diff -Nru seahorse-3.2.2/aclocal.m4 seahorse-3.6.3/aclocal.m4 --- seahorse-3.2.2/aclocal.m4 2011-11-14 11:51:40.000000000 +0100 +++ seahorse-3.6.3/aclocal.m4 2012-11-12 08:49:45.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.12.2 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 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,1734 +13,2045 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. 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'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, 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. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# 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.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.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. # -# 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. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. # -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 # -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 # -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 # -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 # -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Modified to require ngettext +# Matthias Clasen 08/06/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. +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -# serial 9 +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -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='#' +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) + +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) else - $1_TRUE='#' - $1_FALSE= + AC_MSG_RESULT(no) fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# 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. +AC_SUBST($1)dnl +]) -# serial 10 +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -# 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, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + gt_cv_have_gettext=no + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) - am_cv_$1_dependencies_compiler_type=none - 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]) + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi - 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 - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" - # 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 - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi 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 - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $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 $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 - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break + + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) + + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" fi fi - done - cd .. - rm -rf conftest.dir + # We need to process the po/ directory. + POSUB=po + + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS + + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) + +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` else - am_cv_$1_dependencies_compiler_type=none + localedir=`eval echo "${datadir}/locale"` fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) ]) +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) + + +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# 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. +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) -#serial 5 +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # 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 -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. +AC_PREREQ([2.50]) -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# 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 +# 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. +# +# 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. -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -# Do all the work for Automake. -*- Autoconf -*- +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -# 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 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. +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# 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.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 -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -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. -AC_REQUIRE([AC_PROG_AWK])dnl -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([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_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 -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_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 -]) +pkg_failed=no +AC_MSG_CHECKING([for $1]) -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])]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# 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, -# with or without modifications, as long as this notice is preserved. +$$1_PKG_ERRORS -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -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)]) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# Copyright (C) 2003, 2005 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. +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[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. -# serial 2 +_PKG_TEXT -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. +To get pkg-config, see .])[]dnl + ]) else - am__leading_dot=_ + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + +AC_DEFUN([YELP_HELP_INIT], +[ +AC_REQUIRE([AC_PROG_LN_S]) +m4_pattern_allow([AM_V_at]) +m4_pattern_allow([AM_V_GEN]) +m4_pattern_allow([AM_DEFAULT_VERBOSITY]) +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], + [path where help files are installed]),, + [with_help_dir='${datadir}/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) + +AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +if test x"$ITSTOOL" = x; then + AC_MSG_ERROR([itstool not found]) fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) +AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) +if test x"$XMLLINT" = x; then + AC_MSG_ERROR([xmllint not found]) +fi + +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= + +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); + +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) + +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) + +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done + +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi + $(AM_V_GEN)if ! test -f "[$]@"; then \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ + else \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ + rm "$(notdir [$]@).tmp"); \ + fi + +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_GEN)msgfmt -o "[$]@" "$<" + +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "[$]@" + +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) + +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) + +distdir: distdir-help-files +distdir-help-files: + @for lc in C $(HELP_LINGUAS); do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ + +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done + + +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + done; \ + done + +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' +AC_SUBST([YELP_HELP_RULES]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) +]) -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2002-2012 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 8 -# 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], -[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=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# 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.12' +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.12.2], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -# Check to see how 'make' treats includes. -*- Autoconf -*- +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.12.2])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 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 2 -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# 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 - 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]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +# AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 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 6 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - +# serial 10 -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -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 " +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +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='#' else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + $1_TRUE='#' + $1_FALSE= fi -]) +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 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. -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +# serial 17 -# Helper functions for option handling. -*- Autoconf -*- +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# 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 4 +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + am_cv_$1_dependencies_compiler_type=none + 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]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + 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 + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -# Check to make sure that the build environment is sane. -*- Autoconf -*- + # 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. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | 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 + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $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 $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 + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -# 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. + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) -# serial 5 -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# 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 +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -# 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` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # 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". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' fi -AC_MSG_RESULT(yes)]) +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 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 +# serial 6 -# 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 -]) +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # 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"` + # 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'`; 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 +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -# Copyright (C) 2001, 2003, 2005 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. -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# 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. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 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]) +# serial 8 -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Check how to create a tarball. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 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_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +# serial 19 - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +# 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. - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# 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.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 +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +fi -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], +[$0: two- and three-arguments forms are deprecated. For more info, see: +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -AC_PREREQ([2.50]) +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +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([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +dnl Support for Objective C++ was only introduced in Autoconf 2.65, +dnl but we still cater to Autoconf 2.62. +m4_ifdef([AC_PROG_OBJCXX], +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])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 ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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. -# -# 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. +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])]) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# Copyright (C) 2001-2012 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. -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# serial 8 +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +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])]) -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# 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. -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# serial 2 -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -$$1_PKG_ERRORS +# Copyright (C) 1996-2012 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. -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# serial 7 -_PKG_TEXT]) - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[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. +# 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], +[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 enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]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=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) -_PKG_TEXT +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -To get pkg-config, see .]) - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES +# Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # -# Modified to require ngettext -# Matthias Clasen 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +# 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. -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# serial 5 -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# 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])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + 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($1)dnl +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf ]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi +# Copyright (C) 1997-2012 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. - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) +# serial 7 - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +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= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) +# Helper functions for option handling. -*- Autoconf -*- - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi +# Copyright (C) 2001-2012 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. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi +# serial 6 - # We need to process the po/ directory. - POSUB=po +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# Copyright (C) 2001-2012 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. - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +# serial 1 - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +# Check to make sure that the build environment is sane. -*- Autoconf -*- - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) +# Copyright (C) 1996-2012 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. -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` +# serial 9 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# 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 ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # 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". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : else - localedir=`eval echo "${datadir}/locale"` + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file ]) -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +# Copyright (C) 2009-2012 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. -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +# serial 3 + +# 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], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +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 +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) +# Copyright (C) 2001-2012 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. -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl +# serial 2 -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# 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. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas +# Copyright (C) 2006-2012 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. -mostlyclean-am: clean-gsettings-schemas +# serial 3 -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas +# Check how to create a tarball. -*- Autoconf -*- -.SECONDARY: $(gsettings_SCHEMAS) +# Copyright (C) 2004-2012 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. -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi +# serial 3 -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of '-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -m4_include([m4/gnome-doc-utils.m4]) m4_include([m4/intltool.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff -Nru seahorse-3.2.2/ChangeLog seahorse-3.6.3/ChangeLog --- seahorse-3.2.2/ChangeLog 2011-11-14 11:53:25.000000000 +0100 +++ seahorse-3.6.3/ChangeLog 2012-11-12 08:51:05.000000000 +0100 @@ -1,63 +1,5158 @@ # Generated automatically. Do not edit. -commit c795be9e319cbb2cf2c6f024856bffb4386076b5 +commit 0af7c55cb8c888469eb343dcc32fd995eea42e2c +Author: Stef Walter +Date: 2012-11-12 + + Release 3.6.3 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 3dd8dde3047279fa46013b54f873cf26ab4126f2 +Author: Stef Walter +Date: 2012-11-12 + + gkr: Display item labels even if they don't match formatters + + gkr/seahorse-gkr-item.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 6a27b4d9a036086654e06141ab997f51795f5c6b +Author: Stef Walter +Date: 2012-11-09 + + pkcs11: Unreference partner private key correctly + + * Fixes a critical and crash on seahorse exit + + https://bugzilla.gnome.org/show_bug.cgi?id=687972 + + pkcs11/seahorse-certificate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 165fc2f40e6ce53a5b56dd2144ba2c6992871bc2 +Author: Stef Walter +Date: 2012-11-09 + + Use fallback icons if symbolic icons are not available + + * Avoids crash + + https://bugzilla.gnome.org/show_bug.cgi?id=687967 + + src/seahorse-sidebar.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 7734a694ed69822e8f079d9d2c9b08785fb85dd5 +Author: Tom Tryfonidis +Date: 2012-10-23 + + Updated Greek translation + + po/el.po | 492 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 292 insertions(+), 200 deletions(-) + +commit bbf46895a0ef07b8dfb9cae35729c4ad45ea01c0 +Author: Stef Walter +Date: 2012-10-22 + + Release version 3.6.2 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 0c64651c23437f140307046f302628ba63542561 +Author: Stef Walter +Date: 2012-10-18 + + gkr: Fix problem where keyring items overwrite one another + + Regression since the migration to libsecret. Items stored + manually by choosing 'Stored Password' overwrite one another. + Don't use secret_service_store() as it uses the + SECRET_ITEM_CREATE_REOPLACE flag. + + https://bugzilla.gnome.org/show_bug.cgi?id=686407 + + gkr/seahorse-gkr-add-item.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 83fc74f32248e193e517304b443f9ef96fea3878 +Author: Stef Walter +Date: 2012-10-15 + + Release version 3.6.1 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 60e7f1bc15a554fa05106c2b9f5e25fb827925a4 +Author: Stef Walter +Date: 2012-10-13 + + Strip possible dbus errors before displaying + + * It's dumb that we need to strip error messages to prevent + DBus error names from leaking to the user. But do this anyway + now that we're using libsecret, which uses GDBus. + + https://bugzilla.gnome.org/show_bug.cgi?id=684966 + + gkr/seahorse-gkr-item-properties.c | 2 ++ + libseahorse/seahorse-key-manager-store.c | 1 + + libseahorse/seahorse-util.c | 1 + + pgp/seahorse-keyserver-results.c | 1 + + 4 files changed, 5 insertions(+) + +commit 4a297007e5c555ee4efe881cda283bd1c45e8f52 +Author: Stef Walter +Date: 2012-10-13 + + gkr: Fix regression for changing keyring password + + * Changing a keyring password was failing with 'The collection does + not exist'. + * Use the correct DBus object path when changing the keyring password. + + https://bugzilla.gnome.org/show_bug.cgi?id=684966 + + gkr/seahorse-gkr-actions.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0ebdf0df889fc12609b2540e311d9c5ad8bcb793 +Author: Ani Peter +Date: 2012-10-06 + + Updated file by Anish A + + po/ml.po | 4018 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 2062 insertions(+), 1956 deletions(-) + +commit 15ae4fc1a0e148585f49d7de41f86890a2ff19bb +Author: Yaron Shahrabani +Date: 2012-10-05 + + Updated Hebrew translation. + + po/he.po | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 61d9eb4dafe447b8f5d93b14e855d1ca8711f14e +Author: Yaron Shahrabani +Date: 2012-10-05 + + Updated Hebrew translation. + + po/he.po | 328 ++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 208 insertions(+), 120 deletions(-) + +commit bd190ad2c2680260d4a180990096e1b989160c41 +Author: Stef Walter +Date: 2012-10-01 + + Don't use deprecated header + + pkcs11/seahorse-certificate.c | 1 - + pkcs11/seahorse-pkcs11-generate.c | 1 - + pkcs11/seahorse-pkcs11-request.c | 1 - + pkcs11/seahorse-private-key.c | 1 - + 4 files changed, 4 deletions(-) + +commit dd7fcd24f287e6dc8c870998f10813c7f38524c3 +Author: Stef Walter +Date: 2012-09-25 + + Release version 3.6.0 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit adedacb2d9f1a7335c41572b8dcb04c57758417a +Author: Rūdolfs Mazurs +Date: 2012-09-24 + + Updated Latvian translation + + po/lv.po | 654 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 335 insertions(+), 319 deletions(-) + +commit dc3c82972a433f761baa0adfd2ded3e31a055074 +Author: Mattias Põldaru +Date: 2012-09-24 + + [l10n] Updated Estonian translation + + po/et.po | 97 ++++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 51 insertions(+), 46 deletions(-) + +commit 3506b626a7918df773c10d037be915fa1742efa1 +Author: Timo Jyrinki +Date: 2012-09-24 + + Finnish translation update by Jiri Grönroos + + po/fi.po | 823 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 478 insertions(+), 345 deletions(-) + +commit 8dbf7eab4bff389e1f0b267b77e97e45ec3ec888 +Author: Rajesh Ranjan +Date: 2012-09-23 + + hindi update + + po/hi.po | 4158 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 2233 insertions(+), 1925 deletions(-) + +commit 1c89d6f1db0e1478ee98d8dca2b78220f6877d38 +Author: YunQiang Su +Date: 2012-09-23 + + update Simplified Chinese (zh_CN) translation + + po/zh_CN.po | 649 +++++++++++++++++++++++++++++------------------------------- + 1 file changed, 314 insertions(+), 335 deletions(-) + +commit d5c50a6541d367cba141dff5991f7ecc280e69dd +Author: Theppitak Karoonboonyanan +Date: 2012-09-22 + + Updated Thai translation + + po/th.po | 2862 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1501 insertions(+), 1361 deletions(-) + +commit 907d632f99596e83fd3e584b412f73cd7c3361ed +Author: Carles Ferrando +Date: 2012-09-21 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 381 ++++++++++++++++++++++++++++-------------------------- + 1 file changed, 198 insertions(+), 183 deletions(-) + +commit 58456f6f6eef56db501d8d9371deee0a8ceda7f7 +Author: Gil Forcada +Date: 2012-09-21 + + [l10n] Updated Catalan translation + + po/ca.po | 609 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 316 insertions(+), 293 deletions(-) + +commit 6efda29bbe9a42aefebc977f3d62ac1bc0535f4f +Author: Daniel Korostil +Date: 2012-09-20 + + Uploaded Ukranian + + po/uk.po | 635 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 330 insertions(+), 305 deletions(-) + +commit 6caac492531d9d73609d268b015ab98483123976 +Author: Piotr Drąg +Date: 2012-09-18 + + Updated Polish translation + + po/pl.po | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit c5fa9d5355d592665920a7ea2c39f12c2dd59602 +Author: Stef Walter +Date: 2012-09-18 + + Release version 3.5.92 + + .gitignore | 3 +++ + NEWS | 6 ++++++ + configure.ac | 2 +- + 3 files changed, 10 insertions(+), 1 deletion(-) + +commit 4754ca8fc505d9455051224e7c972bd62b982842 +Author: Rafael Ferreira +Date: 2012-09-17 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 796 +++++++++++++++++++++++------------------------------------- + 1 file changed, 301 insertions(+), 495 deletions(-) + +commit d017193642c7f681264b6c857ede3b47d120c59f +Author: Daniel Mustieles +Date: 2012-09-16 + + Updated Spanish translation + + po/es.po | 47 ++++++++++++++++++++++++----------------------- + 1 file changed, 24 insertions(+), 23 deletions(-) + +commit cca29bdd68960095d255ccf4ae58fd8437bf7911 +Author: Flemming Christensen +Date: 2012-09-15 + + Updated Danish translation + + po/da.po | 390 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 201 insertions(+), 189 deletions(-) + +commit a526968027fde4b3c009ce17ab6703fa45477068 +Author: Changwoo Ryu +Date: 2012-09-15 + + Updated Korean translation + + po/ko.po | 376 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 193 insertions(+), 183 deletions(-) + +commit f50186f15ba52e1ae00f217ae9b9d20ad377f8e1 +Author: Alexandre Franke +Date: 2012-09-14 + + Update French translation + + help/fr/fr.po | 1136 +++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 655 insertions(+), 481 deletions(-) + +commit f6405b26b25b2c667dc7b4e35238d905133a3ba0 +Author: Daniel Mustieles +Date: 2012-09-12 + + Updated Spanish translation + + help/es/es.po | 186 +++++++++++++++++++--------------------------------------- + 1 file changed, 60 insertions(+), 126 deletions(-) + +commit fc1f7e1e94b18389d15f7708fb4d879fa5826db6 +Author: Daniel Mustieles +Date: 2012-09-10 + + Updated Spanish translation + + help/es/es.po | 1276 +++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 783 insertions(+), 493 deletions(-) + +commit 8bd668581e2c7c7bdd5312f7b9a72585028a9aeb +Author: Tom Tryfonidis +Date: 2012-09-10 + + Updated Greek help translation + + help/el/el.po | 2424 +++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 1648 insertions(+), 776 deletions(-) + +commit fe0bb9c58f58cb2ad8110cc02747fd52159dd72c +Author: Alexandre Franke +Date: 2012-09-10 + + Update French translation + + po/fr.po | 365 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 191 insertions(+), 174 deletions(-) + +commit 6cf70ca49c20ff9c9fea1f1f09d3898be984639f +Author: Mario Blättermann +Date: 2012-09-09 + + [l10n] Updated German doc translation + + help/de/de.po | 980 ++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 511 insertions(+), 469 deletions(-) + +commit 04463d1d26fee97313b367c3bebac2a04cf7bdb3 +Author: Javier Jardón +Date: 2012-08-17 + + Port to new documentation infrastructure + + Use yelp-tools instead gnome-doc-utils + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=683307 + + .gitignore | 1 - + Makefile.am | 5 +- + configure.ac | 4 +- + help/C/index.docbook | 1419 +++++++++++++++++++++++++++++++++++++++++ + help/C/legal.xml | 2 +- + help/C/seahorse.xml | 1419 ----------------------------------------- + help/Makefile.am | 16 +- + help/seahorse.omf.in | 18 - + libseahorse/seahorse-widget.c | 4 +- + m4/.gitignore | 1 - + 10 files changed, 1435 insertions(+), 1454 deletions(-) + +commit c23cb1c1dd6ca12fbdeb76e62b14e13ab5e2faf4 +Author: Marek Černocký +Date: 2012-09-07 + + Updated Czech translation + + po/cs.po | 334 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 162 insertions(+), 172 deletions(-) + +commit e430c0471dae990560de5a02f32e89a89ccbfcd9 +Author: Paul Seyfert +Date: 2012-09-06 + + [l10n] Updated German translation + + po/de.po | 1266 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 641 insertions(+), 625 deletions(-) + +commit 5e8f482ecb5d6ac43f389bcd2f88919ffa9b04e5 +Author: Bruce Cowan +Date: 2012-09-05 + + Updated British English translation + + po/en_GB.po | 358 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 185 insertions(+), 173 deletions(-) + +commit 2ded42b06e6929a33c12e1a011fd3d1ff3849aaf +Author: Gabor Kelemen +Date: 2012-09-04 + + Updated Hungarian translation + + po/hu.po | 1290 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 657 insertions(+), 633 deletions(-) + +commit c9d59248c4b3161860b426b902906ebd3d458524 +Author: Piotr Drąg +Date: 2012-09-04 + + Updated Polish translation + + po/pl.po | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +commit e4d467431c9556305144ff6a22fd9d857bc47d93 +Author: Muhammet Kara +Date: 2012-09-04 + + [l10n]Updated Turkish translation + + po/tr.po | 610 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 313 insertions(+), 297 deletions(-) + +commit 680a8395b26ffaacd45a9775727bdefe8c8d0a48 +Author: Stef Walter +Date: 2012-09-03 + + Release version 3.5.91 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit f3e64d1df45d9d9eec985d8b4ac671fb261725fe +Author: Dr.T.Vasudevan +Date: 2012-09-02 + + updated Tamil translation + + po/ta.po | 371 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 194 insertions(+), 177 deletions(-) + +commit a2f30dd0563b78727cfeeb25c22c2ac8b549cd50 +Author: Nguyễn Thái Ngọc Duy +Date: 2012-09-01 + + Updated Vietnamese translation + + po/vi.po | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +commit 39c62bd77288ca978bbea5801c35b2b036e1b10f +Author: Nguyễn Thái Ngọc Duy +Date: 2012-09-01 + + po/vi: import from Damned Lies + + po/vi.po | 677 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 313 insertions(+), 364 deletions(-) + +commit cdbcd8e22936d305c4c829811699f2d5b2e7b36c +Author: Duarte Loreto +Date: 2012-09-01 + + Updated Portuguese translation + + po/pt.po | 372 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 193 insertions(+), 179 deletions(-) + +commit b909ca5c4c7691851d203138b58f8bb016499626 +Author: Nilamdyuti Goswami +Date: 2012-08-28 + + Implemented FUEL entries to Assamese translation + + po/as.po | 78 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 39 insertions(+), 39 deletions(-) + +commit 399ae61ba2e1259980ef5f06052877c2e23da9b2 +Author: Yuri Myasoedov +Date: 2012-08-24 + + Updated Russian translation + + po/ru.po | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 08473bf6bc2c3e09aea9510534b45c6b69efd9a0 +Author: Yuri Myasoedov +Date: 2012-08-24 + + Updated Russian translation + + po/ru.po | 886 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 486 insertions(+), 400 deletions(-) + +commit d1212a8c9b73d2d42db57f0d6a4e134662424ed1 +Author: A S Alam +Date: 2012-08-22 + + update Punjabi Translation + + po/pa.po | 367 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 186 insertions(+), 181 deletions(-) + +commit 4249e2caeceb134652173bcf4e8be0a764408ec5 +Author: Piotr Drąg +Date: 2012-08-22 + + Updated Polish translation + + po/pl.po | 332 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 162 insertions(+), 170 deletions(-) + +commit f693720b8275f9ff09d1a1cbc971683a47033d8b +Author: Dirgita +Date: 2012-08-21 + + Updated Indonesian translation + + po/id.po | 598 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 296 insertions(+), 302 deletions(-) + +commit 3b5bb7ff3dbcc813515217afec616fbad80124b4 +Author: Stef Walter +Date: 2012-08-20 + + Release version 3.5.90 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit e3cc6e40d7001d17e5054558f1ecf59dfc781bb9 +Author: Milo Casagrande +Date: 2012-08-19 + + [l10n] Updated Italian translation. + + po/it.po | 404 ++++++++++++++++++--------------------------------------------- + 1 file changed, 115 insertions(+), 289 deletions(-) + +commit 0ab3c5e39684868f0fa09e168f3d56286f7b3df4 +Author: Nilamdyuti Goswami +Date: 2012-08-17 + + Assamese translation updated + + po/as.po | 981 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 493 insertions(+), 488 deletions(-) + +commit fc12700c1131feb2ffe6731e7494451acb6f83e9 +Author: Fran Diéguez +Date: 2012-08-17 + + Updated Galician translations + + po/gl.po | 100 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 50 insertions(+), 50 deletions(-) + +commit 13fc4d1279b343a8042b08b63df5113525d8ec84 +Author: Fran Diéguez +Date: 2012-07-31 + + Updated Galician translations + + po/gl.po | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 776be41cfb2345ebe9895764a314f2c5f7d1e68a +Author: Fran Diéguez +Date: 2012-07-30 + + Updated Galician translations + + po/gl.po | 355 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 181 insertions(+), 174 deletions(-) + +commit 4d4a0efb8f705868380454b915d31a83fd9ecf63 +Author: Aurimas Černius +Date: 2012-07-22 + + Updated Lithuanian translation + + po/lt.po | 2124 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1094 insertions(+), 1030 deletions(-) + +commit 6b7af8c3791698e40740d864309630f4e7f9da0f +Author: Мирослав Николић +Date: 2012-07-22 + + Updated Serbian translation + + po/sr.po | 1043 ++++++++++---------------------------------------------- + po/sr@latin.po | 1043 ++++++++++---------------------------------------------- + 2 files changed, 378 insertions(+), 1708 deletions(-) + +commit 51f71fc36610083572865a6724b36073304d6d9f +Author: Matej Urbančič +Date: 2012-07-19 + + Updated Slovenian translation + + po/sl.po | 363 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 188 insertions(+), 175 deletions(-) + +commit 009931bccea86696d06cdffc6954bfba42523089 +Author: Chao-Hsiung Liao +Date: 2012-07-17 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 1237 +++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 1241 ++++++++++++++++++++++++++++++----------------------------- + 2 files changed, 1256 insertions(+), 1222 deletions(-) + +commit 5c11bcaa34036508953dd53b38b6fe7c3f343044 +Author: Stef Walter +Date: 2012-07-16 + + Release version 3.5.4 + + NEWS | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit e92a5fa9cdcba78ddcc261065793159ca7d0466a +Author: Stef Walter +Date: 2012-07-16 + + Fix for incompatibility with libsecret + + * SecretItem already has a 'flags' property, so we need to rename + the one in seahorse to 'object-flags' + + gkr/seahorse-gkr-item.c | 4 ++-- + libseahorse/seahorse-object.c | 4 ++-- + libseahorse/seahorse-predicate.c | 2 +- + pgp/seahorse-gpgme-key.c | 2 +- + pgp/seahorse-hkp-source.c | 2 +- + pgp/seahorse-ldap-source.c | 2 +- + pkcs11/seahorse-certificate.c | 2 +- + pkcs11/seahorse-private-key.c | 2 +- + pkcs11/seahorse-token.c | 2 +- + ssh/seahorse-ssh-key.c | 4 ++-- + 10 files changed, 13 insertions(+), 13 deletions(-) + +commit c36f158a8bb263beb27191285fd2ca373e63c231 +Author: Ihar Hrachyshka +Date: 2012-07-15 + + Updated Belarusian translation. + + po/be.po | 595 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 298 insertions(+), 297 deletions(-) + +commit cdfc9bd7df52f16d837f75749371899370ae033e +Author: Stef Walter +Date: 2012-07-13 + + Bump dependency on libsecret + + * And fix for changes in the headers + + configure.ac | 2 +- + gkr/seahorse-gkr-item.h | 2 +- + gkr/seahorse-gkr-keyring.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 39807f14707f5898a34de780a7baec59ce47ad3e +Author: Stef Walter +Date: 2012-07-12 + + Update for recent changes in libsecret + + * Require libsecret 0.5 or later + + configure.ac | 2 +- + gkr/seahorse-gkr-add-keyring.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 0807706cd5cc7bb2c733452c401458dd4f345d7e +Author: Yaron Shahrabani +Date: 2012-07-10 + + Updated Hebrew translation. + + po/he.po | 1252 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 632 insertions(+), 620 deletions(-) + +commit ff95fcb2dc657ebf735d10231c2521369aac4b58 +Author: Kjartan Maraas +Date: 2012-07-10 + + Updated Norwegian bokmål translation + + po/nb.po | 333 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 162 insertions(+), 171 deletions(-) + +commit 6c42a2a7b3010e0b84a17c10853f7b160e36d723 +Author: Daniel Mustieles +Date: 2012-07-06 + + Updated Spanish translation + + po/es.po | 188 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 96 insertions(+), 92 deletions(-) + +commit 645bf146b673e61fbe44a6a5450744aa79f238ce +Author: Stef Walter +Date: 2012-07-06 + + More updates for libsecret changes + + gkr/seahorse-gkr-actions.c | 12 ++++++------ + gkr/seahorse-gkr-backend.c | 14 +++++++------- + 2 files changed, 13 insertions(+), 13 deletions(-) + +commit bb9ee255d535e41bd9dc8aaf828ec2f04a5f8fcd +Author: Stef Walter +Date: 2012-07-05 + + gkr: Update for latest changes in libsecret + + gkr/seahorse-gkr-backend.c | 2 +- + gkr/seahorse-gkr-item.c | 9 ++++----- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 99ce5cbc8705a884c11b3b0d578e7ec1b7461b1e +Author: Khaled Hosny +Date: 2012-07-05 + + Updated Arabic translation + + po/ar.po | 352 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 181 insertions(+), 171 deletions(-) + +commit f776e4e71321304820913cef86b4f31a5c27e1da +Author: Alexander Shopov +Date: 2012-07-04 + + Updated Bulgarian translation + + po/bg.po | 337 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 165 insertions(+), 172 deletions(-) + +commit 8e33e88e5ac5186bbb6d28b2627809d69ed1525e +Author: Tom Tryfonidis +Date: 2012-07-04 + + Updated Greek translations + + help/el/el.po | 1338 +++++++++++++++++---------------------------------------- + po/el.po | 195 ++++----- + 2 files changed, 484 insertions(+), 1049 deletions(-) + +commit ad6b514e27e78b9b236f3ce415c05e81cb64c40d +Author: Piotr Drąg +Date: 2012-07-02 + + Updated POTFILES.in + + po/POTFILES.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2c58032f7e34f4b1546e6aa574a4f5801627d118 +Author: Daniel Mustieles +Date: 2012-07-02 + + Updated Spanish translation + + po/es.po | 39 +++++++++++++++++++++++++++------------ + 1 file changed, 27 insertions(+), 12 deletions(-) + +commit 7e7d7794147d126d1fae447f4776bb64e591e923 +Author: Stef Walter +Date: 2012-07-02 + + Migrate to GtkApplication + + * Use GtkApplication to startup seahorse, parse arguments + * Seahorse is now a single instance application + * SeahorseApplication replaces SeahorseContext and is + derived from GtkApplication + * Depends on GTK+ 3.4 or later + + https://bugzilla.gnome.org/show_bug.cgi?id=677234 + + configure.ac | 2 +- + libseahorse/Makefile.am | 2 +- + libseahorse/seahorse-application.c | 203 ++++++++++++++++++++++++++ + libseahorse/seahorse-application.h | 51 +++++++ + libseahorse/seahorse-context.c | 236 ------------------------------- + libseahorse/seahorse-context.h | 85 ----------- + libseahorse/seahorse-keyserver-control.c | 10 +- + libseahorse/seahorse-place.c | 1 - + libseahorse/seahorse-prefs.c | 9 +- + libseahorse/seahorse-servers.c | 6 +- + libseahorse/seahorse-widget.c | 35 ++--- + libseahorse/seahorse-widget.h | 2 +- + pgp/seahorse-keyserver-search.c | 10 +- + pgp/seahorse-keyserver-sync.c | 8 +- + pgp/seahorse-pgp-backend.c | 12 +- + pgp/seahorse-pgp-keysets.c | 4 +- + pgp/seahorse-signer.c | 2 +- + src/seahorse-key-manager.c | 43 ++---- + src/seahorse-key-manager.h | 2 +- + src/seahorse-main.c | 84 +++-------- + 20 files changed, 330 insertions(+), 477 deletions(-) + +commit 6e1f8bcc9b9f0fa46dad197955d77121be882f9f +Author: Stef Walter +Date: 2012-07-02 + + Bump version number + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e49f2ef135565487d5147cd16e92f12c28d53513 +Author: Stef Walter +Date: 2012-07-01 + + Include the seahorse-place.h header in appropriate places + + libseahorse/seahorse-catalog.h | 1 + + pgp/seahorse-gpgme-keyring.c | 1 + + pgp/seahorse-hkp-source.c | 1 + + pgp/seahorse-ldap-source.c | 1 + + 4 files changed, 4 insertions(+) + +commit 181b279d62991b3bab465bd4bacd5802fc79878a +Author: Stef Walter +Date: 2012-06-29 + + pgp: Fix use of null pointer in SeahorseGpgmeKeyring + + pgp/seahorse-gpgme-keyring.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4619f1bb35aa5ea79b0b45ba40da6a10abd684ba +Author: Stef Walter +Date: 2012-06-29 + + gkr: No keyring UI bits if failed to connect to Secret Service + + * Only register keyring ui bits with the interface once + we've connected to the Secret Service + + https://bugzilla.gnome.org/show_bug.cgi?id=668770 + + gkr/seahorse-gkr-actions.c | 33 ++++++++++++++++++++++++++++----- + gkr/seahorse-gkr-actions.h | 3 ++- + gkr/seahorse-gkr-backend.c | 16 ++++++++++++---- + 3 files changed, 42 insertions(+), 10 deletions(-) + +commit f67c294cadb936efd4766c222c7c99754db75d2b +Author: Stef Walter +Date: 2012-06-29 + + When Ctrl-F pressed in the main window, focus the filter box + + https://bugzilla.gnome.org/show_bug.cgi?id=677844 + + src/seahorse-key-manager.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit aafa5b689524a976fb26969b6a0023cb786c9690 +Author: Stef Walter +Date: 2012-06-29 + + Remove unused 'secure' memory code + + gkr/seahorse-gkr-item-properties.c | 1 - + gkr/seahorse-gkr-item.c | 1 - + libseahorse/Makefile.am | 1 - + libseahorse/seahorse-secure-memory.c | 178 ----------------------------------- + libseahorse/seahorse-secure-memory.h | 39 -------- + src/seahorse-main.c | 3 - + 6 files changed, 223 deletions(-) + +commit 1ab3f7875cda713b6ae932465b7f1e43dcad79ac +Author: Tom Tryfonidis +Date: 2012-06-29 + + Updated Greek translation + + po/el.po | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +commit c544e751d5029c60a8174b7d5a38c0a52c04928b +Author: Stef Walter +Date: 2012-06-29 + + Make these icons have the correct canvas size. + + https://bugzilla.gnome.org/show_bug.cgi?id=676357 + + data/icons/hicolor_status_22x22_seahorse-sign-bad.png | Bin 1254 -> 1198 bytes + data/icons/hicolor_status_22x22_seahorse-sign-ok.png | Bin 1197 -> 1143 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 32f0c345a4596957dc24bbb27dd9edbd7d953168 +Author: Stef Walter +Date: 2012-06-29 + + Fix an #ifdef and clear up some warnings + + libseahorse/seahorse-prefs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f36207c292d3de99c88aa7d38d7785e6f8495d2c +Author: Stef Walter +Date: 2012-06-29 + + pgp: Add suggestion to generate entropy while generating key + + https://bugzilla.gnome.org/show_bug.cgi?id=678680 + + libseahorse/seahorse-progress.c | 19 +++++++++++++++++++ + libseahorse/seahorse-progress.h | 5 +++++ + libseahorse/seahorse-progress.xml | 16 +++++++++++++--- + pgp/seahorse-gpgme-generate.c | 10 +++++++++- + 4 files changed, 46 insertions(+), 4 deletions(-) + +commit ec56b4f0744c160f3ee651628576fd6a320ab418 +Author: Tom Tryfonidis +Date: 2012-06-28 + + Updated Greek translation + + po/el.po | 1491 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 700 insertions(+), 791 deletions(-) + +commit d8fe8ebdb3064d043269a45d5f221db5c0c8c05e +Author: Stef Walter +Date: 2012-06-28 + + Update libsecret usage for removal of some varargs functions + + gkr/seahorse-gkr-add-item.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 8c629abccc97e901a91dcd7341ca0377cd163b43 +Author: Daniel Mustieles +Date: 2012-06-28 + + Updated Spanish translation + + po/es.po | 306 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 150 insertions(+), 156 deletions(-) + +commit 4d3eef35c678d6e379dfe6a4bf05f62e7fb16578 +Author: Andika Triwidada +Date: 2012-06-28 + + Updated Indonesian translation + + po/id.po | 2536 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1365 insertions(+), 1171 deletions(-) + +commit 47a84c4ddf6d712affc964418a9e2d9c13e0a658 +Author: Milo Casagrande +Date: 2012-06-27 + + [l10n] Updated Italian translation. + + po/it.po | 1203 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 599 insertions(+), 604 deletions(-) + +commit 39ada6e1603adccb6a2391c7cb16e8a476a34ac8 +Author: Piotr Drąg +Date: 2012-06-27 + + Updated POTFILES.in + + po/POTFILES.in | 1 - + 1 file changed, 1 deletion(-) + +commit 9b12bfdd245867f928651bc5414cba67a3f84169 +Author: Stef Walter +Date: 2012-04-30 + + Use libsecret instead of libgnome-keyring + + * Requires libsecret 0.4 or later + + configure.ac | 12 +- + gkr/Makefile.am | 6 +- + gkr/seahorse-gkr-actions.c | 123 ++++-- + gkr/seahorse-gkr-add-item.c | 79 ++-- + gkr/seahorse-gkr-add-keyring.c | 38 +- + gkr/seahorse-gkr-backend.c | 405 ++++++++++---------- + gkr/seahorse-gkr-backend.h | 6 +- + gkr/seahorse-gkr-dialogs.c | 42 +- + gkr/seahorse-gkr-dialogs.h | 2 +- + gkr/seahorse-gkr-item-deleter.c | 52 +-- + gkr/seahorse-gkr-item-properties.c | 80 ++-- + gkr/seahorse-gkr-item.c | 700 ++++++++++++---------------------- + gkr/seahorse-gkr-item.h | 38 +- + gkr/seahorse-gkr-keyring-deleter.c | 68 +--- + gkr/seahorse-gkr-keyring-properties.c | 22 +- + gkr/seahorse-gkr-keyring.c | 528 +++++++------------------ + gkr/seahorse-gkr-keyring.h | 25 +- + gkr/seahorse-gkr-operation.c | 362 ------------------ + gkr/seahorse-gkr-operation.h | 52 --- + libseahorse/seahorse-interaction.c | 7 +- + libseahorse/seahorse-object-widget.c | 2 +- + libseahorse/seahorse-registry.c | 2 + + libseahorse/seahorse-secure-memory.c | 25 +- + pgp/seahorse-pgp-backend.c | 2 - + src/seahorse-key-manager.c | 2 - + 25 files changed, 891 insertions(+), 1789 deletions(-) + +commit c92f2195bb56328d10204a3363cf5786120cdd0a +Merge: d62ff17 7fafa3c +Author: Stef Walter +Date: 2012-06-25 + + Merge branch 'gnome-3-4' + +commit d62ff173c02beba7b73e0dbbcca7558df4f51917 +Author: Stef Walter +Date: 2012-06-23 + + Use GcrSecureEntryBuffer and remove duplicate code + + * Remove duplicate SeahorseSecureBuffer since we have the + equivalent in the gcr library + + gkr/seahorse-gkr-add-item.c | 3 +- + gkr/seahorse-gkr-item-properties.c | 3 +- + libseahorse/Makefile.am | 1 - + libseahorse/seahorse-passphrase.c | 7 +- + libseahorse/seahorse-secure-buffer.c | 196 ----------------------------------- + libseahorse/seahorse-secure-buffer.h | 57 ---------- + 6 files changed, 6 insertions(+), 261 deletions(-) + +commit a70943e9feec9ab456bc59f5c5f1d9e6f1865177 +Author: Daniel Mustieles +Date: 2012-05-31 + + Updated Spanish translation + + po/es.po | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 72f074c911d30447a6d6849df8d6bf1c71df56ce +Author: Bruno Brouard +Date: 2012-05-23 + + Updated French translation + + po/fr.po | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit 9e7796a5d2b905a0ddf549c6146fcdeb785e1146 +Author: Tom Tryfonidis +Date: 2012-05-03 + + Updated Greek translation + + po/el.po | 3354 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1723 insertions(+), 1631 deletions(-) + +commit 7fafa3ccda857a8d65259e50060f5a6bcb5e0a0a +Author: Stef Walter +Date: 2012-04-30 + + Align keyids with name/signatures in key properties + + * In the table for names/signatures, align the keyid with the + name/userid markup + + pgp/seahorse-pgp-key-properties.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 4833b9c66251dc7bf0aa6d75292de633093ffea5 +Author: Stef Walter +Date: 2012-04-30 + + Unavailable entries were displayed incorrectly for signatures + + * Only load unknown keys for ones that we can't find locally + + https://bugzilla.gnome.org/show_bug.cgi?id=675015 + + pgp/seahorse-pgp-backend.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 5286af2304b3a59a2deeb508433c13d96fe2287c +Author: Stef Walter +Date: 2012-04-30 + + Fix typo in finalizing of GPGME keyring + + pgp/seahorse-gpgme-keyring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f3493e185e3f4a1b65cf95e286926113cd23de24 +Author: Marek Černocký +Date: 2012-04-17 + + Updated Czech translation + + po/cs.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8a0cfcfc78f487447a347309affa6acadcfe77f +Author: Stef Walter +Date: 2012-04-30 + + Fix typo in finalizing of GPGME keyring + + pgp/seahorse-gpgme-keyring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ac08711a14d59e1e28dc7dc08817bf658d24901 +Author: Marek Černocký +Date: 2012-04-17 + + Updated Czech translation + + po/cs.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fda219ef5fd5cd79b0cb86c63823169855238708 +Author: Sasi Bhushan +Date: 2012-04-17 + + Updated Telugu Translation + + po/te.po | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +commit 5052960e3dd6835146eb92649a0237b061efb6ed +Author: Matej Urbančič +Date: 2012-04-16 + + Updated Slovenian translation + + po/sl.po | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit af0ef27fa6e3e18562e7371885a367c6332610f5 +Merge: bc1f312 53673c4 +Author: Stef Walter +Date: 2012-04-16 + + Merge branch 'gnome-3-4' + +commit 53673c4f58e03e969b12a9facedb6a24794e4c82 +Author: Stef Walter +Date: 2012-04-16 + + Release 3.4.1 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 8fcc87df4a147c83cc7924bad7508f4fa610ddac +Author: Ahmad Gharbeia +Date: 2012-04-12 + + Updated Arabic translation + + po/ar.po | 403 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 206 insertions(+), 197 deletions(-) + +commit bc1f3122cd6770994620e41e7484c1591943bf2a +Author: Bruce Cowan +Date: 2012-04-13 + + Updated British English translation + + po/en_GB.po | 351 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 182 insertions(+), 169 deletions(-) + +commit 4a0b6a510f906b123eb743aff7dcc991efe8ab2f +Author: Bruce Cowan +Date: 2012-04-13 + + Updated British English translation + + po/en_GB.po | 351 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 182 insertions(+), 169 deletions(-) + +commit 41fc5c59d1a8a089e1e5853fb29b7ecd3578617d +Author: Debarshi Ray +Date: 2012-03-25 + + Don't complete the hkp_source_export operation on an error + + Occurence of an error does not mean that there are no more pending + requests. So set the error but wait for the other requests to finish. + + Fixes: https://bugzilla.gnome.org/672814 + + pgp/seahorse-hkp-source.c | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +commit e710225ccf6a6c76607af8f44d2dabb3fc0d031f +Author: Robert Ancell +Date: 2012-04-11 + + Fix memory errors when limiting the servers to search for keys + + https://bugzilla.gnome.org/show_bug.cgi?id=673884 + + pgp/seahorse-pgp-backend.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit cdf99bc466ab63bdb2953f1d1bfcab3c56d73c4c +Author: Carles Ferrando +Date: 2012-04-10 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 47 +++++++++++++++++++++++++---------------------- + 1 file changed, 25 insertions(+), 22 deletions(-) + +commit 33818813d0ff1b42dd8e7e9543c16b7444c563dc +Author: Jordi Serratosa +Date: 2012-04-10 + + [l10n] Fixes on Catalan translation + + po/ca.po | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +commit 0147e2460fb5a85721f2a8989cf8f0a61cb0ce8a +Author: Carles Ferrando +Date: 2012-04-10 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit f79c6c1968b9e03d8a25309ec48d638eb9ea85ab +Author: Jordi Serratosa +Date: 2012-04-10 + + [l10n] Fixes on Catalan translation + + po/ca.po | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +commit 45ca379803157199c9a69ea16450c17a5827def2 +Author: Yaron Shahrabani +Date: 2012-04-10 + + Updated Hebrew translation. + + po/he.po | 370 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 190 insertions(+), 180 deletions(-) + +commit 73f078a5acc231c9bfaa73a4e94f47f4273d454f +Author: Chandan Kumar +Date: 2012-04-08 + + Updated HINDI translation + + po/hi.po | 4081 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 2180 insertions(+), 1901 deletions(-) + +commit 695ff4cd8f47ed5d5c9532ba2abffd97ab28405a +Author: Andika Triwidada +Date: 2012-03-30 + + [l10n] Updated Indonesian translation + + po/id.po | 2552 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1393 insertions(+), 1159 deletions(-) + +commit 94e3dfa07ae022e83c24120c05b2a52975f45328 +Author: Stef Walter +Date: 2012-03-30 + + Better building for .desktop files + + Makefile.decl | 37 +++++++++++++++++++++++++++++++++++++ + configure.ac | 1 - + src/Makefile.am | 5 +++-- + src/seahorse.desktop.in.in | 2 +- + 4 files changed, 41 insertions(+), 4 deletions(-) + +commit e5c9d039b2eca84bf67553aa6ee179eeded9d058 +Author: Khaled Hosny +Date: 2012-03-30 + + Updated Arabic translation + + po/ar.po | 3935 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 2017 insertions(+), 1918 deletions(-) + +commit 9cb5be8c029141e5a2c6a456a3f879d8e236f210 +Author: Khaled Hosny +Date: 2012-03-30 + + Updated Arabic translation + + po/ar.po | 3935 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 2017 insertions(+), 1918 deletions(-) + +commit 290c490678fcd99c1719b2f559de27939ccdbff9 +Author: Kjartan Maraas +Date: 2012-03-29 + + Updated Norwegian bokmål translation + + po/nb.po | 334 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 171 insertions(+), 163 deletions(-) + +commit 823e2daffaec038fef176a39085312eb432ad55b +Author: Kjartan Maraas +Date: 2012-03-29 + + Updated Norwegian bokmål translation + + po/nb.po | 334 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 171 insertions(+), 163 deletions(-) + +commit 3d5fafc802e18bed651986ad3c5052855b4c3c57 +Author: Aurimas Černius +Date: 2012-03-28 + + Updated Lithuanian translation + + po/lt.po | 2128 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1170 insertions(+), 958 deletions(-) + +commit 5328ff27b25a78dca24252a41ce970b5808e0d36 +Author: Changwoo Ryu +Date: 2012-03-27 + + Updated Korean translation + + po/ko.po | 334 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 173 insertions(+), 161 deletions(-) + +commit de7bb0eec9d9214d9742001e17a66be4a924ff34 +Author: Changwoo Ryu +Date: 2012-03-27 + + Updated Korean translation + + po/ko.po | 334 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 173 insertions(+), 161 deletions(-) + +commit ee1570fa1b8d27d81776b28fa5a64cedb9285c80 +Author: Cosimo Cecchi +Date: 2012-03-21 + + key-manager: remove scrolled window container border + + The scrolled window should not have any border width; on the other hand, + the treeview inside can use a left/right margin to give some space on + the sides of the leftmost/rightmost renderers. + + https://bugzilla.gnome.org/show_bug.cgi?id=672602 + + src/seahorse-key-manager.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9b72f8daaff4fcd0b1949e35cd6907d15546751b +Author: Stef Walter +Date: 2012-03-26 + + Release 3.4.0 + + Makefile.am | 3 ++- + NEWS | 5 +++++ + configure.ac | 2 +- + 3 files changed, 8 insertions(+), 2 deletions(-) + +commit 3be013681166e51bc4ecbf1484089d779e9c802c +Author: A S Alam +Date: 2012-03-26 + + update Punjabi Translation + + po/pa.po | 433 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 185 insertions(+), 248 deletions(-) + +commit 2b8bc6f0941f2021e1a62659bce58b9a993530b1 +Author: A S Alam +Date: 2012-03-26 + + update Punjabi Translation + + po/pa.po | 433 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 185 insertions(+), 248 deletions(-) + +commit 159cf6c3a6208d7771710d0fae824404293d7afb +Author: Alexander Shopov +Date: 2012-03-25 + + Updated Bulgarian translation + + po/bg.po | 336 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 172 insertions(+), 164 deletions(-) + +commit 4fc2240f94dfbe305fb15fbf319690d02e6c6100 +Author: Alexander Shopov +Date: 2012-03-25 + + Updated Bulgarian translation + + po/bg.po | 334 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 171 insertions(+), 163 deletions(-) + +commit adeb73a17746aaf5f0ae947aee002a426c279de5 +Author: Peteris Krisjanis +Date: 2012-03-25 + + Updated Latvian translation. + + po/lv.po | 358 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 185 insertions(+), 173 deletions(-) + +commit ed23b35d098077b6b54f48813bd79d37d4bfe2f6 +Author: Chao-Hsiung Liao +Date: 2012-03-25 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 365 +++++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 365 +++++++++++++++++++++++++++++++----------------------------- + 2 files changed, 374 insertions(+), 356 deletions(-) + +commit 4469bb54f6366125f9837f3081ce2d6ca71e66dc +Author: Chao-Hsiung Liao +Date: 2012-03-25 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 365 +++++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 365 +++++++++++++++++++++++++++++++----------------------------- + 2 files changed, 374 insertions(+), 356 deletions(-) + +commit dd770067a769511a9ba7390ff0bbcb8e3c41a80b +Author: Ihar Hrachyshka +Date: 2012-03-24 + + Updated Belarusian translation. + + po/be.po | 369 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 189 insertions(+), 180 deletions(-) + +commit 0c7a0a084ebab56017ecf158391dda9ad648bf95 +Author: Milo Casagrande +Date: 2012-03-24 + + [l10n] Updated Italian translation + + po/it.po | 366 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 187 insertions(+), 179 deletions(-) + +commit ccd1b9fb22fd9691f7f31ed286fcbcf23dacf24c +Author: Milo Casagrande +Date: 2012-03-24 + + [l10n] Updated Italian translation + + po/it.po | 366 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 187 insertions(+), 179 deletions(-) + +commit 5814680a92b02385bc59abb770eda6a548522075 +Author: Daniel Nylander +Date: 2012-03-24 + + Updated Swedish translation + + po/sv.po | 342 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 176 insertions(+), 166 deletions(-) + +commit 2bd51e845872cb149452da9b3d03fbd2e33cfbcf +Author: Yaron Shahrabani +Date: 2012-03-24 + + Updated Hebrew translation. + + po/he.po | 370 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 190 insertions(+), 180 deletions(-) + +commit b58d275f35364c612f67165488c48ee0914eb652 +Author: Bruno Brouard +Date: 2012-03-24 + + Updated French translation + + po/fr.po | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 32b59adb4571e2bd4c2dd446bf7cfd9db6cb6328 +Author: Sasi Bhushan +Date: 2012-03-24 + + Updated Telugu translation + + po/te.po | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit a70fd62f6ce4b28b244b093f3b2b5088917388cf +Author: Sasi Bhushan +Date: 2012-03-24 + + Updated Telugu translation + + po/te.po | 2700 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1482 insertions(+), 1218 deletions(-) + +commit 638e8a70caa059e81cbe6d13d7103c03c5e607da +Author: Sasi Bhushan +Date: 2012-03-24 + + Updated Telugu translation + + po/te.po | 2700 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1482 insertions(+), 1218 deletions(-) + +commit 7cb0f189819c0b3e4c60f5cfa18b59e812e0b4ca +Author: Daniel Korostil +Date: 2012-03-24 + + Uploaded Ukranian + + po/uk.po | 384 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 198 insertions(+), 186 deletions(-) + +commit 568c32f69a52391b865f02ada0ead036a2aba727 +Author: Duarte Loreto +Date: 2012-03-24 + + Updated Portuguese translation + + po/pt.po | 2754 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1500 insertions(+), 1254 deletions(-) + +commit f167065c065bd8c6c1202914221c13b2d5f1abf6 +Author: Duarte Loreto +Date: 2012-03-24 + + Updated Portuguese translation + + po/pt.po | 2754 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1500 insertions(+), 1254 deletions(-) + +commit d390cd8da9a7a968db1949b6b94b81ad375492a7 +Author: Carles Ferrando +Date: 2012-03-24 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 576d77f58c34191b9efd061fdec995391fe5fffd +Author: Gil Forcada +Date: 2012-03-24 + + [l10n] Updated Catalan translation + + po/ca.po | 340 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 174 insertions(+), 166 deletions(-) + +commit c661889902db97cf55a64bbec60d2562d023e76c +Author: Mario Blättermann +Date: 2012-03-23 + + [l10n] Updated German translation + + po/de.po | 1053 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 530 insertions(+), 523 deletions(-) + +commit 809c381514889be37c1c5647c9b358d0b4f812af +Author: Mario Blättermann +Date: 2012-03-23 + + [l10n] Updated German translation + + po/de.po | 401 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 202 insertions(+), 199 deletions(-) + +commit 66bf2b924f6b560e339e7b78eb175a14035b3b47 +Author: Muhammet Kara +Date: 2012-03-23 + + [l10n]Updated Turkish translation + + po/tr.po | 349 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 180 insertions(+), 169 deletions(-) + +commit 0f38e814e54b2930579b9e7d1cf9082539328c5f +Author: Мирослав Николић +Date: 2012-03-22 + + Updated Serbian translation + + po/sr.po | 430 +++++++++++++++++++++++++-------------------------------- + po/sr@latin.po | 430 +++++++++++++++++++++++++-------------------------------- + 2 files changed, 370 insertions(+), 490 deletions(-) + +commit 333ceb36d6c5f06a4f9f250dcf85d1c9eb3e1e21 +Author: Мирослав Николић +Date: 2012-03-22 + + Updated Serbian translation + + po/sr.po | 430 +++++++++++++++++++++++++-------------------------------- + po/sr@latin.po | 430 +++++++++++++++++++++++++-------------------------------- + 2 files changed, 370 insertions(+), 490 deletions(-) + +commit ae5d9e5687b2385616536a3acafef2c7dd28742f +Author: Kenneth Nielsen +Date: 2012-03-22 + + Updated Danish translation + + po/da.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f91170b380ee39cc2a8ec6704ae11bcca31b0fd3 +Author: Kenneth Nielsen +Date: 2012-03-22 + + Updated Danish translation + + po/da.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 51695cd30d3342769d2333b95c8d15b52e289c62 +Author: Kenneth Nielsen +Date: 2012-03-22 + + Updated Danish translation + + po/da.po | 1043 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 528 insertions(+), 515 deletions(-) + +commit 4e9d6e79c5757b596fa28c9e39bca9d7d30f6f3c +Author: Kenneth Nielsen +Date: 2012-03-22 + + Updated Danish translation + + po/da.po | 1043 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 528 insertions(+), 515 deletions(-) + +commit 5a13cac9db6152243c8db83f46bde4ccefe9d75a +Author: Marek Černocký +Date: 2012-03-22 + + Updated Czech translation + + po/cs.po | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit a2b9f56fa20e652794a17833fce1e19a17706f5e +Author: Marek Černocký +Date: 2012-03-22 + + Updated Czech translation + + po/cs.po | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit e0a900cbfae621def3a7fed97545ffb52ce8109a +Author: Gabor Kelemen +Date: 2012-03-22 + + Updated Hungarian translation + + po/hu.po | 393 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 198 insertions(+), 195 deletions(-) + +commit 722e731a77f25131fc0bb64948c8dfe373c61df0 +Author: Gabor Kelemen +Date: 2012-03-22 + + Updated Hungarian translation + + po/hu.po | 393 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 198 insertions(+), 195 deletions(-) + +commit 431f3a6831c536f44596b1ea0fc0808739d3bcd2 +Author: Jonh Wendell +Date: 2012-03-21 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 1060 ++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 535 insertions(+), 525 deletions(-) + +commit 3b3d815e31e7342a1720ffb47b38e6a0fc2d6e85 +Author: Fran Diéguez +Date: 2012-03-21 + + Updated Galician translations + + Signed-off-by: Fran Diéguez + + po/gl.po | 351 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 183 insertions(+), 168 deletions(-) + +commit e199acd7ff50fe1b79d2fd1227c8fa52e037ad85 +Author: Fran Diéguez +Date: 2012-03-21 + + Updated Galician translations + + po/gl.po | 355 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 185 insertions(+), 170 deletions(-) + +commit 66c9ce4da9780050730c2d3e2cf003b90ee46440 +Author: Yuri Myasoedov +Date: 2012-03-21 + + Updated Russian translation + + po/ru.po | 350 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 184 insertions(+), 166 deletions(-) + +commit e839b2c102814c0cc193575442543662229630c2 +Author: Nilamdyuti Goswami +Date: 2012-03-21 + + Assamese translation updated + + po/as.po | 515 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 227 insertions(+), 288 deletions(-) + +commit 2fa880af2217891d4097e6d9bc583ef5b8e17e6c +Author: Nilamdyuti Goswami +Date: 2012-03-21 + + Assamese translation updated + + po/as.po | 515 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 227 insertions(+), 288 deletions(-) + +commit 4a860f9457062edc378d9a2c068c71a07d66b749 +Author: Matej Urbančič +Date: 2012-03-21 + + Updated Slovenian translation + + po/sl.po | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit a6a68aa7a12b55e352987497da0c9dbf87687221 +Author: Automatic Mirroring +Date: 2012-03-21 + + Update Simplified Chinese translation + + po/zh_CN.po | 1077 ++++++++++++++++++++++++++++------------------------------- + 1 file changed, 517 insertions(+), 560 deletions(-) + +commit 56ecf290d6a26aba0a6a7273388bf74e37fc29f0 +Author: Daniel Mustieles +Date: 2012-03-21 + + Updated Spanish translation + + po/es.po | 40 ++++++++++++++++------------------------ + 1 file changed, 16 insertions(+), 24 deletions(-) + +commit eda6e517db3fc39b2cbf36a3d9f210cc77f6cb20 +Author: Daniel Mustieles +Date: 2012-03-21 + + Updated Spanish translation + + po/es.po | 40 ++++++++++++++++------------------------ + 1 file changed, 16 insertions(+), 24 deletions(-) + +commit eecc41d899bdac14b866bd26a63f18480f95502c +Author: Automatic Mirroring +Date: 2012-03-20 + + Update Simplified Chinese translation. + + po/zh_CN.po | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 64a5ee7a1b540d71d0d38c6f8e2e8f934abb2a46 +Author: Carles Ferrando +Date: 2012-03-20 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +commit de6bbceb8ff76f6ca45a142685f35b2f48dd701d +Author: Gil Forcada +Date: 2012-03-20 + + [l10n] Minor update to Catalan translation + + po/ca.po | 347 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 171 insertions(+), 176 deletions(-) + +commit 5920a81bd1097609aaebccb2edceac932432d630 +Author: Carles Ferrando +Date: 2012-03-20 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit 3a72337e6a092bab78dd1e604e6f96e1ae0752ec +Author: Marek Černocký +Date: 2012-03-18 + + Updated Czech translation + + po/cs.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d7d9505b6f8e9bc89b00afa13b7e7206459c18c6 +Author: Milo Casagrande +Date: 2012-03-13 + + [l10n] Finally updated Italian translation + + po/it.po | 356 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 175 insertions(+), 181 deletions(-) + +commit 8b5d1cc0a0a0180e48e24b5a1fa9bd418cc81d84 +Author: Peteris Krisjanis +Date: 2012-03-13 + + Updated Latvian translation. + + po/lv.po | 354 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 177 insertions(+), 177 deletions(-) + +commit a8cdc21035acd5a82330bd332338ede1e8d2bc77 +Author: Nilamdyuti Goswami +Date: 2012-03-13 + + Assamese translation completed + + po/as.po | 4570 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 2367 insertions(+), 2203 deletions(-) + +commit aefacb114dec59032cc089ea4fa06d83148e85af +Author: Nguyễn Thái Ngọc Duy +Date: 2012-03-21 + + Updated Vietnamese translation + + po/vi.po | 314 ++++++++++++++++++++++++--------------------------------------- + 1 file changed, 119 insertions(+), 195 deletions(-) + +commit f5b1cbf68f585040f8a39368f4476653eb5577a6 +Author: Nguyễn Thái Ngọc Duy +Date: 2012-03-21 + + po/vi: updated from Damned Lies + + po/vi.po | 4070 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 2144 insertions(+), 1926 deletions(-) + +commit 970f97489a5d727444c7dadccd32831c9ea10aed +Author: YunQiang Su +Date: 2012-03-20 + + update Simplified Chinese (zh_CN) translation + + po/zh_CN.po | 2123 ++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1072 insertions(+), 1051 deletions(-) + +commit dab893e9e08f7a8762fe47c6f4619b55679e9cb2 +Author: Carles Ferrando +Date: 2012-03-20 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 2737 +++++++++++++++++++++++++++++------------------------ + 1 file changed, 1507 insertions(+), 1230 deletions(-) + +commit db43b874e29f5180ac6fbae60e18bef6c745d9a9 +Author: Gil Forcada +Date: 2012-03-20 + + [l10n] Updated Catalan translation + + po/ca.po | 2743 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1510 insertions(+), 1233 deletions(-) + +commit 4115371b2efac17e8092a15658b07bf3f5ebc9f8 +Author: Piotr Drąg +Date: 2012-03-19 + + Updated Polish translation + + po/pl.po | 333 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 171 insertions(+), 162 deletions(-) + +commit df7d53722aaede1cdbbe84d2f507f57f63a508c9 +Author: Stef Walter +Date: 2012-03-19 + + Fix ngettext usage + + ssh/seahorse-ssh-deleter.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dd051ab6254130e5e93806fadd42ba6f42d5bbbe +Author: Stef Walter +Date: 2012-03-19 + + Release version 3.3.92 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 1efccfa8f4c12e72e9326fd2506ae8cd4d1535bc +Author: Mario Blättermann +Date: 2012-03-18 + + [l10n] Updated German translation + + po/de.po | 1664 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 839 insertions(+), 825 deletions(-) + +commit 2f0f69154565b3361c180db9c8026b9b1d9460d9 +Author: Marek Černocký +Date: 2012-03-18 + + Updated Czech translation + + po/cs.po | 443 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 217 insertions(+), 226 deletions(-) + +commit cf1990969a8f215a8a0da8478afb9b9f1eda52d7 +Author: Bruno Brouard +Date: 2012-03-17 + + Updated French translation + + po/fr.po | 330 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 171 insertions(+), 159 deletions(-) + +commit 5185bbf9b7b4107df3db0f6381dd3661b7b39467 +Author: Bruno Brouard +Date: 2012-03-17 + + Updated French translation + + po/fr.po | 2549 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1335 insertions(+), 1214 deletions(-) + +commit 016ee947ea953ea06b2c52983d781ca1466b5c80 +Author: Stef Walter +Date: 2012-03-15 + + Revert ""IM account" string is not translatable" + + This reverts commit b02872f734b4601c80dbd34baf13949d503cb039. + + https://bugzilla.gnome.org/show_bug.cgi?id=671298 + + gkr/seahorse-gkr-item.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bc4479f9228ba766f5194b7007ecfb0685992967 +Author: Dr.T.Vasudevan +Date: 2012-03-15 + + updated Tamil translation + + po/ta.po | 391 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 200 insertions(+), 191 deletions(-) + +commit 3d8753c1e22f6c934c65ab1b7103f0d50c07e8c6 +Author: Dr.T.Vasudevan +Date: 2012-03-15 + + updated Tamil translation + + po/ta.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cca3069d7c137b30c20b122c5618e0da6f4c1cb2 +Author: Stef Walter +Date: 2012-03-14 + + Remove translator comment, since string is used for certain forms + + http://bugzilla.gnome.org/show_bug.cgi?id=671301 + + ssh/seahorse-ssh-deleter.c | 1 - + 1 file changed, 1 deletion(-) + +commit b02872f734b4601c80dbd34baf13949d503cb039 +Author: Stef Walter +Date: 2012-03-14 + + "IM account" string is not translatable + + * This string is not marked as translatalbe in empathy, + so don't mark it as translatable here. + + https://bugzilla.gnome.org/show_bug.cgi?id=671298 + + gkr/seahorse-gkr-item.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 48ad29bfa467ce671dc42ce379e80af9dbfd75b8 +Author: Stef Walter +Date: 2012-03-14 + + Fix problem where label isn't changed when edited + + https://bugzilla.gnome.org/show_bug.cgi?id=671846 + + gkr/seahorse-gkr-item.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 31cd557f296fe71fd9233d61bfc69ce6906ac52d +Author: Milo Casagrande +Date: 2012-03-13 + + [l10n] Finally updated Italian translation + + po/it.po | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +commit 8e396b216f63c88fed7d2cf241b9b4f85d501bce +Author: Milo Casagrande +Date: 2012-03-13 + + [l10n] Updated Italian translation + + po/it.po | 2086 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1191 insertions(+), 895 deletions(-) + +commit 30274bdfb4c79ba1d52b9ef680b57cffa0abacd0 +Author: Peteris Krisjanis +Date: 2012-03-13 + + Updated Latvian translation again. + + po/lv.po | 414 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 174 insertions(+), 240 deletions(-) + +commit 73d752e9b6ec627f6f3e4c0773a92d5556411959 +Author: Peteris Krisjanis +Date: 2012-03-13 + + Updated Latvian translation. + + po/lv.po | 2804 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1572 insertions(+), 1232 deletions(-) + +commit c754cf8dd30c75f1838da608630ec7456b1a8afd +Author: Gabor Kelemen +Date: 2012-03-12 + + Updated Hungarian translation + + po/hu.po | 1955 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1104 insertions(+), 851 deletions(-) + +commit 52d386fdee3acf5f3dd9b7277b193cef720234b4 +Author: Timo Jyrinki +Date: 2012-03-12 + + Finnish translation update from http://l10n.laxstrom.name/wiki/Gnome_3.4 translation sprint + + po/fi.po | 1799 ++++++++++++++++++-------------------------------------------- + 1 file changed, 513 insertions(+), 1286 deletions(-) + +commit d1f975445a1b4279eca75d51ab786a2f535d5bbd +Author: Daniel Mustieles +Date: 2012-03-11 + + Updated Spanish translation + + po/es.po | 1049 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 536 insertions(+), 513 deletions(-) + +commit 3d0da5e2faf7d312b514bd583cf8d4ff87814bf0 +Author: Piotr Drąg +Date: 2012-03-11 + + Updated Polish translation + + po/pl.po | 2503 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1311 insertions(+), 1192 deletions(-) + +commit c730a80196bca531944924b90976b4c8a0831a9a +Author: Changwoo Ryu +Date: 2012-03-11 + + Updated Korean translation + + po/ko.po | 2675 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1458 insertions(+), 1217 deletions(-) + +commit 12f79bb35a8e4ef27c764eddb606fb425d46ab33 +Author: Matej Urbančič +Date: 2012-03-09 + + Updated Slovenian translation + + po/sl.po | 342 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 178 insertions(+), 164 deletions(-) + +commit 086fd9b24de98c343b9eb7f9f619db007d6c3842 +Merge: 856ed10 b241e52 +Author: Stef Walter +Date: 2012-03-09 + + Merge branch 'gnome-3-4' + +commit b241e52dd165075ca9fdbbdc0d305324592dcab9 +Author: Stef Walter +Date: 2012-03-09 + + pgp: Fix warning for icon size -1 + + * Specify the dialog icon size for the photo control when + no photos on a pgp key + + pgp/seahorse-pgp-key-properties.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 856ed10b0ed7f8543287c4a51434817ae5a8a869 +Author: Stef Walter +Date: 2012-03-09 + + Fix translatable messages + + https://bugzilla.gnome.org/show_bug.cgi?id=671301 + + pgp/seahorse-add-uid.xml | 2 +- + pgp/seahorse-keyserver-results.c | 1 + + pgp/seahorse-pgp-generate.xml | 4 ++-- + pgp/seahorse-pgp-key-properties.c | 12 ++++++++---- + pgp/seahorse-pgp-private-key-properties.xml | 8 ++++---- + pgp/seahorse-pgp-public-key-properties.xml | 8 ++++---- + pgp/seahorse-sign.xml | 2 +- + src/seahorse-key-manager.c | 1 + + ssh/seahorse-ssh-deleter.c | 3 ++- + ssh/seahorse-ssh-key-properties.xml | 4 ++-- + 10 files changed, 26 insertions(+), 19 deletions(-) + +commit 3047635ff0e898277ae10cf348ee4e73a36658a8 +Author: Stef Walter +Date: 2012-03-09 + + pgp: Fix warning when cancelling the signing dialog + + pgp/seahorse-sign.xml | 1 - + 1 file changed, 1 deletion(-) + +commit aca5d826a827eff06de22c9742481d22f7cfe048 +Author: Stef Walter +Date: 2012-03-09 + + Fix issue when multiple keys with same label in signer list + + * Add keyid after the user id if there are multiple keys in the + combo are the same. + + https://bugzilla.gnome.org/show_bug.cgi?id=312064 + + pgp/seahorse-combo-keys.c | 135 ++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 113 insertions(+), 22 deletions(-) + +commit 4003c32cd217f18c355ace9a78a2e8cfc61869ea +Author: Stef Walter +Date: 2012-03-09 + + Release version 3.3.91 + + NEWS | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit bad4930e1f26957ac9024befd93b57c5ca105392 +Author: Stef Walter +Date: 2012-03-09 + + Fix regression of configure key action + + * Make sure it's displayed at the right times + * Fix selection of which key is uploaded + + https://bugzilla.gnome.org/show_bug.cgi?id=671525 + + libseahorse/seahorse-catalog.c | 4 ++-- + ssh/seahorse-ssh-actions.c | 24 ++++++++++++++++++------ + 2 files changed, 20 insertions(+), 8 deletions(-) + +commit b0c1c8233f3e849813891c4b17dfb63ff61e1a04 +Author: Daniel Korostil +Date: 2012-03-09 + + Uploaded Ukranian + + po/uk.po | 2699 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1477 insertions(+), 1222 deletions(-) + +commit 55dc4d9409bfa8884ac1502773e5664f12b53e78 +Author: Gabriel Speckhahn +Date: 2012-03-08 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 2721 ++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1499 insertions(+), 1222 deletions(-) + +commit e05a732bea6e27c15030dbb75e91391f64694c34 +Author: Matej Urbančič +Date: 2012-03-07 + + Updated Slovenian translation + + po/sl.po | 78 ++++++++++++++++++++++------------------------------------------ + 1 file changed, 27 insertions(+), 51 deletions(-) + +commit 1bde9a6c7e7a9ae7b6076c802e831855838aac0b +Author: Inaki Larranaga Murgoitio +Date: 2012-03-07 + + Updated Basque language + + po/eu.po | 1852 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1055 insertions(+), 797 deletions(-) + +commit 620d22f38dcdde7869d47e666ead6ef85e72794c +Author: Bruce Cowan +Date: 2012-03-07 + + Updated British English translation + + po/en_GB.po | 2716 ++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1472 insertions(+), 1244 deletions(-) + +commit 50aa0890dfb3a0e9135dcd73fd816ff9252348ae +Author: Chao-Hsiung Liao +Date: 2012-03-05 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 8 ++++++-- + po/zh_TW.po | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +commit 69f1de80dc51eac8e2f609c39bb8146c8debf203 +Author: Martin Srebotnjak +Date: 2012-03-04 + + Updated Slovenian translation + + po/sl.po | 757 +++------------------------------------------------------------ + 1 file changed, 28 insertions(+), 729 deletions(-) + +commit 9036f46b165cc31eb5d2f7678e1f9a4e14cbeae6 +Author: Kasia Bondarava +Date: 2012-03-04 + + Added Belarusian translation. + + po/LINGUAS | 1 + + po/be.po | 2578 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 2579 insertions(+) + +commit 0bc90a0014b27a646cdd08793de5526a8157e606 +Author: A S Alam +Date: 2012-03-01 + + update Punjabi Translation + + po/pa.po | 2823 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1570 insertions(+), 1253 deletions(-) + +commit 2c8a8c1a9987408d627f4fa5996bb4b3c3e636c3 +Author: Daniel Nylander +Date: 2012-03-01 + + Updated Swedish translation + + po/sv.po | 2122 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1059 insertions(+), 1063 deletions(-) + +commit 4097c4e145f8e8166ed33a8cad6fdf82ea5ccdc2 +Author: Dr.T.Vasudevan +Date: 2012-02-29 + + updated Tamil translation + + po/ta.po | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit c058cb70a5941a0a82ddb2b5269a7e7e2ec17e4c +Author: Mattias Põldaru +Date: 2012-02-27 + + [l10n] Updated Estonian translation + + po/et.po | 2179 ++++++++++++++++++++++++-------------------------------------- + 1 file changed, 827 insertions(+), 1352 deletions(-) + +commit 4cdfb6a095f9aa872fac250d4c2641c73a680115 +Author: Dr.T.Vasudevan +Date: 2012-02-27 + + updated Tamil translation + + po/ta.po | 958 ++++++++------------------------------------------------------- + 1 file changed, 114 insertions(+), 844 deletions(-) + +commit 77c000d575d3bc8478e32fdee3f36bae988b6306 +Author: Dr.T.Vasudevan +Date: 2012-02-26 + + updated Tamil translation + + po/ta.po | 1951 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 1139 insertions(+), 812 deletions(-) + +commit 8cbc21de3aa8f33b963c792d868190c1790bd534 +Author: Matej Urbančič +Date: 2012-02-24 + + Updated Slovenian translation + + po/sl.po | 1774 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 866 insertions(+), 908 deletions(-) + +commit 10e008b18349917899d7b19b6fa2912d0ece6086 +Author: Kjartan Maraas +Date: 2012-02-23 + + Updated Norwegian bokmål translation + + po/nb.po | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 4f2ff73cb350ee7b96b977e593b30d8c304ef91d +Author: Alexander Shopov +Date: 2012-02-22 + + Updated Bulgarian translation + + po/bg.po | 943 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 474 insertions(+), 469 deletions(-) + +commit 0e733b44dbd9a66c8646092cf908cbebc2a28fc4 +Author: Ask H. Larsen +Date: 2012-02-20 + + Updated Danish translation + + po/da.po | 1993 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1118 insertions(+), 875 deletions(-) + +commit 209b394642afffa5bbb93d81125633185da269c5 +Author: Мирослав Николић +Date: 2012-02-20 + + Updated Serbian translation + + po/sr.po | 2842 +++++++++++++++++++++++++++++++------------------------- + po/sr@latin.po | 2842 +++++++++++++++++++++++++++++++------------------------- + 2 files changed, 3178 insertions(+), 2506 deletions(-) + +commit 234b9c4e4ad9b56425ee2fa025d939c6bb118e2b +Author: Kjartan Maraas +Date: 2012-02-20 + + Updated Norwegian bokmål translation + + po/nb.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7e4b32e086b940135e7fe8ca3775ba9b79bf4bca +Author: Stef Walter +Date: 2012-02-18 + + Fix line on top of the sidebar + + https://bugzilla.gnome.org/show_bug.cgi?id=668782 + + libseahorse/seahorse.css | 8 ++++---- + src/seahorse-sidebar.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit f8c4691b86b28feb61af85ed6291ba6c1bff2bfc +Author: Gheyret Kenji +Date: 2012-02-18 + + updated Uyghur translation + + po/ug.po | 3704 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 1765 insertions(+), 1939 deletions(-) + +commit c107f1e557ab8a6d2a3b95be48046017c17be21d +Author: Petr Kovar +Date: 2012-02-17 + + Update Czech translation by Marketa Nykrynova + + po/cs.po | 2766 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1447 insertions(+), 1319 deletions(-) + +commit 8e2a62fbc506eee895718dc00a716ee85564d195 +Author: Muhammet Kara +Date: 2012-02-15 + + [l10n]Updated Turkish translation + + po/tr.po | 1012 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 501 insertions(+), 511 deletions(-) + +commit bf1791119ebcd1e54832013aaf20329c4a215a96 +Author: Yuri Myasoedov +Date: 2012-02-11 + + Updated Russian translation + + po/ru.po | 931 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 428 insertions(+), 503 deletions(-) + +commit ec8aa97e9a44b8b2b2cb0591c34586481f267622 +Author: Yuri Myasoedov +Date: 2012-02-09 + + Updated Russian translation + + po/ru.po | 137 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 58 insertions(+), 79 deletions(-) + +commit d674bae0be0cc8164ce8df547f39db34ff228881 +Author: Yuri Myasoedov +Date: 2012-02-08 + + Updated Russian translation + + po/ru.po | 1981 +++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 1189 insertions(+), 792 deletions(-) + +commit 94a0c321aca4de1ca5018a3abb95aed8e89a83a3 +Author: Fran Diéguez +Date: 2012-02-06 + + Updated Galician translations + + po/gl.po | 980 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 493 insertions(+), 487 deletions(-) + +commit b4d14bab12711c082915db986a09df620070c65f +Author: Stef Walter +Date: 2012-02-04 + + Release 3.3.5 + + NEWS | 10 ++++++++++ + configure.ac | 6 +++--- + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit 50b6d953344dcd5c827db45eef66c2cdd8f335b7 +Author: Gert Kulyk +Date: 2012-02-04 + + Fixes for building with -Wformat-security + + https://bugzilla.gnome.org/show_bug.cgi?id=668981 + + pkcs11/seahorse-pkcs11-deleter.c | 2 +- + pkcs11/seahorse-pkcs11-key-deleter.c | 2 +- + ssh/seahorse-ssh-deleter.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 320cc24035d6c8cbac3c4891d755a10476a31eac +Author: Daniel Mustieles +Date: 2012-01-29 + + Updated Spanish translation + + po/es.po | 82 +++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 42 insertions(+), 40 deletions(-) + +commit 5b19a1145b5fd08ade87b956b29c563e4f1b40f9 +Author: Chao-Hsiung Liao +Date: 2012-01-29 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 3059 +++++++++++++++++----------------------------------------- + po/zh_TW.po | 3061 +++++++++++++++++------------------------------------------ + 2 files changed, 1760 insertions(+), 4360 deletions(-) + +commit 6a5071bd52a7c72bd2280ad8bace7b6503747c7c +Author: Kjartan Maraas +Date: 2012-01-28 + + Updated Norwegian bokmål translation + + po/nb.po | 76 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 38 insertions(+), 38 deletions(-) + +commit 10a27c02287680f039d1c05bbbfbc41888061120 +Author: Yaron Shahrabani +Date: 2012-01-28 + + Updated Hebrew translation. + + po/he.po | 97 +++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 50 insertions(+), 47 deletions(-) + +commit 03c6da5ad81931703ed97560c6628645f9ba7a8f +Author: Stef Walter +Date: 2012-01-27 + + Clearer wording for various keyrings + + https://bugzilla.gnome.org/show_bug.cgi?id=668786 + + pgp/seahorse-gpgme-keyring.c | 2 +- + ssh/seahorse-ssh-source.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 45a3a5546b17093164b7fbb128228d0e06294fc3 +Author: Stef Walter +Date: 2012-01-27 + + Fix uninitialized memory usage + + libseahorse/seahorse-exportable.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit cf1c8bb401cf511324df8db149ea35151fd12d1f +Author: Stef Walter +Date: 2012-01-27 + + Fix up the icons for search/clear in the filter entry + + https://bugzilla.gnome.org/show_bug.cgi?id=668774 + + src/seahorse-key-manager.c | 40 +++++++++++++++++++++++----------------- + 1 file changed, 23 insertions(+), 17 deletions(-) + +commit fbec92a60515a8d1855cbe9fe30189c118581829 +Author: Stef Walter +Date: 2012-01-27 + + Add maximum and minimum sidebar pane position + + Related to: https://bugzilla.gnome.org/show_bug.cgi?id=668779 + + src/seahorse-key-manager.c | 3 +++ + src/seahorse-key-manager.xml | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 8d04b4730f3c43822e9bac10832cb1f9ae8734c4 +Author: Daniel Mustieles +Date: 2012-01-27 + + Updated Spanish translation + + po/es.po | 53 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 28 insertions(+), 25 deletions(-) + +commit 3aa4130bfd35b4f62c9afa2bbdc669e5bd138580 +Author: Stef Walter +Date: 2012-01-27 + + Change menu item 'Places' to 'By keyring' + + https://bugzilla.gnome.org/show_bug.cgi?id=668784 + + data/org.gnome.seahorse.manager.gschema.xml | 10 +++++----- + libseahorse/seahorse-catalog.c | 4 ++-- + src/seahorse-key-manager.c | 8 ++++---- + src/seahorse-key-manager.ui | 2 +- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 811f340d7703a355cb5cfdce0a0d072f69d5aa2f +Author: Timo Jyrinki +Date: 2012-01-24 + + Updated Finnish translation. + + po/fi.po | 1884 +++++++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 1301 insertions(+), 583 deletions(-) + +commit e9d02522ecdc965626cc051cd78f9ab12c072613 +Author: Alexander Shopov +Date: 2012-01-21 + + Updated Bulgarian translation + + po/bg.po | 1675 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 895 insertions(+), 780 deletions(-) + +commit 143a5ce7884a2df8ea0d74648068a1deaa8c65e6 +Author: Kjartan Maraas +Date: 2012-01-16 + + Updated Norwegian bokmål translation + + po/nb.po | 892 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 447 insertions(+), 445 deletions(-) + +commit 0ee5106325b067b23935852d24a9024e8637a040 +Author: Stef Walter +Date: 2012-01-16 + + Release version 3.3.4 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 91de375df0f9f938d943ee2a79379484d5bc2751 +Author: Stef Walter +Date: 2012-01-16 + + Fix duplicate typedef of SeahorsePlace + + https://bugzilla.gnome.org/show_bug.cgi?id=667982 + + libseahorse/seahorse-place.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7ffb2fccd91b3a75b18a4146f5aa462f0b780d1b +Author: Hideki Yamane +Date: 2012-01-15 + + Updated Japanese translation + + po/ja.po | 2588 ++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 1180 insertions(+), 1408 deletions(-) + +commit a6c3ef20f32d457451b3aa2cb567d23ad649e448 +Author: Muhammet Kara +Date: 2012-01-11 + + [l10n]Updated Turkish translation + + po/tr.po | 1213 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 585 insertions(+), 628 deletions(-) + +commit 7e848ec9caad7a512e2669e0b2d862b2dd79d0ea +Author: Jiro Matsuzawa +Date: 2012-01-04 + + Updated Japanese translation + + help/ja/ja.po | 273 +++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 193 insertions(+), 80 deletions(-) + +commit df634cab4ee4a2ae192ed0f78c79ebb415bed2b6 +Author: Stef Walter +Date: 2012-01-03 + + gkr: Remove limitation of max keyring item description + + https://bugzilla.gnome.org/show_bug.cgi?id=666923 + + gkr/seahorse-gkr-add-item.xml | 1 - + 1 file changed, 1 deletion(-) + +commit cde19645fb76d7a4759aa40fc0bec772579547f9 +Author: Jovan Naumovski +Date: 2012-01-02 + + Updated Macedonian translation. + + po/mk.po | 3971 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 2107 insertions(+), 1864 deletions(-) + +commit ad21286f1f7bba4d8f0818489015364efb43702f +Author: Yaron Shahrabani +Date: 2011-12-30 + + Updated Hebrew translation. + + po/he.po | 691 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 346 insertions(+), 345 deletions(-) + +commit 63505dcee13d087b01d05bf08f60e3f84bba3982 +Author: Stef Walter +Date: 2011-12-22 + + Fix build warnings for variable arguments + + gkr/seahorse-gkr-item-deleter.c | 2 +- + pgp/seahorse-gpgme-key-deleter.c | 2 +- + pgp/seahorse-gpgme-secret-deleter.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit c0b4b09298dec71e401ef0660c28e8f7d464435d +Author: Daniel Mustieles +Date: 2011-12-19 + + Updated Spanish translation + + po/es.po | 165 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 81 insertions(+), 84 deletions(-) + +commit 3d33ea88777a94dccfba93d420f023c21f50f576 +Author: Stef Walter +Date: 2011-12-19 + + Release version 3.3.3 + + * Fix some compile warnings + + NEWS | 12 ++++++++++++ + libseahorse/seahorse-prefs.c | 8 +++----- + libseahorse/seahorse-progress.c | 4 +--- + pgp/seahorse-gpgme-data.c | 4 ++-- + pgp/seahorse-gpgme-key.c | 4 ++-- + ssh/seahorse-ssh-operation.c | 2 +- + 6 files changed, 21 insertions(+), 13 deletions(-) + +commit c5c3f4c74839831ab2d77523e514ad0658576b00 +Author: Stef Walter +Date: 2011-12-19 + + Drop signal handlers in SeahorseCollection when disposing + + libseahorse/seahorse-collection.c | 23 ++++++++++------------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +commit 24a839f8ca20e4c246a1c6d4386e9ccca36dc99c +Author: Stef Walter +Date: 2011-12-19 + + Fix lack of refresh when a keyring is unlocked + + gkr/seahorse-gkr-keyring.c | 15 +++++++++------ + libseahorse/seahorse-collection.c | 31 +++++++++++++++++++------------ + 2 files changed, 28 insertions(+), 18 deletions(-) + +commit 9e565039503410ff9670fe01e4454c6a82df1757 +Author: Stef Walter +Date: 2011-12-19 + + gkr: Remove Mnemonic from gkr keyring properties + + https://bugzilla.gnome.org/show_bug.cgi?id=664098 + + gkr/seahorse-gkr-keyring.xml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e12907aa4940ba20343c7e0fc50645ce8ba3bded +Author: Fran Diéguez +Date: 2011-12-15 + + Updated Galician translations + + po/gl.po | 672 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 330 insertions(+), 342 deletions(-) + +commit 21f6dd977b8e40fa160f766966efce8b37117125 +Author: Kjartan Maraas +Date: 2011-12-14 + + Updated Norwegian bokmål translation + + po/nb.po | 616 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 277 insertions(+), 339 deletions(-) + +commit a364fcf31460d4dfd35c23198811a82ffa5b9056 +Author: Mario Blättermann +Date: 2011-12-14 + + [l10n] Updated German doc translation, fixed bug #666186 + + help/de/de.po | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit d2837739cda618d02b80729634721cceb59f4a04 +Author: Stef Walter +Date: 2011-12-14 + + pkcs11: Fix bugs in key generation + + * Display algorithm correctly in key generation list when + token selection changes + * Remove invalid assertion when generation completes + + pkcs11/seahorse-pkcs11-generate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0d1b117c051a271b1a3d1f651f500bba182bcf6c +Author: Stef Walter +Date: 2011-12-14 + + Update combined view when places are loaded + + * Previously if places weren't selected, then on startup, certain + objects wouldn't show up. + + src/seahorse-key-manager.c | 6 +++--- + src/seahorse-sidebar.c | 3 +++ + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit aff35e657c80dbe7ef45a032455682552efa3cc8 +Author: Stef Walter +Date: 2011-12-14 + + Fix problem loading correct size for the sidebar + + src/seahorse-key-manager.c | 65 +++++++++++++++++++++++----------------------- + 1 file changed, 32 insertions(+), 33 deletions(-) + +commit 6d1271f1bcd585c526b6281eff93243353d64e1b +Author: Stef Walter +Date: 2011-12-14 + + pgp: Fix selection of keys for the sync action + + libseahorse/seahorse-catalog.c | 1 + + pgp/seahorse-pgp-actions.c | 28 ++++++++++++++++++++-------- + 2 files changed, 21 insertions(+), 8 deletions(-) + +commit 581b91c05bdfd8ae6090c5f3bfe67756e6ab62c1 +Author: Stef Walter +Date: 2011-12-13 + + pgp: Move the import_async/import_finish virtual methods into pgp code + + * Only used from pgp code, specifically seahorse-transfer.c so + move these there instead of in SeahorsePlace + + libseahorse/seahorse-place.c | 39 ++++++--------------------------------- + libseahorse/seahorse-place.h | 24 ++---------------------- + pgp/seahorse-gpgme-keyring.c | 15 ++++++--------- + pgp/seahorse-gpgme-keyring.h | 10 ++++++++++ + pgp/seahorse-hkp-source.c | 15 ++++++++------- + pgp/seahorse-ldap-source.c | 14 +++++++------- + pgp/seahorse-server-source.c | 27 +++++++++++++++++++++++++++ + pgp/seahorse-server-source.h | 20 ++++++++++++++++++++ + pgp/seahorse-transfer.c | 26 +++++++++++++++++++++++--- + ssh/seahorse-ssh-source.c | 15 ++++++--------- + ssh/seahorse-ssh-source.h | 10 ++++++++++ + 11 files changed, 125 insertions(+), 90 deletions(-) + +commit 7907fc56b1e9a406b7baa0c7da4ed188757b029e +Author: Stef Walter +Date: 2011-12-13 + + Add way to lookup places, and refresh appropriate place after import + + * Since importing is done by libgcr, we look up the uri on the + importer. + * So then we need a way to find the place that matches a uri. + URIs aren't always unique, so virtual method on SeahorseBackend + * Make refresh methods on place be virtual, so we can call from + generic code. + + gkr/seahorse-gkr-backend.c | 33 ++++++++++++++++++-------- + gkr/seahorse-gkr-keyring.c | 37 +++++++++++++---------------- + gkr/seahorse-gkr-keyring.h | 11 --------- + libseahorse/seahorse-backend.c | 33 ++++++++++++++++++++++++++ + libseahorse/seahorse-backend.h | 13 ++++++++-- + libseahorse/seahorse-place.c | 27 ++++++++++++++++++--- + libseahorse/seahorse-place.h | 22 +++++++++++++++-- + pgp/seahorse-gpgme-keyring.c | 15 +++++++----- + pgp/seahorse-gpgme-keyring.h | 9 ------- + pgp/seahorse-pgp-backend.c | 22 ++++++++++++----- + pkcs11/seahorse-pkcs11-backend.c | 50 ++++++++++++++++++++++++++++----------- + pkcs11/seahorse-pkcs11-backend.h | 1 + + pkcs11/seahorse-pkcs11-generate.c | 2 +- + pkcs11/seahorse-token.c | 38 ++++++++++++++--------------- + pkcs11/seahorse-token.h | 9 ------- + src/seahorse-import-dialog.c | 16 +++++++++++++ + src/seahorse-sidebar.c | 3 +-- + ssh/seahorse-ssh-backend.c | 32 +++++++++++++++++++------ + ssh/seahorse-ssh-source.c | 15 +++++++----- + ssh/seahorse-ssh-source.h | 9 ------- + 20 files changed, 260 insertions(+), 137 deletions(-) + +commit 6984d33cffd20793eb7253829e9844d966441c14 +Author: Stef Walter +Date: 2011-12-13 + + Fix filter on file for importer + + * And remove some unused code, clean up + + libseahorse/seahorse-util.c | 218 -------------------------------------------- + libseahorse/seahorse-util.h | 20 ---- + pgp/seahorse-gpgme-photos.c | 106 ++++++++++----------- + src/seahorse-key-manager.c | 65 +++++++++++-- + 4 files changed, 113 insertions(+), 296 deletions(-) + +commit c1631da7c6d4b463c0f6dd10253ec4db092915a9 +Author: Stef Walter +Date: 2011-12-13 + + Fix ordering of top level menu items + + libseahorse/seahorse-catalog.c | 4 ++-- + pgp/seahorse-keyserver-results.c | 22 +++++----------------- + pgp/seahorse-keyserver-results.ui | 8 +++++--- + ssh/seahorse-ssh-actions.c | 8 +++++--- + 4 files changed, 17 insertions(+), 25 deletions(-) + +commit faf4b71610744156ee7efc5e3c368d493ce64d86 +Author: Stef Walter +Date: 2011-12-13 + + Fix importing from SeahorseKeyserverResults window + + pgp/seahorse-keyserver-results.c | 4 +++- + pgp/seahorse-pgp-backend.c | 4 ++-- + pgp/seahorse-transfer.c | 20 ++++++++++++++++---- + pgp/seahorse-transfer.h | 2 +- + 4 files changed, 22 insertions(+), 8 deletions(-) + +commit b03e169025a559780188583c7ccda047618aff5e +Author: Stef Walter +Date: 2011-12-13 + + Remove unneeded 'selected' property from SeahorseKeyserverResults + + pgp/seahorse-keyserver-results.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit feb389bffd7e4f6f94512ff6fe81dbd6892b6275 +Author: Daniel Mustieles +Date: 2011-12-13 + + Updated Spanish translation + + po/es.po | 570 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 279 insertions(+), 291 deletions(-) + +commit fe820633522e22d7fccc0548f13df503d441e2ed +Author: Stef Walter +Date: 2011-12-13 + + Update translatable files + + po/POTFILES.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e186f1245eaf000bb7e92385b126cd17c0e87a05 +Author: Stef Walter +Date: 2011-12-13 + + Rework how actions work for places + + * Create menu ourselves, and use SeahorseDeletable, SeahorseLockable + and other interfaces to create popup menu. + * Remove the clone_for_objects strangeness in SeahorseActions + * In the future we may move away from SeahorseActions all together + + gkr/seahorse-gkr-actions.c | 340 ++++----------------------------------- + gkr/seahorse-gkr-actions.h | 6 +- + gkr/seahorse-gkr-item.c | 10 +- + gkr/seahorse-gkr-keyring.c | 7 +- + gkr/seahorse-gkr-keyring.h | 5 +- + libseahorse/seahorse-action.c | 42 +++-- + libseahorse/seahorse-action.h | 8 +- + libseahorse/seahorse-actions.c | 96 +++++++++-- + libseahorse/seahorse-actions.h | 13 +- + libseahorse/seahorse-catalog.c | 30 ++-- + libseahorse/seahorse-catalog.h | 4 +- + pgp/seahorse-keyserver-results.c | 9 +- + pgp/seahorse-pgp-actions.c | 68 +------- + pkcs11/Makefile.am | 1 - + pkcs11/seahorse-certificate.c | 7 +- + pkcs11/seahorse-pkcs11-actions.c | 248 ---------------------------- + pkcs11/seahorse-pkcs11-actions.h | 31 ---- + pkcs11/seahorse-private-key.c | 6 +- + pkcs11/seahorse-token.c | 6 +- + src/seahorse-generate-select.c | 4 +- + src/seahorse-key-manager.c | 11 +- + src/seahorse-sidebar.c | 285 +++++++++++++++++++++++++++----- + src/seahorse-sidebar.h | 4 + + ssh/seahorse-ssh-actions.c | 23 +-- + 24 files changed, 448 insertions(+), 816 deletions(-) + +commit 612e23b4b4af0bc57694f714d262d45472486f64 +Author: Stef Walter +Date: 2011-12-12 + + Add SeahorseLockable for locking/unlocking places + + * Generic interface doing what we were already doing in various places + in the code. + * Simplifies sidebar lock/unlock icon code. + * In the future will be used to build the context menu on the sidebar + + gkr/seahorse-gkr-keyring.c | 106 ++++++++++- + libseahorse/Makefile.am | 2 + + libseahorse/seahorse-interaction.c | 194 ++++++++++++++++++++ + libseahorse/seahorse-interaction.h | 58 ++++++ + libseahorse/seahorse-lockable.c | 143 +++++++++++++++ + libseahorse/seahorse-lockable.h | 89 ++++++++++ + pkcs11/Makefile.am | 1 - + pkcs11/seahorse-interaction.c | 194 -------------------- + pkcs11/seahorse-interaction.h | 58 ------ + pkcs11/seahorse-pkcs11-actions.c | 13 +- + pkcs11/seahorse-token.c | 351 ++++++++++++++++++------------------- + pkcs11/seahorse-token.h | 20 --- + src/seahorse-sidebar.c | 171 ++++++++++-------- + 13 files changed, 867 insertions(+), 533 deletions(-) + +commit 5a81d2302488fb8553638b6284dcb621b3d30c83 +Author: Stef Walter +Date: 2011-12-12 + + pgp: Fix key server and syncing bugs + + pgp/seahorse-hkp-source.c | 20 ++++---- + pgp/seahorse-keyserver-sync.c | 17 +++++-- + pgp/seahorse-ldap-source.c | 8 ++-- + pgp/seahorse-pgp-backend.c | 38 ++++++++------- + pgp/seahorse-pgp-backend.h | 4 +- + pgp/seahorse-pgp-key-properties.c | 64 +++++++++++++------------ + pgp/seahorse-server-source.c | 2 +- + pgp/seahorse-server-source.h | 4 +- + pgp/seahorse-transfer.c | 81 +++++++++++++++++++++++++------- + pgp/seahorse-transfer.h | 9 +++- + pgp/seahorse-unknown-source.c | 98 ++++++++++++++++++++++++++++++++++++--- + 11 files changed, 251 insertions(+), 94 deletions(-) + +commit 7a5b350e6b8d5198ab30226b41340edb24552f7b +Author: Stef Walter +Date: 2011-12-12 + + Add SeahorseViewable interface, and use for showing properties + + gkr/seahorse-gkr-actions.c | 26 +--------------- + gkr/seahorse-gkr-item.c | 19 ++++++++++++ + gkr/seahorse-gkr-keyring.c | 18 +++++++++++ + libseahorse/Makefile.am | 1 + + libseahorse/seahorse-catalog.c | 42 ++++++++------------------ + libseahorse/seahorse-viewable.c | 59 +++++++++++++++++++++++++++++++++++++ + libseahorse/seahorse-viewable.h | 55 ++++++++++++++++++++++++++++++++++ + pgp/seahorse-pgp-actions.c | 10 ------- + pgp/seahorse-pgp-key.c | 39 ++++++++++++++++-------- + pkcs11/seahorse-certificate.c | 19 ++++++++++++ + pkcs11/seahorse-pkcs11-actions.c | 37 ++--------------------- + pkcs11/seahorse-pkcs11-properties.c | 2 ++ + pkcs11/seahorse-pkcs11-properties.h | 1 - + pkcs11/seahorse-private-key.c | 19 ++++++++++++ + ssh/seahorse-ssh-actions.c | 20 ------------- + ssh/seahorse-ssh-key.c | 18 +++++++++++ + 16 files changed, 254 insertions(+), 131 deletions(-) + +commit 34636664c23e8d7d17d244b7364e287e43df23a6 +Author: Stef Walter +Date: 2011-12-12 + + Rename SeahorseViewer to SeahorseCatalog + + * Since we want to use the name 'viewer' for viewing specific items. + * The SeahorseCatalog represents a list of items in the main window + and in the key server listing + + gkr/seahorse-gkr-backend.c | 1 - + libseahorse/Makefile.am | 2 +- + libseahorse/seahorse-actions.h | 2 +- + libseahorse/seahorse-catalog.c | 645 +++++++++++++++++++++++++++++++++++++++ + libseahorse/seahorse-catalog.h | 82 +++++ + libseahorse/seahorse-viewer.c | 645 --------------------------------------- + libseahorse/seahorse-viewer.h | 82 ----- + pgp/seahorse-keyserver-results.c | 52 ++-- + pgp/seahorse-keyserver-results.h | 6 +- + pkcs11/seahorse-interaction.h | 1 - + src/seahorse-key-manager.c | 58 ++-- + src/seahorse-key-manager.h | 6 +- + 12 files changed, 790 insertions(+), 792 deletions(-) + +commit 7e92c04c58e187cba7fa7d94e207cb8ff7751f37 +Author: Mario Blättermann +Date: 2011-12-11 + + [l10n] Updated German translation + + po/de.po | 526 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 266 insertions(+), 260 deletions(-) + +commit 277b304b4c0250dfe3e89a009a55c69f26d37669 +Author: Yaron Shahrabani +Date: 2011-12-10 + + Updated Hebrew translation. + + po/he.po | 928 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 538 insertions(+), 390 deletions(-) + +commit bc48a084e8d99b6ebf2a690b2d9c94972724fe53 +Author: Daniel Mustieles +Date: 2011-12-09 + + Updated Spanish translation + + po/es.po | 103 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 48 insertions(+), 55 deletions(-) + +commit 66c4f8b37a34ef6fe748dfef879ef817ba783037 +Author: Lucian Adrian Grijincu +Date: 2011-12-09 + + Remove extra accellerator in 'Show any' option + + src/seahorse-key-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 914689a787a1181659504caf80a3b1035c747f73 +Author: Lucian Adrian Grijincu +Date: 2011-12-09 + + Fixing typo in SSH Generate dialog + + ssh/seahorse-ssh-generate.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0b2b7da7b1b767ef12d63785f8dbade459734716 +Author: Stef Walter +Date: 2011-12-09 + + pkcs11: Show errors for unlock/lock failures + + * And ignore some relevant errors + + pkcs11/seahorse-pkcs11-actions.c | 32 +++++++++++++++++++++++--------- + 1 file changed, 23 insertions(+), 9 deletions(-) + +commit dbc37fe2e2869127cb973c365417928fbfd3569d +Author: Stef Walter +Date: 2011-12-09 + + pkcs11: Set GcrKeyRenderer object property to private key + + * Allows the renderer to retrieve key related attributes from + the pkcs11 store. + + pkcs11/seahorse-pkcs11-properties.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6f7af07da7dcaeee08c52baf13905d86437b6476 +Author: Stef Walter +Date: 2011-12-09 + + pkcs11: Add 'exportable' property to SeahorsePrivateKey + + * And also add the SeahorseExportable interface, but no private + key exporters yet. No time to implement at this point. + + pkcs11/seahorse-private-key.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 47223c01005fe141a7023a4abf7be9abdd68c694 +Author: Matej Urbančič +Date: 2011-12-08 + + Updated Slovenian translation + + po/sl.po | 978 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 583 insertions(+), 395 deletions(-) + +commit b28f0cda879e22dc453709ca0276a804df7bee98 +Author: Stef Walter +Date: 2011-12-08 + + Bump version number + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d0458f05153837bf1f9ef298c8d13fdbeaa6b204 +Author: Stef Walter +Date: 2011-12-08 + + Update for changes in libgck + + * In particular the GckBuilder change and GckObjectCache + * Depend on gck version 3.3.3 + + configure.ac | 4 +-- + pkcs11/seahorse-certificate.c | 30 ++++++++++++++++++----- + pkcs11/seahorse-pkcs11-generate.c | 51 +++++++++++++++++++++------------------ + pkcs11/seahorse-private-key.c | 28 +++++++++++++++++---- + pkcs11/seahorse-token.c | 34 ++++++++++++-------------- + 5 files changed, 91 insertions(+), 56 deletions(-) + +commit 39e8f2dbaf67c616cf05411233cf85afa97cb7e8 +Author: Stef Walter +Date: 2011-12-08 + + Fixes for glib 2.31.x deprecations + + * Remove use of g_atexit() + * Fix for warning for missing varargs sentinel + + libseahorse/seahorse-passphrase.c | 2 +- + libseahorse/seahorse-util.c | 51 --------------------------------------- + libseahorse/seahorse-util.h | 5 ---- + pgp/seahorse-discovery.c | 17 ++++++++++++- + 4 files changed, 17 insertions(+), 58 deletions(-) + +commit b4f78823341a08302e9bd8366674cde9ecdd8024 +Author: Fran Diéguez +Date: 2011-12-03 + + Updated Galician translations + + po/gl.po | 891 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 501 insertions(+), 390 deletions(-) + +commit 1dab455b1eef613284483060c93b9893e2f85d23 +Author: Fran Diéguez +Date: 2011-12-03 + + Updated Galician translations + + po/gl.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c13e48e944b00e7f16004c7ca818c629c638d90f +Author: Daniel Mustieles +Date: 2011-12-02 + + Updated Spanish translation + + po/es.po | 833 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 432 insertions(+), 401 deletions(-) + +commit 0c9f8ae1357bc18c4e2efc52bd49405b048bed4e +Author: Kjartan Maraas +Date: 2011-12-01 + + Updated Norwegian bokmål translation + + po/nb.po | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 79 insertions(+), 18 deletions(-) + +commit 1cde9aeb903458e7e81a3bf24485d6329be79c30 +Author: Piotr Drąg +Date: 2011-12-01 + + Updated POTFILES.in + + po/POTFILES.in | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 7e88c2ac0fb40a4f6908443f16f789bc89dc7ad1 +Author: Kjartan Maraas +Date: 2011-12-01 + + Updated Norwegian bokmål translation + + po/nb.po | 737 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 364 insertions(+), 373 deletions(-) + +commit 3b34b0009119313d903566ecd01a21a62500e345 +Author: Stef Walter +Date: 2011-12-01 + + Refactor deleting, add SeahorseDeleter and SeahorseDeletable types + + * SeahorseDeletable is an interface implemented by objects that can + be deletable, with a "deletable" boolean property, and a create_deleter() + method. + * SeahorseDeleter is an object that can delete objects, combining them + if possible. + + gkr/Makefile.am | 2 + + gkr/seahorse-gkr-actions.c | 110 ++------------ + gkr/seahorse-gkr-item-deleter.c | 271 +++++++++++++++++++++++++++++++++++ + gkr/seahorse-gkr-item-deleter.h | 42 ++++++ + gkr/seahorse-gkr-item.c | 25 +++- + gkr/seahorse-gkr-keyring-deleter.c | 228 +++++++++++++++++++++++++++++ + gkr/seahorse-gkr-keyring-deleter.h | 42 ++++++ + gkr/seahorse-gkr-keyring.c | 22 ++- + gkr/seahorse-gkr-operation.c | 148 ------------------- + gkr/seahorse-gkr-operation.h | 8 -- + libseahorse/Makefile.am | 2 + + libseahorse/seahorse-deletable.c | 185 ++++++++++++++++++++++++ + libseahorse/seahorse-deletable.h | 53 +++++++ + libseahorse/seahorse-deleter.c | 135 +++++++++++++++++ + libseahorse/seahorse-deleter.h | 92 ++++++++++++ + libseahorse/seahorse-exportable.c | 22 ++- + libseahorse/seahorse-exportable.h | 2 + + libseahorse/seahorse-object.c | 18 ++- + libseahorse/seahorse-viewer.c | 32 ++--- + pgp/Makefile.am | 2 + + pgp/seahorse-gpgme-key-deleter.c | 181 +++++++++++++++++++++++ + pgp/seahorse-gpgme-key-deleter.h | 42 ++++++ + pgp/seahorse-gpgme-key.c | 22 +++ + pgp/seahorse-gpgme-secret-deleter.c | 177 +++++++++++++++++++++++ + pgp/seahorse-gpgme-secret-deleter.h | 42 ++++++ + pgp/seahorse-pgp-actions.c | 117 --------------- + pkcs11/Makefile.am | 3 +- + pkcs11/seahorse-certificate.c | 51 ++++++- + pkcs11/seahorse-pkcs11-actions.c | 63 -------- + pkcs11/seahorse-pkcs11-deleter.c | 235 ++++++++++++++++++++++++++++++ + pkcs11/seahorse-pkcs11-deleter.h | 55 +++++++ + pkcs11/seahorse-pkcs11-key-deleter.c | 150 +++++++++++++++++++ + pkcs11/seahorse-pkcs11-key-deleter.h | 42 ++++++ + pkcs11/seahorse-pkcs11-operations.c | 146 ------------------- + pkcs11/seahorse-pkcs11-operations.h | 36 ----- + pkcs11/seahorse-pkcs11-properties.c | 67 +++------ + pkcs11/seahorse-private-key.c | 29 +++- + pkcs11/seahorse-token.c | 25 +++- + pkcs11/seahorse-token.h | 3 + + ssh/Makefile.am | 1 + + ssh/seahorse-ssh-actions.c | 44 ------ + ssh/seahorse-ssh-deleter.c | 205 ++++++++++++++++++++++++++ + ssh/seahorse-ssh-deleter.h | 42 ++++++ + ssh/seahorse-ssh-key.c | 20 ++- + 44 files changed, 2496 insertions(+), 743 deletions(-) + +commit 100433b2c40b26dcc4c023fd8bbf65ec0fcc83cb +Author: Stef Walter +Date: 2011-11-30 + + Only enable export and copy actions if exportable objects selected + + libseahorse/seahorse-viewer.c | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +commit 064f51fff735b404d8c12e3b39863cf2483be0e5 +Author: Stef Walter +Date: 2011-11-30 + + pkcs11: Ignore NSS Generic Crypto Services token + + * No need to show this in seahorse + + pkcs11/seahorse-pkcs11-backend.c | 1 + + 1 file changed, 1 insertion(+) + +commit 36c02a04d3800624f9aa3e87efaadc817463908b +Author: Stef Walter +Date: 2011-11-30 + + Show import errors in an info bar in the import dialog + + src/seahorse-import-dialog.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +commit feb4b00d59f2e0936adc1267c06c04f5acb5f7ee +Author: Mario Blättermann +Date: 2011-11-29 + + [l10n] Updated German translation + + po/de.po | 732 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 433 insertions(+), 299 deletions(-) + +commit 721e4d33294d7e77df5014348b8989c5cfd40959 +Author: Stef Walter +Date: 2011-11-29 + + Fix issues filtering on personal, trusted, and any items + + pkcs11/seahorse-certificate.c | 51 ++++++++++++++++++++++++++++---- + src/seahorse-key-manager.c | 68 +++++++++++++++++++++++++------------------ + 2 files changed, 86 insertions(+), 33 deletions(-) + +commit 392abc38a3ebafb8d7f2c86f836c1ff3171635e7 +Author: Stef Walter +Date: 2011-11-29 + + pkcs11: Don't copy certificate value unnecessarily. + + pkcs11/seahorse-certificate.c | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +commit 27614a2257ac0c663eb1372631c1870852eff05f +Author: Stef Walter +Date: 2011-11-28 + + Reimplement export functionality + + * SeahorseExportable interface on an object indicates export capability. + * SeahorseExporter represents a format for a given set of objects. + * Multiple objects can be combined using seahorse_exportable_add_object() + if the format supports it. + * So far only implemented one certificate exporter. + + libseahorse/Makefile.am | 2 + + libseahorse/seahorse-exportable.c | 427 +++++++++++++++++++++++++++ + libseahorse/seahorse-exportable.h | 72 +++++ + libseahorse/seahorse-exporter.c | 273 ++++++++++++++++++ + libseahorse/seahorse-exporter.h | 101 +++++++ + libseahorse/seahorse-key-manager-store.c | 88 ++---- + libseahorse/seahorse-place.c | 168 ----------- + libseahorse/seahorse-place.h | 37 --- + libseahorse/seahorse-util.c | 285 +++--------------- + libseahorse/seahorse-util.h | 19 +- + libseahorse/seahorse-viewer.c | 165 +++-------- + pgp/Makefile.am | 1 + + pgp/seahorse-gpg-op.c | 53 ++-- + pgp/seahorse-gpg-op.h | 2 +- + pgp/seahorse-gpgme-exporter.c | 445 +++++++++++++++++++++++++++++ + pgp/seahorse-gpgme-exporter.h | 47 +++ + pgp/seahorse-gpgme-key.c | 48 +++- + pgp/seahorse-gpgme-keyring.c | 152 +--------- + pgp/seahorse-hkp-source.c | 48 ++-- + pgp/seahorse-ldap-source.c | 56 ++-- + pgp/seahorse-pgp-key-properties.c | 82 ++---- + pgp/seahorse-server-source.c | 10 +- + pgp/seahorse-server-source.h | 8 +- + pgp/seahorse-transfer.c | 67 +++-- + pkcs11/Makefile.am | 1 + + pkcs11/seahorse-certificate-der-exporter.c | 245 ++++++++++++++++ + pkcs11/seahorse-certificate-der-exporter.h | 41 +++ + pkcs11/seahorse-certificate.c | 27 +- + pkcs11/seahorse-pkcs11-properties.c | 22 +- + po/POTFILES.in | 4 + + src/seahorse-key-manager.ui | 2 + + ssh/Makefile.am | 1 + + ssh/seahorse-ssh-exporter.c | 321 +++++++++++++++++++++ + ssh/seahorse-ssh-exporter.h | 42 +++ + ssh/seahorse-ssh-key-properties.c | 77 ++--- + ssh/seahorse-ssh-key.c | 37 ++- + ssh/seahorse-ssh-key.h | 2 + + ssh/seahorse-ssh-operation.c | 114 +++----- + ssh/seahorse-ssh-source.c | 82 ------ + 39 files changed, 2464 insertions(+), 1210 deletions(-) + +commit 1ce0826be33c1c924bf0b3436811640f690343e0 +Author: Lucian Adrian Grijincu +Date: 2011-11-27 + + Updated Romanian translation + + po/ro.po | 3152 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1658 insertions(+), 1494 deletions(-) + +commit 50dc814f6d4f037495088e470535064ca3d7fb29 +Author: Jorge González +Date: 2011-11-26 + + Updated Spanish translation + + po/es.po | 54 ++++++++++++++++++++---------------------------------- + 1 file changed, 20 insertions(+), 34 deletions(-) + +commit 6e69115d5caf97283111d60edcf2fe213246814a +Author: Muhammet Kara +Date: 2011-11-26 + + [l10n]Updated Turkish translation + + po/tr.po | 3207 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1723 insertions(+), 1484 deletions(-) + +commit bd28080eb3997596dd5331dad55d4ca588ed5999 +Author: Aron Xu +Date: 2011-11-26 + + Update Simplified Chinese translation. + + po/zh_CN.po | 1818 +++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 1082 insertions(+), 736 deletions(-) + +commit bb3ccc874940075b0ba9ab48113f7a61bf1c2abf +Author: Daniel Mustieles +Date: 2011-11-25 + + Updated Spanish translation + + po/es.po | 171 +++++++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 127 insertions(+), 44 deletions(-) + +commit e8f8521c529cf700bffb4a0fa454b6d756d2e9ad +Author: Daniel Nylander +Date: 2011-11-25 + + Updated Swedish translation + + po/sv.po | 2236 +++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 1493 insertions(+), 743 deletions(-) + +commit 9a7ff94414fcbb6ac08071a537280b1f254b626d +Author: Piotr Drąg +Date: 2011-11-24 + + Updated POTFILES.in + + po/POTFILES.in | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6daebac736c3fe3a8173443eca26f17bff0d427c +Author: Stef Walter +Date: 2011-11-22 + + pkcs11: Support for creating certificate requests + + * Add an action button in the key properties window + + pkcs11/Makefile.am | 4 +- + pkcs11/seahorse-pkcs11-properties.c | 92 ++++++++- + pkcs11/seahorse-pkcs11-request.c | 379 ++++++++++++++++++++++++++++++++++++ + pkcs11/seahorse-pkcs11-request.h | 34 ++++ + pkcs11/seahorse-pkcs11-request.xml | 114 +++++++++++ + 5 files changed, 615 insertions(+), 8 deletions(-) + +commit 6df2460eb5cef806c1df147b93a7beb3700f4459 +Author: Stef Walter +Date: 2011-11-14 + + pkcs11: Support for PKCS#11 key generation + + * Used to generate keys on smart cards and the like + * Also code for detecting which mechanisms a slot supports. + + libseahorse/seahorse-key-manager-store.c | 1 + + pkcs11/Makefile.am | 4 +- + pkcs11/seahorse-pkcs11-backend.c | 51 ++- + pkcs11/seahorse-pkcs11-backend.h | 3 + + pkcs11/seahorse-pkcs11-generate.c | 517 +++++++++++++++++++++++++++++++ + pkcs11/seahorse-pkcs11-generate.h | 35 +++ + pkcs11/seahorse-pkcs11-generate.xml | 246 +++++++++++++++ + pkcs11/seahorse-token.c | 42 ++- + pkcs11/seahorse-token.h | 5 + + 9 files changed, 897 insertions(+), 7 deletions(-) + +commit 37a3e8cb56cf5027bbdb07ca3cbd381ac713e087 +Author: Daniel Mustieles +Date: 2011-11-22 + + Updated Spanish translation + + po/es.po | 269 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 156 insertions(+), 113 deletions(-) + +commit 659d593ce64252725e76d7df7bcb10db3d3894a0 +Author: Stef Walter +Date: 2011-11-22 + + gkr: Fix keyring description string + + https://bugzilla.gnome.org/show_bug.cgi?id=664407 + + gkr/seahorse-gkr-keyring.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit df4015ac031b01b8070a37d460f4df916b85db51 +Author: Stef Walter +Date: 2011-11-22 + + pkcs11: Fix null dereference in certificate destructor + + pkcs11/seahorse-certificate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1aa3c8c6b9dc704fc8f6f6029f876b83e836bb80 +Author: Stef Walter +Date: 2011-11-22 + + pkcs11: Implement toolbar and deletion from pkcs11 properties window + + gkr/seahorse-gkr-actions.c | 9 +- + libseahorse/Makefile.am | 1 + + libseahorse/seahorse-delete-dialog.c | 279 +++++++++++++++++++++++++++++++++++ + libseahorse/seahorse-delete-dialog.h | 63 ++++++++ + libseahorse/seahorse-util.c | 45 ------ + libseahorse/seahorse-util.h | 3 - + pgp/seahorse-pgp-actions.c | 7 +- + pgp/seahorse-pgp-key-properties.c | 5 +- + pkcs11/seahorse-pkcs11-actions.c | 7 +- + pkcs11/seahorse-pkcs11-properties.c | 166 ++++++++++++++++++++- + ssh/seahorse-ssh-actions.c | 7 +- + 11 files changed, 527 insertions(+), 65 deletions(-) + +commit c804fee52dac41b33dbf13769c2c5478cacbe59a +Author: Stef Walter +Date: 2011-11-21 + + Release version 3.3.2 + + NEWS | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit eaf2212371b732b6824bdd2f5d514f2ac8f5420a +Author: Paul Seyfert +Date: 2011-11-18 + + [l10n] Updated German translation + + po/de.po | 240 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 128 insertions(+), 112 deletions(-) + +commit 87f37b935be4c160db0cf1a3370ad9e98ea08e92 +Author: Daniel Mustieles +Date: 2011-11-18 + + Updated Spanish translation + + po/es.po | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 751dc434459f5990aadb409dd2b950e4c291e923 +Author: Jorge González +Date: 2011-11-17 + + Updated Spanish translation + + po/es.po | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) + +commit 3c2bad03d8970353f8493a7a327f6c54948694a3 +Author: Stef Walter +Date: 2011-11-14 + + Release version 3.2.2 + + NEWS | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 6072b306123008647a640ede6883e63ed5a675e0 +Author: Stef Walter +Date: 2011-11-14 + + pgp: Don't load signatures unless showing key properties + + https://bugzilla.gnome.org/show_bug.cgi?id=662088 + + pgp/seahorse-gpgme-key.c | 8 +++++++- + pgp/seahorse-gpgme-key.h | 2 ++ + pgp/seahorse-pgp-key-properties.c | 4 +++- + 3 files changed, 12 insertions(+), 2 deletions(-) + +commit 1a2147b2003b1f52dc9ab860d6cb70bb56a1f629 +Author: Stef Walter +Date: 2011-11-14 + + pgp: Fix issues adding key servers + + * Make all key server types show up + * Fix validation code for hkp server type + * These were regressions because of port to GTK+3 + + libseahorse/seahorse-prefs.c | 11 +++++------ + pgp/seahorse-hkp-source.c | 2 +- + 2 files changed, 6 insertions(+), 7 deletions(-) + +commit 9deebce839f32ed5e2cc7ae18c835feb52bc5a2f +Author: Vincent Untz +Date: 2011-10-13 + + Fix crash when adding a non-LDAP keyserver + + https://bugzilla.gnome.org/show_bug.cgi?id=661683 + + libseahorse/seahorse-prefs.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 049fed8df401bd295cad0205ab66cb368c49d435 +Author: Daniel Mustieles +Date: 2011-11-14 + + Updated Spanish translation + + po/es.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f2c61630234c01ea6b19535cc1ae17c3b2f8456f +Author: Daniel Mustieles +Date: 2011-11-14 + + Updated Spanish translation + + po/es.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit beac8e60c8ac3a43684a00e04900f121e4b4375e +Author: Daniel Mustieles +Date: 2011-11-14 + + Updated Spanish translation + + po/es.po | 120 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 61 insertions(+), 59 deletions(-) + +commit d83bf011b7c549664eb6bb1edb7a7c03fea42060 +Author: Stef Walter +Date: 2011-11-14 + + Fix seahorse so it doesn't crash if gpg or gpg2 don't load. + + * Print out informative message when creating a gpgme context fails + * Rework all code paths to handle such failures. + + https://bugzilla.gnome.org/show_bug.cgi?id=659529 + + pgp/seahorse-gpg-options.c | 80 +++++++++++---------- + pgp/seahorse-gpgme-key-op.c | 79 +++++++++++--------- + pgp/seahorse-gpgme-key.c | 5 +- + pgp/seahorse-gpgme-keyring.c | 147 ++++++++++++++++++++------------------ + pgp/seahorse-gpgme-keyring.h | 3 +- + pgp/seahorse-pgp-key-properties.c | 9 ++- + 6 files changed, 177 insertions(+), 146 deletions(-) + +commit 5174d6c314583ae800e884875fc602ffc20884d0 +Author: Stef Walter +Date: 2011-11-14 + + Fix build warnings for uninitialized variables + + pgp/seahorse-gpgme-key-op.c | 2 +- + pgp/seahorse-ldap-source.c | 2 +- + pgp/seahorse-pgp-key-properties.c | 4 ++-- + src/seahorse-key-manager.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 553461e0f2be494406cbce2ecc9cc0af39711fff +Author: Gabor Kelemen +Date: 2011-11-14 + + Transform translation context to a comment. + + * Its localization was not working, and using a context is not necessary + anymore. + + https://bugzilla.gnome.org/show_bug.cgi?id=661481 + + libseahorse/seahorse-viewer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 235c665691199e2b92d740685ea276df9b065cd3 +Author: Kjartan Maraas +Date: 2011-11-13 + + Updated Norwegian bokmål translation + + po/nb.po | 363 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 154 insertions(+), 209 deletions(-) + +commit db595b25ee11e3dd39b13d06c9d81ac5ba30f6d9 +Author: Fran Diéguez +Date: 2011-11-10 + + Updated Galician translations + + po/gl.po | 61 +++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 35 insertions(+), 26 deletions(-) + +commit cca696c5c47ca0eb1e405236e1ebf0c87cca01b1 +Author: Daniel Mustieles +Date: 2011-11-08 + + Updated Spanish translation + + po/es.po | 88 +++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 45 insertions(+), 43 deletions(-) + +commit 496f6adfe5017993401cc335f4e839a925c932e8 +Author: Piotr Drąg +Date: 2011-11-07 + + Updated POTFILES.in + + po/POTFILES.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit 20e66860aaa71b5033511d33f8afcfc5c1a2e9bc +Author: Andre Klapper +Date: 2011-11-07 + + Remove non-existing file from POTFILES.in to make xgettext work + + po/POTFILES.in | 1 - + 1 file changed, 1 deletion(-) + +commit 27a2ede548cab9f035a542d4b052a12d652716bf +Author: Stef Walter +Date: 2011-11-07 + + Make the properties viewer work for keys and certificates. + + pkcs11/Makefile.am | 2 +- + pkcs11/seahorse-certificate.c | 42 +++-- + pkcs11/seahorse-certificate.h | 6 +- + pkcs11/seahorse-pkcs11-actions.c | 32 +--- + pkcs11/seahorse-pkcs11-certificate-props.c | 228 -------------------------- + pkcs11/seahorse-pkcs11-certificate-props.h | 75 --------- + pkcs11/seahorse-pkcs11-properties.c | 251 +++++++++++++++++++++++++++++ + pkcs11/seahorse-pkcs11-properties.h | 45 ++++++ + pkcs11/seahorse-private-key.c | 20 +-- + pkcs11/seahorse-private-key.h | 4 +- + pkcs11/seahorse-token.c | 16 +- + 11 files changed, 354 insertions(+), 367 deletions(-) + +commit 2922282354301d0cbf53008af9e15fb52d3a67c4 +Author: Stef Walter +Date: 2011-11-06 + + Use ngettext for strings that are only pluralized + + https://bugzilla.gnome.org/show_bug.cgi?id=659469 + + pgp/seahorse-pgp-actions.c | 15 ++++++++++++--- + ssh/seahorse-ssh-actions.c | 5 ++++- + 2 files changed, 16 insertions(+), 4 deletions(-) + +commit b0110cf2a62a43e6509053b164638451efc76fdc +Author: Jorge González +Date: 2011-11-06 + + Updated Spanish translation + + po/es.po | 76 +++++++++++++++++++++++++--------------------------------------- + 1 file changed, 30 insertions(+), 46 deletions(-) + +commit 74f04792d4b9126a94d408f745b3e0e7c0e9cca5 +Author: Algimantas Margevičius +Date: 2011-11-06 + + Updated Lithuanian translation + + po/lt.po | 2845 ++++++++++++++++++-------------------------------------------- + 1 file changed, 833 insertions(+), 2012 deletions(-) + +commit 610039e4494aed5f42bcfa0b1e5bd6b3c92c42bf +Author: Mario Blättermann +Date: 2011-11-05 + + [l10n] Updated German translation + + po/de.po | 321 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 171 insertions(+), 150 deletions(-) + +commit c2c1c376d3d763863b2b7cdc0dbe535446208b56 +Author: Daniel Mustieles +Date: 2011-11-04 + + Updated Spanish translation + + po/es.po | 281 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 151 insertions(+), 130 deletions(-) + +commit b872b8774d247ea555d2584fcd7af4eb44075921 +Author: Fran Diéguez +Date: 2011-11-04 + + Updated Galician translations + + po/gl.po | 245 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 135 insertions(+), 110 deletions(-) + +commit 2f9873a8fcab14b9fc12045e91a40c857afc9545 +Author: Piotr Drąg +Date: 2011-11-03 + + Updated POTFILES.in + + po/POTFILES.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2c778d59082eefae39531441b6524b132667ad18 +Author: Stef Walter +Date: 2011-11-03 + + pkcs11: Add private key text and icon + + pkcs11/seahorse-private-key.c | 110 ++++++++++++++++++++++++++++++++++++++---- + pkcs11/seahorse-private-key.h | 2 + + 2 files changed, 102 insertions(+), 10 deletions(-) + +commit 57d1e9d0ff77cfb26654df69becaf53b617442ad +Author: Stef Walter +Date: 2011-11-03 + + pkcs11: Matching certificates and keys into a single item + + * Also fix regression of setting appropriate place on pkcs11 items + + pkcs11/seahorse-certificate.c | 105 +++++++++++- + pkcs11/seahorse-certificate.h | 10 +- + pkcs11/seahorse-private-key.c | 53 +++++- + pkcs11/seahorse-private-key.h | 8 +- + pkcs11/seahorse-token.c | 363 ++++++++++++++++++++++++++++++++---------- + 5 files changed, 441 insertions(+), 98 deletions(-) + +commit a74369551cb929d7792127792c90d39bd2dc4200 +Author: Stef Walter +Date: 2011-11-03 + + pkcs11: Initial support for listing (but not showing) private keys + + pkcs11/Makefile.am | 1 + + pkcs11/seahorse-private-key.c | 170 ++++++++++++++++++++++++++++++++++++++++++ + pkcs11/seahorse-private-key.h | 51 +++++++++++++ + pkcs11/seahorse-token.c | 163 ++++++++++++++++++++++++++++++++-------- + pkcs11/seahorse-token.h | 5 ++ + 5 files changed, 359 insertions(+), 31 deletions(-) + +commit b13932a8c67f382a9924f188c1326c2060b64a46 +Author: Stef Walter +Date: 2011-11-02 + + Make selection work normally, without checks on sidebar + + * The checks get in the way of the lock/unlock icons + * The sidebar is thought of as a power user feature, and these guys + know about multiple select in the standard HIG manner. + + src/seahorse-sidebar.c | 265 +++++++------------------------------------------ + 1 file changed, 37 insertions(+), 228 deletions(-) + +commit 9993a5fa795e92c9be244d2bfc6baca850702ef6 Author: Stef Walter -Date: 2011-11-14 +Date: 2011-10-25 - Release version 3.2.2 + pkcs11: Implement locking and unlocking of tokens - NEWS | 9 +++++++++ - configure.ac | 2 +- - 2 files changed, 10 insertions(+), 1 deletions(-) + libseahorse/seahorse-passphrase.c | 6 +- + libseahorse/seahorse-passphrase.h | 2 +- + pgp/seahorse-gpgme-keyring.c | 2 +- + pkcs11/Makefile.am | 1 + + pkcs11/seahorse-certificate.c | 2 +- + pkcs11/seahorse-interaction.c | 194 +++++++++++++++++++++++++ + pkcs11/seahorse-interaction.h | 59 ++++++++ + pkcs11/seahorse-pkcs11-actions.c | 174 +++++++++++++++++++--- + pkcs11/seahorse-pkcs11-actions.h | 4 +- + pkcs11/seahorse-token.c | 295 ++++++++++++++++++++++++++++++++++++-- + pkcs11/seahorse-token.h | 26 ++++ + 11 files changed, 728 insertions(+), 37 deletions(-) -commit d5eb5431ef4d9f47aeaed04444ec611b5383c871 +commit 6b294359c31b0d8b187d7a1c3682a2f689ddca29 Author: Stef Walter -Date: 2011-11-14 +Date: 2011-10-25 - pgp: Don't load signatures unless showing key properties + Add ability to lock and unlock from the sidebar. + + gkr/seahorse-gkr-actions.c | 49 ++++-- + gkr/seahorse-gkr-keyring.c | 23 ++- + gkr/seahorse-gkr-keyring.h | 2 + + src/seahorse-sidebar.c | 389 ++++++++++++++++++++++++++++++++++++++++++++- + 4 files changed, 448 insertions(+), 15 deletions(-) + +commit 700ae51c40e90cef388dab0cf89c5e82933b4757 +Author: Stef Walter +Date: 2011-10-25 + + Rework actions again - https://bugzilla.gnome.org/show_bug.cgi?id=662088 + * We clone action groups for the current selection, that clone + contains a reference to the current selection. - pgp/seahorse-gpgme-key.c | 8 +++++++- - pgp/seahorse-gpgme-key.h | 2 ++ - pgp/seahorse-pgp-key-properties.c | 1 + - 3 files changed, 10 insertions(+), 1 deletions(-) + gkr/seahorse-gkr-actions.c | 202 ++++++++++++++------------ + libseahorse/seahorse-action.c | 123 +++------------- + libseahorse/seahorse-action.h | 19 +-- + libseahorse/seahorse-actions.c | 35 +++-- + libseahorse/seahorse-actions.h | 8 +- + libseahorse/seahorse-object-list.c | 5 +- + libseahorse/seahorse-object-list.h | 2 +- + libseahorse/seahorse-viewer.c | 289 ++++++++++++------------------------- + libseahorse/seahorse-viewer.h | 24 +-- + pgp/seahorse-keyserver-results.c | 13 +- + pgp/seahorse-pgp-actions.c | 68 +++++++-- + pkcs11/seahorse-pkcs11-actions.c | 50 +++++-- + src/seahorse-generate-select.c | 24 ++- + src/seahorse-key-manager.c | 21 +-- + ssh/seahorse-ssh-actions.c | 53 +++++-- + ssh/seahorse-ssh-actions.h | 2 + + ssh/seahorse-ssh-key.c | 14 +- + 17 files changed, 445 insertions(+), 507 deletions(-) -commit 5c5acf9d176e648e2947d95f5539951c600f27f9 +commit 80032ed75a55da247602cc32bba5c7ce9ec453ee Author: Stef Walter -Date: 2011-11-14 +Date: 2011-10-26 - Fix build warnings for uninitialized variables + Bump version number - pgp/seahorse-gpgme-key-op.c | 2 +- - pgp/seahorse-ldap-source.c | 2 +- - pgp/seahorse-pgp-key-properties.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 0bf8e278d1637083555cfdb97675a6a8f26bd123 +commit e994833ec2f217bfa445388362c1164af1be5ea7 Author: Stef Walter -Date: 2011-11-14 +Date: 2011-10-26 - pgp: Fix issues adding key servers + Release version 3.3.1.1 + + NEWS | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 0dfc94bc94f47a820424b4516be5844397e8973a +Author: Stef Walter +Date: 2011-10-26 + + Fix issues building without pgp, ssh, or pkcs11 backends + + libseahorse/seahorse-util.c | 4 +++- + pgp/seahorse-pgp.h | 7 +++---- + pkcs11/seahorse-pkcs11.h | 4 ++-- + src/seahorse-main.c | 8 ++++++++ + ssh/seahorse-ssh.h | 7 +++---- + 5 files changed, 19 insertions(+), 11 deletions(-) + +commit 39ac163cbe6579d5942d16d5fd7f0c8f3f2c2560 +Author: Fran Diéguez +Date: 2011-10-26 + + Updated Galician translations + + po/gl.po | 1679 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 924 insertions(+), 755 deletions(-) + +commit a826e3f3da3a84ecf55f67ce2f50a42f2ef08e3f +Author: Daniel Mustieles +Date: 2011-10-26 + + Updated Spanish translation + + po/es.po | 81 +++++++++++++++------------------------------------------------- + 1 file changed, 19 insertions(+), 62 deletions(-) + +commit dab81b23f3eb732a9766aeec68ff3d120942d961 +Author: Mario Blättermann +Date: 2011-10-24 + + [l10n] Updated German translation + + po/de.po | 1581 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 843 insertions(+), 738 deletions(-) + +commit 795317ee85d9ef59e337f8a3ae245581bad2302b +Author: Kjartan Maraas +Date: 2011-10-24 + + Updated Norwegian bokmål translation + + po/nb.po | 1585 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 884 insertions(+), 701 deletions(-) + +commit 4db1ef4bb069d3874c983da5d67786b21c42addb +Author: Stef Walter +Date: 2011-10-24 + + Bump version number + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c8840af1a017c8653f66176355ffd1bf8a392d4f +Author: Stef Walter +Date: 2011-10-24 + + Release version 3.3.1 + + NEWS | 13 +++++++++++++ + configure.ac | 6 +++--- + pgp/Makefile.am | 3 ++- + src/Makefile.am | 1 - + 4 files changed, 18 insertions(+), 5 deletions(-) + +commit 03199aef87aaeeb4858442d86bd0e5f5a10de7a8 +Author: Daniel Mustieles +Date: 2011-10-23 + + Updated Spanish translation + + po/es.po | 1751 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 990 insertions(+), 761 deletions(-) + +commit d1db596c98635b848af8ca92de75b5056c8dd5c0 +Author: Yaron Shahrabani +Date: 2011-10-22 + + Updated Hebrew translation. + + po/he.po | 1894 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 975 insertions(+), 919 deletions(-) + +commit 6fa777deed28f1941b3f504e34786da22127bae6 +Author: Matej Urbančič +Date: 2011-10-21 + + Updated Slovenian translation + + po/sl.po | 1565 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 892 insertions(+), 673 deletions(-) + +commit 22d600ea560058afc4a31e9feb1a255b0fa33e83 +Author: Piotr Drąg +Date: 2011-10-20 + + Updated POTFILES.in + + po/POTFILES.in | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit 9a9747d43b8fecd770440cdd21220cc3a1d61b3d +Author: Stef Walter +Date: 2011-10-20 + + Make delete actions work properly again - * Make all key server types show up - * Fix validation code for hkp server type - * These were regressions because of port to GTK+3 + * We sort the selected items by deleting action + * Invoke those actions in turn + * Allow cancellation of one, to cancel all the remaining + + gkr/seahorse-gkr-actions.c | 5 +++ + libseahorse/seahorse-action.c | 53 +++++++++++++++++++----- + libseahorse/seahorse-action.h | 9 ++++- + libseahorse/seahorse-viewer.c | 87 ++++++++++++++++++++-------------------- + pgp/seahorse-pgp-actions.c | 1 + + pkcs11/seahorse-pkcs11-actions.c | 2 + + src/seahorse-key-manager.ui | 3 +- + ssh/seahorse-ssh-actions.c | 2 + + 8 files changed, 103 insertions(+), 59 deletions(-) - libseahorse/seahorse-prefs.c | 11 +++++------ - pgp/seahorse-hkp-source.c | 2 +- - 2 files changed, 6 insertions(+), 7 deletions(-) +commit 13122385b16d2981ac0e514de6973b7f3f3c1a74 +Author: Stef Walter +Date: 2011-10-20 -commit e33e47cb1d864f68dac89c5a29b30c3e34998e33 -Author: Vincent Untz + Fix double free of list of selected items + + gkr/seahorse-gkr-actions.c | 6 ------ + pgp/seahorse-pgp-actions.c | 2 ++ + ssh/seahorse-ssh-actions.c | 1 - + 3 files changed, 2 insertions(+), 7 deletions(-) + +commit 168e07166d7c20ee7d5a2023ba8d27ddf67165ec +Author: Stef Walter +Date: 2011-10-20 + + Cleanup adding new keys, items, keyrings + + * Fix dialog issues in new dialogs + * Fix prompting issues, and rework selector + + gkr/seahorse-gkr-actions.c | 19 ++- + pgp/seahorse-gpgme-generate.c | 12 +- + pgp/seahorse-pgp-generate.xml | 197 ++++++++++++++++------------ + src/seahorse-generate-select.c | 269 +++++++++++++++++++++++++-------------- + src/seahorse-generate-select.h | 24 +--- + src/seahorse-generate-select.xml | 82 +----------- + src/seahorse-key-manager.c | 25 ++++ + src/seahorse-key-manager.ui | 2 +- + ssh/seahorse-ssh-generate.c | 10 +- + ssh/seahorse-ssh-generate.xml | 209 ++++++++++++++---------------- + 10 files changed, 439 insertions(+), 410 deletions(-) + +commit d4b8510ad74b2b7a8b5e67a554f16eeff9000228 +Author: Stef Walter +Date: 2011-10-20 + + Right clicking on the sidebar items for context menus. + + gkr/seahorse-gkr-actions.c | 63 ++++++++++--------- + libseahorse/seahorse-actions.c | 9 +++ + libseahorse/seahorse-actions.h | 2 +- + libseahorse/seahorse-viewer.c | 20 +++--- + libseahorse/seahorse-viewer.h | 4 +- + src/seahorse-key-manager.c | 14 +++++ + src/seahorse-key-manager.ui | 13 +--- + src/seahorse-sidebar.c | 134 ++++++++++++++++++++++++++++++++++++++++- + 8 files changed, 208 insertions(+), 51 deletions(-) + +commit f784d2e0e52da53301fa5fd73d917598fd6136f7 +Author: Stef Walter +Date: 2011-10-19 + + Fix for various deprecations in Glib and GTK + + * In particular use GtkGrid instead of GtkTable when prompting + for a passphrase. + + libseahorse/seahorse-bind.c | 8 -- + libseahorse/seahorse-passphrase.c | 242 +++++++++++++++++++------------------- + src/seahorse-main.c | 2 - + 3 files changed, 122 insertions(+), 130 deletions(-) + +commit 9ea9a0f0aadba12ecf34169a2783e9afdc8bc6a7 +Author: Stef Walter +Date: 2011-10-19 + + Rework build options + + * --enable-strict disables deprecations and makes warnings into errors + * --enable-debug enables debug symbols + + configure.ac | 241 +++++++++++++++++++++++++---------------------------------- + 1 file changed, 103 insertions(+), 138 deletions(-) + +commit abb1b7a289405b2840935149477d369e5be555ac +Author: Stef Walter +Date: 2011-10-19 + + Rework how actions come from the backends and various objects. + + * Rename SeahorseSourc to SeahorsePlace + * Actions are exposed by having a GtkActionGroup on the various + objects, places, backends + + gkr/Makefile.am | 3 +- + gkr/seahorse-gkr-actions.c | 548 +++++++++++++++++++ + gkr/seahorse-gkr-actions.h | 33 ++ + gkr/seahorse-gkr-backend.c | 22 +- + gkr/seahorse-gkr-item-commands.c | 162 ------ + gkr/seahorse-gkr-item-commands.h | 49 -- + gkr/seahorse-gkr-item.c | 36 +- + gkr/seahorse-gkr-item.h | 1 - + gkr/seahorse-gkr-keyring-commands.c | 458 ---------------- + gkr/seahorse-gkr-keyring-commands.h | 53 -- + gkr/seahorse-gkr-keyring.c | 36 +- + gkr/seahorse-gkr-operation.c | 2 +- + libseahorse/Makefile.am | 5 +- + libseahorse/seahorse-action.c | 130 +++++ + libseahorse/seahorse-action.h | 42 ++ + libseahorse/seahorse-actions.c | 78 +++ + libseahorse/seahorse-actions.h | 66 +++ + libseahorse/seahorse-backend.c | 4 + + libseahorse/seahorse-backend.h | 5 +- + libseahorse/seahorse-commands.c | 218 -------- + libseahorse/seahorse-commands.h | 75 --- + libseahorse/seahorse-context.h | 2 +- + libseahorse/seahorse-key-manager-store.c | 18 +- + libseahorse/seahorse-object-widget.c | 2 - + libseahorse/seahorse-object.c | 89 ++-- + libseahorse/seahorse-object.h | 10 +- + libseahorse/seahorse-place.c | 279 ++++++++++ + libseahorse/seahorse-place.h | 114 ++++ + libseahorse/seahorse-predicate.c | 2 +- + libseahorse/seahorse-predicate.h | 1 - + libseahorse/seahorse-source.c | 275 ---------- + libseahorse/seahorse-source.h | 111 ---- + libseahorse/seahorse-util.c | 79 ++- + libseahorse/seahorse-util.h | 10 +- + libseahorse/seahorse-viewer.c | 885 ++++++++++++++----------------- + libseahorse/seahorse-viewer.h | 41 +- + pgp/Makefile.am | 2 +- + pgp/seahorse-gpgme-key-op.c | 4 +- + pgp/seahorse-gpgme-key.c | 16 +- + pgp/seahorse-gpgme-key.h | 2 +- + pgp/seahorse-gpgme-keyring.c | 69 ++- + pgp/seahorse-hkp-source.c | 19 +- + pgp/seahorse-keyserver-results.c | 78 +-- + pgp/seahorse-keyserver-results.ui | 14 +- + pgp/seahorse-keyserver-sync.c | 14 +- + pgp/seahorse-ldap-source.c | 23 +- + pgp/seahorse-pgp-actions.c | 329 ++++++++++++ + pgp/seahorse-pgp-actions.h | 32 ++ + pgp/seahorse-pgp-backend.c | 48 +- + pgp/seahorse-pgp-backend.h | 4 +- + pgp/seahorse-pgp-commands.c | 369 ------------- + pgp/seahorse-pgp-commands.h | 57 -- + pgp/seahorse-pgp-key.c | 1 - + pgp/seahorse-server-source.c | 9 +- + pgp/seahorse-transfer.c | 28 +- + pgp/seahorse-transfer.h | 6 +- + pgp/seahorse-unknown-source.h | 1 - + pgp/seahorse-unknown.c | 2 +- + pkcs11/Makefile.am | 2 +- + pkcs11/seahorse-certificate.c | 25 +- + pkcs11/seahorse-pkcs11-actions.c | 182 +++++++ + pkcs11/seahorse-pkcs11-actions.h | 29 + + pkcs11/seahorse-pkcs11-backend.c | 20 +- + pkcs11/seahorse-pkcs11-commands.c | 253 --------- + pkcs11/seahorse-pkcs11-commands.h | 53 -- + pkcs11/seahorse-pkcs11-operations.c | 2 +- + pkcs11/seahorse-token.c | 15 +- + src/seahorse-key-manager.c | 129 ++--- + src/seahorse-key-manager.ui | 25 +- + src/seahorse-sidebar.c | 21 + + src/seahorse-sidebar.h | 4 + + ssh/Makefile.am | 2 +- + ssh/seahorse-ssh-actions.c | 171 ++++++ + ssh/seahorse-ssh-actions.h | 28 + + ssh/seahorse-ssh-backend.c | 11 +- + ssh/seahorse-ssh-commands.c | 238 --------- + ssh/seahorse-ssh-commands.h | 57 -- + ssh/seahorse-ssh-key-properties.c | 8 +- + ssh/seahorse-ssh-key.c | 11 +- + ssh/seahorse-ssh-key.h | 4 +- + ssh/seahorse-ssh-operation.c | 16 +- + ssh/seahorse-ssh-source.c | 39 +- + ssh/seahorse-ssh-source.h | 1 - + ssh/seahorse-ssh-upload.c | 2 +- + 84 files changed, 2975 insertions(+), 3444 deletions(-) + +commit b7deadc93845be59ce25d87523777c8d2a438cd9 +Author: Stef Walter +Date: 2011-10-18 + + Remove SeahorseView and merge functionality into SeahorseViewer + + * Now that SeahorseViewer is in the common directory, there's no + need to have the SeahorseView interface, and it's just confusing. + + gkr/seahorse-gkr-item-commands.c | 24 +++---- + gkr/seahorse-gkr-keyring-commands.c | 73 ++++++++++----------- + libseahorse/Makefile.am | 1 - + libseahorse/seahorse-commands.c | 50 +++++++------- + libseahorse/seahorse-commands.h | 4 +- + libseahorse/seahorse-view.c | 127 ------------------------------------ + libseahorse/seahorse-view.h | 99 ---------------------------- + libseahorse/seahorse-viewer.c | 62 +++++------------- + libseahorse/seahorse-viewer.h | 13 ++-- + pgp/seahorse-keyserver-results.c | 2 +- + pgp/seahorse-pgp-commands.c | 62 ++++++++---------- + pkcs11/seahorse-pkcs11-commands.c | 38 ++++------- + pkcs11/seahorse-pkcs11-commands.h | 1 + + ssh/seahorse-ssh-commands.c | 55 +++++++--------- + 14 files changed, 157 insertions(+), 454 deletions(-) + +commit 26d11fd1e7323d2ec76c9dbf62d4e0e800e33387 +Author: Stef Walter +Date: 2011-10-17 + + Use place holder text for the filter box + + src/seahorse-key-manager.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c1dafb1ca7d162438cba03e04bc186d463d1cee3 +Author: Stef Walter +Date: 2011-10-17 + + pgp: Change to use the gnupg logo for gpg keyrings + + pgp/seahorse-gpgme-keyring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 44f3eda0a6b0ddc9ce6c1b55724fc0865b642d08 +Author: Stef Walter +Date: 2011-10-14 + + Save the set of selected place in settings + + * Each place has a uri, and remember the set of chosen uris + even when the uri is no longer present. + + data/org.gnome.seahorse.manager.gschema.xml | 5 + + gkr/seahorse-gkr-keyring.c | 12 +- + libseahorse/seahorse-source.c | 4 + + libseahorse/seahorse-source.h | 10 - + pgp/seahorse-gpgme-keyring.c | 7 +- + pgp/seahorse-server-source.c | 4 +- + pkcs11/seahorse-pkcs11-backend.c | 2 + + pkcs11/seahorse-token.c | 20 +- + src/seahorse-key-manager.c | 38 ++-- + src/seahorse-sidebar.c | 300 ++++++++++++++++++++-------- + src/seahorse-sidebar.h | 5 + + ssh/seahorse-ssh-source.c | 12 +- + 12 files changed, 308 insertions(+), 111 deletions(-) + +commit 0e5addded36d5de04b5f3fdd195ca5b9f8f27136 +Author: Stef Walter +Date: 2011-10-14 + + Remove the status bar + + src/seahorse-key-manager.xml | 35 ----------------------------------- + 1 file changed, 35 deletions(-) + +commit b31cd3bbf165adbadff675668868dcf536191b9c +Author: Stef Walter +Date: 2011-10-14 + + Sync the view-places setting properly + + src/seahorse-key-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 15ec8cb39919192ddeb8977d91887cfe4b35648b +Author: Stef Walter +Date: 2011-10-14 + + Make filtering work by text, personal, trusted and all. + + data/org.gnome.seahorse.manager.gschema.xml | 15 +++--- + gkr/seahorse-gkr-item.c | 2 +- + gkr/seahorse-gkr-keyring.c | 3 +- + libseahorse/Makefile.am | 2 +- + libseahorse/seahorse-key-manager-store.c | 15 ++++-- + libseahorse/seahorse-key-manager-store.h | 3 ++ + libseahorse/seahorse-object.c | 41 ---------------- + libseahorse/seahorse-predicate.c | 74 ++++++++++++++++++++++++++++ + libseahorse/seahorse-predicate.h | 7 ++- + libseahorse/seahorse-types.c | 27 +++++++++- + libseahorse/seahorse-types.h | 12 +++-- + libseahorse/seahorse-viewer.c | 1 - + pgp/seahorse-gpgme-key.c | 13 +++-- + pgp/seahorse-keyserver-results.c | 2 + + pkcs11/seahorse-certificate.c | 10 ++++ + src/seahorse-key-manager.c | 76 ++++++++++++++++++++--------- + ssh/seahorse-ssh-key.c | 10 +++- + 17 files changed, 217 insertions(+), 96 deletions(-) + +commit a8381a6cb7ac2ea390fc54a352eff3af3645af7b +Author: Stef Walter +Date: 2011-10-14 + + Make the filter in the main window work again + + libseahorse/seahorse-collection.c | 3 ++- + libseahorse/seahorse-key-manager-store.c | 12 ++++++------ + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit 28e36da83327a540547e402460d56bc047dc208f +Author: Stef Walter +Date: 2011-10-14 + + Add proper icons and text for the GnuPG and OPENSSH sources + + pgp/seahorse-gpgme-keyring.c | 10 +++------- + ssh/seahorse-ssh-key.c | 1 - + ssh/seahorse-ssh-source.c | 8 +++++--- + 3 files changed, 8 insertions(+), 11 deletions(-) + +commit 7be2194edc388ef7bc8aef5476a3775bd0701a65 +Author: Stef Walter Date: 2011-10-13 - Fix crash when adding a non-LDAP keyserver + Add descriptions and clearer markup to various object types + + gkr/seahorse-gkr-item.c | 791 ++++++++++++++++++++----------- + libseahorse/seahorse-key-manager-store.c | 188 ++------ + pgp/seahorse-pgp-key.c | 21 +- + ssh/seahorse-ssh-key.c | 40 +- + 4 files changed, 611 insertions(+), 429 deletions(-) + +commit 12ea05e4395adfbb9b41bd0b67ad6a2bbff663a8 +Author: Stef Walter +Date: 2011-10-13 + + Allow showing and hiding the places sidebar - https://bugzilla.gnome.org/show_bug.cgi?id=661683 + * If places sidebar is hidden then show all items in the same + view. + + data/org.gnome.seahorse.manager.gschema.xml | 39 +++--- + libseahorse/seahorse-viewer.c | 2 - + pgp/seahorse-keyserver-results.c | 36 ------ + src/seahorse-key-manager.c | 144 ++++++++++------------ + src/seahorse-key-manager.ui | 11 +- + src/seahorse-sidebar.c | 179 +++++++++++++++++++++------- + src/seahorse-sidebar.h | 5 + + 7 files changed, 234 insertions(+), 182 deletions(-) + +commit 1c608b1040227ebdf919d1c2d4cb6c5781902e78 +Author: Stef Walter +Date: 2011-10-13 + + Make pgp key items in the main view wrap and show all uids in one item. + + libseahorse/seahorse-key-manager-store.c | 13 ++- + pgp/seahorse-pgp-key.c | 153 ++++++++++++++++--------------- + 2 files changed, 90 insertions(+), 76 deletions(-) + +commit e2165880f17ded851dfccc4c591e256846346d0d +Author: Stef Walter +Date: 2011-10-12 + + pkcs11: Use new gck functionality to load certificates + + * Use enumerator to load certificates, and have the enumerator + get the attributes for each certificate. + * No more SeahorsePkcs11Object + * Simpler names for things` + + pkcs11/Makefile.am | 7 +- + pkcs11/seahorse-certificate.c | 194 +++++++++++++ + pkcs11/seahorse-certificate.h | 59 ++++ + pkcs11/seahorse-pkcs11-backend.c | 4 +- + pkcs11/seahorse-pkcs11-certificate-props.c | 4 +- + pkcs11/seahorse-pkcs11-certificate.c | 333 ---------------------- + pkcs11/seahorse-pkcs11-certificate.h | 65 ----- + pkcs11/seahorse-pkcs11-commands.c | 10 +- + pkcs11/seahorse-pkcs11-object.c | 380 ------------------------- + pkcs11/seahorse-pkcs11-object.h | 75 ----- + pkcs11/seahorse-pkcs11-operations.c | 164 +---------- + pkcs11/seahorse-pkcs11-operations.h | 12 - + pkcs11/seahorse-pkcs11-token.c | 303 -------------------- + pkcs11/seahorse-pkcs11-token.h | 61 ---- + pkcs11/seahorse-token.c | 439 +++++++++++++++++++++++++++++ + pkcs11/seahorse-token.h | 66 +++++ + 16 files changed, 779 insertions(+), 1397 deletions(-) + +commit 872e08aab53ab647c38e751ad38e12709a5a3fa8 +Author: Stef Walter +Date: 2011-10-12 + + Refactor that there's no unnecessary use of SeahorseObject + + * So that other stuff like GcrCertificate can work in seahorse. + + gkr/seahorse-gkr-item-commands.c | 5 +-- + gkr/seahorse-gkr-item-properties.c | 12 +++--- + gkr/seahorse-gkr-keyring-commands.c | 5 ++- + gkr/seahorse-gkr-keyring-properties.c | 8 ++-- + gkr/seahorse-gkr-operation.c | 8 ++-- + libseahorse/seahorse-collection.c | 52 ++++++++++++------------- + libseahorse/seahorse-commands.c | 8 ++-- + libseahorse/seahorse-commands.h | 11 +++--- + libseahorse/seahorse-context.h | 3 -- + libseahorse/seahorse-key-manager-store.c | 30 +++++++-------- + libseahorse/seahorse-key-manager-store.h | 4 +- + libseahorse/seahorse-object-model.c | 41 ++++++++++++-------- + libseahorse/seahorse-object-model.h | 22 +++++------ + libseahorse/seahorse-object-widget.c | 16 +++++--- + libseahorse/seahorse-object-widget.h | 14 +++---- + libseahorse/seahorse-object.c | 46 +++++++++------------- + libseahorse/seahorse-predicate.h | 6 +-- + libseahorse/seahorse-source.c | 9 +++-- + libseahorse/seahorse-source.h | 4 -- + libseahorse/seahorse-util.c | 58 ++++++++++++++-------------- + libseahorse/seahorse-util.h | 4 +- + libseahorse/seahorse-view.c | 5 ++- + libseahorse/seahorse-view.h | 12 +++--- + libseahorse/seahorse-viewer.c | 40 +++++++++---------- + libseahorse/seahorse-viewer.h | 27 +++++++------ + pgp/seahorse-gpgme-add-subkey.c | 4 +- + pgp/seahorse-gpgme-add-uid.c | 8 ++-- + pgp/seahorse-keyserver-results.c | 11 +++--- + pgp/seahorse-pgp-commands.c | 9 ++--- + pgp/seahorse-pgp-key-properties.c | 66 ++++++++++++++++---------------- + pgp/seahorse-pgp-keysets.c | 2 +- + pkcs11/seahorse-pkcs11-commands.c | 3 +- + src/seahorse-key-manager.c | 11 +++--- + ssh/seahorse-ssh-commands.c | 8 ++-- + ssh/seahorse-ssh-key-properties.c | 19 ++++----- + 35 files changed, 294 insertions(+), 297 deletions(-) + +commit 1257d002a366376fd02ca31342148ef4b29b96e8 +Author: Stef Walter +Date: 2011-10-06 + + Add label to the import dialog + + src/seahorse-import-dialog.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit 36f8d3bf12d4afc796d8f65e6619178e6054f147 +Author: Stef Walter +Date: 2011-10-06 + + Update import dialog for libgcr changes + + src/seahorse-import-dialog.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit fb6e3df6aca4335113cce6096e52848d76b9f727 +Author: Stef Walter +Date: 2011-10-06 + + gcr: Use functions in gcr to get PKCS#11 icons + + pkcs11/seahorse-pkcs11-token.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 283115770e497456ae4b1542052de3e43040334c +Author: Stef Walter +Date: 2011-10-06 + + gcr: Asynchronously initialize PKCS#11 modules + + pkcs11/seahorse-pkcs11-backend.c | 54 ++++++++++++++++++++++++++++++++-------- + 1 file changed, 43 insertions(+), 11 deletions(-) + +commit dfcd78e04f520d9af4aaabb0819d5f713f2c3294 +Author: Stef Walter +Date: 2011-09-22 + + Use the new importer infrastructure in libgcr + + * Show a preview of what we're going to import before importing. + + libseahorse/seahorse-viewer.c | 67 ----------------- + pgp/seahorse-hkp-source.c | 4 +- + pgp/seahorse-keyserver-results.c | 83 +++++++++++++++++++-- + pgp/seahorse-ldap-source.c | 1 + + pgp/seahorse-transfer.c | 2 +- + src/Makefile.am | 1 + + src/seahorse-import-dialog.c | 157 +++++++++++++++++++++++++++++++++++++++ + src/seahorse-import-dialog.h | 52 +++++++++++++ + src/seahorse-key-manager.c | 156 ++++++++------------------------------ + 9 files changed, 323 insertions(+), 200 deletions(-) + +commit 5765df8c91aca8d852ca1f56560dd074766cc0f1 +Author: Stef Walter +Date: 2011-09-09 + + Load certificates from tokens + + pkcs11/seahorse-pkcs11-object.c | 2 +- + pkcs11/seahorse-pkcs11-token.c | 17 +++++++++++++---- + 2 files changed, 14 insertions(+), 5 deletions(-) + +commit 0b63ff6e23501b4af7c68a21970d2cde87eb5a41 +Author: Stef Walter +Date: 2011-09-09 + + Blacklist certain PKCS#11 tokens from showing up in seahorse. + + * Both of these are displayed elsewhere in the interface. + * SSH keys and Secret Store + + pkcs11/seahorse-pkcs11-backend.c | 42 +++++++++++++++++++++++++++++++++++++--- + 1 file changed, 39 insertions(+), 3 deletions(-) + +commit 397acc3038b1841ec005dbd7821065d0643abe50 +Author: Stef Walter +Date: 2011-09-09 + + Rename SeahorsePkcs11Source to SeahorsePkcs11Token + + * Display label and manufacturer as label and tooltip. + + pkcs11/Makefile.am | 2 +- + pkcs11/seahorse-pkcs11-backend.c | 4 +- + pkcs11/seahorse-pkcs11-operations.c | 34 ++--- + pkcs11/seahorse-pkcs11-operations.h | 8 +- + pkcs11/seahorse-pkcs11-source.c | 290 ------------------------------------ + pkcs11/seahorse-pkcs11-source.h | 62 -------- + pkcs11/seahorse-pkcs11-token.c | 290 ++++++++++++++++++++++++++++++++++++ + pkcs11/seahorse-pkcs11-token.h | 61 ++++++++ + src/seahorse-sidebar.c | 1 + + 9 files changed, 376 insertions(+), 376 deletions(-) + +commit 058b368f250195afd6ec227674d45b270640051b +Author: Stef Walter +Date: 2011-09-09 + + Make the main key manager view reflect what's in the side pane. + + src/seahorse-key-manager.c | 296 +++++-------------------------------------- + src/seahorse-key-manager.xml | 111 ++-------------- + src/seahorse-sidebar.c | 232 ++++++++++++++++++++------------- + src/seahorse-sidebar.h | 2 + + 4 files changed, 188 insertions(+), 453 deletions(-) - libseahorse/seahorse-prefs.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) +commit 85352bcb2a80c0991edfa3c15f142c872c22599e +Author: Stef Walter +Date: 2011-09-09 + + Allow simple mulitple select based on checks in sidebar. + + * Use stable update of sidebar, so that state isn't needlessly trashed. + + src/seahorse-sidebar.c | 239 +++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 201 insertions(+), 38 deletions(-) + +commit 0a7ff2c9c67faa33584a535839c6b1da96189b0f +Author: Stef Walter +Date: 2011-09-09 + + Add CSS file and style sidebar properly. + + libseahorse/Makefile.am | 3 ++- + libseahorse/seahorse-widget.c | 18 +++++++++++++++--- + libseahorse/seahorse.css | 12 ++++++++++++ + src/seahorse-sidebar.c | 5 ++++- + 4 files changed, 33 insertions(+), 5 deletions(-) + +commit af37ff6f57bc27ac0d9a5816845e880b54bf29e6 +Author: Stef Walter +Date: 2011-09-09 + + Update translatable files for recent refactoring. + + po/POTFILES.in | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +commit bddd86370e67a95ad7a1a3d3d1e517aaabbfeefc +Author: Stef Walter +Date: 2011-09-09 + + Move keyserver UI files to pgp directory. + + pgp/Makefile.am | 4 + + pgp/seahorse-keyserver-results.ui | 43 +++++++ + pgp/seahorse-keyserver-results.xml | 97 +++++++++++++++ + pgp/seahorse-keyserver-search.xml | 243 +++++++++++++++++++++++++++++++++++++ + pgp/seahorse-keyserver-sync.xml | 180 +++++++++++++++++++++++++++ + src/Makefile.am | 6 +- + src/seahorse-keyserver-results.ui | 43 ------- + src/seahorse-keyserver-results.xml | 97 --------------- + src/seahorse-keyserver-search.xml | 243 ------------------------------------- + src/seahorse-keyserver-sync.xml | 180 --------------------------- + 10 files changed, 568 insertions(+), 568 deletions(-) + +commit 7fe8ab03912f53bb65df3e5e45d1da6ede10e684 +Author: Stef Walter +Date: 2011-09-08 + + Implement sidebar, structure backends and sources better + + * Initial implementation of sidebar which shows all sources + * Give SeahorseSource standard properties, so we can display + them in the sidebar, such as icon, name etc. + * Create SeahorseBackend interface with standard properties + again for the sidebar. + * Some of the values displayed are place holders. + + data/org.gnome.seahorse.manager.gschema.xml | 5 + + gkr/seahorse-gkr-backend.c | 64 ++- + gkr/seahorse-gkr-keyring.c | 27 +- + gkr/seahorse-gkr-keyring.h | 2 + + gkr/seahorse-gkr.h | 4 +- + libseahorse/Makefile.am | 1 + + libseahorse/seahorse-backend.c | 51 +++ + libseahorse/seahorse-backend.h | 41 ++ + libseahorse/seahorse-source.c | 49 +-- + pgp/seahorse-gpgme-keyring.c | 41 +- + pgp/seahorse-pgp-backend.c | 55 ++- + pgp/seahorse-pgp-backend.h | 3 +- + pgp/seahorse-pgp.h | 8 +- + pgp/seahorse-server-source.c | 92 ++-- + pgp/seahorse-unknown-source.c | 11 +- + pixmaps/22x22/Makefile | 490 +++++++++++++++++++++ + pixmaps/22x22/Makefile.in | 490 +++++++++++++++++++++ + pixmaps/48x48/Makefile | 483 +++++++++++++++++++++ + pixmaps/48x48/Makefile.in | 483 +++++++++++++++++++++ + pixmaps/Makefile | 642 ++++++++++++++++++++++++++++ + pixmaps/Makefile.in | 642 ++++++++++++++++++++++++++++ + pixmaps/scalable/Makefile | 483 +++++++++++++++++++++ + pixmaps/scalable/Makefile.in | 483 +++++++++++++++++++++ + pkcs11/seahorse-pkcs11-backend.c | 59 ++- + pkcs11/seahorse-pkcs11-commands.c | 2 +- + pkcs11/seahorse-pkcs11-source.c | 28 +- + pkcs11/seahorse-pkcs11.h | 5 +- + src/Makefile.am | 1 + + src/seahorse-key-manager.c | 88 +++- + src/seahorse-key-manager.h | 4 +- + src/seahorse-key-manager.xml | 542 +++++++++++++---------- + src/seahorse-main.c | 17 +- + src/seahorse-sidebar.c | 586 +++++++++++++++++++++++++ + src/seahorse-sidebar.h | 43 ++ + ssh/seahorse-ssh-backend.c | 59 ++- + ssh/seahorse-ssh-source.c | 43 +- + ssh/seahorse-ssh.h | 8 +- + 37 files changed, 5750 insertions(+), 385 deletions(-) + +commit 0deb6bf417db5a6d6ce9181c897bf1ad212965c5 +Author: Stef Walter +Date: 2011-09-07 + + Refactor core of seahorse + + * Objects are owned by sources not by the SeahorseContext + * No more unique identifiers for objects, since these don't + fit well with PKCS#11 objects at all. + * Cleanup SeahorseSource and remove server stuff. + * All server related stuff goes into the pgp backend. + * More well defined backends + * DNS-SD stuff goes into the pgp backend + + Makefile.am | 2 +- + gkr/Makefile.am | 7 +- + gkr/seahorse-gkr-add-item.c | 13 +- + gkr/seahorse-gkr-add-keyring.c | 5 +- + gkr/seahorse-gkr-backend.c | 409 +++++++++ + gkr/seahorse-gkr-backend.h | 69 ++ + gkr/seahorse-gkr-item-commands.c | 6 +- + gkr/seahorse-gkr-item-properties.c | 1 - + gkr/seahorse-gkr-item.c | 18 +- + gkr/seahorse-gkr-item.h | 5 +- + gkr/seahorse-gkr-keyring-commands.c | 17 +- + gkr/seahorse-gkr-keyring.c | 60 +- + gkr/seahorse-gkr-keyring.h | 9 + + gkr/seahorse-gkr-module.c | 47 - + gkr/seahorse-gkr-module.h | 30 - + gkr/seahorse-gkr-operation.c | 18 +- + gkr/seahorse-gkr-operation.h | 1 - + gkr/seahorse-gkr-source.c | 382 -------- + gkr/seahorse-gkr-source.h | 66 -- + gkr/seahorse-gkr.h | 5 +- + libseahorse/Makefile.am | 9 +- + libseahorse/seahorse-collection.c | 127 ++- + libseahorse/seahorse-collection.h | 3 +- + libseahorse/seahorse-combo-keys.c | 271 ------ + libseahorse/seahorse-combo-keys.h | 51 -- + libseahorse/seahorse-context.c | 1445 +----------------------------- + libseahorse/seahorse-context.h | 140 +-- + libseahorse/seahorse-dns-sd.c | 460 ---------- + libseahorse/seahorse-dns-sd.h | 83 -- + libseahorse/seahorse-key-manager-store.c | 954 ++++++++++++++++++++ + libseahorse/seahorse-key-manager-store.h | 77 ++ + libseahorse/seahorse-object-widget.c | 21 +- + libseahorse/seahorse-object.c | 266 +----- + libseahorse/seahorse-object.h | 19 - + libseahorse/seahorse-predicate.h | 4 - + libseahorse/seahorse-preferences.c | 44 + + libseahorse/seahorse-preferences.h | 36 + + libseahorse/seahorse-prefs.c | 1 - + libseahorse/seahorse-prefs.h | 1 - + libseahorse/seahorse-registry.c | 50 -- + libseahorse/seahorse-registry.h | 8 - + libseahorse/seahorse-source.c | 188 +--- + libseahorse/seahorse-source.h | 64 -- + libseahorse/seahorse-transfer.c | 205 ----- + libseahorse/seahorse-transfer.h | 38 - + libseahorse/seahorse-types.c | 19 - + libseahorse/seahorse-types.h | 14 - + libseahorse/seahorse-unknown-source.c | 191 ---- + libseahorse/seahorse-unknown-source.h | 74 -- + libseahorse/seahorse-unknown.c | 64 -- + libseahorse/seahorse-unknown.h | 57 -- + libseahorse/seahorse-util.c | 4 +- + libseahorse/seahorse-util.h | 2 - + libseahorse/seahorse-view.h | 2 + + libseahorse/seahorse-viewer.c | 1023 +++++++++++++++++++++ + libseahorse/seahorse-viewer.h | 111 +++ + pgp/Makefile.am | 11 +- + pgp/seahorse-combo-keys.c | 273 ++++++ + pgp/seahorse-combo-keys.h | 51 ++ + pgp/seahorse-discovery.c | 453 ++++++++++ + pgp/seahorse-discovery.h | 83 ++ + pgp/seahorse-gpg-options.c | 1 - + pgp/seahorse-gpgme-dialogs.h | 6 +- + pgp/seahorse-gpgme-generate.c | 46 +- + pgp/seahorse-gpgme-key-op.c | 58 +- + pgp/seahorse-gpgme-key-op.h | 6 +- + pgp/seahorse-gpgme-key.c | 87 +- + pgp/seahorse-gpgme-keyring.c | 1070 ++++++++++++++++++++++ + pgp/seahorse-gpgme-keyring.h | 91 ++ + pgp/seahorse-gpgme-sign.c | 5 +- + pgp/seahorse-gpgme-source.c | 1047 ---------------------- + pgp/seahorse-gpgme-source.h | 74 -- + pgp/seahorse-gpgme-uid.c | 15 - + pgp/seahorse-hkp-source.c | 180 ++-- + pgp/seahorse-keyserver-results.c | 542 +++++++++++ + pgp/seahorse-keyserver-results.h | 65 ++ + pgp/seahorse-keyserver-search.c | 502 +++++++++++ + pgp/seahorse-keyserver-search.h | 31 + + pgp/seahorse-keyserver-sync.c | 231 +++++ + pgp/seahorse-keyserver-sync.h | 31 + + pgp/seahorse-ldap-source.c | 147 +-- + pgp/seahorse-ldap-source.h | 2 +- + pgp/seahorse-pgp-backend.c | 646 +++++++++++++ + pgp/seahorse-pgp-backend.h | 110 +++ + pgp/seahorse-pgp-commands.c | 79 +- + pgp/seahorse-pgp-key-properties.c | 102 +-- + pgp/seahorse-pgp-key.c | 124 ++- + pgp/seahorse-pgp-key.h | 14 +- + pgp/seahorse-pgp-keysets.c | 39 +- + pgp/seahorse-pgp-module.c | 58 -- + pgp/seahorse-pgp-module.h | 30 - + pgp/seahorse-pgp-signature.c | 25 +- + pgp/seahorse-pgp-signature.h | 2 - + pgp/seahorse-pgp-uid.c | 1 - + pgp/seahorse-pgp.h | 9 + + pgp/seahorse-server-source.c | 112 ++- + pgp/seahorse-server-source.h | 48 +- + pgp/seahorse-signer.c | 25 +- + pgp/seahorse-transfer.c | 226 +++++ + pgp/seahorse-transfer.h | 40 + + pgp/seahorse-unknown-source.c | 115 +++ + pgp/seahorse-unknown-source.h | 48 + + pgp/seahorse-unknown.c | 69 ++ + pgp/seahorse-unknown.h | 57 ++ + pkcs11/Makefile.am | 2 +- + pkcs11/seahorse-pkcs11-backend.c | 168 ++++ + pkcs11/seahorse-pkcs11-backend.h | 46 + + pkcs11/seahorse-pkcs11-certificate.c | 1 - + pkcs11/seahorse-pkcs11-helpers.c | 129 +-- + pkcs11/seahorse-pkcs11-helpers.h | 6 +- + pkcs11/seahorse-pkcs11-module.c | 63 -- + pkcs11/seahorse-pkcs11-module.h | 30 - + pkcs11/seahorse-pkcs11-object.c | 31 +- + pkcs11/seahorse-pkcs11-object.h | 2 - + pkcs11/seahorse-pkcs11-operations.c | 36 +- + pkcs11/seahorse-pkcs11-source.c | 128 ++- + pkcs11/seahorse-pkcs11-source.h | 4 + + pkcs11/seahorse-pkcs11.h | 8 + + src/Makefile.am | 11 - + src/seahorse-generate-select.h | 2 +- + src/seahorse-key-manager-store.c | 950 -------------------- + src/seahorse-key-manager-store.h | 77 -- + src/seahorse-key-manager.c | 219 ++--- + src/seahorse-key-manager.h | 9 +- + src/seahorse-key-manager.ui | 6 +- + src/seahorse-keyserver-results.c | 589 ------------ + src/seahorse-keyserver-results.h | 65 -- + src/seahorse-keyserver-search.c | 498 ---------- + src/seahorse-keyserver-sync.c | 249 ----- + src/seahorse-keyserver-sync.h | 27 - + src/seahorse-main.c | 49 +- + src/seahorse-preferences.c | 44 - + src/seahorse-preferences.h | 36 - + src/seahorse-viewer.c | 1023 --------------------- + src/seahorse-viewer.h | 111 --- + src/seahorse-windows.h | 37 - + ssh/Makefile.am | 2 +- + ssh/seahorse-ssh-backend.c | 141 +++ + ssh/seahorse-ssh-backend.h | 48 + + ssh/seahorse-ssh-commands.c | 1 - + ssh/seahorse-ssh-generate.c | 11 +- + ssh/seahorse-ssh-key.c | 32 - + ssh/seahorse-ssh-key.h | 5 +- + ssh/seahorse-ssh-module.c | 45 - + ssh/seahorse-ssh-module.h | 30 - + ssh/seahorse-ssh-operation.c | 9 +- + ssh/seahorse-ssh-source.c | 197 ++-- + ssh/seahorse-ssh-source.h | 11 + + ssh/seahorse-ssh.h | 7 + + 149 files changed, 8951 insertions(+), 10627 deletions(-) + +commit 621bb4c0b3e9054846668b65294e21afd77a8dcc +Author: Stef Walter +Date: 2011-09-06 + + Implement GcrCollection contains virtual method. + + gkr/seahorse-gkr-keyring.c | 14 ++++++++++++++ + libseahorse/seahorse-collection.c | 19 +++++++++---------- + libseahorse/seahorse-collection.h | 3 --- + pgp/seahorse-pgp-key.c | 11 +++++++++++ + src/seahorse-key-manager.c | 3 ++- + 5 files changed, 36 insertions(+), 14 deletions(-) + +commit 8bd4f54370ce03c340616dcba07a249e0a16c065 +Author: Stef Walter +Date: 2011-09-05 + + Implement GcrCollection on PGP Keys and GKR keyrings + + * This way they show up properly as folders with tehir nested + contents inside. + * Fine tune some bits about how PGP keys are displayed. + + gkr/seahorse-gkr-item.c | 24 +++++- + gkr/seahorse-gkr-item.h | 3 +- + gkr/seahorse-gkr-keyring.c | 114 +++++++++++++++++---------- + gkr/seahorse-gkr-keyring.h | 5 +- + gkr/seahorse-gkr-operation.c | 3 +- + libseahorse/seahorse-collection.c | 7 -- + libseahorse/seahorse-object.c | 160 +------------------------------------- + libseahorse/seahorse-object.h | 7 -- + pgp/seahorse-gpgme-key.c | 2 +- + pgp/seahorse-gpgme-uid.c | 24 +++--- + pgp/seahorse-gpgme-uid.h | 3 +- + pgp/seahorse-hkp-source.c | 4 +- + pgp/seahorse-ldap-source.c | 5 +- + pgp/seahorse-pgp-commands.c | 11 ++- + pgp/seahorse-pgp-key.c | 68 ++++++++++++---- + pgp/seahorse-pgp-uid.c | 42 ++++++++-- + pgp/seahorse-pgp-uid.h | 7 +- + 17 files changed, 225 insertions(+), 264 deletions(-) + +commit efef15901be0b7541b552001caad485451946562 +Author: Stef Walter +Date: 2011-09-05 + + Use GcrCollectionModel instead of our own GtkTreeModel implementation. + + * More maintained code base and easier to integrate objects + from gcr. + * EAsier to format coluns how we want them without changing + the underlying objects. + * Split out SeahorsePredicate into its own header in preparation + for later work. + + configure.ac | 9 +- + gkr/seahorse-gkr-item-commands.c | 2 +- + gkr/seahorse-gkr-keyring-commands.c | 2 +- + gkr/seahorse-gkr-keyring.c | 5 +- + gkr/seahorse-gkr-source.c | 9 +- + libseahorse/Makefile.am | 6 +- + libseahorse/seahorse-collection.c | 329 ++++++++++++++ + libseahorse/seahorse-collection.h | 64 +++ + libseahorse/seahorse-combo-keys.c | 250 ++++++----- + libseahorse/seahorse-combo-keys.h | 4 +- + libseahorse/seahorse-context.c | 22 +- + libseahorse/seahorse-context.h | 6 +- + libseahorse/seahorse-object.c | 31 +- + libseahorse/seahorse-object.h | 22 - + libseahorse/seahorse-predicate.h | 56 +++ + libseahorse/seahorse-set-model.c | 840 ----------------------------------- + libseahorse/seahorse-set-model.h | 82 ---- + libseahorse/seahorse-set.c | 336 -------------- + libseahorse/seahorse-set.h | 109 ----- + libseahorse/seahorse-view.c | 12 +- + libseahorse/seahorse-view.h | 14 +- + pgp/seahorse-gpgme-key.c | 8 +- + pgp/seahorse-gpgme-sign.c | 31 +- + pgp/seahorse-pgp-commands.c | 4 +- + pgp/seahorse-pgp-key-properties.c | 2 +- + pgp/seahorse-pgp-key.c | 55 --- + pgp/seahorse-pgp-key.h | 6 - + pgp/seahorse-pgp-keysets.c | 40 +- + pgp/seahorse-pgp-keysets.h | 4 +- + pgp/seahorse-pgp-uid.c | 15 - + pgp/seahorse-pgp-uid.h | 3 - + pgp/seahorse-signer.c | 16 +- + pkcs11/Makefile.am | 2 - + pkcs11/seahorse-pkcs11-certificate.c | 61 +-- + pkcs11/seahorse-pkcs11-certificate.h | 6 - + pkcs11/seahorse-pkcs11-commands.c | 2 +- + pkcs11/seahorse-pkcs11-operations.c | 1 - + src/seahorse-key-manager-store.c | 619 ++++++++++++-------------- + src/seahorse-key-manager-store.h | 18 +- + src/seahorse-key-manager.c | 30 +- + src/seahorse-keyserver-results.c | 18 +- + src/seahorse-viewer.c | 52 ++- + src/seahorse-viewer.h | 5 +- + ssh/seahorse-ssh-commands.c | 2 +- + 44 files changed, 1048 insertions(+), 2162 deletions(-) + +commit f0b2be9cf0932931063602f550d9ff272c02e7ee +Author: Stef Walter +Date: 2011-09-05 + + Use icon theme instead of stock images. + + * Install seahorse icons properly as part of private icon theme. + * Use GIcon and icon name instead of stock images. + * Allows us to use custom GLoadableIcon renderers in the future. + + Makefile.am | 3 +- + configure.ac | 4 - + data/icons/Makefile.am | 20 +- + .../hicolor_apps_22x22_seahorse-key-personal.png | Bin 0 -> 1118 bytes + data/icons/hicolor_apps_22x22_seahorse-key-ssh.png | Bin 0 -> 1022 bytes + data/icons/hicolor_apps_22x22_seahorse-key.png | Bin 0 -> 686 bytes + data/icons/hicolor_apps_22x22_seahorse-person.png | Bin 0 -> 1128 bytes + .../hicolor_apps_48x48_seahorse-key-personal.png | Bin 0 -> 3181 bytes + data/icons/hicolor_apps_48x48_seahorse-key-ssh.png | Bin 0 -> 2836 bytes + data/icons/hicolor_apps_48x48_seahorse-key.png | Bin 0 -> 1794 bytes + data/icons/hicolor_apps_48x48_seahorse-person.png | Bin 0 -> 2908 bytes + .../hicolor_status_22x22_seahorse-sign-bad.png | Bin 0 -> 1254 bytes + .../hicolor_status_22x22_seahorse-sign-ok.png | Bin 0 -> 1197 bytes + data/icons/hicolor_status_22x22_seahorse-sign.png | Bin 0 -> 1156 bytes + .../hicolor_status_48x48_seahorse-sign-bad.png | Bin 0 -> 3698 bytes + .../hicolor_status_48x48_seahorse-sign-ok.png | Bin 0 -> 3476 bytes + .../hicolor_status_48x48_seahorse-sign-unknown.png | Bin 0 -> 3614 bytes + data/icons/hicolor_status_48x48_seahorse-sign.png | Bin 0 -> 3251 bytes + data/icons/svg/seahorse-key-22.svg | 357 +++ + data/icons/svg/seahorse-key-48.svg | 377 +++ + data/icons/svg/seahorse-key-personal-22.svg | 807 ++++++ + data/icons/svg/seahorse-key-personal-48.svg | 757 ++++++ + data/icons/svg/seahorse-key-ssh-22.svg | 1131 +++++++++ + data/icons/svg/seahorse-key-ssh-48.svg | 786 ++++++ + data/icons/svg/seahorse-person-22.svg | 532 ++++ + data/icons/svg/seahorse-person-48.svg | 467 ++++ + data/icons/svg/seahorse-sign-22.svg | 446 ++++ + data/icons/svg/seahorse-sign-48.svg | 441 ++++ + data/icons/svg/seahorse-sign-bad-22.svg | 588 +++++ + data/icons/svg/seahorse-sign-bad-48.svg | 599 +++++ + data/icons/svg/seahorse-sign-ok-22.svg | 751 ++++++ + data/icons/svg/seahorse-sign-ok-48.svg | 757 ++++++ + data/icons/svg/seahorse-sign-unknown-48.svg | 1289 ++++++++++ + gkr/Makefile.am | 6 +- + gkr/seahorse-gkr-item-properties.c | 4 +- + gkr/seahorse-gkr-item.c | 18 +- + gkr/seahorse-gkr-keyring-properties.c | 4 +- + gkr/seahorse-gkr-keyring.c | 11 +- + libseahorse/Makefile.am | 5 +- + libseahorse/seahorse-gtkstock.c | 229 -- + libseahorse/seahorse-gtkstock.h | 48 - + libseahorse/seahorse-icons.c | 48 + + libseahorse/seahorse-icons.h | 47 + + libseahorse/seahorse-object.c | 35 +- + libseahorse/seahorse-object.h | 5 +- + libseahorse/seahorse-prefs.c | 2 +- + libseahorse/seahorse-widget.c | 2 +- + pgp/Makefile.am | 1 - + pgp/seahorse-gpgme-generate.c | 8 +- + pgp/seahorse-gpgme-key.c | 2 +- + pgp/seahorse-gpgme-sign.c | 6 +- + pgp/seahorse-pgp-key-properties.c | 82 +- + pgp/seahorse-pgp-key.c | 13 +- + pgp/seahorse-pgp-uid.c | 2 +- + pixmaps/.gitignore | 2 - + pixmaps/22x22/.gitignore | 2 - + pixmaps/22x22/Makefile.am | 19 - + pixmaps/22x22/seahorse-key-personal.png | Bin 1118 -> 0 bytes + pixmaps/22x22/seahorse-key-personal.svg | 807 ------ + pixmaps/22x22/seahorse-key-ssh.png | Bin 1022 -> 0 bytes + pixmaps/22x22/seahorse-key-ssh.svg | 1131 --------- + pixmaps/22x22/seahorse-key.png | Bin 686 -> 0 bytes + pixmaps/22x22/seahorse-key.svg | 357 --- + pixmaps/22x22/seahorse-person.png | Bin 1128 -> 0 bytes + pixmaps/22x22/seahorse-person.svg | 532 ---- + pixmaps/22x22/seahorse-preferences.png | Bin 1320 -> 0 bytes + pixmaps/22x22/seahorse-preferences.svg | 1428 ----------- + pixmaps/22x22/seahorse-sign-bad.png | Bin 1254 -> 0 bytes + pixmaps/22x22/seahorse-sign-bad.svg | 588 ----- + pixmaps/22x22/seahorse-sign-ok.png | Bin 1197 -> 0 bytes + pixmaps/22x22/seahorse-sign-ok.svg | 751 ------ + pixmaps/22x22/seahorse-sign.png | Bin 1156 -> 0 bytes + pixmaps/22x22/seahorse-sign.svg | 446 ---- + pixmaps/22x22/seahorse.png | Bin 1015 -> 0 bytes + pixmaps/22x22/seahorse.svg | 2648 -------------------- + pixmaps/48x48/.gitignore | 2 - + pixmaps/48x48/Makefile.am | 12 - + pixmaps/48x48/seahorse-key-personal.png | Bin 3181 -> 0 bytes + pixmaps/48x48/seahorse-key-ssh.png | Bin 2836 -> 0 bytes + pixmaps/48x48/seahorse-key.png | Bin 1794 -> 0 bytes + pixmaps/48x48/seahorse-person.png | Bin 2908 -> 0 bytes + pixmaps/48x48/seahorse-preferences.png | Bin 3642 -> 0 bytes + pixmaps/48x48/seahorse-sign-bad.png | Bin 3698 -> 0 bytes + pixmaps/48x48/seahorse-sign-ok.png | Bin 3476 -> 0 bytes + pixmaps/48x48/seahorse-sign-unknown.png | Bin 3614 -> 0 bytes + pixmaps/48x48/seahorse-sign.png | Bin 3251 -> 0 bytes + pixmaps/48x48/seahorse.png | Bin 3538 -> 0 bytes + pixmaps/Makefile.am | 14 - + pixmaps/scalable/.gitignore | 2 - + pixmaps/scalable/Makefile.am | 11 - + pixmaps/scalable/seahorse-key-personal.svg | 757 ------ + pixmaps/scalable/seahorse-key-ssh.svg | 786 ------ + pixmaps/scalable/seahorse-key.svg | 377 --- + pixmaps/scalable/seahorse-person.svg | 467 ---- + pixmaps/scalable/seahorse-preferences.svg | 1250 --------- + pixmaps/scalable/seahorse-sign-bad.svg | 599 ----- + pixmaps/scalable/seahorse-sign-ok.svg | 757 ------ + pixmaps/scalable/seahorse-sign-unknown.svg | 1289 ---------- + pixmaps/scalable/seahorse-sign.svg | 441 ---- + pixmaps/scalable/seahorse.svg | 1209 --------- + pkcs11/Makefile.am | 1 - + src/Makefile.am | 3 - + src/seahorse-generate-select.c | 13 +- + src/seahorse-key-manager-store.c | 7 +- + src/seahorse-main.c | 6 +- + ssh/Makefile.am | 1 - + ssh/seahorse-ssh-generate.c | 4 +- + ssh/seahorse-ssh-key-properties.c | 4 +- + ssh/seahorse-ssh-key.c | 10 +- + ssh/seahorse-ssh-upload.c | 2 +- + 110 files changed, 10328 insertions(+), 17097 deletions(-) + +commit ba2e70d228fd3a3d7319490f9adc9e9c9a7d67ab +Merge: ddc3620 0cb0d5a +Author: Stef Walter +Date: 2011-10-20 + + Merge branch 'gnome-3-2' commit 0cb0d5abe4af9160bafe753296ff1dca46e54866 Author: Stef Walter @@ -69,8 +5164,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=662088 - pgp/seahorse-gpgme-source.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + pgp/seahorse-gpgme-source.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) commit 2015a379a95aeaafe70ceb6be14cc00ed16909ae Author: Stef Walter @@ -79,7 +5174,21 @@ Add gl help file translations help/gl/gl.po | 1085 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 1085 insertions(+), 0 deletions(-) + 1 file changed, 1085 insertions(+) + +commit ddc362006156e52a5314b3d085ef7e2c6b3f0c58 +Author: Stef Walter +Date: 2011-10-19 + + Remove useless seahorse-algo.c file + + * Use glib checksum functionality instead + + ssh/Makefile.am | 1 - + ssh/seahorse-algo.c | 243 -------------------------------------------- + ssh/seahorse-algo.h | 49 --------- + ssh/seahorse-ssh-key-data.c | 41 ++++---- + 4 files changed, 20 insertions(+), 314 deletions(-) commit c357d4523d1e06e97fab69e4c7b998f17a939943 Author: Stef Walter @@ -87,9 +5196,9 @@ Release version 3.2.1 - NEWS | 5 +++++ - configure.ac | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) commit 31ae954de467236c8e362c28a652faa1147520d2 Author: krishnababu k @@ -97,8 +5206,8 @@ Updated Telugu Translations - po/te.po | 2391 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1136 insertions(+), 1255 deletions(-) + po/te.po | 2395 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 1138 insertions(+), 1257 deletions(-) commit 7d848de2faac5803461993d2a480b8acd413f8bd Author: Wouter Bolsterlee @@ -107,7 +5216,7 @@ Updated Dutch translation by Wouter Bolsterlee po/nl.po | 2000 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 926 insertions(+), 1074 deletions(-) + 1 file changed, 926 insertions(+), 1074 deletions(-) commit bbe8ce65c4b09ac9afae8f09960dd5f352957bcb Author: Yaron Shahrabani @@ -115,8 +5224,8 @@ Updated Hebrew translation. - po/he.po | 2244 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1048 insertions(+), 1196 deletions(-) + po/he.po | 2242 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 1047 insertions(+), 1195 deletions(-) commit e22b3fbecd55a1e7646297f600ee57dcb4a15767 Author: Daniel Korostil @@ -125,7 +5234,7 @@ Uploaded Ukranian po/uk.po | 1977 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 918 insertions(+), 1059 deletions(-) + 1 file changed, 918 insertions(+), 1059 deletions(-) commit 7fd9268d25cab7f57db787999131b2617055e7da Author: Chao-Hsiung Liao @@ -133,8 +5242,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 462 +++++++++++++++++++++++++++++----------------------------- - po/zh_TW.po | 462 +++++++++++++++++++++++++++++----------------------------- + po/zh_HK.po | 462 ++++++++++++++++++++++++++++++------------------------------ + po/zh_TW.po | 462 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 462 insertions(+), 462 deletions(-) commit 58ec16588a0590f394436c7d5c1a30dbd4975f42 @@ -143,8 +5252,8 @@ [l10n]Updated Catalan (Valencian) translation - po/ca@valencia.po | 3541 ++++++++--------------------------------------------- - 1 files changed, 508 insertions(+), 3033 deletions(-) + po/ca@valencia.po | 3543 ++++++++--------------------------------------------- + 1 file changed, 509 insertions(+), 3034 deletions(-) commit cb1175797c705c9982b88954b7345834b591dbb8 Author: Tommi Vainikainen @@ -153,7 +5262,7 @@ Updated Finnish translation po/fi.po | 1413 +++++++++++++++++++++++++------------------------------------- - 1 files changed, 560 insertions(+), 853 deletions(-) + 1 file changed, 560 insertions(+), 853 deletions(-) commit fb317a15e1575f4a9f7b9afd3a041ecf9623de7a Author: Stef Walter @@ -161,9 +5270,9 @@ Release version 3.2.0 - NEWS | 7 +++++++ - configure.ac | 2 +- - 2 files changed, 8 insertions(+), 1 deletions(-) + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) commit 81e840705d6419d5389f4625764713ca07c9f39a Author: Stef Walter @@ -171,9 +5280,9 @@ Remove unused spec file - .gitignore | 1 - - seahorse.spec.in | 87 ------------------------------------------------------ - 2 files changed, 0 insertions(+), 88 deletions(-) + .gitignore | 1 - + seahorse.spec.in | 87 -------------------------------------------------------- + 2 files changed, 88 deletions(-) commit 45ffa1229a88c593a5ac4b995cf6ed4e0c12ee40 Author: Inaki Larranaga Murgoitio @@ -182,7 +5291,7 @@ Updated Basque language po/eu.po | 2257 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1059 insertions(+), 1198 deletions(-) + 1 file changed, 1059 insertions(+), 1198 deletions(-) commit fc73981cb127bd706c68bc85a13e6a05434fa1ee Author: Andika Triwidada @@ -190,8 +5299,8 @@ Updated Indonesian translation - po/id.po | 538 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 284 insertions(+), 254 deletions(-) + po/id.po | 538 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 284 insertions(+), 254 deletions(-) commit 8a5008f118f9179f7ccff426c1d1966f291bb235 Author: Marek Černocký @@ -199,8 +5308,8 @@ Updated Czech translation - po/cs.po | 480 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 241 insertions(+), 239 deletions(-) + po/cs.po | 480 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 241 insertions(+), 239 deletions(-) commit 53e9dcacd23bda33d5bbacf88c442f24cfa7c728 Author: Marek Černocký @@ -209,7 +5318,7 @@ Updated Czech translation po/cs.po | 1540 +++++++++++++++++++------------------------------------------- - 1 files changed, 476 insertions(+), 1064 deletions(-) + 1 file changed, 476 insertions(+), 1064 deletions(-) commit d8a6075a50ba2a2fdc027cd0a54a078c38964f86 Author: A S Alam @@ -217,8 +5326,8 @@ update Punjabi Translation - po/pa.po | 490 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 238 insertions(+), 252 deletions(-) + po/pa.po | 490 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 238 insertions(+), 252 deletions(-) commit 31cf27156571ed8b8bd5b3c81f5b25f9aaa6b7e9 Author: Changwoo Ryu @@ -227,7 +5336,7 @@ Updated Korean translation po/ko.po | 1959 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 906 insertions(+), 1053 deletions(-) + 1 file changed, 906 insertions(+), 1053 deletions(-) commit 7571e39141ea3536971f8845a7e9a009786c4395 Author: Flemming Christensen @@ -236,7 +5345,7 @@ Updated Danish translation po/da.po | 2015 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 933 insertions(+), 1082 deletions(-) + 1 file changed, 933 insertions(+), 1082 deletions(-) commit dd9c91a388504d787612397eca1673c38e2f39da Author: Gabor Kelemen @@ -245,7 +5354,7 @@ Updated Hungarian translation po/hu.po | 2007 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 936 insertions(+), 1071 deletions(-) + 1 file changed, 936 insertions(+), 1071 deletions(-) commit 6bb4265f152be1170e4b338b6778e6582908991b Author: Fran Dieguez @@ -254,7 +5363,7 @@ Added Galician translations for doc help/gl.po | 1409 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 1409 insertions(+), 0 deletions(-) + 1 file changed, 1409 insertions(+) commit 6fc0a479d6d2ec4cd87e6e989a8634c4db106c1f Author: Fran Dieguez @@ -262,8 +5371,8 @@ Added Galician translations for doc - help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 369cf23150cec937e6b19155164e27e6f3a0a462 Author: Мирослав Николић @@ -282,7 +5391,7 @@ [l10n]Updated Catalan translation po/ca.po | 2998 +++++++------------------------------------------------------- - 1 files changed, 301 insertions(+), 2697 deletions(-) + 1 file changed, 301 insertions(+), 2697 deletions(-) commit 664a45674906fb4d639c4bcb228f20b0f61e4456 Author: Bruce Cowan @@ -290,8 +5399,8 @@ Updated British English translation - po/en_GB.po | 120 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 60 insertions(+), 60 deletions(-) + po/en_GB.po | 120 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 60 insertions(+), 60 deletions(-) commit 2beffcb13f6edc54f9515781988747952d5838f1 Author: Rudolfs Mazurs @@ -299,8 +5408,8 @@ Updated Latvian translation. - po/lv.po | 493 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 240 insertions(+), 253 deletions(-) + po/lv.po | 493 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 240 insertions(+), 253 deletions(-) commit bc094e7e81e56f53c0c027b49576b1f90b8eb40f Author: Daniel Nylander @@ -308,8 +5417,8 @@ Updated Swedish translation - po/sv.po | 640 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 306 insertions(+), 334 deletions(-) + po/sv.po | 640 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 306 insertions(+), 334 deletions(-) commit a5195bbd5af3d8e987a0301840299ca771d9a54f Author: Theppitak Karoonboonyanan @@ -318,7 +5427,7 @@ Updated Thai translation. po/th.po | 1969 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 908 insertions(+), 1061 deletions(-) + 1 file changed, 908 insertions(+), 1061 deletions(-) commit 0d9afcd4fa99efc62638ac1be6d10e7c637a678f Author: Aurimas Černius @@ -326,8 +5435,8 @@ Updated Lithuanian translation - po/lt.po | 577 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 282 insertions(+), 295 deletions(-) + po/lt.po | 577 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 282 insertions(+), 295 deletions(-) commit a05ff87f2f1f6e23dc7eb70ef915e2c2b5517f0d Author: Stef Walter @@ -335,8 +5444,8 @@ Properly null terminate the string array returned for DNS-SD - libseahorse/seahorse-dns-sd.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + libseahorse/seahorse-dns-sd.c | 1 + + 1 file changed, 1 insertion(+) commit cde40a9d259edf736ccaf4f8d2c096a2210f51ef Author: Stef Walter @@ -344,8 +5453,8 @@ Fix the key sharing DNS-SD type to match that of seahorse-sharing - libseahorse/seahorse-dns-sd.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libseahorse/seahorse-dns-sd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 88ef4a706b38caa00760f18899f452b6f095e6c9 Author: Dr.T.Vasudevan @@ -353,8 +5462,8 @@ updated Tamil translation - po/ta.po | 120 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 60 insertions(+), 60 deletions(-) + po/ta.po | 120 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 60 insertions(+), 60 deletions(-) commit 2dfdcd5be257a1c43314b4f5eaa884f8c6eb2812 Author: Stef Walter @@ -362,9 +5471,9 @@ Release 3.1.92 - Makefile.am | 2 -- - NEWS | 10 ++++++++++ - configure.ac | 2 +- + Makefile.am | 2 -- + NEWS | 10 ++++++++++ + configure.ac | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) commit a1cf984555131378d3608644ae938847bb94ee11 @@ -373,8 +5482,8 @@ Updated Bulgarian translation - po/bg.po | 111 ++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 51 insertions(+), 60 deletions(-) + po/bg.po | 111 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 51 insertions(+), 60 deletions(-) commit e1e1990d656219689bc2921994976473826715de Author: Yuri Myasoedov @@ -382,8 +5491,8 @@ Updated Russian translation - po/ru.po | 630 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 281 insertions(+), 349 deletions(-) + po/ru.po | 630 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 281 insertions(+), 349 deletions(-) commit 828d64578879894da65e578225b553679de101d6 Author: Matej Urbančič @@ -391,8 +5500,8 @@ Updated Slovenian translation - po/sl.po | 124 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 63 insertions(+), 61 deletions(-) + po/sl.po | 124 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 63 insertions(+), 61 deletions(-) commit 6a4519b1e47b82cfe0bd759dc65bc384553d6ce1 Author: Kjartan Maraas @@ -400,8 +5509,8 @@ Updated Norwegian bokmål translation - po/nb.po | 575 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 260 insertions(+), 315 deletions(-) + po/nb.po | 575 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 260 insertions(+), 315 deletions(-) commit 627dc25390eb36ee3e2102b66301615307e34bb3 Author: Yinghua Wang @@ -409,8 +5518,8 @@ update Simplified Chinese (zh_CN) translation - po/zh_CN.po | 209 ++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 107 insertions(+), 102 deletions(-) + po/zh_CN.po | 209 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 107 insertions(+), 102 deletions(-) commit 18142f5b1edaece4cd1dd231dc775dfd3a2b24b6 Author: Jiro Matsuzawa @@ -418,8 +5527,8 @@ Updated Japanese translation - po/ja.po | 2092 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 989 insertions(+), 1103 deletions(-) + po/ja.po | 2096 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 991 insertions(+), 1105 deletions(-) commit bee1183d917e49bdc41ec7539ef43885cee17a1e Author: Duarte Loreto @@ -427,8 +5536,8 @@ Updated Portuguese translation - po/pt.po | 120 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 60 insertions(+), 60 deletions(-) + po/pt.po | 120 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 60 insertions(+), 60 deletions(-) commit 64ac91ea6f4d528349b1fedc267d6a874d9aa2ca Author: Mario Blättermann @@ -437,7 +5546,7 @@ [l10n] Updated German translation po/de.po | 1046 +++++++++++++++++--------------------------------------------- - 1 files changed, 279 insertions(+), 767 deletions(-) + 1 file changed, 279 insertions(+), 767 deletions(-) commit 74ffeef74dd06ae167ecf51546ef6ecee4403356 Author: Milo Casagrande @@ -445,8 +5554,8 @@ [l10n] Updated Italian translation - po/it.po | 111 ++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 51 insertions(+), 60 deletions(-) + po/it.po | 111 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 51 insertions(+), 60 deletions(-) commit 41c4171d9a8baf5a8291b2bfefd476af41892c7b Author: Antonio Fernandes C. Neto @@ -454,8 +5563,8 @@ Updated Brazilian Portuguese translation. - po/pt_BR.po | 2014 +++++++++++++++++------------------------------------------ - 1 files changed, 585 insertions(+), 1429 deletions(-) + po/pt_BR.po | 2020 +++++++++++++++++------------------------------------------ + 1 file changed, 588 insertions(+), 1432 deletions(-) commit 6757203ae228f141dc7c19b45c104e54fe1151b6 Author: Fran Dieguez @@ -463,8 +5572,8 @@ Updated Galician translations - po/gl.po | 470 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 235 insertions(+), 235 deletions(-) + po/gl.po | 470 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 235 insertions(+), 235 deletions(-) commit ab49fc897ae0d57063f745b381f9d01546372ceb Author: Piotr Drąg @@ -472,8 +5581,8 @@ Updated Polish translation - po/pl.po | 111 ++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 51 insertions(+), 60 deletions(-) + po/pl.po | 111 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 51 insertions(+), 60 deletions(-) commit a16bb1ce6ab053d7e572afb27008590cfc831af3 Author: Alexandre Franke @@ -481,8 +5590,8 @@ Update French translation - po/fr.po | 578 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 262 insertions(+), 316 deletions(-) + po/fr.po | 578 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 262 insertions(+), 316 deletions(-) commit c04bd797a85352ca4fbee541d1ce1f106fc1a574 Author: Saleem Abdulrasool @@ -490,9 +5599,9 @@ doc: fix types to reflect reality - libseahorse/seahorse-context.h | 2 +- - libseahorse/seahorse-set.h | 2 +- - libseahorse/seahorse-widget.h | 2 +- + libseahorse/seahorse-context.h | 2 +- + libseahorse/seahorse-set.h | 2 +- + libseahorse/seahorse-widget.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit c305f8c00d654cf9c01cb0ec6789ac92ee731691 @@ -501,8 +5610,8 @@ Updated Spanish translation - po/es.po | 624 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 305 insertions(+), 319 deletions(-) + po/es.po | 624 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 305 insertions(+), 319 deletions(-) commit 8f165666aacb2403395f9fdc739a1b2ec294ddde Author: Stef Walter @@ -520,13 +5629,13 @@ * Close key generation and upload dialogs before we start ssh operations. - ssh/seahorse-ssh-askpass.c | 158 +++++++++--------- - ssh/seahorse-ssh-generate.c | 16 +- - ssh/seahorse-ssh-generate.xml | 1 - - ssh/seahorse-ssh-operation.c | 363 +++++++---------------------------------- - ssh/seahorse-ssh-source.c | 86 +++++++--- - ssh/seahorse-ssh-upload.c | 5 +- - 6 files changed, 205 insertions(+), 424 deletions(-) + ssh/seahorse-ssh-askpass.c | 170 ++++++++++---------- + ssh/seahorse-ssh-generate.c | 16 +- + ssh/seahorse-ssh-generate.xml | 1 - + ssh/seahorse-ssh-operation.c | 363 +++++++----------------------------------- + ssh/seahorse-ssh-source.c | 86 +++++++--- + ssh/seahorse-ssh-upload.c | 5 +- + 6 files changed, 211 insertions(+), 430 deletions(-) commit 007580d02e32ccc6165de15c64843bdfa2d0f362 Author: Stef Walter @@ -537,8 +5646,8 @@ * If confirmed passwords don't match don't allow the key to complete the password prompt. - libseahorse/seahorse-passphrase.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + libseahorse/seahorse-passphrase.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit aa850691116f103d96a4d5dfd26a50993c927915 Author: Stef Walter @@ -548,9 +5657,9 @@ * Needed some additional properties in order not to fail with warnings. - libseahorse/seahorse-add-keyserver.xml | 2 ++ - pgp/seahorse-pgp-generate.xml | 2 ++ - ssh/seahorse-ssh-generate.xml | 16 ++-------------- + libseahorse/seahorse-add-keyserver.xml | 2 ++ + pgp/seahorse-pgp-generate.xml | 2 ++ + ssh/seahorse-ssh-generate.xml | 16 ++-------------- 3 files changed, 6 insertions(+), 14 deletions(-) commit c51ac5059693fb3468435cf1f02623e9195f064f @@ -560,7 +5669,7 @@ Updated Bulgarian translation po/bg.po | 1542 +++++++++++++++++++------------------------------------------- - 1 files changed, 476 insertions(+), 1066 deletions(-) + 1 file changed, 476 insertions(+), 1066 deletions(-) commit 90e85e54abdffcda9977ce5ef6e1dda55e441d33 Author: Yinghua Wang @@ -568,8 +5677,8 @@ update Simplified Chinese (zh_CN) translation - po/zh_CN.po | 594 +++++++++++++++++++++++++++++------------------------------ - 1 files changed, 289 insertions(+), 305 deletions(-) + po/zh_CN.po | 594 +++++++++++++++++++++++++++++------------------------------- + 1 file changed, 289 insertions(+), 305 deletions(-) commit 43b8ad7a7e0e3faf9cb9c0ff1c817459c70a6f9f Author: Dr.T.Vasudevan @@ -577,8 +5686,8 @@ updated Tamil translation - po/ta.po | 2071 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 969 insertions(+), 1102 deletions(-) + po/ta.po | 2065 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 966 insertions(+), 1099 deletions(-) commit ed48412b7b320b5b52809af75fab65b2b2c3e985 Author: Milo Casagrande @@ -587,7 +5696,7 @@ [l10n] Updated Italian translation po/it.po | 1487 +++++++++++++++++++------------------------------------------- - 1 files changed, 443 insertions(+), 1044 deletions(-) + 1 file changed, 443 insertions(+), 1044 deletions(-) commit b4122341b8f4127c8ea3ffec510af2d534b97081 Author: Rudolfs Mazurs @@ -596,7 +5705,7 @@ Updated Latvian translation. po/lv.po | 1927 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 901 insertions(+), 1026 deletions(-) + 1 file changed, 901 insertions(+), 1026 deletions(-) commit 5500d11bcc22c9516f2b0537b6a72f796ebc1100 Author: Javier Jardón @@ -607,8 +5716,8 @@ See https://mail.gnome.org/archives/desktop-devel-list/2011-September/msg00064.html - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit f75f784740b56865f7318d7f1563238da1282fd8 Author: Duarte Loreto @@ -617,7 +5726,7 @@ Updated Portuguese translation po/pt.po | 1933 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 892 insertions(+), 1041 deletions(-) + 1 file changed, 892 insertions(+), 1041 deletions(-) commit 01d8cc12a22742a9782fc73b6967423f96e593b3 Author: Piotr Drąg @@ -626,7 +5735,7 @@ Updated Polish translation po/pl.po | 1483 +++++++++++++++++++------------------------------------------- - 1 files changed, 444 insertions(+), 1039 deletions(-) + 1 file changed, 444 insertions(+), 1039 deletions(-) commit dbe3be58567c3e77a198de5f45e534f81b87e914 Author: Bruce Cowan @@ -635,7 +5744,7 @@ Updated British English translation po/en_GB.po | 1919 +++++++++++++++++++++++++++-------------------------------- - 1 files changed, 885 insertions(+), 1034 deletions(-) + 1 file changed, 885 insertions(+), 1034 deletions(-) commit bebce393a78b1122943b5c823f9673ebe23dde25 Author: A S Alam @@ -644,7 +5753,7 @@ update PunjabiTranslation po/pa.po | 1910 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 881 insertions(+), 1029 deletions(-) + 1 file changed, 881 insertions(+), 1029 deletions(-) commit 6547bb8fa124ab620e4f07fb9d77eb88fa762d42 Author: Matej Urbančič @@ -653,7 +5762,7 @@ Updated Slovenian translation po/sl.po | 1946 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 930 insertions(+), 1016 deletions(-) + 1 file changed, 930 insertions(+), 1016 deletions(-) commit 1da843ada29dba8e914fd90b375e1bdc30cf8369 Author: Stef Walter @@ -661,48 +5770,48 @@ Stricter warnings about declarations, and fix issues. - configure.ac | 40 +++++-- - gkr/seahorse-gkr-add-item.c | 23 +++- - gkr/seahorse-gkr-add-keyring.c | 16 ++- - gkr/seahorse-gkr-item-properties.c | 39 ++++-- - gkr/seahorse-gkr-item.c | 15 +-- - gkr/seahorse-gkr-keyring-properties.c | 9 +- - gkr/seahorse-gkr-keyring.c | 2 +- - libseahorse/seahorse-context.c | 2 +- - libseahorse/seahorse-dns-sd.c | 2 +- - libseahorse/seahorse-dns-sd.h | 4 +- - libseahorse/seahorse-keyserver-control.h | 2 + - libseahorse/seahorse-prefs.c | 23 +++- - libseahorse/seahorse-set-model.c | 2 +- - libseahorse/seahorse-util.c | 42 ------ - libseahorse/seahorse-widget.h | 2 +- - pgp/seahorse-gpg-options.c | 2 +- - pgp/seahorse-gpg-options.h | 2 +- - pgp/seahorse-gpgme-add-subkey.c | 21 +++- - pgp/seahorse-gpgme-add-uid.c | 21 +++- - pgp/seahorse-gpgme-expires.c | 14 ++- - pgp/seahorse-gpgme-generate.c | 30 ++++- - pgp/seahorse-gpgme-photos.c | 2 +- - pgp/seahorse-gpgme-revoke.c | 8 +- - pgp/seahorse-gpgme-sign.c | 13 ++- - pgp/seahorse-gpgme-source.h | 2 +- - pgp/seahorse-hkp-source.c | 4 +- - pgp/seahorse-pgp-key-properties.c | 206 ++++++++++++++++++++++++----- - pgp/seahorse-pgp-keysets.c | 4 +- - pgp/seahorse-pgp-keysets.h | 2 +- - pgp/seahorse-signer.c | 1 + - pkcs11/seahorse-pkcs11-certificate.c | 2 +- - pkcs11/seahorse-pkcs11-certificate.h | 2 + - src/seahorse-key-manager-store.h | 2 + - src/seahorse-key-manager.c | 18 +++ - src/seahorse-keyserver-results.c | 7 + - src/seahorse-keyserver-search.c | 10 ++- - src/seahorse-keyserver-sync.c | 6 + - src/seahorse-viewer.c | 3 + - ssh/seahorse-ssh-key-data.c | 2 +- - ssh/seahorse-ssh-key-properties.c | 17 +++ - ssh/seahorse-ssh-upload.c | 4 + - 41 files changed, 468 insertions(+), 160 deletions(-) + configure.ac | 42 +++++-- + gkr/seahorse-gkr-add-item.c | 23 +++- + gkr/seahorse-gkr-add-keyring.c | 16 ++- + gkr/seahorse-gkr-item-properties.c | 39 +++--- + gkr/seahorse-gkr-item.c | 15 +-- + gkr/seahorse-gkr-keyring-properties.c | 9 +- + gkr/seahorse-gkr-keyring.c | 2 +- + libseahorse/seahorse-context.c | 2 +- + libseahorse/seahorse-dns-sd.c | 2 +- + libseahorse/seahorse-dns-sd.h | 4 +- + libseahorse/seahorse-keyserver-control.h | 2 + + libseahorse/seahorse-prefs.c | 23 +++- + libseahorse/seahorse-set-model.c | 2 +- + libseahorse/seahorse-util.c | 42 ------- + libseahorse/seahorse-widget.h | 2 +- + pgp/seahorse-gpg-options.c | 2 +- + pgp/seahorse-gpg-options.h | 2 +- + pgp/seahorse-gpgme-add-subkey.c | 21 +++- + pgp/seahorse-gpgme-add-uid.c | 21 +++- + pgp/seahorse-gpgme-expires.c | 14 ++- + pgp/seahorse-gpgme-generate.c | 30 ++++- + pgp/seahorse-gpgme-photos.c | 2 +- + pgp/seahorse-gpgme-revoke.c | 8 +- + pgp/seahorse-gpgme-sign.c | 13 +- + pgp/seahorse-gpgme-source.h | 2 +- + pgp/seahorse-hkp-source.c | 4 +- + pgp/seahorse-pgp-key-properties.c | 206 +++++++++++++++++++++++++------ + pgp/seahorse-pgp-keysets.c | 4 +- + pgp/seahorse-pgp-keysets.h | 2 +- + pgp/seahorse-signer.c | 1 + + pkcs11/seahorse-pkcs11-certificate.c | 2 +- + pkcs11/seahorse-pkcs11-certificate.h | 2 + + src/seahorse-key-manager-store.h | 2 + + src/seahorse-key-manager.c | 18 +++ + src/seahorse-keyserver-results.c | 7 ++ + src/seahorse-keyserver-search.c | 10 +- + src/seahorse-keyserver-sync.c | 6 + + src/seahorse-viewer.c | 3 + + ssh/seahorse-ssh-key-data.c | 2 +- + ssh/seahorse-ssh-key-properties.c | 17 +++ + ssh/seahorse-ssh-upload.c | 4 + + 41 files changed, 469 insertions(+), 161 deletions(-) commit bd364996e61709247c36c448f881b103462bc137 Author: Stef Walter @@ -712,8 +5821,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=656297 - libseahorse/seahorse-set.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + libseahorse/seahorse-set.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) commit 41ab356fbdde20b81c620b0d8c32837ec7ed36dc Author: Chao-Hsiung Liao @@ -721,8 +5830,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 256 ++++++++++++++++++++++++++++------------------------------- - po/zh_TW.po | 256 ++++++++++++++++++++++++++++------------------------------- + po/zh_HK.po | 256 ++++++++++++++++++++++++++++-------------------------------- + po/zh_TW.po | 256 ++++++++++++++++++++++++++++-------------------------------- 2 files changed, 242 insertions(+), 270 deletions(-) commit 235cd92563b2cea58673474b3649727aec1ca506 @@ -731,8 +5840,8 @@ Updated Indonesian translation - po/id.po | 445 ++++++++++++++++++++++++-------------------------------------- - 1 files changed, 169 insertions(+), 276 deletions(-) + po/id.po | 445 ++++++++++++++++++++++++--------------------------------------- + 1 file changed, 169 insertions(+), 276 deletions(-) commit e235682d1cc6ee06cb3d409838d917a758e25e48 Author: Piotr Drąg @@ -740,8 +5849,8 @@ Fixed ms.po - po/ms.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/ms.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit f43577a2e877b4fbffa3ba7c7d56da60d1dc6638 Author: Alexandre Franke @@ -749,8 +5858,8 @@ Update French translation - help/fr/fr.po | 221 +++++++++++++++++++++++++++------------------------------ - 1 files changed, 105 insertions(+), 116 deletions(-) + help/fr/fr.po | 223 ++++++++++++++++++++++++++++------------------------------ + 1 file changed, 106 insertions(+), 117 deletions(-) commit 628bd81564eb9c766f8c10a5479b681fe6278b15 Author: Stef Walter @@ -758,9 +5867,9 @@ Release version 3.1.91 - NEWS | 8 ++++++++ - configure.ac | 2 +- - 2 files changed, 9 insertions(+), 1 deletions(-) + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) commit 643eb736085bc13d9314383a53d9808d711c936c Author: Fran Dieguez @@ -768,8 +5877,8 @@ Updated galician translations - po/gl.po | 263 +++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 125 insertions(+), 138 deletions(-) + po/gl.po | 263 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 125 insertions(+), 138 deletions(-) commit 344a2c887cc2a6da7c9f332c67347fc9ea8ca8ab Author: Fran Dieguez @@ -777,8 +5886,8 @@ Updated galician translations - po/gl.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/gl.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0fd2ce2b71d2f4b9006c44c5c9d69e33cfd96d48 Author: Aurimas Černius @@ -787,7 +5896,7 @@ Updated Lithuanian translation po/lt.po | 2445 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1129 insertions(+), 1316 deletions(-) + 1 file changed, 1129 insertions(+), 1316 deletions(-) commit c4093fe3b8b33acbde86e6f8e07f3a949c493ca7 Author: Stef Walter @@ -797,8 +5906,8 @@ * Removed a bunch of version dependent #ifdefs for drag and drop - src/seahorse-key-manager-store.c | 65 +++++++++++--------------------------- - 1 files changed, 19 insertions(+), 46 deletions(-) + src/seahorse-key-manager-store.c | 65 ++++++++++++---------------------------- + 1 file changed, 19 insertions(+), 46 deletions(-) commit 3bb6be0e1b87d41356bbfe9f1af3d9a4024d1231 Author: Stef Walter @@ -808,11 +5917,11 @@ * Use accessor functions in SeahorseCommands and SeahorseViewer - gkr/seahorse-gkr-item-commands.c | 6 ++-- - gkr/seahorse-gkr-keyring-commands.c | 46 ++++++++++++++-------------------- - pkcs11/seahorse-pkcs11-commands.c | 6 ++-- - src/seahorse-viewer.c | 10 ++++---- - ssh/seahorse-ssh-commands.c | 2 +- + gkr/seahorse-gkr-item-commands.c | 6 ++--- + gkr/seahorse-gkr-keyring-commands.c | 46 +++++++++++++++---------------------- + pkcs11/seahorse-pkcs11-commands.c | 6 ++--- + src/seahorse-viewer.c | 10 ++++---- + ssh/seahorse-ssh-commands.c | 2 +- 5 files changed, 31 insertions(+), 39 deletions(-) commit 9fc6e666e03a85aea07cd391fc3c55132ea63490 @@ -823,10 +5932,10 @@ * Unneeded - libseahorse/seahorse-view.c | 15 +-------------- - libseahorse/seahorse-view.h | 6 +----- - src/seahorse-viewer.c | 20 +------------------- - src/seahorse-viewer.h | 6 +----- + libseahorse/seahorse-view.c | 15 +-------------- + libseahorse/seahorse-view.h | 6 +----- + src/seahorse-viewer.c | 20 +------------------- + src/seahorse-viewer.h | 6 +----- 4 files changed, 4 insertions(+), 43 deletions(-) commit 117f062ef433f3d2f89ed431a46b7da88c47fa7c @@ -837,15 +5946,15 @@ * This is not used by seahorse (used to be used by seahorse-daemon) - gkr/seahorse-gkr-item.c | 9 --- - gkr/seahorse-gkr-keyring.c | 1 - - libseahorse/seahorse-object.c | 141 +---------------------------------------- - libseahorse/seahorse-object.h | 7 -- - pgp/seahorse-gpgme-expires.c | 2 +- - pgp/seahorse-pgp-key.c | 5 +- - pgp/seahorse-pgp-subkey.c | 4 +- - pgp/seahorse-pgp-subkey.h | 4 +- - ssh/seahorse-ssh-key.c | 12 +--- + gkr/seahorse-gkr-item.c | 9 --- + gkr/seahorse-gkr-keyring.c | 1 - + libseahorse/seahorse-object.c | 141 +----------------------------------------- + libseahorse/seahorse-object.h | 7 --- + pgp/seahorse-gpgme-expires.c | 2 +- + pgp/seahorse-pgp-key.c | 5 +- + pgp/seahorse-pgp-subkey.c | 4 +- + pgp/seahorse-pgp-subkey.h | 4 +- + ssh/seahorse-ssh-key.c | 12 +--- 9 files changed, 11 insertions(+), 174 deletions(-) commit 3d2130f23c5d9afa15ebfc40eec5a5449558671b @@ -857,27 +5966,27 @@ * These are almost always generally called from within their own component, so these don't need to be virtual. - gkr/seahorse-gkr-item-properties.c | 2 +- - gkr/seahorse-gkr-item.c | 55 ++++++----------- - gkr/seahorse-gkr-item.h | 4 + - gkr/seahorse-gkr-keyring.c | 24 ++------ - gkr/seahorse-gkr-keyring.h | 4 + - libseahorse/seahorse-object.c | 106 +-------------------------------- - libseahorse/seahorse-object.h | 10 --- - pgp/seahorse-gpgme-key.c | 54 +++++++++--------- - pgp/seahorse-gpgme-key.h | 4 + - pgp/seahorse-pgp-key-properties.c | 7 +-- - pgp/seahorse-pgp-key.c | 31 ++++------ - pgp/seahorse-pgp-key.h | 2 + - pgp/seahorse-pgp-uid.c | 30 ++++++---- - pgp/seahorse-pgp-uid.h | 2 + - pkcs11/seahorse-pkcs11-certificate.c | 18 ++---- - pkcs11/seahorse-pkcs11-object.c | 24 ++------ - pkcs11/seahorse-pkcs11-object.h | 4 + - pkcs11/seahorse-pkcs11-source.c | 2 +- - ssh/seahorse-ssh-key.c | 10 +-- - ssh/seahorse-ssh-key.h | 2 + - ssh/seahorse-ssh-operation.c | 4 +- + gkr/seahorse-gkr-item-properties.c | 2 +- + gkr/seahorse-gkr-item.c | 55 +++++++----------- + gkr/seahorse-gkr-item.h | 4 ++ + gkr/seahorse-gkr-keyring.c | 24 ++------ + gkr/seahorse-gkr-keyring.h | 4 ++ + libseahorse/seahorse-object.c | 106 ++--------------------------------- + libseahorse/seahorse-object.h | 10 ---- + pgp/seahorse-gpgme-key.c | 54 +++++++++--------- + pgp/seahorse-gpgme-key.h | 4 ++ + pgp/seahorse-pgp-key-properties.c | 7 +-- + pgp/seahorse-pgp-key.c | 31 ++++------ + pgp/seahorse-pgp-key.h | 2 + + pgp/seahorse-pgp-uid.c | 30 +++++----- + pgp/seahorse-pgp-uid.h | 2 + + pkcs11/seahorse-pkcs11-certificate.c | 18 ++---- + pkcs11/seahorse-pkcs11-object.c | 24 +++----- + pkcs11/seahorse-pkcs11-object.h | 4 ++ + pkcs11/seahorse-pkcs11-source.c | 2 +- + ssh/seahorse-ssh-key.c | 10 +--- + ssh/seahorse-ssh-key.h | 2 + + ssh/seahorse-ssh-operation.c | 4 +- 21 files changed, 130 insertions(+), 269 deletions(-) commit 5705c613665238aa3566f937c74628be4d1b153d @@ -888,8 +5997,8 @@ * seahorse_set_model_iter_nth_child gets called with NULL iter. - libseahorse/seahorse-set-model.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libseahorse/seahorse-set-model.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d61e6086f5b62c2e20636fd9a877c3f6952bc23c Author: Yuri Myasoedov @@ -898,7 +6007,7 @@ Updated Russian translation po/ru.po | 1446 +++++++++++++++++++++----------------------------------------- - 1 files changed, 481 insertions(+), 965 deletions(-) + 1 file changed, 481 insertions(+), 965 deletions(-) commit a66174fa084df5b91beeadcc00adc2a3dd7eba24 Author: Mario Blättermann @@ -906,8 +6015,8 @@ [l10n] Updated German doc translation - help/de/de.po | 582 +++++---------------------------------------------------- - 1 files changed, 51 insertions(+), 531 deletions(-) + help/de/de.po | 582 +++++----------------------------------------------------- + 1 file changed, 51 insertions(+), 531 deletions(-) commit f4b5e86c730dc578ea388bb2796b4bd2242d7690 Author: Daniel Nylander @@ -915,8 +6024,8 @@ Updated Swedish translation - po/sv.po | 37 ++++++++++++++++++------------------- - 1 files changed, 18 insertions(+), 19 deletions(-) + po/sv.po | 37 ++++++++++++++++++------------------- + 1 file changed, 18 insertions(+), 19 deletions(-) commit 6d88ff7e991b830892b4fe58ab16a74fb0240c13 Author: Claude Paroz @@ -927,7 +6036,7 @@ Contributed by Alexandre Franke and Claude Paroz po/fr.po | 1499 +++++++++++++++++++------------------------------------------- - 1 files changed, 448 insertions(+), 1051 deletions(-) + 1 file changed, 448 insertions(+), 1051 deletions(-) commit 4ad3526bf1c8b84bf6952b0a345299b09d48261d Author: Kjartan Maraas @@ -935,8 +6044,8 @@ Added Norwegian bokmål translation - po/nb.po | 29 +++++++++++------------------ - 1 files changed, 11 insertions(+), 18 deletions(-) + po/nb.po | 29 +++++++++++------------------ + 1 file changed, 11 insertions(+), 18 deletions(-) commit 930ac244c55a3759f5b17ad22db7fb8a83691b0c Author: Jorge González @@ -944,8 +6053,8 @@ Updated Spanish translation - help/es/es.po | 61 ++++++++++++++++++++++++-------------------------------- - 1 files changed, 26 insertions(+), 35 deletions(-) + help/es/es.po | 61 +++++++++++++++++++++++++---------------------------------- + 1 file changed, 26 insertions(+), 35 deletions(-) commit 4df2b409e2f05895bc71f6d1ce6e8b0ff04efcb9 Author: Jorge González @@ -953,9 +6062,9 @@ Updated Spanish translation - help/es/es.po | 237 +++++++++++++++++++--------------- - po/es.po | 398 ++++++++++++++++++++++++++++----------------------------- - 2 files changed, 326 insertions(+), 309 deletions(-) + help/es/es.po | 239 +++++++++++++++++++---------------- + po/es.po | 398 ++++++++++++++++++++++++++++------------------------------ + 2 files changed, 327 insertions(+), 310 deletions(-) commit 9042815fdb31e8d45b19c50db01c12d68a482958 Author: Stef Walter @@ -963,10 +6072,10 @@ Fix up for GTK+3 deprecations of GtkHBox and GtkVBox - libegg/egg-datetime.c | 10 +++++----- - libegg/egg-datetime.h | 4 ++-- - libseahorse/seahorse-passphrase.c | 6 +++--- - src/seahorse-key-manager.c | 2 +- + libegg/egg-datetime.c | 10 +++++----- + libegg/egg-datetime.h | 4 ++-- + libseahorse/seahorse-passphrase.c | 6 +++--- + src/seahorse-key-manager.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) commit 3ddfcdb14026644c8c580d6f51c68b314a3d203f @@ -975,8 +6084,8 @@ Paper bag release: Actually update the version to 3.1.90 - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d1ceedb2798d371f5f2c96d0f20afd994c659d3c Author: Stef Walter @@ -984,16 +6093,16 @@ Release version 3.1.90 - Makefile.am | 4 +- - NEWS | 12 + - configure.ac | 4 - - reference/.gitignore | 3 - - reference/Makefile.am | 1 - - reference/libseahorse/.gitignore | 16 - - reference/libseahorse/Makefile.am | 61 --- - reference/libseahorse/libseahorse-docs.sgml | 65 --- - reference/libseahorse/libseahorse-sections.txt | 598 ------------------------ - reference/libseahorse/version.xml.in | 1 - + Makefile.am | 4 +- + NEWS | 12 + + configure.ac | 4 - + reference/.gitignore | 3 - + reference/Makefile.am | 1 - + reference/libseahorse/.gitignore | 16 - + reference/libseahorse/Makefile.am | 61 --- + reference/libseahorse/libseahorse-docs.sgml | 65 --- + reference/libseahorse/libseahorse-sections.txt | 598 ------------------------- + reference/libseahorse/version.xml.in | 1 - 10 files changed, 13 insertions(+), 752 deletions(-) commit 172d39e425b699788c91a93406f6076f930ed167 @@ -1014,12 +6123,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=655720 - libseahorse/seahorse-add-keyserver.xml | 7 - - pgp/seahorse-pgp-generate.xml | 7 - - src/seahorse-generate-select.c | 1 + - src/seahorse-generate-select.xml | 111 ++++++++++-------- - ssh/seahorse-ssh-generate.c | 2 +- - ssh/seahorse-ssh-generate.xml | 197 +++++++++++++++++++------------ + libseahorse/seahorse-add-keyserver.xml | 7 -- + pgp/seahorse-pgp-generate.xml | 7 -- + src/seahorse-generate-select.c | 1 + + src/seahorse-generate-select.xml | 111 +++++++++++-------- + ssh/seahorse-ssh-generate.c | 2 +- + ssh/seahorse-ssh-generate.xml | 197 ++++++++++++++++++++------------- 6 files changed, 187 insertions(+), 138 deletions(-) commit fbbd7ac2ca93b1c97bb2e1ce769359641479534d @@ -1028,8 +6137,8 @@ Unmark fuzzy string in French translation - help/fr/fr.po | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) + help/fr/fr.po | 6 ------ + 1 file changed, 6 deletions(-) commit 8bc807e0252d8e7154d340f736125624d24bd19f Author: Alexandre Franke @@ -1037,8 +6146,8 @@ Update French translation - help/fr/fr.po | 36 ++++++++++++++++++++++-------------- - 1 files changed, 22 insertions(+), 14 deletions(-) + help/fr/fr.po | 36 ++++++++++++++++++++++-------------- + 1 file changed, 22 insertions(+), 14 deletions(-) commit 53d08efd5b5e7c8127a78b3e289fa59c7446cee6 Author: Stef Walter @@ -1050,12 +6159,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=657217 - help/C/seahorse.xml | 6 +++--- - src/seahorse-key-manager.c | 2 +- - src/seahorse-main.c | 2 +- - src/seahorse-viewer.c | 2 +- - src/seahorse.1 | 2 +- - src/seahorse.desktop.in.in | 2 +- + help/C/seahorse.xml | 6 +++--- + src/seahorse-key-manager.c | 2 +- + src/seahorse-main.c | 2 +- + src/seahorse-viewer.c | 2 +- + src/seahorse.1 | 2 +- + src/seahorse.desktop.in.in | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) commit 5cde3baa972639897e88baf6e10101b8e21a4ef6 @@ -1066,8 +6175,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=657617 - gkr/seahorse-gkr-item-commands.c | 2 +- - gkr/seahorse-gkr-keyring-commands.c | 2 +- + gkr/seahorse-gkr-item-commands.c | 2 +- + gkr/seahorse-gkr-keyring-commands.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit c0ee067f33ee5eaacd3f3f98b037815b8ef2c007 @@ -1078,8 +6187,8 @@ * Instead a message since this is external stimuli. - pgp/seahorse-server-source.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + pgp/seahorse-server-source.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 97bedc1665323c1e4fe717fecd6fd50ad1961a2c Author: Mario Blättermann @@ -1088,7 +6197,7 @@ [l10n] Updated German translation po/de.po | 1811 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 845 insertions(+), 966 deletions(-) + 1 file changed, 845 insertions(+), 966 deletions(-) commit d06557bc4239154a55269a4bfdac291dd6c7b6e1 Author: Chao-Hsiung Liao @@ -1106,8 +6215,8 @@ Remove SeahorseOperation from libseahorse reference. - reference/libseahorse/libseahorse-sections.txt | 53 ------------------------ - 1 files changed, 0 insertions(+), 53 deletions(-) + reference/libseahorse/libseahorse-sections.txt | 53 -------------------------- + 1 file changed, 53 deletions(-) commit 324b9f32c574110a780e771b79f555d942778ccb Author: Stef Walter @@ -1117,8 +6226,8 @@ * And update dependency on latest GCR/GCK - configure.ac | 2 +- - pkcs11/seahorse-pkcs11-module.c | 8 +++++++- + configure.ac | 2 +- + pkcs11/seahorse-pkcs11-module.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) commit 7d18b759944c8e751ad98a3519019a2ed04df8f0 @@ -1128,7 +6237,7 @@ Updated Galician translations po/gl.po | 1853 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 866 insertions(+), 987 deletions(-) + 1 file changed, 866 insertions(+), 987 deletions(-) commit 6f5f90af56be68d543226c3d38364710944fa4ff Author: Daniel Nylander @@ -1137,7 +6246,7 @@ Updated Swedish translation po/sv.po | 1722 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 763 insertions(+), 959 deletions(-) + 1 file changed, 763 insertions(+), 959 deletions(-) commit e80af9b74fab8b02362fcdc635c80acb40a9c59a Author: Gil Forcada @@ -1146,7 +6255,7 @@ [l10n]Updated Catalan translation po/ca.po | 1918 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 894 insertions(+), 1024 deletions(-) + 1 file changed, 894 insertions(+), 1024 deletions(-) commit bdd1950949a3a63a1a1a4aeee561d2da55b3a03c Author: Kjartan Maraas @@ -1155,7 +6264,7 @@ Updated Norwegian bokmål translation po/nb.po | 1416 ++++++++++++++++++++------------------------------------------ - 1 files changed, 442 insertions(+), 974 deletions(-) + 1 file changed, 442 insertions(+), 974 deletions(-) commit b1b55414202ec25f4961c281098e092b80eda650 Author: Aron Xu @@ -1164,7 +6273,7 @@ Update Simplified Chinese translation. po/zh_CN.po | 1750 +++++++++++++++++++++++++++-------------------------------- - 1 files changed, 812 insertions(+), 938 deletions(-) + 1 file changed, 812 insertions(+), 938 deletions(-) commit 7edde17ac3c5949bd86d4961304fc6836fdad654 Author: Jorge González @@ -1173,7 +6282,7 @@ Updated Spanish translation po/es.po | 1827 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 860 insertions(+), 967 deletions(-) + 1 file changed, 860 insertions(+), 967 deletions(-) commit bbfa1e7b9c831c92082f27a8df354081b70b5d7d Author: Andika Triwidada @@ -1182,7 +6291,7 @@ Updated Indonesian translation po/id.po | 1686 ++++++++++++++++++++------------------------------------------ - 1 files changed, 551 insertions(+), 1135 deletions(-) + 1 file changed, 551 insertions(+), 1135 deletions(-) commit 4d6338a3ee0b85e4d99ab8b1469930ebc7934c64 Author: Stef Walter @@ -1192,12 +6301,12 @@ * Janitorial duties. - libegg/Makefile.am | 13 ++- - libegg/eggtreemultidnd.c | 415 ++++++++++++++++++++++++++++++++++++++++++++++ - libegg/eggtreemultidnd.h | 74 ++++++++ - src/Makefile.am | 2 +- - src/eggtreemultidnd.c | 415 ---------------------------------------------- - src/eggtreemultidnd.h | 74 -------- + libegg/Makefile.am | 13 +- + libegg/eggtreemultidnd.c | 415 +++++++++++++++++++++++++++++++++++++++++++++++ + libegg/eggtreemultidnd.h | 74 +++++++++ + src/Makefile.am | 2 +- + src/eggtreemultidnd.c | 415 ----------------------------------------------- + src/eggtreemultidnd.h | 74 --------- 6 files changed, 502 insertions(+), 491 deletions(-) commit f916a9493ea3b0bcdb64877f9b7e06ef7a7840d1 @@ -1210,70 +6319,70 @@ In theory it was supposed to be usable without depending on other bits of seahorse, but this was an arbitrary distinction. - Makefile.am | 1 - - common/.gitignore | 3 - - common/Makefile.am | 15 - - common/seahorse-bind.c | 543 --------------------------------- - common/seahorse-bind.h | 43 --- - common/seahorse-cleanup.c | 86 ------ - common/seahorse-cleanup.h | 33 -- - common/seahorse-object-list.c | 84 ----- - common/seahorse-object-list.h | 42 --- - common/seahorse-registry.c | 409 ------------------------- - common/seahorse-registry.h | 86 ------ - common/seahorse-secure-buffer.c | 196 ------------ - common/seahorse-secure-buffer.h | 57 ---- - configure.ac | 1 - - gkr/Makefile.am | 3 +- - gkr/seahorse-gkr-add-item.c | 3 +- - gkr/seahorse-gkr-item-commands.c | 3 +- - gkr/seahorse-gkr-item-properties.c | 5 +- - gkr/seahorse-gkr-keyring-commands.c | 3 +- - gkr/seahorse-gkr-keyring-properties.c | 3 +- - gkr/seahorse-gkr-source.c | 7 +- - libseahorse/Makefile.am | 10 +- - libseahorse/seahorse-bind.c | 543 +++++++++++++++++++++++++++++++++ - libseahorse/seahorse-bind.h | 43 +++ - libseahorse/seahorse-cleanup.c | 86 ++++++ - libseahorse/seahorse-cleanup.h | 33 ++ - libseahorse/seahorse-context.c | 5 +- - libseahorse/seahorse-object-list.c | 84 +++++ - libseahorse/seahorse-object-list.h | 42 +++ - libseahorse/seahorse-object-model.c | 3 +- - libseahorse/seahorse-passphrase.c | 7 +- - libseahorse/seahorse-passphrase.h | 2 + - libseahorse/seahorse-prefs.c | 3 +- - libseahorse/seahorse-registry.c | 409 +++++++++++++++++++++++++ - libseahorse/seahorse-registry.h | 86 ++++++ - libseahorse/seahorse-secure-buffer.c | 196 ++++++++++++ - libseahorse/seahorse-secure-buffer.h | 57 ++++ - libseahorse/seahorse-servers.c | 3 +- - libseahorse/seahorse-source.c | 3 +- - libseahorse/seahorse-unknown-source.c | 3 +- - pgp/Makefile.am | 3 +- - pgp/seahorse-gpgme-generate.c | 10 +- - pgp/seahorse-gpgme-key-op.c | 3 +- - pgp/seahorse-gpgme-key.c | 3 +- - pgp/seahorse-gpgme-source.c | 3 +- - pgp/seahorse-gpgme-uid.c | 2 +- - pgp/seahorse-hkp-source.c | 5 +- - pgp/seahorse-ldap-source.c | 5 +- - pgp/seahorse-pgp-commands.c | 3 +- - pgp/seahorse-pgp-key-properties.c | 3 +- - pgp/seahorse-pgp-key.c | 5 +- - pgp/seahorse-pgp-uid.c | 2 +- - pgp/seahorse-server-source.c | 8 +- - pkcs11/seahorse-pkcs11-commands.c | 3 +- - pkcs11/seahorse-pkcs11-operations.c | 2 +- - pkcs11/seahorse-pkcs11-source.c | 2 +- - src/Makefile.am | 1 - - src/seahorse-generate-select.c | 4 +- - src/seahorse-main.c | 7 +- - src/seahorse-viewer.c | 4 +- - ssh/seahorse-ssh-commands.c | 3 +- - ssh/seahorse-ssh-generate.c | 8 +- - ssh/seahorse-ssh-key-properties.c | 3 +- - ssh/seahorse-ssh-source.c | 3 +- + Makefile.am | 1 - + common/.gitignore | 3 - + common/Makefile.am | 15 - + common/seahorse-bind.c | 543 ---------------------------------- + common/seahorse-bind.h | 43 --- + common/seahorse-cleanup.c | 86 ------ + common/seahorse-cleanup.h | 33 --- + common/seahorse-object-list.c | 84 ------ + common/seahorse-object-list.h | 42 --- + common/seahorse-registry.c | 409 ------------------------- + common/seahorse-registry.h | 86 ------ + common/seahorse-secure-buffer.c | 196 ------------ + common/seahorse-secure-buffer.h | 57 ---- + configure.ac | 1 - + gkr/Makefile.am | 3 +- + gkr/seahorse-gkr-add-item.c | 3 +- + gkr/seahorse-gkr-item-commands.c | 3 +- + gkr/seahorse-gkr-item-properties.c | 5 +- + gkr/seahorse-gkr-keyring-commands.c | 3 +- + gkr/seahorse-gkr-keyring-properties.c | 3 +- + gkr/seahorse-gkr-source.c | 7 +- + libseahorse/Makefile.am | 10 +- + libseahorse/seahorse-bind.c | 543 ++++++++++++++++++++++++++++++++++ + libseahorse/seahorse-bind.h | 43 +++ + libseahorse/seahorse-cleanup.c | 86 ++++++ + libseahorse/seahorse-cleanup.h | 33 +++ + libseahorse/seahorse-context.c | 5 +- + libseahorse/seahorse-object-list.c | 84 ++++++ + libseahorse/seahorse-object-list.h | 42 +++ + libseahorse/seahorse-object-model.c | 3 +- + libseahorse/seahorse-passphrase.c | 7 +- + libseahorse/seahorse-passphrase.h | 2 + + libseahorse/seahorse-prefs.c | 3 +- + libseahorse/seahorse-registry.c | 409 +++++++++++++++++++++++++ + libseahorse/seahorse-registry.h | 86 ++++++ + libseahorse/seahorse-secure-buffer.c | 196 ++++++++++++ + libseahorse/seahorse-secure-buffer.h | 57 ++++ + libseahorse/seahorse-servers.c | 3 +- + libseahorse/seahorse-source.c | 3 +- + libseahorse/seahorse-unknown-source.c | 3 +- + pgp/Makefile.am | 3 +- + pgp/seahorse-gpgme-generate.c | 10 +- + pgp/seahorse-gpgme-key-op.c | 3 +- + pgp/seahorse-gpgme-key.c | 3 +- + pgp/seahorse-gpgme-source.c | 3 +- + pgp/seahorse-gpgme-uid.c | 2 +- + pgp/seahorse-hkp-source.c | 5 +- + pgp/seahorse-ldap-source.c | 5 +- + pgp/seahorse-pgp-commands.c | 3 +- + pgp/seahorse-pgp-key-properties.c | 3 +- + pgp/seahorse-pgp-key.c | 5 +- + pgp/seahorse-pgp-uid.c | 2 +- + pgp/seahorse-server-source.c | 8 +- + pkcs11/seahorse-pkcs11-commands.c | 3 +- + pkcs11/seahorse-pkcs11-operations.c | 2 +- + pkcs11/seahorse-pkcs11-source.c | 2 +- + src/Makefile.am | 1 - + src/seahorse-generate-select.c | 4 +- + src/seahorse-main.c | 7 +- + src/seahorse-viewer.c | 4 +- + ssh/seahorse-ssh-commands.c | 3 +- + ssh/seahorse-ssh-generate.c | 8 +- + ssh/seahorse-ssh-key-properties.c | 3 +- + ssh/seahorse-ssh-source.c | 3 +- 64 files changed, 1646 insertions(+), 1693 deletions(-) commit 3750c6e6926222301d67988c1f0c68429a1e4a70 @@ -1285,70 +6394,70 @@ * This work was done while working for Collabora, so the copyright should reflect that. - gkr/seahorse-gkr-add-keyring.c | 1 + - gkr/seahorse-gkr-item-commands.c | 3 ++- - gkr/seahorse-gkr-item-properties.c | 1 + - gkr/seahorse-gkr-item.c | 1 + - gkr/seahorse-gkr-item.h | 1 + - gkr/seahorse-gkr-keyring-commands.c | 3 ++- - gkr/seahorse-gkr-keyring.c | 3 ++- - gkr/seahorse-gkr-operation.c | 1 + - gkr/seahorse-gkr-operation.h | 1 + - gkr/seahorse-gkr-source.c | 1 + - libseahorse/seahorse-commands.c | 3 ++- - libseahorse/seahorse-commands.h | 3 ++- - libseahorse/seahorse-context.c | 1 + - libseahorse/seahorse-context.h | 1 + - libseahorse/seahorse-object.c | 3 ++- - libseahorse/seahorse-object.h | 3 ++- - libseahorse/seahorse-passphrase.c | 1 + - libseahorse/seahorse-progress.c | 1 + - libseahorse/seahorse-source.c | 1 + - libseahorse/seahorse-source.h | 1 + - libseahorse/seahorse-transfer.c | 1 + - libseahorse/seahorse-transfer.h | 1 + - libseahorse/seahorse-unknown-source.c | 1 + - libseahorse/seahorse-unknown-source.h | 1 + - libseahorse/seahorse-util.c | 1 + - libseahorse/seahorse-util.h | 1 + - pgp/seahorse-gpgme-generate.c | 1 + - pgp/seahorse-gpgme-key-op.c | 1 + - pgp/seahorse-gpgme-key.c | 1 + - pgp/seahorse-gpgme-source.c | 1 + - pgp/seahorse-gpgme.c | 3 ++- - pgp/seahorse-gpgme.h | 3 ++- - pgp/seahorse-hkp-source.c | 1 + - pgp/seahorse-ldap-source.c | 1 + - pgp/seahorse-pgp-commands.c | 3 ++- - pgp/seahorse-pgp-commands.h | 3 ++- - pgp/seahorse-pgp-key-properties.c | 1 + - pgp/seahorse-server-source.c | 1 + - pgp/seahorse-server-source.h | 1 + - pgp/seahorse-signer.c | 1 + - pkcs11/seahorse-pkcs11-certificate.c | 3 ++- - pkcs11/seahorse-pkcs11-commands.c | 3 ++- - pkcs11/seahorse-pkcs11-object.c | 3 ++- - pkcs11/seahorse-pkcs11-operations.c | 3 ++- - pkcs11/seahorse-pkcs11-operations.h | 3 ++- - pkcs11/seahorse-pkcs11-source.c | 1 + - src/seahorse-key-manager-store.c | 1 + - src/seahorse-key-manager.c | 3 ++- - src/seahorse-keyserver-results.c | 3 ++- - src/seahorse-keyserver-results.h | 3 ++- - src/seahorse-keyserver-search.c | 1 + - src/seahorse-keyserver-sync.c | 1 + - src/seahorse-viewer.c | 3 ++- - ssh/seahorse-ssh-commands.c | 3 ++- - ssh/seahorse-ssh-commands.h | 3 ++- - ssh/seahorse-ssh-generate.c | 1 + - ssh/seahorse-ssh-key-properties.c | 1 + - ssh/seahorse-ssh-key.c | 1 + - ssh/seahorse-ssh-key.h | 1 + - ssh/seahorse-ssh-operation.c | 1 + - ssh/seahorse-ssh-operation.h | 1 + - ssh/seahorse-ssh-source.c | 1 + - ssh/seahorse-ssh-source.h | 1 + - ssh/seahorse-ssh-upload.c | 1 + + gkr/seahorse-gkr-add-keyring.c | 1 + + gkr/seahorse-gkr-item-commands.c | 3 ++- + gkr/seahorse-gkr-item-properties.c | 1 + + gkr/seahorse-gkr-item.c | 1 + + gkr/seahorse-gkr-item.h | 1 + + gkr/seahorse-gkr-keyring-commands.c | 3 ++- + gkr/seahorse-gkr-keyring.c | 3 ++- + gkr/seahorse-gkr-operation.c | 1 + + gkr/seahorse-gkr-operation.h | 1 + + gkr/seahorse-gkr-source.c | 1 + + libseahorse/seahorse-commands.c | 3 ++- + libseahorse/seahorse-commands.h | 3 ++- + libseahorse/seahorse-context.c | 1 + + libseahorse/seahorse-context.h | 1 + + libseahorse/seahorse-object.c | 3 ++- + libseahorse/seahorse-object.h | 3 ++- + libseahorse/seahorse-passphrase.c | 1 + + libseahorse/seahorse-progress.c | 1 + + libseahorse/seahorse-source.c | 1 + + libseahorse/seahorse-source.h | 1 + + libseahorse/seahorse-transfer.c | 1 + + libseahorse/seahorse-transfer.h | 1 + + libseahorse/seahorse-unknown-source.c | 1 + + libseahorse/seahorse-unknown-source.h | 1 + + libseahorse/seahorse-util.c | 1 + + libseahorse/seahorse-util.h | 1 + + pgp/seahorse-gpgme-generate.c | 1 + + pgp/seahorse-gpgme-key-op.c | 1 + + pgp/seahorse-gpgme-key.c | 1 + + pgp/seahorse-gpgme-source.c | 1 + + pgp/seahorse-gpgme.c | 3 ++- + pgp/seahorse-gpgme.h | 3 ++- + pgp/seahorse-hkp-source.c | 1 + + pgp/seahorse-ldap-source.c | 1 + + pgp/seahorse-pgp-commands.c | 3 ++- + pgp/seahorse-pgp-commands.h | 3 ++- + pgp/seahorse-pgp-key-properties.c | 1 + + pgp/seahorse-server-source.c | 1 + + pgp/seahorse-server-source.h | 1 + + pgp/seahorse-signer.c | 1 + + pkcs11/seahorse-pkcs11-certificate.c | 3 ++- + pkcs11/seahorse-pkcs11-commands.c | 3 ++- + pkcs11/seahorse-pkcs11-object.c | 3 ++- + pkcs11/seahorse-pkcs11-operations.c | 3 ++- + pkcs11/seahorse-pkcs11-operations.h | 3 ++- + pkcs11/seahorse-pkcs11-source.c | 1 + + src/seahorse-key-manager-store.c | 1 + + src/seahorse-key-manager.c | 3 ++- + src/seahorse-keyserver-results.c | 3 ++- + src/seahorse-keyserver-results.h | 3 ++- + src/seahorse-keyserver-search.c | 1 + + src/seahorse-keyserver-sync.c | 1 + + src/seahorse-viewer.c | 3 ++- + ssh/seahorse-ssh-commands.c | 3 ++- + ssh/seahorse-ssh-commands.h | 3 ++- + ssh/seahorse-ssh-generate.c | 1 + + ssh/seahorse-ssh-key-properties.c | 1 + + ssh/seahorse-ssh-key.c | 1 + + ssh/seahorse-ssh-key.h | 1 + + ssh/seahorse-ssh-operation.c | 1 + + ssh/seahorse-ssh-operation.h | 1 + + ssh/seahorse-ssh-source.c | 1 + + ssh/seahorse-ssh-source.h | 1 + + ssh/seahorse-ssh-upload.c | 1 + 64 files changed, 86 insertions(+), 22 deletions(-) commit d3e11bc21c7149a0510fdde62775413dc4cf94ee @@ -1357,8 +6466,8 @@ Update POTFILES.in for recent changes. - po/POTFILES.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/POTFILES.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5ad63bb99ff81865cfdfddea2a8ecdbe5dc22fe4 Author: Stef Walter @@ -1366,10 +6475,10 @@ Remove unused unix signal code. - libseahorse/Makefile.am | 1 - - libseahorse/seahorse-unix-signal.c | 143 ------------------------------------ - libseahorse/seahorse-unix-signal.h | 35 --------- - 3 files changed, 0 insertions(+), 179 deletions(-) + libseahorse/Makefile.am | 1 - + libseahorse/seahorse-unix-signal.c | 143 ------------------------------------- + libseahorse/seahorse-unix-signal.h | 35 --------- + 3 files changed, 179 deletions(-) commit bf8a2e217103b693aa475e0c09900b1c10eecfd8 Author: Stef Walter @@ -1377,9 +6486,9 @@ More fixes for new async operation code. - libseahorse/seahorse-util.c | 4 ++-- - pgp/seahorse-gpgme.c | 3 +-- - ssh/seahorse-ssh-operation.c | 11 ++++------- + libseahorse/seahorse-util.c | 4 ++-- + pgp/seahorse-gpgme.c | 3 +-- + ssh/seahorse-ssh-operation.c | 11 ++++------- 3 files changed, 7 insertions(+), 11 deletions(-) commit c7e0a9535dd0416f7bcfd753667095020771964f @@ -1400,64 +6509,64 @@ gkr/seahorse-gkr-add-item.c | 15 +- gkr/seahorse-gkr-add-keyring.c | 15 +- gkr/seahorse-gkr-item-commands.c | 48 +- - gkr/seahorse-gkr-item-properties.c | 409 ++----- + gkr/seahorse-gkr-item-properties.c | 409 ++---- gkr/seahorse-gkr-item-properties.xml | 153 --- - gkr/seahorse-gkr-item.c | 106 +-- + gkr/seahorse-gkr-item.c | 106 +- gkr/seahorse-gkr-item.h | 5 - gkr/seahorse-gkr-keyring-commands.c | 72 +- - gkr/seahorse-gkr-keyring.c | 445 +++---- + gkr/seahorse-gkr-keyring.c | 445 +++--- gkr/seahorse-gkr-operation.c | 618 ++++++--- gkr/seahorse-gkr-operation.h | 64 +- - gkr/seahorse-gkr-source.c | 491 +++---- + gkr/seahorse-gkr-source.c | 495 +++---- libseahorse/Makefile.am | 3 +- libseahorse/seahorse-commands.c | 22 +- libseahorse/seahorse-commands.h | 12 +- - libseahorse/seahorse-context.c | 740 ++++++----- - libseahorse/seahorse-context.h | 177 ++-- + libseahorse/seahorse-context.c | 740 +++++----- + libseahorse/seahorse-context.h | 193 +-- libseahorse/seahorse-object.c | 22 - libseahorse/seahorse-object.h | 4 - libseahorse/seahorse-operation.c | 937 ------------- libseahorse/seahorse-operation.h | 336 ----- libseahorse/seahorse-passphrase.c | 21 - - libseahorse/seahorse-progress.c | 891 ++++++++----- + libseahorse/seahorse-progress.c | 913 ++++++++----- libseahorse/seahorse-progress.h | 47 +- libseahorse/seahorse-progress.xml | 89 +- - libseahorse/seahorse-source.c | 533 ++++---- - libseahorse/seahorse-source.h | 188 ++-- + libseahorse/seahorse-source.c | 549 ++++---- + libseahorse/seahorse-source.h | 218 +-- libseahorse/seahorse-transfer-operation.c | 382 ------ libseahorse/seahorse-transfer-operation.h | 61 - libseahorse/seahorse-transfer.c | 204 +++ libseahorse/seahorse-transfer.h | 37 + - libseahorse/seahorse-unknown-source.c | 109 +- + libseahorse/seahorse-unknown-source.c | 111 +- libseahorse/seahorse-unknown-source.h | 4 +- libseahorse/seahorse-unknown.c | 14 +- libseahorse/seahorse-util.c | 59 +- libseahorse/seahorse-util.h | 6 +- pgp/Makefile.am | 1 - pgp/seahorse-gpg-options.c | 4 +- - pgp/seahorse-gpgme-generate.c | 71 +- - pgp/seahorse-gpgme-key-op.c | 220 +++- + pgp/seahorse-gpgme-generate.c | 75 +- + pgp/seahorse-gpgme-key-op.c | 236 ++-- pgp/seahorse-gpgme-key-op.h | 12 +- pgp/seahorse-gpgme-key.c | 33 +- pgp/seahorse-gpgme-operation.c | 438 ------ pgp/seahorse-gpgme-operation.h | 94 -- pgp/seahorse-gpgme-photos.c | 6 +- - pgp/seahorse-gpgme-source.c | 1464 +++++++++++---------- + pgp/seahorse-gpgme-source.c | 1488 ++++++++++---------- pgp/seahorse-gpgme.c | 309 ++++- pgp/seahorse-gpgme.h | 6 +- - pgp/seahorse-hkp-source.c | 1054 +++++++-------- - pgp/seahorse-ldap-source.c | 1908 ++++++++++++++------------- + pgp/seahorse-hkp-source.c | 1056 +++++++------- + pgp/seahorse-ldap-source.c | 1952 +++++++++++++------------- pgp/seahorse-pgp-commands.c | 48 +- pgp/seahorse-pgp-commands.h | 2 - pgp/seahorse-pgp-generate.xml | 2 +- pgp/seahorse-pgp-key-properties.c | 36 +- - pgp/seahorse-server-source.c | 121 +-- + pgp/seahorse-server-source.c | 121 +- pgp/seahorse-server-source.h | 8 +- pgp/seahorse-signer.c | 1 - pkcs11/seahorse-pkcs11-certificate.c | 2 +- pkcs11/seahorse-pkcs11-commands.c | 45 +- pkcs11/seahorse-pkcs11-object.c | 11 +- - pkcs11/seahorse-pkcs11-operations.c | 480 +++----- + pkcs11/seahorse-pkcs11-operations.c | 492 +++---- pkcs11/seahorse-pkcs11-operations.h | 19 +- pkcs11/seahorse-pkcs11-source.c | 23 +- src/seahorse-key-manager-store.c | 78 +- @@ -1466,21 +6575,21 @@ src/seahorse-keyserver-results.h | 8 +- src/seahorse-keyserver-results.xml | 2 +- src/seahorse-keyserver-search.c | 15 +- - src/seahorse-keyserver-sync.c | 153 ++-- - src/seahorse-viewer.c | 158 ++-- + src/seahorse-keyserver-sync.c | 181 +-- + src/seahorse-viewer.c | 158 +-- ssh/seahorse-ssh-commands.c | 29 +- ssh/seahorse-ssh-commands.h | 2 - ssh/seahorse-ssh-generate.c | 105 +- ssh/seahorse-ssh-generate.xml | 2 +- - ssh/seahorse-ssh-key-properties.c | 211 ++-- + ssh/seahorse-ssh-key-properties.c | 211 +-- ssh/seahorse-ssh-key.c | 48 +- ssh/seahorse-ssh-key.h | 12 +- - ssh/seahorse-ssh-operation.c | 2071 ++++++++++++++++------------- + ssh/seahorse-ssh-operation.c | 2117 ++++++++++++++++------------- ssh/seahorse-ssh-operation.h | 126 +- - ssh/seahorse-ssh-source.c | 935 ++++++++------ + ssh/seahorse-ssh-source.c | 935 +++++++------ ssh/seahorse-ssh-source.h | 4 +- ssh/seahorse-ssh-upload.c | 92 +- - 84 files changed, 8200 insertions(+), 9746 deletions(-) + 84 files changed, 8333 insertions(+), 9879 deletions(-) commit e7ad0d5a9bb4aef9df25368b064f0dcf703da10c Merge: 013f7bc 30b03db @@ -1502,8 +6611,8 @@ [l10n] Updated German doc translation - help/de/de.po | 25 +++++++++++++------------ - 1 files changed, 13 insertions(+), 12 deletions(-) + help/de/de.po | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) commit 6b56370d9f0a7b41e4660ace9b5deccfd8be6d9c Author: Stef Walter @@ -1516,8 +6625,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=655539 - pkcs11/seahorse-pkcs11-module.c | 22 +++++----------------- - 1 files changed, 5 insertions(+), 17 deletions(-) + pkcs11/seahorse-pkcs11-module.c | 22 +++++----------------- + 1 file changed, 5 insertions(+), 17 deletions(-) commit 30b03db09d4a97de46456da557f5a8f1b8e5c401 Author: Stef Walter @@ -1528,12 +6637,12 @@ * Remove a bunch of unused or little used functions from seahorse-util.[ch] - libseahorse/seahorse-transfer-operation.c | 2 +- - libseahorse/seahorse-util.c | 311 +---------------------------- - libseahorse/seahorse-util.h | 42 +---- - src/seahorse-key-manager-store.c | 2 +- - src/seahorse-key-manager.c | 3 +- - src/seahorse-viewer.c | 4 +- + libseahorse/seahorse-transfer-operation.c | 2 +- + libseahorse/seahorse-util.c | 311 +----------------------------- + libseahorse/seahorse-util.h | 42 +--- + src/seahorse-key-manager-store.c | 2 +- + src/seahorse-key-manager.c | 3 +- + src/seahorse-viewer.c | 4 +- 6 files changed, 13 insertions(+), 351 deletions(-) commit 7c4a43b20303611dd23ccbc81c7b8bc9096e022a @@ -1545,30 +6654,30 @@ * Use GList where lists are necessary. * Use gchar ** for string lists. - common/seahorse-bind.c | 28 +++--- - common/seahorse-cleanup.c | 22 +++--- - libseahorse/seahorse-context.c | 88 +++++++++--------- - libseahorse/seahorse-context.h | 6 +- - libseahorse/seahorse-dns-sd.c | 2 +- - libseahorse/seahorse-object-model.c | 14 ++-- - libseahorse/seahorse-object-model.h | 4 +- - libseahorse/seahorse-operation.c | 78 ++++++++-------- - libseahorse/seahorse-operation.h | 12 ++-- - libseahorse/seahorse-prefs.c | 47 +++++------ - libseahorse/seahorse-servers.c | 12 ++-- - libseahorse/seahorse-servers.h | 2 +- - libseahorse/seahorse-source.c | 20 ++-- - libseahorse/seahorse-source.h | 4 +- - libseahorse/seahorse-transfer-operation.c | 14 ++-- - libseahorse/seahorse-transfer-operation.h | 2 +- - libseahorse/seahorse-util.c | 139 ----------------------------- - libseahorse/seahorse-util.h | 16 +--- - pgp/seahorse-hkp-source.c | 30 ++++--- - pgp/seahorse-ldap-source.c | 130 +++++++++++++------------- - pgp/seahorse-pgp-key-properties.c | 24 +++--- - pkcs11/seahorse-pkcs11-module.c | 2 +- - src/eggtreemultidnd.c | 14 ++-- - src/seahorse-keyserver-sync.c | 6 +- + common/seahorse-bind.c | 28 +++--- + common/seahorse-cleanup.c | 22 ++--- + libseahorse/seahorse-context.c | 88 +++++++++---------- + libseahorse/seahorse-context.h | 6 +- + libseahorse/seahorse-dns-sd.c | 2 +- + libseahorse/seahorse-object-model.c | 14 +-- + libseahorse/seahorse-object-model.h | 4 +- + libseahorse/seahorse-operation.c | 78 ++++++++--------- + libseahorse/seahorse-operation.h | 12 +-- + libseahorse/seahorse-prefs.c | 47 +++++----- + libseahorse/seahorse-servers.c | 12 +-- + libseahorse/seahorse-servers.h | 2 +- + libseahorse/seahorse-source.c | 20 ++--- + libseahorse/seahorse-source.h | 4 +- + libseahorse/seahorse-transfer-operation.c | 14 +-- + libseahorse/seahorse-transfer-operation.h | 2 +- + libseahorse/seahorse-util.c | 139 ------------------------------ + libseahorse/seahorse-util.h | 16 +--- + pgp/seahorse-hkp-source.c | 30 ++++--- + pgp/seahorse-ldap-source.c | 130 ++++++++++++++-------------- + pgp/seahorse-pgp-key-properties.c | 24 +++--- + pkcs11/seahorse-pkcs11-module.c | 2 +- + src/eggtreemultidnd.c | 14 +-- + src/seahorse-keyserver-sync.c | 6 +- 24 files changed, 281 insertions(+), 435 deletions(-) commit d6b5e2ea6ba805e1e073e6fba385c908340618ad @@ -1580,14 +6689,14 @@ * Remove dependencies from configure.ac * And remove lots of comments referring to gconf - configure.ac | 3 +-- - libseahorse/seahorse-context.c | 1 - - libseahorse/seahorse-keyserver-control.h | 2 +- - libseahorse/seahorse-prefs.c | 2 +- - pgp/seahorse-hkp-source.c | 9 +-------- - pgp/seahorse-pgp-key-properties.c | 2 +- - src/seahorse-key-manager.c | 2 +- - src/seahorse-keyserver-search.c | 4 ++-- + configure.ac | 3 +-- + libseahorse/seahorse-context.c | 1 - + libseahorse/seahorse-keyserver-control.h | 2 +- + libseahorse/seahorse-prefs.c | 2 +- + pgp/seahorse-hkp-source.c | 9 +-------- + pgp/seahorse-pgp-key-properties.c | 2 +- + src/seahorse-key-manager.c | 2 +- + src/seahorse-keyserver-search.c | 4 ++-- 8 files changed, 8 insertions(+), 17 deletions(-) commit a9a0eca82e07ba04099e8690d870585422893d50 @@ -1598,8 +6707,8 @@ * Had the wrong schema name. - data/org.gnome.seahorse.manager.convert | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + data/org.gnome.seahorse.manager.convert | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 140bfe64528ae740b7d372a5d8c23439de2ac864 Author: Stef Walter @@ -1612,49 +6721,49 @@ https://bugzilla.gnome.org/show_bug.cgi?id=622401 - .gitignore | 1 + - configure.ac | 6 +- - data/Makefile.am | 32 +-- - data/org.gnome.seahorse.convert | 6 + - data/org.gnome.seahorse.gschema.xml | 29 ++ - data/org.gnome.seahorse.manager.convert | 6 + - data/org.gnome.seahorse.manager.gschema.xml | 29 ++ - data/org.gnome.seahorse.window.gschema.xml | 14 + - data/seahorse.schemas.in | 211 ------------- - libseahorse/Makefile.am | 2 - - libseahorse/seahorse-add-keyserver.xml | 3 +- - libseahorse/seahorse-check-button-control.c | 63 ---- - libseahorse/seahorse-check-button-control.h | 34 -- - libseahorse/seahorse-combo-keys.c | 1 - - libseahorse/seahorse-context.c | 291 +++++++++--------- - libseahorse/seahorse-context.h | 4 + - libseahorse/seahorse-dns-sd.c | 64 ++--- - libseahorse/seahorse-dns-sd.h | 6 +- - libseahorse/seahorse-gconf.c | 439 --------------------------- - libseahorse/seahorse-gconf.h | 85 ----- - libseahorse/seahorse-keyserver-control.c | 178 +++++------ - libseahorse/seahorse-keyserver-control.h | 11 +- - libseahorse/seahorse-prefs.c | 198 ++++++------- - libseahorse/seahorse-servers.c | 61 ++-- - libseahorse/seahorse-servers.h | 5 +- - libseahorse/seahorse-set.c | 25 +- - libseahorse/seahorse-util.c | 1 - - libseahorse/seahorse-widget.c | 129 +++----- - libseahorse/seahorse-widget.h | 1 + - pgp/seahorse-gpgme-sign.c | 3 +- - pgp/seahorse-hkp-source.c | 112 +++++--- - pgp/seahorse-pgp-key-properties.c | 1 - - pgp/seahorse-pgp-keysets.c | 18 +- - pgp/seahorse-signer.c | 12 +- - pkcs11/seahorse-pkcs11-module.c | 13 +- - src/seahorse-key-manager-store.c | 179 ++++++------ - src/seahorse-key-manager-store.h | 3 +- - src/seahorse-key-manager.c | 69 ++--- - src/seahorse-keyserver-results.c | 12 +- - src/seahorse-keyserver-search.c | 411 +++++++++++++------------- - src/seahorse-keyserver-sync.c | 109 +++---- - src/seahorse-preferences.c | 2 - - 42 files changed, 1043 insertions(+), 1836 deletions(-) + .gitignore | 1 + + configure.ac | 6 +- + data/Makefile.am | 32 +- + data/org.gnome.seahorse.convert | 6 + + data/org.gnome.seahorse.gschema.xml | 29 ++ + data/org.gnome.seahorse.manager.convert | 6 + + data/org.gnome.seahorse.manager.gschema.xml | 29 ++ + data/org.gnome.seahorse.window.gschema.xml | 14 + + data/seahorse.schemas.in | 211 ------------- + libseahorse/Makefile.am | 2 - + libseahorse/seahorse-add-keyserver.xml | 3 +- + libseahorse/seahorse-check-button-control.c | 63 ---- + libseahorse/seahorse-check-button-control.h | 34 --- + libseahorse/seahorse-combo-keys.c | 1 - + libseahorse/seahorse-context.c | 291 +++++++++--------- + libseahorse/seahorse-context.h | 4 + + libseahorse/seahorse-dns-sd.c | 64 ++-- + libseahorse/seahorse-dns-sd.h | 6 +- + libseahorse/seahorse-gconf.c | 439 ---------------------------- + libseahorse/seahorse-gconf.h | 85 ------ + libseahorse/seahorse-keyserver-control.c | 178 ++++++----- + libseahorse/seahorse-keyserver-control.h | 11 +- + libseahorse/seahorse-prefs.c | 218 +++++++------- + libseahorse/seahorse-servers.c | 63 ++-- + libseahorse/seahorse-servers.h | 5 +- + libseahorse/seahorse-set.c | 25 +- + libseahorse/seahorse-util.c | 1 - + libseahorse/seahorse-widget.c | 129 ++++---- + libseahorse/seahorse-widget.h | 1 + + pgp/seahorse-gpgme-sign.c | 3 +- + pgp/seahorse-hkp-source.c | 114 +++++--- + pgp/seahorse-pgp-key-properties.c | 1 - + pgp/seahorse-pgp-keysets.c | 18 +- + pgp/seahorse-signer.c | 12 +- + pkcs11/seahorse-pkcs11-module.c | 13 +- + src/seahorse-key-manager-store.c | 179 ++++++------ + src/seahorse-key-manager-store.h | 3 +- + src/seahorse-key-manager.c | 69 ++--- + src/seahorse-keyserver-results.c | 12 +- + src/seahorse-keyserver-search.c | 429 ++++++++++++++------------- + src/seahorse-keyserver-sync.c | 113 ++++--- + src/seahorse-preferences.c | 2 - + 42 files changed, 1066 insertions(+), 1859 deletions(-) commit af87f36c0aafdc75d4baa9fafa081d452a306e8a Author: Stef Walter @@ -1665,25 +6774,25 @@ * This allows use of the SEAHORSE_DEBUG="all" environment variable. * Use SEAHORSE_DEBUG="help" to figure out what flags are available - configure.ac | 2 +- - gkr/seahorse-gkr-operation.c | 14 ---- - gkr/seahorse-gkr-source.c | 17 ----- - libseahorse/Makefile.am | 1 + - libseahorse/seahorse-debug.c | 112 +++++++++++++++++++++++++++++ - libseahorse/seahorse-debug.h | 91 +++++++++++++++++++++++ - libseahorse/seahorse-dns-sd.c | 22 +----- - libseahorse/seahorse-operation.c | 42 ++++------- - libseahorse/seahorse-transfer-operation.c | 53 ++++++-------- - libseahorse/seahorse-util.h | 6 -- - pgp/seahorse-gpgme-key-op.c | 58 ++++++--------- - pgp/seahorse-gpgme-operation.c | 57 ++++++--------- - pgp/seahorse-gpgme-source.c | 32 +++------ - pgp/seahorse-hkp-source.c | 31 +++----- - pgp/seahorse-ldap-source.c | 55 ++++++-------- - pgp/seahorse-pgp-key-properties.c | 9 ++- - src/seahorse-key-manager-store.c | 39 ++++++----- - ssh/seahorse-ssh-operation.c | 83 +++++++++------------ - ssh/seahorse-ssh-source.c | 31 ++------ + configure.ac | 2 +- + gkr/seahorse-gkr-operation.c | 14 ---- + gkr/seahorse-gkr-source.c | 17 ----- + libseahorse/Makefile.am | 1 + + libseahorse/seahorse-debug.c | 112 ++++++++++++++++++++++++++++++ + libseahorse/seahorse-debug.h | 91 ++++++++++++++++++++++++ + libseahorse/seahorse-dns-sd.c | 22 ++---- + libseahorse/seahorse-operation.c | 42 ++++------- + libseahorse/seahorse-transfer-operation.c | 53 ++++++-------- + libseahorse/seahorse-util.h | 6 -- + pgp/seahorse-gpgme-key-op.c | 58 ++++++---------- + pgp/seahorse-gpgme-operation.c | 57 ++++++--------- + pgp/seahorse-gpgme-source.c | 32 +++------ + pgp/seahorse-hkp-source.c | 31 ++++----- + pgp/seahorse-ldap-source.c | 55 +++++++-------- + pgp/seahorse-pgp-key-properties.c | 9 ++- + src/seahorse-key-manager-store.c | 39 ++++++----- + ssh/seahorse-ssh-operation.c | 83 ++++++++++------------ + ssh/seahorse-ssh-source.c | 31 +++------ 19 files changed, 405 insertions(+), 350 deletions(-) commit 8ce2a2f0636d48499d385def4d80301eb30bf142 @@ -1696,22 +6805,22 @@ * Use --disable-debug to disable all debug code. * Use --enable-debug=full to enable debug compilation and extras. - configure.ac | 38 ++++++++++++++++++++++----------- - gkr/seahorse-gkr-add-item.c | 5 +-- - gkr/seahorse-gkr-dialogs.c | 3 +- - gkr/seahorse-gkr-keyring-commands.c | 6 ----- - libegg/egg-datetime.c | 19 +++++++++------- - libseahorse/seahorse-commands.c | 17 --------------- - libseahorse/seahorse-context.c | 19 ----------------- - libseahorse/seahorse-object-widget.c | 6 +--- - libseahorse/seahorse-passphrase.c | 3 -- - libseahorse/seahorse-util.c | 2 +- - pgp/seahorse-gpg-options.c | 4 +-- - pgp/seahorse-gpgme-source.c | 5 ---- - pgp/seahorse-pgp-key-properties.c | 9 +------ - pgp/seahorse-server-source.c | 7 +----- - ssh/seahorse-ssh-askpass.c | 6 ++-- - 15 files changed, 49 insertions(+), 100 deletions(-) + configure.ac | 40 +++++++++++++++++++++++------------- + gkr/seahorse-gkr-add-item.c | 5 ++--- + gkr/seahorse-gkr-dialogs.c | 3 +-- + gkr/seahorse-gkr-keyring-commands.c | 6 ------ + libegg/egg-datetime.c | 19 +++++++++-------- + libseahorse/seahorse-commands.c | 17 --------------- + libseahorse/seahorse-context.c | 19 ----------------- + libseahorse/seahorse-object-widget.c | 6 ++---- + libseahorse/seahorse-passphrase.c | 3 --- + libseahorse/seahorse-util.c | 2 +- + pgp/seahorse-gpg-options.c | 4 +--- + pgp/seahorse-gpgme-source.c | 5 ----- + pgp/seahorse-pgp-key-properties.c | 9 ++------ + pgp/seahorse-server-source.c | 7 +------ + ssh/seahorse-ssh-askpass.c | 6 +++--- + 15 files changed, 50 insertions(+), 101 deletions(-) commit 87af2252681f1626f01e27ef7b5d1d9fc2c7f4d9 Author: Stef Walter @@ -1719,8 +6828,8 @@ Bump version number - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 87204ac46554e578bfef39b157393b8eb11b2e9a Author: Stef Walter @@ -1728,9 +6837,9 @@ Release version 3.1.4 - NEWS | 7 +++++++ - configure.ac | 2 +- - 2 files changed, 8 insertions(+), 1 deletions(-) + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) commit 010fbf3f6ae6548208599ca4b101d31d5eb90bf7 Author: Stef Walter @@ -1821,7 +6930,7 @@ po/POTFILES.in | 11 - reference/Makefile.am | 3 +- reference/libcryptui/.gitignore | 17 - - reference/libcryptui/Makefile.am | 61 - + reference/libcryptui/Makefile.am | 61 -- reference/libcryptui/libcryptui-docs.sgml | 28 - reference/libcryptui/libcryptui-sections.txt | 165 --- reference/libcryptui/version.xml.in | 1 - @@ -1839,8 +6948,8 @@ Updated Finnish translation - po/fi.po | 474 +++++++++++++------------------------------------------------- - 1 files changed, 96 insertions(+), 378 deletions(-) + po/fi.po | 474 +++++++++++++-------------------------------------------------- + 1 file changed, 96 insertions(+), 378 deletions(-) commit 42ff44299ce5131ddf83532fb7ab8522682377c0 Author: Stef Walter @@ -1853,23 +6962,23 @@ * In order for seahorse to build with gnome-keyring, remove GTK+2 support from seahorse too. - configure.ac | 43 ++++++--------------------------- - gkr/seahorse-gkr-dialogs.c | 8 ------ - libcryptui/Makefile.am | 4 +- - libcryptui/cryptui-key-chooser.c | 7 ----- - libegg/egg-datetime.c | 21 +--------------- - libseahorse/seahorse-passphrase.c | 2 - - libseahorse/seahorse-prefs.c | 6 ---- - pgp/seahorse-gpgme-generate.c | 6 ---- - pkcs11/seahorse-pkcs11-certificate.c | 2 +- - pkcs11/seahorse-pkcs11-helpers.c | 3 +- - pkcs11/seahorse-pkcs11-module.c | 2 +- - pkcs11/seahorse-pkcs11-object.c | 2 +- - pkcs11/seahorse-pkcs11-operations.c | 2 +- - reference/libcryptui/Makefile.am | 4 --- - reference/libseahorse/Makefile.am | 4 --- - src/seahorse-key-manager.c | 8 ++---- - ssh/seahorse-ssh-generate.c | 10 +------- + configure.ac | 43 +++++++----------------------------- + gkr/seahorse-gkr-dialogs.c | 8 ------- + libcryptui/Makefile.am | 4 ++-- + libcryptui/cryptui-key-chooser.c | 7 ------ + libegg/egg-datetime.c | 21 +----------------- + libseahorse/seahorse-passphrase.c | 2 -- + libseahorse/seahorse-prefs.c | 6 ----- + pgp/seahorse-gpgme-generate.c | 6 ----- + pkcs11/seahorse-pkcs11-certificate.c | 2 +- + pkcs11/seahorse-pkcs11-helpers.c | 3 ++- + pkcs11/seahorse-pkcs11-module.c | 2 +- + pkcs11/seahorse-pkcs11-object.c | 2 +- + pkcs11/seahorse-pkcs11-operations.c | 2 +- + reference/libcryptui/Makefile.am | 4 ---- + reference/libseahorse/Makefile.am | 4 ---- + src/seahorse-key-manager.c | 8 +++---- + ssh/seahorse-ssh-generate.c | 10 +-------- 17 files changed, 21 insertions(+), 113 deletions(-) commit 66885bc1176288edfd4ff7a93420fedddf846c37 @@ -1882,8 +6991,8 @@ See: Debian bug #630470 - gkr/seahorse-gkr-add-item.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) + gkr/seahorse-gkr-add-item.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) commit fcff0bf75d8363fd60edf097575d9c143f61bbb5 Author: Seunghoon, Kang @@ -1893,7 +7002,7 @@ help/Makefile.am | 2 +- help/ko/ko.po | 1635 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1636 insertions(+), 1 deletions(-) + 2 files changed, 1636 insertions(+), 1 deletion(-) commit 11a224046e6cf7bb639df8f9aacdb242e37bb4e5 Author: Мирослав Николић @@ -1901,8 +7010,8 @@ Updated Serbian translation - po/sr.po | 676 ++++++++++++++++++++++++++++---------------------------- - po/sr@latin.po | 676 ++++++++++++++++++++++++++++---------------------------- + po/sr.po | 676 +++++++++++++++++++++++++++++---------------------------- + po/sr@latin.po | 676 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 678 insertions(+), 674 deletions(-) commit 8fe7455a447a6ab0efaff70094a02fd0b3ca50f3 @@ -1911,8 +7020,8 @@ remove reference to non-existent info documentation from manpage - src/seahorse.1 | 12 ------------ - 1 files changed, 0 insertions(+), 12 deletions(-) + src/seahorse.1 | 12 ------------ + 1 file changed, 12 deletions(-) commit 1f3c4010cc6f5939fb861addcf86c360519425b3 Author: Carles Ferrando @@ -1920,8 +7029,8 @@ [l10n]Updated Catalan (Valencian) translation - po/ca@valencia.po | 544 +++++++++++++++++++++++++++-------------------------- - 1 files changed, 278 insertions(+), 266 deletions(-) + po/ca@valencia.po | 544 ++++++++++++++++++++++++++++-------------------------- + 1 file changed, 278 insertions(+), 266 deletions(-) commit d3d3ff55494ae18894505faeb622ad181e04208d Author: Nguyễn Thái Ngọc Duy @@ -1929,8 +7038,8 @@ Updated Vietnamese translation - po/vi.po | 214 ++++++++++++++++++++++++++------------------------------------ - 1 files changed, 90 insertions(+), 124 deletions(-) + po/vi.po | 214 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 90 insertions(+), 124 deletions(-) commit c121bf253c9b31b8883d2cecdc35d4bc4a3e2a6b Author: Nguyễn Thái Ngọc Duy @@ -1938,8 +7047,8 @@ po/vi.po: import from Damned Lies - po/vi.po | 2213 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 1289 insertions(+), 924 deletions(-) + po/vi.po | 2223 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 1294 insertions(+), 929 deletions(-) commit 1a02e06ff6ba4abac9efee09bcf8fe565f23c37c Author: Stef Walter @@ -1947,8 +7056,8 @@ Bump version number - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit c1d9daf45633d98be71682bb6e9c3bbb79d44b70 Author: Stef Walter @@ -1956,9 +7065,9 @@ Release version 3.1.1 - NEWS | 8 ++++++++ - configure.ac | 2 +- - 2 files changed, 9 insertions(+), 1 deletions(-) + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) commit 8a99ee3f6ca8d662f1a9e286a2badccd17aa4c08 Author: Stef Walter @@ -1966,8 +7075,8 @@ pkcs11: Fix up implementing of GcrCertificate for new gcr version. - configure.ac | 2 +- - pkcs11/seahorse-pkcs11-certificate.c | 10 +++++++--- + configure.ac | 2 +- + pkcs11/seahorse-pkcs11-certificate.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) commit 89848934f9bd09bdc2b0fb09a5416bc0f5453dd9 @@ -1976,8 +7085,8 @@ Updated Spanish translation - help/es/es.po | 33 +++++++++++++++++++++------------ - 1 files changed, 21 insertions(+), 12 deletions(-) + help/es/es.po | 33 +++++++++++++++++++++------------ + 1 file changed, 21 insertions(+), 12 deletions(-) commit 43a6ae1f6329a925e506509b39db8c4a93303905 Author: Muhammet Kara @@ -1985,8 +7094,8 @@ Updated Turkish translation - po/tr.po | 959 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 500 insertions(+), 459 deletions(-) + po/tr.po | 959 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 500 insertions(+), 459 deletions(-) commit abe1603ece39465b418bfbfaa47d728f39cbfe44 Author: Takayuki KUSANO @@ -1994,8 +7103,8 @@ Updated Japanese translation - po/ja.po | 638 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 321 insertions(+), 317 deletions(-) + po/ja.po | 638 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 321 insertions(+), 317 deletions(-) commit 6dd01874da814127e9746ecee5e7e6c791fabee7 Author: Tomáš Virgl @@ -2003,8 +7112,8 @@ Updated Slovak translation - po/sk.po | 676 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 340 insertions(+), 336 deletions(-) + po/sk.po | 676 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 340 insertions(+), 336 deletions(-) commit 83f1ebc3a0a74a91ed09a15a0b71ee5c237bcfbe Author: Stef Walter @@ -2012,9 +7121,9 @@ Rename configure.in to configure.ac - autogen.sh | 2 +- - configure.ac | 670 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - configure.in | 670 ---------------------------------------------------------- + autogen.sh | 2 +- + configure.ac | 670 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.in | 670 ----------------------------------------------------------- 3 files changed, 671 insertions(+), 671 deletions(-) commit f3b8f56cf37e91b87a2d88d4799b2f921eeb7985 @@ -2033,9 +7142,9 @@ Release version 3.0.1 - NEWS | 8 ++++++++ - configure.in | 2 +- - 2 files changed, 9 insertions(+), 1 deletions(-) + NEWS | 8 ++++++++ + configure.in | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) commit 072e0510b781811b71b3c3535e0a481eb7af2298 Author: Stef Walter @@ -2046,8 +7155,8 @@ * Accept arguments like --with-gtk=2 and --with-gtk=3 instead of strict --with-gtk=3.0. - configure.in | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) + configure.in | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) commit a8c5bac5ec6c4411b3eaedb819e75bed2b783db1 Author: Theppitak Karoonboonyanan @@ -2055,8 +7164,8 @@ Updated Thai translation. - po/th.po | 344 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 180 insertions(+), 164 deletions(-) + po/th.po | 344 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 180 insertions(+), 164 deletions(-) commit 46339f71147d542f587c09c54eb7867f46606dad Author: Theppitak Karoonboonyanan @@ -2064,8 +7173,8 @@ Updated Thai translation. - po/th.po | 344 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 180 insertions(+), 164 deletions(-) + po/th.po | 344 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 180 insertions(+), 164 deletions(-) commit 40a8e37a4ad93ad9e6017e57f52fd8e9c66a4d72 Author: Kristjan SCHMIDT @@ -2075,7 +7184,7 @@ po/LINGUAS | 1 + po/eo.po | 2958 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2959 insertions(+), 0 deletions(-) + 2 files changed, 2959 insertions(+) commit f093fc5bea9bf8d3418866cda089fbf1802ed14e Author: Kristjan SCHMIDT @@ -2085,7 +7194,7 @@ po/LINGUAS | 1 + po/eo.po | 2958 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2959 insertions(+), 0 deletions(-) + 2 files changed, 2959 insertions(+) commit 8f643e3eca0aa918d6befa9ca44b689f9b79170f Author: Tomas Bzatek @@ -2095,29 +7204,29 @@ Not valid for GTK+ 3.0 anymore. - gkr/seahorse-add-keyring.xml | 1 - - gkr/seahorse-gkr-add-item.xml | 1 - - gkr/seahorse-gkr-item-properties.xml | 1 - - gkr/seahorse-gkr-keyring.xml | 1 - - libseahorse/seahorse-add-keyserver.xml | 1 - - libseahorse/seahorse-notify.xml | 1 - - libseahorse/seahorse-prefs.xml | 1 - - libseahorse/seahorse-progress.xml | 1 - - pgp/seahorse-add-subkey.xml | 1 - - pgp/seahorse-add-uid.xml | 1 - - pgp/seahorse-expires.xml | 1 - - pgp/seahorse-pgp-generate.xml | 1 - - pgp/seahorse-pgp-private-key-properties.xml | 1 - - pgp/seahorse-revoke.xml | 1 - - pgp/seahorse-signer.xml | 1 - - src/seahorse-change-passphrase.xml | 1 - - src/seahorse-generate-select.xml | 1 - - src/seahorse-keyserver-search.xml | 1 - - src/seahorse-keyserver-sync.xml | 1 - - ssh/seahorse-ssh-generate.xml | 1 - - ssh/seahorse-ssh-key-properties.xml | 1 - - ssh/seahorse-ssh-upload.xml | 1 - - 22 files changed, 0 insertions(+), 22 deletions(-) + gkr/seahorse-add-keyring.xml | 1 - + gkr/seahorse-gkr-add-item.xml | 1 - + gkr/seahorse-gkr-item-properties.xml | 1 - + gkr/seahorse-gkr-keyring.xml | 1 - + libseahorse/seahorse-add-keyserver.xml | 1 - + libseahorse/seahorse-notify.xml | 1 - + libseahorse/seahorse-prefs.xml | 1 - + libseahorse/seahorse-progress.xml | 1 - + pgp/seahorse-add-subkey.xml | 1 - + pgp/seahorse-add-uid.xml | 1 - + pgp/seahorse-expires.xml | 1 - + pgp/seahorse-pgp-generate.xml | 1 - + pgp/seahorse-pgp-private-key-properties.xml | 1 - + pgp/seahorse-revoke.xml | 1 - + pgp/seahorse-signer.xml | 1 - + src/seahorse-change-passphrase.xml | 1 - + src/seahorse-generate-select.xml | 1 - + src/seahorse-keyserver-search.xml | 1 - + src/seahorse-keyserver-sync.xml | 1 - + ssh/seahorse-ssh-generate.xml | 1 - + ssh/seahorse-ssh-key-properties.xml | 1 - + ssh/seahorse-ssh-upload.xml | 1 - + 22 files changed, 22 deletions(-) commit abef8bd54e56b3c7dbcaa9a839a49a3eb8f2374d Author: Stef Walter @@ -2129,8 +7238,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=634064 - libseahorse/seahorse-util.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + libseahorse/seahorse-util.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) commit 032b3d01cc887ced3fc2a11ce21bb528e9ff4ffc Author: Stef Walter @@ -2138,8 +7247,8 @@ cryptui: Fix building of tests with GTK+ 3.0 - libcryptui/tests/cryptui-test-ui.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libcryptui/tests/cryptui-test-ui.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit f834f7561dcd5d5917243c397b88523d272c97ba Author: Changwoo Ryu @@ -2147,8 +7256,8 @@ Updated Korean translation - po/ko.po | 44 ++++++++++++++++++++++---------------------- - 1 files changed, 22 insertions(+), 22 deletions(-) + po/ko.po | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) commit 4b203897eebfacd50e269a994a6e04b1a9dc6b24 Author: Changwoo Ryu @@ -2156,8 +7265,8 @@ Updated Korean translation - po/ko.po | 44 ++++++++++++++++++++++---------------------- - 1 files changed, 22 insertions(+), 22 deletions(-) + po/ko.po | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) commit 2ea04bc447f0ddc79dd218e46d5f605ca2d4a0ba Author: Stef Walter @@ -2165,10 +7274,10 @@ Release version 3.0.0 - .gitignore | 1 + - NEWS | 5 +++++ - configure.in | 2 +- - pkcs11/Makefile.am | 3 ++- + .gitignore | 1 + + NEWS | 5 +++++ + configure.in | 2 +- + pkcs11/Makefile.am | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) commit 55566ecaf01d1582b6cc7c0e4204d4bc091d5aae @@ -2177,8 +7286,8 @@ [l10n]Fixes on Catalan translation - po/ca.po | 78 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 39 insertions(+), 39 deletions(-) + po/ca.po | 78 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 39 insertions(+), 39 deletions(-) commit a13cdf0ee0024199facac2a4968bbd64b11b79d4 Author: Jordi Serratosa @@ -2186,8 +7295,8 @@ [l10n]Fixes on Catalan translation - po/ca.po | 78 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 39 insertions(+), 39 deletions(-) + po/ca.po | 78 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 39 insertions(+), 39 deletions(-) commit 679b29dd05b7497d19aa9d7879532a76c640f438 Author: Inaki Larranaga Murgoitio @@ -2195,8 +7304,8 @@ Updated Basque language - po/eu.po | 679 +++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 323 insertions(+), 356 deletions(-) + po/eu.po | 679 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 323 insertions(+), 356 deletions(-) commit 350d1993e9df853d8cfd993f5433eb950eaf33f8 Author: Marek Černocký @@ -2204,8 +7313,8 @@ Updated Czech translation - po/cs.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/cs.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 4f408471d6450674040749c5ea79859621ab3b02 Author: Ask H. Larsen @@ -2213,8 +7322,8 @@ Updated Danish translation - po/da.po | 636 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 320 insertions(+), 316 deletions(-) + po/da.po | 636 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 320 insertions(+), 316 deletions(-) commit cb61fde1323f13190894be2bc2e2c03487ea7c34 Author: Ask H. Larsen @@ -2222,8 +7331,8 @@ Updated Danish translation - po/da.po | 636 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 320 insertions(+), 316 deletions(-) + po/da.po | 636 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 320 insertions(+), 316 deletions(-) commit ebf072aa3113baffd6bbbada082c2254a1bcff1d Author: Dr.T.Vasudevan @@ -2231,8 +7340,8 @@ Updated Tamil translation - po/ta.po | 468 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 234 insertions(+), 234 deletions(-) + po/ta.po | 468 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 234 insertions(+), 234 deletions(-) commit 1f7ca43b33d6a491f32d0ca768ff88b9c4d971f7 Author: Amitakhya Phukan @@ -2240,8 +7349,8 @@ Updated Assamese translations - po/as.po | 984 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 508 insertions(+), 476 deletions(-) + po/as.po | 984 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 508 insertions(+), 476 deletions(-) commit 232b064d44bbcfb9b2c9fab6bcf113ae1db0ca27 Author: Kjartan Maraas @@ -2249,10 +7358,10 @@ Don't check for HAVE_CONFIG_H - libegg/egg-datetime.c | 2 -- - libseahorse/seahorse-keyserver-control.c | 2 -- - src/seahorse-keyserver-search.c | 2 -- - ssh/seahorse-algo.c | 6 ++---- + libegg/egg-datetime.c | 2 -- + libseahorse/seahorse-keyserver-control.c | 2 -- + src/seahorse-keyserver-search.c | 2 -- + ssh/seahorse-algo.c | 6 ++---- 4 files changed, 2 insertions(+), 10 deletions(-) commit 65280aa0efa2ba73892f6789887af0c2c37097eb @@ -2261,13 +7370,13 @@ Do #include in the .c files only. - daemon/seahorse-daemon.h | 1 - - libegg/egg-datetime.c | 4 ++++ - libseahorse/seahorse-keyserver-control.c | 4 ++++ - libseahorse/seahorse-util.h | 1 - - pgp/seahorse-ldap-source.h | 1 - - src/seahorse-keyserver-search.c | 3 +++ - ssh/seahorse-algo.c | 4 ++++ + daemon/seahorse-daemon.h | 1 - + libegg/egg-datetime.c | 4 ++++ + libseahorse/seahorse-keyserver-control.c | 4 ++++ + libseahorse/seahorse-util.h | 1 - + pgp/seahorse-ldap-source.h | 1 - + src/seahorse-keyserver-search.c | 3 +++ + ssh/seahorse-algo.c | 4 ++++ 7 files changed, 15 insertions(+), 3 deletions(-) commit 1da34ac91defd55764426155187fe69996aaed36 @@ -2278,8 +7387,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=645995 - data/seahorse.schemas.in | 2 +- - help/C/seahorse.xml | 4 ++-- + data/seahorse.schemas.in | 2 +- + help/C/seahorse.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit acdb641983999434c6392fbbfbf733d47f2a3e7d @@ -2288,8 +7397,8 @@ Updated Portuguese translation - po/pt.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/pt.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit eb570135deba13ce516711dcac380c7861065359 Author: Krix Apolinário @@ -2297,8 +7406,8 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 192 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 96 insertions(+), 96 deletions(-) + po/pt_BR.po | 192 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 96 insertions(+), 96 deletions(-) commit 4fbc95c89fe8a7b4f96e319bd6d5c06a169e1626 Author: Rodrigo Padula de Oliveira @@ -2306,8 +7415,8 @@ Updated Brazilian Portuguese translation. Reviewed by Enrico Nicoletto. - po/pt_BR.po | 463 ++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 233 insertions(+), 230 deletions(-) + po/pt_BR.po | 463 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 233 insertions(+), 230 deletions(-) commit ff8f973ddc153de1d4ba708932b3a081da194e41 Author: Abduxukur Abdurixit @@ -2315,8 +7424,8 @@ Added UG translation - po/ug.po | 289 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 148 insertions(+), 141 deletions(-) + po/ug.po | 289 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 141 deletions(-) commit 9370ab96956d3cf25e7521833f11137b0d1d23c4 Author: Stef Walter @@ -2324,9 +7433,9 @@ Release version 2.91.93 - NEWS | 5 +++++ - configure.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) + NEWS | 5 +++++ + configure.in | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) commit 6c4e35de42e101966abe3977ca437b779b6f6e6b Author: Cosimo Cecchi @@ -2338,8 +7447,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=644216 - src/seahorse-key-manager.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + src/seahorse-key-manager.c | 6 ++++++ + 1 file changed, 6 insertions(+) commit 9f36bdde631861ce809b4fd90da6ebf76f1f6eee Author: Runa Bhattacharjee @@ -2348,7 +7457,7 @@ Updated Bengali India Translation po/bn_IN.po | 1009 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 526 insertions(+), 483 deletions(-) + 1 file changed, 526 insertions(+), 483 deletions(-) commit 39e9011299a3f2e56b74c076ab455f222957603c Author: Milo Casagrande @@ -2356,8 +7465,8 @@ [l10n] Updated Italian translation - po/it.po | 607 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 291 insertions(+), 316 deletions(-) + po/it.po | 607 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 291 insertions(+), 316 deletions(-) commit 23199c49e320e66941aed1b8ee62961597317b46 Author: Stef Walter @@ -2365,9 +7474,9 @@ Release version 2.91.92 - NEWS | 9 +++++++++ - configure.in | 2 +- - 2 files changed, 10 insertions(+), 1 deletions(-) + NEWS | 9 +++++++++ + configure.in | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) commit 5f06a1f7599b8d7f71c20f2a02aa5d2418c89b50 Author: Yuri Myasoedov @@ -2375,8 +7484,8 @@ Updated Russian translation - po/ru.po | 592 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 286 insertions(+), 306 deletions(-) + po/ru.po | 592 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 286 insertions(+), 306 deletions(-) commit 97e66b73b36994da25d4f62b7d59589cc050ecc1 Author: Dirgita @@ -2385,7 +7494,7 @@ Updated Indonesian translation po/id.po | 1106 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 603 insertions(+), 503 deletions(-) + 1 file changed, 603 insertions(+), 503 deletions(-) commit 02369a2345d35cbe3424d6b2cad1b1df0a50660e Author: Wei Li @@ -2393,8 +7502,8 @@ Update Simplified Chinese translation. - po/zh_CN.po | 128 +++++++++++++++++++++++++++------------------------------- - 1 files changed, 60 insertions(+), 68 deletions(-) + po/zh_CN.po | 128 ++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 60 insertions(+), 68 deletions(-) commit 70e455095c0608d7aba8481ac09178d835f4484c Author: Mario Blättermann @@ -2402,8 +7511,8 @@ [l10n] Updated German translation - po/de.po | 464 ++++++++++++++++++++++++-------------------------------------- - 1 files changed, 176 insertions(+), 288 deletions(-) + po/de.po | 464 ++++++++++++++++++++++++--------------------------------------- + 1 file changed, 176 insertions(+), 288 deletions(-) commit d407dac93a8ec3c544bb26cc87f84f2fa2146758 Author: Bruce Cowan @@ -2411,8 +7520,8 @@ Updated British English translation - po/en_GB.po | 637 ++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 320 insertions(+), 317 deletions(-) + po/en_GB.po | 637 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 320 insertions(+), 317 deletions(-) commit 527b10b0dd4ef73d0227bc8cdd2d541bed32084a Author: Lucian Adrian Grijincu @@ -2420,8 +7529,8 @@ Updated Romanian translation - po/ro.po | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) + po/ro.po | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) commit 82050149d43debfd0454b3529a56bdec373717d1 Author: Lucian Adrian Grijincu @@ -2429,8 +7538,8 @@ Updated Romanian translation - po/ro.po | 217 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 116 insertions(+), 101 deletions(-) + po/ro.po | 217 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 116 insertions(+), 101 deletions(-) commit 681d25cc4087ab48830a0547030af53d24adc03e Author: Stef Walter @@ -2444,8 +7553,8 @@ See https://bugzilla.gnome.org/show_bug.cgi?id=644216 - src/seahorse-key-manager.xml | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + src/seahorse-key-manager.xml | 3 --- + 1 file changed, 3 deletions(-) commit d83424f86f3aaf06a06f552c6b312cb466c283e5 Author: Stef Walter @@ -2464,8 +7573,8 @@ data/icons/hicolor_apps_256x256_seahorse.png | Bin 0 -> 35962 bytes data/icons/hicolor_apps_32x32_seahorse.png | Bin 2458 -> 2288 bytes data/icons/hicolor_apps_48x48_seahorse.png | Bin 4298 -> 3665 bytes - data/icons/svg/seahorse.svg | 6213 ++++++++++++++++++-------- - 8 files changed, 4228 insertions(+), 1986 deletions(-) + data/icons/svg/seahorse.svg | 6273 +++++++++++++++++--------- + 8 files changed, 4258 insertions(+), 2016 deletions(-) commit ad9638ace3f799161b26a325c1be505ba5e43d8c Author: Stef Walter @@ -2475,8 +7584,8 @@ This fixes a crash. - ssh/seahorse-ssh-key-data.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + ssh/seahorse-ssh-key-data.c | 4 ++++ + 1 file changed, 4 insertions(+) commit e1e3e65754a8e583c481eb992a53dcd62148a832 Author: Piotr Drąg @@ -2484,8 +7593,8 @@ Updated Polish translation - po/pl.po | 609 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 292 insertions(+), 317 deletions(-) + po/pl.po | 609 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 292 insertions(+), 317 deletions(-) commit 23032802f86e5f0ba32ebbc9dbe132407a1ddd6d Author: Duarte Loreto @@ -2493,8 +7602,8 @@ Updated Portuguese translation - po/pt.po | 638 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 321 insertions(+), 317 deletions(-) + po/pt.po | 638 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 321 insertions(+), 317 deletions(-) commit 9335671cc5fc6e626dbb322b8894ffded7ce7ddb Author: Stef Walter @@ -2504,8 +7613,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=638350 - pgp/seahorse-gpgme-source.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) + pgp/seahorse-gpgme-source.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) commit ecb70c1e531369fd1f9efb57ec31e06cb42fcc46 Author: Craig Keogh @@ -2513,8 +7622,8 @@ Honor aclocal flags (GNOME bug 641657) - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d481949b1cb54894f7862e541a5970d65618304f Author: Cosimo Cecchi @@ -2526,8 +7635,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=644220 - src/seahorse-viewer.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/seahorse-viewer.c | 1 + + 1 file changed, 1 insertion(+) commit 283ed05a53dc32892bc115b7d7e2c69d31f875c6 Author: Cosimo Cecchi @@ -2539,8 +7648,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=644216 - src/seahorse-key-manager.xml | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + src/seahorse-key-manager.xml | 3 +++ + 1 file changed, 3 insertions(+) commit ebef77434ac4cd93cab03aac5dab23ad73a0a405 Author: Stef Walter @@ -2548,9 +7657,9 @@ Release version 2.91.91 - NEWS | 8 ++++++++ - configure.in | 2 +- - 2 files changed, 9 insertions(+), 1 deletions(-) + NEWS | 8 ++++++++ + configure.in | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) commit 411798117445d1b4a7aad35abd4d74a8ca58eb32 Author: A S Alam @@ -2558,8 +7667,8 @@ update Punjabi Translation by A S Alam - po/pa.po | 768 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 414 insertions(+), 354 deletions(-) + po/pa.po | 768 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 414 insertions(+), 354 deletions(-) commit 945c705fe4ae04d9f3ca45af3d2f8bf914e0120b Author: Gabor Kelemen @@ -2567,8 +7676,8 @@ Updated Hungarian translation - po/hu.po | 620 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 293 insertions(+), 327 deletions(-) + po/hu.po | 620 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 293 insertions(+), 327 deletions(-) commit 2b5947c626d16caf936cd351d763ca65828529e0 Author: Manoj Kumar Giri @@ -2577,7 +7686,7 @@ Updated Oriya Translation po/or.po | 1038 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 536 insertions(+), 502 deletions(-) + 1 file changed, 536 insertions(+), 502 deletions(-) commit 24ac51adfe1cdf69dc13cabd1f49192dd859cf62 Author: Gil Forcada @@ -2585,8 +7694,8 @@ [l10n] Updated Catalan translation - po/ca.po | 638 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 321 insertions(+), 317 deletions(-) + po/ca.po | 638 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 321 insertions(+), 317 deletions(-) commit 109ced70f321058378e3427e814ebdd034f4c6bd Author: Wei Li @@ -2594,8 +7703,8 @@ Update Simplified Chinese translation. - po/zh_CN.po | 267 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 142 insertions(+), 125 deletions(-) + po/zh_CN.po | 267 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 142 insertions(+), 125 deletions(-) commit 6859dcfc423fc6c6aa903e2b5e423cc45338bea5 Author: Rudolfs Mazurs @@ -2603,8 +7712,8 @@ Updated Latvian translation. - po/lv.po | 670 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 340 insertions(+), 330 deletions(-) + po/lv.po | 670 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 340 insertions(+), 330 deletions(-) commit c80eaed610f09a5657ce26845231a88ff9574c16 Author: Changwoo Ryu @@ -2612,8 +7721,8 @@ Updated Korean translation - po/ko.po | 261 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 138 insertions(+), 123 deletions(-) + po/ko.po | 261 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 138 insertions(+), 123 deletions(-) commit 3f5076849dda9f18b1ae1454ac5f375e94633774 Author: Kjartan Maraas @@ -2621,8 +7730,8 @@ Updated Norwegian bokmål translation. - po/nb.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + po/nb.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit 3600a22f73fe5d4832654d2bce84b07c431b7988 Author: Bruno Brouard @@ -2630,8 +7739,8 @@ Updated French translation - po/fr.po | 631 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 317 insertions(+), 314 deletions(-) + po/fr.po | 631 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 317 insertions(+), 314 deletions(-) commit 2a7e948dd44116802a2db17f0c02caed3729923e Author: Jorge González @@ -2639,8 +7748,8 @@ Updated Spanish translation - help/es/es.po | 77 ++++++++++++++++++++++++++++++++------------------------ - 1 files changed, 44 insertions(+), 33 deletions(-) + help/es/es.po | 77 ++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 44 insertions(+), 33 deletions(-) commit 4ebd1394fe9f84d731686529d6c5ddc3f50673c7 Author: Jorge González @@ -2648,8 +7757,8 @@ Updated Spanish translation - po/es.po | 22 ++++++++++------------ - 1 files changed, 10 insertions(+), 12 deletions(-) + po/es.po | 22 ++++++++++------------ + 1 file changed, 10 insertions(+), 12 deletions(-) commit 8982cec589077a669dc2a7a9e87508ffdf83a5d8 Author: Daniel Korostil @@ -2657,8 +7766,8 @@ Uploaded Ukranian - po/uk.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/uk.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 61c22df2421b6358fd55e142ad494a14ac45beae Author: Daniel Korostil @@ -2666,8 +7775,8 @@ Uploaded Ukranian - po/uk.po | 687 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 349 insertions(+), 338 deletions(-) + po/uk.po | 687 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 349 insertions(+), 338 deletions(-) commit ccde80cec06a953dbd0d70479b5fecd3d4106b12 Author: Wouter Bolsterlee @@ -2675,8 +7784,8 @@ Updated Dutch translation by Wouter Bolsterlee - po/nl.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/nl.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit eb51c72a6d92c949ef57f6f16881001b3fc9f18e Author: Wouter Bolsterlee @@ -2684,8 +7793,8 @@ Updated Dutch translation by Wouter Bolsterlee - po/nl.po | 196 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 100 insertions(+), 96 deletions(-) + po/nl.po | 196 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 100 insertions(+), 96 deletions(-) commit a7a55af467f357ad8ea198768d2898bfe8415553 Author: Alexander Shopov @@ -2693,8 +7802,8 @@ Updated Bulgarian translation - po/bg.po | 190 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 97 insertions(+), 93 deletions(-) + po/bg.po | 190 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 97 insertions(+), 93 deletions(-) commit 3f197c8d8149fcfc3764e95bdd3103099e601b36 Author: Khaled Hosny @@ -2702,8 +7811,8 @@ Updated Arabic translation - po/ar.po | 437 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 218 insertions(+), 219 deletions(-) + po/ar.po | 437 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 218 insertions(+), 219 deletions(-) commit 66d407eae68ab57e62fa3581fee891ed251adc9d Author: Stef Walter @@ -2713,8 +7822,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641018 - gkr/seahorse-gkr-item.c | 18 +++++++++++------- - 1 files changed, 11 insertions(+), 7 deletions(-) + gkr/seahorse-gkr-item.c | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) commit c6491c78cea42cdf9dcd389f49c7bf2d9029c332 Author: Fran Diéguez @@ -2722,8 +7831,8 @@ QA of Galician translations - po/gl.po | 68 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 34 insertions(+), 34 deletions(-) + po/gl.po | 68 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 34 insertions(+), 34 deletions(-) commit 9ff4e924eae7235f6eeac022d4087d32d92aed3c Author: Matej Urbančič @@ -2731,8 +7840,8 @@ Updated Slovenian translation - po/sl.po | 193 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 97 insertions(+), 96 deletions(-) + po/sl.po | 193 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 97 insertions(+), 96 deletions(-) commit d2debd5f727f2620496cb14ab73186c50a91521f Author: Marek Černocký @@ -2740,8 +7849,8 @@ Updated Czech translation - po/cs.po | 191 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 98 insertions(+), 93 deletions(-) + po/cs.po | 191 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 98 insertions(+), 93 deletions(-) commit 32f0d62e2180adaf6350c43861f44639b7cc7d4b Author: Chao-Hsiung Liao @@ -2749,8 +7858,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 674 ++++++++++++++++++++++++++++++----------------------------- - po/zh_TW.po | 675 ++++++++++++++++++++++++++++++----------------------------- + po/zh_HK.po | 674 +++++++++++++++++++++++++++++------------------------------ + po/zh_TW.po | 675 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 680 insertions(+), 669 deletions(-) commit 6453c023736964ce4640b57a0a22ebaf6e815189 @@ -2759,8 +7868,8 @@ Updated Swedish translation - po/sv.po | 192 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 98 insertions(+), 94 deletions(-) + po/sv.po | 192 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 98 insertions(+), 94 deletions(-) commit 9a7bda121e64f9bb5bf225ad4d5fcbbc9580046e Author: Ivar Smolin @@ -2768,8 +7877,8 @@ [l10n] Updated Estonian translation - po/et.po | 57 ++++++++++++++++++--------------------------------------- - 1 files changed, 18 insertions(+), 39 deletions(-) + po/et.po | 57 ++++++++++++++++++--------------------------------------- + 1 file changed, 18 insertions(+), 39 deletions(-) commit 6e092f50ab8b8ce8893d42373a1a3838d7ba85df Author: Daniel Mustieles @@ -2777,8 +7886,8 @@ Updated Spanish translation - po/es.po | 215 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 111 insertions(+), 104 deletions(-) + po/es.po | 215 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 111 insertions(+), 104 deletions(-) commit c36dafbdb597ff8387dd4017062fe77bd9099b75 Author: Kjartan Maraas @@ -2786,8 +7895,8 @@ Updated Norwegian bokmål translation - po/nb.po | 46 +++++++++++++++++++++++----------------------- - 1 files changed, 23 insertions(+), 23 deletions(-) + po/nb.po | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) commit f5705282c3798f6158681c980547ec3d2881e477 Author: Kjartan Maraas @@ -2795,8 +7904,8 @@ Updated Norwegian bokmål translation - po/nb.po | 188 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 96 insertions(+), 92 deletions(-) + po/nb.po | 188 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 96 insertions(+), 92 deletions(-) commit 7caa5c12edfb6c6ae3500b319fc778bfc0335f66 Author: Yaron Shahrabani @@ -2804,8 +7913,8 @@ Updated Hebrew translation. - po/he.po | 186 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 95 insertions(+), 91 deletions(-) + po/he.po | 186 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 95 insertions(+), 91 deletions(-) commit cb763cbecef3956e6d6e69d5fe1181d4530a3670 Author: Stef Walter @@ -2815,8 +7924,8 @@ This makes sure that windows are closed when the user requests it. - libseahorse/seahorse-widget.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + libseahorse/seahorse-widget.c | 1 + + 1 file changed, 1 insertion(+) commit 571e656f82ec4d3965f43a59a784d66d98328416 Author: Fran Diéguez @@ -2824,8 +7933,8 @@ Updated Galician translations - po/gl.po | 184 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 94 insertions(+), 90 deletions(-) + po/gl.po | 184 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 94 insertions(+), 90 deletions(-) commit 8ef5bb3206c93fb92b2e9147dd7a8757138a74f0 Author: Stef Walter @@ -2835,8 +7944,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=635097 - pgp/seahorse-pgp-public-key-properties.xml | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) + pgp/seahorse-pgp-public-key-properties.xml | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) commit 1217669712d3279377f7ed2ac123f847e7983474 Author: Stef Walter @@ -2846,8 +7955,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=633568 - gkr/seahorse-gkr-item-properties.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + gkr/seahorse-gkr-item-properties.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit 35f8f8be68074f24d2e903c477d828a1b118a9ac Author: Stef Walter @@ -2857,9 +7966,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629217 - gkr/seahorse-gkr-item-properties.xml | 2 +- - pgp/seahorse-pgp-private-key-properties.xml | 2 +- - pgp/seahorse-pgp-public-key-properties.xml | 2 +- + gkr/seahorse-gkr-item-properties.xml | 2 +- + pgp/seahorse-pgp-private-key-properties.xml | 2 +- + pgp/seahorse-pgp-public-key-properties.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit ab07cefa89724d464de155b6b2e2e8406cc68fb0 @@ -2868,8 +7977,8 @@ Updated Greek translation - po/el.po | 461 ++++++++++++++++++++++++++------------------------------------ - 1 files changed, 191 insertions(+), 270 deletions(-) + po/el.po | 461 ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 191 insertions(+), 270 deletions(-) commit 93fe1d6ed0495a67cb3e6ca2b59f667f9b3d7b22 Author: Alexander Shopov @@ -2877,8 +7986,8 @@ Updated Bulgarian translation - po/bg.po | 404 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 187 insertions(+), 217 deletions(-) + po/bg.po | 404 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 187 insertions(+), 217 deletions(-) commit 514808f46e6bdadbf2925e92e05897bcb9716659 Author: Fran Diéguez @@ -2886,8 +7995,8 @@ Updated Galician translations - po/gl.po | 448 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 224 insertions(+), 224 deletions(-) + po/gl.po | 448 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 224 insertions(+), 224 deletions(-) commit 4ebd269f748351fb7dc1b8024e2a867c1c9cf419 Author: Wouter Bolsterlee @@ -2895,8 +8004,8 @@ Updated Dutch translation by Wouter Bolsterlee - po/nl.po | 435 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 218 insertions(+), 217 deletions(-) + po/nl.po | 435 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 218 insertions(+), 217 deletions(-) commit f039cdf7c7607e771838c8698cdda79ec6cc0aad Author: Paul Seyfert @@ -2904,8 +8013,8 @@ [l10n] Updated German translation - po/de.po | 558 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 283 insertions(+), 275 deletions(-) + po/de.po | 558 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 283 insertions(+), 275 deletions(-) commit e2b55eb9ef118d3dd81c2a5927bc69d44812a891 Author: Daniel Nylander @@ -2913,8 +8022,8 @@ Updated Swedish translation - po/sv.po | 434 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 216 insertions(+), 218 deletions(-) + po/sv.po | 434 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 216 insertions(+), 218 deletions(-) commit 8ace06d20359e0d64a7948908444a6b198728903 Author: Marek Černocký @@ -2922,8 +8031,8 @@ Updated Czech translation - po/cs.po | 405 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 189 insertions(+), 216 deletions(-) + po/cs.po | 405 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 189 insertions(+), 216 deletions(-) commit 9d611d886538a0bf4d16345c42bbcdf784bdd5f9 Author: Stef Walter @@ -2931,8 +8040,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6b12530a79eaf9d5126ca256c9842c3fcbceb0e0 Author: Stef Walter @@ -2940,9 +8049,9 @@ Release version 2.91.4 - NEWS | 10 ++++++++++ - configure.in | 2 +- - 2 files changed, 11 insertions(+), 1 deletions(-) + NEWS | 10 ++++++++++ + configure.in | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) commit 9318b28f9ea039ea8322b778d42235a88b68aa3d Author: Stef Walter @@ -2953,9 +8062,9 @@ A copy of Matthias Clasen's changes to libegg: http://git.gnome.org/browse/libegg/commit/?id=0be81fa47fb5dabba2be40888ed5d4b16f0ae6a3 - libegg/eggsmclient-private.h | 6 ++++++ - libegg/eggsmclient-xsmp.c | 7 ++++++- - 2 files changed, 12 insertions(+), 1 deletions(-) + libegg/eggsmclient-private.h | 6 ++++++ + libegg/eggsmclient-xsmp.c | 7 ++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) commit d01e85b98b3b091d0af1b92ea8ad7c559ac13a4f Author: Stef Walter @@ -2966,12 +8075,12 @@ This doesn't result in the PKCS#11 stuff working. Just an initial commit to get it compiling again after gcr changes. - pkcs11/seahorse-pkcs11-certificate-props.c | 2 +- - pkcs11/seahorse-pkcs11-certificate-props.h | 2 +- - pkcs11/seahorse-pkcs11-certificate.c | 3 +-- - pkcs11/seahorse-pkcs11-helpers.c | 1 - - pkcs11/seahorse-pkcs11-object.c | 1 - - pkcs11/seahorse-pkcs11-operations.c | 1 - + pkcs11/seahorse-pkcs11-certificate-props.c | 2 +- + pkcs11/seahorse-pkcs11-certificate-props.h | 2 +- + pkcs11/seahorse-pkcs11-certificate.c | 3 +-- + pkcs11/seahorse-pkcs11-helpers.c | 1 - + pkcs11/seahorse-pkcs11-object.c | 1 - + pkcs11/seahorse-pkcs11-operations.c | 1 - 6 files changed, 3 insertions(+), 7 deletions(-) commit 033e8b8f134fdea65d90f1b89b9cad64c55c9b83 @@ -2980,8 +8089,8 @@ Added UG translation - po/ug.po | 167 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 86 insertions(+), 81 deletions(-) + po/ug.po | 167 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 86 insertions(+), 81 deletions(-) commit 39af6f3ade4bdf1b4a7c2a19befd13721dd5cc35 Author: Ivar Smolin @@ -2989,8 +8098,8 @@ [l10n] Updated Estonian translation - po/et.po | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + po/et.po | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit 251ea0a5c0c6721a90fae720e447de01fecae992 Author: Kjartan Maraas @@ -2998,8 +8107,8 @@ Updated Norwegian bokmål translation - po/nb.po | 402 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 187 insertions(+), 215 deletions(-) + po/nb.po | 402 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 187 insertions(+), 215 deletions(-) commit 4a5c6db502dfa22262070be683b98dc65b744096 Author: Matej Urbančič @@ -3008,7 +8117,7 @@ Updated Slovenian translation po/sl.po | 5952 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 2977 insertions(+), 2975 deletions(-) + 1 file changed, 2977 insertions(+), 2975 deletions(-) commit 2ebbdf178e5222a593548f466966242756741c7d Author: Ivar Smolin @@ -3016,8 +8125,8 @@ [l10n] Updated Estonian translation - po/et.po | 373 ++++++++++++++++++++++++++++++++++++++++++++------------------ - 1 files changed, 266 insertions(+), 107 deletions(-) + po/et.po | 373 +++++++++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 266 insertions(+), 107 deletions(-) commit 72767bb8d5b4e56fb479c53d7eb487cf525c47c8 Author: Yaron Shahrabani @@ -3025,8 +8134,8 @@ Updated Hebrew translation. - po/he.po | 439 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 219 insertions(+), 220 deletions(-) + po/he.po | 439 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 219 insertions(+), 220 deletions(-) commit 7cedce14a43ae3527fc9d26c097de6122810f95c Author: Jorge González @@ -3034,8 +8143,8 @@ Updated Spanish translation - po/es.po | 421 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 210 insertions(+), 211 deletions(-) + po/es.po | 421 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 210 insertions(+), 211 deletions(-) commit 762c04906a63ed80d07cb3ca0801a5d173dc2600 Author: Pablo Castellano @@ -3046,9 +8155,9 @@ Show path to GNUPG executable and version for which seahorse was compiled - configure.in | 1 + - src/seahorse-main.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) + configure.in | 1 + + src/seahorse-main.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) commit 5bb9786c52a13463d8f172cf7fa2c57c7bd0362d Author: nobled @@ -3065,8 +8174,8 @@ Thanks to Pablo Castellano for debugging. Closes: bgo#609344. - libseahorse/seahorse-validity.h | 2 +- - pgp/seahorse-gpgme-key-op.c | 18 +++++++++--------- + libseahorse/seahorse-validity.h | 2 +- + pgp/seahorse-gpgme-key-op.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) commit b6a37957bd2b12dc243d7cc4070342f5c96e6b31 @@ -3080,9 +8189,9 @@ Closes: bgo#605497. - pgp/seahorse-gpgme-add-subkey.c | 6 +++--- - pgp/seahorse-gpgme-generate.c | 31 ++++++++++++++++--------------- - pgp/seahorse-gpgme-key-op.h | 4 +++- + pgp/seahorse-gpgme-add-subkey.c | 6 +++--- + pgp/seahorse-gpgme-generate.c | 31 ++++++++++++++++--------------- + pgp/seahorse-gpgme-key-op.h | 4 +++- 3 files changed, 22 insertions(+), 19 deletions(-) commit 42691a5b192ce753beb4218202733db2b99c572d @@ -3097,8 +8206,8 @@ Part of: https://bugzilla.gnome.org/show_bug.cgi?id=357322 - pgp/seahorse-gpgme-key-op.c | 6 +----- - pgp/seahorse-gpgme-sign.c | 18 +++++++++++++----- + pgp/seahorse-gpgme-key-op.c | 6 +----- + pgp/seahorse-gpgme-sign.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) commit 66f3c65fd7ef596062b7c7f1f127ca70e95c6a16 @@ -3107,8 +8216,8 @@ Updated Romanian translation - po/ro.po | 545 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 270 insertions(+), 275 deletions(-) + po/ro.po | 545 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 270 insertions(+), 275 deletions(-) commit bf9454bf47416b8ad8cbf896100d4ddce9161375 Author: Theppitak Karoonboonyanan @@ -3116,8 +8225,8 @@ Updated Thai translation. - po/th.po | 397 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 195 insertions(+), 202 deletions(-) + po/th.po | 397 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 195 insertions(+), 202 deletions(-) commit 3ecdb585af8c871b55e8cbc89909114698918459 Author: Gheyret T.Kenji @@ -3125,8 +8234,8 @@ Added UG translation - po/ug.po | 64 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 32 insertions(+), 32 deletions(-) + po/ug.po | 64 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 32 insertions(+), 32 deletions(-) commit d66ec3ca7c9ca97a7c5e2ff16016599e1dc87d5a Author: Gheyret T.Kenji @@ -3134,8 +8243,8 @@ Added UG translation - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit 996ed372d892e4779f93d59493aace9469d2aa39 Author: Gheyret T.Kenji @@ -3144,7 +8253,7 @@ Added UG translation po/ug.po | 2940 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 2940 insertions(+), 0 deletions(-) + 1 file changed, 2940 insertions(+) commit b4158e5296063391c20af8f6737979c07ebed806 Author: Stef Walter @@ -3152,8 +8261,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 501c65c816f7f1aae86e3048e0b4cfa4e6d2c62a Author: Stef Walter @@ -3161,8 +8270,8 @@ Release version 2.91.2 - NEWS | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + NEWS | 6 ++++++ + 1 file changed, 6 insertions(+) commit a6c1089473d9800f5bbec4757e0b3b604ed532f3 Author: Stef Walter @@ -3172,8 +8281,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=633568 - gkr/seahorse-gkr-item-properties.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + gkr/seahorse-gkr-item-properties.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) commit c548f3b610f1a925bcca0203b19200ef07a50d7a Author: Stef Walter @@ -3183,8 +8292,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=633773 - libseahorse/seahorse-notification.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libseahorse/seahorse-notification.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5b9aa67a8841cd54744fd365973ceed8c8524987 Author: Stef Walter @@ -3194,10 +8303,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=633773 - gkr/seahorse-gkr-add-item.c | 6 +++++- - libseahorse/seahorse-prefs.c | 10 ++++++++-- - pgp/seahorse-gpgme-generate.c | 6 ++++++ - ssh/seahorse-ssh-generate.c | 8 ++++++++ + gkr/seahorse-gkr-add-item.c | 6 +++++- + libseahorse/seahorse-prefs.c | 10 ++++++++-- + pgp/seahorse-gpgme-generate.c | 6 ++++++ + ssh/seahorse-ssh-generate.c | 8 ++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) commit 4556596c7848357fa1f1fdb79f8fb832f214e2c8 @@ -3206,8 +8315,8 @@ Updated Catalan (Valencian) translation - po/ca@valencia.po | 443 ++++++++++++++++++++++++++--------------------------- - 1 files changed, 220 insertions(+), 223 deletions(-) + po/ca@valencia.po | 443 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 220 insertions(+), 223 deletions(-) commit 9610326815309079f448ff5d42a2da15cebb9cff Author: Stef Walter @@ -3215,8 +8324,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 30ee1da7a4750e9bb119a73229f94475d61cc86e Author: Stef Walter @@ -3224,8 +8333,8 @@ Release version 2.91.1.1 - NEWS | 10 ++++++++++ - configure.in | 6 +++--- + NEWS | 10 ++++++++++ + configure.in | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) commit a6a21d1cc8f52f956e2f2bbab057ea301be18257 @@ -3234,8 +8343,8 @@ Fix build with libnotify 0.7 - libseahorse/seahorse-notification.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) + libseahorse/seahorse-notification.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) commit 77c537b5523ca2ceff3de1f1ea76c306384d536f Author: Matthias Clasen @@ -3245,8 +8354,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=632604 - libcryptui/cryptui-key-chooser.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + libcryptui/cryptui-key-chooser.c | 7 +++++++ + 1 file changed, 7 insertions(+) commit 2d13926f655d8c0a525eb56ecfe10f81824ec0dd Author: Tomas Bzatek @@ -3254,8 +8363,8 @@ [pkcs11] Fix build issues on gtk+-3.0 - pkcs11/seahorse-pkcs11-certificate-props.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) + pkcs11/seahorse-pkcs11-certificate-props.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) commit 5b35b922c748798a0bd69c7fd64345f4fedafe98 Author: Matej Urbančič @@ -3263,8 +8372,8 @@ Added sl for Slovenian translation - help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 341abdc73f82f65c618a90c53a09deba067d7e0d Author: Matej Urbančič @@ -3273,7 +8382,7 @@ Added Slovenian translation help/sl/sl.po | 1134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 1134 insertions(+), 0 deletions(-) + 1 file changed, 1134 insertions(+) commit 2610cddc7cae34a3db0716f0bf24ddceea25d533 Author: Martin Paljak @@ -3281,8 +8390,8 @@ build with latest gcr which only has GcrCertificateWidget - pkcs11/seahorse-pkcs11-certificate-props.c | 35 ++++++++------------------- - 1 files changed, 11 insertions(+), 24 deletions(-) + pkcs11/seahorse-pkcs11-certificate-props.c | 35 ++++++++++-------------------- + 1 file changed, 11 insertions(+), 24 deletions(-) commit 46b51cc9967abe46b325e7ba59bbe0a200c4bb1e Author: YunQiang Su @@ -3290,8 +8399,8 @@ Update Simplified Chinese translation, partially sync from ubuntu-l10n-zh-cn team. - po/zh_CN.po | 1267 ++++++++++------------------------------------------------- - 1 files changed, 216 insertions(+), 1051 deletions(-) + po/zh_CN.po | 1269 ++++++++++------------------------------------------------- + 1 file changed, 217 insertions(+), 1052 deletions(-) commit e4e91bed87360f1562757d55f69882a28cd4c35c Author: Andreas Henriksson @@ -3302,8 +8411,8 @@ The included Gtk+ gir should match the version we're building against. - libcryptui/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + libcryptui/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit b2d0c94cff1f94c6e986f3cc306edacb7c6141fc Author: Changwoo Ryu @@ -3311,8 +8420,8 @@ Updated Korean translation - po/ko.po | 414 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 204 insertions(+), 210 deletions(-) + po/ko.po | 414 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 204 insertions(+), 210 deletions(-) commit eee80ac605b06ec4885f32b214ee5d13767d631b Author: Diego Escalante Urrelo @@ -3326,8 +8435,8 @@ Bug #614332 - src/seahorse-key-manager.c | 24 +++++++++++++++++++++++- - 1 files changed, 23 insertions(+), 1 deletions(-) + src/seahorse-key-manager.c | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) commit 4a3e2415fa9b2486ed72ac821c31ccd9efbb419a Author: Stef Walter @@ -3335,8 +8444,8 @@ Bump version number. - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e9a3ecd6874814de39662baa39071f2f1c4a9521 Author: Stef Walter @@ -3344,9 +8453,9 @@ Release version 2.91.1 - NEWS | 7 +++++++ - README | 1 - - 2 files changed, 7 insertions(+), 1 deletions(-) + NEWS | 7 +++++++ + README | 1 - + 2 files changed, 7 insertions(+), 1 deletion(-) commit 3660af92919b1f25f511c367980cbe41187ad4db Author: Stef Walter @@ -3356,8 +8465,8 @@ Accidentally dropped in migration to GTK3 - configure.in | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + configure.in | 2 ++ + 1 file changed, 2 insertions(+) commit 106786f532fbd5d914707a494c7a9824bec29cfc Author: Stef Walter @@ -3367,23 +8476,23 @@ Use the --with-gtk=3.0 option to build with GTK3 - .gitignore | 1 + - configure.in | 49 +++++++++++++++----- - daemon/Makefile.am | 3 +- - libcryptui/Makefile.am | 5 +- - libcryptui/cryptui-keyset.h | 10 ++-- - libegg/egg-datetime.c | 41 ++++++++++++----- - libseahorse/seahorse-context.c | 27 ++++++++---- - libseahorse/seahorse-context.h | 20 +++++---- - libseahorse/seahorse-object-widget.c | 10 +---- - libseahorse/seahorse-passphrase.c | 6 ++- - libseahorse/seahorse-set.h | 12 +++--- - libseahorse/seahorse-util.c | 1 + - libseahorse/seahorse-widget.c | 81 ++++++++++++++++++++------------- - libseahorse/seahorse-widget.h | 20 +++++--- - src/seahorse-key-manager.c | 2 +- - src/seahorse-viewer.c | 26 ----------- - 16 files changed, 179 insertions(+), 135 deletions(-) + .gitignore | 1 + + configure.in | 49 ++++++++++++++++------ + daemon/Makefile.am | 3 +- + libcryptui/Makefile.am | 5 +-- + libcryptui/cryptui-keyset.h | 10 ++--- + libegg/egg-datetime.c | 41 +++++++++++++----- + libseahorse/seahorse-context.c | 27 ++++++++---- + libseahorse/seahorse-context.h | 20 +++++---- + libseahorse/seahorse-object-widget.c | 10 +---- + libseahorse/seahorse-passphrase.c | 6 ++- + libseahorse/seahorse-set.h | 12 +++--- + libseahorse/seahorse-util.c | 1 + + libseahorse/seahorse-widget.c | 81 ++++++++++++++++++++++-------------- + libseahorse/seahorse-widget.h | 22 ++++++---- + src/seahorse-key-manager.c | 2 +- + src/seahorse-viewer.c | 26 ------------ + 16 files changed, 180 insertions(+), 136 deletions(-) commit 2ddd0ffe2e1105fe9cb7e38252ba6ac9966f9467 Author: Stef Walter @@ -3394,8 +8503,8 @@ Fix compiler warnings in seahorse_gpgme_get_keytype_table() and seahorse_service_generate_credentials() - daemon/seahorse-service.c | 12 ++++++------ - pgp/seahorse-gpgme.c | 8 ++++---- + daemon/seahorse-service.c | 12 ++++++------ + pgp/seahorse-gpgme.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) commit 16e8b3edbfccaeedbce475856f8b4e48cdaf4712 @@ -3406,18 +8515,18 @@ Migrate to libgck from libgp11, now that gck is in gnome-keyring. - configure.in | 22 ++++---- - pkcs11/Makefile.am | 1 + - pkcs11/seahorse-pkcs11-certificate.c | 40 +++++++------- - pkcs11/seahorse-pkcs11-certificate.h | 4 +- - pkcs11/seahorse-pkcs11-helpers.c | 16 +++--- - pkcs11/seahorse-pkcs11-helpers.h | 6 +- - pkcs11/seahorse-pkcs11-module.c | 15 ++--- - pkcs11/seahorse-pkcs11-object.c | 105 ++++++++++++++++++---------------- - pkcs11/seahorse-pkcs11-object.h | 14 ++-- - pkcs11/seahorse-pkcs11-operations.c | 44 +++++++------- - pkcs11/seahorse-pkcs11-source.c | 14 ++-- - pkcs11/seahorse-pkcs11-source.h | 8 +- + configure.in | 22 ++++---- + pkcs11/Makefile.am | 1 + + pkcs11/seahorse-pkcs11-certificate.c | 40 ++++++------- + pkcs11/seahorse-pkcs11-certificate.h | 4 +- + pkcs11/seahorse-pkcs11-helpers.c | 16 +++--- + pkcs11/seahorse-pkcs11-helpers.h | 6 +- + pkcs11/seahorse-pkcs11-module.c | 15 +++-- + pkcs11/seahorse-pkcs11-object.c | 105 +++++++++++++++++++---------------- + pkcs11/seahorse-pkcs11-object.h | 14 ++--- + pkcs11/seahorse-pkcs11-operations.c | 44 +++++++-------- + pkcs11/seahorse-pkcs11-source.c | 14 ++--- + pkcs11/seahorse-pkcs11-source.h | 8 +-- 12 files changed, 148 insertions(+), 141 deletions(-) commit 9be069017e73ce47f12c343986a8dba2f1fbf12d @@ -3426,8 +8535,8 @@ Bump release number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5a370ab67e039aa9a25f50c381361e5cae72dc54 Author: Stef Walter @@ -3435,9 +8544,9 @@ Release version 2.91.0 - NEWS | 5 +++++ - configure.in | 2 +- - po/POTFILES.in | 1 - + NEWS | 5 +++++ + configure.in | 2 +- + po/POTFILES.in | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) commit e3514baed3588f916048df4bfee901ab0829b64a @@ -3463,7 +8572,7 @@ libseahorse/seahorse-gtkstock.c | 1 - libseahorse/seahorse-gtkstock.h | 1 - libseahorse/seahorse-prefs.c | 26 - - libseahorse/seahorse-prefs.xml | 71 +-- + libseahorse/seahorse-prefs.xml | 71 +- pixmaps/22x22/Makefile.am | 2 - pixmaps/22x22/seahorse-share-keys.png | Bin 1127 -> 0 bytes pixmaps/22x22/seahorse-share-keys.svg | 1091 ------------------------------ @@ -3479,8 +8588,8 @@ Updated Lithuanian translation - po/lt.po | 130 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 68 insertions(+), 62 deletions(-) + po/lt.po | 130 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 68 insertions(+), 62 deletions(-) commit f2b42aebdecb802c187afcc492aeba4b0a7e41b1 Author: Inaki Larranaga Murgoitio @@ -3488,8 +8597,8 @@ Updated Basque language - po/eu.po | 194 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 103 insertions(+), 91 deletions(-) + po/eu.po | 194 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 103 insertions(+), 91 deletions(-) commit 99cf4cf0e2016161daee41fb109ebc8664031205 Author: Simos Xenitellis @@ -3497,8 +8606,8 @@ l10n: Updated Greek translation for seahorse - po/el.po | 103 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 55 insertions(+), 48 deletions(-) + po/el.po | 103 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 55 insertions(+), 48 deletions(-) commit 7e5e668fd37c614d477486d39e43d0c37e5a6f95 Author: Stef Walter @@ -3506,8 +8615,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 92ebfaee5e91d3fc2772372eba46a15a66e416b6 Author: Stef Walter @@ -3515,10 +8624,10 @@ Release version 2.32.0 - Makefile.am | 3 ++- - NEWS | 5 +++++ - configure.in | 4 ++-- - help/zh_CN/zh_CN.po | 2 +- + Makefile.am | 3 ++- + NEWS | 5 +++++ + configure.in | 4 ++-- + help/zh_CN/zh_CN.po | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) commit 8d578af1f31692a90413b09cbad1ec432175a1c3 @@ -3527,8 +8636,8 @@ Updated Russian translation - po/ru.po | 574 +++++++++++++++++++++++++------------------------------------- - 1 files changed, 234 insertions(+), 340 deletions(-) + po/ru.po | 574 ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 234 insertions(+), 340 deletions(-) commit 5582761d220b7082291d0074a0ed769d85375017 Author: Khaled Hosny @@ -3536,8 +8645,8 @@ Updated Arabic translation - po/ar.po | 518 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 274 insertions(+), 244 deletions(-) + po/ar.po | 518 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 274 insertions(+), 244 deletions(-) commit 846609192eea04d976b680cb747e6392f29d4390 Author: Takayuki KUSANO @@ -3545,8 +8654,8 @@ Updated Japanese translation - po/ja.po | 26 +++++++++++++------------- - 1 files changed, 13 insertions(+), 13 deletions(-) + po/ja.po | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) commit e92e91a72a851912618c56c9b1c97e409f7023b8 Author: Kenneth Nielsen @@ -3554,8 +8663,8 @@ Updated Danish translation - po/da.po | 104 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 55 insertions(+), 49 deletions(-) + po/da.po | 104 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 55 insertions(+), 49 deletions(-) commit 35a9ed0a2efb4d7b58de5b88c6c98fcc1688fa15 Author: Piotr Drąg @@ -3563,8 +8672,8 @@ Updated Polish translation - po/pl.po | 105 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 55 insertions(+), 50 deletions(-) + po/pl.po | 105 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 55 insertions(+), 50 deletions(-) commit f7dca7fb971dc02c4b39c0685bd6dd425b078689 Author: Takayuki KUSANO @@ -3572,8 +8681,8 @@ Updated Japanese translation. - po/ja.po | 153 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 77 insertions(+), 76 deletions(-) + po/ja.po | 153 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 77 insertions(+), 76 deletions(-) commit efd6bda57124729a877cb38cab81fc1c6e38f562 Author: Yasumichi Akahoshi @@ -3581,8 +8690,8 @@ Updated Japanese translation. - help/ja/figures/seahorse-window.png | Bin 0 -> 20435 bytes - help/ja/ja.po | 32 +++++++++++++++++--------------- + help/ja/figures/seahorse-window.png | Bin 0 -> 20435 bytes + help/ja/ja.po | 32 +++++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) commit 163183780ae6fc69d3a127e7b6373d3168a517dc @@ -3591,8 +8700,8 @@ Updated Dutch translation by Wouter Bolsterlee - po/nl.po | 104 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 55 insertions(+), 49 deletions(-) + po/nl.po | 104 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 55 insertions(+), 49 deletions(-) commit e13ca7657f9296904b2ffdb379108b6f84d782ed Author: André Gondim @@ -3600,8 +8709,8 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 116 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 61 insertions(+), 55 deletions(-) + po/pt_BR.po | 116 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 61 insertions(+), 55 deletions(-) commit 4f37e4b5e7ecc42be0353266ba3cae83226a6662 Author: Philip Withnall @@ -3609,8 +8718,8 @@ Update British English translation - po/en_GB.po | 108 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 57 insertions(+), 51 deletions(-) + po/en_GB.po | 108 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 57 insertions(+), 51 deletions(-) commit 7c6239901b49129d7b04fb908a80ec4a80cafa50 Author: Gabor Kelemen @@ -3618,8 +8727,8 @@ Updated Hungarian translation - po/hu.po | 132 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 73 insertions(+), 59 deletions(-) + po/hu.po | 132 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 73 insertions(+), 59 deletions(-) commit e948e1cde78175f6cb7adca837466d1eff11b2d9 Author: Stef Walter @@ -3627,8 +8736,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit b9239b8d573022b1d9610fee56b8c35fddf71fbd Author: Stef Walter @@ -3636,9 +8745,9 @@ Release version 2.31.91 - NEWS | 8 ++++++++ - configure.in | 2 +- - 2 files changed, 9 insertions(+), 1 deletions(-) + NEWS | 8 ++++++++ + configure.in | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) commit 1242e2695063e9bac90f305a3fcf86e10d0284f0 Author: Милош Поповић @@ -3646,8 +8755,8 @@ Updated Serbian translation - po/sr.po | 68 +++++++++++++++++++++++++++++++++---------------------- - po/sr@latin.po | 68 +++++++++++++++++++++++++++++++++---------------------- + po/sr.po | 68 +++++++++++++++++++++++++++++++++++----------------------- + po/sr@latin.po | 68 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 82 insertions(+), 54 deletions(-) commit be855ae7e424a547095b09292180f0eb9a7b231e @@ -3656,8 +8765,8 @@ Update Czech translation by Marek Cernocky - po/cs.po | 72 +++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 39 insertions(+), 33 deletions(-) + po/cs.po | 72 +++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 39 insertions(+), 33 deletions(-) commit 500dee6cc33a6585d69556ad6258199c21fe96da Author: Alexander Shopov @@ -3665,8 +8774,8 @@ Updated Bulgarian translation - po/bg.po | 104 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 55 insertions(+), 49 deletions(-) + po/bg.po | 104 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 55 insertions(+), 49 deletions(-) commit acc85534ba8e124839939a491574e981bfcd552d Author: David Planella @@ -3674,8 +8783,8 @@ Updated Catalan translation - po/ca.po | 121 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 64 insertions(+), 57 deletions(-) + po/ca.po | 121 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 64 insertions(+), 57 deletions(-) commit bf74f4c6188392cff11a1b03e06c82b955e5b8e5 Author: Duarte Loreto @@ -3683,8 +8792,8 @@ Updated Portuguese translation - po/pt.po | 108 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 57 insertions(+), 51 deletions(-) + po/pt.po | 108 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 57 insertions(+), 51 deletions(-) commit e83850f35dc363fb014af4eae4ae758000e64529 Author: Chao-Hsiung Liao @@ -3692,8 +8801,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 119 ++++++++++++++++++++++++++++++---------------------------- - po/zh_TW.po | 119 ++++++++++++++++++++++++++++++---------------------------- + po/zh_HK.po | 119 +++++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 119 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 124 insertions(+), 114 deletions(-) commit a58f000e467a79d3d44ff69f1e377816cc000892 @@ -3702,8 +8811,8 @@ Updated Slovenian translation - po/sl.po | 55 +++++++++++++++++++++++++++---------------------------- - 1 files changed, 27 insertions(+), 28 deletions(-) + po/sl.po | 55 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 27 insertions(+), 28 deletions(-) commit aa750d2d2bbc72e12777456424d43164c91209bf Author: Jorge González @@ -3711,8 +8820,8 @@ Updated Spanish translation - po/es.po | 54 +++++++++++++++++++++++++++--------------------------- - 1 files changed, 27 insertions(+), 27 deletions(-) + po/es.po | 54 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 27 insertions(+), 27 deletions(-) commit c715fdb3622685594bab9afeab1aa7836e0707b9 Author: Milo Casagrande @@ -3720,8 +8829,8 @@ [l10n] Updated Italian translation - po/it.po | 119 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 63 insertions(+), 56 deletions(-) + po/it.po | 119 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 63 insertions(+), 56 deletions(-) commit a134a7d5057189979433b201d222aa4e7d5b3288 Author: Claude Paroz @@ -3729,8 +8838,8 @@ Updated French translation - po/fr.po | 221 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 111 insertions(+), 110 deletions(-) + po/fr.po | 221 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 111 insertions(+), 110 deletions(-) commit dc57628a493d9f77f7c86da3f4d3cbae9039999e Author: Aron Xu @@ -3738,8 +8847,8 @@ Update Simplified Chinese translation. - po/zh_CN.po | 78 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 39 insertions(+), 39 deletions(-) + po/zh_CN.po | 78 ++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 39 insertions(+), 39 deletions(-) commit 58d032815f27c2f2cf3c9794378ca1ee0b11b22d Author: Daniel Nylander @@ -3747,8 +8856,8 @@ Updated Swedish translation - po/sv.po | 109 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 57 insertions(+), 52 deletions(-) + po/sv.po | 109 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 57 insertions(+), 52 deletions(-) commit 88374f629758bad1213aef15b4cd0dba0f5f56bf Author: Matej Urbančič @@ -3756,8 +8865,8 @@ Updated Slovenian translation - po/sl.po | 227 +------------------------------------------------------------- - 1 files changed, 2 insertions(+), 225 deletions(-) + po/sl.po | 227 +-------------------------------------------------------------- + 1 file changed, 2 insertions(+), 225 deletions(-) commit 19f0cc0b93d49993049cdab6ba38f3f2e6a8b551 Author: Kjartan Maraas @@ -3765,8 +8874,8 @@ Updated Norwegian bokmål translation - po/nb.po | 253 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 130 insertions(+), 123 deletions(-) + po/nb.po | 253 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 130 insertions(+), 123 deletions(-) commit ea39f32bd762a6b3feb95e663b38cd985142a04f Author: Tomáš Virgl @@ -3774,8 +8883,8 @@ Updated Slovak translation - po/sk.po | 4783 ++++++++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 3068 insertions(+), 1715 deletions(-) + po/sk.po | 4819 ++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 3086 insertions(+), 1733 deletions(-) commit 466ae6ca4b3040eaf5c799ad71609faf0f8d2420 Author: Thorsten Sick @@ -3786,8 +8895,8 @@ This patch adds full documentation for seahorse-keyserver-results. Static functions are commented in a non-specific way, the other functions in a GTK-Doc style. - src/seahorse-keyserver-results.c | 102 +++++++++++++++++++++++++++++++++++++- - 1 files changed, 101 insertions(+), 1 deletions(-) + src/seahorse-keyserver-results.c | 102 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 101 insertions(+), 1 deletion(-) commit af9025e2c2e504d9cb15554ea19aa2519a6bdbf6 Author: A S Alam @@ -3795,8 +8904,8 @@ update Translation in master for Punjabi by A S Alam - po/pa.po | 203 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 103 insertions(+), 100 deletions(-) + po/pa.po | 203 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 103 insertions(+), 100 deletions(-) commit c426881dd7da3225dd87326e2b798491a27c3214 Author: Hideki Yamane (Debian-JP) @@ -3804,8 +8913,8 @@ Updated Japanese translation. - po/ja.po | 356 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 196 insertions(+), 160 deletions(-) + po/ja.po | 356 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 196 insertions(+), 160 deletions(-) commit f4df11704679c27f2e4fe7b87626497e46e9f5dc Author: Yasumichi Akahoshi @@ -3815,7 +8924,7 @@ help/Makefile.am | 2 +- help/ja/ja.po | 1667 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1668 insertions(+), 1 deletions(-) + 2 files changed, 1668 insertions(+), 1 deletion(-) commit 5b5ac4bf6329972199fd4d447cbee41c481d7c10 Author: Matthias Ferdinand @@ -3827,8 +8936,8 @@ Fixes bug #625506 - libseahorse/seahorse-util.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + libseahorse/seahorse-util.c | 2 ++ + 1 file changed, 2 insertions(+) commit 981866be8ec2d19838e3001aec1a48ac9b55a6f6 Author: Stef Walter @@ -3836,8 +8945,8 @@ Ignore *.mo and seahorse.xml files in help/ - help/.gitignore | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + help/.gitignore | 2 ++ + 1 file changed, 2 insertions(+) commit 2708c6c9779c98cb06876cc96986d9ae2ac01bee Author: Mattias Põldaru @@ -3845,8 +8954,8 @@ [l10n] Updated Estonian translation - po/et.po | 318 ++++++++++++++++---------------------------------------------- - 1 files changed, 83 insertions(+), 235 deletions(-) + po/et.po | 318 +++++++++++++++++---------------------------------------------- + 1 file changed, 83 insertions(+), 235 deletions(-) commit 828c2acb33415fbaa360f05d74fc51ff857915ba Author: Mario Blättermann @@ -3854,8 +8963,8 @@ [i18n] Updated German translation - po/de.po | 222 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 113 insertions(+), 109 deletions(-) + po/de.po | 222 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 113 insertions(+), 109 deletions(-) commit d0a7b2a9a32fa443b2ce5ebb0bf6b23751d7c4ba Author: Jorge González @@ -3863,8 +8972,8 @@ Updated Spanish translation - po/es.po | 52 +++++++++++++++++++++++++++------------------------- - 1 files changed, 27 insertions(+), 25 deletions(-) + po/es.po | 52 +++++++++++++++++++++++++++------------------------- + 1 file changed, 27 insertions(+), 25 deletions(-) commit 1e9c991760b62f06a9347d599a73d2814b033417 Author: Matej Urbančič @@ -3873,7 +8982,7 @@ Updated Slovenian translation po/sl.po | 6393 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 3199 insertions(+), 3194 deletions(-) + 1 file changed, 3199 insertions(+), 3194 deletions(-) commit 8ae4760cb0e86490927402199339ca3a05ccb0c2 Author: drtv @@ -3881,8 +8990,8 @@ Updated Tamil translation - po/ta.po | 82 +++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 44 insertions(+), 38 deletions(-) + po/ta.po | 82 ++++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 44 insertions(+), 38 deletions(-) commit c5a0bc77e49e1befbf07dddce350935c57ea3189 Author: Aron Xu @@ -3890,8 +8999,8 @@ Update Simplified Chinese translation. - po/zh_CN.po | 31 +++++++++++++++++-------------- - 1 files changed, 17 insertions(+), 14 deletions(-) + po/zh_CN.po | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) commit 10d65ae63ccb7d1ba3fad8b53d393fab52d43d92 Author: Fran Diéguez @@ -3899,8 +9008,8 @@ Updated Galician translations - po/gl.po | 165 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 77 insertions(+), 88 deletions(-) + po/gl.po | 165 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 77 insertions(+), 88 deletions(-) commit d492093cda08ffbc271a3d0a3fcb311c9252239a Author: Adam Schreiber @@ -3910,8 +9019,8 @@ Add GCR_CFLAGS and LIBS to SEAHORSE_CFLAGS and LIBS - configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit e710cf592e6eff1be1da78e89be2b7ea68d770fd Author: Yaron Shahrabani @@ -3919,8 +9028,8 @@ Updated Hebrew translation. - po/he.po | 29 +++++++++++++++++------------ - 1 files changed, 17 insertions(+), 12 deletions(-) + po/he.po | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) commit 312277d27e7f8a0a399afaab51a9bc2f58e89419 Author: Pablo Castellano @@ -3928,8 +9037,8 @@ Separate check for GCR and GP11 in building phase. - configure.in | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) + configure.in | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) commit be62ac21f22b102aa5404037f008087502a1bdca Author: Pablo Castellano @@ -3939,8 +9048,8 @@ GTK_WIDGET_VISIBLE -> gtk_widget_get_visible - pkcs11/seahorse-pkcs11-commands.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + pkcs11/seahorse-pkcs11-commands.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit f49d577c887e1df609e1d9c526e44f8fb718cfda Author: Adam Schreiber @@ -3950,8 +9059,8 @@ ifdef'd around this one appropriately. - daemon/seahorse-service.c | 74 +++++++++++++++++++++++++------------------- - 1 files changed, 42 insertions(+), 32 deletions(-) + daemon/seahorse-service.c | 80 ++++++++++++++++++++++++++--------------------- + 1 file changed, 45 insertions(+), 35 deletions(-) commit fbd62228e335b68e7d4d797993833323d1d1acfa Author: Adam Schreiber @@ -3961,8 +9070,8 @@ Changed from GTK_ICON_SIZE_DIALOG to _DND - src/seahorse-generate-select.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/seahorse-generate-select.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit b3af3c9c41f54f7a06233e9c014bf21bbb98a0cd Author: Adam Schreiber @@ -3973,8 +9082,8 @@ Incorporate changes from Javier Jardon's patch, but add ifdefs so that building with gdk less than 2.22.0 doesn't break. - src/seahorse-key-manager-store.c | 48 +++++++++++++++++++++++++++++++++---- - 1 files changed, 42 insertions(+), 6 deletions(-) + src/seahorse-key-manager-store.c | 48 +++++++++++++++++++++++++++++++++++----- + 1 file changed, 42 insertions(+), 6 deletions(-) commit fe7cf95feb3b30e003e8e449000738d3a95aa42a Author: Yaron Shahrabani @@ -3983,7 +9092,7 @@ Updated Hebrew translation. po/he.po | 1752 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 882 insertions(+), 870 deletions(-) + 1 file changed, 882 insertions(+), 870 deletions(-) commit 75a9f71e586378a823fc7921ed1751382c09cee2 Author: Aron Xu @@ -3991,8 +9100,8 @@ Update Simplified Chinese translation. - po/zh_CN.po | 298 +++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 165 insertions(+), 133 deletions(-) + po/zh_CN.po | 298 +++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 165 insertions(+), 133 deletions(-) commit 44a8441deabc17e803338d150f2a4385855f946d Author: Petr Kovar @@ -4000,8 +9109,8 @@ Update Czech translation by Marek Cernocky - po/cs.po | 46 ++++++++++++++++++++++------------------------ - 1 files changed, 22 insertions(+), 24 deletions(-) + po/cs.po | 46 ++++++++++++++++++++++------------------------ + 1 file changed, 22 insertions(+), 24 deletions(-) commit 95d7f03ee0945c8eca89a80a9fc4a10a99583721 Author: TeliuTe @@ -4011,7 +9120,7 @@ help/Makefile.am | 2 +- help/zh_CN/zh_CN.po | 1565 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1566 insertions(+), 1 deletions(-) + 2 files changed, 1566 insertions(+), 1 deletion(-) commit 67e69694b91697cd7cff2b68f7a3ad31a2c3e731 Author: Mario Blättermann @@ -4019,8 +9128,8 @@ [i18n] Updated German translation, fixed bug #622330 - help/de/de.po | 22 +++++++--------------- - 1 files changed, 7 insertions(+), 15 deletions(-) + help/de/de.po | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) commit df8956f8e63ec2b8b838f952c4c49d3015b7a236 Author: Adam Schreiber @@ -4028,8 +9137,8 @@ Finish making seahorse build with DGSEAL - libseahorse/seahorse-widget.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + libseahorse/seahorse-widget.c | 1 - + 1 file changed, 1 deletion(-) commit afd76065c742338700217aba05b9bd1c563fe94d Author: Sira Nokyoongtong @@ -4037,8 +9146,8 @@ Updated Thai translation. - po/th.po | 190 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 95 insertions(+), 95 deletions(-) + po/th.po | 190 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 95 insertions(+), 95 deletions(-) commit 3e2919a60658af1205a6e3a20abb83616db54bb3 Author: Thorsten Sick @@ -4049,8 +9158,8 @@ This patch adds full documentation for seahorse-progress.c. Static functions are commented in a non-specific way, the other functions in a GTK-Doc style. - libseahorse/seahorse-progress.c | 133 +++++++++++++++++++++++++++++++++++++-- - 1 files changed, 127 insertions(+), 6 deletions(-) + libseahorse/seahorse-progress.c | 133 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 127 insertions(+), 6 deletions(-) commit 69b25da92993dfaadce19eec1006bcf972fe02f0 Author: Thomas Thurman @@ -4058,8 +9167,8 @@ Updated Shavian translation - po/en@shaw.po | 186 +++++++++++++++++---------------------------------------- - 1 files changed, 54 insertions(+), 132 deletions(-) + po/en@shaw.po | 186 +++++++++++++++++----------------------------------------- + 1 file changed, 54 insertions(+), 132 deletions(-) commit 0f297b9af395b7b8095dc6163ec94d7c00fa3ca1 Author: Thomas Thurman @@ -4068,7 +9177,7 @@ Updated Shavian transliteration po/en@shaw.po | 1184 ++++++++++++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 1010 insertions(+), 174 deletions(-) + 1 file changed, 1010 insertions(+), 174 deletions(-) commit 8c24fda5d48c53fcbd886af8012f7aaf00c16c69 Author: Adam Schreiber @@ -4076,8 +9185,8 @@ post release bump - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4814aa20587ff04ca3bdf81452b8a1ded943c85a Author: Adam Schreiber @@ -4085,9 +9194,9 @@ make 2.30.1 release - NEWS | 14 ++++++++++++++ - README | 2 +- - 2 files changed, 15 insertions(+), 1 deletions(-) + NEWS | 14 ++++++++++++++ + README | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) commit 812052d9594dc4f78fe2900e3adbf8ba732fc72a Author: Andika Triwidada @@ -4095,8 +9204,8 @@ Updated Indonesian translation - po/id.po | 504 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 254 insertions(+), 250 deletions(-) + po/id.po | 504 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 254 insertions(+), 250 deletions(-) commit 3835f13f5472b6a77c727c4a774b9cc95879c7ee Author: Andika Triwidada @@ -4104,8 +9213,8 @@ Updated Indonesian translation - po/id.po | 437 ++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 201 insertions(+), 236 deletions(-) + po/id.po | 437 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 201 insertions(+), 236 deletions(-) commit 5f2ba1eb6701cd544b74b1bdbde22e55e4e62e34 Author: Andika Triwidada @@ -4116,7 +9225,7 @@ po/LINGUAS | 1 + po/id.po | 2975 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2976 insertions(+), 0 deletions(-) + 2 files changed, 2976 insertions(+) commit cf66db4f5533437b581147c69e5122cfe66d2b92 Author: Peteris Krisjanis @@ -4124,8 +9233,8 @@ Updated Latvian translation. - po/lv.po | 186 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 92 insertions(+), 94 deletions(-) + po/lv.po | 186 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 92 insertions(+), 94 deletions(-) commit 6de674d53328986e8637a3b6ac5cc3f752957669 Author: Carles Ferrando @@ -4133,8 +9242,8 @@ Updated Catalan (Valencian) translation - po/ca@valencia.po | 360 ++++++++++++++++++++++++++++------------------------ - 1 files changed, 194 insertions(+), 166 deletions(-) + po/ca@valencia.po | 360 +++++++++++++++++++++++++++++------------------------- + 1 file changed, 194 insertions(+), 166 deletions(-) commit 964b3702ced10c59a9d13956c52054858cfa3f76 Author: Andre Klapper @@ -4142,8 +9251,8 @@ Fix last commit. - libseahorse/seahorse-util.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + libseahorse/seahorse-util.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit ba122ff38ceaa0a2938c88f960c0f857fdd1a8be Author: Andre Klapper @@ -4151,13 +9260,13 @@ Fixes all but one issue for compiling with -DGSEAL_ENABLE. See bug 612494. - gkr/seahorse-gkr-dialogs.c | 18 +++++++++++++----- - libcryptui/cryptui.c | 6 +++--- - libegg/egg-datetime.c | 18 ++++++++++-------- - libseahorse/seahorse-passphrase.c | 12 ++++++------ - libseahorse/seahorse-util.c | 9 +++++---- - pgp/seahorse-pgp-key-properties.c | 2 +- - src/seahorse-key-manager-store.c | 2 +- + gkr/seahorse-gkr-dialogs.c | 18 +++++++++++++----- + libcryptui/cryptui.c | 6 +++--- + libegg/egg-datetime.c | 18 ++++++++++-------- + libseahorse/seahorse-passphrase.c | 12 ++++++------ + libseahorse/seahorse-util.c | 9 +++++---- + pgp/seahorse-pgp-key-properties.c | 2 +- + src/seahorse-key-manager-store.c | 2 +- 7 files changed, 39 insertions(+), 28 deletions(-) commit 3843fefedce6cf22eb0d7aac6fa467d2f5e52162 @@ -4166,8 +9275,8 @@ Fixes to Catalan translation - po/ca.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/ca.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 9d9a893ba9fb335f69284567c0ccf35feb23bdfb Author: Javier Jardón @@ -4177,8 +9286,8 @@ Use gtk_widget_is_toplevel() instead GTK_WIDGET_TOPLEVEL() - libseahorse/seahorse-util.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + libseahorse/seahorse-util.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 03a3e92e211195eba521ad2e4dc38298a093030f Author: Jorge González @@ -4186,8 +9295,8 @@ Updated Spanish translation - po/es.po | 203 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 103 insertions(+), 100 deletions(-) + po/es.po | 203 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 103 insertions(+), 100 deletions(-) commit 4238ebcc28ad483488b2fc1126370af8a31f9abf Author: Adam Schreiber @@ -4195,8 +9304,8 @@ Post-release version bump - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 64ab945abf8884d7a303ce11a37fc56c1c281164 Author: Adam Schreiber @@ -4204,10 +9313,10 @@ Release 2.30.0 - NEWS | 29 +++++++++++++++++++++++++++++ - README | 2 +- - configure.in | 2 +- - po/es.po | 23 +++++++++++------------ + NEWS | 29 +++++++++++++++++++++++++++++ + README | 2 +- + configure.in | 2 +- + po/es.po | 23 +++++++++++------------ 4 files changed, 42 insertions(+), 14 deletions(-) commit c3c5af66a60aee53bb98ccf3e8e280b71764f62f @@ -4216,8 +9325,8 @@ Updated Serbian translations - po/sr.po | 533 +++++++++++++++++++++++++++++--------------------------- - po/sr@latin.po | 533 +++++++++++++++++++++++++++++--------------------------- + po/sr.po | 533 +++++++++++++++++++++++++++++---------------------------- + po/sr@latin.po | 533 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 546 insertions(+), 520 deletions(-) commit 0b5440b13d9fef3c55a5ac4f9e7244af8a1558ec @@ -4226,8 +9335,8 @@ Updated Greek translation for seahorse documentation - help/el/el.po | 20 +++++++++----------- - 1 files changed, 9 insertions(+), 11 deletions(-) + help/el/el.po | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) commit 0cfe2c685b157c81fafc0a283affcd46ff41d1ba Author: Thorsten Sick @@ -4238,8 +9347,8 @@ This patch adds full documentation for seahorse-hkp-source.c. Static functions are commented in a non-specific way, the other functions in a GTK-Doc style. - pgp/seahorse-hkp-source.c | 201 +++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 193 insertions(+), 8 deletions(-) + pgp/seahorse-hkp-source.c | 201 ++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 193 insertions(+), 8 deletions(-) commit da0a9a24488214864433928765ede6bfeff53251 Author: Ask H. Larsen @@ -4247,8 +9356,8 @@ Updated Danish translation - po/da.po | 450 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 239 insertions(+), 211 deletions(-) + po/da.po | 450 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 239 insertions(+), 211 deletions(-) commit 079bddde320b1bffb52678513733d2dc610ce7c7 Author: Jamil Ahmed @@ -4257,7 +9366,7 @@ Updated Bengali translation po/bn.po | 6146 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 3081 insertions(+), 3065 deletions(-) + 1 file changed, 3081 insertions(+), 3065 deletions(-) commit 0f5a35ea9606d9c5521ed27cb0276323576e7b53 Author: Gintautas Miliauskas @@ -4265,8 +9374,8 @@ Updated Lithuanian translation. - po/lt.po | 400 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 213 insertions(+), 187 deletions(-) + po/lt.po | 400 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 213 insertions(+), 187 deletions(-) commit decfb47de659141f8648e649c5b7e2c06b64b982 Author: Maxim V. Dziumanenko @@ -4274,8 +9383,8 @@ Updated Ukrainian translation - po/uk.po | 474 +++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 225 insertions(+), 249 deletions(-) + po/uk.po | 474 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 225 insertions(+), 249 deletions(-) commit dd4775e3b3af42e4771c8bd9a69d77ee54a630a5 Author: Gil Forcada @@ -4283,8 +9392,8 @@ Updated Catalan translation - po/ca.po | 403 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 215 insertions(+), 188 deletions(-) + po/ca.po | 403 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 215 insertions(+), 188 deletions(-) commit 203a7b369209a0465ba25d786bdc0468dfc0600e Author: Nikos Bakaoukas @@ -4292,8 +9401,8 @@ Updated Greek translation for seahorse - po/el.po | 1589 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 919 insertions(+), 670 deletions(-) + po/el.po | 1593 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 921 insertions(+), 672 deletions(-) commit ca8e3cbe62d8e059caf1810c8dfb924c7652e1a4 Author: Thorsten Sick @@ -4304,8 +9413,8 @@ This patch adds full documentation for seahorse-dns-sd.c. Static functions are commented in a non-specific way, the other functions in a GTK-Doc style. - libseahorse/seahorse-dns-sd.c | 123 ++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 122 insertions(+), 1 deletions(-) + libseahorse/seahorse-dns-sd.c | 123 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 122 insertions(+), 1 deletion(-) commit 76e57b4c69fb388f4493a550cf0dfd3a4a69d678 Author: Thorsten Sick @@ -4315,8 +9424,8 @@ Static functions are commented in a non-specific way, the other functions in a GTK-Doc style. - pgp/seahorse-server-source.c | 103 +++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 98 insertions(+), 5 deletions(-) + pgp/seahorse-server-source.c | 103 ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 98 insertions(+), 5 deletions(-) commit 0b32a5f8db4a1e32a50e46522c026df05169672d Author: Leonid Kanter @@ -4324,8 +9433,8 @@ Update Russian translation from Юрий Козлов - po/ru.po | 233 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 120 insertions(+), 113 deletions(-) + po/ru.po | 233 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 120 insertions(+), 113 deletions(-) commit 78684be7cdf53e1dfb4f13b42b53875d5fe08c69 Author: Tommi Vainikainen @@ -4333,8 +9442,8 @@ Updated Finnish translation - po/fi.po | 477 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 251 insertions(+), 226 deletions(-) + po/fi.po | 477 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 251 insertions(+), 226 deletions(-) commit ddf25721659b2a50088d82f645dec12b46fd0ea8 Author: A S Alam @@ -4342,8 +9451,8 @@ update Punjabi Translation by A S Alam - po/pa.po | 362 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 189 insertions(+), 173 deletions(-) + po/pa.po | 362 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 189 insertions(+), 173 deletions(-) commit b57f6462e4762e409fa2b6b2c8f983c85ff7c707 Author: Wouter Bolsterlee @@ -4351,8 +9460,8 @@ Dutch translation updated by Wouter Bolsterlee - po/nl.po | 246 +++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 138 insertions(+), 108 deletions(-) + po/nl.po | 246 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 138 insertions(+), 108 deletions(-) commit 8bc57f2cf4f96c562a62b87d77328a93d4f06d03 Author: Changwoo Ryu @@ -4360,8 +9469,8 @@ Updated Korean translation - po/ko.po | 474 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 251 insertions(+), 223 deletions(-) + po/ko.po | 474 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 251 insertions(+), 223 deletions(-) commit 672bfab671bbe0d90e68916e0d0a8a80f0ee41d4 Author: Duarte Loreto @@ -4369,8 +9478,8 @@ Updated Portuguese translation - po/pt.po | 471 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 248 insertions(+), 223 deletions(-) + po/pt.po | 471 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 248 insertions(+), 223 deletions(-) commit c59bcc647667b786682b078fd07322a8873b7272 Author: Peteris Krisjanis @@ -4378,8 +9487,8 @@ Updated Latvian translation. - po/lv.po | 255 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 137 insertions(+), 118 deletions(-) + po/lv.po | 255 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 137 insertions(+), 118 deletions(-) commit cc68e6bd86661f4ce1136f004906f5374d974e6d Author: Marek Černocký @@ -4387,8 +9496,8 @@ Update Czech translation - po/cs.po | 539 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 277 insertions(+), 262 deletions(-) + po/cs.po | 539 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 277 insertions(+), 262 deletions(-) commit 82081084d4c34f330a720077bd99aad24424e68d Author: Gabor Kelemen @@ -4396,8 +9505,8 @@ Updated Hungarian translation - po/hu.po | 150 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 74 insertions(+), 76 deletions(-) + po/hu.po | 150 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 74 insertions(+), 76 deletions(-) commit 15642c2ec2ce64a572cba65944e3650f00bd4416 Author: Inaki Larranaga Murgoitio @@ -4405,8 +9514,8 @@ Updated Basque language - po/eu.po | 29 +++++++++++++++++++++++------ - 1 files changed, 23 insertions(+), 6 deletions(-) + po/eu.po | 29 +++++++++++++++++++++++------ + 1 file changed, 23 insertions(+), 6 deletions(-) commit d1dbcf04084592c9c7125ebcbd390fa4a59cc1fd Author: Gabor Kelemen @@ -4414,8 +9523,8 @@ Updated Hungarian translation - po/hu.po | 380 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 194 insertions(+), 186 deletions(-) + po/hu.po | 380 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 194 insertions(+), 186 deletions(-) commit 17388abac930e819f66bea869bc6acd7ad8a5af9 Author: Daniel Nylander @@ -4423,8 +9532,8 @@ Updated Swedish translation - po/sv.po | 513 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 269 insertions(+), 244 deletions(-) + po/sv.po | 513 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 269 insertions(+), 244 deletions(-) commit 29c383d73b6560234c0a8ee83cf1df20fbe453f1 Author: Piotr Drąg @@ -4432,8 +9541,8 @@ Updated Polish translation - po/pl.po | 589 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 296 insertions(+), 293 deletions(-) + po/pl.po | 589 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 296 insertions(+), 293 deletions(-) commit e2194dcd9016891f900e786c707ff7cd70c7211c Author: Bruce Cowan @@ -4441,8 +9550,8 @@ Updated British English translation - po/en_GB.po | 451 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 240 insertions(+), 211 deletions(-) + po/en_GB.po | 451 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 240 insertions(+), 211 deletions(-) commit 182b9cecdb9e33c156ace365bfb4a56b1bcb8fd1 Author: Leonid Kanter @@ -4450,8 +9559,8 @@ Updated Russian translation - po/ru.po | 285 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 130 insertions(+), 155 deletions(-) + po/ru.po | 285 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 130 insertions(+), 155 deletions(-) commit a90b0735e75f4b532fce6a2a247bfdbffbc32730 Author: Alexander Shopov @@ -4459,8 +9568,8 @@ Updated Bulgarian translation - po/bg.po | 181 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 95 insertions(+), 86 deletions(-) + po/bg.po | 181 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 95 insertions(+), 86 deletions(-) commit 039e5d347bb80e38f01012bf7898ea3face5a1a6 Author: Antonio Fernandes C. Neto @@ -4468,8 +9577,8 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 446 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 237 insertions(+), 209 deletions(-) + po/pt_BR.po | 446 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 237 insertions(+), 209 deletions(-) commit f14055cd1c67a508b15e4df49bd6d53dfb446e47 Author: Adam Schreiber @@ -4477,8 +9586,8 @@ Post-release version bump - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3021d049c7bbb803efa47354b7cd4765f1eff130 Author: Adam Schreiber @@ -4486,9 +9595,9 @@ Make 2.29.91 release - NEWS | 29 +++++++++++++++++++++++++++++ - README | 2 +- - 2 files changed, 30 insertions(+), 1 deletions(-) + NEWS | 29 +++++++++++++++++++++++++++++ + README | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) commit dd47282ec4dfc4d7319004e3ea1810d4667b881c Author: Adam Schreiber @@ -4496,8 +9605,8 @@ Change default key lengths for subkey generation. - pgp/seahorse-gpgme-add-subkey.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + pgp/seahorse-gpgme-add-subkey.c | 3 +++ + 1 file changed, 3 insertions(+) commit 77e8dad64c35d80970be52409babbfc7a986a0c8 Author: Pablo Castellano @@ -4505,8 +9614,8 @@ Remove unused variables - pgp/seahorse-gpgme-generate.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + pgp/seahorse-gpgme-generate.c | 3 --- + 1 file changed, 3 deletions(-) commit ef5874328c8a3155e8f38be3ec396f9583b9ba1b Author: Pablo Castellano @@ -4516,8 +9625,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=592956 - libseahorse/seahorse-util.c | 6 +++--- - pgp/seahorse-gpgme-key-op.c | 14 +++++++++----- + libseahorse/seahorse-util.c | 6 +++--- + pgp/seahorse-gpgme-key-op.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) commit dd94f42f9fd5fb3a642035aa269e503ddb0176a8 @@ -4526,8 +9635,8 @@ updated Tamil translation - po/ta.po | 494 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 260 insertions(+), 234 deletions(-) + po/ta.po | 494 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 260 insertions(+), 234 deletions(-) commit 262aec9f1f109f9e2ad670c67b4db535cef2017c Author: Pablo Castellano @@ -4537,8 +9646,8 @@ Bug introduced in 6bfb8025ed42f47748b6d83d604a4fa71aec61df - libseahorse/seahorse-passphrase.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + libseahorse/seahorse-passphrase.c | 2 ++ + 1 file changed, 2 insertions(+) commit 3593d4c58363b8d584aae179f532ba5ceedd5d9e Author: nobled @@ -4546,8 +9655,8 @@ Check the OpenPGP engine only - pgp/seahorse-gpgme.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + pgp/seahorse-gpgme.c | 4 ++++ + 1 file changed, 4 insertions(+) commit c1447172c212aafb92f0dcce0dfa5923e498d037 Author: Inaki Larranaga Murgoitio @@ -4555,8 +9664,8 @@ Updated Basque language - po/eu.po | 457 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 223 insertions(+), 234 deletions(-) + po/eu.po | 457 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 223 insertions(+), 234 deletions(-) commit 511277254fbb1ab0bcb6fb9867e7404558f0225e Author: Pablo Castellano @@ -4567,8 +9676,8 @@ Thanks to nobled for reporting: https://bugzilla.gnome.org/show_bug.cgi?id=605326 - pgp/seahorse-gpgme-key-op.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + pgp/seahorse-gpgme-key-op.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 0eec7838a411870636ac797f1de4046719b4920b Author: Chao-Hsiung Liao @@ -4576,8 +9685,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 491 +++++++++++++++++++++++++++++++---------------------------- - po/zh_TW.po | 491 +++++++++++++++++++++++++++++++---------------------------- + po/zh_HK.po | 491 ++++++++++++++++++++++++++++++++---------------------------- + po/zh_TW.po | 491 ++++++++++++++++++++++++++++++++---------------------------- 2 files changed, 516 insertions(+), 466 deletions(-) commit 869f6d95bab44abd73e04511985b39530d8c79e2 @@ -4586,8 +9695,8 @@ Really updated Italian translation, removed the fuzzy - po/it.po | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) + po/it.po | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) commit 81e781443e14df283693948efe8ea9bea2b20320 Author: Milo Casagrande @@ -4595,8 +9704,8 @@ Updated Italian translation - po/it.po | 455 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 235 insertions(+), 220 deletions(-) + po/it.po | 455 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 235 insertions(+), 220 deletions(-) commit d8ff80a2b43baec7daa136e07583fe179fec1d75 Author: nobled @@ -4606,8 +9715,8 @@ Add an inline macro to make the declarations readable - libseahorse/seahorse-util.h | 3 +++ - pgp/seahorse-gpgme.c | 15 ++++++--------- + libseahorse/seahorse-util.h | 3 +++ + pgp/seahorse-gpgme.c | 15 ++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) commit fe2ed7691666ab7b773fc02bbcb4d13ef08021f0 @@ -4616,8 +9725,8 @@ Updated Galician Translation - po/gl.po | 639 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 334 insertions(+), 305 deletions(-) + po/gl.po | 639 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 334 insertions(+), 305 deletions(-) commit b5ad0d7e7153305b36b460ff6469a9bceb105586 Author: Bruno Brouard @@ -4625,8 +9734,8 @@ Updated French translation - po/fr.po | 430 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 228 insertions(+), 202 deletions(-) + po/fr.po | 430 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 228 insertions(+), 202 deletions(-) commit a88703f481e10a0c0199cbd47eaccc66ec453193 Author: Lucian Adrian Grijincu @@ -4634,8 +9743,8 @@ Update Romanian translation - po/ro.po | 636 +++++++++++++++++++++++++++++++++++++++----------------------- - 1 files changed, 399 insertions(+), 237 deletions(-) + po/ro.po | 636 +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 399 insertions(+), 237 deletions(-) commit 5b61e396582b451d47cbc3c07d17ecc20e29bbc9 Author: Ivar Smolin @@ -4643,8 +9752,8 @@ Estonian translation updated - po/et.po | 31 ++++++++++++++----------------- - 1 files changed, 14 insertions(+), 17 deletions(-) + po/et.po | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) commit 353446a7d6308316b1b4525eae17a09fce6e429b Author: Pablo Castellano @@ -4655,8 +9764,8 @@ - Added missing cast GTK_TOGGLE_BUTTON - Corrected case syntax - gkr/seahorse-gkr-item-properties.c | 2 +- - pgp/seahorse-gpgme-key-op.c | 3 ++- + gkr/seahorse-gkr-item-properties.c | 2 +- + pgp/seahorse-gpgme-key-op.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit 326b399cf90019a80c0abeff98b44a39e1cd9455 @@ -4665,10 +9774,10 @@ Unescape URI's before presenting them to the user. - daemon/seahorse-service-crypto.c | 6 ++++-- - pgp/seahorse-pgp-key-properties.c | 12 +++++++----- - src/seahorse-viewer.c | 10 ++++++---- - ssh/seahorse-ssh-key-properties.c | 12 +++++++----- + daemon/seahorse-service-crypto.c | 6 ++++-- + pgp/seahorse-pgp-key-properties.c | 12 +++++++----- + src/seahorse-viewer.c | 10 ++++++---- + ssh/seahorse-ssh-key-properties.c | 12 +++++++----- 4 files changed, 24 insertions(+), 16 deletions(-) commit 149434f8d13415ab16866534bcd9a70a2665d1be @@ -4679,8 +9788,8 @@ Part of: https://bugzilla.gnome.org/show_bug.cgi?id=609418 - src/seahorse-viewer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/seahorse-viewer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e4ea26b9ae7394dd72b8749df14cd7c3f98b097c Author: Pablo Castellano @@ -4692,8 +9801,8 @@ "Not at all/Casually/Very Carefully" not being updated when the radiobutton changed. - pgp/seahorse-sign.xml | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + pgp/seahorse-sign.xml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 08b392d6b800e3856325919dc877429dded186e6 Author: Pablo Castellano @@ -4708,9 +9817,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=609708 - pgp/seahorse-pgp-key-properties.c | 2 +- - pgp/seahorse-pgp-public-key-properties.xml | 1 - - 2 files changed, 1 insertions(+), 2 deletions(-) + pgp/seahorse-pgp-key-properties.c | 2 +- + pgp/seahorse-pgp-public-key-properties.xml | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) commit 4027328a8aa4ff30ef3a618061787b47abf16125 Author: Matej Urbančič @@ -4718,8 +9827,8 @@ Updated Slovenian translation - po/sl.po | 73 +++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 42 insertions(+), 31 deletions(-) + po/sl.po | 73 +++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 42 insertions(+), 31 deletions(-) commit 06e6c3d0773bc1c0adcab7d391a14d10be25dc5b Author: Kjartan Maraas @@ -4727,8 +9836,8 @@ Updated Norwegian bokmål translation - po/nb.po | 43 ++++++++++++++++++++++++++----------------- - 1 files changed, 26 insertions(+), 17 deletions(-) + po/nb.po | 43 ++++++++++++++++++++++++++----------------- + 1 file changed, 26 insertions(+), 17 deletions(-) commit ae2a1cd801f0a712e48b6eb91442129f7264128f Author: Adam Schreiber @@ -4736,8 +9845,8 @@ Post bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 852d2a1ef78d6be6718a4a7a11ff1a493fe06534 Author: Adam Schreiber @@ -4745,9 +9854,9 @@ Make 2.29.90 release - NEWS | 16 ++++++++++++++++ - README | 2 +- - configure.in | 2 +- + NEWS | 16 ++++++++++++++++ + README | 2 +- + configure.in | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) commit fda4190561a1488ef1166c6bd0673c115b403186 @@ -4756,8 +9865,8 @@ Updated Thai translation. - po/th.po | 46 +++++++++++++++++++++++++++++----------------- - 1 files changed, 29 insertions(+), 17 deletions(-) + po/th.po | 46 +++++++++++++++++++++++++++++----------------- + 1 file changed, 29 insertions(+), 17 deletions(-) commit 8f63c6bab966e3af8512264991f2f9388895a33d Author: Adam Schreiber @@ -4765,8 +9874,8 @@ Fix formatting of g_strsplit to add space before parens - libseahorse/seahorse-util.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libseahorse/seahorse-util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e2092a387868e7a71db7f0c230e7b18da5bbc844 Author: Adam Schreiber @@ -4774,9 +9883,9 @@ Remove daemon autostart file from lists - po/POTFILES.in | 1 - - po/POTFILES.skip | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) + po/POTFILES.in | 1 - + po/POTFILES.skip | 1 - + 2 files changed, 2 deletions(-) commit 8d80091e8fe708d2c7e771a797946f04b50868a9 Author: nobled @@ -4795,8 +9904,8 @@ Closes: bgo#605967. - pgp/seahorse-gpgme-key-op.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) + pgp/seahorse-gpgme-key-op.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) commit c7671f25e6c752924c1957491b9fff16f79b4e2d Author: nobled @@ -4807,9 +9916,9 @@ Add the keytype selection numbers used by gpg from 1.2.0 to 2.0.14. - pgp/seahorse-gpgme.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ - pgp/seahorse-gpgme.h | 8 ++++++ - 2 files changed, 73 insertions(+), 0 deletions(-) + pgp/seahorse-gpgme.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + pgp/seahorse-gpgme.h | 8 +++++++ + 2 files changed, 73 insertions(+) commit e992586c5058b4639c422c02818bd0665030791f Author: nobled @@ -4817,9 +9926,9 @@ libseahorse: Add version string parsing - libseahorse/seahorse-util.c | 28 +++++++++++++++++++++++++++- - libseahorse/seahorse-util.h | 4 ++++ - 2 files changed, 31 insertions(+), 1 deletions(-) + libseahorse/seahorse-util.c | 28 +++++++++++++++++++++++++++- + libseahorse/seahorse-util.h | 4 ++++ + 2 files changed, 31 insertions(+), 1 deletion(-) commit e53ff18f839871a60eb70d450062c5a1f357f046 Author: Jorge González @@ -4827,8 +9936,8 @@ Updated Spanish translation - po/es.po | 33 +++++++++++++++++++++++++-------- - 1 files changed, 25 insertions(+), 8 deletions(-) + po/es.po | 33 +++++++++++++++++++++++++-------- + 1 file changed, 25 insertions(+), 8 deletions(-) commit 395506b50e0a60aea0c73397f98ee918a48fe153 Author: Martin Pitt @@ -4844,10 +9953,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=608012 - configure.in | 1 - - daemon/Makefile.am | 8 -------- - daemon/seahorse-daemon.desktop.in.in | 13 ------------- - 3 files changed, 0 insertions(+), 22 deletions(-) + configure.in | 1 - + daemon/Makefile.am | 8 -------- + daemon/seahorse-daemon.desktop.in.in | 13 ------------- + 3 files changed, 22 deletions(-) commit 4dcbc1f5bac4331b5bef5f3a15b839bba9fd8925 Author: Mario Blättermann @@ -4855,8 +9964,8 @@ Updated German translation - po/de.po | 171 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 91 insertions(+), 80 deletions(-) + po/de.po | 171 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 91 insertions(+), 80 deletions(-) commit ba8bcf321291f8cd8f91ba60e1f05ebcdbea300c Author: Adam Schreiber @@ -4866,8 +9975,8 @@ Update eggdesktopfile.[ch] from libegg/smclient - libegg/eggdesktopfile.c | 103 +++++++++++++++++++++++++++++++++------------- - libegg/eggdesktopfile.h | 8 +++- + libegg/eggdesktopfile.c | 103 ++++++++++++++++++++++++++++++++++-------------- + libegg/eggdesktopfile.h | 8 +++- 2 files changed, 80 insertions(+), 31 deletions(-) commit c388601bf88412756621e4382c691829bc903ab0 @@ -4879,11 +9988,11 @@ User name, email address and comments can be passed over DBus. The only dialog being shown is the password creation dialog. - daemon/seahorse-service.c | 72 ++++++++++++++++++++++++++ - daemon/seahorse-service.h | 3 + - daemon/seahorse-service.xml | 7 +++ - pgp/seahorse-gpgme-dialogs.h | 14 +++++- - pgp/seahorse-gpgme-generate.c | 111 ++++++++++++++++++++++++++++++---------- + daemon/seahorse-service.c | 72 +++++++++++++++++++++++++++ + daemon/seahorse-service.h | 3 ++ + daemon/seahorse-service.xml | 7 +++ + pgp/seahorse-gpgme-dialogs.h | 14 +++++- + pgp/seahorse-gpgme-generate.c | 111 +++++++++++++++++++++++++++++++----------- 5 files changed, 178 insertions(+), 29 deletions(-) commit c6681cd99a4bfbeb5ada3e396accb06a378a67d5 @@ -4892,8 +10001,8 @@ changed GPG_ERR_CANCELED to GPG_ERR_BAD_PASSPHRASE - pgp/seahorse-gpgme-key-op.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + pgp/seahorse-gpgme-key-op.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 8e37fabd89fcfd3fe0f267e2cc5d9563d2365aa7 Author: Thorsten Sick @@ -4901,8 +10010,8 @@ Error windows after the third wrong pasword is displayed now. - pgp/seahorse-gpgme-key-op.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + pgp/seahorse-gpgme-key-op.c | 5 +++++ + 1 file changed, 5 insertions(+) commit b2e176fe36424efcf2a78a543a377e50a1789ef3 Author: Theppitak Karoonboonyanan @@ -4910,8 +10019,8 @@ Updated Thai translation. - po/th.po | 361 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 187 insertions(+), 174 deletions(-) + po/th.po | 361 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 187 insertions(+), 174 deletions(-) commit 2d7ad2bc35cfe2c957e32997e8808cf9e2fae609 Author: Jorge González @@ -4919,8 +10028,8 @@ Updated Spanish translation - po/es.po | 402 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 207 insertions(+), 195 deletions(-) + po/es.po | 402 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 207 insertions(+), 195 deletions(-) commit 6a85f6e93660ccb6a9943feab9a858b2db861252 Author: Mattias Põldaru @@ -4928,8 +10037,8 @@ Updating Estonian translation - po/et.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + po/et.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit 3e560335a4dc44dc2f1b5cb8e251505a26961c2c Author: Kjartan Maraas @@ -4937,8 +10046,8 @@ Updated Norwegian bokmål translation - po/nb.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + po/nb.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit 148848196cbb292e337b727f475d230e221b2c76 Author: Christian Kirbach @@ -4948,8 +10057,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=608248 - po/POTFILES.in | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + po/POTFILES.in | 1 - + 1 file changed, 1 deletion(-) commit f4c06b573b20172bbbbd44634fdf6bfc830eb427 Author: Jamil Ahmed @@ -4958,7 +10067,7 @@ Updated Bengali translation po/bn.po | 6116 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 3065 insertions(+), 3051 deletions(-) + 1 file changed, 3065 insertions(+), 3051 deletions(-) commit 16b5de56416f64f2f3a65ed7ec965bb783eda7c9 Author: Christian Kirbach @@ -4968,8 +10077,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=608256 - daemon/seahorse-service-crypto.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + daemon/seahorse-service-crypto.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit c06b59c95921d3ae12e9262a1451f4ab6c422f97 Author: Ivar Smolin @@ -4977,8 +10086,8 @@ Updating Estonian translation - po/et.po | 62 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 34 insertions(+), 28 deletions(-) + po/et.po | 62 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 34 insertions(+), 28 deletions(-) commit d92ff4314c64c5366693ce7f9850221ce7c1db47 Author: Christian Kirbach @@ -4986,8 +10095,8 @@ Updated German translation - po/de.po | 379 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 196 insertions(+), 183 deletions(-) + po/de.po | 379 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 196 insertions(+), 183 deletions(-) commit 17d9d43ca6aa6f4c885db48a3ddd38b0810c4233 Author: Matej Urbančič @@ -4995,8 +10104,8 @@ Updated Slovenian translation - po/sl.po | 506 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 260 insertions(+), 246 deletions(-) + po/sl.po | 506 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 260 insertions(+), 246 deletions(-) commit 369fb7930f91edbd671f5c8757c1ceeb5607b787 Author: Pablo Castellano @@ -5004,8 +10113,8 @@ Updated HACKING file - HACKING | 21 ++------------------- - 1 files changed, 2 insertions(+), 19 deletions(-) + HACKING | 21 ++------------------- + 1 file changed, 2 insertions(+), 19 deletions(-) commit 287fa9c4925e1e4faa8a4f97c6b9bf9682039895 Author: Alexander Shopov @@ -5013,8 +10122,8 @@ Updated Bulgarian translation - po/bg.po | 363 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 180 insertions(+), 183 deletions(-) + po/bg.po | 363 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 180 insertions(+), 183 deletions(-) commit 9bf8b84ebcbb9cfadae7decae0c7d9ea8de611c6 Author: Kjartan Maraas @@ -5022,8 +10131,8 @@ Updated Norwegian bokmål translation - po/nb.po | 385 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 191 insertions(+), 194 deletions(-) + po/nb.po | 385 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 191 insertions(+), 194 deletions(-) commit 6bfb8025ed42f47748b6d83d604a4fa71aec61df Author: Stef Walter @@ -5057,9 +10166,9 @@ the results in another file. The second file will be overwritten. These commands are meant to allow people to encrypt/decrypt binary data using DBus commands. - daemon/seahorse-service-crypto.c | 417 ++++++++++++++++++++++++++++-------- - daemon/seahorse-service-crypto.xml | 20 ++ - daemon/seahorse-service.h | 16 ++ + daemon/seahorse-service-crypto.c | 417 +++++++++++++++++++++++++++++-------- + daemon/seahorse-service-crypto.xml | 20 ++ + daemon/seahorse-service.h | 16 ++ 3 files changed, 367 insertions(+), 86 deletions(-) commit 8330d061885ce133d3b6dd8792879b167f7a82d1 @@ -5069,7 +10178,7 @@ Updated Dutch translation po/nl.po | 1202 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 622 insertions(+), 580 deletions(-) + 1 file changed, 622 insertions(+), 580 deletions(-) commit 3233b32ff70566ce1c7da61388a3087a9e58a960 Author: Xandru Armesto Fernandez @@ -5078,7 +10187,7 @@ Updated asturian translation po/ast.po | 2930 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 2930 insertions(+), 0 deletions(-) + 1 file changed, 2930 insertions(+) commit 8c8323351679826a47035c74ec3c5ff429f66f0e Author: Xandru Armesto Fernandez @@ -5086,8 +10195,8 @@ Added asturian language - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit 8572a86718b4f8d07417713eafe597ba7b09c165 Author: Matthias Clasen @@ -5097,8 +10206,8 @@ Check return value of gdk_property_get before returning value. - src/seahorse-key-manager-store.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) + src/seahorse-key-manager-store.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) commit e329c309f8330c140acb86d270f531f2fc1cca64 Author: Vincent Untz @@ -5108,8 +10217,8 @@ Closes: bgo#605367 - pgp/seahorse-gpg-options.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + pgp/seahorse-gpg-options.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5e233999df4fb0ee11422020a93b9577c810f128 Author: Vincent Untz @@ -5117,8 +10226,8 @@ [release] post-release bump to 2.29.5 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 24c55a5ba010fae3a3424991132b21e1ef877539 Merge: 23d181e f98a38f @@ -5133,9 +10242,9 @@ [release] 2.29.4 - NEWS | 14 ++++++++++++++ - README | 2 +- - 2 files changed, 15 insertions(+), 1 deletions(-) + NEWS | 14 ++++++++++++++ + README | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) commit 176b907abc137ccaf9ce637c1f2792587c7321c2 Author: Vincent Untz @@ -5143,8 +10252,8 @@ Fix distcheck with introspection - libcryptui/Makefile.am | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) + libcryptui/Makefile.am | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) commit 3eee55c4234f8642c0c9e17fb3ca715fa071d6d7 Author: Vincent Untz @@ -5154,8 +10263,8 @@ gp11_slot_open_session_async now takes two additional arguments. - configure.in | 2 +- - pkcs11/seahorse-pkcs11-operations.c | 2 +- + configure.in | 2 +- + pkcs11/seahorse-pkcs11-operations.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 23d181ea19ce7c7f611c5114f811bb8c2497697a @@ -5166,8 +10275,8 @@ gp11_slot_open_session_async now takes two additional arguments. - pkcs11/seahorse-pkcs11-operations.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + pkcs11/seahorse-pkcs11-operations.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e852cb47ed77ef71610d6a87b2271271156d1029 Author: Pablo Castellano @@ -5177,9 +10286,9 @@ Closes: bgo#592959 - src/Makefile.am | 3 +++ - src/seahorse.1 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 56 insertions(+), 0 deletions(-) + src/Makefile.am | 3 +++ + src/seahorse.1 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+) commit b497a91cfeea3d24eab10e39ba6485754c92717f Author: Emilio Pozuelo Monfort @@ -5190,8 +10299,8 @@ Use dynamic allocation instead, since MAXPATHLEN may not be defined on some platforms. Fixes the build on GNU/Hurd. - pgp/seahorse-gpg-options.c | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) + pgp/seahorse-gpg-options.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) commit 5f42e1e9aad249cf1ed6fc018dac817cecdb12de Author: Thorsten Sick @@ -5202,8 +10311,8 @@ This patch adds full documentation for seahorse-context.c. Static functions are commented in a non-specific way, the other functions in a GTK-Doc style. - libseahorse/seahorse-context.c | 377 +++++++++++++++++++++++++++++++++++++++- - 1 files changed, 375 insertions(+), 2 deletions(-) + libseahorse/seahorse-context.c | 377 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 375 insertions(+), 2 deletions(-) commit d4089fc45bdc5423d48bbbe57655cb961bc3b48e Author: Tao Wei @@ -5211,8 +10320,8 @@ Updated Simplified Chinese translation. - po/zh_CN.po | 266 +++++++++++++++++++++++++++++------------------------------ - 1 files changed, 132 insertions(+), 134 deletions(-) + po/zh_CN.po | 266 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 132 insertions(+), 134 deletions(-) commit b62f080b94c98ec69b68dc105c9dbe0de67fc8f7 Author: Adam Schreiber @@ -5220,8 +10329,8 @@ Remove underscore from enum to fix introspection generation - libcryptui/cryptui.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libcryptui/cryptui.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1281ac54286a9e9f3450dcd11f5d8c85b65aa8b4 Author: Lucian Adrian Grijincu @@ -5229,8 +10338,8 @@ Update Romanian translation - po/ro.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/ro.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit ed5b6c9f1280b05baf52a29f8d80cd8d8a8c6c45 Author: Adam Schreiber @@ -5242,10 +10351,10 @@ least one known bug. https://bugzilla.gnome.org/show_bug.cgi?id=603812 - configure.in | 29 +++++++++------ - libcryptui/.gitignore | 2 + - libcryptui/Makefile.am | 52 ++++++++++++++++++++++++--- - m4/introspection.m4 | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ + configure.in | 29 ++++++++++------ + libcryptui/.gitignore | 2 ++ + libcryptui/Makefile.am | 52 ++++++++++++++++++++++++---- + m4/introspection.m4 | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 17 deletions(-) commit e4df7d98ee6b21edc24c6af8093db3e6dc612477 @@ -5254,8 +10363,8 @@ Bump version to 2.29.4 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3620093350b45fb4697bf6fd58c1dbcc613e6575 Author: Adam Schreiber @@ -5263,9 +10372,9 @@ Release 2.29.3 - NEWS | 17 +++++++++++++++++ - README | 2 +- - configure.in | 2 +- + NEWS | 17 +++++++++++++++++ + README | 2 +- + configure.in | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) commit 268dae261e4ce9dedc5b377569977882db97f944 @@ -5274,8 +10383,8 @@ Update my email address - MAINTAINERS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e02d3ecda17b82bfea5ce61739b54dd79b5de43b Author: Adam Schreiber @@ -5285,8 +10394,8 @@ Set to 2048 bits unless > algo max - pgp/seahorse-gpgme-generate.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + pgp/seahorse-gpgme-generate.c | 6 ++++++ + 1 file changed, 6 insertions(+) commit 6ef33b44e8546b095c74c8b99762d3fcbcfca28f Author: nobled @@ -5297,9 +10406,9 @@ This adds the option "RSA" to the top of the list of available key types. - pgp/seahorse-gpgme-generate.c | 1 + - pgp/seahorse-gpgme-key-op.c | 13 ++++++++----- - pgp/seahorse-gpgme-key-op.h | 6 +++++- + pgp/seahorse-gpgme-generate.c | 1 + + pgp/seahorse-gpgme-key-op.c | 13 ++++++++----- + pgp/seahorse-gpgme-key-op.h | 6 +++++- 3 files changed, 14 insertions(+), 6 deletions(-) commit 418dd39300417cd5bc8f7effdd73673fa84916e3 @@ -5310,8 +10419,8 @@ Patch the configure script - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 62a391f53f6e455c3683941654519aed380b7015 Author: Pablo Castellano @@ -5319,8 +10428,8 @@ Fixed signals (they were "pressed" and must be "clicked") - ssh/seahorse-ssh-key-properties.xml | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + ssh/seahorse-ssh-key-properties.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 2804e28c5d997c780239588467877b46cccda67b Author: Pablo Castellano @@ -5331,8 +10440,8 @@ Before, if you closed the dialog using the top right X the dialog window wouldn't open again - src/seahorse-keyserver-search.xml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/seahorse-keyserver-search.xml | 1 + + 1 file changed, 1 insertion(+) commit a226f506a8e428b17c2a6299919c9e912e3d85b0 Author: Adi Roiban @@ -5341,7 +10450,7 @@ Add po/ro.po and update LINGUAS po/ro.po | 2948 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 2948 insertions(+), 0 deletions(-) + 1 file changed, 2948 insertions(+) commit 9461aa809b350b162681d9193405c8b8b8fdd788 Author: Adi Roiban @@ -5349,8 +10458,8 @@ Update Romanian translation - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit 1ce79b38205830b96547cfae9283800dc2de2447 Author: Adam Schreiber @@ -5358,8 +10467,8 @@ Fix compile warnings - libseahorse/seahorse-util.c | 3 +-- - src/seahorse-key-manager.c | 2 +- + libseahorse/seahorse-util.c | 3 +-- + src/seahorse-key-manager.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) commit b076f383fc80ee50e233fb19544e9b2bcaa6032b @@ -5371,8 +10480,8 @@ This patch adds full documentation for seahorse-operation.c. Static functions are commented in a non-specific way, the other functions in a GTK-Doc style. - libseahorse/seahorse-operation.c | 284 +++++++++++++++++++++++++++++++++++++- - 1 files changed, 279 insertions(+), 5 deletions(-) + libseahorse/seahorse-operation.c | 284 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 279 insertions(+), 5 deletions(-) commit 29a76c5be321061555aefd7e17273fcc215a5a61 Author: Thorsten Sick @@ -5380,8 +10489,8 @@ seahorse-source.c full documentation - libseahorse/seahorse-source.c | 99 ++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 92 insertions(+), 7 deletions(-) + libseahorse/seahorse-source.c | 99 ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 92 insertions(+), 7 deletions(-) commit 702a8156ee7b4ecaff7d33d3435c9978ef3cec40 Author: Thorsten Sick @@ -5389,8 +10498,8 @@ update documentation for seahorse-source.h - libseahorse/seahorse-source.h | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) + libseahorse/seahorse-source.h | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) commit 52f318c4e8a0f26b7eb6e99bf8f80c8ea8ea8243 Author: Thorsten Sick @@ -5398,8 +10507,8 @@ seahorse-widget.c documented - libseahorse/seahorse-widget.c | 130 ++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 123 insertions(+), 7 deletions(-) + libseahorse/seahorse-widget.c | 130 +++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 123 insertions(+), 7 deletions(-) commit 99e5e881df3287ff304c7240f9d610c052327a40 Author: Thorsten Sick @@ -5407,8 +10516,8 @@ full documentation for seahorse-keyserver-search.c - src/seahorse-keyserver-search.c | 130 +++++++++++++++++++++++++++++++++++++-- - 1 files changed, 125 insertions(+), 5 deletions(-) + src/seahorse-keyserver-search.c | 130 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 125 insertions(+), 5 deletions(-) commit a0dba5c66456fbcb28968fbcefe6f253d03a8e59 Author: Thorsten Sick @@ -5416,8 +10525,8 @@ full documentation for seahorse-daemon.c For the sake of completeness. This file is not very complex. Things happen somewhere else - daemon/seahorse-daemon.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) + daemon/seahorse-daemon.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) commit 2a82b9e1f02fc8f71d880c22c355242fde4056ad Author: Thorsten Sick @@ -5425,8 +10534,8 @@ seahorse-sharing.c full documentation - daemon/seahorse-sharing.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 82 insertions(+), 1 deletions(-) + daemon/seahorse-sharing.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 82 insertions(+), 1 deletion(-) commit 003fa6b145e181ecf9c8fdafa71c58e93e049c28 Author: Thorsten Sick @@ -5434,8 +10543,8 @@ seahorse-hkp-server full documentation - daemon/seahorse-hkp-server.c | 147 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 146 insertions(+), 1 deletions(-) + daemon/seahorse-hkp-server.c | 147 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 146 insertions(+), 1 deletion(-) commit 7116e8c7b647680607c28d8a754473e60ec7b2ce Author: Thorsten Sick @@ -5443,8 +10552,8 @@ seahorse-service-keyset full documentation - daemon/seahorse-service-keyset.c | 108 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 108 insertions(+), 0 deletions(-) + daemon/seahorse-service-keyset.c | 108 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 108 insertions(+) commit 0a88643393a881d7edd438c6645ba730ea88ca5c Author: Thomas Thurman @@ -5454,7 +10563,7 @@ po/LINGUAS | 1 + po/en@shaw.po | 2320 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2321 insertions(+), 0 deletions(-) + 2 files changed, 2321 insertions(+) commit 2a842387c4fe0cbdbe6e5d29e4d06ac106425dbd Author: Peteris Krisjanis @@ -5462,8 +10571,8 @@ Updated Latvian translation. - po/lv.po | 4959 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 2252 insertions(+), 2707 deletions(-) + po/lv.po | 4945 ++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 2245 insertions(+), 2700 deletions(-) commit 31bdeb23a74f2810c4ab10e89a806a44ffba7537 Author: Jeff Cai @@ -5473,8 +10582,8 @@ This patch can fix the error that happens when a user imports a SSH key file. But it doesn't fix the issue when importing from the clipboard. - libseahorse/seahorse-util.c | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) + libseahorse/seahorse-util.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) commit e90930b27d60c459955729d0a9620fc6405ae82b Author: Carles Ferrando @@ -5483,7 +10592,7 @@ Updated Catalan (Valencian) translation po/ca@valencia.po | 2161 +++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 2010 insertions(+), 151 deletions(-) + 1 file changed, 2010 insertions(+), 151 deletions(-) commit f89de7228f9a58eb8b1645dde369c086a1c5d200 Author: Adam Schreiber @@ -5491,8 +10600,8 @@ Modify the API documentation to support introspection comments - reference/libcryptui/libcryptui-docs.sgml | 1 + - reference/libseahorse/libseahorse-docs.sgml | 6 +++--- + reference/libcryptui/libcryptui-docs.sgml | 1 + + reference/libseahorse/libseahorse-docs.sgml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) commit 2c9bf49c8603ddfec0dd1fb8f0fece9bbcd07ccb @@ -5502,7 +10611,7 @@ Updated Japanese translation po/ja.po | 1132 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 589 insertions(+), 543 deletions(-) + 1 file changed, 589 insertions(+), 543 deletions(-) commit 508533c82b0e20669b916d6371d871ad06fb94e3 Author: Adam Schreiber @@ -5510,9 +10619,9 @@ Release 2.29.1 - NEWS | 5 +++++ - README | 2 +- - configure.in | 2 +- + NEWS | 5 +++++ + README | 2 +- + configure.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) commit 2153aab3cdd457732204a4988eb13c56d52fd567 @@ -5523,8 +10632,8 @@ This reverts commit 38849c3de2465b731ac3564c5069d96b02549018. - libseahorse/seahorse-util.c | 18 +++--------------- - 1 files changed, 3 insertions(+), 15 deletions(-) + libseahorse/seahorse-util.c | 18 +++--------------- + 1 file changed, 3 insertions(+), 15 deletions(-) commit 38849c3de2465b731ac3564c5069d96b02549018 Author: Jeff Cai @@ -5533,8 +10642,8 @@ Use g_file_info_get_content_type instead of g_content_type_guess Fix #556670 - libseahorse/seahorse-util.c | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) + libseahorse/seahorse-util.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) commit 8b327d0bf85efd0343ff56cf3b57ee28ffa5d00f Author: Stef Walter @@ -5542,8 +10651,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7d92015ee4945e360b391ad49c924a0b0d7b9d40 Author: Stef Walter @@ -5551,9 +10660,9 @@ Release 2.28.1 - NEWS | 16 ++++++++++++++++ - README | 2 +- - 2 files changed, 17 insertions(+), 1 deletions(-) + NEWS | 16 ++++++++++++++++ + README | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) commit e270921c6f712b1132d78a0885cc747f0caf69a6 Author: Thorsten Sick @@ -5561,8 +10670,8 @@ full documentation for seahorse-service-crypto.c - daemon/seahorse-service-crypto.c | 110 +++++++++++++++++++++++++++++++++++++- - 1 files changed, 108 insertions(+), 2 deletions(-) + daemon/seahorse-service-crypto.c | 110 ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 108 insertions(+), 2 deletions(-) commit dbc15703a35ac78efeba285d20e627f755070c73 Author: Thorsten Sick @@ -5572,8 +10681,8 @@ Signed-off-by: Stef Walter - daemon/seahorse-service.c | 95 +++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 79 insertions(+), 16 deletions(-) + daemon/seahorse-service.c | 95 +++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 79 insertions(+), 16 deletions(-) commit 5f8867464217f505c825892189b1cda25c2b6950 Author: Gil Forcada @@ -5582,7 +10691,7 @@ Updated Catalan translation po/ca.po | 1048 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 544 insertions(+), 504 deletions(-) + 1 file changed, 544 insertions(+), 504 deletions(-) commit 0159fb43a1e32832fdcefa333c2abac1adf834a6 Author: Leonid Kanter @@ -5591,7 +10700,7 @@ Updated Russian translation po/ru.po | 1073 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 562 insertions(+), 511 deletions(-) + 1 file changed, 562 insertions(+), 511 deletions(-) commit 9065861cdb314a6351fe241145c73436f9252a8f Author: nobled @@ -5604,8 +10713,8 @@ Closes: bgo#555205 - pgp/seahorse-gpgme-key-op.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + pgp/seahorse-gpgme-key-op.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit b0cef6e39c8aa2643dd78b79f4ddf73a704e5273 Author: Stef Walter @@ -5616,8 +10725,8 @@ The key bit size setting was not set properly in the SSH key generate dialog. - ssh/seahorse-ssh-generate.c | 23 ++++++++++++----------- - 1 files changed, 12 insertions(+), 11 deletions(-) + ssh/seahorse-ssh-generate.c | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) commit 05d133f818b574fab1a36a8f71ae14993e20e26c Author: nobled @@ -5633,8 +10742,8 @@ Signed-off-by: Stef Walter - pgp/seahorse-gpgme-key-op.c | 2 +- - pgp/seahorse-gpgme-key-op.h | 12 +++++++++--- + pgp/seahorse-gpgme-key-op.c | 2 +- + pgp/seahorse-gpgme-key-op.h | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) commit 5773f60e19156ac4c20a9af5cd3ed15e423a7245 @@ -5645,8 +10754,8 @@ Signed-off-by: Stef Walter - configure.in | 1 + - pgp/seahorse-gpgme-key-op.h | 4 ++-- + configure.in | 1 + + pgp/seahorse-gpgme-key-op.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) commit 01a06706174d04f9e19b63892299b1d2516c1248 @@ -5657,8 +10766,8 @@ Reviewed by: Petr Kovar. - help/cs/cs.po | 1550 +++++++++++++++++++++++++++++++++++++++------------------ - 1 files changed, 1067 insertions(+), 483 deletions(-) + help/cs/cs.po | 1558 +++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 1071 insertions(+), 487 deletions(-) commit 1e1e68896263a043334ae744b22a1d878502af86 Author: Pablo Castellano @@ -5670,8 +10779,8 @@ Signed-off-by: Stef Walter - pgp/seahorse-pgp-generate.xml | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + pgp/seahorse-pgp-generate.xml | 1 - + 1 file changed, 1 deletion(-) commit 44b1bb974b3d3cab80171fa8f3d7e0cd906b8a32 Author: Stef Walter @@ -5685,8 +10794,8 @@ Fixes bug: #594269 - src/seahorse-keyserver-sync.xml | 2 +- - ssh/seahorse-ssh-key-properties.xml | 2 +- + src/seahorse-keyserver-sync.xml | 2 +- + ssh/seahorse-ssh-key-properties.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit a9034b0d23ed3156e6a64319713f3c1cb90ac0fa @@ -5697,8 +10806,8 @@ Fixes botched fix in commit dc8d2827... - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 433bb13701b754f3cb2c0e8b93ec8b52744685b8 Author: nobled @@ -5714,8 +10823,8 @@ Signed-off-by: Stef Walter - pgp/seahorse-gpgme-key-op.h | 21 ++++++++++++++++++++- - 1 files changed, 20 insertions(+), 1 deletions(-) + pgp/seahorse-gpgme-key-op.h | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) commit ec4795be0b8f1a62d078fc02e4bcf01350dd33be Author: Thorsten Sick @@ -5725,8 +10834,8 @@ Signed-off-by: Stef Walter - pgp/seahorse-gpgme-generate.c | 75 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 75 insertions(+), 0 deletions(-) + pgp/seahorse-gpgme-generate.c | 75 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 75 insertions(+) commit 34a674c2a96b38f805fcd6b628d621373a0fc1e7 Author: Thorsten Sick @@ -5736,8 +10845,8 @@ Signed-off-by: Stef Walter - pgp/seahorse-gpgme.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 57 insertions(+), 1 deletions(-) + pgp/seahorse-gpgme.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 57 insertions(+), 1 deletion(-) commit 5c272eb9dfff23c2cde308419327131398e600c7 Author: Thorsten Sick @@ -5747,10 +10856,10 @@ Signed-off-by: Stef Walter - gkr/seahorse-gkr-add-keyring.c | 39 +++++++++++++++++++++++++++++++++++ - gkr/seahorse-gkr-keyring-commands.c | 7 ++++++ - libseahorse/seahorse-widget.c | 15 +++++++++++++ - 3 files changed, 61 insertions(+), 0 deletions(-) + gkr/seahorse-gkr-add-keyring.c | 39 +++++++++++++++++++++++++++++++++++++ + gkr/seahorse-gkr-keyring-commands.c | 7 +++++++ + libseahorse/seahorse-widget.c | 15 ++++++++++++++ + 3 files changed, 61 insertions(+) commit dc8d28276204dbd9b47e6ff6fb2f3419a648bc1b Author: Stef Walter @@ -5760,8 +10869,8 @@ Fixes bug #596691 - configure.in | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + configure.in | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) commit 2dcd1fb71e0406fa48c64e9d04b43f5b1e11b23d Author: Stef Walter @@ -5774,8 +10883,8 @@ Fixes bug #597583 - ssh/seahorse-ssh-key-properties.xml | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + ssh/seahorse-ssh-key-properties.xml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit e344df96c7828f321d13eca670c04c9484090067 Author: Stef Walter @@ -5788,8 +10897,8 @@ Fixes bug #596842 - libseahorse/seahorse-object.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + libseahorse/seahorse-object.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) commit c210d3b3592c51d5371cd8bda79f2a00d4339a0c Author: Gintautas Miliauskas @@ -5798,7 +10907,7 @@ Updated Lithuanian translation. po/lt.po | 1146 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 599 insertions(+), 547 deletions(-) + 1 file changed, 599 insertions(+), 547 deletions(-) commit c65ba7c1554859f3c919f1020ec5caa4379adb12 Author: Adam Schreiber @@ -5806,8 +10915,8 @@ Premtively fix 'bogus' handling of the flags type - common/seahorse-bind.c | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) + common/seahorse-bind.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) commit 432d298ed320ea0aaccd27e6d6200bfe345e8c2d Author: Adam Schreiber @@ -5819,8 +10928,8 @@ paste to it instead of trying to import text. When filter doesn't have focus, importing is attempted. - src/seahorse-key-manager.c | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) + src/seahorse-key-manager.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) commit 457ebc5a23fe88a777e4b7f1238cbe557d6d9ff2 Author: Bastien Nocera @@ -5832,8 +10941,8 @@ sub-classes of G_TYPE_ENUM. Check whether the value holds an enum instead and manually check for equality. - common/seahorse-bind.c | 17 ++++++----------- - 1 files changed, 6 insertions(+), 11 deletions(-) + common/seahorse-bind.c | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) commit 5834ab2c23ddab6b27525c339bf5c74e5f3d460c Author: Peteris Krisjanis @@ -5841,8 +10950,8 @@ Fix for wrongly translated term 'keys' in Latvian translation. - po/lv.po | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) + po/lv.po | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) commit c4fcd75a6b826a2b8306c8fa5acea43d34b596cb Author: Manoj Kumar Giri @@ -5850,8 +10959,8 @@ Upadated Oriya Translation - po/or.po | 311 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 162 insertions(+), 149 deletions(-) + po/or.po | 311 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 162 insertions(+), 149 deletions(-) commit 26d8e6410ba0203e9ce4f8dcbbc1a69333e7725e Author: Stef Walter @@ -5859,8 +10968,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit cccda296b89f6b3dad942c18b84b9812f07a8d08 Author: Stef Walter @@ -5868,9 +10977,9 @@ Release 2.28.0 - NEWS | 5 +++++ - README | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) + NEWS | 5 +++++ + README | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) commit fbac78f56ff6a6f8c6699d8f1bbc44c2639ef881 Author: Vitezslav Kotrla @@ -5879,7 +10988,7 @@ Update Czech translation po/cs.po | 1049 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 532 insertions(+), 517 deletions(-) + 1 file changed, 532 insertions(+), 517 deletions(-) commit 5843615ec2f96d2700bf3cf5df19683629876fbd Author: Amitakhya Phukan @@ -5887,8 +10996,8 @@ Updating Assamese translations. - po/as.po | 1187 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 623 insertions(+), 564 deletions(-) + po/as.po | 1187 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 623 insertions(+), 564 deletions(-) commit 161c624a9f4c61ab85223e12fce6629f6b1084be Author: Claude Paroz @@ -5896,8 +11005,8 @@ Updated French translation - help/fr/fr.po | 525 +++++++++++++++++++++++++++------------------------------ - po/fr.po | 8 +- + help/fr/fr.po | 525 +++++++++++++++++++++++++++------------------------------- + po/fr.po | 8 +- 2 files changed, 249 insertions(+), 284 deletions(-) commit e52942e6b47a20dd3b6ee663c69822930a5a007f @@ -5908,7 +11017,7 @@ po/LINGUAS | 1 + po/mai.po | 2954 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2955 insertions(+), 0 deletions(-) + 2 files changed, 2955 insertions(+) commit eb81fc385040cb44cebe398a7cddaf9e0cd734a0 Author: Shankar Prasad @@ -5916,8 +11025,8 @@ Updated Kannada(kn) translation - po/kn.po | 1149 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 558 insertions(+), 591 deletions(-) + po/kn.po | 1151 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 559 insertions(+), 592 deletions(-) commit 15ab1c32de7060e505591279da1199c3d4d4ef48 Author: Jeff Cai @@ -5925,8 +11034,8 @@ The void function should not return a value. - libseahorse/seahorse-view.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + libseahorse/seahorse-view.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 37def1157a24ef3e26f5c79558aa5790e0617fb6 Author: Maxim V. Dziumanenko @@ -5934,8 +11043,8 @@ Added Ukrainian translation - po/uk.po | 925 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 487 insertions(+), 438 deletions(-) + po/uk.po | 927 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 488 insertions(+), 439 deletions(-) commit 20701577bfa2d040a0986a5b4f368999cbd2dabd Author: Milo Casagrande @@ -5944,7 +11053,7 @@ Updated Italian translation po/it.po | 1819 ++++++++++++++++++-------------------------------------------- - 1 files changed, 516 insertions(+), 1303 deletions(-) + 1 file changed, 516 insertions(+), 1303 deletions(-) commit e44901eafca64c6c334b54d9996f1202fda80f3b Author: Matej Urbančič @@ -5953,7 +11062,7 @@ Updated Slovenian translation po/sl.po | 1068 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 563 insertions(+), 505 deletions(-) + 1 file changed, 563 insertions(+), 505 deletions(-) commit 6af80c768791b1cb320856f8977a7e57ca5fefd6 Author: Carlos José Pereira @@ -5961,8 +11070,8 @@ Corrected an error in Brazilian Portuguese translation - po/pt_BR.po | 148 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 74 insertions(+), 74 deletions(-) + po/pt_BR.po | 148 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 74 insertions(+), 74 deletions(-) commit b7cfee76509f3e461c6af8a6134fd4a8dcb24428 Author: Ask H. Larsen @@ -5970,8 +11079,8 @@ Updated Danish translation - po/da.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/da.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 8e8dd8ef6af2c23b815faa209b7c22de16faa3f5 Author: Ani @@ -5979,8 +11088,8 @@ Updated Malayalam Translations - po/ml.po | 301 +++++++++++++++++++++++++++++++++++++------------------------ - 1 files changed, 182 insertions(+), 119 deletions(-) + po/ml.po | 301 ++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 182 insertions(+), 119 deletions(-) commit 01d61c5c708c84a2b2770e85a066a3aef9f99868 Author: Rajesh Ranjan @@ -5988,8 +11097,8 @@ hindi update by Rajesh Ranjan - po/hi.po | 162 ++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 90 insertions(+), 72 deletions(-) + po/hi.po | 162 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 90 insertions(+), 72 deletions(-) commit 31c49b498cd43fa90e17332424151b8b51bd6979 Author: Ani @@ -5998,7 +11107,7 @@ Updaeted Malayalam Translations po/ml.po | 1073 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 534 insertions(+), 539 deletions(-) + 1 file changed, 534 insertions(+), 539 deletions(-) commit da9f04679bb54dd883e7989b68df310adba9c958 Author: Rajesh Ranjan @@ -6006,8 +11115,8 @@ hindi update by Rajesh Ranjan - po/hi.po | 295 +++++++++++++++++++++++++++----------------------------------- - 1 files changed, 129 insertions(+), 166 deletions(-) + po/hi.po | 295 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 129 insertions(+), 166 deletions(-) commit 62d5046cc965e80e4492a31903d2e7f9fd2f9dfa Author: Stef Walter @@ -6015,8 +11124,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d9836104f391a912dcb7c043e54a18a73c10c290 Author: Stef Walter @@ -6024,9 +11133,9 @@ Release version 2.27.92 - NEWS | 17 +++++++++++++++++ - README | 2 +- - configure.in | 2 +- + NEWS | 17 +++++++++++++++++ + README | 2 +- + configure.in | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) commit 40820ee20fd64a3e4a84aa2aeca601617eb1497d @@ -6039,9 +11148,9 @@ Signed-off-by: Stef Walter - pgp/seahorse-gpg-op.c | 2 ++ - pgp/seahorse-gpg-options.c | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) + pgp/seahorse-gpg-op.c | 2 ++ + pgp/seahorse-gpg-options.c | 2 ++ + 2 files changed, 4 insertions(+) commit f8e8263faa2e9ba6cc29e9a6dacd7007099bfe16 Author: Pablo Castellano @@ -6059,13 +11168,13 @@ Signed-off-by: Stef Walter - libseahorse/seahorse-notify.xml | 86 ++++----- - pgp/seahorse-signer.xml | 33 ++- - src/seahorse-change-passphrase.xml | 168 ++++++---------- - src/seahorse-generate-select.xml | 149 ++++++-------- - src/seahorse-keyserver-sync.xml | 205 ++++++++----------- - ssh/seahorse-ssh-generate.xml | 397 ++++++++++-------------------------- - ssh/seahorse-ssh-upload.xml | 215 +++++++------------- + libseahorse/seahorse-notify.xml | 86 ++++---- + pgp/seahorse-signer.xml | 33 ++- + src/seahorse-change-passphrase.xml | 168 ++++++---------- + src/seahorse-generate-select.xml | 149 ++++++-------- + src/seahorse-keyserver-sync.xml | 205 ++++++++----------- + ssh/seahorse-ssh-generate.xml | 397 +++++++++++-------------------------- + ssh/seahorse-ssh-upload.xml | 215 +++++++------------- 7 files changed, 447 insertions(+), 806 deletions(-) commit 8678f49f5c74fc315cf91746fcb0b1fd3c806876 @@ -6076,8 +11185,8 @@ Signed-off-by: Stef Walter - pgp/seahorse-pgp-private-key-properties.xml | 26 +++++--------------------- - 1 files changed, 5 insertions(+), 21 deletions(-) + pgp/seahorse-pgp-private-key-properties.xml | 26 +++++--------------------- + 1 file changed, 5 insertions(+), 21 deletions(-) commit c40c40e0e2b4d808cce0d1119fd07ebf1af1d6aa Author: A S Alam @@ -6085,8 +11194,8 @@ Updating Translation for Punjabi - po/pa.po | 960 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 510 insertions(+), 450 deletions(-) + po/pa.po | 960 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 510 insertions(+), 450 deletions(-) commit dedc7df3c790d9cc2c9c507722d86a3930437e92 Author: Ask H. Larsen @@ -6094,8 +11203,8 @@ Updated Danish translation - po/da.po | 949 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 497 insertions(+), 452 deletions(-) + po/da.po | 949 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 497 insertions(+), 452 deletions(-) commit 0bc9a35100a6b91824786adcdf760e6e27de9b70 Author: Philip Withnall @@ -6104,7 +11213,7 @@ Updated British English translation po/en_GB.po | 1148 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 598 insertions(+), 550 deletions(-) + 1 file changed, 598 insertions(+), 550 deletions(-) commit 1014f37958bd23746a2bc1aa8b48a0f0ba0074b1 Author: Kostas Papadimas @@ -6112,8 +11221,8 @@ Updated Greek help translation. - help/el/el.po | 1779 ++++++++++++++++++++++++++++++++++++++++----------------- - 1 files changed, 1246 insertions(+), 533 deletions(-) + help/el/el.po | 1791 ++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 1252 insertions(+), 539 deletions(-) commit f7c3ce3121aa8f035e094cc80338c8d151128011 Author: Rajesh Ranjan @@ -6122,7 +11231,7 @@ hindi update by Rajesh Ranjan po/hi.po | 1079 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 550 insertions(+), 529 deletions(-) + 1 file changed, 550 insertions(+), 529 deletions(-) commit c015714c5de04d5054c4c4494e6f7376202b69b1 Author: Gabor Kelemen @@ -6130,8 +11239,8 @@ Updated Hungarian translation - po/hu.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + po/hu.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit f95bf6fa9189f54f5e83222d506bcfef35536aad Author: Gabor Kelemen @@ -6140,7 +11249,7 @@ Hungarian translation updated po/hu.po | 1036 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 530 insertions(+), 506 deletions(-) + 1 file changed, 530 insertions(+), 506 deletions(-) commit e219d7d59cda0f4a385faae643e861aff4d26351 Author: Sweta Kothari @@ -6148,8 +11257,8 @@ Updated Gujarati Translations - po/gu.po | 1122 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 532 insertions(+), 590 deletions(-) + po/gu.po | 1126 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 534 insertions(+), 592 deletions(-) commit 7974cc7c9060cd62252781d397f3929e2521f00b Author: Carles Ferrando @@ -6159,7 +11268,7 @@ po/LINGUAS | 1 + po/ca@valencia.po | 3146 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 3147 insertions(+), 0 deletions(-) + 2 files changed, 3147 insertions(+) commit a86a85417405047306efec41cf0ddc4f516e8d91 Author: Aron Xu @@ -6168,7 +11277,7 @@ Updated Simplified Chinese translation. po/zh_CN.po | 1070 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 556 insertions(+), 514 deletions(-) + 1 file changed, 556 insertions(+), 514 deletions(-) commit 16db30074ee873a1df59268530966fc44d04d27a Author: Ivar Smolin @@ -6176,8 +11285,8 @@ Updating Estonian translation - po/et.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/et.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit bd55f113880d0e2a5c121206c5fd2f751817c61d Author: Khaled Hosny @@ -6185,8 +11294,8 @@ Updated Arabic translation - po/ar.po | 1417 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 706 insertions(+), 711 deletions(-) + po/ar.po | 1421 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 708 insertions(+), 713 deletions(-) commit eb6477b4ee290bcfb5cbb92e5a6defd8b49d46a5 Author: Manoj Kumar Giri @@ -6194,8 +11303,8 @@ Updated Oriya Translation - po/or.po | 306 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 147 insertions(+), 159 deletions(-) + po/or.po | 306 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 147 insertions(+), 159 deletions(-) commit 9f001491b44bcf6e27152b5a05b74e8257f1bc75 Author: Manoj Kumar Giri @@ -6203,8 +11312,8 @@ Updated Oriya Translation - po/or.po | 608 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 305 insertions(+), 303 deletions(-) + po/or.po | 608 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 305 insertions(+), 303 deletions(-) commit 79de37cf7049009fe9cf881082595f82f5179a5c Author: Sandeep Shedmake @@ -6212,8 +11321,8 @@ Updated Marathi Translations - po/mr.po | 1197 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 578 insertions(+), 619 deletions(-) + po/mr.po | 1199 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 579 insertions(+), 620 deletions(-) commit e4501606d86fd47c9b3f808e253ddaf86228e60b Author: Denis Arnaud @@ -6222,7 +11331,7 @@ Updated breton translation po/br.po | 3485 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 1773 insertions(+), 1712 deletions(-) + 1 file changed, 1773 insertions(+), 1712 deletions(-) commit 08efca69a3f5db7efc29839f5101ecf0bc45a932 Author: Baris Cicek @@ -6231,7 +11340,7 @@ Updated Turkish translation. po/tr.po | 1019 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 536 insertions(+), 483 deletions(-) + 1 file changed, 536 insertions(+), 483 deletions(-) commit 87d58af5e07fa0b512597c220e0e24ddd2f3f10e Author: Stef Walter @@ -6241,8 +11350,8 @@ Fixes bug #590540 - ssh/seahorse-ssh-key-properties.xml | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) + ssh/seahorse-ssh-key-properties.xml | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) commit fcb092c3d803363e566b899fb43c8f3099adf3c8 Author: Stef Walter @@ -6252,8 +11361,8 @@ Fixes bug #592888. - gkr/seahorse-gkr-keyring-commands.c | 57 ++++++++++++++++++++++++---------- - 1 files changed, 40 insertions(+), 17 deletions(-) + gkr/seahorse-gkr-keyring-commands.c | 57 ++++++++++++++++++++++++++----------- + 1 file changed, 40 insertions(+), 17 deletions(-) commit 844ccf8a6bc05fb2064f98d7a2fd20bc64853c38 Author: Stef Walter @@ -6261,11 +11370,11 @@ Fix more compiler warnings. - pgp/seahorse-gpgme-key-op.c | 6 +++--- - pgp/seahorse-ldap-source.c | 2 ++ - src/seahorse-key-manager-store.c | 2 +- - src/seahorse-viewer.c | 10 ++-------- - ssh/seahorse-ssh-operation.c | 2 +- + pgp/seahorse-gpgme-key-op.c | 6 +++--- + pgp/seahorse-ldap-source.c | 2 ++ + src/seahorse-key-manager-store.c | 2 +- + src/seahorse-viewer.c | 10 ++-------- + ssh/seahorse-ssh-operation.c | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) commit d91809ad3f9efbeab4866966f405ad9efa57c4f3 @@ -6274,8 +11383,8 @@ Use AM_SILENT_RULES - configure.in | 1 + - libcryptui/Makefile.am | 6 +++--- + configure.in | 1 + + libcryptui/Makefile.am | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) commit 1cc4a05280e68bc0702dcf608f3af6eaf2dec0e6 @@ -6286,10 +11395,10 @@ Signed-off-by: Stef Walter - pgp/seahorse-hkp-source.c | 2 +- - src/seahorse-viewer.c | 2 +- - ssh/seahorse-ssh-generate.c | 2 +- - ssh/seahorse-ssh-key-properties.c | 4 ++-- + pgp/seahorse-hkp-source.c | 2 +- + src/seahorse-viewer.c | 2 +- + ssh/seahorse-ssh-generate.c | 2 +- + ssh/seahorse-ssh-key-properties.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) commit a601d0b4ad7a64cf0cc651977ff6eb548f8abee8 @@ -6300,11 +11409,11 @@ Signed-off-by: Stef Walter - gkr/.gitignore | 1 - - libseahorse/.gitignore | 1 - - pgp/.gitignore | 1 - - src/.gitignore | 3 --- - 4 files changed, 0 insertions(+), 6 deletions(-) + gkr/.gitignore | 1 - + libseahorse/.gitignore | 1 - + pgp/.gitignore | 1 - + src/.gitignore | 3 --- + 4 files changed, 6 deletions(-) commit 3325ba05d627747101e09c46e232a03c1e9c42bb Author: Pablo Castellano @@ -6312,25 +11421,25 @@ Removed old CVS stuff. - .cvsignore | 26 -------------------------- - README.cvs | 16 ---------------- - autogen.sh | 2 +- - daemon/.cvsignore | 11 ----------- - data/.cvsignore | 4 ---- - help/.cvsignore | 3 --- - help/C/.cvsignore | 4 ---- - help/it/.cvsignore | 1 - - libcryptui/.cvsignore | 8 -------- - libcryptui/tests/.gitignore | 1 - - libseahorse/.cvsignore | 19 ------------------- - m4/.cvsignore | 3 --- - pixmaps/.cvsignore | 2 -- - pixmaps/22x22/.cvsignore | 2 -- - pixmaps/48x48/.cvsignore | 2 -- - pixmaps/scalable/.cvsignore | 2 -- - po/.cvsignore | 15 --------------- - src/.cvsignore | 19 ------------------- - 18 files changed, 1 insertions(+), 139 deletions(-) + .cvsignore | 26 -------------------------- + README.cvs | 16 ---------------- + autogen.sh | 2 +- + daemon/.cvsignore | 11 ----------- + data/.cvsignore | 4 ---- + help/.cvsignore | 3 --- + help/C/.cvsignore | 4 ---- + help/it/.cvsignore | 1 - + libcryptui/.cvsignore | 8 -------- + libcryptui/tests/.gitignore | 1 - + libseahorse/.cvsignore | 19 ------------------- + m4/.cvsignore | 3 --- + pixmaps/.cvsignore | 2 -- + pixmaps/22x22/.cvsignore | 2 -- + pixmaps/48x48/.cvsignore | 2 -- + pixmaps/scalable/.cvsignore | 2 -- + po/.cvsignore | 15 --------------- + src/.cvsignore | 19 ------------------- + 18 files changed, 1 insertion(+), 139 deletions(-) commit 5abe0dfcb80ac107870100b960db425fc904eb2e Author: Matthias Clasen @@ -6338,13 +11447,13 @@ Respect the button-images setting, and cleanup gtkbuilder xml. - pgp/seahorse-pgp-generate.xml | 44 ++---------- - src/seahorse-generate-select.xml | 67 ++---------------- - src/seahorse-keyserver-search.xml | 44 ++---------- - src/seahorse-keyserver-sync.xml | 134 ++++------------------------------- - ssh/seahorse-ssh-generate.xml | 69 ++---------------- - ssh/seahorse-ssh-key-properties.xml | 88 ++++------------------- - ssh/seahorse-ssh-upload.xml | 67 ++---------------- + pgp/seahorse-pgp-generate.xml | 44 ++---------- + src/seahorse-generate-select.xml | 67 ++---------------- + src/seahorse-keyserver-search.xml | 44 ++---------- + src/seahorse-keyserver-sync.xml | 134 ++++-------------------------------- + ssh/seahorse-ssh-generate.xml | 69 +++---------------- + ssh/seahorse-ssh-key-properties.xml | 88 ++++------------------- + ssh/seahorse-ssh-upload.xml | 67 ++---------------- 7 files changed, 64 insertions(+), 449 deletions(-) commit e870820825a26544a7b91e5d5af2a982c14de92e @@ -6354,7 +11463,7 @@ Updated Polish translation po/pl.po | 2164 +++++++++++++++----------------------------------------------- - 1 files changed, 531 insertions(+), 1633 deletions(-) + 1 file changed, 531 insertions(+), 1633 deletions(-) commit ad680ca660cef0588233d145aec92fc568e18848 Author: Inaki Larranaga Murgoitio @@ -6362,8 +11471,8 @@ Updated Basque language - po/eu.po | 26 +++++++++++++++++++++++--- - 1 files changed, 23 insertions(+), 3 deletions(-) + po/eu.po | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) commit 63f008616a119a8f6d0169234dd154df68083da5 Author: Claude Paroz @@ -6371,8 +11480,8 @@ Updated French translation - po/fr.po | 982 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 506 insertions(+), 476 deletions(-) + po/fr.po | 982 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 506 insertions(+), 476 deletions(-) commit 6ad1e4419e85bce5bc3653e93a2f971f34fd779f Author: Changwoo Ryu @@ -6381,7 +11490,7 @@ Update Korean translation po/ko.po | 1085 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 542 insertions(+), 543 deletions(-) + 1 file changed, 542 insertions(+), 543 deletions(-) commit aaf525b45b1a350b44be83b52a60bb4f40ea9d6a Author: Branko Kokanović @@ -6389,9 +11498,9 @@ Updated Serbian translation - po/sr.po | 4467 ++++++++++++++++++-------------------------------------- - po/sr@latin.po | 4467 ++++++++++++++++++-------------------------------------- - 2 files changed, 2882 insertions(+), 6052 deletions(-) + po/sr.po | 4451 ++++++++++++++++++-------------------------------------- + po/sr@latin.po | 4451 ++++++++++++++++++-------------------------------------- + 2 files changed, 2866 insertions(+), 6036 deletions(-) commit b7516c70de0bd551267c5df63da74a0201b4858b Author: krishnababu k @@ -6400,7 +11509,7 @@ Updated Telugu Translations po/te.po | 1316 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 622 insertions(+), 694 deletions(-) + 1 file changed, 622 insertions(+), 694 deletions(-) commit 59f33835e7568f47d3c645c129413af0140c4b03 Author: Duarte Loreto @@ -6409,7 +11518,7 @@ Updated Portuguese translation po/pt.po | 1128 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 551 insertions(+), 577 deletions(-) + 1 file changed, 551 insertions(+), 577 deletions(-) commit cf1bbf38e241a3d641a6b65e8f913e04f222cd49 Author: Mario Blättermann @@ -6417,8 +11526,8 @@ Updated German doc translation - help/de/de.po | 578 ++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 302 insertions(+), 276 deletions(-) + help/de/de.po | 584 ++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 305 insertions(+), 279 deletions(-) commit 0c6ac661d075fa0036e5c7560d31a352905fa4ba Author: Inaki Larranaga Murgoitio @@ -6426,8 +11535,8 @@ Updated Basque language - po/eu.po | 995 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 500 insertions(+), 495 deletions(-) + po/eu.po | 995 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 500 insertions(+), 495 deletions(-) commit a0c2a077e0b772b7e4c4e820b3224cd5ac5731de Author: Jorge González @@ -6436,7 +11545,7 @@ Updated Spanish translation help/es/es.po | 1009 +++++++++++++++------------------------------------------ - 1 files changed, 262 insertions(+), 747 deletions(-) + 1 file changed, 262 insertions(+), 747 deletions(-) commit a4359a84b8b9cf46ee2baff889d79a10f970f2e0 Author: Paul Cutler @@ -6444,8 +11553,8 @@ Fix bug 581820 (add a keyring docs) - help/C/seahorse.xml | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + help/C/seahorse.xml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) commit c9d379432ad04ffb78b3276bdc07a099211bb791 Author: Paul Cutler @@ -6453,8 +11562,8 @@ Fix bug 583184 (Remove keyring docs) - help/C/seahorse.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + help/C/seahorse.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit bb43e416e0802537bf2798f4a91227429f67bd3e Author: Jamil Ahmed @@ -6463,7 +11572,7 @@ Updated Bengali translation po/bn.po | 6446 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 3060 insertions(+), 3386 deletions(-) + 1 file changed, 3060 insertions(+), 3386 deletions(-) commit 2d90e1a515a29481056654fe56c27407af52bb43 Author: Theppitak Karoonboonyanan @@ -6472,7 +11581,7 @@ Updated Thai translation. po/th.po | 1071 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 557 insertions(+), 514 deletions(-) + 1 file changed, 557 insertions(+), 514 deletions(-) commit 54ba9489d67c538b1af62c094deccd643ff8c592 Merge: 53aefd8 7be78a7 @@ -6487,8 +11596,8 @@ mixed comments in gpgme and key operations - pgp/seahorse-gpgme-key-op.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + pgp/seahorse-gpgme-key-op.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 53aefd8c7559615a0281e9c3cb816a90d320d28d Author: Adam Schreiber @@ -6498,22 +11607,22 @@ Fix gtk-doc warnings - libseahorse/seahorse-context.c | 23 ++++++++--- - libseahorse/seahorse-context.h | 40 +++++++++++--------- - libseahorse/seahorse-dns-sd.h | 22 ++++++---- - libseahorse/seahorse-keyserver-control.h | 25 +++++++----- - libseahorse/seahorse-object-model.h | 21 ++++++---- - libseahorse/seahorse-object.c | 3 +- - libseahorse/seahorse-operation.h | 55 +++++++++++++++----------- - libseahorse/seahorse-prefs.c | 6 ++- - libseahorse/seahorse-set-model.h | 13 ++++-- - libseahorse/seahorse-set.h | 53 ++++++++++++++------------ - libseahorse/seahorse-source.c | 12 +++--- - libseahorse/seahorse-transfer-operation.h | 28 +++++++------ - libseahorse/seahorse-unknown-source.h | 30 ++++++++------ - libseahorse/seahorse-util.c | 2 +- - libseahorse/seahorse-widget.h | 33 +++++++++------- - reference/libseahorse/libseahorse-docs.sgml | 7 ++- + libseahorse/seahorse-context.c | 23 ++++++++---- + libseahorse/seahorse-context.h | 40 +++++++++++---------- + libseahorse/seahorse-dns-sd.h | 22 +++++++----- + libseahorse/seahorse-keyserver-control.h | 25 +++++++------ + libseahorse/seahorse-object-model.h | 21 ++++++----- + libseahorse/seahorse-object.c | 3 +- + libseahorse/seahorse-operation.h | 55 +++++++++++++++++------------ + libseahorse/seahorse-prefs.c | 6 +++- + libseahorse/seahorse-set-model.h | 13 ++++--- + libseahorse/seahorse-set.h | 53 ++++++++++++++------------- + libseahorse/seahorse-source.c | 12 +++---- + libseahorse/seahorse-transfer-operation.h | 28 ++++++++------- + libseahorse/seahorse-unknown-source.h | 30 +++++++++------- + libseahorse/seahorse-util.c | 2 +- + libseahorse/seahorse-widget.h | 33 +++++++++-------- + reference/libseahorse/libseahorse-docs.sgml | 7 ++-- 16 files changed, 215 insertions(+), 158 deletions(-) commit 9789966dcd63523f1afb834eee55869278776576 @@ -6522,11 +11631,11 @@ mixed dbus related comments - daemon/seahorse-dbus-server.c | 19 +++++++++++ - daemon/seahorse-service-keyset.c | 10 +++++- - daemon/seahorse-service.c | 63 ++++++++++++++++++++++++++++++++++++++ - libseahorse/seahorse-context.c | 15 +++++++++ - libseahorse/seahorse-source.c | 9 +++++- + daemon/seahorse-dbus-server.c | 19 ++++++++++++ + daemon/seahorse-service-keyset.c | 10 ++++++- + daemon/seahorse-service.c | 63 ++++++++++++++++++++++++++++++++++++++++ + libseahorse/seahorse-context.c | 15 ++++++++++ + libseahorse/seahorse-source.c | 9 +++++- 5 files changed, 114 insertions(+), 2 deletions(-) commit d865cc80236e98cc800ba3f7a9f1b0d6a2aa7978 @@ -6535,8 +11644,8 @@ Updated Galician Translation - po/gl.po | 76 ++++++++++++++----------------------------------------------- - 1 files changed, 18 insertions(+), 58 deletions(-) + po/gl.po | 76 +++++++++++++++------------------------------------------------- + 1 file changed, 18 insertions(+), 58 deletions(-) commit 6bf01abad4ed7ade09921fd8c88cc79018f17973 Author: Alexander Shopov @@ -6544,8 +11653,8 @@ Updated Bulgarian translation - po/bg.po | 988 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 505 insertions(+), 483 deletions(-) + po/bg.po | 988 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 505 insertions(+), 483 deletions(-) commit a92461a4920fdfcfae5939cc7ff2acc6cf307a87 Author: Tommi Vainikainen @@ -6553,8 +11662,8 @@ Updated Finnish translation - po/fi.po | 990 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 523 insertions(+), 467 deletions(-) + po/fi.po | 990 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 523 insertions(+), 467 deletions(-) commit 9ffc7b9630cbb930690eb4eed2e2a670c9aa3f7b Author: Manoj Kumar Giri @@ -6563,7 +11672,7 @@ Updated Oriya Translation po/or.po | 1078 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 559 insertions(+), 519 deletions(-) + 1 file changed, 559 insertions(+), 519 deletions(-) commit 8158027d1f2b750f8e2876eda81ce711888a4b1e Author: Mario Blättermann @@ -6571,8 +11680,8 @@ Small fix in German translation - po/de.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 72f5187db39f25401294c245a97b0b09838cf0f2 Author: Antón Méixome @@ -6580,8 +11689,8 @@ Updated Galician translation - po/gl.po | 1150 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 606 insertions(+), 544 deletions(-) + po/gl.po | 1152 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 607 insertions(+), 545 deletions(-) commit d4eb6ecf3578dd6bcff3efe3075d1f06d01979d3 Author: Thorsten Sick @@ -6591,13 +11700,13 @@ gtk-doc comments - libseahorse/seahorse-gconf.c | 143 +++++++++++++- - libseahorse/seahorse-gtkstock.c | 40 ++++ - libseahorse/seahorse-object.c | 366 ++++++++++++++++++++++++++++++++-- - libseahorse/seahorse-prefs.c | 16 ++ - libseahorse/seahorse-secure-memory.c | 52 +++++ - libseahorse/seahorse-util.c | 362 ++++++++++++++++++++++++++++++---- - libseahorse/seahorse-validity.c | 6 + + libseahorse/seahorse-gconf.c | 143 +++++++++++++- + libseahorse/seahorse-gtkstock.c | 40 ++++ + libseahorse/seahorse-object.c | 366 +++++++++++++++++++++++++++++++++-- + libseahorse/seahorse-prefs.c | 16 ++ + libseahorse/seahorse-secure-memory.c | 52 +++++ + libseahorse/seahorse-util.c | 362 ++++++++++++++++++++++++++++++---- + libseahorse/seahorse-validity.c | 6 + 7 files changed, 933 insertions(+), 52 deletions(-) commit 84a8296898c4a214e3e3cb67d45399b9d81e6221 @@ -6608,10 +11717,10 @@ Add gtk-doc files and a .gitignore file - reference/libseahorse/.gitignore | 16 + - reference/libseahorse/libseahorse-docs.sgml | 64 +++ - reference/libseahorse/libseahorse-sections.txt | 651 ++++++++++++++++++++++++ - 3 files changed, 731 insertions(+), 0 deletions(-) + reference/libseahorse/.gitignore | 16 + + reference/libseahorse/libseahorse-docs.sgml | 64 +++ + reference/libseahorse/libseahorse-sections.txt | 651 +++++++++++++++++++++++++ + 3 files changed, 731 insertions(+) commit ffe7794801a22dbee9a03fa70043eb542095c0fe Author: Adam Schreiber @@ -6621,8 +11730,8 @@ Add dynamic version file - reference/libseahorse/version.xml.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + reference/libseahorse/version.xml.in | 1 + + 1 file changed, 1 insertion(+) commit 58ab74fcf5d356a18e700963581e1f83516505df Author: Adam Schreiber @@ -6632,10 +11741,10 @@ Build magic for gtk-doc comments in libseahorse - configure.in | 2 + - reference/Makefile.am | 3 +- - reference/libseahorse/Makefile.am | 65 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 69 insertions(+), 1 deletions(-) + configure.in | 2 ++ + reference/Makefile.am | 3 +- + reference/libseahorse/Makefile.am | 65 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 69 insertions(+), 1 deletion(-) commit 3353ceb235160869c2d369af43319fe5ffaa3303 Author: Stef Walter @@ -6643,8 +11752,8 @@ Bump version number to 2.27.91 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d95de9ab897e17e610c43e7b24a64e011262daec Author: Stef Walter @@ -6652,9 +11761,9 @@ Release 2.27.90 - NEWS | 5 +++++ - README | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) + NEWS | 5 +++++ + README | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) commit 227aaae70cd2f282f76c59263d1ffce60c794b83 Author: Mario Blättermann @@ -6662,8 +11771,8 @@ Updated German translation - po/de.po | 1076 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 569 insertions(+), 507 deletions(-) + po/de.po | 1078 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 570 insertions(+), 508 deletions(-) commit 67c1e5574b15577148b8cd6875d3e99618d4b34c Author: Seán de Búrca @@ -6672,7 +11781,7 @@ Updated Irish translation po/ga.po | 4228 +++++++++++++++++++++++++++----------------------------------- - 1 files changed, 1861 insertions(+), 2367 deletions(-) + 1 file changed, 1861 insertions(+), 2367 deletions(-) commit 30a18f365435de433a51e0f7debba557eec58773 Author: Kjartan Maraas @@ -6680,8 +11789,8 @@ Updated Norwegian bokmål translation. - po/nb.po | 963 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 497 insertions(+), 466 deletions(-) + po/nb.po | 963 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 497 insertions(+), 466 deletions(-) commit 802fdfb1b275ffb2733df301567b6d8e95eda9f4 Author: André Gondim @@ -6691,8 +11800,8 @@ Translation provided by André Gondim and myself. - po/pt_BR.po | 1044 +++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 558 insertions(+), 486 deletions(-) + po/pt_BR.po | 1044 +++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 558 insertions(+), 486 deletions(-) commit 4a1bfa6a3d399d93a9b0dc7b1ab45977ef859e80 Author: Stef Walter @@ -6702,8 +11811,8 @@ Fixes bug #590331 - src/seahorse-key-manager.xml | 25 ++++++++++++++++++++++--- - 1 files changed, 22 insertions(+), 3 deletions(-) + src/seahorse-key-manager.xml | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) commit a8673f88e4ac3043a5cdedfe5cc96d54a642b851 Author: Denis Arnaud @@ -6711,8 +11820,8 @@ Added br in Linguas - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit f838c10ca974c524f3f96d5e0985ab710ec2544d Author: Denis Arnaud @@ -6721,7 +11830,7 @@ Added breton translation po/br.po | 2905 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 2905 insertions(+), 0 deletions(-) + 1 file changed, 2905 insertions(+) commit 485ffab159cd8f5ede6e720e403b17ae875a7747 Author: Paul Cutler @@ -6729,8 +11838,8 @@ Removed backup references from documentation - help/C/seahorse.xml | 35 ----------------------------------- - 1 files changed, 0 insertions(+), 35 deletions(-) + help/C/seahorse.xml | 35 ----------------------------------- + 1 file changed, 35 deletions(-) commit 87a7dd7f2d27defed6e638343572ed545c4696d6 Author: Stef Walter @@ -6738,8 +11847,8 @@ Ignore files built for cs translation - help/cs/.gitignore | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + help/cs/.gitignore | 2 ++ + 1 file changed, 2 insertions(+) commit 76b1cd683d50881d9d3d502bf788571b813036ef Author: Stef Walter @@ -6747,8 +11856,8 @@ Bump version number - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 598902c5001e6937970a3d0216e30d9b3894744d Author: Stef Walter @@ -6756,9 +11865,9 @@ Release version 2.27.5 - NEWS | 16 ++++++++++++++++ - configure.in | 2 +- - 2 files changed, 17 insertions(+), 1 deletions(-) + NEWS | 16 ++++++++++++++++ + configure.in | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) commit 7ac75c5b9c1e453ba71aa2b5f61f7089506ef2d6 Author: Petr Kovar @@ -6769,7 +11878,7 @@ help/Makefile.am | 2 +- help/cs/cs.po | 1160 +++++++++++++++++++++++++++++++++++ help/cs/figures/seahorse-window.png | Bin 0 -> 29600 bytes - 3 files changed, 1161 insertions(+), 1 deletions(-) + 3 files changed, 1161 insertions(+), 1 deletion(-) commit 20cdc65e9a278534f5dbb464f47726e7c06e96b3 Author: Mario Blättermann @@ -6777,8 +11886,8 @@ Updated German translation - help/de/de.po | 601 ++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 314 insertions(+), 287 deletions(-) + help/de/de.po | 601 ++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 314 insertions(+), 287 deletions(-) commit 8ac922bc6fc1d9d2817833bd667d7d3f248cc76d Author: Gil Forcada @@ -6786,8 +11895,8 @@ Added cy to LINGUAS - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit e0d9a542eb8de055bb4b3b47e279aee171e03d9f Author: Daniel Nylander @@ -6795,8 +11904,8 @@ Updated Swedish translation - po/sv.po | 856 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 453 insertions(+), 403 deletions(-) + po/sv.po | 856 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 453 insertions(+), 403 deletions(-) commit 1bca34cd4a83a1c25b4ff95e234ad1b92dced6c8 Author: Chao-Hsiung Liao @@ -6814,8 +11923,8 @@ Updated Tamil translation - po/ta.po | 861 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 457 insertions(+), 404 deletions(-) + po/ta.po | 861 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 457 insertions(+), 404 deletions(-) commit 182819bf5c5951a92b622e344c68ed98bde4a8d9 Author: Ivar Smolin @@ -6823,8 +11932,8 @@ Updating Estonian translation - po/et.po | 124 ++++++++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 80 insertions(+), 44 deletions(-) + po/et.po | 124 ++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 80 insertions(+), 44 deletions(-) commit 32ab2109b99e903521537f6f6a2238a58702ce66 Author: Jorge González @@ -6832,8 +11941,8 @@ Updated Spanish translation - po/es.po | 28 +++++++++------------------- - 1 files changed, 9 insertions(+), 19 deletions(-) + po/es.po | 28 +++++++++------------------- + 1 file changed, 9 insertions(+), 19 deletions(-) commit dbc9cc7b859d06e3c0ebd9941946acb32b817296 Author: Runa Bhattacharjee @@ -6842,7 +11951,7 @@ Updated Bengali India Translations po/bn_IN.po | 1137 ++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 583 insertions(+), 554 deletions(-) + 1 file changed, 583 insertions(+), 554 deletions(-) commit a8629d13f50623ec7cc705cb3d849d85ed0be5b6 Author: Kjartan Maraas @@ -6850,8 +11959,8 @@ Fix GTK+ single include - libseahorse/seahorse-widget.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libseahorse/seahorse-widget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6b7d1de066011d04db35548217f0b64e607abe4b Author: Stef Walter @@ -6861,8 +11970,8 @@ Also change the label of the other keys. - src/seahorse-key-manager.xml | 44 +++++++++++------------------------------ - 1 files changed, 12 insertions(+), 32 deletions(-) + src/seahorse-key-manager.xml | 44 ++++++++++++-------------------------------- + 1 file changed, 12 insertions(+), 32 deletions(-) commit f56f0bb48adf30d7ca406885c15a4808b030ada3 Author: Jorge González @@ -6870,8 +11979,8 @@ Updated Spanish translation - po/es.po | 850 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 456 insertions(+), 394 deletions(-) + po/es.po | 850 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 456 insertions(+), 394 deletions(-) commit e9d379fa809beac670f19c1c608dc305bf479072 Author: Stef Walter @@ -6882,16 +11991,16 @@ User can now manually add items to keyrings from the File | New menu. 'Stored Password' is the name. - gkr/Makefile.am | 4 +- - gkr/seahorse-gkr-add-item.c | 172 +++++++++++++++++++++++++++++++ - gkr/seahorse-gkr-add-item.xml | 191 +++++++++++++++++++++++++++++++++++ - gkr/seahorse-gkr-add-keyring.c | 78 +-------------- - gkr/seahorse-gkr-dialogs.c | 99 ++++++++++++++++++ - gkr/seahorse-gkr-dialogs.h | 7 ++ - gkr/seahorse-gkr-keyring-commands.c | 11 ++- - gkr/seahorse-gkr-keyring.c | 1 + - libseahorse/seahorse-gtkstock.c | 1 + - po/POTFILES.in | 2 + + gkr/Makefile.am | 4 +- + gkr/seahorse-gkr-add-item.c | 172 ++++++++++++++++++++++++++++++++ + gkr/seahorse-gkr-add-item.xml | 191 ++++++++++++++++++++++++++++++++++++ + gkr/seahorse-gkr-add-keyring.c | 78 +-------------- + gkr/seahorse-gkr-dialogs.c | 99 +++++++++++++++++++ + gkr/seahorse-gkr-dialogs.h | 7 ++ + gkr/seahorse-gkr-keyring-commands.c | 11 ++- + gkr/seahorse-gkr-keyring.c | 1 + + libseahorse/seahorse-gtkstock.c | 1 + + po/POTFILES.in | 2 + 10 files changed, 488 insertions(+), 78 deletions(-) commit 25a1e1010a6a6aaa94bb268f548501331cf08709 @@ -6900,8 +12009,8 @@ Update POTFILES.in after GTKBuilder migration. - po/POTFILES.in | 50 +++++++++++++++++++++++++------------------------- - 1 files changed, 25 insertions(+), 25 deletions(-) + po/POTFILES.in | 50 +++++++++++++++++++++++++------------------------- + 1 file changed, 25 insertions(+), 25 deletions(-) commit ce616ee6aa9027c818b06346404dcd08dcab11bb Author: Stef Walter @@ -6956,7 +12065,7 @@ pgp/seahorse-gpgme-sign.c | 51 +- pgp/seahorse-pgp-generate.glade | 651 ------ pgp/seahorse-pgp-generate.xml | 452 ++++ - pgp/seahorse-pgp-key-properties.c | 403 ++--- + pgp/seahorse-pgp-key-properties.c | 403 ++-- pgp/seahorse-pgp-private-key-properties.glade | 2890 ------------------------- pgp/seahorse-pgp-private-key-properties.xml | 1771 +++++++++++++++ pgp/seahorse-pgp-public-key-properties.glade | 2393 -------------------- @@ -6991,13 +12100,13 @@ ssh/seahorse-ssh-generate.c | 2 +- ssh/seahorse-ssh-generate.glade | 648 ------ ssh/seahorse-ssh-generate.xml | 634 ++++++ - ssh/seahorse-ssh-key-properties.c | 59 +- + ssh/seahorse-ssh-key-properties.c | 61 +- ssh/seahorse-ssh-key-properties.glade | 1014 --------- ssh/seahorse-ssh-key-properties.xml | 613 ++++++ ssh/seahorse-ssh-upload.c | 25 +- ssh/seahorse-ssh-upload.glade | 351 --- ssh/seahorse-ssh-upload.xml | 331 +++ - 83 files changed, 10162 insertions(+), 14458 deletions(-) + 83 files changed, 10163 insertions(+), 14459 deletions(-) commit b7a4c9f75254684ce6c8216283b6e8b24e7871cb Author: Jorge González @@ -7005,8 +12114,8 @@ Updated Spanish translation - po/es.po | 86 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 43 insertions(+), 43 deletions(-) + po/es.po | 86 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 43 insertions(+), 43 deletions(-) commit 6d356c1b6c9b8dc239858191f316ac44147d6640 Author: Stef Walter @@ -7017,8 +12126,8 @@ Also make 'passwords' tab first since that's what people seem to use the most. - src/seahorse-key-manager.c | 13 ------- - src/seahorse-key-manager.glade | 76 +++++---------------------------------- + src/seahorse-key-manager.c | 13 -------- + src/seahorse-key-manager.glade | 76 ++++++------------------------------------ 2 files changed, 10 insertions(+), 79 deletions(-) commit e92778463984f47fa913ebe954ed4215f7aa6a4e @@ -7030,8 +12139,8 @@ Gray out PGP keys that are not trusted in the main key display and other places where they're rendered as markup. - pgp/seahorse-pgp-uid.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) + pgp/seahorse-pgp-uid.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) commit 9b047fb6a974101fdb5cb74f693e0f795b7e1180 Author: Stef Walter @@ -7039,8 +12148,8 @@ Ignore project files and backup files. - .gitignore | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) + .gitignore | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) commit dd3f1b871fa57e4eddf5ab57650cfa40cb1fc989 Author: Maxim V. Dziumanenko @@ -7048,8 +12157,8 @@ Updated Ukrainian translation - po/uk.po | 822 +++----------------------------------------------------------- - 1 files changed, 37 insertions(+), 785 deletions(-) + po/uk.po | 822 +++------------------------------------------------------------ + 1 file changed, 37 insertions(+), 785 deletions(-) commit 13582f9987de9ac2d79004452684adc80cb67112 Author: A S Alam @@ -7057,8 +12166,8 @@ updating translation for Punjabi - po/pa.po | 283 ++++++++++++++++++++++++++------------------------------------ - 1 files changed, 117 insertions(+), 166 deletions(-) + po/pa.po | 283 ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 117 insertions(+), 166 deletions(-) commit 2e2a3d529b62ea39b69b707b6dde7a1425ba7ca4 Author: Adam Schreiber @@ -7068,8 +12177,8 @@ Remove the autostart condition on the sharing gconf key. - daemon/seahorse-daemon.desktop.in.in | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + daemon/seahorse-daemon.desktop.in.in | 1 - + 1 file changed, 1 deletion(-) commit 572e429904fc62bdc1c6eddbf1316b6b70fd2fd2 Author: Ivar Smolin @@ -7077,8 +12186,8 @@ Updating Estonian translation - po/et.po | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) + po/et.po | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) commit e22cad4e318df704d865f97ea41a3f46a2c584f4 Author: Ivar Smolin @@ -7086,8 +12195,8 @@ Updating Estonian translation - po/et.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/et.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 123cb92dcdb0ede08a179d34ac0f2d084543a347 Author: Daniel Nylander @@ -7095,8 +12204,8 @@ Updated sv translation (Daniel Nylander) - po/sv.po | 180 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 92 insertions(+), 88 deletions(-) + po/sv.po | 180 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 92 insertions(+), 88 deletions(-) commit a6763731b54d929c12053a279dc4e5d00a453e2a Author: Ivar Smolin @@ -7104,8 +12213,8 @@ Updating Estonian translation - po/et.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/et.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 50bb662cfc8d7292aca391ba279776fd87002f7b Author: Ask H. Larsen @@ -7113,8 +12222,8 @@ Updated Danish translation - po/da.po | 214 ++++++++++++++++++++++---------------------------------------- - 1 files changed, 75 insertions(+), 139 deletions(-) + po/da.po | 214 ++++++++++++++++++++++----------------------------------------- + 1 file changed, 75 insertions(+), 139 deletions(-) commit 3082358a3e788dbff9fa0af7f18319758f3ffa4d Author: Claude Paroz @@ -7122,8 +12231,8 @@ Updated French translation - help/fr/fr.po | 664 +++++++++++++++++++++++++++++--------------------------- - 1 files changed, 344 insertions(+), 320 deletions(-) + help/fr/fr.po | 666 ++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 345 insertions(+), 321 deletions(-) commit d7333ecea390bae86cb10d2406641e8dede33587 Author: Adam Schreiber @@ -7133,8 +12242,8 @@ Initially select the old search text in the GtkEntry. - src/seahorse-keyserver-search.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/seahorse-keyserver-search.c | 1 + + 1 file changed, 1 insertion(+) commit 34df28756a71b16ffa95135e04a02c06ed048c6e Author: drtvasudevan @@ -7142,8 +12251,8 @@ Updated Tamil translation - po/ta.po | 350 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 163 insertions(+), 187 deletions(-) + po/ta.po | 350 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 163 insertions(+), 187 deletions(-) commit 6eda8ecc06e4e114e5ebe8b8817e57363aad5287 Author: Thomas Klausner @@ -7153,8 +12262,8 @@ Change == tests to = tests - configure.in | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + configure.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit b0b0192ceeddb8383a4c0899be0ee19c7d5ef876 Author: Josselin Mouette @@ -7164,8 +12273,8 @@ Adds the --no-daemonize flag to the DBus autostart file. - daemon/org.gnome.seahorse.service.in | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + daemon/org.gnome.seahorse.service.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) commit 83ef5295fca7692d12df9f61f15ac4003985fce6 Author: Ivar Smolin @@ -7173,8 +12282,8 @@ Updating Estonian translation - po/et.po | 97 ++++++++----------------------------------------------------- - 1 files changed, 13 insertions(+), 84 deletions(-) + po/et.po | 97 +++++++++------------------------------------------------------- + 1 file changed, 13 insertions(+), 84 deletions(-) commit 8a529cfdacd70a5e4219cc34216d6e64c7ff6ab3 Author: Simos Xenitellis @@ -7182,8 +12291,8 @@ updated Greek documentation translation - help/el/el.po | 1191 +++++++++++++++------------------------------------------ - 1 files changed, 301 insertions(+), 890 deletions(-) + help/el/el.po | 1193 +++++++++++++++------------------------------------------ + 1 file changed, 302 insertions(+), 891 deletions(-) commit c204f2848789b579a265d07d18f8ba2344acc2d6 Author: Fotis Tsamis @@ -7191,8 +12300,8 @@ updated Greek documentation translation - help/el/el.po | 2626 +++++++++++++++++++++++++++++---------------------------- - 1 files changed, 1335 insertions(+), 1291 deletions(-) + help/el/el.po | 2660 +++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1352 insertions(+), 1308 deletions(-) commit fa86856ba00a9edd59773767263d30352cfc4973 Author: Jorge Gonzalez @@ -7200,8 +12309,8 @@ Updated Spanish translation - help/es/es.po | 622 +++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 339 insertions(+), 283 deletions(-) + help/es/es.po | 622 ++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 339 insertions(+), 283 deletions(-) commit 9bfc8c5873e01c6534fa460390dd96948f029490 Author: Jorge Gonzalez @@ -7209,8 +12318,8 @@ Updated Spanish translation - po/es.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/es.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 814a307dada575e07f1ce6d1664a4d9d30ffe4e0 Author: Jorge Gonzalez @@ -7218,8 +12327,8 @@ Updated Spanish translation - po/es.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/es.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 0c54c0301b8b53d85a6645ea3696e8fc57dd0c4b Author: Paul Cutler @@ -7227,8 +12336,8 @@ Update docs / bug 580171 - help/C/seahorse.xml | 70 +++++++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 59 insertions(+), 11 deletions(-) + help/C/seahorse.xml | 70 ++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 59 insertions(+), 11 deletions(-) commit 3c39bec3bff25ac0e8b449044c1454924cc83b83 Author: Adam Schreiber @@ -7236,9 +12345,9 @@ Fix whitespace errors - libcryptui/cryptui-key-chooser.h | 2 +- - libcryptui/cryptui-key-list.h | 2 +- - libcryptui/cryptui.c | 2 +- + libcryptui/cryptui-key-chooser.h | 2 +- + libcryptui/cryptui-key-list.h | 2 +- + libcryptui/cryptui.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 51f876027692b0473376f2b577bee815e0387f91 @@ -7247,8 +12356,8 @@ Fix white space errors - libcryptui/cryptui-key-list.c | 2 +- - libcryptui/cryptui-key-list.h | 2 +- + libcryptui/cryptui-key-list.c | 2 +- + libcryptui/cryptui-key-list.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit aaed9690f94d433e1dbcf92632cf2b1aa37e4f22 @@ -7257,8 +12366,8 @@ Fix function definition - libcryptui/cryptui-key-store.c | 4 ++-- - libcryptui/cryptui-key-store.h | 2 +- + libcryptui/cryptui-key-store.c | 4 ++-- + libcryptui/cryptui-key-store.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit b58c4e86b61ab8c09e0c4fe85e412c1d05445346 @@ -7267,8 +12376,8 @@ Add unimplemented function - libcryptui/cryptui-keyset.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + libcryptui/cryptui-keyset.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) commit 3ec1d9abb9d8cc5b6feac25a8736efd7949c2281 Author: Adam Schreiber @@ -7276,8 +12385,8 @@ Document enums - libcryptui/cryptui.h | 76 ++++++++++++++++++++++++++++++++++++++----------- - 1 files changed, 59 insertions(+), 17 deletions(-) + libcryptui/cryptui.h | 76 ++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 59 insertions(+), 17 deletions(-) commit 7e953f440ae48e6d1b9b3e0c21644e04bbacd603 Author: Adam Schreiber @@ -7285,12 +12394,12 @@ Fix gtk-doc make errors - libcryptui/cryptui-key-chooser.c | 6 ------ - libcryptui/cryptui-key-combo.c | 4 ---- - libcryptui/cryptui-key-list.c | 6 ------ - libcryptui/cryptui-keyset.c | 10 +--------- - libcryptui/cryptui.c | 10 ---------- - 5 files changed, 1 insertions(+), 35 deletions(-) + libcryptui/cryptui-key-chooser.c | 6 ------ + libcryptui/cryptui-key-combo.c | 4 ---- + libcryptui/cryptui-key-list.c | 6 ------ + libcryptui/cryptui-keyset.c | 10 +--------- + libcryptui/cryptui.c | 10 ---------- + 5 files changed, 1 insertion(+), 35 deletions(-) commit 6d1e191c8a45af154079141947d8ddf347925f03 Author: Adam Schreiber @@ -7298,8 +12407,8 @@ Document cryptui-key-store - libcryptui/cryptui-key-store.c | 155 +++++++++++++++++++++++++++++++++++++++- - 1 files changed, 154 insertions(+), 1 deletions(-) + libcryptui/cryptui-key-store.c | 155 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 154 insertions(+), 1 deletion(-) commit 55abce79c4cf3f376b602d74e3f35b349556f194 Author: Adam Schreiber @@ -7307,8 +12416,8 @@ Document cryptui-keyset.c - libcryptui/cryptui-keyset.c | 152 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 152 insertions(+), 0 deletions(-) + libcryptui/cryptui-keyset.c | 152 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 152 insertions(+) commit 3b10ec965928ff0b7277ef1ec68ec84fc69a6ce4 Author: Adam Schreiber @@ -7316,10 +12425,10 @@ Add annotations and harmonize function defs and implementations - libcryptui/cryptui-key-combo.c | 40 +++++++------- - libcryptui/cryptui-key-combo.h | 6 +- - libcryptui/cryptui-key-list.c | 113 +++++++++++++++++++++++++++++++++------ - libcryptui/cryptui-key-list.h | 14 +++--- + libcryptui/cryptui-key-combo.c | 40 +++++++-------- + libcryptui/cryptui-key-combo.h | 6 +-- + libcryptui/cryptui-key-list.c | 113 ++++++++++++++++++++++++++++++++++------- + libcryptui/cryptui-key-list.h | 14 ++--- 4 files changed, 125 insertions(+), 48 deletions(-) commit 5a367e6f1f462ed1758d6d354c0be03e6a37fe7a @@ -7328,8 +12437,8 @@ Add gtk-doc annotations to cryptui-key-combo.c - libcryptui/cryptui-key-combo.c | 88 +++++++++++++++++++++++++++++++--------- - 1 files changed, 69 insertions(+), 19 deletions(-) + libcryptui/cryptui-key-combo.c | 88 +++++++++++++++++++++++++++++++++--------- + 1 file changed, 69 insertions(+), 19 deletions(-) commit 57c48766afc271e4bb9cc08b15fda9761026fd0b Author: Adam Schreiber @@ -7337,8 +12446,8 @@ Remove blank lines at end of file - libcryptui/cryptui-key-chooser.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + libcryptui/cryptui-key-chooser.c | 2 -- + 1 file changed, 2 deletions(-) commit a21a950035a09f36db1f362ac80da47ff3cb983a Author: Adam Schreiber @@ -7346,8 +12455,8 @@ Fix trailing white space - libcryptui/cryptui-key-chooser.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + libcryptui/cryptui-key-chooser.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 43a254c17950fcd5423c8518e5e58d7ff95f573e Author: Adam Schreiber @@ -7355,8 +12464,8 @@ Fix function define formatting - libcryptui/cryptui-key-chooser.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + libcryptui/cryptui-key-chooser.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit 784b0b3aa02d689013ff9007cac2c3a9b5260c9b Author: Adam Schreiber @@ -7364,8 +12473,8 @@ Fix gtk-doc formatting - libcryptui/cryptui.c | 12 +----------- - 1 files changed, 1 insertions(+), 11 deletions(-) + libcryptui/cryptui.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) commit 52a842ee99b598feb9db435ebe13f78a93656c3f Author: Adam Schreiber @@ -7373,8 +12482,8 @@ Add missing functions and fix gtk-doc formatting - libcryptui/cryptui-key-chooser.c | 44 ++++++++++++++++++++++++++++++++----- - 1 files changed, 38 insertions(+), 6 deletions(-) + libcryptui/cryptui-key-chooser.c | 44 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 38 insertions(+), 6 deletions(-) commit c8e9ec48a0ef23b4d90d8ff74a15baa74ad8bb5b Author: Adam Schreiber @@ -7382,8 +12491,8 @@ Add defines for implemented functions - libcryptui/cryptui-key-chooser.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + libcryptui/cryptui-key-chooser.h | 1 + + 1 file changed, 1 insertion(+) commit 57a27ccec066708c75d8d0e211e57a384967f83c Author: Adam Schreiber @@ -7391,8 +12500,8 @@ Document the key chooser widget - libcryptui/cryptui-key-chooser.c | 65 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 65 insertions(+), 0 deletions(-) + libcryptui/cryptui-key-chooser.c | 65 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 65 insertions(+) commit f58998347181cf993bc6790265e66b89825d33a9 Author: Adam Schreiber @@ -7400,8 +12509,8 @@ Fix trailing white space in gtk-doc comments - libcryptui/cryptui.c | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) + libcryptui/cryptui.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) commit a4f63c558f157770f9594f690ac6945ebc3c35a5 Author: Adam Schreiber @@ -7409,8 +12518,8 @@ Finish documenting cryptui.c - libcryptui/cryptui.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 80 insertions(+), 6 deletions(-) + libcryptui/cryptui.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 80 insertions(+), 6 deletions(-) commit bd5e30160ab7411420779dbc799866c2ae132ad8 Author: Adam Schreiber @@ -7421,8 +12530,8 @@ The logic for the trust combo set it insensitive if it was not disabled instead of the other way around. - pgp/seahorse-pgp-key-properties.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + pgp/seahorse-pgp-key-properties.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit dc34e33e11bcc02904ea97f9ee08a5c9fcd6e13d Author: Marios Zindilis @@ -7430,8 +12539,8 @@ Updated Greek translation - po/el.po | 705 +++++++++++++++++++++----------------------------------------- - 1 files changed, 240 insertions(+), 465 deletions(-) + po/el.po | 705 ++++++++++++++++++++++----------------------------------------- + 1 file changed, 240 insertions(+), 465 deletions(-) commit 6ec0523ff9556a4c80ce92c757125e6978515081 Author: Jorge Gonzalez @@ -7439,8 +12548,8 @@ Updated Spanish translation - po/es.po | 127 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 65 insertions(+), 62 deletions(-) + po/es.po | 127 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 65 insertions(+), 62 deletions(-) commit 5ba4b75ce38f341f5421a11301b077b34e6c5ac0 Author: Jorge Gonzalez @@ -7448,8 +12557,8 @@ Updated Spanish translation - po/es.po | 92 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 46 insertions(+), 46 deletions(-) + po/es.po | 92 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 46 insertions(+), 46 deletions(-) commit ce471134a70ce79ffaba5b017af3ceb128429233 Author: Alexander Faithfull @@ -7460,8 +12569,8 @@ Patch from Alexander Faithfull. I added a short option to it. Signed-off-by: Adam Schreiber - src/seahorse-main.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) + src/seahorse-main.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) commit a228b7727371d679c62414f5f9ff41068cb06e71 Author: Adam Schreiber @@ -7469,8 +12578,8 @@ Fix gtk-doc errors - libcryptui/cryptui.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + libcryptui/cryptui.c | 2 -- + 1 file changed, 2 deletions(-) commit 586ae14e5229477455bb884301aa23dd68ff6258 Author: Adam Schreiber @@ -7478,9 +12587,9 @@ Bump version for 2.27.1 - NEWS | 12 ++++++++++++ - README | 2 +- - configure.in | 2 +- + NEWS | 12 ++++++++++++ + README | 2 +- + configure.in | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) commit 3d59806230c34c132fc45c81aca42de578423069 @@ -7492,8 +12601,8 @@ Copied the plurals line from evolution, changed the charset to UTF-8, and entered my date and time as the po-revision-date. - po/cy.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + po/cy.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit 5021860ef90e78b70b5d31dbacd1a9ad5dd45081 Author: Adam Schreiber @@ -7501,8 +12610,8 @@ Added fuzzy param to errored string. - po/ne.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/ne.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 46c550b5a5b284c0b099980d94a4b0ea0a69a470 Author: Adam Schreiber @@ -7510,8 +12619,8 @@ Change default package name to seahorse - po/ku.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/ku.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 82088e4e73eb34b4e21cbfc2d4701bfce6360e41 Author: Adam Schreiber @@ -7522,8 +12631,8 @@ When creating a new remote branch, a pre-commit hook flaged this translation. Adding fuzzy to the strings fixes the problem. - po/bn.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/bn.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit c9e8df6ee8d653b00cefe811f2fa27ee75388e64 Author: Adam Schreiber @@ -7531,8 +12640,8 @@ Fix ChangeLog version - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit da994bb7aa5690ad6ff2df992d981c206e4b81e9 Author: Maxim V. Dziumanenko @@ -7540,8 +12649,8 @@ Updated Ukrainian translation - po/uk.po | 5444 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 2838 insertions(+), 2606 deletions(-) + po/uk.po | 5492 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 2862 insertions(+), 2630 deletions(-) commit 497068cb3f7a0bb35cb6abe2a7c0eba5bdba5a38 Author: Adam Schreiber @@ -7549,8 +12658,8 @@ Distribute earlier ChangeLogs - Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit b48a2d7e56023fe3150a7899fc3d3610e62ce88a Author: Adam Schreiber @@ -7558,8 +12667,8 @@ Fix typo in ChangeLog generation text - Makefile.am | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) commit 897f192925404f63dd5fd60fb6b1bd6aed409a1f Author: Adam Schreiber @@ -7567,8 +12676,8 @@ Add mailto: urls - seahorse.doap | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + seahorse.doap | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 90c06070bd536085542dfa5e2b8d9ce9a2dbfa46 Author: Ivar Smolin @@ -7576,8 +12685,8 @@ Updating Estonian translation - po/et.po | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + po/et.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit b911de1b26c8dc936a8ab79b7d70faa5d952a032 Author: Adam Schreiber @@ -7589,8 +12698,8 @@ and added an importable predicate to control the visibility/sensitivity of the item. - src/seahorse-keyserver-results.c | 49 ------------------------------ - src/seahorse-viewer.c | 61 ++++++++++++++++++++++++++++++++++++++ + src/seahorse-keyserver-results.c | 49 -------------------------------- + src/seahorse-viewer.c | 61 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 49 deletions(-) commit cd5d7c337cb36b240d08f63f46e8f449a2fcbf7f @@ -7599,8 +12708,8 @@ [DOAP] Add to desktop category - seahorse.doap | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + seahorse.doap | 1 + + 1 file changed, 1 insertion(+) commit 8a71bc3e453be3e39c754ae36c76a48f3284feeb Author: Jordi Mas i Hernandez @@ -7608,8 +12717,8 @@ Minor fixes to Catalan translation - po/ca.po | 96 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 48 insertions(+), 48 deletions(-) + po/ca.po | 96 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 48 insertions(+), 48 deletions(-) commit 1b5f883bd60ea3c6bb021b7e8d954c85ad5f26b7 Author: Stef Walter @@ -7620,8 +12729,8 @@ Project description will show up at git.gnome.org, and apparently has other uses. - seahorse.doap | 30 ++++++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) + seahorse.doap | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) commit e822df87f0eec52a371108a84e72028fde7f5263 Author: Stef Walter @@ -7632,9 +12741,9 @@ Ignore gtk-doc built files, and object/library files no longer automatically ignored by our version control. - .gitignore | 11 +++++++++-- - m4/.gitignore | 1 + - reference/libcryptui/.gitignore | 14 ++++++++++++++ + .gitignore | 11 +++++++++-- + m4/.gitignore | 1 + + reference/libcryptui/.gitignore | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) commit 4aad9413deb80a7421f4325a3cf5a1a658eb83c7 diff -Nru seahorse-3.2.2/config.guess seahorse-3.6.3/config.guess --- seahorse-3.2.2/config.guess 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/config.guess 2012-10-13 13:58:51.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-02-10' # 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 @@ -17,9 +17,7 @@ # 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 @@ -56,8 +54,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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." @@ -144,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -803,15 +804,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -857,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,7 +877,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,20 +889,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -933,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -959,7 +979,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,14 +987,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1070,13 @@ exit ;; 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 i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # 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 ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1111,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /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 \ @@ -1132,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1275,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1321,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru seahorse-3.2.2/config.h.in seahorse-3.6.3/config.h.in --- seahorse-3.2.2/config.h.in 2011-11-14 11:51:41.000000000 +0100 +++ seahorse-3.6.3/config.h.in 2012-11-12 08:49:52.000000000 +0100 @@ -3,9 +3,6 @@ /* always defined to indicate that i18n is enabled */ #undef ENABLE_NLS -/* Fatal runtime messages */ -#undef FATAL_MESSAGES - /* Name of the gettext domain. */ #undef GETTEXT_PACKAGE @@ -51,12 +48,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the `setresgid' function. */ -#undef HAVE_SETRESGID - -/* Define to 1 if you have the `setresuid' function. */ -#undef HAVE_SETRESUID - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -148,6 +139,14 @@ /* With SSH Support */ #undef WITH_SSH +/* More strict checks */ +#undef WITH_STRICT + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* In debug mode */ #undef _DEBUG diff -Nru seahorse-3.2.2/config.sub seahorse-3.6.3/config.sub --- seahorse-3.2.2/config.sub 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/config.sub 2012-10-13 13:58:51.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,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 @@ -75,8 +73,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +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." @@ -123,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | 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/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -156,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -245,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -281,29 +290,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | 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 \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +332,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,21 +361,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -367,25 +405,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | 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-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +452,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +522,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +567,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,7 +782,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -771,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +897,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +985,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1082,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1212,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1312,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1293,8 +1352,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1401,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1450,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1495,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1519,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1534,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1564,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1595,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru seahorse-3.2.2/configure seahorse-3.6.3/configure --- seahorse-3.2.2/configure 2011-11-14 11:51:41.000000000 +0100 +++ seahorse-3.6.3/configure 2012-11-12 08:49:48.000000000 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for seahorse 3.2.2. +# Generated by GNU Autoconf 2.69 for seahorse 3.6.3. # +# Report bugs to . # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # 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. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || 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'\" && @@ -220,21 +246,25 @@ 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. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # 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. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -244,10 +274,12 @@ $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 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." + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." fi exit 1 fi @@ -336,6 +368,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -457,6 +497,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # 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). @@ -491,16 +535,16 @@ # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -512,28 +556,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -567,12 +591,11 @@ # Identity of this package. PACKAGE_NAME='seahorse' PACKAGE_TARNAME='seahorse' -PACKAGE_VERSION='3.2.2' -PACKAGE_STRING='seahorse 3.2.2' -PACKAGE_BUGREPORT='' +PACKAGE_VERSION='3.6.3' +PACKAGE_STRING='seahorse 3.6.3' +PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse' PACKAGE_URL='' -ac_unique_file="src/seahorse-main.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -613,27 +636,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -EGG_SMCLIENT_LIBS -EGG_SMCLIENT_CFLAGS -EGG_LIBS -EGG_CFLAGS -MKINSTALLDIRS -POSUB -POFILES -PO_IN_DATADIR_FALSE -PO_IN_DATADIR_TRUE -INTLLIBS -INSTOBJEXT -GMOFILES -CATOBJEXT -CATALOGS -MSGFMT_OPTS -GETTEXT_PACKAGE -UPDATE_MIME_DATABASE_FALSE -UPDATE_MIME_DATABASE_TRUE -GLIB_GENMARSHAL -WITH_TESTS_FALSE -WITH_TESTS_TRUE WITH_SSH_FALSE WITH_SSH_TRUE SSH_PATH @@ -642,14 +644,12 @@ WITH_PKCS11_TRUE GCK_LIBS GCK_CFLAGS -GCR_LIBS -GCR_CFLAGS WITH_SHARING_FALSE WITH_SHARING_TRUE SHARING_LIBS SHARING_CFLAGS -GNOME_KEYRING_LIBS -GNOME_KEYRING_CFLAGS +LIBSECRET_LIBS +LIBSECRET_CFLAGS WITH_KEYSERVER_FALSE WITH_KEYSERVER_TRUE WITH_HKP_FALSE @@ -663,29 +663,42 @@ WITH_PGP_TRUE GPGME_CONFIG GNUPG -PLUGIN_LIBTOOL_FLAGS -OS_WIN32_FALSE -OS_WIN32_TRUE -PLATFORM_WIN32_FALSE -PLATFORM_WIN32_TRUE +EGG_SMCLIENT_LIBS +EGG_SMCLIENT_CFLAGS +EGG_LIBS +EGG_CFLAGS +GLIB_GENMARSHAL +MKINSTALLDIRS +POSUB +POFILES +PO_IN_DATADIR_FALSE +PO_IN_DATADIR_TRUE +INTLLIBS +INSTOBJEXT +GMOFILES +CATOBJEXT +CATALOGS +MSGFMT_OPTS GSETTINGS_RULES GLIB_COMPILE_SCHEMAS gsettingsschemadir GSETTINGS_DISABLE_SCHEMAS_COMPILE +YELP_HELP_RULES +XMLLINT +ITSTOOL +HELP_DIR SEAHORSE_LIBS SEAHORSE_CFLAGS GTK_LIBS GTK_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_LIBDIR PKG_CONFIG_PATH +PLUGIN_LIBTOOL_FLAGS +OS_WIN32_FALSE +OS_WIN32_TRUE +PLATFORM_WIN32_FALSE +PLATFORM_WIN32_TRUE +GETTEXT_PACKAGE PKG_CONFIG CXXCPP CPP @@ -744,6 +757,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -757,6 +776,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -775,6 +795,8 @@ MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -851,11 +873,8 @@ with_sysroot enable_libtool_lock with_help_dir -with_omf_dir -with_help_formats -enable_scrollkeeper -enable_largefile enable_schemas_compile +enable_largefile enable_pgp enable_gpg_check enable_ldap @@ -864,9 +883,7 @@ enable_pkcs11 enable_ssh enable_debug -enable_fatal_messages -enable_tests -enable_update_mime_database +enable_strict ' ac_precious_vars='build_alias host_alias @@ -888,20 +905,20 @@ GTK_LIBS SEAHORSE_CFLAGS SEAHORSE_LIBS +ITSTOOL +XMLLINT +EGG_CFLAGS +EGG_LIBS +EGG_SMCLIENT_CFLAGS +EGG_SMCLIENT_LIBS SOUP_CFLAGS SOUP_LIBS -GNOME_KEYRING_CFLAGS -GNOME_KEYRING_LIBS +LIBSECRET_CFLAGS +LIBSECRET_LIBS SHARING_CFLAGS SHARING_LIBS -GCR_CFLAGS -GCR_LIBS GCK_CFLAGS -GCK_LIBS -EGG_CFLAGS -EGG_LIBS -EGG_SMCLIENT_CFLAGS -EGG_SMCLIENT_LIBS' +GCK_LIBS' # Initialize some variables set by options. @@ -1357,8 +1374,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $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 fi @@ -1444,7 +1459,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 seahorse 3.2.2 to adapt to many kinds of systems. +\`configure' configures seahorse 3.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1514,7 +1529,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of seahorse 3.2.2:";; + short | recursive ) echo "Configuration of seahorse 3.6.3:";; esac cat <<\_ACEOF @@ -1522,22 +1537,24 @@ --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-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-maintainer-mode disable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --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) - --disable-scrollkeeper do not make updates to the scrollkeeper database - --disable-largefile omit support for large files --disable-schemas-compile Disable regeneration of gschemas.compiled on install + --disable-largefile omit support for large files --enable-pgp enable PGP support (default is auto) --disable-gpg-check check GPG version (default is yes) --disable-ldap disable LDAP keyserver interface @@ -1545,27 +1562,21 @@ --disable-sharing Don't compile in DNS-SD key sharing --disable-pkcs11 Support keys and certificates via PKCS#11 --disable-ssh Support for managing SSH keys - --enable-debug=no/yes/full + --enable-debug=no/default/yes Turn on or off debugging - --enable-fatal-messages Don't make compile and or runtime messages fatal in - debug mode. - --enable-tests Compile Test Programs - --disable-update-mime-database - do not run the update-mime-database utility (mostly - useful for package maintainers) + + --enable-strict Strict code compilation + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-help-dir=DIR path to help docs - --with-omf-dir=DIR path to OMF files - --with-help-formats=FORMATS - list of formats + --with-help-dir=DIR path where help files are installed Some influential environment variables: CC C compiler command @@ -1590,31 +1601,31 @@ C compiler flags for SEAHORSE, overriding pkg-config SEAHORSE_LIBS linker flags for SEAHORSE, overriding pkg-config + ITSTOOL Path to the `itstool` command + XMLLINT Path to the `xmllint` command + EGG_CFLAGS C compiler flags for EGG, overriding pkg-config + EGG_LIBS linker flags for EGG, overriding pkg-config + EGG_SMCLIENT_CFLAGS + C compiler flags for EGG_SMCLIENT, overriding pkg-config + EGG_SMCLIENT_LIBS + linker flags for EGG_SMCLIENT, overriding pkg-config SOUP_CFLAGS C compiler flags for SOUP, overriding pkg-config SOUP_LIBS linker flags for SOUP, overriding pkg-config - GNOME_KEYRING_CFLAGS - C compiler flags for GNOME_KEYRING, overriding pkg-config - GNOME_KEYRING_LIBS - linker flags for GNOME_KEYRING, overriding pkg-config + LIBSECRET_CFLAGS + C compiler flags for LIBSECRET, overriding pkg-config + LIBSECRET_LIBS + linker flags for LIBSECRET, overriding pkg-config SHARING_CFLAGS C compiler flags for SHARING, overriding pkg-config SHARING_LIBS linker flags for SHARING, overriding pkg-config - GCR_CFLAGS C compiler flags for GCR, overriding pkg-config - GCR_LIBS linker flags for GCR, overriding pkg-config GCK_CFLAGS C compiler flags for GCK, overriding pkg-config GCK_LIBS linker flags for GCK, overriding pkg-config - EGG_CFLAGS C compiler flags for EGG, overriding pkg-config - EGG_LIBS linker flags for EGG, overriding pkg-config - EGG_SMCLIENT_CFLAGS - C compiler flags for EGG_SMCLIENT, overriding pkg-config - EGG_SMCLIENT_LIBS - linker flags for EGG_SMCLIENT, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. +Report bugs to . _ACEOF ac_status=$? fi @@ -1677,10 +1688,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -seahorse configure 3.2.2 -generated by GNU Autoconf 2.68 +seahorse configure 3.6.3 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1794,7 +1805,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2054,7 +2065,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2073,60 +2084,6 @@ } # ac_fn_cxx_try_link -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - 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 eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -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 -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_type - # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -2197,6 +2154,10 @@ $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;} +( $as_echo "## ----------------------------------------------------------------------- ## +## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse ## +## ----------------------------------------------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -2213,12 +2174,66 @@ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + 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 eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +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 +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_type 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 seahorse $as_me 3.2.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by seahorse $as_me 3.6.3, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2566,11 +2581,18 @@ -GCR_REQUIRED=3.1.5 - +GCK_REQUIRED=3.3.4 +GCR_REQUIRED=3.3.4 +GTK_REQUIRED=3.4.0 +GNUPG_ACCEPTED="1.2 1.4 2.0" +GPGME_REQUIRED=1.0.0 +LIBSECRET_REQUIRED=0.5 +AVAHI_GLIB_REQUIRED=0.6 +# ----------------------------------------------------------------------------- +# Basic tools -am__api_version='1.11' +am__api_version='1.12' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2638,7 +2660,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2696,9 +2718,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=' @@ -2709,32 +2728,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # 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". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # 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". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2746,6 +2773,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2772,8 +2809,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $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;} + { $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 @@ -2785,10 +2822,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# 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. +# 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. @@ -2807,7 +2844,7 @@ 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 + if as_fn_executable_p "$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 @@ -2847,7 +2884,7 @@ 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 + if as_fn_executable_p "$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 @@ -2898,7 +2935,7 @@ test -z "$as_dir" && as_dir=. 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 + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2927,12 +2964,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 - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2951,7 +2982,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3036,8 +3067,8 @@ # Define the identity of the package. - PACKAGE=seahorse - VERSION=3.2.2 + PACKAGE='seahorse' + VERSION='3.6.3' cat >>confdefs.h <<_ACEOF @@ -3065,43 +3096,224 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of '-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -AMTAR=${AMTAR-"${am_missing_run}tar"} + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi +done +rm -rf conftest.dir +if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } -ac_config_headers="$ac_config_headers config.h" -# 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;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# 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 -AM_BACKSLASH='\' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=yes -fi +# 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 ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + # If neither matched, then we have a broken ls. This can happen + # 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". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +ac_config_headers="$ac_config_headers config.h" + +# 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_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + + +{ $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 : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=yes +fi + + { $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= @@ -3138,7 +3350,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3178,7 +3390,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3231,7 +3443,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3272,7 +3484,7 @@ 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 + if as_fn_executable_p "$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 @@ -3330,7 +3542,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3374,7 +3586,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3820,8 +4032,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3924,7 +4135,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# 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 @@ -3957,6 +4168,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3979,8 +4191,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4014,16 +4227,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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 + # 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 @@ -4032,16 +4245,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | 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} @@ -4123,7 +4336,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4167,7 +4380,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4363,8 +4576,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4398,16 +4612,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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 + # 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 @@ -4416,16 +4630,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | 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} @@ -4504,14 +4718,12 @@ ;; esac +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; }'` if test -n "0.35.0"; then { $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; }'` - { $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" || @@ -4536,7 +4748,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4576,7 +4788,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4616,7 +4828,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4642,25 +4854,48 @@ 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 $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.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_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.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 $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.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 $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.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_UI_RULE='%.ui: %.ui.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 $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.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 $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.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 $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.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_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.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_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 $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -4777,7 +5012,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4817,7 +5052,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4857,7 +5092,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4897,7 +5132,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4948,7 +5183,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4979,7 +5214,7 @@ 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\"`" + 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 @@ -5046,8 +5281,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5225,7 +5460,7 @@ 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 + as_fn_executable_p "$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 @@ -5301,7 +5536,7 @@ 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 + as_fn_executable_p "$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 @@ -5367,7 +5602,7 @@ 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 + as_fn_executable_p "$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 @@ -5434,7 +5669,7 @@ 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 + as_fn_executable_p "$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 @@ -5690,7 +5925,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5734,7 +5969,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5892,6 +6127,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5931,7 +6171,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6153,7 +6393,7 @@ 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 + if as_fn_executable_p "$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 @@ -6193,7 +6433,7 @@ 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 + if as_fn_executable_p "$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 @@ -6360,7 +6600,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6499,7 +6739,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6539,7 +6779,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6642,7 +6882,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6686,7 +6926,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6811,7 +7051,7 @@ 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 + if as_fn_executable_p "$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 @@ -6851,7 +7091,7 @@ 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 + if as_fn_executable_p "$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 @@ -6910,7 +7150,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6950,7 +7190,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7000,13 +7240,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -7153,6 +7393,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7541,7 +7782,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7552,7 +7793,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7585,7 +7839,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7625,7 +7879,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7705,7 +7959,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7745,7 +7999,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7797,7 +8051,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7837,7 +8091,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7889,7 +8143,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7929,7 +8183,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7981,7 +8235,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8021,7 +8275,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8073,7 +8327,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8113,7 +8367,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8192,7 +8446,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8203,6 +8463,7 @@ fi { $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 ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -8235,6 +8496,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -8256,7 +8518,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8672,7 +8936,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8750,6 +9029,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -9209,7 +9492,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -9300,18 +9585,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9673,7 +9973,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9923,8 +10222,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -10303,6 +10601,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -10348,6 +10647,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -10376,10 +10676,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10392,7 +10688,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10431,7 +10727,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -11055,11 +11350,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -11149,7 +11439,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -11158,7 +11448,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -11223,7 +11513,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11362,7 +11652,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11370,10 +11660,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11381,7 +11667,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11399,7 +11685,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11419,17 +11705,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -11490,7 +11777,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11506,7 +11793,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11543,9 +11830,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11631,7 +11918,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11700,7 +11987,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11725,7 +12012,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11749,7 +12036,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11780,7 +12067,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11790,7 +12077,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12715,7 +13002,6 @@ hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -13299,6 +13585,7 @@ hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec_CXX='' fi @@ -13343,7 +13630,7 @@ esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -14019,6 +14306,7 @@ case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -14808,7 +15096,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' @@ -14961,8 +15251,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -14988,7 +15276,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -14997,7 +15285,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -15062,7 +15350,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -15199,7 +15487,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -15207,10 +15495,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15218,7 +15502,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -15236,7 +15520,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -15256,17 +15540,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -15327,7 +15612,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -15343,7 +15628,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -15380,9 +15665,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15468,7 +15753,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15537,7 +15822,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15562,7 +15847,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15586,7 +15871,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15617,7 +15902,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15627,7 +15912,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -15766,6 +16051,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -15774,6 +16061,109 @@ # Only expand once: +# Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $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 + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +GETTEXT_PACKAGE=seahorse + + +cat >>confdefs.h <<_ACEOF +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +_ACEOF + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for some Win32 platform" >&5 +$as_echo_n "checking for some Win32 platform... " >&6; } +case "$host" in + *-*-cygwin*|*-*-mingw*) + platform_win32=yes + ;; + *) + platform_win32=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_win32" >&5 +$as_echo "$platform_win32" >&6; } + if test "$platform_win32" = "yes"; then + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' +else + PLATFORM_WIN32_TRUE='#' + PLATFORM_WIN32_FALSE= +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5 +$as_echo_n "checking for native Win32... " >&6; } +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_win32" >&5 +$as_echo "$os_win32" >&6; } + if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' +else + OS_WIN32_TRUE='#' + OS_WIN32_FALSE= +fi + + +if test "$platform_win32" = "yes" ; then + PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined" +else + PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" +fi + + +# ----------------------------------------------------------------------------- +# Basic Dependencies + + @@ -15800,7 +16190,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15843,7 +16233,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15894,399 +16284,486 @@ fi fi -gdu_cv_version_required=0.3.2 +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 +$as_echo_n "checking for GTK... " >&6; } -{ $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" && \ - { { $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 +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - gdu_cv_have_gdu=yes + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - gdu_cv_have_gdu=no + pkg_failed=yes fi - -if test "$gdu_cv_have_gdu" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : + else + pkg_failed=untried +fi +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - { $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 + pkg_failed=yes +fi + else + pkg_failed=untried fi -# Check whether --with-help-dir was given. -if test "${with_help_dir+set}" = set; then : - withval=$with_help_dir; +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - with_help_dir='${datadir}/gnome/help' + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` + else + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 -HELP_DIR="$with_help_dir" + as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED) were not met: + +$GTK_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 GTK_CFLAGS +and GTK_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}: result: no" >&5 +$as_echo "no" >&6; } + { { $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 GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -# Check whether --with-omf-dir was given. -if test "${with_omf_dir+set}" = set; then : - withval=$with_omf_dir; +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - with_omf_dir='${datadir}/omf' + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi -OMF_DIR="$with_omf_dir" -# Check whether --with-help-formats was given. -if test "${with_help_formats+set}" = set; then : - withval=$with_help_formats; +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SEAHORSE" >&5 +$as_echo_n "checking for SEAHORSE... " >&6; } + +if test -n "$SEAHORSE_CFLAGS"; then + pkg_cv_SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= \$GTK_REQUIRED gcr-3 >= \$GCR_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SEAHORSE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SEAHORSE_LIBS"; then + pkg_cv_SEAHORSE_LIBS="$SEAHORSE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= \$GTK_REQUIRED gcr-3 >= \$GCR_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SEAHORSE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - with_help_formats='' + pkg_failed=yes +fi + else + pkg_failed=untried fi -DOC_USER_FORMATS="$with_help_formats" -# Check whether --enable-scrollkeeper was given. -if test "${enable_scrollkeeper+set}" = set; then : - enableval=$enable_scrollkeeper; -else - enable_scrollkeeper=yes -fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then - ENABLE_SK_TRUE= - ENABLE_SK_FALSE='#' +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ENABLE_SK_TRUE='#' - ENABLE_SK_FALSE= + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED" 2>&1` + else + SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SEAHORSE_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED) were not met: + +$SEAHORSE_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +Alternatively, you may set the environment variables SEAHORSE_CFLAGS +and SEAHORSE_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}: result: no" >&5 +$as_echo "no" >&6; } + { { $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 SEAHORSE_CFLAGS +and SEAHORSE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - if test "$gdu_cv_have_gdu" = "yes"; then - HAVE_GNOME_DOC_UTILS_TRUE= - HAVE_GNOME_DOC_UTILS_FALSE='#' +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - HAVE_GNOME_DOC_UTILS_TRUE='#' - HAVE_GNOME_DOC_UTILS_FALSE= + SEAHORSE_CFLAGS=$pkg_cv_SEAHORSE_CFLAGS + SEAHORSE_LIBS=$pkg_cv_SEAHORSE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi +SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE" +# User documentation -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; + + + +# Check whether --with-help-dir was given. +if test "${with_help_dir+set}" = set; then : + withval=$with_help_dir; +else + with_help_dir='${datadir}/help' fi -if test "$enable_largefile" != no; then +HELP_DIR="$with_help_dir" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : + + +# Extract the first word of "itstool", so it can be a program name with args. +set dummy itstool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ITSTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ + if test -n "$ITSTOOL"; then + ac_cv_prog_ITSTOOL="$ITSTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ITSTOOL="itstool" + $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 - ; - return 0; -} -_ACEOF - if ac_fn_c_try_compile "$LINENO"; then : - break fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi +ITSTOOL=$ac_cv_prog_ITSTOOL +if test -n "$ITSTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5 +$as_echo "$ITSTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : + +if test x"$ITSTOOL" = x; then + as_fn_error $? "itstool not found" "$LINENO" 5 +fi + + +# Extract the first word of "xmllint", so it can be a program name with args. +set dummy xmllint; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_XMLLINT+:} false; then : $as_echo_n "(cached) " >&6 else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ + if test -n "$XMLLINT"; then + ac_cv_prog_XMLLINT="$XMLLINT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_XMLLINT="xmllint" + $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 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done +XMLLINT=$ac_cv_prog_XMLLINT +if test -n "$XMLLINT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5 +$as_echo "$XMLLINT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF -;; -esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF -;; -esac -rm -rf conftest* - fi +if test x"$XMLLINT" = x; then + as_fn_error $? "xmllint not found" "$LINENO" 5 fi -ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = xyes; then : +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= + +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir $@); + +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) + +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES) + +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x$(_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done -else +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(AM_V_at)if test ! -f "$@" -a -f "$(srcdir)/$@"; then cp "$(srcdir)/$@" "$@"; fi + $(AM_V_GEN)if ! test -f "$@"; then \ + (cd "$(dir $@)" && \ + $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir $@).tmp" "$(notdir $@)"); \ + else \ + (cd "$(dir $@)" && \ + $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir $@)" "$(notdir $@)" "$(notdir $@).tmp" && \ + rm "$(notdir $@).tmp"); \ + fi -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(AM_V_GEN)msgfmt -o "$@" "$<" + +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir $@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "$@" + +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) + +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) + +distdir: distdir-help-files +distdir-help-files: + @for lc in C $(HELP_LINGUAS); do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ + +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if ${ac_cv_sys_largefile_source+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=no; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_sys_largefile_source=1; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF -;; -esac -rm -rf conftest* +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + done; \ + done + +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h -fi -for ac_func in setresuid setresgid -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + # Check whether --enable-schemas-compile was given. +if test "${enable_schemas_compile+set}" = set; then : + enableval=$enable_schemas_compile; case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; + esac fi -done -for ac_func in strsep -do : - ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" -if test "x$ac_cv_func_strsep" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRSEP 1 -_ACEOF -fi -done -# Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + 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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PKG_CONFIG+:} false; then : @@ -16303,7 +16780,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16312,7 +16789,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -16326,284 +16802,35 @@ fi - -GTK_REQUIRED=2.90.0 - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 -$as_echo_n "checking for GTK... " >&6; } - -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` +if test -z "$ac_cv_path_PKG_CONFIG"; then + 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -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 - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` - else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTK_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED) were not met: - -$GTK_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 GTK_CFLAGS -and GTK_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}: result: no" >&5 -$as_echo "no" >&6; } - { { $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 GTK_CFLAGS -and GTK_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 - GTK_CFLAGS=$pkg_cv_GTK_CFLAGS - GTK_LIBS=$pkg_cv_GTK_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 SEAHORSE" >&5 -$as_echo_n "checking for SEAHORSE... " >&6; } - -if test -n "$SEAHORSE_CFLAGS"; then - pkg_cv_SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SEAHORSE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SEAHORSE_LIBS"; then - pkg_cv_SEAHORSE_LIBS="$SEAHORSE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SEAHORSE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -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 - SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED" 2>&1` - else - SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SEAHORSE_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED) were not met: - -$SEAHORSE_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 SEAHORSE_CFLAGS -and SEAHORSE_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}: result: no" >&5 -$as_echo "no" >&6; } - { { $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 SEAHORSE_CFLAGS -and SEAHORSE_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 - SEAHORSE_CFLAGS=$pkg_cv_SEAHORSE_CFLAGS - SEAHORSE_LIBS=$pkg_cv_SEAHORSE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - - # Check whether --enable-schemas-compile was given. -if test "${enable_schemas_compile+set}" = set; then : - enableval=$enable_schemas_compile; case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; - esac -fi - - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $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 - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $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 + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $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 ;; esac @@ -16669,7 +16896,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16747,317 +16974,195 @@ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for some Win32 platform" >&5 -$as_echo_n "checking for some Win32 platform... " >&6; } -case "$host" in - *-*-cygwin*|*-*-mingw*) - platform_win32=yes - ;; - *) - platform_win32=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_win32" >&5 -$as_echo "$platform_win32" >&6; } - if test "$platform_win32" = "yes"; then - PLATFORM_WIN32_TRUE= - PLATFORM_WIN32_FALSE='#' -else - PLATFORM_WIN32_TRUE='#' - PLATFORM_WIN32_FALSE= + 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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LOCALE_H 1 +_ACEOF + fi +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5 -$as_echo_n "checking for native Win32... " >&6; } -case "$host" in - *-*-mingw*) - os_win32=yes - ;; - *) - os_win32=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_win32" >&5 -$as_echo "$os_win32" >&6; } - if test "$os_win32" = "yes"; then - OS_WIN32_TRUE= - OS_WIN32_FALSE='#' + if test $ac_cv_header_locale_h = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if ${am_cv_val_LC_MESSAGES+:} false; then : + $as_echo_n "(cached) " >&6 else - OS_WIN32_TRUE='#' - OS_WIN32_FALSE= -fi - - -if test "$platform_win32" = "yes" ; then - PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return LC_MESSAGES + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes else - PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" + am_cv_val_LC_MESSAGES=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $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 +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - -# Check whether --enable-pgp was given. -if test "${enable_pgp+set}" = set; then : - enableval=$enable_pgp; -fi + fi + fi + USE_NLS=yes -have_gpg="" -have_gpgme="" + gt_cv_have_gettext=no -if test "$enable_pgp" = "no"; then - echo "disabling PGP support" -else - # Check whether --enable-gpg-check was given. -if test "${enable_gpg_check+set}" = set; then : - enableval=$enable_gpg_check; DO_CHECK=$enableval -else - DO_CHECK=yes -fi + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= + 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" = xyes; then : + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" - if test "$DO_CHECK" = "yes"; then - accepted_versions="1.2 1.4 2.0" - for ac_prog in gpg gpg2 -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GNUPG+:} false; then : + # + # First check in libc + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 +$as_echo_n "checking for ngettext in libc... " >&6; } +if ${gt_cv_func_ngettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else - case $GNUPG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GNUPG="$GNUPG" # Let the user override the test with a path. - ;; - *) - 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_path_GNUPG="$as_dir/$ac_word$ac_exec_ext" - $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 - - ;; -esac -fi -GNUPG=$ac_cv_path_GNUPG -if test -n "$GNUPG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUPG" >&5 -$as_echo "$GNUPG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$GNUPG" && break -done -test -n "$GNUPG" || GNUPG="no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -cat >>confdefs.h <<_ACEOF -#define GNUPG "$GNUPG" +int +main () +{ +return !ngettext ("","", 1) + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_ngettext_libc=yes +else + gt_cv_func_ngettext_libc=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext - ok="no" - if test "$GNUPG" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for appropriate GnuPG version" >&5 -$as_echo_n "checking for appropriate GnuPG version... " >&6; } - gnupg_version=`$GNUPG --version | grep gpg` - major=`echo $gnupg_version | \ - sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` - minor=`echo $gnupg_version | \ - sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` - micro=`echo $gnupg_version | \ - sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` - - for ver in $accepted_versions; do - if test "$ver" = "$major.$minor"; then +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 +$as_echo "$gt_cv_func_ngettext_libc" >&6; } -cat >>confdefs.h <<_ACEOF -#define GPG_MAJOR $major -_ACEOF + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 +$as_echo_n "checking for dgettext in libc... " >&6; } +if ${gt_cv_func_dgettext_libc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -cat >>confdefs.h <<_ACEOF -#define GPG_MINOR $minor +int +main () +{ +return !dgettext ("","") + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes +else + gt_cv_func_dgettext_libc=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi -cat >>confdefs.h <<_ACEOF -#define GPG_MICRO $micro + 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" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF - ok="yes" - break - fi - done - fi +fi +done - if test "$ok" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_gpg="$gnupg_version" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - fi + fi + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - ok="no" - min_gpgme_version=1.0.0 - # Extract the first word of "gpgme-config", so it can be a program name with args. -set dummy gpgme-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GPGME_CONFIG+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +if ${ac_cv_lib_intl_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else - case $GPGME_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. - ;; - *) - 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_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $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 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG=""failed"" - ;; -esac -fi -GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG -if test -n "$GPGME_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5 -$as_echo "$GPGME_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test $GPGME_CONFIG != "failed" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME - version >= $min_gpgme_version" >&5 -$as_echo_n "checking for GPGME - version >= $min_gpgme_version... " >&6; } - req_major=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - gpgme_config_version=`$GPGME_CONFIG --version` - major=`echo $gpgme_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` - minor=`echo $gpgme_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` - micro=`echo $gpgme_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` - - if test "$major" -eq "$req_major"; then - if test "$minor" -ge "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok="yes" - fi - fi - fi - fi - - if test $ok = "yes"; then - GPGME_CFLAGS=`$GPGME_CONFIG --cflags` - GPGME_LIBS=`$GPGME_CONFIG --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_gpgme="$gpgme_config_version" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi -fi - -if test "$enable_pgp" != "no" -a -n "$have_gpg" -a -n "$have_gpgme"; then - enable_pgp="yes" -fi - -if test "$enable_pgp" = "yes"; then - if test -z "$have_gpg"; then - as_fn_error $? "Appropriate version of GnuPG not found. Please install one of versions: $accepted_versions" "$LINENO" 5 - fi - - if test -z "$have_gpgme"; then - as_fn_error $? "GPGME $min_gpgme_version or later needed" "$LINENO" 5 - fi - - SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GPGME_CFLAGS" - SEAHORSE_LIBS="$SEAHORSE_LIBS $GPGME_LIBS" - -$as_echo "#define WITH_PGP 1" >>confdefs.h - -fi - - if test "$enable_pgp" = "yes"; then - WITH_PGP_TRUE= - WITH_PGP_FALSE='#' -else - WITH_PGP_TRUE='#' - WITH_PGP_FALSE= -fi - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDAP keyserver support" >&5 -$as_echo_n "checking LDAP keyserver support... " >&6; } -# Check whether --enable-ldap was given. -if test "${enable_ldap+set}" = set; then : - enableval=$enable_ldap; try_ldap=$enableval +/* 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 bindtextdomain (); +int +main () +{ +return bindtextdomain (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_bindtextdomain=yes else - try_ldap=yes + ac_cv_lib_intl_bindtextdomain=no fi - - -if test "$enable_pgp" != "yes"; then - echo "LDAP keyserver interface requires PGP support" - try_ldap=no +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try_ldap" >&5 -$as_echo "$try_ldap" >&6; } -with_ldap=no - - -ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : +{ $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" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" +LIBS="-lintl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17067,43 +17172,34 @@ #ifdef __cplusplus extern "C" #endif -char gethostbyname (); +char ngettext (); int main () { -return gethostbyname (); +return ngettext (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_nsl_gethostbyname=yes + ac_cv_lib_intl_ngettext=yes else - ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_intl_ngettext=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : - NETLIBS="-lnsl $NETLIBS" -fi - -fi - -ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt" -if test "x$ac_cv_func_setsockopt" = xyes; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5 -$as_echo_n "checking for setsockopt in -lsocket... " >&6; } -if ${ac_cv_lib_socket_setsockopt+:} false; then : +{ $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" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +$as_echo_n "checking for dgettext in -lintl... " >&6; } +if ${ac_cv_lib_intl_dgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" +LIBS="-lintl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17113,294 +17209,552 @@ #ifdef __cplusplus extern "C" #endif -char setsockopt (); +char dgettext (); int main () { -return setsockopt (); +return dgettext (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_socket_setsockopt=yes + ac_cv_lib_intl_dgettext=yes else - ac_cv_lib_socket_setsockopt=no + ac_cv_lib_intl_dgettext=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5 -$as_echo "$ac_cv_lib_socket_setsockopt" >&6; } -if test "x$ac_cv_lib_socket_setsockopt" = xyes; then : - NETLIBS="-lsocket $NETLIBS" +{ $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" = xyes; then : + gt_cv_func_dgettext_libintl=yes fi fi +fi -if test "$try_ldap" = yes ; then - for MY_LDAPLIBS in ${LDAP_LIBS+"$LDAP_LIBS"} "-lldap -llber" "-lldap" "-lldap -llber -lresolv"; do - _ldap_save_libs=$LIBS - LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether LDAP via \"$MY_LDAPLIBS\" is present and sane" >&5 -$as_echo_n "checking whether LDAP via \"$MY_LDAPLIBS\" is present and sane... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + { $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 ${ac_cv_lib_intl_ngettext+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl -liconv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* 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 ngettext (); int main () { -ldap_open("foobar",1234); ber_free(NULL, 0); +return ngettext (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - cv_func_ldap_init=yes + ac_cv_lib_intl_ngettext=yes else - cv_func_ldap_init=no + ac_cv_lib_intl_ngettext=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cv_func_ldap_init" >&5 -$as_echo "$cv_func_ldap_init" >&6; } - - if test $cv_func_ldap_init = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether I can make LDAP be sane with lber.h" >&5 -$as_echo_n "checking whether I can make LDAP be sane with lber.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $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" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 +$as_echo_n "checking for dcgettext in -lintl... " >&6; } +if ${ac_cv_lib_intl_dcgettext+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl -liconv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include + +/* 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 dcgettext (); int main () { -ldap_open("foobar",1234); +return dcgettext (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - cv_func_ldaplber_init=yes + ac_cv_lib_intl_dcgettext=yes else - cv_func_ldaplber_init=no + ac_cv_lib_intl_dcgettext=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cv_func_ldaplber_init" >&5 -$as_echo "$cv_func_ldaplber_init" >&6; } - fi - - if test "$cv_func_ldaplber_init" = yes ; then +LIBS=$ac_check_lib_save_LIBS +fi +{ $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" = xyes; then : + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv +else + : +fi -$as_echo "#define NEED_LBER_H 1" >>confdefs.h - - fi - - if test "$cv_func_ldap_init" = yes || \ - test "$cv_func_ldaplber_init" = yes ; then - LDAP_LIBS=$MY_LDAPLIBS - fi - - LIBS=$_ldap_save_libs - - if test "$LDAP_LIBS" != ""; then - with_keyserver=yes - with_ldap=yes - -$as_echo "#define WITH_LDAP 1" >>confdefs.h - - break - fi - done -fi - - if test "$with_ldap" = "yes"; then - WITH_LDAP_TRUE= - WITH_LDAP_FALSE='#' else - WITH_LDAP_TRUE='#' - WITH_LDAP_FALSE= + : fi -SEAHORSE_LIBS="$SEAHORSE_LIBS $LDAP_LIBS" - - - + fi + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + 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 : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +_ACEOF -# Allow hkp to be disabled -# Check whether --enable-hkp was given. -if test "${enable_hkp+set}" = set; then : - enableval=$enable_hkp; fi +done + LIBS="$glib_save_LIBS" -# HKP tests -if test "$enable_pgp" != "yes"; then - echo "HKP keyserver interface requires PGP support" - enable_hkp=no -fi + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -if test "$enable_hkp" = "no"; then - echo "disabling HKP keyserver interface" -else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi - echo "checking for supported versions of libsoup..." + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + if test "$gt_cv_have_gettext" = "yes"; then -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUP" >&5 -$as_echo_n "checking for SOUP... " >&6; } +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h -if test -n "$SOUP_CFLAGS"; then - pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null` + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes -fi - else - pkg_failed=untried + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" + ;; +esac fi -if test -n "$SOUP_LIBS"; then - pkg_cv_SOUP_LIBS="$SOUP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null` +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - pkg_failed=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - else - pkg_failed=untried + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DCGETTEXT 1 +_ACEOF + fi +done + MSGFMT_OPTS= + { $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 "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +_ACEOF +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=$? + $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; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no +echo "$as_me: failed input was:" >&5 +sed 's/^/| /' conftest.foo >&5 fi - if test $_pkg_short_errors_supported = yes; then - SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4" 2>&1` - else - SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SOUP_PKG_ERRORS" >&5 - enable_hkp=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_hkp=no + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 else - SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS - SOUP_LIBS=$pkg_cv_SOUP_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - enable_hkp=yes -fi - - if test "$enable_hkp" = yes; then - with_keyserver=yes - - -$as_echo "#define WITH_HKP 1" >>confdefs.h - - SEAHORSE_LIBS="$SEAHORSE_LIBS $SOUP_LIBS" - SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $SOUP_CFLAGS" - - # libsoup is also used for async lookups - -$as_echo "#define WITH_SOUP 1" >>confdefs.h + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $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 + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi - - if test "$enable_hkp" = "yes"; then - WITH_HKP_TRUE= - WITH_HKP_FALSE='#' +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - WITH_HKP_TRUE='#' - WITH_HKP_FALSE= + { $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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XGETTEXT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - if test "$with_keyserver" = "yes"; then - WITH_KEYSERVER_TRUE= - WITH_KEYSERVER_FALSE='#' +int +main () +{ +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + CATOBJEXT=.gmo + DATADIRNAME=share else - WITH_KEYSERVER_TRUE='#' - WITH_KEYSERVER_FALSE= + case $host in + *-*-solaris*) + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : + CATOBJEXT=.gmo + DATADIRNAME=share +else + CATOBJEXT=.mo + DATADIRNAME=lib +fi + + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + fi -if test "$with_keyserver" = "yes"; then - echo "enabling key server support" -$as_echo "#define WITH_KEYSERVER 1" >>confdefs.h + if test "$gt_cv_have_gettext" = "yes" ; then + +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + fi + + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + { $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 + + # We need to process the po/ directory. + POSUB=po + + ac_config_commands="$ac_config_commands default-1" + + + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + + + + + + + + + + + + + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + { $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 + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } + fi + + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + +# Extract the first word of "glib-genmarshal", so it can be a program name with args. +set dummy glib-genmarshal; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_GENMARSHAL in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" + $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 + ;; +esac +fi +GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL +if test -n "$GLIB_GENMARSHAL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 +$as_echo "$GLIB_GENMARSHAL" >&6; } else - with_keyserver=no - echo "disabling key server support" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_KEYRING" >&5 -$as_echo_n "checking for GNOME_KEYRING... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG" >&5 +$as_echo_n "checking for EGG... " >&6; } -if test -n "$GNOME_KEYRING_CFLAGS"; then - pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS" +if test -n "$EGG_CFLAGS"; then + pkg_cv_EGG_CFLAGS="$EGG_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= 2.25.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= 2.25.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_KEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1 >= 2.25.5" 2>/dev/null` + pkg_cv_EGG_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$GNOME_KEYRING_LIBS"; then - pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS" +if test -n "$EGG_LIBS"; then + pkg_cv_EGG_LIBS="$EGG_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= 2.25.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= 2.25.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_KEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1 >= 2.25.5" 2>/dev/null` + pkg_cv_EGG_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17420,89 +17774,81 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-keyring-1 >= 2.25.5" 2>&1` + EGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` else - GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-keyring-1 >= 2.25.5" 2>&1` + EGG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GNOME_KEYRING_PKG_ERRORS" >&5 - - enable_gnome_keyring=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_gnome_keyring=no -else - GNOME_KEYRING_CFLAGS=$pkg_cv_GNOME_KEYRING_CFLAGS - GNOME_KEYRING_LIBS=$pkg_cv_GNOME_KEYRING_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - enable_gnome_keyring=yes -fi - -if test "$enable_gnome_keyring" = "no"; then - as_fn_error $? "gnome-keyring library or headers not found." "$LINENO" 5 -fi + echo "$EGG_PKG_ERRORS" >&5 -SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS" -SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS" + as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED) were not met: +$EGG_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -AVAHI_GLIB_REQUIRED=0.6 +Alternatively, you may set the environment variables EGG_CFLAGS +and EGG_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}: result: no" >&5 +$as_echo "no" >&6; } + { { $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. -# Allow sharing to be disabled -# Check whether --enable-sharing was given. -if test "${enable_sharing+set}" = set; then : - enableval=$enable_sharing; -fi +Alternatively, you may set the environment variables EGG_CFLAGS +and EGG_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 + EGG_CFLAGS=$pkg_cv_EGG_CFLAGS + EGG_LIBS=$pkg_cv_EGG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -if test "$enable_pgp" != "yes"; then - echo "DNS-SD key sharing requires PGP support" - enable_sharing=no fi -if test "$enable_hkp" = "no"; then - echo "DNS-SD key sharing requires HKP support" - enable_sharing=no -fi -if test "$enable_sharing" = "no"; then - echo "disabling DNS-SD key sharing" -else pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHARING" >&5 -$as_echo_n "checking for SHARING... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG_SMCLIENT" >&5 +$as_echo_n "checking for EGG_SMCLIENT... " >&6; } -if test -n "$SHARING_CFLAGS"; then - pkg_cv_SHARING_CFLAGS="$SHARING_CFLAGS" +if test -n "$EGG_SMCLIENT_CFLAGS"; then + pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client avahi-glib >= \$AVAHI_GLIB_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SHARING_CFLAGS=`$PKG_CONFIG --cflags "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>/dev/null` + pkg_cv_EGG_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$SHARING_LIBS"; then - pkg_cv_SHARING_LIBS="$SHARING_LIBS" +if test -n "$EGG_SMCLIENT_LIBS"; then + pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client avahi-glib >= \$AVAHI_GLIB_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SHARING_LIBS=`$PKG_CONFIG --libs "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>/dev/null` + pkg_cv_EGG_SMCLIENT_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17522,489 +17868,379 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SHARING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>&1` + EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0" 2>&1` else - SHARING_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>&1` + EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SHARING_PKG_ERRORS" >&5 + echo "$EGG_SMCLIENT_PKG_ERRORS" >&5 - enable_sharing=no + as_fn_error $? "Package requirements (gtk+-3.0) were not met: + +$EGG_SMCLIENT_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 EGG_SMCLIENT_CFLAGS +and EGG_SMCLIENT_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}: result: no" >&5 $as_echo "no" >&6; } - enable_sharing=no + { { $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 EGG_SMCLIENT_CFLAGS +and EGG_SMCLIENT_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 - SHARING_CFLAGS=$pkg_cv_SHARING_CFLAGS - SHARING_LIBS=$pkg_cv_SHARING_LIBS + EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS + EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_sharing=yes -fi - - if test "$enable_sharing" = "yes"; then - echo "enabling key sharing" - -cat >>confdefs.h <<_ACEOF -#define WITH_SHARING 1 -_ACEOF - - SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $SHARING_CFLAGS" - SEAHORSE_LIBS="$SEAHORSE_LIBS $SHARING_LIBS" - fi fi - if test "$enable_sharing" = "yes"; then - WITH_SHARING_TRUE= - WITH_SHARING_FALSE='#' -else - WITH_SHARING_TRUE='#' - WITH_SHARING_FALSE= -fi +# ----------------------------------------------------------------------------- +# Checks for functions -# Check whether --enable-pkcs11 was given. -if test "${enable_pkcs11+set}" = set; then : - enableval=$enable_pkcs11; +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; fi +if test "$enable_largefile" != no; then -if test "$enable_pkcs11" = "no"; then - echo "disabling pkcs11 support" - enable_pkcs11="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCR" >&5 -$as_echo_n "checking for GCR... " >&6; } - -if test -n "$GCR_CFLAGS"; then - pkg_cv_GCR_CFLAGS="$GCR_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-3 >= \$GCR_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gcr-3 >= $GCR_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GCR_CFLAGS=`$PKG_CONFIG --cflags "gcr-3 >= $GCR_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break fi -if test -n "$GCR_LIBS"; then - pkg_cv_GCR_LIBS="$GCR_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-3 >= \$GCR_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gcr-3 >= $GCR_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GCR_LIBS=`$PKG_CONFIG --libs "gcr-3 >= $GCR_REQUIRED" 2>/dev/null` -else - pkg_failed=yes +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break fi - else - pkg_failed=untried +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GCR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gcr-3 >= $GCR_REQUIRED" 2>&1` - else - GCR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gcr-3 >= $GCR_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GCR_PKG_ERRORS" >&5 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ - gcr_is_present="no" -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - gcr_is_present="no" -else - GCR_CFLAGS=$pkg_cv_GCR_CFLAGS - GCR_LIBS=$pkg_cv_GCR_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - gcr_is_present="yes" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break fi - if test "$gcr_is_present" = "no"; then - echo "disabling pkcs11 support" - fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCK" >&5 -$as_echo_n "checking for GCK... " >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ -if test -n "$GCK_CFLAGS"; then - pkg_cv_GCK_CFLAGS="$GCK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gck-1 >= 3.1.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gck-1 >= 3.1.2") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GCK_CFLAGS=`$PKG_CONFIG --cflags "gck-1 >= 3.1.2" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GCK_LIBS"; then - pkg_cv_GCK_LIBS="$GCK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gck-1 >= 3.1.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gck-1 >= 3.1.2") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GCK_LIBS=`$PKG_CONFIG --libs "gck-1 >= 3.1.2" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done fi - if test $_pkg_short_errors_supported = yes; then - GCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gck-1 >= 3.1.2" 2>&1` - else - GCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gck-1 >= 3.1.2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GCK_PKG_ERRORS" >&5 - - enable_pkcs11="no" -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_pkcs11="no" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 else - GCK_CFLAGS=$pkg_cv_GCK_CFLAGS - GCK_LIBS=$pkg_cv_GCK_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - enable_pkcs11="yes" -fi - if test "$enable_pkcs11" = "yes" && test "$gcr_is_present" = "yes"; then - -$as_echo "#define WITH_PKCS11 1" >>confdefs.h - - SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCK_CFLAGS $GCR_CFLAGS" - SEAHORSE_LIBS="$SEAHORSE_LIBS $GCK_LIBS $GCR_LIBS" - else - enable_pkcs11="no" - fi -fi + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ - if test "$enable_pkcs11" = "yes"; then - WITH_PKCS11_TRUE= - WITH_PKCS11_FALSE='#' -else - WITH_PKCS11_TRUE='#' - WITH_PKCS11_FALSE= + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ - - -# Check whether --enable-ssh was given. -if test "${enable_ssh+set}" = set; then : - enableval=$enable_ssh; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break fi - - -if test "x$enable_ssh" = "xno"; then - echo "disabling ssh support" -else - - # Extract the first word of "ssh-keygen", so it can be a program name with args. -set dummy ssh-keygen; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SSH_KEYGEN_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $SSH_KEYGEN_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_SSH_KEYGEN_PATH="$SSH_KEYGEN_PATH" # Let the user override the test with a path. - ;; - *) - 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_path_SSH_KEYGEN_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_SSH_KEYGEN_PATH" && ac_cv_path_SSH_KEYGEN_PATH=""failed"" - ;; -esac fi -SSH_KEYGEN_PATH=$ac_cv_path_SSH_KEYGEN_PATH -if test -n "$SSH_KEYGEN_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSH_KEYGEN_PATH" >&5 -$as_echo "$SSH_KEYGEN_PATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "ssh", so it can be a program name with args. -set dummy ssh; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SSH_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $SSH_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_SSH_PATH="$SSH_PATH" # Let the user override the test with a path. - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; *) - 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_path_SSH_PATH="$as_dir/$ac_word$ac_exec_ext" - $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 - - test -z "$ac_cv_path_SSH_PATH" && ac_cv_path_SSH_PATH=""failed"" - ;; +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; esac -fi -SSH_PATH=$ac_cv_path_SSH_PATH -if test -n "$SSH_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSH_PATH" >&5 -$as_echo "$SSH_PATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - if test $SSH_KEYGEN_PATH != "failed" && - test $SSH_PATH != "failed"; then - enable_ssh="yes" +rm -rf conftest* + fi -$as_echo "#define WITH_SSH 1" >>confdefs.h +fi -cat >>confdefs.h <<_ACEOF -#define SSH_KEYGEN_PATH "$SSH_KEYGEN_PATH" -_ACEOF +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = xyes; then : +else cat >>confdefs.h <<_ACEOF -#define SSH_PATH "$SSH_PATH" +#define off_t long int _ACEOF - fi - fi - if test "$enable_ssh" = "yes"; then - WITH_SSH_TRUE= - WITH_SSH_FALSE='#' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if ${ac_cv_sys_largefile_source+:} false; then : + $as_echo_n "(cached) " >&6 else - WITH_SSH_TRUE='#' - WITH_SSH_FALSE= -fi - - -# ----------------------------------------------------------------------------- -# Debug mode -# - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug mode" >&5 -$as_echo_n "checking for debug mode... " >&6; } -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -fi - - -if test "$enable_debug" != "no"; then - -cat >>confdefs.h <<_ACEOF -#define WITH_DEBUG 1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include /* for off_t */ + #include +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} _ACEOF - - -cat >>confdefs.h <<_ACEOF -#define _DEBUG 1 +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_sys_largefile_source=no; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGEFILE_SOURCE 1 +#include /* for off_t */ + #include +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} _ACEOF - +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_sys_largefile_source=1; break fi - -if test "$enable_debug" = "full"; then - debug_status="full" - CFLAGS="$CFLAGS -g -O0 -Werror" - CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" - CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" -elif test "$enable_debug" = "no"; then - debug_status="no" - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_cv_sys_largefile_source=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +$as_echo "$ac_cv_sys_largefile_source" >&6; } +case $ac_cv_sys_largefile_source in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF -#define G_DISABLE_ASSERT 1 +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source _ACEOF +;; +esac +rm -rf conftest* -else - debug_status="yes" -fi +# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +# in glibc 2.1.3, but that breaks too many other things. +# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +if test $ac_cv_sys_largefile_source != unknown; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $debug_status" >&5 -$as_echo "$debug_status" >&6; } +$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h -# Fatal Messages mode -# Check whether --enable-fatal-messages was given. -if test "${enable_fatal_messages+set}" = set; then : - enableval=$enable_fatal_messages; fi -if test "$enable_fatal_messages" = "yes" && test "$enable_debug" = "yes"; then - CFLAGS="$CFLAGS -Wall -Werror" - -cat >>confdefs.h <<_ACEOF -#define FATAL_MESSAGES 1 +for ac_func in strsep +do : + ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" +if test "x$ac_cv_func_strsep" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRSEP 1 _ACEOF - echo "enabling fatal runtime messages" -fi - -# Build Tests -# Check whether --enable-tests was given. -if test "${enable_tests+set}" = set; then : - enableval=$enable_tests; fi +done -if test "$enable_tests" != "yes"; then - enable_tests="no" -fi +# ----------------------------------------------------------------------------- +# GPG / GPGME CHECKS - if test "$enable_tests" = "yes"; then - WITH_TESTS_TRUE= - WITH_TESTS_FALSE='#' -else - WITH_TESTS_TRUE='#' - WITH_TESTS_FALSE= +# Check whether --enable-pgp was given. +if test "${enable_pgp+set}" = set; then : + enableval=$enable_pgp; fi -# ------------------------------------------------------------------- -# More warnings - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 -$as_echo_n "checking for more warnings... " >&6; } -if test "$GCC" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="\ - -Wall \ - -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith \ - -Wcast-align -Wsign-compare \ - $CFLAGS" - - for option in -Wno-strict-aliasing -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - { $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 -main () -{ +have_gpg="" +have_gpgme="" - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - has_option=yes +if test "$enable_pgp" = "no"; then + echo "disabling PGP support" else - has_option=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 -$as_echo "$has_option" >&6; } - unset has_option - unset SAVE_CFLAGS - done - unset option + # Check whether --enable-gpg-check was given. +if test "${enable_gpg_check+set}" = set; then : + enableval=$enable_gpg_check; DO_CHECK=$enableval else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + DO_CHECK=yes fi - - - -# Extract the first word of "glib-genmarshal", so it can be a program name with args. -set dummy glib-genmarshal; ac_word=$2 + if test "$DO_CHECK" = "yes"; then + for ac_prog in gpg gpg2 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : +if ${ac_cv_path_GNUPG+:} false; then : $as_echo_n "(cached) " >&6 else - case $GLIB_GENMARSHAL in + case $GNUPG in [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. + ac_cv_path_GNUPG="$GNUPG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -18013,8 +18249,8 @@ 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_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GNUPG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -18025,267 +18261,214 @@ ;; esac fi -GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL -if test -n "$GLIB_GENMARSHAL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 -$as_echo "$GLIB_GENMARSHAL" >&6; } +GNUPG=$ac_cv_path_GNUPG +if test -n "$GNUPG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUPG" >&5 +$as_echo "$GNUPG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$GNUPG" && break +done +test -n "$GNUPG" || GNUPG="no" -# Check whether --enable-update-mime-database was given. -if test "${enable_update_mime_database+set}" = set; then : - enableval=$enable_update_mime_database; -fi - if test "$enable_update_mime_database" != "no"; then - UPDATE_MIME_DATABASE_TRUE= - UPDATE_MIME_DATABASE_FALSE='#' -else - UPDATE_MIME_DATABASE_TRUE='#' - UPDATE_MIME_DATABASE_FALSE= -fi +cat >>confdefs.h <<_ACEOF +#define GNUPG "$GNUPG" +_ACEOF + ok="no" + if test "$GNUPG" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for appropriate GnuPG version" >&5 +$as_echo_n "checking for appropriate GnuPG version... " >&6; } + gnupg_version=`$GNUPG --version | grep gpg` + major=`echo $gnupg_version | \ + sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` + minor=`echo $gnupg_version | \ + sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` + micro=`echo $gnupg_version | \ + sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` + for ver in $GNUPG_ACCEPTED; do + if test "$ver" = "$major.$minor"; then -GETTEXT_PACKAGE=seahorse +cat >>confdefs.h <<_ACEOF +#define GPG_MAJOR $major +_ACEOF cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +#define GPG_MINOR $minor _ACEOF - - 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" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALE_H 1 +cat >>confdefs.h <<_ACEOF +#define GPG_MICRO $micro _ACEOF -fi + ok="yes" + break + fi + done + fi -done + if test "$ok" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_gpg="$gnupg_version" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi - if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 -$as_echo_n "checking for LC_MESSAGES... " >&6; } -if ${am_cv_val_LC_MESSAGES+:} false; then : + + ok="no" + # Extract the first word of "gpgme-config", so it can be a program name with args. +set dummy gpgme-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GPGME_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return LC_MESSAGES - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_val_LC_MESSAGES=yes -else - am_cv_val_LC_MESSAGES=no + case $GPGME_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $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 + + test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG=""failed"" + ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG +if test -n "$GPGME_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5 +$as_echo "$GPGME_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $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 -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - fi - fi - USE_NLS=yes + if test $GPGME_CONFIG != "failed" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME - version >= $GPGME_REQUIRED" >&5 +$as_echo_n "checking for GPGME - version >= $GPGME_REQUIRED... " >&6; } + req_major=`echo $GPGME_REQUIRED | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` + req_minor=`echo $GPGME_REQUIRED | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` + req_micro=`echo $GPGME_REQUIRED | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` + gpgme_config_version=`$GPGME_CONFIG --version` + major=`echo $gpgme_config_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` + minor=`echo $gpgme_config_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` + micro=`echo $gpgme_config_version | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` + + if test "$major" -eq "$req_major"; then + if test "$minor" -ge "$req_minor"; then + if test "$micro" -ge "$req_micro"; then + ok="yes" + fi + fi + fi + fi + if test $ok = "yes"; then + GPGME_CFLAGS=`$GPGME_CONFIG --cflags` + GPGME_LIBS=`$GPGME_CONFIG --libs` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_gpgme="$gpgme_config_version" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi - gt_cv_have_gettext=no +if test "$enable_pgp" != "no" -a -n "$have_gpg" -a -n "$have_gpgme"; then + enable_pgp="yes" +fi - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +if test "$enable_pgp" = "yes"; then + if test -z "$have_gpg"; then + as_fn_error $? "Appropriate version of GnuPG not found. Please install one of versions: $GNUPG_ACCEPTED" "$LINENO" 5 + fi - 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" = xyes; then : - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" + if test -z "$have_gpgme"; then + as_fn_error $? "GPGME $GPGME_REQUIRED or later needed" "$LINENO" 5 + fi - # - # First check in libc - # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 -$as_echo_n "checking for ngettext in libc... " >&6; } -if ${gt_cv_func_ngettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GPGME_CFLAGS" + SEAHORSE_LIBS="$SEAHORSE_LIBS $GPGME_LIBS" -#include +$as_echo "#define WITH_PGP 1" >>confdefs.h -int -main () -{ -return !ngettext ("","", 1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_ngettext_libc=yes -else - gt_cv_func_ngettext_libc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + if test "$enable_pgp" = "yes"; then + WITH_PGP_TRUE= + WITH_PGP_FALSE='#' +else + WITH_PGP_TRUE='#' + WITH_PGP_FALSE= fi -{ $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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 -$as_echo_n "checking for dgettext in libc... " >&6; } -if ${gt_cv_func_dgettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +# ----------------------------------------------------------------------------- +# LDAP [from gpg] -int -main () -{ -return !dgettext ("","") - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_dgettext_libc=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDAP keyserver support" >&5 +$as_echo_n "checking LDAP keyserver support... " >&6; } +# Check whether --enable-ldap was given. +if test "${enable_ldap+set}" = set; then : + enableval=$enable_ldap; try_ldap=$enableval else - gt_cv_func_dgettext_libc=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - + try_ldap=yes fi -{ $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" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF +if test "$enable_pgp" != "yes"; then + echo "LDAP keyserver interface requires PGP support" + try_ldap=no fi -done - - fi - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try_ldap" >&5 +$as_echo "$try_ldap" >&6; } +with_ldap=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 -$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if ${ac_cv_lib_intl_bindtextdomain+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -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 bindtextdomain (); -int -main () -{ -return bindtextdomain (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_bindtextdomain=yes -else - ac_cv_lib_intl_bindtextdomain=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $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" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +if test "x$ac_cv_func_gethostbyname" = xyes; then : -/* 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 ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes else - ac_cv_lib_intl_ngettext=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $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" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 -$as_echo_n "checking for dgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dgettext+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" +LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18295,84 +18478,43 @@ #ifdef __cplusplus extern "C" #endif -char dgettext (); +char gethostbyname (); int main () { -return dgettext (); +return gethostbyname (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dgettext=yes + ac_cv_lib_nsl_gethostbyname=yes else - ac_cv_lib_intl_dgettext=no + ac_cv_lib_nsl_gethostbyname=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $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" = xyes; then : - gt_cv_func_dgettext_libintl=yes -fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : + NETLIBS="-lnsl $NETLIBS" fi fi +ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt" +if test "x$ac_cv_func_setsockopt" = xyes; then : - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $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 ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -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 ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes else - ac_cv_lib_intl_ngettext=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $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" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 -$as_echo_n "checking for dcgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dcgettext+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5 +$as_echo_n "checking for setsockopt in -lsocket... " >&6; } +if ${ac_cv_lib_socket_setsockopt+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" +LIBS="-lsocket $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18382,583 +18524,819 @@ #ifdef __cplusplus extern "C" #endif -char dcgettext (); +char setsockopt (); int main () { -return dcgettext (); +return setsockopt (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dcgettext=yes + ac_cv_lib_socket_setsockopt=yes else - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_socket_setsockopt=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $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" = xyes; then : - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv -else - : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5 +$as_echo "$ac_cv_lib_socket_setsockopt" >&6; } +if test "x$ac_cv_lib_socket_setsockopt" = xyes; then : + NETLIBS="-lsocket $NETLIBS" fi -else - : fi - fi - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - 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 : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + +if test "$try_ldap" = yes ; then + for MY_LDAPLIBS in ${LDAP_LIBS+"$LDAP_LIBS"} "-lldap -llber" "-lldap" "-lldap -llber -lresolv"; do + _ldap_save_libs=$LIBS + LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether LDAP via \"$MY_LDAPLIBS\" is present and sane" >&5 +$as_echo_n "checking whether LDAP via \"$MY_LDAPLIBS\" is present and sane... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +ldap_open("foobar",1234); ber_free(NULL, 0); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + cv_func_ldap_init=yes +else + cv_func_ldap_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cv_func_ldap_init" >&5 +$as_echo "$cv_func_ldap_init" >&6; } + if test $cv_func_ldap_init = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether I can make LDAP be sane with lber.h" >&5 +$as_echo_n "checking whether I can make LDAP be sane with lber.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int +main () +{ +ldap_open("foobar",1234); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + cv_func_ldaplber_init=yes +else + cv_func_ldaplber_init=no fi -done +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cv_func_ldaplber_init" >&5 +$as_echo "$cv_func_ldaplber_init" >&6; } + fi - LIBS="$glib_save_LIBS" + if test "$cv_func_ldaplber_init" = yes ; then - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi +$as_echo "#define NEED_LBER_H 1" >>confdefs.h - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi + fi - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi + if test "$cv_func_ldap_init" = yes || \ + test "$cv_func_ldaplber_init" = yes ; then + LDAP_LIBS=$MY_LDAPLIBS + fi - if test "$gt_cv_have_gettext" = "yes"; then + LIBS=$_ldap_save_libs -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + if test "$LDAP_LIBS" != ""; then + with_keyserver=yes + with_ldap=yes - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi +$as_echo "#define WITH_LDAP 1" >>confdefs.h + + break fi done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" - ;; -esac fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + + if test "$with_ldap" = "yes"; then + WITH_LDAP_TRUE= + WITH_LDAP_FALSE='#' else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + WITH_LDAP_TRUE='#' + WITH_LDAP_FALSE= fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do : - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF +SEAHORSE_LIBS="$SEAHORSE_LIBS $LDAP_LIBS" + + + +# ----------------------------------------------------------------------------- +# HKP (libsoup) + +# Allow hkp to be disabled +# Check whether --enable-hkp was given. +if test "${enable_hkp+set}" = set; then : + enableval=$enable_hkp; fi -done - MSGFMT_OPTS= - { $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 "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" +# HKP tests +if test "$enable_pgp" != "yes"; then + echo "HKP keyserver interface requires PGP support" + enable_hkp=no +fi -_ACEOF -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 +if test "$enable_hkp" = "no"; then + echo "disabling HKP keyserver interface" +else + + echo "checking for supported versions of libsoup..." + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUP" >&5 +$as_echo_n "checking for SOUP... " >&6; } + +if test -n "$SOUP_CFLAGS"; then + pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 ac_status=$? $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 + pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SOUP_LIBS"; then + pkg_cv_SOUP_LIBS="$SOUP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $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 + +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 + SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4" 2>&1` + else + SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SOUP_PKG_ERRORS" >&5 - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 + enable_hkp=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_hkp=no else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $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 + SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS + SOUP_LIBS=$pkg_cv_SOUP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_hkp=yes +fi - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac + if test "$enable_hkp" = yes; then + with_keyserver=yes + + +$as_echo "#define WITH_HKP 1" >>confdefs.h + + SEAHORSE_LIBS="$SEAHORSE_LIBS $SOUP_LIBS" + SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $SOUP_CFLAGS" + + # libsoup is also used for async lookups + +$as_echo "#define WITH_SOUP 1" >>confdefs.h + + fi fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } + + if test "$enable_hkp" = "yes"; then + WITH_HKP_TRUE= + WITH_HKP_FALSE='#' else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + WITH_HKP_TRUE='#' + WITH_HKP_FALSE= fi - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 +# ----------------------------------------------------------------------------- +# KEYSERVER + + if test "$with_keyserver" = "yes"; then + WITH_KEYSERVER_TRUE= + WITH_KEYSERVER_FALSE='#' else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac + WITH_KEYSERVER_TRUE='#' + WITH_KEYSERVER_FALSE= fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } + + +if test "$with_keyserver" = "yes"; then + echo "enabling key server support" + +$as_echo "#define WITH_KEYSERVER 1" >>confdefs.h + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + with_keyserver=no + echo "disabling key server support" fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +# ----------------------------------------------------------------------------- +# LIBSECRET -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - CATOBJEXT=.gmo - DATADIRNAME=share + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5 +$as_echo_n "checking for LIBSECRET... " >&6; } + +if test -n "$LIBSECRET_CFLAGS"; then + pkg_cv_LIBSECRET_CFLAGS="$LIBSECRET_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-unstable >= \$LIBSECRET_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsecret-unstable >= $LIBSECRET_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBSECRET_CFLAGS=`$PKG_CONFIG --cflags "libsecret-unstable >= $LIBSECRET_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - CATOBJEXT=.gmo - DATADIRNAME=share + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBSECRET_LIBS"; then + pkg_cv_LIBSECRET_LIBS="$LIBSECRET_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-unstable >= \$LIBSECRET_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsecret-unstable >= $LIBSECRET_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBSECRET_LIBS=`$PKG_CONFIG --libs "libsecret-unstable >= $LIBSECRET_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - CATOBJEXT=.mo - DATADIRNAME=lib + pkg_failed=yes fi - - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac + else + pkg_failed=untried fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi -fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "$gt_cv_have_gettext" = "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 + LIBSECRET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsecret-unstable >= $LIBSECRET_REQUIRED" 2>&1` + else + LIBSECRET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsecret-unstable >= $LIBSECRET_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBSECRET_PKG_ERRORS" >&5 -$as_echo "#define ENABLE_NLS 1" >>confdefs.h + enable_gnome_keyring=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_gnome_keyring=no +else + LIBSECRET_CFLAGS=$pkg_cv_LIBSECRET_CFLAGS + LIBSECRET_LIBS=$pkg_cv_LIBSECRET_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_gnome_keyring=yes +fi - fi +if test "$enable_gnome_keyring" = "no"; then + as_fn_error $? "libsecret library or headers not found." "$LINENO" 5 +fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - { $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 +SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $LIBSECRET_CFLAGS" +SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBSECRET_LIBS" - # We need to process the po/ directory. - POSUB=po +# ----------------------------------------------------------------------------- +# KEY SHARING - ac_config_commands="$ac_config_commands default-1" +# Allow sharing to be disabled +# Check whether --enable-sharing was given. +if test "${enable_sharing+set}" = set; then : + enableval=$enable_sharing; +fi - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +if test "$enable_pgp" != "yes"; then + echo "DNS-SD key sharing requires PGP support" + enable_sharing=no +fi + +if test "$enable_hkp" = "no"; then + echo "DNS-SD key sharing requires HKP support" + enable_sharing=no +fi +if test "$enable_sharing" = "no"; then + echo "disabling DNS-SD key sharing" +else +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHARING" >&5 +$as_echo_n "checking for SHARING... " >&6; } +if test -n "$SHARING_CFLAGS"; then + pkg_cv_SHARING_CFLAGS="$SHARING_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client avahi-glib >= \$AVAHI_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SHARING_CFLAGS=`$PKG_CONFIG --cflags "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SHARING_LIBS"; then + pkg_cv_SHARING_LIBS="$SHARING_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client avahi-glib >= \$AVAHI_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SHARING_LIBS=`$PKG_CONFIG --libs "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + SHARING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>&1` + else + SHARING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SHARING_PKG_ERRORS" >&5 + enable_sharing=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_sharing=no +else + SHARING_CFLAGS=$pkg_cv_SHARING_CFLAGS + SHARING_LIBS=$pkg_cv_SHARING_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_sharing=yes +fi + if test "$enable_sharing" = "yes"; then + echo "enabling key sharing" +cat >>confdefs.h <<_ACEOF +#define WITH_SHARING 1 +_ACEOF - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - { $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 - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - fi + SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $SHARING_CFLAGS" + SEAHORSE_LIBS="$SEAHORSE_LIBS $SHARING_LIBS" + fi +fi - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi + if test "$enable_sharing" = "yes"; then + WITH_SHARING_TRUE= + WITH_SHARING_FALSE='#' +else + WITH_SHARING_TRUE='#' + WITH_SHARING_FALSE= +fi - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi +# ----------------------------------------------------------------------------- +# PKCS11 - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES +# Check whether --enable-pkcs11 was given. +if test "${enable_pkcs11+set}" = set; then : + enableval=$enable_pkcs11; +fi -## here we get the flags we'll actually use +if test "$enable_pkcs11" = "no"; then + echo "disabling pkcs11 support" + enable_pkcs11="no" +else pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG" >&5 -$as_echo_n "checking for EGG... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCK" >&5 +$as_echo_n "checking for GCK... " >&6; } -if test -n "$EGG_CFLAGS"; then - pkg_cv_EGG_CFLAGS="$EGG_CFLAGS" +if test -n "$GCK_CFLAGS"; then + pkg_cv_GCK_CFLAGS="$GCK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gck-1 >= \$GCK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gck-1 >= $GCK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EGG_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GCK_CFLAGS=`$PKG_CONFIG --cflags "gck-1 >= $GCK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$EGG_LIBS"; then - pkg_cv_EGG_LIBS="$EGG_LIBS" +if test -n "$GCK_LIBS"; then + pkg_cv_GCK_LIBS="$GCK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gck-1 >= \$GCK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gck-1 >= $GCK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EGG_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GCK_LIBS=`$PKG_CONFIG --libs "gck-1 >= $GCK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +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 + GCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gck-1 >= $GCK_REQUIRED" 2>&1` + else + GCK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gck-1 >= $GCK_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GCK_PKG_ERRORS" >&5 + + enable_pkcs11="no" +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_pkcs11="no" +else + GCK_CFLAGS=$pkg_cv_GCK_CFLAGS + GCK_LIBS=$pkg_cv_GCK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_pkcs11="yes" +fi + if test "$enable_pkcs11" = "yes"; then + +$as_echo "#define WITH_PKCS11 1" >>confdefs.h + + SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCK_CFLAGS $GCR_CFLAGS" + SEAHORSE_LIBS="$SEAHORSE_LIBS $GCK_LIBS $GCR_LIBS" + else + enable_pkcs11="no" + fi +fi + + if test "$enable_pkcs11" = "yes"; then + WITH_PKCS11_TRUE= + WITH_PKCS11_FALSE='#' +else + WITH_PKCS11_TRUE='#' + WITH_PKCS11_FALSE= +fi + + +# ----------------------------------------------------------------------------- +# SSH + +# Check whether --enable-ssh was given. +if test "${enable_ssh+set}" = set; then : + enableval=$enable_ssh; +fi + + +if test "x$enable_ssh" = "xno"; then + echo "disabling ssh support" +else + + # Extract the first word of "ssh-keygen", so it can be a program name with args. +set dummy ssh-keygen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SSH_KEYGEN_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $SSH_KEYGEN_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_SSH_KEYGEN_PATH="$SSH_KEYGEN_PATH" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SSH_KEYGEN_PATH="$as_dir/$ac_word$ac_exec_ext" + $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 + + test -z "$ac_cv_path_SSH_KEYGEN_PATH" && ac_cv_path_SSH_KEYGEN_PATH=""failed"" + ;; +esac +fi +SSH_KEYGEN_PATH=$ac_cv_path_SSH_KEYGEN_PATH +if test -n "$SSH_KEYGEN_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSH_KEYGEN_PATH" >&5 +$as_echo "$SSH_KEYGEN_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "ssh", so it can be a program name with args. +set dummy ssh; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SSH_PATH+:} false; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes + case $SSH_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_SSH_PATH="$SSH_PATH" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SSH_PATH="$as_dir/$ac_word$ac_exec_ext" + $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 + + test -z "$ac_cv_path_SSH_PATH" && ac_cv_path_SSH_PATH=""failed"" + ;; +esac fi - else - pkg_failed=untried +SSH_PATH=$ac_cv_path_SSH_PATH +if test -n "$SSH_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSH_PATH" >&5 +$as_echo "$SSH_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -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 - EGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` - else - EGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$EGG_PKG_ERRORS" >&5 + if test $SSH_KEYGEN_PATH != "failed" && + test $SSH_PATH != "failed"; then + enable_ssh="yes" - as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED) were not met: +$as_echo "#define WITH_SSH 1" >>confdefs.h -$EGG_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +cat >>confdefs.h <<_ACEOF +#define SSH_KEYGEN_PATH "$SSH_KEYGEN_PATH" +_ACEOF -Alternatively, you may set the environment variables EGG_CFLAGS -and EGG_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}: result: no" >&5 -$as_echo "no" >&6; } - { { $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. +cat >>confdefs.h <<_ACEOF +#define SSH_PATH "$SSH_PATH" +_ACEOF -Alternatively, you may set the environment variables EGG_CFLAGS -and EGG_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + fi -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +fi + if test "$enable_ssh" = "yes"; then + WITH_SSH_TRUE= + WITH_SSH_FALSE='#' else - EGG_CFLAGS=$pkg_cv_EGG_CFLAGS - EGG_LIBS=$pkg_cv_EGG_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + WITH_SSH_TRUE='#' + WITH_SSH_FALSE= +fi + + +# ----------------------------------------------------------------------------- +# Compilation and linking options +# +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug mode" >&5 +$as_echo_n "checking for debug mode... " >&6; } +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; fi +if test "$enable_debug" != "no"; then +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG 1 +_ACEOF -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG_SMCLIENT" >&5 -$as_echo_n "checking for EGG_SMCLIENT... " >&6; } -if test -n "$EGG_SMCLIENT_CFLAGS"; then - pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_EGG_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$EGG_SMCLIENT_LIBS"; then - pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_EGG_SMCLIENT_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi +cat >>confdefs.h <<_ACEOF +#define _DEBUG 1 +_ACEOF + CFLAGS="$CFLAGS -g" +fi +if test "$enable_debug" = "yes"; then + debug_status="yes (-g, -O0, debug output, testable)" + CFLAGS="$CFLAGS -O0" +elif test "$enable_debug" = "no"; then + debug_status="no (no debug output, not testable, G_DISABLE_ASSERT)" -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +cat >>confdefs.h <<_ACEOF +#define G_DISABLE_ASSERT 1 +_ACEOF -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no + debug_status="default (-g, debug output, testable)" fi - if test $_pkg_short_errors_supported = yes; then - EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0" 2>&1` - else - EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$EGG_SMCLIENT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-3.0) were not met: +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $debug_status" >&5 +$as_echo "$debug_status" >&6; } -$EGG_SMCLIENT_PKG_ERRORS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 +$as_echo_n "checking for more warnings... " >&6; } +if test "$GCC" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="\ + -Wall \ + -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ + -Wnested-externs -Wpointer-arith \ + -Wcast-align -Wsign-compare \ + $CFLAGS" -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + for option in -Wno-strict-aliasing -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + { $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. */ -Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS -and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +int +main () +{ -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + has_option=yes +else + has_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $has_option = no; then + CFLAGS="$SAVE_CFLAGS" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 +$as_echo "$has_option" >&6; } + unset has_option + unset SAVE_CFLAGS + done + unset option +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $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. +fi -Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS -and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +# Check whether --enable-strict was given. +if test "${enable_strict+set}" = set; then : + enableval=$enable_strict; +fi -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS - EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build strict" >&5 +$as_echo_n "checking build strict... " >&6; } + +if test "$enable_strict" = "yes"; then + CFLAGS="$CFLAGS -Werror \ + -DGTK_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED" + +cat >>confdefs.h <<_ACEOF +#define WITH_STRICT 1 +_ACEOF + strict_status="yes (-Werror, fatals, no deprecations)" +else + strict_status="no (non-fatal warnings)" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $strict_status" >&5 +$as_echo "$strict_status" >&6; } + +# ----------------------------------------------------------------------------- + -ac_config_files="$ac_config_files Makefile gkr/Makefile libegg/Makefile libseahorse/Makefile pgp/Makefile po/Makefile.in help/Makefile data/Makefile data/icons/Makefile pixmaps/Makefile pixmaps/22x22/Makefile pixmaps/48x48/Makefile pixmaps/scalable/Makefile pkcs11/Makefile src/Makefile src/seahorse.desktop.in ssh/Makefile" +ac_config_files="$ac_config_files Makefile gkr/Makefile libegg/Makefile libseahorse/Makefile pgp/Makefile po/Makefile.in help/Makefile data/Makefile data/icons/Makefile pkcs11/Makefile src/Makefile ssh/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19069,6 +19447,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -19077,6 +19463,14 @@ am__EXEEXT_FALSE= fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19097,14 +19491,6 @@ ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - 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 - 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 "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19141,14 +19527,6 @@ as_fn_error $? "conditional \"WITH_SSH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_TESTS_TRUE}" && test -z "${WITH_TESTS_FALSE}"; then - as_fn_error $? "conditional \"WITH_TESTS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${UPDATE_MIME_DATABASE_TRUE}" && test -z "${UPDATE_MIME_DATABASE_FALSE}"; then - as_fn_error $? "conditional \"UPDATE_MIME_DATABASE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -19447,16 +19825,16 @@ # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -19516,28 +19894,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -19558,8 +19924,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by seahorse $as_me 3.2.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by seahorse $as_me 3.6.3, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -19618,17 +19984,17 @@ Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -seahorse config.status 3.2.2 -configured by $0, generated by GNU Autoconf 2.68, +seahorse config.status 3.6.3 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -19719,7 +20085,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + 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' @@ -19761,6 +20127,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -19843,7 +20210,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -19915,7 +20281,6 @@ allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -19954,6 +20319,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -20004,7 +20370,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -20038,7 +20403,6 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -20144,13 +20508,8 @@ "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; - "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;; - "pixmaps/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/22x22/Makefile" ;; - "pixmaps/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/48x48/Makefile" ;; - "pixmaps/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/scalable/Makefile" ;; "pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES pkcs11/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/seahorse.desktop.in") CONFIG_FILES="$CONFIG_FILES src/seahorse.desktop.in" ;; "ssh/Makefile") CONFIG_FILES="$CONFIG_FILES ssh/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -20762,7 +21121,7 @@ # 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 + # 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. @@ -20796,21 +21155,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # 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 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -20864,8 +21221,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -20919,6 +21276,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -21220,10 +21580,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -21566,10 +21922,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -21707,7 +22059,6 @@ fi - echo " PKCS11 Support: $enable_pkcs11 PGP Support: $enable_pgp @@ -21718,4 +22069,6 @@ LDAP: $with_ldap HKP: $enable_hkp Key Sharing: $enable_sharing +Debug: $debug_status +Strict: $strict_status " diff -Nru seahorse-3.2.2/configure.ac seahorse-3.6.3/configure.ac --- seahorse-3.2.2/configure.ac 2011-11-14 11:45:26.000000000 +0100 +++ seahorse-3.6.3/configure.ac 2012-11-12 08:48:59.000000000 +0100 @@ -1,18 +1,21 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.52) - -dnl **************************************************************************** -dnl MAIN SEAHORSE VERSION (update after release) - -AC_INIT(seahorse, 3.2.2) - -GCR_REQUIRED=3.1.5 +AC_PREREQ([2.63]) +AC_INIT([seahorse], [3.6.3], + [http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse], + [seahorse]) + +GCK_REQUIRED=3.3.4 +GCR_REQUIRED=3.3.4 +GTK_REQUIRED=3.4.0 +GNUPG_ACCEPTED="1.2 1.4 2.0" +GPGME_REQUIRED=1.0.0 +LIBSECRET_REQUIRED=0.5 +AVAHI_GLIB_REQUIRED=0.6 -dnl **************************************************************************** +# ----------------------------------------------------------------------------- +# Basic tools -AC_CONFIG_SRCDIR(src/seahorse-main.c) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) +AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability]) +AM_SANITY_CHECK AM_CONFIG_HEADER(config.h) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE([enable]) @@ -22,27 +25,11 @@ AC_PROG_CXX AC_PROG_INTLTOOL([0.35.0]) AM_PROG_LIBTOOL -GNOME_DOC_INIT - -dnl Get the off_t size right -AC_SYS_LARGEFILE -AC_TYPE_OFF_T -AC_FUNC_FSEEKO - -AC_CHECK_FUNCS(setresuid setresgid) -AC_CHECK_FUNCS(strsep) - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -GTK_REQUIRED=2.90.0 - -PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) - -PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED) - -GLIB_GSETTINGS +GETTEXT_PACKAGE=seahorse +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext domain.]) AC_MSG_CHECKING([for some Win32 platform]) case "$host" in @@ -75,9 +62,42 @@ fi AC_SUBST(PLUGIN_LIBTOOL_FLAGS) -dnl ************************************************************** -dnl GPG / GPGME CHECKS -dnl ************************************************************** +# ----------------------------------------------------------------------------- +# Basic Dependencies + +PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) + +PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED gcr-3 >= $GCR_REQUIRED) +SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE" + +# User documentation +YELP_HELP_INIT + +GLIB_GSETTINGS +AM_GLIB_GNU_GETTEXT +AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + +PKG_CHECK_MODULES(EGG, gtk+-3.0 >= $GTK_REQUIRED) +AC_SUBST(EGG_LIBS) +AC_SUBST(EGG_CFLAGS) + +PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-3.0) +AC_SUBST(EGG_SMCLIENT_LIBS) +AC_SUBST(EGG_SMCLIENT_CFLAGS) + +# ----------------------------------------------------------------------------- +# Checks for functions + +AC_SYS_LARGEFILE +AC_TYPE_OFF_T +AC_FUNC_FSEEKO + +AC_CHECK_FUNCS(strsep) + +# ----------------------------------------------------------------------------- +# GPG / GPGME CHECKS AC_ARG_ENABLE(pgp, AC_HELP_STRING([--enable-pgp], [enable PGP support (default is auto)])) @@ -93,7 +113,6 @@ DO_CHECK=$enableval, DO_CHECK=yes) if test "$DO_CHECK" = "yes"; then - accepted_versions="1.2 1.4 2.0" AC_PATH_PROGS(GNUPG, [gpg gpg2], no) AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) ok="no" @@ -107,7 +126,7 @@ micro=`echo $gnupg_version | \ sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - for ver in $accepted_versions; do + for ver in $GNUPG_ACCEPTED; do if test "$ver" = "$major.$minor"; then AC_DEFINE_UNQUOTED(GPG_MAJOR, [$major], [GPG Major Version]) AC_DEFINE_UNQUOTED(GPG_MINOR, [$minor], [GPG Minor Version]) @@ -128,15 +147,14 @@ ok="no" - min_gpgme_version=1.0.0 AC_PATH_PROG(GPGME_CONFIG, gpgme-config, "failed") if test $GPGME_CONFIG != "failed" ; then - AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) - req_major=`echo $min_gpgme_version | \ + AC_MSG_CHECKING(for GPGME - version >= $GPGME_REQUIRED) + req_major=`echo $GPGME_REQUIRED | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ + req_minor=`echo $GPGME_REQUIRED | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ + req_micro=`echo $GPGME_REQUIRED | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` gpgme_config_version=`$GPGME_CONFIG --version` major=`echo $gpgme_config_version | \ @@ -171,11 +189,11 @@ if test "$enable_pgp" = "yes"; then if test -z "$have_gpg"; then - AC_MSG_ERROR([Appropriate version of GnuPG not found. Please install one of versions: $accepted_versions]) + AC_MSG_ERROR([Appropriate version of GnuPG not found. Please install one of versions: $GNUPG_ACCEPTED]) fi if test -z "$have_gpgme"; then - AC_MSG_ERROR(GPGME $min_gpgme_version or later needed) + AC_MSG_ERROR(GPGME $GPGME_REQUIRED or later needed) fi SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GPGME_CFLAGS" @@ -185,9 +203,8 @@ AM_CONDITIONAL(WITH_PGP, test "$enable_pgp" = "yes") -dnl ****************************************************************************** -dnl LDAP [from gpg] -dnl ****************************************************************************** +# ----------------------------------------------------------------------------- +# LDAP [from gpg] AC_MSG_CHECKING([LDAP keyserver support]) AC_ARG_ENABLE(ldap, @@ -261,10 +278,8 @@ AC_SUBST(NETLIBS) - -dnl **************************************************************************** -dnl HKP (libsoup) -dnl **************************************************************************** +# ----------------------------------------------------------------------------- +# HKP (libsoup) # Allow hkp to be disabled AC_ARG_ENABLE(hkp, @@ -301,10 +316,8 @@ AM_CONDITIONAL(WITH_HKP, test "$enable_hkp" = "yes") - -dnl *************** -dnl KEYSERVER -dnl *************** +# ----------------------------------------------------------------------------- +# KEYSERVER AM_CONDITIONAL(WITH_KEYSERVER, test "$with_keyserver" = "yes") @@ -316,27 +329,21 @@ echo "disabling key server support" fi +# ----------------------------------------------------------------------------- +# LIBSECRET -dnl **************************************************************************** -dnl GNOME-KEYRING -dnl **************************************************************************** - -PKG_CHECK_MODULES([GNOME_KEYRING], gnome-keyring-1 >= 2.25.5, +PKG_CHECK_MODULES([LIBSECRET], libsecret-unstable >= $LIBSECRET_REQUIRED, [enable_gnome_keyring=yes],[enable_gnome_keyring=no]) if test "$enable_gnome_keyring" = "no"; then - AC_MSG_ERROR([gnome-keyring library or headers not found.]) + AC_MSG_ERROR([libsecret library or headers not found.]) fi -SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS" -SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS" - - -dnl ******************* -dnl KEY SHARING -dnl ******************* +SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $LIBSECRET_CFLAGS" +SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBSECRET_LIBS" -AVAHI_GLIB_REQUIRED=0.6 +# ----------------------------------------------------------------------------- +# KEY SHARING # Allow sharing to be disabled AC_ARG_ENABLE(sharing, @@ -372,9 +379,8 @@ AM_CONDITIONAL(WITH_SHARING, test "$enable_sharing" = "yes") -dnl **************************************************************************** -dnl PKCS11 -dnl **************************************************************************** +# ----------------------------------------------------------------------------- +# PKCS11 AC_ARG_ENABLE(pkcs11, AC_HELP_STRING([--disable-pkcs11], @@ -384,12 +390,8 @@ echo "disabling pkcs11 support" enable_pkcs11="no" else - PKG_CHECK_MODULES(GCR, gcr-3 >= $GCR_REQUIRED, gcr_is_present="yes", gcr_is_present="no") - if test "$gcr_is_present" = "no"; then - echo "disabling pkcs11 support" - fi - PKG_CHECK_MODULES(GCK, gck-1 >= 3.1.2, enable_pkcs11="yes", enable_pkcs11="no") - if test "$enable_pkcs11" = "yes" && test "$gcr_is_present" = "yes"; then + PKG_CHECK_MODULES(GCK, gck-1 >= $GCK_REQUIRED, enable_pkcs11="yes", enable_pkcs11="no") + if test "$enable_pkcs11" = "yes"; then AC_DEFINE(WITH_PKCS11, 1, [gck library available]) SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCK_CFLAGS $GCR_CFLAGS" SEAHORSE_LIBS="$SEAHORSE_LIBS $GCK_LIBS $GCR_LIBS" @@ -400,9 +402,8 @@ AM_CONDITIONAL(WITH_PKCS11, test "$enable_pkcs11" = "yes") -dnl **************************************************************************** -dnl SSH -dnl **************************************************************************** +# ----------------------------------------------------------------------------- +# SSH AC_ARG_ENABLE(ssh, AC_HELP_STRING([--disable-ssh], @@ -428,58 +429,32 @@ AM_CONDITIONAL(WITH_SSH, test "$enable_ssh" = "yes") # ----------------------------------------------------------------------------- -# Debug mode +# Compilation and linking options # AC_MSG_CHECKING([for debug mode]) AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=no/yes/full], + AC_HELP_STRING([--enable-debug=no/default/yes], [Turn on or off debugging])) if test "$enable_debug" != "no"; then AC_DEFINE_UNQUOTED(WITH_DEBUG, 1, [Print debug output]) AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode]) + CFLAGS="$CFLAGS -g" fi -if test "$enable_debug" = "full"; then - debug_status="full" - CFLAGS="$CFLAGS -g -O0 -Werror" - CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" - CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" +if test "$enable_debug" = "yes"; then + debug_status="yes (-g, -O0, debug output, testable)" + CFLAGS="$CFLAGS -O0" elif test "$enable_debug" = "no"; then - debug_status="no" + debug_status="no (no debug output, not testable, G_DISABLE_ASSERT)" AC_DEFINE_UNQUOTED(G_DISABLE_ASSERT, 1, [Disable glib assertions]) else - debug_status="yes" + debug_status="default (-g, debug output, testable)" fi AC_MSG_RESULT($debug_status) -# Fatal Messages mode -AC_ARG_ENABLE(fatal-messages, - AC_HELP_STRING([--enable-fatal-messages], - [Don't make compile and or runtime messages fatal in debug mode.])) - -if test "$enable_fatal_messages" = "yes" && test "$enable_debug" = "yes"; then - CFLAGS="$CFLAGS -Wall -Werror" - AC_DEFINE_UNQUOTED(FATAL_MESSAGES, 1, [Fatal runtime messages]) - echo "enabling fatal runtime messages" -fi - -# Build Tests -AC_ARG_ENABLE(tests, - AC_HELP_STRING([--enable-tests], - [Compile Test Programs])) - -if test "$enable_tests" != "yes"; then - enable_tests="no" -fi - -AM_CONDITIONAL(WITH_TESTS, test "$enable_tests" = "yes") - -# ------------------------------------------------------------------- -# More warnings - AC_MSG_CHECKING(for more warnings) if test "$GCC" = "yes"; then AC_MSG_RESULT(yes) @@ -509,39 +484,30 @@ AC_MSG_RESULT(no) fi -dnl **************************************************************************** - -AC_SUBST(SEAHORSE_CFLAGS) -AC_SUBST(SEAHORSE_LIBS) - -AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) - -AC_ARG_ENABLE(update-mime-database, - AC_HELP_STRING([--disable-update-mime-database], - [do not run the update-mime-database utility (mostly useful for package maintainers) ])) -AM_CONDITIONAL(UPDATE_MIME_DATABASE, test "$enable_update_mime_database" != "no") - -dnl ******************* -dnl ***** gettext ***** -dnl ******************* - -GETTEXT_PACKAGE=seahorse -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext domain.]) - -AM_GLIB_GNU_GETTEXT +AC_ARG_ENABLE(strict, [ + AS_HELP_STRING([--enable-strict], [Strict code compilation]) + ]) + +AC_MSG_CHECKING([build strict]) + +if test "$enable_strict" = "yes"; then + CFLAGS="$CFLAGS -Werror \ + -DGTK_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED" + AC_DEFINE_UNQUOTED(WITH_STRICT, 1, [More strict checks]) + strict_status="yes (-Werror, fatals, no deprecations)" +else + strict_status="no (non-fatal warnings)" +fi -dnl **************************************************************************** -## here we get the flags we'll actually use -PKG_CHECK_MODULES(EGG, gtk+-3.0 >= $GTK_REQUIRED) -AC_SUBST(EGG_LIBS) -AC_SUBST(EGG_CFLAGS) +AC_MSG_RESULT($strict_status) -PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-3.0) -AC_SUBST(EGG_SMCLIENT_LIBS) -AC_SUBST(EGG_SMCLIENT_CFLAGS) +# ----------------------------------------------------------------------------- -dnl **************************************************************************** +AC_SUBST(SEAHORSE_CFLAGS) +AC_SUBST(SEAHORSE_LIBS) AC_OUTPUT([ Makefile @@ -553,20 +519,11 @@ help/Makefile data/Makefile data/icons/Makefile -pixmaps/Makefile -pixmaps/22x22/Makefile -pixmaps/48x48/Makefile -pixmaps/scalable/Makefile pkcs11/Makefile src/Makefile -src/seahorse.desktop.in ssh/Makefile ]) -dnl **************************************************************************** -dnl SUMMARY -dnl **************************************************************************** - echo " PKCS11 Support: $enable_pkcs11 PGP Support: $enable_pgp @@ -577,4 +534,6 @@ LDAP: $with_ldap HKP: $enable_hkp Key Sharing: $enable_sharing +Debug: $debug_status +Strict: $strict_status " Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_22x22_seahorse-key-personal.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_22x22_seahorse-key-personal.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_22x22_seahorse-key.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_22x22_seahorse-key.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_22x22_seahorse-key-ssh.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_22x22_seahorse-key-ssh.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_22x22_seahorse-person.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_22x22_seahorse-person.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_48x48_seahorse-key-personal.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_48x48_seahorse-key-personal.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_48x48_seahorse-key.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_48x48_seahorse-key.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_48x48_seahorse-key-ssh.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_48x48_seahorse-key-ssh.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_apps_48x48_seahorse-person.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_apps_48x48_seahorse-person.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_status_22x22_seahorse-sign-bad.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_status_22x22_seahorse-sign-bad.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_status_22x22_seahorse-sign-ok.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_status_22x22_seahorse-sign-ok.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_status_22x22_seahorse-sign.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_status_22x22_seahorse-sign.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_status_48x48_seahorse-sign-bad.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_status_48x48_seahorse-sign-bad.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_status_48x48_seahorse-sign-ok.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_status_48x48_seahorse-sign-ok.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_status_48x48_seahorse-sign.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_status_48x48_seahorse-sign.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/data/icons/hicolor_status_48x48_seahorse-sign-unknown.png und /tmp/lzerpLe8rK/seahorse-3.6.3/data/icons/hicolor_status_48x48_seahorse-sign-unknown.png sind verschieden. diff -Nru seahorse-3.2.2/data/icons/Makefile.am seahorse-3.6.3/data/icons/Makefile.am --- seahorse-3.2.2/data/icons/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/data/icons/Makefile.am 2012-08-21 12:23:15.000000000 +0200 @@ -1,4 +1,5 @@ NULL = +pkgdatadir = $(datadir)/seahorse public_icons = \ hicolor_apps_16x16_seahorse.png \ @@ -15,6 +16,21 @@ $(NULL) private_icons = \ + hicolor_apps_22x22_seahorse-key.png \ + hicolor_apps_22x22_seahorse-key-personal.png \ + hicolor_apps_22x22_seahorse-key-ssh.png \ + hicolor_apps_22x22_seahorse-person.png \ + hicolor_apps_48x48_seahorse-key.png \ + hicolor_apps_48x48_seahorse-key-personal.png \ + hicolor_apps_48x48_seahorse-key-ssh.png \ + hicolor_apps_48x48_seahorse-person.png \ + hicolor_status_22x22_seahorse-sign.png \ + hicolor_status_22x22_seahorse-sign-bad.png \ + hicolor_status_22x22_seahorse-sign-ok.png \ + hicolor_status_48x48_seahorse-sign.png \ + hicolor_status_48x48_seahorse-sign-bad.png \ + hicolor_status_48x48_seahorse-sign-ok.png \ + hicolor_status_48x48_seahorse-sign-unknown.png \ $(NULL) noinst_DATA = \ @@ -54,7 +70,7 @@ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done uninstall-icons: @@ -70,7 +86,7 @@ CONTEXT=`echo $$icon | cut -d_ -f2`; \ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ - rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done install-data-local: install-icons update-icon-cache diff -Nru seahorse-3.2.2/data/icons/Makefile.in seahorse-3.6.3/data/icons/Makefile.in --- seahorse-3.2.2/data/icons/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/data/icons/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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,7 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -35,29 +50,42 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(noinst_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = $(datadir)/seahorse ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ @@ -82,9 +110,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -99,15 +125,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -126,10 +148,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -147,7 +176,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -182,6 +210,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -217,6 +246,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -252,6 +283,21 @@ $(NULL) private_icons = \ + hicolor_apps_22x22_seahorse-key.png \ + hicolor_apps_22x22_seahorse-key-personal.png \ + hicolor_apps_22x22_seahorse-key-ssh.png \ + hicolor_apps_22x22_seahorse-person.png \ + hicolor_apps_48x48_seahorse-key.png \ + hicolor_apps_48x48_seahorse-key-personal.png \ + hicolor_apps_48x48_seahorse-key-ssh.png \ + hicolor_apps_48x48_seahorse-person.png \ + hicolor_status_22x22_seahorse-sign.png \ + hicolor_status_22x22_seahorse-sign-bad.png \ + hicolor_status_22x22_seahorse-sign-ok.png \ + hicolor_status_48x48_seahorse-sign.png \ + hicolor_status_48x48_seahorse-sign-bad.png \ + hicolor_status_48x48_seahorse-sign-ok.png \ + hicolor_status_48x48_seahorse-sign-unknown.png \ $(NULL) noinst_DATA = \ @@ -278,9 +324,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/Makefile + $(AUTOMAKE) --foreign data/icons/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -311,6 +357,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -356,10 +404,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -476,7 +529,7 @@ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done uninstall-icons: @@ -492,7 +545,7 @@ CONTEXT=`echo $$icon | cut -d_ -f2`; \ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ - rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done install-data-local: install-icons update-icon-cache diff -Nru seahorse-3.2.2/data/Makefile.in seahorse-3.6.3/data/Makefile.in --- seahorse-3.2.2/data/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/data/Makefile.in 2012-11-12 08:49:46.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,25 +51,32 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -63,6 +86,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -84,6 +112,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(convertdir)" DATA = $(convert_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -144,9 +178,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -161,15 +193,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -188,10 +216,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -209,7 +244,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -244,6 +278,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -279,6 +314,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -327,9 +364,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/Makefile + $(AUTOMAKE) --foreign data/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -356,8 +393,11 @@ -rm -rf .libs _libs install-convertDATA: $(convert_DATA) @$(NORMAL_INSTALL) - test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)" @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -371,17 +411,15 @@ @$(NORMAL_UNINSTALL) @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(convertdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(convertdir)" && rm -f $$files + dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) # 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): +# 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) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -391,7 +429,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -405,37 +447,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= 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); \ @@ -444,6 +455,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -507,6 +522,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -542,13 +571,10 @@ 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 \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -586,10 +612,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -667,23 +698,24 @@ uninstall-am: uninstall-convertDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive 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-convertDATA \ - 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 \ - uninstall-convertDATA + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-convertDATA 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 uninstall-convertDATA @GSETTINGS_RULES@ diff -Nru seahorse-3.2.2/data/org.gnome.seahorse.manager.gschema.xml seahorse-3.6.3/data/org.gnome.seahorse.manager.gschema.xml --- seahorse-3.2.2/data/org.gnome.seahorse.manager.gschema.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/data/org.gnome.seahorse.manager.gschema.xml 2012-08-21 12:23:15.000000000 +0200 @@ -1,29 +1,53 @@ + + false + Show keyrings sidebar + Show keyrings sidebar in seahorse. + + + "personal" + Which items to show + Filter which items to show. If empty, show all items, if + 'personal' show personal keys, if 'trusted' show trusted. + + + 148 + Width of the side pane + The default width of the side pane. + + + ["secret-service://login"] + The keyrings chosen + The URIs of the keyrings chosen in the sidebar. + + + + + + 'name' + The column to sort the seahorse keys by + Specify the column to sort the seahorse key manager main window by. Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in front of the column name to sort in descending order. + false Show validity column - Controls the visibility of the expires column for the key manager. + No longer in use. false Show expiry column - Controls the visibility of the expiry column for the key manager. + No longer in use. false Show trust column - Controls the visibility of the trust column for the key manager. + No longer in use. false Show type column - Controls the visibility of the type column for the key manager. - - - 'name' - The column to sort the seahorse keys by - Specify the column to sort the seahorse key manager main window by. Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in front of the column name to sort in descending order. + No longer in use. diff -Nru seahorse-3.2.2/debian/changelog seahorse-3.6.3/debian/changelog --- seahorse-3.2.2/debian/changelog 2012-10-18 13:44:03.000000000 +0200 +++ seahorse-3.6.3/debian/changelog 2012-11-12 11:44:14.000000000 +0100 @@ -1,112 +1,132 @@ -seahorse (3.2.2-0ubuntu2.1) precise-proposed; urgency=low +seahorse (3.6.3-0ubuntu1) raring; urgency=low + * New upstream version + + -- Sebastien Bacher Mon, 12 Nov 2012 11:41:34 +0100 + +seahorse (3.6.2-0ubuntu1) quantal-proposed; urgency=low + + * New upstream release + + Fix problem where keyring items overwrite one another. Regression since + the migration to libsecret. Items stored manually by choosing 'Stored + Password' overwrite one another. (BGO: #686407) + + -- Iain Lane Tue, 23 Oct 2012 09:50:08 +0100 + +seahorse (3.6.1-0ubuntu1) quantal-proposed; urgency=low + + * New upstream version: + - Strip DBus errors before displaying them + - Fix regression for changing a keyring master password (lp: #1048484) + - Updated translations * debian/patches/use_valid_help_url.patch: - Let help buttons point to valid documentation references (lp: #853137) -- Sebastien Bacher Wed, 17 Oct 2012 19:43:05 +0200 -seahorse (3.2.2-0ubuntu2) precise; urgency=low +seahorse (3.6.0-0ubuntu1) quantal; urgency=low - * debian/patches/02_broken_search_filter.patch: - - Fix broken search filter (LP: #978600) - * debian/patches/03_broken_search.patch: - - Fix broken search (LP: #925474) - * debian/patches/99_ltmain_as-needed.patch: - - Dropped as it conflicts with dh-autoreconf. + * New upstream release (LP: #1056585) - -- Robert Ancell Wed, 11 Apr 2012 16:06:48 +1000 + -- Matthew Fischer Tue, 25 Sep 2012 22:08:25 -0600 -seahorse (3.2.2-0ubuntu1) precise; urgency=low +seahorse (3.5.92-0ubuntu1) quantal; urgency=low - * New upstream release. - * Don't load PGP signatures unless showing key properties (LP: #876813) - * Fix crash, issues adding key servers + * New upstream release + - Port to new documentation infrastructure + + BD on yelp-tools for this. - -- Ken VanDine Mon, 14 Nov 2011 11:29:30 -0500 + -- Iain Lane Tue, 18 Sep 2012 17:36:46 +0100 -seahorse (3.2.1-0ubuntu1) oneiric-proposed; urgency=low +seahorse (3.5.91-0ubuntu1) quantal; urgency=low - * New upstream release (LP: #877253) - - updated translations + * New upstream bugfix release - -- Didier Roche Tue, 18 Oct 2011 11:17:42 +0200 + -- Robert Ancell Tue, 04 Sep 2012 09:11:46 +1200 -seahorse (3.2.0-0ubuntu1) oneiric; urgency=low +seahorse (3.5.90-0ubuntu1) quantal; urgency=low * New upstream release - - Fix DNS-SD key sharing crasher and make compatible with seahorse-sharing - - Removed unused spec file - - Updated translations - -- Didier Roche Mon, 26 Sep 2011 17:22:56 +0200 + -- Robert Ancell Tue, 21 Aug 2012 17:26:13 +1200 -seahorse (3.1.92-0ubuntu1) oneiric; urgency=low +seahorse (3.5.4-0ubuntu1) quantal; urgency=low - * New upstream release: - - Fix the SSH password prompting and uploading of keys - - Fix behavior of password prompts when enter is pressed - - Fix GtkComboText GTK+3 problems - - Fix crasher when closing - - Build and documentation fixes - - Updated translations - * Unfuzz patches. + * New upstream release (LP: #1025540) + * debian/control: + - Replace build-depends on libgnome-keyring-dev with libsecret-1-dev + - Bump build-depends on libgtk-3-dev + * debian/patches/use-stable-libsecret.patch: + - Use the stable libsecret + * debian/patches/10_gpgme_keyring_finalize_typo.patch: + * debian/patches/11_unavailable_signature_entries.patch: + * debian/patches/12_align_keyids_with_name_userid.patch: + - Applied upstream - -- Martin Pitt Sun, 18 Sep 2011 13:47:38 +0200 + -- Robert Ancell Mon, 30 Jul 2012 15:31:36 +0200 -seahorse (3.1.91-0ubuntu1) oneiric; urgency=low +seahorse (3.4.1-2) unstable; urgency=low - * New upstream version - * debian/control.in: - - depends on the current gnome-keyring version since it ships a gsettings - schemas used by seahorse - - don't use libgconf, the new version uses gsettings instead - * 11_ubuntu_keyserver.patch: - - drop the corresponding key seems deprecated + * Upload to unstable. + * Tighten dependency on gcr and gnome-keyring. + * Remove obsolete configure flags. - -- Sebastien Bacher Tue, 06 Sep 2011 15:29:42 +0200 + -- Michael Biebl Sat, 19 May 2012 07:26:18 +0200 -seahorse (3.1.4-0ubuntu2) oneiric; urgency=low +seahorse (3.4.1-1) experimental; urgency=low + [ Jeremy Bicha ] + * New upstream release. * debian/control.in: - - build-depends on libgck-1-dev not libgck-dev (lp: #829473) + - Bump libgcr & libgck build-depends + - Depend on gcr for gsettings schema - -- Sebastien Bacher Tue, 23 Aug 2011 22:45:16 +0200 + [ Jordi Mallach ] + * Don't suggest seahorse-plugins. + * Bump Standards-Version to 3.9.3, no changes needed. + * Refresh 99_ltmain_as-needed.patch with copy from dh-autoreconf. + * Add 10_gpgme_keyring_finalize_typo.patch from upstream Git to fix a + build failure caused by a typo. + * Add 11_unavailable_signature_entries.patch from upstream Git to avoid + getting erroneous "Unavailable entries" for key signatures. + * Add 12_align_keyids_with_name_userid.patch from upstream Git to + align keyids with name/signatures in key properties. -seahorse (3.1.4-0ubuntu1) oneiric; urgency=low + -- Jordi Mallach Tue, 15 May 2012 01:08:48 +0200 - * New upstream version - * debian/control.in: - - clean the library packages, that's a new source - - don't build-depends on gir binaries,libdbus-glib,libnotify,scrollkeeper - * Cleaned the install files, there is only one binary - * debian/patches/01_autostart_patch.patch: - - drop the autostart since that service is deprecated - * debian/patches/01_lpi.patch: - - new version update - * debian/rules: - - clean gtk configure option, the new version is gtk3 only - - don't set a shlibs since the library is in a new source - * debian/watch: - - use bz2 - - -- Sebastien Bacher Mon, 25 Jul 2011 17:06:42 +0200 - -seahorse (3.1.1-0ubuntu1) oneiric; urgency=low +seahorse (3.2.2-1) unstable; urgency=low - * Merge with Debian unstable. Remaining Ubuntu changes: - - Launchpad integration: - + Add 01_lpi.patch. - + debian/rules; Run autotools. - + debian/control.in: Add liblaunchpad-integration-3.0-dev build dep. - - debian/rules: Add a shlibs rule for libcryptui0a (>= 3.0.0) - - Add 11_ubuntu-keyserver.patch: Make Ubuntu keyserver the default - - debian/watch: Check for unstable versions. - - debian/rules, debian/control.in: Enable libnotify support (temporarily - disabled in Debian). + [ Jordi Mallach ] * New upstream release. - * Unfuzz patches for new version. + * Bump Build-Deps for GCK and GCR. + * Remove obsolete Replaces. + * Drop libcryptui and gir1.2 packages (moved to its own source). + * Drop our manpage, it was merged upstream ages ago. + * Update copyright file, remove full GFDL text and point to common + licenses. + * Watch for .xz tarballs. + * Don't request GTK+3.0 on configure, its the only version supported. + * Likewise for libnotify, it's gone with libcryptui. + * Drop seahorse.install, as it's the only binary. + * Drop 01_autostart_path.patch: obsolete. + * Set Maintainer to the Debian GNOME team. + + [ Michael Biebl ] + * debian/menu: + - Update description, seahorse also manages SSH keys. + * Refresh patches. + * debian/control.in: + - Drop Build-Depends on libdbus-glib-1-dev, no longer required. + - Drop Build-Depends on scrollkeeper. + - Change Build-Depends on libgck-dev → libgck-1-dev. + - Add Depends on gnome-keyring (>= 3.2) for the org.gnome.crypto.pgp + gsettings schema file. + * debian/watch: + - Fix regex to correctly match directories. + * debian/seahorse.install: + - Install the seahorse icon for the menu file. - -- Martin Pitt Mon, 11 Jul 2011 10:45:11 +0200 + -- Michael Biebl Sat, 19 Nov 2011 22:11:01 +0100 seahorse (3.0.2-1) unstable; urgency=low @@ -1200,6 +1220,3 @@ -- Anthony Mulcahy Mon, 10 Jan 2000 22:17:00 +0900 -Local variables: -mode: debian-changelog -End: diff -Nru seahorse-3.2.2/debian/control seahorse-3.6.3/debian/control --- seahorse-3.2.2/debian/control 2012-10-18 13:48:08.000000000 +0200 +++ seahorse-3.6.3/debian/control 2012-11-12 11:44:16.000000000 +0100 @@ -6,39 +6,39 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jose Carlos Garcia Sogo -Uploaders: Debian GNOME Maintainers -Build-Depends: debhelper (>= 8), - cdbs (>= 0.4.41), +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Jordi Mallach , Michael Biebl +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 8), dh-autoreconf, libgpgme11-dev (>= 1.0.0), - libgck-1-dev (>= 3.0.0), - libgcr-3-dev (>= 3.0.0), + libgck-1-dev (>= 3.3.4), + libgcr-3-dev (>= 3.3.4), intltool (>= 0.35), libsoup2.4-dev, libldap2-dev, libavahi-glib-dev (>= 0.6), libavahi-client-dev (>= 0.6), - gnome-doc-utils, + yelp-tools, gtk-doc-tools (>= 1.9), - libgnome-keyring-dev (>= 3.0.0), + libsecret-1-dev (>= 0.5), libglib2.0-dev (>= 2.10.0), - libgtk-3-dev (>= 2.90.0), - gnome-pkg-tools, - liblaunchpad-integration-3.0-dev + libgtk-3-dev (>= 3.4.0), + gnome-pkg-tools Build-Conflicts: gnupg2 -Standards-Version: 3.9.2 -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu +Standards-Version: 3.9.3 +Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/seahorse/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seahorse/ Homepage: http://live.gnome.org/Seahorse Package: seahorse Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + gcr (>= 3.4), gnupg (>= 1.4.7), - gnome-keyring (>> 3.1.90) + gnome-keyring (>= 3.4) Recommends: openssh-client -Suggests: seahorse-plugins Description: GNOME front end for GnuPG Seahorse is a front end for GnuPG - the GNU Privacy Guard program - that integrates to the GNOME desktop. It is a tool for secure diff -Nru seahorse-3.2.2/debian/control.in seahorse-3.6.3/debian/control.in --- seahorse-3.2.2/debian/control.in 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/control.in 2012-11-12 11:44:14.000000000 +0100 @@ -2,39 +2,39 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 8), - cdbs (>= 0.4.41), +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 8), dh-autoreconf, libgpgme11-dev (>= 1.0.0), - libgck-1-dev (>= 3.0.0), - libgcr-3-dev (>= 3.0.0), + libgck-1-dev (>= 3.3.4), + libgcr-3-dev (>= 3.3.4), intltool (>= 0.35), libsoup2.4-dev, libldap2-dev, libavahi-glib-dev (>= 0.6), libavahi-client-dev (>= 0.6), - gnome-doc-utils, + yelp-tools, gtk-doc-tools (>= 1.9), - libgnome-keyring-dev (>= 3.0.0), + libsecret-1-dev (>= 0.5), libglib2.0-dev (>= 2.10.0), - libgtk-3-dev (>= 2.90.0), - gnome-pkg-tools, - liblaunchpad-integration-3.0-dev + libgtk-3-dev (>= 3.4.0), + gnome-pkg-tools Build-Conflicts: gnupg2 -Standards-Version: 3.9.2 -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu +Standards-Version: 3.9.3 +Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/seahorse/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seahorse/ Homepage: http://live.gnome.org/Seahorse Package: seahorse Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + gcr (>= 3.4), gnupg (>= 1.4.7), - gnome-keyring (>> 3.1.90) + gnome-keyring (>= 3.4) Recommends: openssh-client -Suggests: seahorse-plugins Description: GNOME front end for GnuPG Seahorse is a front end for GnuPG - the GNU Privacy Guard program - that integrates to the GNOME desktop. It is a tool for secure diff -Nru seahorse-3.2.2/debian/copyright seahorse-3.6.3/debian/copyright --- seahorse-3.2.2/debian/copyright 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/copyright 2012-11-12 11:44:14.000000000 +0100 @@ -1,15 +1,16 @@ This package was debianized by Jose Carlos Garcia Sogo on Mon, 17 Jan 2003 20:14:10 +0100. -It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse/ Upstream Authors: Nate Nielsen , Adam Schreiber -Copyright (C) 2001, 2002 Jose Carlos Garcia Sogo -Copyright (C) 2002, 2003 Jacob Perkins -Copyright (C) 2004, 2006 Nate Nielsen, Adam Schreiber +Copyright © 2001, 2002 Jose Carlos Garcia Sogo +Copyright © 2002, 2003 Jacob Perkins +Copyright © 2004, 2006 Nate Nielsen, Adam Schreiber +Copyright © 2005-2011 Stef Walter -Main License (everything except docs and libcryptui): +Main License (everything except docs): This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,382 +29,14 @@ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. -The libcryptui code is covered by LGPL-2.1: +Documentation and help files are covered by GFDL 1.1 license, with no +invariant sections of front or back-covers. - This program 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 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301, USA. + Copyright © 2005-2011 Stef Walter. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with no Invariant Sections, Front-Cover or Back-Cover Texts. -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. - -Documentation and help files are covered by GFDL 1.1 license. - -GFDL License: - - GNU Free Documentation License - Version 1.1, March 2000 - - Copyright (C) 2000 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - -0. PREAMBLE - -The purpose of this License is to make a manual, textbook, or other -written document "free" in the sense of freedom: to assure everyone -the effective freedom to copy and redistribute it, with or without -modifying it, either commercially or noncommercially. Secondarily, -this License preserves for the author and publisher a way to get -credit for their work, while not being considered responsible for -modifications made by others. - -This License is a kind of "copyleft", which means that derivative -works of the document must themselves be free in the same sense. It -complements the GNU General Public License, which is a copyleft -license designed for free software. - -We have designed this License in order to use it for manuals for free -software, because free software needs free documentation: a free -program should come with manuals providing the same freedoms that the -software does. But this License is not limited to software manuals; -it can be used for any textual work, regardless of subject matter or -whether it is published as a printed book. We recommend this License -principally for works whose purpose is instruction or reference. - - -1. APPLICABILITY AND DEFINITIONS - -This License applies to any manual or other work that contains a -notice placed by the copyright holder saying it can be distributed -under the terms of this License. The "Document", below, refers to any -such manual or work. Any member of the public is a licensee, and is -addressed as "you". - -A "Modified Version" of the Document means any work containing the -Document or a portion of it, either copied verbatim, or with -modifications and/or translated into another language. - -A "Secondary Section" is a named appendix or a front-matter section of -the Document that deals exclusively with the relationship of the -publishers or authors of the Document to the Document's overall subject -(or to related matters) and contains nothing that could fall directly -within that overall subject. (For example, if the Document is in part a -textbook of mathematics, a Secondary Section may not explain any -mathematics.) The relationship could be a matter of historical -connection with the subject or with related matters, or of legal, -commercial, philosophical, ethical or political position regarding -them. - -The "Invariant Sections" are certain Secondary Sections whose titles -are designated, as being those of Invariant Sections, in the notice -that says that the Document is released under this License. - -The "Cover Texts" are certain short passages of text that are listed, -as Front-Cover Texts or Back-Cover Texts, in the notice that says that -the Document is released under this License. - -A "Transparent" copy of the Document means a machine-readable copy, -represented in a format whose specification is available to the -general public, whose contents can be viewed and edited directly and -straightforwardly with generic text editors or (for images composed of -pixels) generic paint programs or (for drawings) some widely available -drawing editor, and that is suitable for input to text formatters or -for automatic translation to a variety of formats suitable for input -to text formatters. A copy made in an otherwise Transparent file -format whose markup has been designed to thwart or discourage -subsequent modification by readers is not Transparent. A copy that is -not "Transparent" is called "Opaque". - -Examples of suitable formats for Transparent copies include plain -ASCII without markup, Texinfo input format, LaTeX input format, SGML -or XML using a publicly available DTD, and standard-conforming simple -HTML designed for human modification. Opaque formats include -PostScript, PDF, proprietary formats that can be read and edited only -by proprietary word processors, SGML or XML for which the DTD and/or -processing tools are not generally available, and the -machine-generated HTML produced by some word processors for output -purposes only. - -The "Title Page" means, for a printed book, the title page itself, -plus such following pages as are needed to hold, legibly, the material -this License requires to appear in the title page. For works in -formats which do not have any title page as such, "Title Page" means -the text near the most prominent appearance of the work's title, -preceding the beginning of the body of the text. - - -2. VERBATIM COPYING - -You may copy and distribute the Document in any medium, either -commercially or noncommercially, provided that this License, the -copyright notices, and the license notice saying this License applies -to the Document are reproduced in all copies, and that you add no other -conditions whatsoever to those of this License. You may not use -technical measures to obstruct or control the reading or further -copying of the copies you make or distribute. However, you may accept -compensation in exchange for copies. If you distribute a large enough -number of copies you must also follow the conditions in section 3. - -You may also lend copies, under the same conditions stated above, and -you may publicly display copies. - - -3. COPYING IN QUANTITY - -If you publish printed copies of the Document numbering more than 100, -and the Document's license notice requires Cover Texts, you must enclose -the copies in covers that carry, clearly and legibly, all these Cover -Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on -the back cover. Both covers must also clearly and legibly identify -you as the publisher of these copies. The front cover must present -the full title with all words of the title equally prominent and -visible. You may add other material on the covers in addition. -Copying with changes limited to the covers, as long as they preserve -the title of the Document and satisfy these conditions, can be treated -as verbatim copying in other respects. - -If the required texts for either cover are too voluminous to fit -legibly, you should put the first ones listed (as many as fit -reasonably) on the actual cover, and continue the rest onto adjacent -pages. - -If you publish or distribute Opaque copies of the Document numbering -more than 100, you must either include a machine-readable Transparent -copy along with each Opaque copy, or state in or with each Opaque copy -a publicly-accessible computer-network location containing a complete -Transparent copy of the Document, free of added material, which the -general network-using public has access to download anonymously at no -charge using public-standard network protocols. If you use the latter -option, you must take reasonably prudent steps, when you begin -distribution of Opaque copies in quantity, to ensure that this -Transparent copy will remain thus accessible at the stated location -until at least one year after the last time you distribute an Opaque -copy (directly or through your agents or retailers) of that edition to -the public. - -It is requested, but not required, that you contact the authors of the -Document well before redistributing any large number of copies, to give -them a chance to provide you with an updated version of the Document. - - -4. MODIFICATIONS - -You may copy and distribute a Modified Version of the Document under -the conditions of sections 2 and 3 above, provided that you release -the Modified Version under precisely this License, with the Modified -Version filling the role of the Document, thus licensing distribution -and modification of the Modified Version to whoever possesses a copy -of it. In addition, you must do these things in the Modified Version: - -A. Use in the Title Page (and on the covers, if any) a title distinct - from that of the Document, and from those of previous versions - (which should, if there were any, be listed in the History section - of the Document). You may use the same title as a previous version - if the original publisher of that version gives permission. -B. List on the Title Page, as authors, one or more persons or entities - responsible for authorship of the modifications in the Modified - Version, together with at least five of the principal authors of the - Document (all of its principal authors, if it has less than five). -C. State on the Title page the name of the publisher of the - Modified Version, as the publisher. -D. Preserve all the copyright notices of the Document. -E. Add an appropriate copyright notice for your modifications - adjacent to the other copyright notices. -F. Include, immediately after the copyright notices, a license notice - giving the public permission to use the Modified Version under the - terms of this License, in the form shown in the Addendum below. -G. Preserve in that license notice the full lists of Invariant Sections - and required Cover Texts given in the Document's license notice. -H. Include an unaltered copy of this License. -I. Preserve the section entitled "History", and its title, and add to - it an item stating at least the title, year, new authors, and - publisher of the Modified Version as given on the Title Page. If - there is no section entitled "History" in the Document, create one - stating the title, year, authors, and publisher of the Document as - given on its Title Page, then add an item describing the Modified - Version as stated in the previous sentence. -J. Preserve the network location, if any, given in the Document for - public access to a Transparent copy of the Document, and likewise - the network locations given in the Document for previous versions - it was based on. These may be placed in the "History" section. - You may omit a network location for a work that was published at - least four years before the Document itself, or if the original - publisher of the version it refers to gives permission. -K. In any section entitled "Acknowledgements" or "Dedications", - preserve the section's title, and preserve in the section all the - substance and tone of each of the contributor acknowledgements - and/or dedications given therein. -L. Preserve all the Invariant Sections of the Document, - unaltered in their text and in their titles. Section numbers - or the equivalent are not considered part of the section titles. -M. Delete any section entitled "Endorsements". Such a section - may not be included in the Modified Version. -N. Do not retitle any existing section as "Endorsements" - or to conflict in title with any Invariant Section. - -If the Modified Version includes new front-matter sections or -appendices that qualify as Secondary Sections and contain no material -copied from the Document, you may at your option designate some or all -of these sections as invariant. To do this, add their titles to the -list of Invariant Sections in the Modified Version's license notice. -These titles must be distinct from any other section titles. - -You may add a section entitled "Endorsements", provided it contains -nothing but endorsements of your Modified Version by various -parties--for example, statements of peer review or that the text has -been approved by an organization as the authoritative definition of a -standard. - -You may add a passage of up to five words as a Front-Cover Text, and a -passage of up to 25 words as a Back-Cover Text, to the end of the list -of Cover Texts in the Modified Version. Only one passage of -Front-Cover Text and one of Back-Cover Text may be added by (or -through arrangements made by) any one entity. If the Document already -includes a cover text for the same cover, previously added by you or -by arrangement made by the same entity you are acting on behalf of, -you may not add another; but you may replace the old one, on explicit -permission from the previous publisher that added the old one. - -The author(s) and publisher(s) of the Document do not by this License -give permission to use their names for publicity for or to assert or -imply endorsement of any Modified Version. - - -5. COMBINING DOCUMENTS - -You may combine the Document with other documents released under this -License, under the terms defined in section 4 above for modified -versions, provided that you include in the combination all of the -Invariant Sections of all of the original documents, unmodified, and -list them all as Invariant Sections of your combined work in its -license notice. - -The combined work need only contain one copy of this License, and -multiple identical Invariant Sections may be replaced with a single -copy. If there are multiple Invariant Sections with the same name but -different contents, make the title of each such section unique by -adding at the end of it, in parentheses, the name of the original -author or publisher of that section if known, or else a unique number. -Make the same adjustment to the section titles in the list of -Invariant Sections in the license notice of the combined work. - -In the combination, you must combine any sections entitled "History" -in the various original documents, forming one section entitled -"History"; likewise combine any sections entitled "Acknowledgements", -and any sections entitled "Dedications". You must delete all sections -entitled "Endorsements." - - -6. COLLECTIONS OF DOCUMENTS - -You may make a collection consisting of the Document and other documents -released under this License, and replace the individual copies of this -License in the various documents with a single copy that is included in -the collection, provided that you follow the rules of this License for -verbatim copying of each of the documents in all other respects. - -You may extract a single document from such a collection, and distribute -it individually under this License, provided you insert a copy of this -License into the extracted document, and follow this License in all -other respects regarding verbatim copying of that document. - - -7. AGGREGATION WITH INDEPENDENT WORKS - -A compilation of the Document or its derivatives with other separate -and independent documents or works, in or on a volume of a storage or -distribution medium, does not as a whole count as a Modified Version -of the Document, provided no compilation copyright is claimed for the -compilation. Such a compilation is called an "aggregate", and this -License does not apply to the other self-contained works thus compiled -with the Document, on account of their being thus compiled, if they -are not themselves derivative works of the Document. - -If the Cover Text requirement of section 3 is applicable to these -copies of the Document, then if the Document is less than one quarter -of the entire aggregate, the Document's Cover Texts may be placed on -covers that surround only the Document within the aggregate. -Otherwise they must appear on covers around the whole aggregate. - - -8. TRANSLATION - -Translation is considered a kind of modification, so you may -distribute translations of the Document under the terms of section 4. -Replacing Invariant Sections with translations requires special -permission from their copyright holders, but you may include -translations of some or all Invariant Sections in addition to the -original versions of these Invariant Sections. You may include a -translation of this License provided that you also include the -original English version of this License. In case of a disagreement -between the translation and the original English version of this -License, the original English version will prevail. - - -9. TERMINATION - -You may not copy, modify, sublicense, or distribute the Document except -as expressly provided for under this License. Any other attempt to -copy, modify, sublicense or distribute the Document 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. - - -10. FUTURE REVISIONS OF THIS LICENSE - -The Free Software Foundation may publish new, revised versions -of the GNU Free Documentation License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. See -http://www.gnu.org/copyleft/. - -Each version of the License is given a distinguishing version number. -If the Document specifies that a particular numbered version of this -License "or any later version" applies to it, you have the option of -following the terms and conditions either of that specified version or -of any later version that has been published (not as a draft) by the -Free Software Foundation. If the Document does not specify a version -number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation. - - -ADDENDUM: How to use this License for your documents - -To use this License in a document you have written, include a copy of -the License in the document and put the following copyright and -license notices just after the title page: - - Copyright (c) YEAR YOUR NAME. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 - or any later version published by the Free Software Foundation; - with the Invariant Sections being LIST THEIR TITLES, with the - Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. - A copy of the license is included in the section entitled "GNU - Free Documentation License". - -If you have no Invariant Sections, write "with no Invariant Sections" -instead of saying which ones are invariant. If you have no -Front-Cover Texts, write "no Front-Cover Texts" instead of -"Front-Cover Texts being LIST"; likewise for Back-Cover Texts. - -If your document contains nontrivial examples of program code, we -recommend releasing these examples in parallel under your choice of -free software license, such as the GNU General Public License, -to permit their use in free software. +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL-1.1'. diff -Nru seahorse-3.2.2/debian/menu seahorse-3.6.3/debian/menu --- seahorse-3.2.2/debian/menu 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/menu 2012-11-12 11:44:14.000000000 +0100 @@ -2,6 +2,6 @@ section="Applications/System/Security" \ hints="Gnome" \ title="Seahorse" \ - longtitle="A GNOME frontend for GnuPG" \ + longtitle="GNOME frontend for managing GnuPG and SSH keys" \ command="/usr/bin/seahorse" \ icon="/usr/share/pixmaps/seahorse.xpm" diff -Nru seahorse-3.2.2/debian/patches/01_lpi.patch seahorse-3.6.3/debian/patches/01_lpi.patch --- seahorse-3.2.2/debian/patches/01_lpi.patch 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/patches/01_lpi.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -Index: seahorse-3.1.92/configure.ac -=================================================================== ---- seahorse-3.1.92.orig/configure.ac 2011-09-18 08:12:42.000000000 +0200 -+++ seahorse-3.1.92/configure.ac 2011-09-18 13:44:19.670769367 +0200 -@@ -40,7 +40,7 @@ - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - --PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED) -+PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED launchpad-integration-3.0) - - GLIB_GSETTINGS - -Index: seahorse-3.1.92/src/seahorse-key-manager.ui -=================================================================== ---- seahorse-3.1.92.orig/src/seahorse-key-manager.ui 2011-09-14 17:04:59.000000000 +0200 -+++ seahorse-3.1.92/src/seahorse-key-manager.ui 2011-09-18 13:44:19.670769367 +0200 -@@ -29,6 +29,7 @@ - - - -+ - - - -Index: seahorse-3.1.92/src/seahorse-viewer.c -=================================================================== ---- seahorse-3.1.92.orig/src/seahorse-viewer.c 2011-09-14 17:14:58.000000000 +0200 -+++ seahorse-3.1.92/src/seahorse-viewer.c 2011-09-18 13:44:19.670769367 +0200 -@@ -35,6 +35,7 @@ - - #include - #include -+#include - - void on_app_preferences (GtkAction* action, - SeahorseViewer* self); -@@ -671,6 +672,9 @@ - gtk_window_add_accel_group (GTK_WINDOW (win), - gtk_ui_manager_get_accel_group (pv->ui_manager)); - -+ launchpad_integration_add_ui (pv->ui_manager, -+ "/menubar/Help/LaunchpadItems"); -+ - include_basic_actions (self); - - g_signal_connect (SEAHORSE_VIEW (self), "selection-changed", diff -Nru seahorse-3.2.2/debian/patches/02_broken_search_filter.patch seahorse-3.6.3/debian/patches/02_broken_search_filter.patch --- seahorse-3.2.2/debian/patches/02_broken_search_filter.patch 2012-04-11 08:13:21.000000000 +0200 +++ seahorse-3.6.3/debian/patches/02_broken_search_filter.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -Description: Fix memory issues using the server filter in the remote key search dialog -Bug-Ubuntu: https://launchpad.net/bugs/978600 -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=673884 -Author: Robert Ancell - -Index: seahorse-3.2.2/libseahorse/seahorse-context.c -=================================================================== ---- seahorse-3.2.2.orig/libseahorse/seahorse-context.c 2011-11-14 21:45:20.000000000 +1100 -+++ seahorse-3.2.2/libseahorse/seahorse-context.c 2012-04-11 15:59:54.117996896 +1000 -@@ -1220,11 +1220,11 @@ - /* Get a list of all selected key servers */ - names = g_settings_get_strv (self->pv->seahorse_settings, "last-search-servers"); - if (names != NULL && names[0] != NULL) { -- servers = g_hash_table_new (g_str_hash, g_str_equal); -+ servers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - for (i = 0; names[i] != NULL; i++) -- g_hash_table_insert (servers, names[i], GINT_TO_POINTER (TRUE)); -- g_strfreev (names); -+ g_hash_table_insert (servers, g_strdup (names[i]), GINT_TO_POINTER (TRUE)); - } -+ g_strfreev (names); - - res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_context_search_remote_async); -@@ -1254,6 +1254,9 @@ - on_source_search_ready, g_object_ref (res)); - closure->num_searches++; - } -+ -+ if (servers) -+ g_hash_table_unref (servers); - - if (closure->num_searches == 0) - g_simple_async_result_complete_in_idle (res); diff -Nru seahorse-3.2.2/debian/patches/03_broken_search.patch seahorse-3.6.3/debian/patches/03_broken_search.patch --- seahorse-3.2.2/debian/patches/03_broken_search.patch 2012-04-11 08:24:38.000000000 +0200 +++ seahorse-3.6.3/debian/patches/03_broken_search.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -Description: Fix remote key search results not showing -Bug-Ubuntu: https://launchpad.net/bugs/925474 -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=669247 -Author: Robert Ancell - -Index: seahorse-3.2.2/pgp/seahorse-hkp-source.c -=================================================================== ---- seahorse-3.2.2.orig/pgp/seahorse-hkp-source.c 2011-11-14 21:45:20.000000000 +1100 -+++ seahorse-3.2.2/pgp/seahorse-hkp-source.c 2012-04-11 16:00:35.885997476 +1000 -@@ -411,6 +411,7 @@ - seahorse_object_list_free (uids); - seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (key), subkeys); - seahorse_object_list_free (subkeys); -+ seahorse_pgp_key_realize (SEAHORSE_PGP_KEY (key)); - uids = subkeys = NULL; - key = NULL; - } -@@ -465,6 +466,7 @@ - seahorse_object_list_free (uids); - seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (key), g_list_reverse (subkeys)); - seahorse_object_list_free (subkeys); -+ seahorse_pgp_key_realize (SEAHORSE_PGP_KEY (key)); - } - - return keys; -Index: seahorse-3.2.2/pgp/seahorse-ldap-source.c -=================================================================== ---- seahorse-3.2.2.orig/pgp/seahorse-ldap-source.c 2011-11-14 21:45:20.000000000 +1100 -+++ seahorse-3.2.2/pgp/seahorse-ldap-source.c 2012-04-11 16:00:40.957997546 +1000 -@@ -902,6 +902,7 @@ - g_object_set (key, "location", SEAHORSE_LOCATION_REMOTE, - "flags", flags, NULL); - -+ seahorse_pgp_key_realize (key); - add_key (self, key); - g_object_unref (key); - result = SEAHORSE_OBJECT (key); diff -Nru seahorse-3.2.2/debian/patches/08_force_ssh.patch seahorse-3.6.3/debian/patches/08_force_ssh.patch --- seahorse-3.2.2/debian/patches/08_force_ssh.patch 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/patches/08_force_ssh.patch 2012-11-12 11:44:14.000000000 +0100 @@ -1,8 +1,8 @@ -Index: seahorse-3.1.91/configure.ac +Index: seahorse-3.5.4/configure.ac =================================================================== ---- seahorse-3.1.91.orig/configure.ac 2011-09-06 15:05:03.202001641 +0200 -+++ seahorse-3.1.91/configure.ac 2011-09-06 15:05:04.138001686 +0200 -@@ -412,16 +412,16 @@ +--- seahorse-3.5.4.orig/configure.ac 2012-07-13 22:34:57.000000000 +1200 ++++ seahorse-3.5.4/configure.ac 2012-07-17 17:59:37.855896015 +1200 +@@ -411,16 +411,16 @@ echo "disabling ssh support" else diff -Nru seahorse-3.2.2/debian/patches/30_preferences_menu.patch seahorse-3.6.3/debian/patches/30_preferences_menu.patch --- seahorse-3.2.2/debian/patches/30_preferences_menu.patch 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/patches/30_preferences_menu.patch 2012-11-12 11:44:14.000000000 +0100 @@ -1,8 +1,8 @@ -Index: seahorse-3.1.91/src/seahorse.desktop.in.in +Index: seahorse-2.30.1/src/seahorse.desktop.in.in =================================================================== ---- seahorse-3.1.91.orig/src/seahorse.desktop.in.in 2011-08-30 14:17:47.000000000 +0200 -+++ seahorse-3.1.91/src/seahorse.desktop.in.in 2011-09-06 15:05:05.102001733 +0200 -@@ -5,7 +5,7 @@ +--- seahorse-2.30.1.orig/src/seahorse.desktop.in.in 2010-05-07 22:08:15.740896545 +0200 ++++ seahorse-2.30.1/src/seahorse.desktop.in.in 2010-05-07 22:11:12.016895716 +0200 +@@ -5,7 +5,7 @@ Exec=seahorse Terminal=false Type=Application Icon=seahorse diff -Nru seahorse-3.2.2/debian/patches/99_ltmain_as-needed.patch seahorse-3.6.3/debian/patches/99_ltmain_as-needed.patch --- seahorse-3.2.2/debian/patches/99_ltmain_as-needed.patch 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/debian/patches/99_ltmain_as-needed.patch 2012-11-12 11:44:14.000000000 +0100 @@ -0,0 +1,35 @@ +Bug-Debian: http://bugs.debian.org/347650 +Last-Update: 2011-06-14 + +Index: seahorse-3.5.4/ltmain.sh +=================================================================== +--- seahorse-3.5.4.orig/ltmain.sh 2012-06-29 23:59:05.000000000 +1200 ++++ seahorse-3.5.4/ltmain.sh 2012-07-17 18:01:53.107900045 +1200 +@@ -5800,6 +5800,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed|-Wl,--no-as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -6160,6 +6165,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed|-Wl,--no-as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + if test "$linkmode,$pass" = "prog,link"; then diff -Nru seahorse-3.2.2/debian/patches/series seahorse-3.6.3/debian/patches/series --- seahorse-3.2.2/debian/patches/series 2012-10-18 13:43:36.000000000 +0200 +++ seahorse-3.6.3/debian/patches/series 2012-11-12 11:44:14.000000000 +0100 @@ -1,6 +1,5 @@ -01_lpi.patch -02_broken_search_filter.patch -03_broken_search.patch +use-stable-libsecret.patch 08_force_ssh.patch 30_preferences_menu.patch +99_ltmain_as-needed.patch use_valid_help_url.patch diff -Nru seahorse-3.2.2/debian/patches/use-stable-libsecret.patch seahorse-3.6.3/debian/patches/use-stable-libsecret.patch --- seahorse-3.2.2/debian/patches/use-stable-libsecret.patch 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/debian/patches/use-stable-libsecret.patch 2012-11-12 11:44:14.000000000 +0100 @@ -0,0 +1,13 @@ +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -332,7 +332,7 @@ + # ----------------------------------------------------------------------------- + # LIBSECRET + +-PKG_CHECK_MODULES([LIBSECRET], libsecret-unstable >= $LIBSECRET_REQUIRED, ++PKG_CHECK_MODULES([LIBSECRET], libsecret-1 >= $LIBSECRET_REQUIRED, + [enable_gnome_keyring=yes],[enable_gnome_keyring=no]) + + if test "$enable_gnome_keyring" = "no"; then diff -Nru seahorse-3.2.2/debian/patches/use_valid_help_url.patch seahorse-3.6.3/debian/patches/use_valid_help_url.patch --- seahorse-3.2.2/debian/patches/use_valid_help_url.patch 2012-10-18 13:43:30.000000000 +0200 +++ seahorse-3.6.3/debian/patches/use_valid_help_url.patch 2012-11-12 11:44:14.000000000 +0100 @@ -1,13 +1,14 @@ -diff -Nur seahorse-3.2.2/libseahorse/seahorse-widget.c seahorse-3.2.2.ubuntu/libseahorse/seahorse-widget.c ---- seahorse-3.2.2/libseahorse/seahorse-widget.c 2011-11-14 11:45:20.000000000 +0100 -+++ seahorse-3.2.2.ubuntu/libseahorse/seahorse-widget.c 2012-10-18 13:42:55.916862399 +0200 -@@ -451,6 +451,9 @@ +diff --git a/libseahorse/seahorse-widget.c b/libseahorse/seahorse-widget.c +index c887004..e335a32 100644 +--- a/libseahorse/seahorse-widget.c ++++ b/libseahorse/seahorse-widget.c +@@ -450,6 +450,9 @@ seahorse_widget_show_help (SeahorseWidget *swidget) if (g_str_equal (swidget->name, "key-manager") || g_str_equal (swidget->name, "keyserver-results")) { - document = g_strdup ("ghelp:" PACKAGE "?introduction"); + document = g_strdup ("help:" PACKAGE "/introduction"); + } else if (g_str_equal (swidget->name, "gkr-keyring") || + g_str_equal (swidget->name, "gkr-item-properties")) { -+ document = g_strdup ("ghelp:" PACKAGE "?keyring"); ++ document = g_strdup ("help:" PACKAGE "/keyring"); } else { - document = g_strdup_printf ("ghelp:" PACKAGE "?%s", swidget->name); + document = g_strdup_printf ("help:" PACKAGE "/%s", swidget->name); } diff -Nru seahorse-3.2.2/debian/rules seahorse-3.6.3/debian/rules --- seahorse-3.2.2/debian/rules 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/rules 2012-11-12 11:44:14.000000000 +0100 @@ -9,8 +9,5 @@ LDFLAGS += -Wl,-O1 -Wl,--as-needed -DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mime-database \ - --disable-schemas-install \ - --disable-scrollkeeper \ - --enable-pgp - +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \ + --enable-pgp diff -Nru seahorse-3.2.2/debian/seahorse.1 seahorse-3.6.3/debian/seahorse.1 --- seahorse-3.2.2/debian/seahorse.1 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/seahorse.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH SEAHORSE "1" "August 2009" "SEAHORSE" "User Commands" -.SH NAME -seahorse \- Encryption Key Manager -.SH SYNOPSIS -seahorse [OPTION...] -.SH DESCRIPTION -Seahorse is a front end for GnuPG - the Gnu Privacy Guard program - -that integrates to the GNOME desktop. It is a tool for secure -communications and data storage. Data encryption and digital signature -creation can easily be performed through a GUI and Key Management -operations can easily be carried out through an intuitive interface. -.SH OPTIONS -.TP -\-?, \fB\-\-help\fR -Show help options -.TP -\fB\-\-help\-all\fR -Show all help options -.TP -\fB\-\-help\-gtk\fR -Show GTK+ Options -.SS "Application Options:" -.TP -\fB\-\-display\fR=\fIDISPLAY\fR -X display to use -.SH BUGS -If you find a bug, please report it at http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse. -.SH AUTHORS -Jacob Perkins -.TP -Jose Carlos Garcia Sogo -.TP -Jean Schurger -.TP -Stef Walter -.TP -Adam Schreiber diff -Nru seahorse-3.2.2/debian/seahorse.install seahorse-3.6.3/debian/seahorse.install --- seahorse-3.2.2/debian/seahorse.install 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/debian/seahorse.install 2012-11-12 11:44:14.000000000 +0100 @@ -0,0 +1 @@ +debian/seahorse.xpm /usr/share/pixmaps diff -Nru seahorse-3.2.2/debian/seahorse.manpages seahorse-3.6.3/debian/seahorse.manpages --- seahorse-3.2.2/debian/seahorse.manpages 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/seahorse.manpages 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/seahorse.1 diff -Nru seahorse-3.2.2/debian/watch seahorse-3.6.3/debian/watch --- seahorse-3.2.2/debian/watch 2011-11-14 17:56:50.000000000 +0100 +++ seahorse-3.6.3/debian/watch 2012-11-12 11:44:14.000000000 +0100 @@ -1,2 +1,2 @@ -version=2 -http://ftp.gnome.org/pub/gnome/sources/seahorse/([\d\.]+)/seahorse-([\d\.]+)\.tar\.bz2 +version=3 +http://ftp.gnome.org/pub/gnome/sources/seahorse/([\d\.]+[02468])/seahorse-([\d\.]+)\.tar\.xz diff -Nru seahorse-3.2.2/depcomp seahorse-3.6.3/depcomp --- seahorse-3.2.2/depcomp 2011-11-14 11:51:43.000000000 +0100 +++ seahorse-3.6.3/depcomp 2012-10-13 13:58:52.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011, 2012 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 @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +40,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +96,24 @@ # 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" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 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=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +168,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # 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 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +430,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # 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 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +580,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru seahorse-3.2.2/gkr/Makefile.am seahorse-3.6.3/gkr/Makefile.am --- seahorse-3.2.2/gkr/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/Makefile.am 2012-11-09 11:08:13.000000000 +0100 @@ -1,5 +1,6 @@ -uidir = $(datadir)/seahorse/ui/ +pkgdatadir = $(datadir)/seahorse +uidir = $(pkgdatadir)/ui localedir = $(datadir)/locale seahorselibexecbindir = $(libdir)/seahorse/ @@ -7,29 +8,28 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ - -DSEAHORSE_UIDIR=\""$(uidir)"\" \ + -DSEAHORSE_UIDIR=\""$(uidir)/"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ - -DGETTEXT_PACKAGE=\""seahorse\"" + -DGETTEXT_PACKAGE=\""seahorse\"" \ + -DSECRET_API_SUBJECT_TO_CHANGE noinst_LTLIBRARIES = libseahorse-gkr.la libseahorse_gkr_la_SOURCES = \ seahorse-gkr.c seahorse-gkr.h \ + seahorse-gkr-actions.c seahorse-gkr-actions.h \ seahorse-gkr-add-item.c \ seahorse-gkr-add-keyring.c \ + seahorse-gkr-backend.c seahorse-gkr-backend.h \ seahorse-gkr-dialogs.h seahorse-gkr-dialogs.c \ seahorse-gkr-item.c seahorse-gkr-item.h \ - seahorse-gkr-item-commands.c seahorse-gkr-item-commands.h \ + seahorse-gkr-item-deleter.c seahorse-gkr-item-deleter.h \ seahorse-gkr-item-properties.c \ seahorse-gkr-keyring.c seahorse-gkr-keyring.h \ - seahorse-gkr-keyring-commands.c seahorse-gkr-keyring-commands.h \ - seahorse-gkr-keyring-properties.c \ - seahorse-gkr-module.c seahorse-gkr-module.h \ - seahorse-gkr-operation.c seahorse-gkr-operation.h \ - seahorse-gkr-source.c seahorse-gkr-source.h - + seahorse-gkr-keyring-deleter.c seahorse-gkr-keyring-deleter.h \ + seahorse-gkr-keyring-properties.c + libseahorse_gkr_la_LIBADD = \ $(top_builddir)/libseahorse/libseahorse.la diff -Nru seahorse-3.2.2/gkr/Makefile.in seahorse-3.6.3/gkr/Makefile.in --- seahorse-3.2.2/gkr/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/gkr/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -17,7 +16,23 @@ VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,13 +51,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = gkr -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -53,16 +69,29 @@ libseahorse_gkr_la_DEPENDENCIES = \ $(top_builddir)/libseahorse/libseahorse.la am_libseahorse_gkr_la_OBJECTS = seahorse-gkr.lo \ - seahorse-gkr-add-item.lo seahorse-gkr-add-keyring.lo \ + seahorse-gkr-actions.lo seahorse-gkr-add-item.lo \ + seahorse-gkr-add-keyring.lo seahorse-gkr-backend.lo \ seahorse-gkr-dialogs.lo seahorse-gkr-item.lo \ - seahorse-gkr-item-commands.lo seahorse-gkr-item-properties.lo \ - seahorse-gkr-keyring.lo seahorse-gkr-keyring-commands.lo \ - seahorse-gkr-keyring-properties.lo seahorse-gkr-module.lo \ - seahorse-gkr-operation.lo seahorse-gkr-source.lo + seahorse-gkr-item-deleter.lo seahorse-gkr-item-properties.lo \ + seahorse-gkr-keyring.lo seahorse-gkr-keyring-deleter.lo \ + seahorse-gkr-keyring-properties.lo libseahorse_gkr_la_OBJECTS = $(am_libseahorse_gkr_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -73,24 +102,25 @@ $(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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libseahorse_gkr_la_SOURCES) DIST_SOURCES = $(libseahorse_gkr_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -112,11 +142,18 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = $(datadir)/seahorse ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ @@ -141,9 +178,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -158,15 +193,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -185,10 +216,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -206,7 +244,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -241,6 +278,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -276,6 +314,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale @@ -295,33 +335,32 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uidir = $(datadir)/seahorse/ui/ +uidir = $(pkgdatadir)/ui seahorselibexecbindir = $(libdir)/seahorse/ INCLUDES = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ - -DSEAHORSE_UIDIR=\""$(uidir)"\" \ + -DSEAHORSE_UIDIR=\""$(uidir)/"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ - -DGETTEXT_PACKAGE=\""seahorse\"" + -DGETTEXT_PACKAGE=\""seahorse\"" \ + -DSECRET_API_SUBJECT_TO_CHANGE noinst_LTLIBRARIES = libseahorse-gkr.la libseahorse_gkr_la_SOURCES = \ seahorse-gkr.c seahorse-gkr.h \ + seahorse-gkr-actions.c seahorse-gkr-actions.h \ seahorse-gkr-add-item.c \ seahorse-gkr-add-keyring.c \ + seahorse-gkr-backend.c seahorse-gkr-backend.h \ seahorse-gkr-dialogs.h seahorse-gkr-dialogs.c \ seahorse-gkr-item.c seahorse-gkr-item.h \ - seahorse-gkr-item-commands.c seahorse-gkr-item-commands.h \ + seahorse-gkr-item-deleter.c seahorse-gkr-item-deleter.h \ seahorse-gkr-item-properties.c \ seahorse-gkr-keyring.c seahorse-gkr-keyring.h \ - seahorse-gkr-keyring-commands.c seahorse-gkr-keyring-commands.h \ - seahorse-gkr-keyring-properties.c \ - seahorse-gkr-module.c seahorse-gkr-module.h \ - seahorse-gkr-operation.c seahorse-gkr-operation.h \ - seahorse-gkr-source.c seahorse-gkr-source.h + seahorse-gkr-keyring-deleter.c seahorse-gkr-keyring-deleter.h \ + seahorse-gkr-keyring-properties.c libseahorse_gkr_la_LIBADD = \ $(top_builddir)/libseahorse/libseahorse.la @@ -348,9 +387,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gkr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gkr/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu gkr/Makefile + $(AUTOMAKE) --foreign gkr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -372,13 +411,15 @@ 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 -libseahorse-gkr.la: $(libseahorse_gkr_la_OBJECTS) $(libseahorse_gkr_la_DEPENDENCIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libseahorse-gkr.la: $(libseahorse_gkr_la_OBJECTS) $(libseahorse_gkr_la_DEPENDENCIES) $(EXTRA_libseahorse_gkr_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libseahorse_gkr_la_OBJECTS) $(libseahorse_gkr_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -387,43 +428,39 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-actions.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-add-item.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-add-keyring.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-backend.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-dialogs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-item-commands.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-item-deleter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-item-properties.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-item.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-keyring-commands.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-keyring-deleter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-keyring-properties.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-keyring.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-module.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-operation.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr-source.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gkr.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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -432,8 +469,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -447,9 +487,7 @@ @$(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 + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -500,6 +538,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -550,10 +602,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -639,18 +696,18 @@ .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 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-uiDATA + clean-libtool clean-noinstLTLIBRARIES cscopelist 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 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-uiDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-actions.c seahorse-3.6.3/gkr/seahorse-gkr-actions.c --- seahorse-3.2.2/gkr/seahorse-gkr-actions.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-actions.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,307 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-gkr-actions.h" +#include "seahorse-gkr-backend.h" +#include "seahorse-gkr-keyring.h" +#include "seahorse-gkr-keyring-deleter.h" +#include "seahorse-gkr-dialogs.h" + +#include "seahorse-action.h" +#include "seahorse-actions.h" +#include "seahorse-delete-dialog.h" +#include "seahorse-object-list.h" +#include "seahorse-progress.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" + +#include + +GType seahorse_gkr_backend_actions_get_type (void) G_GNUC_CONST; +#define SEAHORSE_TYPE_GKR_BACKEND_ACTIONS (seahorse_gkr_backend_actions_get_type ()) +#define SEAHORSE_GKR_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_BACKEND_ACTIONS, SeahorseGkrBackendActions)) +#define SEAHORSE_GKR_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_BACKEND_ACTIONS, SeahorseGkrBackendActionsClass)) +#define SEAHORSE_IS_GKR_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_BACKEND_ACTIONS)) +#define SEAHORSE_IS_GKR_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_BACKEND_ACTIONS)) +#define SEAHORSE_GKR_BACKEND_ACTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_BACKEND_ACTIONS, SeahorseGkrBackendActionsClass)) + +typedef struct { + SeahorseActions parent; + gboolean initialized; +} SeahorseGkrBackendActions; + +typedef struct { + SeahorseActionsClass parent; +} SeahorseGkrBackendActionsClass; + +G_DEFINE_TYPE (SeahorseGkrBackendActions, seahorse_gkr_backend_actions, SEAHORSE_TYPE_ACTIONS); + +static void +refresh_all_keyrings (void) +{ + seahorse_gkr_backend_load_async (NULL, NULL, NULL, NULL); +} + +static void +on_new_keyring (GtkAction *action, + gpointer unused) +{ + seahorse_gkr_add_keyring_show (seahorse_action_get_window (action)); +} + +static void +on_new_item (GtkAction *action, + gpointer unused) +{ + seahorse_gkr_add_item_show (seahorse_action_get_window (action)); +} + +static const GtkActionEntry BACKEND_ACTIONS[] = { + { "keyring-new", NULL, N_("New password keyring"), "", + N_("Used to store application and network passwords"), G_CALLBACK (on_new_keyring) }, + { "keyring-item-new", NULL, N_("New password..."), "", + N_("Safely store a password or secret."), G_CALLBACK (on_new_item) }, +}; + +static const GtkActionEntry ENTRIES_NEW[] = { + { "keyring-new", "folder", N_("Password Keyring"), "", + N_("Used to store application and network passwords"), G_CALLBACK (on_new_keyring) }, + { "keyring-item-new", GCR_ICON_PASSWORD, N_("Stored Password"), "", + N_("Safely store a password or secret."), G_CALLBACK (on_new_item) } +}; + +static const gchar* BACKEND_UI = +"" +" " +" " +" "\ +""; + +static void +on_backend_notify_service (GObject *obj, + GParamSpec *pspec, + gpointer user_data) +{ + SeahorseGkrBackendActions *self = SEAHORSE_GKR_BACKEND_ACTIONS (user_data); + GtkActionGroup *actions = GTK_ACTION_GROUP (self); + + if (self->initialized) + return; + if (seahorse_gkr_backend_get_service (SEAHORSE_GKR_BACKEND (obj)) == NULL) + return; + + self->initialized = TRUE; + gtk_action_group_add_actions (actions, BACKEND_ACTIONS, G_N_ELEMENTS (BACKEND_ACTIONS), NULL); + seahorse_actions_register_definition (SEAHORSE_ACTIONS (self), BACKEND_UI); + + /* Register another set of actions as a generator */ + actions = gtk_action_group_new ("gkr-generate"); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, ENTRIES_NEW, G_N_ELEMENTS (ENTRIES_NEW), NULL); + seahorse_registry_register_object (NULL, G_OBJECT (actions), "generator", NULL); + g_object_unref (actions); +} + +static void +seahorse_gkr_backend_actions_init (SeahorseGkrBackendActions *self) +{ + GtkActionGroup *actions = GTK_ACTION_GROUP (self); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); +} + +static void +seahorse_gkr_backend_actions_class_init (SeahorseGkrBackendActionsClass *klass) +{ + +} + +GtkActionGroup * +seahorse_gkr_backend_actions_instance (SeahorseGkrBackend *backend) +{ + static SeahorseGkrBackendActions *actions = NULL; + + if (actions == NULL) { + actions = g_object_new (SEAHORSE_TYPE_GKR_BACKEND_ACTIONS, + "name", "KeyringBackend", + NULL); + g_object_add_weak_pointer (G_OBJECT (actions), + (gpointer *)&actions); + + g_signal_connect_object (backend, "notify::service", + G_CALLBACK (on_backend_notify_service), + actions, G_CONNECT_AFTER); + + if (seahorse_gkr_backend_get_service (backend) != NULL) + on_backend_notify_service (G_OBJECT (backend), NULL, actions); + } else { + g_object_ref (actions); + } + + return GTK_ACTION_GROUP (actions); +} + +static void +on_set_default_keyring_done (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GtkWindow *parent = GTK_WINDOW (user_data); + GError *error = NULL; + + secret_service_set_alias_finish (SECRET_SERVICE (source), result, &error); + if (error != NULL) + seahorse_util_handle_error (&error, parent, _("Couldn't set default keyring")); + + refresh_all_keyrings (); + if (parent) + g_object_unref (parent); +} + +static void +on_keyring_default (GtkAction *action, + gpointer user_data) +{ + SecretCollection *keyring = SECRET_COLLECTION (user_data); + GtkWindow *parent = seahorse_action_get_window (action); + + if (parent != NULL) + g_object_ref (parent); + + secret_service_set_alias (secret_collection_get_service (keyring), "default", + SECRET_COLLECTION (keyring), + NULL, on_set_default_keyring_done, parent); +} + +typedef struct { + SecretService *service; + GtkWindow *parent; +} ChangeClosure; + +static void +change_closure_free (gpointer data) +{ + ChangeClosure *change = data; + g_object_unref (change->service); + if (change->parent) + g_object_unref (change->parent); + g_slice_free (ChangeClosure, change); +} + +static void +on_change_password_done (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + ChangeClosure *change = user_data; + GError *error = NULL; + GVariant *retval; + + retval = secret_service_prompt_at_dbus_path_finish (SECRET_SERVICE (source), result, NULL, &error); + if (retval != NULL) + g_variant_unref (retval); + if (error != NULL) + seahorse_util_handle_error (&error, change->parent, + _("Couldn't change keyring password")); + + refresh_all_keyrings (); + change_closure_free (change); +} + +static void +on_change_password_prompt (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + ChangeClosure *change = user_data; + const gchar *prompt_path; + GError *error = NULL; + GVariant *retval; + + retval = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error); + if (error == NULL) { + g_variant_get (retval, "(&o)", &prompt_path); + secret_service_prompt_at_dbus_path (change->service, prompt_path, NULL, + on_change_password_done, change); + g_variant_unref (retval); + } else { + seahorse_util_handle_error (&error, change->parent, _("Couldn't change keyring password")); + change_closure_free (change); + } +} + +static void +on_keyring_password (GtkAction *action, + gpointer user_data) +{ + SecretCollection *collection = SECRET_COLLECTION (user_data); + GDBusProxy *proxy; + ChangeClosure *change; + + change = g_slice_new0 (ChangeClosure); + change->parent = seahorse_action_get_window (action); + if (change->parent) + g_object_ref (change->parent); + change->service = secret_collection_get_service (collection); + g_return_if_fail (change->service != NULL); + g_object_ref (change->service); + + proxy = G_DBUS_PROXY (change->service); + g_dbus_connection_call (g_dbus_proxy_get_connection (proxy), + g_dbus_proxy_get_name (proxy), + g_dbus_proxy_get_object_path (proxy), + "org.gnome.keyring.InternalUnsupportedGuiltRiddenInterface", + "ChangeWithPrompt", + g_variant_new ("(o)", g_dbus_proxy_get_object_path (G_DBUS_PROXY (collection))), + G_VARIANT_TYPE ("(o)"), + 0, -1, NULL, on_change_password_prompt, change); +} + +static const GtkActionEntry KEYRING_ACTIONS[] = { + { "keyring-default", NULL, N_("_Set as default"), NULL, + N_("Applications usually store new passwords in the default keyring."), G_CALLBACK (on_keyring_default) }, + { "keyring-password", NULL, N_("Change _Password"), NULL, + N_("Change the unlock password of the password storage keyring"), G_CALLBACK (on_keyring_password) }, +}; + +GtkActionGroup * +seahorse_gkr_keyring_actions_new (SeahorseGkrKeyring *keyring) +{ + GtkActionGroup *actions; + GtkAction *action; + + g_return_val_if_fail (SEAHORSE_IS_GKR_KEYRING (keyring), NULL); + + actions = gtk_action_group_new ("KeyringActions"); + + /* Add these actions, but none of them are visible until cloned */ + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions_full (actions, KEYRING_ACTIONS, G_N_ELEMENTS (KEYRING_ACTIONS), + g_object_ref (keyring), g_object_unref); + + action = gtk_action_group_get_action (actions, "keyring-default"); + g_object_bind_property (keyring, "is-default", action, "sensitive", + G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE); + + return actions; +} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-actions.h seahorse-3.6.3/gkr/seahorse-gkr-actions.h --- seahorse-3.2.2/gkr/seahorse-gkr-actions.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-actions.h 2012-08-21 12:23:15.000000000 +0200 @@ -0,0 +1,34 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_GKR_ACTIONS_H__ +#define __SEAHORSE_GKR_ACTIONS_H__ + +#include "seahorse-gkr-backend.h" +#include "seahorse-gkr-keyring.h" + +#include + +GtkActionGroup * seahorse_gkr_backend_actions_instance (SeahorseGkrBackend *backend); + +GtkActionGroup * seahorse_gkr_keyring_actions_new (SeahorseGkrKeyring *keyring); + +#endif /* __SEAHORSE_GKR_ACTIONS_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-add-item.c seahorse-3.6.3/gkr/seahorse-gkr-add-item.c --- seahorse-3.2.2/gkr/seahorse-gkr-add-item.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-add-item.c 2012-11-09 11:08:13.000000000 +0100 @@ -20,11 +20,10 @@ */ #include "config.h" +#include "seahorse-gkr-backend.h" #include "seahorse-gkr-dialogs.h" #include "seahorse-gkr-keyring.h" -#include "seahorse-gkr-source.h" -#include "seahorse-secure-buffer.h" #include "seahorse-widget.h" #include "seahorse-util.h" @@ -41,27 +40,27 @@ gpointer user_data); static void -item_add_done (GnomeKeyringResult result, guint32 item, gpointer data) +on_item_stored (GObject *source, + GAsyncResult *result, + gpointer user_data) { - SeahorseWidget *swidget = SEAHORSE_WIDGET (data); - - g_return_if_fail (swidget); + SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); + GError *error = NULL; + SecretItem *item; /* Clear the operation without cancelling it since it is complete */ seahorse_gkr_dialog_complete_request (swidget, FALSE); - /* Successful. Update the listings and stuff. */ - if (result == GNOME_KEYRING_RESULT_OK) { - seahorse_source_load_async (SEAHORSE_SOURCE (seahorse_gkr_source_default ()), - NULL, NULL, NULL); - - /* Setting the default keyring failed */ - } else if (result != GNOME_KEYRING_RESULT_CANCELLED) { - seahorse_util_show_error (seahorse_widget_get_toplevel (swidget), - _("Couldn't add keyring"), - gnome_keyring_result_to_message (result)); + item = secret_item_create_finish (result, &error); + + if (error == NULL) { + g_object_unref (item); + } else { + seahorse_util_handle_error (&error, seahorse_widget_get_toplevel (swidget), + _("Couldn't add item")); } - + + g_object_unref (swidget); seahorse_widget_destroy (swidget); } @@ -89,45 +88,40 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); + SecretCollection *collection; + GCancellable *cancellable; + GHashTable *attributes; GtkWidget *widget; - gchar *keyring; - const gchar *secret; + SecretValue *secret; const gchar *label; - gpointer request; - GArray *attributes; GtkTreeIter iter; if (response == GTK_RESPONSE_HELP) { seahorse_widget_show_help (swidget); } else if (response == GTK_RESPONSE_ACCEPT) { - + widget = seahorse_widget_get_widget (swidget, "item-keyring"); + if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) + return; + gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (widget)), + &iter, 1, &collection, -1); + widget = seahorse_widget_get_widget (swidget, "item-label"); label = gtk_entry_get_text (GTK_ENTRY (widget)); g_return_if_fail (label && label[0]); widget = g_object_get_data (G_OBJECT (swidget), "gkr-secure-entry"); - secret = gtk_entry_get_text (GTK_ENTRY (widget)); - - widget = seahorse_widget_get_widget (swidget, "item-keyring"); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)) { - gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (widget)), - &iter, 0, &keyring, -1); - } else { - keyring = NULL; - } - - attributes = gnome_keyring_attribute_list_new (); - - request = gnome_keyring_item_create (keyring, GNOME_KEYRING_ITEM_NOTE, label, - attributes, secret, FALSE, item_add_done, - g_object_ref (swidget), g_object_unref); - g_return_if_fail (request); - seahorse_gkr_dialog_begin_request (swidget, request); - - g_free (keyring); - gnome_keyring_attribute_list_free (attributes); - + secret = secret_value_new (gtk_entry_get_text (GTK_ENTRY (widget)), + -1, "text/plain"); + + cancellable = seahorse_gkr_dialog_begin_request (swidget); + attributes = g_hash_table_new (g_str_hash, g_str_equal); + secret_item_create (collection, SECRET_SCHEMA_NOTE, attributes, + label, secret, SECRET_ITEM_CREATE_NONE, + cancellable, on_item_stored, g_object_ref (swidget)); + g_hash_table_unref (attributes); + g_object_unref (cancellable); + } else { seahorse_widget_destroy (swidget); } @@ -149,21 +143,24 @@ /* Load up a list of all the keyrings, and select the default */ widget = seahorse_widget_get_widget (swidget, "item-keyring"); - store = gtk_list_store_new (1, G_TYPE_STRING); + store = gtk_list_store_new (2, G_TYPE_STRING, SECRET_TYPE_COLLECTION); gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); cell = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), cell, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), cell, "text", 0); - - keyrings = seahorse_context_find_objects (NULL, SEAHORSE_GKR, SEAHORSE_USAGE_OTHER, - SEAHORSE_LOCATION_LOCAL); + + keyrings = seahorse_gkr_backend_get_keyrings (NULL); for (l = keyrings; l; l = g_list_next (l)) { gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, seahorse_gkr_keyring_get_name (l->data), -1); + gtk_list_store_set (store, &iter, + 0, secret_collection_get_label (l->data), + 1, l->data, + -1); if (seahorse_gkr_keyring_get_is_default (l->data)) gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &iter); } - + g_list_free (keyrings); + g_object_unref (store); widget = seahorse_widget_get_widget (swidget, "item-label"); @@ -172,7 +169,7 @@ widget = seahorse_widget_get_widget (swidget, "password-area"); g_return_if_fail (widget); - buffer = seahorse_secure_buffer_new (); + buffer = gcr_secure_entry_buffer_new (); entry = gtk_entry_new_with_buffer (buffer); g_object_unref (buffer); gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (entry)); diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-add-item.xml seahorse-3.6.3/gkr/seahorse-gkr-add-item.xml --- seahorse-3.2.2/gkr/seahorse-gkr-add-item.xml 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/gkr/seahorse-gkr-add-item.xml 2012-08-21 12:23:15.000000000 +0200 @@ -44,7 +44,6 @@ True True - 32 • True 16 diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-add-keyring.c seahorse-3.6.3/gkr/seahorse-gkr-add-keyring.c --- seahorse-3.2.2/gkr/seahorse-gkr-add-keyring.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-add-keyring.c 2012-08-21 12:23:15.000000000 +0200 @@ -21,9 +21,9 @@ */ #include "config.h" +#include "seahorse-gkr-backend.h" #include "seahorse-gkr-dialogs.h" #include "seahorse-gkr-keyring.h" -#include "seahorse-gkr-source.h" #include "seahorse-widget.h" #include "seahorse-util.h" @@ -52,27 +52,27 @@ * internal seahorse list of keyrings */ static void -keyring_add_done (GnomeKeyringResult result, gpointer data) +on_keyring_create (GObject *source, + GAsyncResult *result, + gpointer data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (data); + GError *error = NULL; g_return_if_fail (swidget); /* Clear the operation without cancelling it since it is complete */ seahorse_gkr_dialog_complete_request (swidget, FALSE); + secret_collection_create_finish (result, &error); + /* Successful. Update the listings and stuff. */ - if (result == GNOME_KEYRING_RESULT_OK) { - seahorse_source_load_async (SEAHORSE_SOURCE (seahorse_gkr_source_default ()), - NULL, NULL, NULL); - - /* Setting the default keyring failed */ - } else if (result != GNOME_KEYRING_RESULT_CANCELLED) { - seahorse_util_show_error (seahorse_widget_get_toplevel (swidget), - _("Couldn't add keyring"), - gnome_keyring_result_to_message (result)); + if (error != NULL) { + seahorse_util_handle_error (&error, seahorse_widget_get_toplevel (swidget), + _("Couldn't add keyring")); } - + + g_object_unref (swidget); seahorse_widget_destroy (swidget); } @@ -109,10 +109,10 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); + GCancellable *cancellable; GtkEntry *entry; const gchar *keyring; - gpointer request; - + if (response == GTK_RESPONSE_HELP) { seahorse_widget_show_help (swidget); @@ -123,11 +123,15 @@ keyring = gtk_entry_get_text (entry); g_return_if_fail (keyring && keyring[0]); - - request = gnome_keyring_create (keyring, NULL, keyring_add_done, g_object_ref (swidget), g_object_unref); - g_return_if_fail (request); - seahorse_gkr_dialog_begin_request (swidget, request); - + + cancellable = seahorse_gkr_dialog_begin_request (swidget); + + secret_collection_create (seahorse_gkr_backend_get_service (NULL), + keyring, NULL, SECRET_COLLECTION_NONE, + cancellable, on_keyring_create, + g_object_ref (swidget)); + g_object_unref (cancellable); + } else { seahorse_widget_destroy (swidget); } diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-backend.c seahorse-3.6.3/gkr/seahorse-gkr-backend.c --- seahorse-3.2.2/gkr/seahorse-gkr-backend.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-backend.c 2012-08-21 12:23:15.000000000 +0200 @@ -0,0 +1,498 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-gkr-actions.h" +#include "seahorse-gkr-backend.h" +#include "seahorse-gkr-dialogs.h" + +#include "seahorse-backend.h" +#include "seahorse-progress.h" + +#include + + +typedef SecretService MySecretService; +typedef SecretServiceClass MySecretServiceClass; + +GType my_secret_service_get_type (void); + +G_DEFINE_TYPE (MySecretService, my_secret_service, SECRET_TYPE_SERVICE); + +static void +my_secret_service_init (MySecretService *self) +{ + +} + +static void +my_secret_service_class_init (MySecretServiceClass *klass) +{ + klass->collection_gtype = SEAHORSE_TYPE_GKR_KEYRING; + klass->item_gtype = SEAHORSE_TYPE_GKR_ITEM; +} + +enum { + PROP_0, + PROP_NAME, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ACTIONS, + PROP_ALIASES, + PROP_SERVICE +}; + +static SeahorseGkrBackend *gkr_backend = NULL; + +struct _SeahorseGkrBackend { + GObject parent; + SecretService *service; + GHashTable *keyrings; + GHashTable *aliases; + GtkActionGroup *actions; +}; + +struct _SeahorseGkrBackendClass { + GObjectClass parent_class; +}; + +static void seahorse_gkr_backend_iface (SeahorseBackendIface *iface); + +static void seahorse_gkr_backend_collection_init (GcrCollectionIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseGkrBackend, seahorse_gkr_backend, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_gkr_backend_collection_init); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_BACKEND, seahorse_gkr_backend_iface); +); + +static void +seahorse_gkr_backend_init (SeahorseGkrBackend *self) +{ + g_return_if_fail (gkr_backend == NULL); + gkr_backend = self; + + self->actions = seahorse_gkr_backend_actions_instance (self); + self->keyrings = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_object_unref); + self->aliases = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_free); +} + +static void +refresh_collection (SeahorseGkrBackend *self) +{ + GHashTable *seen = NULL; + GHashTableIter iter; + const gchar *object_path; + SeahorseGkrKeyring *keyring; + GList *keyrings; + GList *l; + + seen = g_hash_table_new (g_str_hash, g_str_equal); + + keyrings = secret_service_get_collections (self->service); + + /* Add any keyrings we don't have */ + for (l = keyrings; l != NULL; l = g_list_next (l)) { + object_path = g_dbus_proxy_get_object_path (l->data); + + /* Don't list the session keyring */ + if (g_strcmp0 (g_hash_table_lookup (self->aliases, "session"), object_path) == 0) + continue; + + keyring = l->data; + g_hash_table_add (seen, (gpointer)object_path); + + if (!g_hash_table_lookup (self->keyrings, object_path)) { + g_hash_table_insert (self->keyrings, + g_strdup (object_path), + g_object_ref (keyring)); + gcr_collection_emit_added (GCR_COLLECTION (self), G_OBJECT (keyring)); + } + } + + /* Remove any that we didn't find */ + g_hash_table_iter_init (&iter, self->keyrings); + while (g_hash_table_iter_next (&iter, (gpointer *)&object_path, NULL)) { + if (!g_hash_table_lookup (seen, object_path)) { + keyring = g_hash_table_lookup (self->keyrings, object_path); + g_object_ref (keyring); + g_hash_table_iter_remove (&iter); + gcr_collection_emit_removed (GCR_COLLECTION (self), G_OBJECT (keyring)); + g_object_unref (keyring); + } + } + + g_hash_table_destroy (seen); + g_list_free_full (keyrings, g_object_unref); +} + +static void +on_notify_collections (GObject *obj, + GParamSpec *pspec, + gpointer user_data) +{ + refresh_collection (SEAHORSE_GKR_BACKEND (user_data)); +} + +static void +on_service_new (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (user_data); + GError *error = NULL; + + self->service = secret_service_new_finish (result, &error); + if (error == NULL) { + g_signal_connect (self->service, "notify::collections", G_CALLBACK (on_notify_collections), self); + refresh_collection (self); + + secret_service_load_collections (self->service, NULL, NULL, NULL); + seahorse_gkr_backend_load_async (self, NULL, NULL, NULL); + } else { + g_warning ("couldn't connect to secret service: %s", error->message); + g_error_free (error); + } + + g_object_notify (G_OBJECT (self), "service"); + g_object_unref (self); +} + +static void +seahorse_gkr_backend_constructed (GObject *obj) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (obj); + + G_OBJECT_CLASS (seahorse_gkr_backend_parent_class)->constructed (obj); + + secret_service_new (my_secret_service_get_type (), NULL, SECRET_SERVICE_OPEN_SESSION, + NULL, on_service_new, g_object_ref (self)); +} + +static void +seahorse_gkr_backend_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (obj); + + switch (prop_id) { + case PROP_NAME: + g_value_set_string (value, SEAHORSE_GKR_NAME); + break; + case PROP_LABEL: + g_value_set_string (value, _("Passwords")); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, _("Stored personal passwords, credentials and secrets")); + break; + case PROP_ACTIONS: + g_value_set_object (value, self->actions); + break; + case PROP_ALIASES: + g_value_set_boxed (value, self->aliases); + break; + case PROP_SERVICE: + g_value_set_object (value, self->service); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_gkr_backend_dispose (GObject *obj) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (obj); + + if (self->service) { + g_signal_handlers_disconnect_by_func (self->service, on_notify_collections, self); + g_object_unref (self->service); + self->service = NULL; + } + + g_hash_table_remove_all (self->keyrings); + g_hash_table_remove_all (self->aliases); + gtk_action_group_set_sensitive (self->actions, FALSE); + + G_OBJECT_CLASS (seahorse_gkr_backend_parent_class)->finalize (obj); +} + +static void +seahorse_gkr_backend_finalize (GObject *obj) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (obj); + + g_assert (self->service == NULL); + + g_hash_table_destroy (self->keyrings); + g_hash_table_destroy (self->aliases); + g_clear_object (&self->actions); + + g_return_if_fail (gkr_backend == self); + gkr_backend = NULL; + + G_OBJECT_CLASS (seahorse_gkr_backend_parent_class)->finalize (obj); +} + +static void +seahorse_gkr_backend_class_init (SeahorseGkrBackendClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->constructed = seahorse_gkr_backend_constructed; + gobject_class->dispose = seahorse_gkr_backend_dispose; + gobject_class->finalize = seahorse_gkr_backend_finalize; + gobject_class->get_property = seahorse_gkr_backend_get_property; + + g_object_class_override_property (gobject_class, PROP_NAME, "name"); + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); + + g_object_class_install_property (gobject_class, PROP_ALIASES, + g_param_spec_boxed ("aliases", "aliases", "Aliases", + G_TYPE_HASH_TABLE, G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_SERVICE, + g_param_spec_object ("service", "Service", "Service", + SECRET_TYPE_SERVICE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); +} + +static guint +seahorse_gkr_backend_get_length (GcrCollection *collection) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (collection); + return g_hash_table_size (self->keyrings); +} + +static GList * +seahorse_gkr_backend_get_objects (GcrCollection *collection) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (collection); + return seahorse_gkr_backend_get_keyrings (self); +} + +static gboolean +seahorse_gkr_backend_contains (GcrCollection *collection, + GObject *object) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (collection); + gboolean have; + gchar *uri; + + if (!SEAHORSE_IS_GKR_KEYRING (object)) + return FALSE; + + g_object_get (object, "uri", &uri, NULL); + have = (g_hash_table_lookup (self->keyrings, uri) == object); + g_free (uri); + + return have; +} + +static void +seahorse_gkr_backend_collection_init (GcrCollectionIface *iface) +{ + iface->contains = seahorse_gkr_backend_contains; + iface->get_length = seahorse_gkr_backend_get_length; + iface->get_objects = seahorse_gkr_backend_get_objects; +} + +static SeahorsePlace * +seahorse_gkr_backend_lookup_place (SeahorseBackend *backend, + const gchar *uri) +{ + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (backend); + return g_hash_table_lookup (self->keyrings, uri); +} + +static void +seahorse_gkr_backend_iface (SeahorseBackendIface *iface) +{ + iface->lookup_place = seahorse_gkr_backend_lookup_place; +} + +void +seahorse_gkr_backend_initialize (void) +{ + SeahorseGkrBackend *self; + + g_return_if_fail (gkr_backend == NULL); + self = g_object_new (SEAHORSE_TYPE_GKR_BACKEND, NULL); + + seahorse_backend_register (SEAHORSE_BACKEND (self)); + g_object_unref (self); + + g_return_if_fail (gkr_backend != NULL); +} + +SeahorseGkrBackend * +seahorse_gkr_backend_get (void) +{ + g_return_val_if_fail (gkr_backend, NULL); + return gkr_backend; +} + +SecretService * +seahorse_gkr_backend_get_service (SeahorseGkrBackend *self) +{ + self = self ? self : seahorse_gkr_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_GKR_BACKEND (self), NULL); + return self->service; +} + +GList * +seahorse_gkr_backend_get_keyrings (SeahorseGkrBackend *self) +{ + self = self ? self : seahorse_gkr_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_GKR_BACKEND (self), NULL); + return g_hash_table_get_values (self->keyrings); +} + +typedef struct { + gint outstanding; +} LoadClosure; + +static void +on_load_read_alias (GObject *source, + GAsyncResult *result, + const gchar *alias, + gpointer user_data) +{ + GSimpleAsyncResult *async = G_SIMPLE_ASYNC_RESULT (user_data); + LoadClosure *load = g_simple_async_result_get_op_res_gpointer (async); + SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (g_async_result_get_source_object (user_data)); + GError *error = NULL; + gchar *path; + + path = secret_service_read_alias_dbus_path_finish (SECRET_SERVICE (source), result, &error); + if (path != NULL) { + g_hash_table_replace (self->aliases, g_strdup (alias), path); + g_object_notify (G_OBJECT (self), "aliases"); + } + + if (error != NULL) + g_simple_async_result_take_error (async, error); + + load->outstanding--; + if (load->outstanding <= 0) { + refresh_collection (self); + g_simple_async_result_complete (async); + } + + g_object_unref (self); + g_object_unref (async); + +} +static void +on_load_read_default_alias (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + on_load_read_alias (source, result, "default", user_data); +} + +static void +on_load_read_session_alias (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + on_load_read_alias (source, result, "session", user_data); +} + +static void +on_load_read_login_alias (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + on_load_read_alias (source, result, "login", user_data); +} + +void +seahorse_gkr_backend_load_async (SeahorseGkrBackend *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + LoadClosure *load; + GSimpleAsyncResult *async; + + self = self ? self : seahorse_gkr_backend_get (); + + async = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gkr_backend_load_async); + load = g_new0 (LoadClosure, 1); + load->outstanding = 0; + g_simple_async_result_set_op_res_gpointer (async, load, g_free); + + if (!self->service) { + g_simple_async_result_complete_in_idle (async); + g_object_unref (async); + return; + } + + secret_service_read_alias_dbus_path (self->service, "default", cancellable, + on_load_read_default_alias, g_object_ref (async)); + load->outstanding++; + + secret_service_read_alias_dbus_path (self->service, "session", cancellable, + on_load_read_session_alias, g_object_ref (async)); + load->outstanding++; + + secret_service_read_alias_dbus_path (self->service, "login", cancellable, + on_load_read_login_alias, g_object_ref (async)); + load->outstanding++; + + g_object_unref (async); +} + +gboolean +seahorse_gkr_backend_load_finish (SeahorseGkrBackend *self, + GAsyncResult *result, + GError **error) +{ + self = self ? self : seahorse_gkr_backend_get (); + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_gkr_backend_load_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +gboolean +seahorse_gkr_backend_has_alias (SeahorseGkrBackend *self, + const gchar *alias, + SeahorseGkrKeyring *keyring) +{ + const gchar *object_path; + + self = self ? self : seahorse_gkr_backend_get (); + object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY (keyring)); + return g_strcmp0 (g_hash_table_lookup (self->aliases, alias), object_path) == 0; +} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-backend.h seahorse-3.6.3/gkr/seahorse-gkr-backend.h --- seahorse-3.2.2/gkr/seahorse-gkr-backend.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-backend.h 2012-08-21 12:23:15.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef SEAHORSE_GKR_BACKEND_H_ +#define SEAHORSE_GKR_BACKEND_H_ + +#include +#include + +#include + +#include "seahorse-gkr-keyring.h" + +G_BEGIN_DECLS + +#define SEAHORSE_TYPE_GKR_BACKEND (seahorse_gkr_backend_get_type ()) +#define SEAHORSE_GKR_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_BACKEND, SeahorseGkrBackend)) +#define SEAHORSE_GKR_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_BACKEND, SeahorseGkrBackendClass)) +#define SEAHORSE_IS_GKR_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_BACKEND)) +#define SEAHORSE_IS_GKR_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_BACKEND)) +#define SEAHORSE_GKR_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_BACKEND, SeahorseGkrBackendClass)) + +typedef struct _SeahorseGkrBackend SeahorseGkrBackend; +typedef struct _SeahorseGkrBackendClass SeahorseGkrBackendClass; + +GType seahorse_gkr_backend_get_type (void) G_GNUC_CONST; + +SeahorseGkrBackend * seahorse_gkr_backend_get (void); + +SecretService * seahorse_gkr_backend_get_service (SeahorseGkrBackend *self); + +GList * seahorse_gkr_backend_get_keyrings (SeahorseGkrBackend *self); + +gboolean seahorse_gkr_backend_has_alias (SeahorseGkrBackend *self, + const gchar *alias, + SeahorseGkrKeyring *keyring); + +void seahorse_gkr_backend_load_async (SeahorseGkrBackend *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_gkr_backend_load_finish (SeahorseGkrBackend *self, + GAsyncResult *result, + GError **error); + +G_END_DECLS + +#endif /*SEAHORSE_GKR_BACKEND_H_*/ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-dialogs.c seahorse-3.6.3/gkr/seahorse-gkr-dialogs.c --- seahorse-3.2.2/gkr/seahorse-gkr-dialogs.c 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/gkr/seahorse-gkr-dialogs.c 2012-08-21 12:23:15.000000000 +0200 @@ -51,16 +51,23 @@ gdk_window_set_cursor (gtk_widget_get_window (dialog), cursor); } -void -seahorse_gkr_dialog_begin_request (SeahorseWidget *swidget, gpointer request) +static void +cancel_and_unref_cancellable (gpointer data) +{ + GCancellable *cancellable = data; + g_cancellable_cancel (cancellable); + g_object_unref (cancellable); +} + +GCancellable * +seahorse_gkr_dialog_begin_request (SeahorseWidget *swidget) { + GCancellable *cancellable; GtkWidget *dialog; - - g_return_if_fail (request); - + dialog = seahorse_widget_get_toplevel (swidget); - g_return_if_fail (GTK_IS_WIDGET (dialog)); - + g_return_val_if_fail (GTK_IS_WIDGET (dialog), NULL); + /* Cancel any old operation going on */ seahorse_gkr_dialog_complete_request (swidget, TRUE); @@ -68,8 +75,10 @@ * Start the operation and tie it to the widget so that it will get * cancelled if the widget is destroyed before the operation is complete */ - g_object_set_data_full (G_OBJECT (dialog), "gkr-request", request, - gnome_keyring_cancel_request); + cancellable = g_cancellable_new (); + g_object_set_data_full (G_OBJECT (dialog), "gkr-request", + g_object_ref (cancellable), + cancel_and_unref_cancellable); if (gtk_widget_get_realized (dialog)) update_wait_cursor (dialog, NULL); @@ -77,20 +86,23 @@ g_signal_connect (dialog, "realize", G_CALLBACK (update_wait_cursor), dialog); gtk_widget_set_sensitive (dialog, FALSE); + return cancellable; } void seahorse_gkr_dialog_complete_request (SeahorseWidget *swidget, gboolean cancel) { GtkWidget *dialog; - gpointer request; - + GCancellable *cancellable; + dialog = seahorse_widget_get_toplevel (swidget); g_return_if_fail (GTK_IS_WIDGET (dialog)); - - request = g_object_steal_data (G_OBJECT (dialog), "gkr-request"); - if (request && cancel) - gnome_keyring_cancel_request (request); + + cancellable = g_object_steal_data (G_OBJECT (dialog), "gkr-request"); + if (cancellable && cancel) + g_cancellable_cancel (cancellable); + if (cancellable) + g_object_unref (cancellable); if (gtk_widget_get_realized (dialog)) update_wait_cursor (dialog, NULL); diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-dialogs.h seahorse-3.6.3/gkr/seahorse-gkr-dialogs.h --- seahorse-3.2.2/gkr/seahorse-gkr-dialogs.h 2011-09-14 17:04:57.000000000 +0200 +++ seahorse-3.6.3/gkr/seahorse-gkr-dialogs.h 2012-10-18 21:08:43.000000000 +0200 @@ -38,7 +38,7 @@ void seahorse_gkr_keyring_properties_show (SeahorseGkrKeyring *gkr, GtkWindow *parent); -void seahorse_gkr_dialog_begin_request (SeahorseWidget *swidget, gpointer request); +GCancellable * seahorse_gkr_dialog_begin_request (SeahorseWidget *swidget); void seahorse_gkr_dialog_complete_request (SeahorseWidget *swidget, gboolean cancel); diff -Nru seahorse-3.2.2/gkr/seahorse-gkr.h seahorse-3.6.3/gkr/seahorse-gkr.h --- seahorse-3.2.2/gkr/seahorse-gkr.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr.h 2012-08-21 12:23:16.000000000 +0200 @@ -25,10 +25,13 @@ #include #include +#include + G_BEGIN_DECLS -#define SEAHORSE_GKR_TYPE_STR "gnome-keyring" -#define SEAHORSE_GKR_TYPE g_quark_from_string ("gnome-keyring") +#define SEAHORSE_GKR_NAME "gkr" + +void seahorse_gkr_backend_initialize (void); G_END_DECLS diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-item.c seahorse-3.6.3/gkr/seahorse-gkr-item.c --- seahorse-3.2.2/gkr/seahorse-gkr-item.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-item.c 2012-11-12 08:24:12.000000000 +0100 @@ -22,265 +22,127 @@ #include "config.h" +#include #include #include -#include "seahorse-context.h" -#include "seahorse-source.h" -#include "seahorse-gtkstock.h" -#include "seahorse-util.h" -#include "seahorse-secure-memory.h" - #include "seahorse-gkr.h" +#include "seahorse-gkr-actions.h" +#include "seahorse-gkr-dialogs.h" #include "seahorse-gkr-item.h" -#include "seahorse-gkr-operation.h" +#include "seahorse-gkr-item-deleter.h" +#include "seahorse-gkr-keyring.h" -/* For gnome-keyring secret type ids */ -#ifdef WITH_PGP -#include "pgp/seahorse-pgp.h" -#endif -#ifdef WITH_SSH -#include "ssh/seahorse-ssh.h" -#endif - -/* XXX Copied from libgnomeui */ -#define GNOME_STOCK_AUTHENTICATION "gnome-stock-authentication" -#define GNOME_STOCK_BOOK_OPEN "gnome-stock-book-open" -#define GNOME_STOCK_BLANK "gnome-stock-blank" +#include "seahorse-deletable.h" +#include "seahorse-icons.h" +#include "seahorse-place.h" +#include "seahorse-util.h" +#include "seahorse-viewable.h" -enum { - PROP_0, - PROP_KEYRING_NAME, - PROP_ITEM_ID, - PROP_ITEM_INFO, - PROP_ITEM_ATTRIBUTES, - PROP_HAS_SECRET, - PROP_USE +#define GENERIC_SECRET "org.freedesktop.Secret.Generic" +#define NETWORK_PASSWORD "org.gnome.keyring.NetworkPassword" +#define KEYRING_NOTE "org.gnome.keyring.Note" +#define CHAINED_KEYRING "org.gnome.keyring.ChainedKeyring" +#define ENCRYPTION_KEY "org.gnome.keyring.EncryptionKey" +#define PK_STORAGE "org.gnome.keyring.PkStorage" +#define CHROME_PASSWORD "x.internal.Chrome" +#define GOA_PASSWORD "org.gnome.OnlineAccounts" +#define TELEPATHY_PASSWORD "org.freedesktop.Telepathy" +#define EMPATHY_PASSWORD "org.freedesktop.Empathy" +#define NETWORK_MANAGER_SECRET "org.freedesktop.NetworkManager" + +typedef struct _DisplayEntry DisplayEntry; +typedef struct _DisplayInfo DisplayInfo; + +typedef void (*DisplayCustom) (const DisplayEntry *entry, + const gchar *label, + GHashTable *item_attrs, + DisplayInfo *info); + +struct _DisplayEntry { + const gchar *item_type; + const gchar *description; + DisplayCustom custom_func; }; -struct _SeahorseGkrItemPrivate { - gchar *keyring_name; - guint32 item_id; - - gpointer req_info; - GnomeKeyringItemInfo *item_info; - - gpointer req_attrs; - GnomeKeyringAttributeList *item_attrs; - - gpointer req_secret; - gchar *item_secret; +struct _DisplayInfo { + const gchar *item_type; + gchar *label; + gchar *details; + const gchar *description; }; -G_DEFINE_TYPE (SeahorseGkrItem, seahorse_gkr_item, SEAHORSE_TYPE_OBJECT); - -/* ----------------------------------------------------------------------------- - * INTERNAL HELPERS - */ - -static GType -boxed_item_info_type (void) -{ - static GType type = 0; - if (!type) - type = g_boxed_type_register_static ("GnomeKeyringItemInfo", - (GBoxedCopyFunc)gnome_keyring_item_info_copy, - (GBoxedFreeFunc)gnome_keyring_item_info_free); - return type; -} - -static GType -boxed_attributes_type (void) -{ - static GType type = 0; - if (!type) - type = g_boxed_type_register_static ("GnomeKeyringAttributeList", - (GBoxedCopyFunc)gnome_keyring_attribute_list_copy, - (GBoxedFreeFunc)gnome_keyring_attribute_list_free); - return type; -} +typedef struct { + const gchar *item_type; + const gchar *mapped_type; + const gchar *match_attribute; + const gchar *match_pattern; +} MappingEntry; -static gboolean -received_result (SeahorseGkrItem *self, GnomeKeyringResult result) +static guint32 +get_attribute_int (GHashTable *attrs, + const gchar *name) { - if (result == GNOME_KEYRING_RESULT_CANCELLED) - return FALSE; - - if (result == GNOME_KEYRING_RESULT_OK) - return TRUE; + const gchar *value; + gchar *end; + guint32 num; - /* TODO: Implement so that we can display an error icon, along with some text */ - g_message ("failed to retrieve item %d from keyring %s: %s", - self->pv->item_id, self->pv->keyring_name, - gnome_keyring_result_to_message (result)); - return FALSE; -} + if (!attrs) + return 0; -static void -received_item_info (GnomeKeyringResult result, GnomeKeyringItemInfo *info, gpointer data) -{ - SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (data); - self->pv->req_info = NULL; - if (received_result (self, result)) - seahorse_gkr_item_set_info (self, info); -} - -static void -load_item_info (SeahorseGkrItem *self) -{ - /* Already in progress */ - if (!self->pv->req_info) { - g_object_ref (self); - self->pv->req_info = gnome_keyring_item_get_info_full (self->pv->keyring_name, - self->pv->item_id, - GNOME_KEYRING_ITEM_INFO_BASICS, - received_item_info, - self, g_object_unref); + value = g_hash_table_lookup (attrs, name); + if (value != NULL) { + num = strtoul (value, &end, 10); + if (end && *end == '\0') + return num; } -} -static gboolean -require_item_info (SeahorseGkrItem *self) -{ - if (!self->pv->item_info) - load_item_info (self); - return self->pv->item_info != NULL; + return 0; } -static void -received_item_secret (GnomeKeyringResult result, GnomeKeyringItemInfo *info, gpointer data) +static const gchar * +get_attribute_string (GHashTable *attrs, + const gchar *name) { - SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (data); - self->pv->req_secret = NULL; - if (received_result (self, result)) { - g_free (self->pv->item_secret); - WITH_SECURE_MEM (self->pv->item_secret = gnome_keyring_item_info_get_secret (info)); - g_object_notify (G_OBJECT (self), "has-secret"); - } -} + if (!attrs) + return NULL; -static void -load_item_secret (SeahorseGkrItem *self) -{ - /* Already in progress */ - if (!self->pv->req_secret) { - g_object_ref (self); - self->pv->req_secret = gnome_keyring_item_get_info_full (self->pv->keyring_name, - self->pv->item_id, - GNOME_KEYRING_ITEM_INFO_SECRET, - received_item_secret, - self, g_object_unref); - } + return g_hash_table_lookup (attrs, name); } static gboolean -require_item_secret (SeahorseGkrItem *self) -{ - if (!self->pv->item_secret) - load_item_secret (self); - return self->pv->item_secret != NULL; -} - -static void -received_item_attrs (GnomeKeyringResult result, GnomeKeyringAttributeList *attrs, gpointer data) -{ - SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (data); - self->pv->req_attrs = NULL; - if (received_result (self, result)) - seahorse_gkr_item_set_attributes (self, attrs); -} - -static void -load_item_attrs (SeahorseGkrItem *self) +is_network_item (GHashTable *attrs, + const gchar *match) { - /* Already in progress */ - if (!self->pv->req_attrs) { - g_object_ref (self); - self->pv->req_attrs = gnome_keyring_item_get_attributes (self->pv->keyring_name, - self->pv->item_id, - received_item_attrs, - self, g_object_unref); - } -} + const gchar *protocol; -static gboolean -require_item_attrs (SeahorseGkrItem *self) -{ - if (!self->pv->item_attrs) - load_item_attrs (self); - return self->pv->item_attrs != NULL; -} + g_assert (match); -static guint32 -find_attribute_int (GnomeKeyringAttributeList *attrs, const gchar *name) -{ - guint i; - - if (!attrs) - return 0; - - for (i = 0; i < attrs->len; i++) { - GnomeKeyringAttribute *attr = &(gnome_keyring_attribute_list_index (attrs, i)); - if (g_ascii_strcasecmp (name, attr->name) == 0 && - attr->type == GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32) - return attr->value.integer; - } - - return 0; + protocol = get_attribute_string (attrs, "protocol"); + return protocol && strcasecmp (protocol, match) == 0; } - static gboolean -is_network_item (SeahorseGkrItem *self, const gchar *match) +is_custom_network_label (const gchar *server, + const gchar *user, + const gchar *object, + guint32 port, + const gchar *display) { - const gchar *protocol; - - if (!require_item_info (self)) - return FALSE; - - if (gnome_keyring_item_info_get_type (self->pv->item_info) != GNOME_KEYRING_ITEM_NETWORK_PASSWORD) - return FALSE; - - if (!match) - return TRUE; - - protocol = seahorse_gkr_item_get_attribute (self, "protocol"); - return protocol && g_ascii_strncasecmp (protocol, match, strlen (match)) == 0; -} - -static gboolean -is_custom_display_name (SeahorseGkrItem *self, const gchar *display) -{ - const gchar *user; - const gchar *server; - const gchar *object; - guint32 port; GString *generated; gboolean ret; - - if (require_item_info (self) && gnome_keyring_item_info_get_type (self->pv->item_info) != - GNOME_KEYRING_ITEM_NETWORK_PASSWORD) - return TRUE; - - if (!require_item_attrs (self) || !display) - return TRUE; - - /* - * For network passwords gnome-keyring generates in a funky looking display - * name that's generated from login credentials. We simulate that generating - * here and return FALSE if it matches. This allows us to display user + + /* + * For network passwords gnome-keyring generates in a funky looking display + * name that's generated from login credentials. We simulate that generating + * here and return FALSE if it matches. This allows us to display user * customized display names and ignore the generated ones. */ - - user = seahorse_gkr_item_get_attribute (self, "user"); - server = seahorse_gkr_item_get_attribute (self, "server"); - object = seahorse_gkr_item_get_attribute (self, "object"); - port = find_attribute_int (self->pv->item_attrs, "port"); - + if (!server) return TRUE; - + generated = g_string_new (NULL); if (user != NULL) g_string_append_printf (generated, "%s@", user); @@ -292,203 +154,436 @@ ret = strcmp (display, generated->str) != 0; g_string_free (generated, TRUE); - + return ret; } -static gchar* -calc_display_name (SeahorseGkrItem *self, gboolean always) +static gchar * +calc_network_label (GHashTable *attrs, + gboolean always) { const gchar *val; - gchar *display; - - if (!require_item_info (self)) - return NULL; - - display = gnome_keyring_item_info_get_display_name (self->pv->item_info); - - /* If it's customized by the application or user then display that */ - if (is_custom_display_name (self, display)) - return display; - - /* If it's a network item ... */ - if (gnome_keyring_item_info_get_type (self->pv->item_info) == GNOME_KEYRING_ITEM_NETWORK_PASSWORD) { - - /* HTTP usually has a the realm as the "object" display that */ - if (is_network_item (self, "http") && self->pv->item_attrs) { - val = seahorse_gkr_item_get_attribute (self, "object"); - if (val && val[0]) { - g_free (display); - return g_strdup (val); - } - } - + + /* HTTP usually has a the realm as the "object" display that */ + if (is_network_item (attrs, "http") && attrs != NULL) { + val = get_attribute_string (attrs, "object"); + if (val && val[0]) + return g_strdup (val); + /* Display the server name as a last resort */ if (always) { - val = seahorse_gkr_item_get_attribute (self, "server"); - if (val && val[0]) { - g_free (display); + val = get_attribute_string (attrs, "server"); + if (val && val[0]) return g_strdup (val); - } } } - - return always ? display : NULL; + + return NULL; } -static gchar* -calc_network_item_markup (SeahorseGkrItem *self) +static void +network_custom (const DisplayEntry *entry, + const gchar *display, + GHashTable *attrs, + DisplayInfo *info) { const gchar *object; const gchar *user; const gchar *protocol; const gchar *server; - - gchar *uri = NULL; - gchar *display = NULL; - gchar *ret; - - server = seahorse_gkr_item_get_attribute (self, "server"); - protocol = seahorse_gkr_item_get_attribute (self, "protocol"); - object = seahorse_gkr_item_get_attribute (self, "object"); - user = seahorse_gkr_item_get_attribute (self, "user"); + guint32 port; + + server = get_attribute_string (attrs, "server"); + protocol = get_attribute_string (attrs, "protocol"); + object = get_attribute_string (attrs, "object"); + user = get_attribute_string (attrs, "user"); + port = get_attribute_int (attrs, "port"); if (!protocol) - return NULL; - - /* The object in HTTP often isn't a path at all */ - if (is_network_item (self, "http")) - object = NULL; - - display = calc_display_name (self, TRUE); - + return; + + /* If it's customized by the application or user then display that */ + if (!is_custom_network_label (server, user, object, port, display)) + info->label = calc_network_label (attrs, TRUE); + if (info->label == NULL) + info->label = g_strdup (display); + if (server && protocol) { - uri = g_strdup_printf (" %s://%s%s%s/%s", - protocol, - user ? user : "", - user ? "@" : "", - server, - object ? object : ""); - } - - ret = g_markup_printf_escaped ("%s%s", - display, uri ? uri : ""); - g_free (display); - g_free (uri); - - return ret; + info->details = g_markup_printf_escaped ("%s://%s%s%s/%s", + protocol, + user ? user : "", + user ? "@" : "", + server, + object ? object : ""); + } } -static gchar* -calc_name_markup (SeahorseGkrItem *self) +static void +chrome_custom (const DisplayEntry *entry, + const gchar *display, + GHashTable *attrs, + DisplayInfo *info) +{ + const gchar *origin; + GRegex *regex; + GMatchInfo *match; + + origin = get_attribute_string (attrs, "origin_url"); + + /* A brain dead url, parse */ + if (g_strcmp0 (display, origin) == 0) { + regex = g_regex_new ("[a-z]+://([^/]+)/", G_REGEX_CASELESS, 0, NULL); + if (g_regex_match (regex, display, G_REGEX_MATCH_ANCHORED, &match)) { + if (g_match_info_matches (match)) + info->label = g_match_info_fetch (match, 1); + g_match_info_free (match); + } + g_regex_unref (regex); + } + + if (info->label == NULL) + info->label = g_strdup (display); + + info->details = g_markup_escape_text (origin ? origin : "", -1); +} + +static gchar * +decode_telepathy_id (const gchar *account) { - gchar *name, *markup = NULL; - - if (!require_item_info (self)) - return NULL; - - /* Only do our special markup for network passwords */ - if (is_network_item (self, NULL)) - markup = calc_network_item_markup (self); - - if (!markup) { - name = calc_display_name (self, TRUE); - markup = g_markup_escape_text (name, -1); - g_free (name); - } - - return markup; -} - -static gint -calc_item_type (SeahorseGkrItem *self) -{ - if (!require_item_info (self)) - return -1; - return gnome_keyring_item_info_get_type (self->pv->item_info); + gchar *value; + gchar *result; + gchar *pos; + gsize len; + + value = g_strdup (account); + while ((pos = strchr (value, '_')) != NULL) + *pos = '%'; + + len = strlen (value); + + if (len > 0 && value[len - 1] == '0') + value[len - 1] = '\0'; + + result = g_uri_unescape_string (value, ""); + g_free (value); + + if (result != NULL) + return result; + + return NULL; } -/* ----------------------------------------------------------------------------- - * OBJECT - */ +static void +empathy_custom (const DisplayEntry *entry, + const gchar *display, + GHashTable *attrs, + DisplayInfo *info) +{ + const gchar *account; + GMatchInfo *match; + GRegex *regex; + gchar *identifier; + const gchar *prefix; + gchar *pos; + gsize len; + + account = get_attribute_string (attrs, "account-id"); + + /* Translators: This should be the same as the string in empathy */ + prefix = _("IM account password for "); + + if (g_str_has_prefix (display, prefix)) { + len = strlen (prefix); + pos = strchr (display + len, '('); + if (pos != NULL) + info->label = g_strndup (display + len, pos - (display + len)); + + regex = g_regex_new ("^.+/.+/(.+)$", G_REGEX_CASELESS, 0, NULL); + if (g_regex_match (regex, account, G_REGEX_MATCH_ANCHORED, &match)) { + if (g_match_info_matches (match)) { + identifier = g_match_info_fetch (match, 1); + info->details = decode_telepathy_id (identifier); + g_free (identifier); + } + g_match_info_free (match); + } + g_regex_unref (regex); + } -void -seahorse_gkr_item_realize (SeahorseGkrItem *self) + if (info->label == NULL) + info->label = g_strdup (display); + + if (info->details == NULL) + info->details = g_markup_escape_text (account, -1); +} + +static void +telepathy_custom (const DisplayEntry *entry, + const gchar *display, + GHashTable *attrs, + DisplayInfo *info) { - gchar *display; - gchar *markup; + const gchar *account; + GMatchInfo *match; + GRegex *regex; gchar *identifier; - const gchar *icon; - display = calc_display_name (self, TRUE); - markup = calc_name_markup(self); - identifier = g_strdup_printf ("%u", self->pv->item_id); - - /* We use a pointer so we don't copy the string every time */ - switch (calc_item_type (self)) - { - case GNOME_KEYRING_ITEM_GENERIC_SECRET: - icon = GNOME_STOCK_AUTHENTICATION; - break; - case GNOME_KEYRING_ITEM_NETWORK_PASSWORD: - icon = is_network_item (self, "http") ? SEAHORSE_THEMED_WEBBROWSER : GTK_STOCK_NETWORK; - break; - case GNOME_KEYRING_ITEM_NOTE: - icon = GNOME_STOCK_BOOK_OPEN; - break; - default: - icon = GNOME_STOCK_BLANK; - break; + account = get_attribute_string (attrs, "account"); + + if (strstr (display, account)) { + regex = g_regex_new ("^.+/.+/(.+)$", G_REGEX_CASELESS, 0, NULL); + if (g_regex_match (regex, account, G_REGEX_MATCH_ANCHORED, &match)) { + if (g_match_info_matches (match)) { + identifier = g_match_info_fetch (match, 1); + info->label = decode_telepathy_id (identifier); + g_free (identifier); + } + g_match_info_free (match); + } + g_regex_unref (regex); } - - g_object_set (self, - "label", display, - "icon", icon, - "markup", markup, - "identifier", identifier, - "flags", SEAHORSE_FLAG_DELETABLE, - NULL); - - g_free (display); - g_free (markup); - g_free (identifier); - - g_object_notify (G_OBJECT (self), "has-secret"); - g_object_notify (G_OBJECT (self), "use"); + + if (info->label == NULL) + info->label = g_strdup (display); + + info->details = g_markup_escape_text (account, -1); } -void -seahorse_gkr_item_refresh (SeahorseGkrItem *self) +static const DisplayEntry DISPLAY_ENTRIES[] = { + { GENERIC_SECRET, N_("Password or secret"), NULL }, + { NETWORK_PASSWORD, N_("Network password"), network_custom }, + { KEYRING_NOTE, N_("Stored note"), NULL }, + { CHAINED_KEYRING, N_("Keyring password"), NULL }, + { ENCRYPTION_KEY, N_("Encryption key password"), NULL }, + { PK_STORAGE, N_("Key storage password"), NULL }, + { CHROME_PASSWORD, N_("Google Chrome password"), chrome_custom }, + { GOA_PASSWORD, N_("Gnome Online Accounts password"), NULL }, + { TELEPATHY_PASSWORD, N_("Telepathy password"), telepathy_custom }, + { EMPATHY_PASSWORD, N_("Instant messaging password"), empathy_custom }, + { NETWORK_MANAGER_SECRET, N_("Network Manager secret"), NULL }, +}; + +static const MappingEntry MAPPING_ENTRIES[] = { + { GENERIC_SECRET, CHROME_PASSWORD, "application", "chrome*" }, + { GENERIC_SECRET, GOA_PASSWORD, "goa-identity", NULL }, + { GENERIC_SECRET, TELEPATHY_PASSWORD, "account", "*/*/*" }, + { GENERIC_SECRET, EMPATHY_PASSWORD, "account-id", "*/*/*" }, + /* Network secret for Auto anna/802-11-wireless-security/psk */ + { GENERIC_SECRET, NETWORK_MANAGER_SECRET, "connection-uuid", NULL }, +}; + +static const gchar * +map_item_type_to_specific (const gchar *item_type, + GHashTable *attrs) { - if (self->pv->item_info) - load_item_info (self); - if (self->pv->item_attrs) - load_item_attrs (self); - if (self->pv->item_secret) - load_item_secret (self); + const gchar *value; + guint i; + + if (!item_type) + return GENERIC_SECRET; + if (!attrs) + return item_type; + + for (i = 0; i < G_N_ELEMENTS (MAPPING_ENTRIES); i++) { + if (g_str_equal (item_type, MAPPING_ENTRIES[i].item_type)) { + value = get_attribute_string (attrs, MAPPING_ENTRIES[i].match_attribute); + if (value && MAPPING_ENTRIES[i].match_pattern != NULL) { + if (g_pattern_match_simple (MAPPING_ENTRIES[i].match_pattern, value)) + return MAPPING_ENTRIES[i].mapped_type; + } else if (value) { + return MAPPING_ENTRIES[i].mapped_type; + } + } + } + + return item_type; +} + +enum { + PROP_0, + PROP_HAS_SECRET, + PROP_DESCRIPTION, + PROP_USE, + PROP_PLACE, + PROP_FLAGS, + PROP_DELETABLE, + PROP_ICON, + PROP_LABEL, + PROP_MARKUP, + PROP_USAGE, + PROP_ACTIONS +}; + +struct _SeahorseGkrItemPrivate { + SecretValue *item_secret; + GCancellable *req_secret; + DisplayInfo *display_info; + GObject *place; +}; + +static void seahorse_gkr_item_deletable_iface (SeahorseDeletableIface *iface); + +static void seahorse_gkr_item_viewable_iface (SeahorseViewableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseGkrItem, seahorse_gkr_item, SECRET_TYPE_ITEM, + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_DELETABLE, seahorse_gkr_item_deletable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEWABLE, seahorse_gkr_item_viewable_iface); +); + +/* ----------------------------------------------------------------------------- + * INTERNAL HELPERS + */ + +static void +free_display_info (DisplayInfo *info) +{ + g_free (info->label); + g_free (info->details); + g_free (info); +} + +static DisplayInfo * +ensure_display_info (SeahorseGkrItem *self) +{ + const gchar *item_type; + GHashTable *attrs; + DisplayInfo *info; + gchar *label; + guint i; + + if (self->pv->display_info) + return self->pv->display_info; + + info = g_new0 (DisplayInfo, 1); + + attrs = secret_item_get_attributes (SECRET_ITEM (self)); + item_type = get_attribute_string (attrs, "xdg:schema"); + item_type = map_item_type_to_specific (item_type, attrs); + g_assert (item_type != NULL); + info->item_type = item_type; + + label = secret_item_get_label (SECRET_ITEM (self)); + for (i = 0; i < G_N_ELEMENTS (DISPLAY_ENTRIES); i++) { + if (g_str_equal (DISPLAY_ENTRIES[i].item_type, item_type)) { + if (DISPLAY_ENTRIES[i].custom_func != NULL) + (DISPLAY_ENTRIES[i].custom_func) (&DISPLAY_ENTRIES[i], + label, attrs, + info); + if (!info->description) + info->description = DISPLAY_ENTRIES[i].description; + break; + } + } + + if (!info->label) { + info->label = label; + label = NULL; + } + if (!info->details) + info->details = g_strdup (""); + + self->pv->display_info = info; + g_hash_table_unref (attrs); + g_free (label); + return info; } static void -seahorse_gkr_item_init (SeahorseGkrItem *self) +seahorse_gkr_item_g_properties_changed (GDBusProxy *proxy, + GVariant *changed_properties, + const gchar* const *invalidated_properties) { - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GKR_ITEM, SeahorseGkrItemPrivate); - g_object_set (self, "usage", SEAHORSE_USAGE_CREDENTIALS, "tag", SEAHORSE_GKR_TYPE, "location", SEAHORSE_LOCATION_LOCAL, NULL); + SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (proxy); + GObject *obj = G_OBJECT (self); + + if (self->pv->display_info) { + free_display_info (self->pv->display_info); + self->pv->display_info = NULL; + } + + g_object_freeze_notify (obj); + g_object_notify (obj, "has-secret"); + g_object_notify (obj, "use"); + g_object_notify (obj, "label"); + g_object_notify (obj, "icon"); + g_object_notify (obj, "markup"); + g_object_notify (obj, "description"); + g_object_notify (obj, "object-flags"); + g_object_thaw_notify (obj); } static void -seahorse_gkr_item_constructed (GObject *object) +received_item_secret (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (source); + GError *error = NULL; + + g_clear_object (&self->pv->req_secret); + + secret_item_load_secret_finish (SECRET_ITEM (source), result, &error); + if (error == NULL) { + if (self->pv->item_secret) + secret_value_unref (self->pv->item_secret); + self->pv->item_secret = secret_item_get_secret (SECRET_ITEM (self)); + g_object_notify (G_OBJECT (self), "has-secret"); + } else { + g_message ("Couldn't retrieve secret: %s", error->message); + g_error_free (error); + } + + g_object_unref (self); +} + +static void +load_item_secret (SeahorseGkrItem *self) { - SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (object); - GQuark id; + if (self->pv->req_secret) + return; + + self->pv->req_secret = g_cancellable_new (); + secret_item_load_secret (SECRET_ITEM (self), self->pv->req_secret, + received_item_secret, g_object_ref (self)); +} + +static gboolean +require_item_secret (SeahorseGkrItem *self) +{ + if (!self->pv->item_secret) + load_item_secret (self); + return self->pv->item_secret != NULL; +} - G_OBJECT_CLASS (seahorse_gkr_item_parent_class)->constructed (object); +static gchar* +calc_name_markup (SeahorseGkrItem *self) +{ + GString *result; + DisplayInfo *info; + gchar *value; + + info = ensure_display_info (self); + result = g_string_new (""); + value = g_markup_escape_text (info->label, -1); + g_string_append (result, value); + g_string_append (result, "\n"); + g_string_append (result, info->details); + g_string_append (result, ""); - id = seahorse_gkr_item_get_cannonical (self->pv->keyring_name, - self->pv->item_id); - g_object_set (self, "id", id, - "usage", SEAHORSE_USAGE_CREDENTIALS, NULL); + return g_string_free (result, FALSE); +} - seahorse_gkr_item_realize (self); +void +seahorse_gkr_item_refresh (SeahorseGkrItem *self) +{ + if (self->pv->item_secret) + load_item_secret (self); +} + +static void +seahorse_gkr_item_init (SeahorseGkrItem *self) +{ + self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GKR_ITEM, SeahorseGkrItemPrivate); } static void @@ -496,26 +591,45 @@ GValue *value, GParamSpec *pspec) { SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (object); - + DisplayInfo *info; + switch (prop_id) { - case PROP_KEYRING_NAME: - g_value_set_string (value, seahorse_gkr_item_get_keyring_name (self)); - break; - case PROP_ITEM_ID: - g_value_set_uint (value, seahorse_gkr_item_get_item_id (self)); - break; - case PROP_ITEM_INFO: - g_value_set_boxed (value, seahorse_gkr_item_get_info (self)); - break; - case PROP_ITEM_ATTRIBUTES: - g_value_set_boxed (value, seahorse_gkr_item_get_attributes (self)); - break; case PROP_HAS_SECRET: g_value_set_boolean (value, self->pv->item_secret != NULL); break; case PROP_USE: g_value_set_uint (value, seahorse_gkr_item_get_use (self)); break; + case PROP_DESCRIPTION: + info = ensure_display_info (self); + g_value_set_string (value, info->description); + break; + case PROP_PLACE: + g_value_set_object (value, self->pv->place); + break; + case PROP_FLAGS: + g_value_set_flags (value, SEAHORSE_FLAG_DELETABLE | SEAHORSE_FLAG_PERSONAL); + break; + case PROP_LABEL: + info = ensure_display_info (self); + g_value_set_string (value, info->label); + break; + case PROP_MARKUP: + info = ensure_display_info (self); + g_value_take_string (value, calc_name_markup (self)); + break; + case PROP_ICON: + g_value_take_object (value, g_themed_icon_new (GCR_ICON_PASSWORD)); + break; + case PROP_DELETABLE: + g_value_set_boolean (value, TRUE); + break; + case PROP_USAGE: + g_value_set_enum (value, SEAHORSE_USAGE_CREDENTIALS); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -523,25 +637,19 @@ } static void -seahorse_gkr_item_set_property (GObject *object, guint prop_id, const GValue *value, +seahorse_gkr_item_set_property (GObject *object, + guint prop_id, + const GValue *value, GParamSpec *pspec) { SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (object); - switch (prop_id) { - case PROP_KEYRING_NAME: - g_return_if_fail (self->pv->keyring_name == NULL); - self->pv->keyring_name = g_value_dup_string (value); - break; - case PROP_ITEM_ID: - g_return_if_fail (self->pv->item_id == 0); - self->pv->item_id = g_value_get_uint (value); - break; - case PROP_ITEM_INFO: - seahorse_gkr_item_set_info (self, g_value_get_boxed (value)); - break; - case PROP_ITEM_ATTRIBUTES: - seahorse_gkr_item_set_attributes (self, g_value_get_boxed (value)); + case PROP_PLACE: + if (self->pv->place) + g_object_remove_weak_pointer (self->pv->place, (gpointer *)&self->pv->place); + self->pv->place = g_value_get_object (value); + if (self->pv->place) + g_object_add_weak_pointer (self->pv->place, (gpointer *)&self->pv->place); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -550,60 +658,55 @@ } static void +seahorse_gkr_item_dispose (GObject *obj) +{ + SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (obj); + + if (self->pv->req_secret) { + g_cancellable_cancel (self->pv->req_secret); + g_object_unref (self->pv->req_secret); + self->pv->req_secret = NULL; + } + + if (self->pv->place) { + g_object_remove_weak_pointer (self->pv->place, (gpointer *)&self->pv->place); + self->pv->place = NULL; + } + + G_OBJECT_CLASS (seahorse_gkr_item_parent_class)->dispose (obj); +} + +static void seahorse_gkr_item_finalize (GObject *gobject) { SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (gobject); - - g_free (self->pv->keyring_name); - self->pv->keyring_name = NULL; - - if (self->pv->item_info) - gnome_keyring_item_info_free (self->pv->item_info); - self->pv->item_info = NULL; - g_assert (self->pv->req_info == NULL); - - if (self->pv->item_attrs) - gnome_keyring_attribute_list_free (self->pv->item_attrs); - self->pv->item_attrs = NULL; - g_assert (self->pv->req_attrs == NULL); - g_free (self->pv->item_secret); + if (self->pv->item_secret) + secret_value_unref (self->pv->item_secret); self->pv->item_secret = NULL; g_assert (self->pv->req_secret == NULL); - + G_OBJECT_CLASS (seahorse_gkr_item_parent_class)->finalize (gobject); } static void seahorse_gkr_item_class_init (SeahorseGkrItemClass *klass) { - GObjectClass *gobject_class; + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GDBusProxyClass *proxy_class = G_DBUS_PROXY_CLASS (klass); - seahorse_gkr_item_parent_class = g_type_class_peek_parent (klass); - gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->constructed = seahorse_gkr_item_constructed; + gobject_class->dispose = seahorse_gkr_item_dispose; gobject_class->finalize = seahorse_gkr_item_finalize; - gobject_class->set_property = seahorse_gkr_item_set_property; gobject_class->get_property = seahorse_gkr_item_get_property; + gobject_class->set_property = seahorse_gkr_item_set_property; + + proxy_class->g_properties_changed = seahorse_gkr_item_g_properties_changed; g_type_class_add_private (klass, sizeof (SeahorseGkrItemPrivate)); - - g_object_class_install_property (gobject_class, PROP_KEYRING_NAME, - g_param_spec_string("keyring-name", "Keyring Name", "Keyring this item is in", - "", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property (gobject_class, PROP_ITEM_ID, - g_param_spec_uint ("item-id", "Item ID", "GNOME Keyring Item ID", - 0, G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property (gobject_class, PROP_ITEM_INFO, - g_param_spec_boxed ("item-info", "Item Info", "GNOME Keyring Item Info", - boxed_item_info_type (), G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_ITEM_ATTRIBUTES, - g_param_spec_boxed ("item-attributes", "Item Attributes", "GNOME Keyring Item Attributes", - boxed_attributes_type (), G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_DESCRIPTION, + g_param_spec_string("description", "Description", "Item description", + "", G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_USE, g_param_spec_uint ("use", "Use", "Item is used for", @@ -612,71 +715,75 @@ g_object_class_install_property (gobject_class, PROP_HAS_SECRET, g_param_spec_boolean ("has-secret", "Has Secret", "Secret has been loaded", FALSE, G_PARAM_READABLE)); -} -/* ----------------------------------------------------------------------------- - * PUBLIC - */ + g_object_class_install_property (gobject_class, PROP_PLACE, + g_param_spec_object ("place", "place", "place", SEAHORSE_TYPE_GKR_KEYRING, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); -SeahorseGkrItem* -seahorse_gkr_item_new (SeahorseSource *source, const gchar *keyring_name, guint32 item_id) -{ - return g_object_new (SEAHORSE_TYPE_GKR_ITEM, "source", source, - "item-id", item_id, "keyring-name", keyring_name, NULL); + g_object_class_install_property (gobject_class, PROP_FLAGS, + g_param_spec_flags ("object-flags", "Flags", "Flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_ICON, + g_param_spec_object ("icon", "Icon", "Icon", G_TYPE_ICON, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_LABEL, + g_param_spec_string ("label", "Label", "Label", "", + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_MARKUP, + g_param_spec_string ("markup", "Markup", "Markup", "", + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_USAGE, + g_param_spec_enum ("usage", "Object Usage", "How this object is used.", + SEAHORSE_TYPE_USAGE, SEAHORSE_USAGE_NONE, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_ACTIONS, + g_param_spec_object ("actions", "Actions", "Actions", GTK_TYPE_ACTION_GROUP, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + + g_object_class_override_property (gobject_class, PROP_DELETABLE, "deletable"); } -guint32 -seahorse_gkr_item_get_item_id (SeahorseGkrItem *self) +static SeahorseDeleter * +seahorse_gkr_item_create_deleter (SeahorseDeletable *deletable) { - g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (self), 0); - return self->pv->item_id; + SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (deletable); + return seahorse_gkr_item_deleter_new (self); } -const gchar* -seahorse_gkr_item_get_keyring_name (SeahorseGkrItem *self) +static void +seahorse_gkr_item_deletable_iface (SeahorseDeletableIface *iface) { - g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (self), NULL); - return self->pv->keyring_name; + iface->create_deleter = seahorse_gkr_item_create_deleter; } -GnomeKeyringItemInfo* -seahorse_gkr_item_get_info (SeahorseGkrItem *self) +static void +seahorse_gkr_item_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent) { - g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (self), NULL); - require_item_info (self); - return self->pv->item_info; + seahorse_gkr_item_properties_show (SEAHORSE_GKR_ITEM (viewable), + parent); } -void -seahorse_gkr_item_set_info (SeahorseGkrItem *self, GnomeKeyringItemInfo* info) +static void +seahorse_gkr_item_viewable_iface (SeahorseViewableIface *iface) { - GObject *obj; - gchar *secret; - - g_return_if_fail (SEAHORSE_IS_GKR_ITEM (self)); - - if (self->pv->item_info) - gnome_keyring_item_info_free (self->pv->item_info); - if (info) - self->pv->item_info = gnome_keyring_item_info_copy (info); - else - self->pv->item_info = NULL; - - obj = G_OBJECT (self); - g_object_freeze_notify (obj); - seahorse_gkr_item_realize (self); - g_object_notify (obj, "item-info"); - g_object_notify (obj, "use"); - - /* Get the secret out of the item info, if not already loaded */ - WITH_SECURE_MEM (secret = gnome_keyring_item_info_get_secret (self->pv->item_info)); - if (secret != NULL) { - gnome_keyring_free_password (self->pv->item_secret); - self->pv->item_secret = secret; - g_object_notify (obj, "has-secret"); - } + iface->show_viewer = seahorse_gkr_item_show_viewer; +} - g_object_thaw_notify (obj); +SeahorseGkrItem * +seahorse_gkr_item_new (SeahorseGkrKeyring *keyring, + const gchar *keyring_name, + guint32 item_id) +{ + return g_object_new (SEAHORSE_TYPE_GKR_ITEM, + "place", keyring, + "item-id", item_id, + "keyring-name", keyring_name, + NULL); } gboolean @@ -686,7 +793,7 @@ return self->pv->item_secret != NULL; } -const gchar* +SecretValue * seahorse_gkr_item_get_secret (SeahorseGkrItem *self) { g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (self), NULL); @@ -694,99 +801,94 @@ return self->pv->item_secret; } -GnomeKeyringAttributeList* -seahorse_gkr_item_get_attributes (SeahorseGkrItem *self) -{ - g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (self), NULL); - require_item_attrs (self); - return self->pv->item_attrs; -} - -void -seahorse_gkr_item_set_attributes (SeahorseGkrItem *self, GnomeKeyringAttributeList* attrs) -{ - GObject *obj; - - g_return_if_fail (SEAHORSE_IS_GKR_ITEM (self)); - - if (self->pv->item_attrs) - gnome_keyring_attribute_list_free (self->pv->item_attrs); - if (attrs) - self->pv->item_attrs = gnome_keyring_attribute_list_copy (attrs); - else - self->pv->item_attrs = NULL; - - obj = G_OBJECT (self); - g_object_freeze_notify (obj); - seahorse_gkr_item_realize (self); - g_object_notify (obj, "item-attributes"); - g_object_notify (obj, "use"); - g_object_thaw_notify (obj); -} - const gchar* seahorse_gkr_item_get_attribute (SeahorseGkrItem *self, const gchar *name) { + GHashTable *attributes; + g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (self), NULL); - if (!require_item_attrs (self)) + + attributes = secret_item_get_attributes (SECRET_ITEM (self)); + if (attributes == NULL) return NULL; - return seahorse_gkr_find_string_attribute (self->pv->item_attrs, name); + return g_hash_table_lookup (attributes, name); } + const gchar* -seahorse_gkr_find_string_attribute (GnomeKeyringAttributeList *attrs, const gchar *name) +seahorse_gkr_find_string_attribute (GHashTable *attrs, + const gchar *name) { - guint i; - g_return_val_if_fail (attrs, NULL); g_return_val_if_fail (name, NULL); - for (i = 0; i < attrs->len; i++) { - GnomeKeyringAttribute *attr = &(gnome_keyring_attribute_list_index (attrs, i)); - if (g_ascii_strcasecmp (name, attr->name) == 0 && - attr->type == GNOME_KEYRING_ATTRIBUTE_TYPE_STRING) - return attr->value.string; - } - - return NULL; -} - -GQuark -seahorse_gkr_item_get_cannonical (const gchar *keyring_name, guint32 item_id) -{ - gchar *buf = g_strdup_printf ("%s:%s-%08X", SEAHORSE_GKR_STR, keyring_name, item_id); - GQuark id = g_quark_from_string (buf); - g_free (buf); - return id; + return g_hash_table_lookup (attrs, name); } SeahorseGkrUse seahorse_gkr_item_get_use (SeahorseGkrItem *self) { - const gchar *val; - - /* Network passwords */ - if (require_item_info (self)) { - if (gnome_keyring_item_info_get_type (self->pv->item_info) == GNOME_KEYRING_ITEM_NETWORK_PASSWORD) { - if (is_network_item (self, "http")) - return SEAHORSE_GKR_USE_WEB; - return SEAHORSE_GKR_USE_NETWORK; - } - } - - if (require_item_attrs (self)) { - val = seahorse_gkr_item_get_attribute (self, "seahorse-key-type"); - if (val) { -#ifdef WITH_PGP - if (strcmp (val, SEAHORSE_PGP_TYPE_STR) == 0) - return SEAHORSE_GKR_USE_PGP; -#endif -#ifdef WITH_SSH - if (strcmp (val, SEAHORSE_SSH_TYPE_STR) == 0) - return SEAHORSE_GKR_USE_SSH; -#endif - } - } - + const gchar *schema_name; + + schema_name = seahorse_gkr_item_get_attribute (self, "xdg:schema"); + if (schema_name && g_str_equal (schema_name, "org.gnome.keyring.NetworkPassword")) + return SEAHORSE_GKR_USE_NETWORK; + return SEAHORSE_GKR_USE_OTHER; } + +static void +on_set_secret (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *async = G_SIMPLE_ASYNC_RESULT (user_data); + SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (source); + GError *error = NULL; + + secret_item_set_secret_finish (SECRET_ITEM (source), result, &error); + if (error == NULL) { + if (self->pv->item_secret) + secret_value_unref (self->pv->item_secret); + self->pv->item_secret = g_simple_async_result_get_op_res_gpointer (async); + secret_value_ref (self->pv->item_secret); + g_object_notify (G_OBJECT (self), "has-secret"); + + } else { + g_simple_async_result_take_error (async, error); + } + + g_simple_async_result_complete (async); + g_object_unref (async); +} + +void +seahorse_gkr_item_set_secret (SeahorseGkrItem *self, + SecretValue *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *async; + + async = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gkr_item_set_secret); + g_simple_async_result_set_op_res_gpointer (async, secret_value_ref (value), + secret_value_unref); + + secret_item_set_secret (SECRET_ITEM (self), value, cancellable, + on_set_secret, g_object_ref (async)); + + g_object_unref (async); +} + +gboolean +seahorse_gkr_item_set_secret_finish (SeahorseGkrItem *self, + GAsyncResult *result, + GError **error) +{ + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-item-commands.c seahorse-3.6.3/gkr/seahorse-gkr-item-commands.c --- seahorse-3.2.2/gkr/seahorse-gkr-item-commands.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-item-commands.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-gkr-item-commands.h" - -#include "seahorse-gkr.h" -#include "seahorse-gkr-item.h" -#include "seahorse-gkr-dialogs.h" -#include "seahorse-gkr-operation.h" - -#include "seahorse-progress.h" -#include "seahorse-registry.h" -#include "seahorse-source.h" -#include "seahorse-util.h" - -#include - -G_DEFINE_TYPE (SeahorseGkrItemCommands, seahorse_gkr_item_commands, SEAHORSE_TYPE_COMMANDS); - -static SeahorseObjectPredicate commands_predicate = { 0, }; - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_gkr_item_commands_show_properties (SeahorseCommands* base, SeahorseObject* object) -{ - GtkWindow *window; - - g_return_if_fail (SEAHORSE_IS_OBJECT (object)); - g_return_if_fail (seahorse_object_get_tag (object) == SEAHORSE_GKR_TYPE); - - window = seahorse_commands_get_window (base); - if (G_OBJECT_TYPE (object) == SEAHORSE_TYPE_GKR_ITEM) - seahorse_gkr_item_properties_show (SEAHORSE_GKR_ITEM (object), window); - - else - g_return_if_reached (); -} - -static void -on_delete_objects (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data); - GError *error = NULL; - GtkWidget *parent; - - if (!seahorse_gkr_delete_finish (result, &error)) { - parent = GTK_WIDGET (seahorse_commands_get_window (commands)); - seahorse_util_show_error (parent, _("Couldn't delete item"), error->message); - g_error_free (error); - } - - g_object_unref (commands); -} - -static gboolean -seahorse_gkr_item_commands_delete_objects (SeahorseCommands* commands, - GList* objects) -{ - GCancellable *cancellable; - GtkWidget *parent; - gchar *prompt; - gboolean ret; - guint num; - - num = g_list_length (objects); - if (num == 0) - return TRUE; - - if (num == 1) { - prompt = g_strdup_printf (_ ("Are you sure you want to delete the password '%s'?"), - seahorse_object_get_label (SEAHORSE_OBJECT (objects->data))); - } else { - prompt = g_strdup_printf (ngettext ("Are you sure you want to delete %d password?", - "Are you sure you want to delete %d passwords?", - num), num); - } - - parent = GTK_WIDGET (seahorse_commands_get_window (commands)); - ret = seahorse_util_prompt_delete (prompt, parent); - - if (ret) { - cancellable = g_cancellable_new (); - seahorse_gkr_delete_async (objects, cancellable, on_delete_objects, g_object_ref (commands)); - seahorse_progress_show (cancellable, ngettext ("Deleting item", "Deleting items", num), TRUE); - g_object_unref (cancellable); - } - - g_free (prompt); - return ret; -} - -static GObject* -seahorse_gkr_item_commands_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - GObject *obj = G_OBJECT_CLASS (seahorse_gkr_item_commands_parent_class)->constructor (type, n_props, props); - SeahorseCommands *base = NULL; - SeahorseView *view; - - if (obj) { - base = SEAHORSE_COMMANDS (obj); - view = seahorse_commands_get_view (base); - g_return_val_if_fail (view, NULL); - seahorse_view_register_commands (view, &commands_predicate, base); - } - - return obj; -} - -static void -seahorse_gkr_item_commands_init (SeahorseGkrItemCommands *self) -{ - -} - -static void -seahorse_gkr_item_commands_class_init (SeahorseGkrItemCommandsClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - SeahorseCommandsClass *cmd_class = SEAHORSE_COMMANDS_CLASS (klass); - - seahorse_gkr_item_commands_parent_class = g_type_class_peek_parent (klass); - - gobject_class->constructor = seahorse_gkr_item_commands_constructor; - - cmd_class->show_properties = seahorse_gkr_item_commands_show_properties; - cmd_class->delete_objects = seahorse_gkr_item_commands_delete_objects; - - /* Setup the predicate that matches our commands */ - commands_predicate.type = SEAHORSE_TYPE_GKR_ITEM; - - /* Register this class as a commands */ - seahorse_registry_register_type (seahorse_registry_get (), SEAHORSE_TYPE_GKR_ITEM_COMMANDS, - SEAHORSE_GKR_TYPE_STR, "commands", NULL, NULL); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-item-commands.h seahorse-3.6.3/gkr/seahorse-gkr-item-commands.h --- seahorse-3.2.2/gkr/seahorse-gkr-item-commands.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-item-commands.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_GKR_ITEM_COMMANDS_H__ -#define __SEAHORSE_GKR_ITEM_COMMANDS_H__ - -#include "seahorse-commands.h" - -#include - -#define SEAHORSE_TYPE_GKR_ITEM_COMMANDS (seahorse_gkr_item_commands_get_type ()) -#define SEAHORSE_GKR_ITEM_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_ITEM_COMMANDS, SeahorseGkrItemCommands)) -#define SEAHORSE_GKR_ITEM_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_ITEM_COMMANDS, SeahorseGkrItemCommandsClass)) -#define SEAHORSE_IS_GKR_ITEM_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_ITEM_COMMANDS)) -#define SEAHORSE_IS_GKR_ITEM_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_ITEM_COMMANDS)) -#define SEAHORSE_GKR_ITEM_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_ITEM_COMMANDS, SeahorseGkrItemCommandsClass)) - -typedef struct _SeahorseGkrItemCommands SeahorseGkrItemCommands; -typedef struct _SeahorseGkrItemCommandsClass SeahorseGkrItemCommandsClass; - -struct _SeahorseGkrItemCommands { - SeahorseCommands parent; -}; - -struct _SeahorseGkrItemCommandsClass { - SeahorseCommandsClass parent_class; -}; - -GType seahorse_gkr_item_commands_get_type (void); - -#endif /* __SEAHORSE_GKR_ITEM_COMMANDS_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-item-deleter.c seahorse-3.6.3/gkr/seahorse-gkr-item-deleter.c --- seahorse-3.2.2/gkr/seahorse-gkr-item-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-item-deleter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,243 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-gkr-backend.h" +#include "seahorse-gkr-item-deleter.h" + +#include "seahorse-delete-dialog.h" +#include "seahorse-object.h" + +#include + +#define SEAHORSE_GKR_ITEM_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_ITEM_DELETER, SeahorseGkrItemDeleterClass)) +#define SEAHORSE_IS_GKR_ITEM_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_ITEM_DELETER)) +#define SEAHORSE_GKR_ITEM_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_ITEM_DELETER, SeahorseGkrItemDeleterClass)) + +typedef struct _SeahorseGkrItemDeleterClass SeahorseGkrItemDeleterClass; + +struct _SeahorseGkrItemDeleter { + SeahorseDeleter parent; + GList *items; +}; + +struct _SeahorseGkrItemDeleterClass { + SeahorseDeleterClass parent_class; +}; + +static void delete_one_item (GSimpleAsyncResult *res); + +G_DEFINE_TYPE (SeahorseGkrItemDeleter, seahorse_gkr_item_deleter, SEAHORSE_TYPE_DELETER); + +static void +seahorse_gkr_item_deleter_init (SeahorseGkrItemDeleter *self) +{ + +} + +static void +seahorse_gkr_item_deleter_finalize (GObject *obj) +{ + SeahorseGkrItemDeleter *self = SEAHORSE_GKR_ITEM_DELETER (obj); + + g_list_free_full (self->items, g_object_unref); + + G_OBJECT_CLASS (seahorse_gkr_item_deleter_parent_class)->finalize (obj); +} + +static GtkDialog * +seahorse_gkr_item_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorseGkrItemDeleter *self = SEAHORSE_GKR_ITEM_DELETER (deleter); + GtkDialog *dialog; + gchar *prompt; + guint num; + + num = g_list_length (self->items); + if (num == 1) { + prompt = g_strdup_printf (_ ("Are you sure you want to delete the password '%s'?"), + secret_item_get_label (SECRET_ITEM (self->items->data))); + } else { + prompt = g_strdup_printf (ngettext ("Are you sure you want to delete %d password?", + "Are you sure you want to delete %d passwords?", + num), num); + } + + + dialog = seahorse_delete_dialog_new (parent, "%s", prompt); + g_free (prompt); + + return dialog; +} + +static GList * +seahorse_gkr_item_deleter_get_objects (SeahorseDeleter *deleter) +{ + SeahorseGkrItemDeleter *self = SEAHORSE_GKR_ITEM_DELETER (deleter); + return self->items; +} + +static gboolean +seahorse_gkr_item_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorseGkrItemDeleter *self = SEAHORSE_GKR_ITEM_DELETER (deleter); + + if (!SEAHORSE_IS_GKR_ITEM (object)) + return FALSE; + self->items = g_list_append (self->items, g_object_ref (object)); + return TRUE; +} + +typedef struct { + SeahorseGkrItem *current; + GCancellable *cancellable; + GQueue queue; + gpointer request; + gulong cancelled_sig; +} DeleteClosure; + +static void +delete_closure_free (gpointer data) +{ + DeleteClosure *closure = data; + SeahorseGkrItem *item; + + g_clear_object (&closure->current); + while ((item = g_queue_pop_head (&closure->queue))) + g_object_unref (item); + g_queue_clear (&closure->queue); + if (closure->cancellable && closure->cancelled_sig) + g_signal_handler_disconnect (closure->cancellable, + closure->cancelled_sig); + g_clear_object (&closure->cancellable); + g_assert (!closure->request); + g_free (closure); +} + +static void +on_delete_gkr_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + GError *error = NULL; + + secret_item_delete_finish (SECRET_ITEM (source), result, &error); + if (error == NULL) { + delete_one_item (res); + + } else { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete_in_idle (res); + } + + g_object_unref (res); +} + +static void +delete_one_item (GSimpleAsyncResult *res) +{ + DeleteClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + + g_clear_object (&closure->current); + closure->current = g_queue_pop_head (&closure->queue); + if (closure->current == NULL) { + g_simple_async_result_complete_in_idle (res); + + } else { + secret_item_delete (SECRET_ITEM (closure->current), + closure->cancellable, + on_delete_gkr_complete, + g_object_ref (res)); + } +} + +static void +seahorse_gkr_item_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseGkrItemDeleter *self = SEAHORSE_GKR_ITEM_DELETER (deleter); + GSimpleAsyncResult *res; + DeleteClosure *closure; + GList *l; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gkr_item_deleter_delete_async); + closure = g_new0 (DeleteClosure, 1); + closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + g_queue_init (&closure->queue); + for (l = self->items; l != NULL; l = g_list_next (l)) + g_queue_push_tail (&closure->queue, g_object_ref (l->data)); + g_simple_async_result_set_op_res_gpointer (res, closure, delete_closure_free); + + delete_one_item (res); + g_object_unref (res); +} + +static gboolean +seahorse_gkr_item_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error) +{ + SeahorseGkrItemDeleter *self = SEAHORSE_GKR_ITEM_DELETER (deleter); + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_gkr_item_deleter_delete_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +seahorse_gkr_item_deleter_class_init (SeahorseGkrItemDeleterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseDeleterClass *deleter_class = SEAHORSE_DELETER_CLASS (klass); + + gobject_class->finalize = seahorse_gkr_item_deleter_finalize; + + deleter_class->add_object = seahorse_gkr_item_deleter_add_object; + deleter_class->create_confirm = seahorse_gkr_item_deleter_create_confirm; + deleter_class->delete_async = seahorse_gkr_item_deleter_delete_async; + deleter_class->delete_finish = seahorse_gkr_item_deleter_delete_finish; + deleter_class->get_objects = seahorse_gkr_item_deleter_get_objects; +} + +SeahorseDeleter * +seahorse_gkr_item_deleter_new (SeahorseGkrItem *item) +{ + SeahorseDeleter *deleter; + + deleter = g_object_new (SEAHORSE_TYPE_GKR_ITEM_DELETER, NULL); + if (!seahorse_deleter_add_object (deleter, G_OBJECT (item))) + g_assert_not_reached (); + + return deleter; +} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-item-deleter.h seahorse-3.6.3/gkr/seahorse-gkr-item-deleter.h --- seahorse-3.2.2/gkr/seahorse-gkr-item-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-item-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_GKR_ITEM_DELETER_H__ +#define __SEAHORSE_GKR_ITEM_DELETER_H__ + +#include + +#include "seahorse-deleter.h" +#include "seahorse-gkr-item.h" + +#define SEAHORSE_TYPE_GKR_ITEM_DELETER (seahorse_gkr_item_deleter_get_type ()) +#define SEAHORSE_GKR_ITEM_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_ITEM_DELETER, SeahorseGkrItemDeleter)) +#define SEAHORSE_IS_GKR_ITEM_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_ITEM_DELETER)) + +typedef struct _SeahorseGkrItemDeleter SeahorseGkrItemDeleter; + +GType seahorse_gkr_item_deleter_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_gkr_item_deleter_new (SeahorseGkrItem *item); + +#endif /* __SEAHORSE_GKR_ITEM_DELETER_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-item.h seahorse-3.6.3/gkr/seahorse-gkr-item.h --- seahorse-3.2.2/gkr/seahorse-gkr-item.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-item.h 2012-08-21 12:23:16.000000000 +0200 @@ -24,12 +24,12 @@ #define __SEAHORSE_GKR_ITEM_H__ #include -#include +#include -#include "seahorse-gkr-module.h" +#include "seahorse-gkr.h" +#include "seahorse-gkr-keyring.h" #include "seahorse-object.h" -#include "seahorse-source.h" typedef enum { SEAHORSE_GKR_USE_OTHER, @@ -53,51 +53,42 @@ typedef struct _SeahorseGkrItemPrivate SeahorseGkrItemPrivate; struct _SeahorseGkrItem { - SeahorseObject parent; + SecretItem parent; SeahorseGkrItemPrivate *pv; }; struct _SeahorseGkrItemClass { - SeahorseObjectClass parent_class; + SecretItemClass parent_class; }; GType seahorse_gkr_item_get_type (void); -SeahorseGkrItem* seahorse_gkr_item_new (SeahorseSource *source, +SeahorseGkrItem * seahorse_gkr_item_new (SeahorseGkrKeyring *keyring, const gchar *keyring_name, guint32 item_id); void seahorse_gkr_item_refresh (SeahorseGkrItem *self); -void seahorse_gkr_item_realize (SeahorseGkrItem *self); - -guint32 seahorse_gkr_item_get_item_id (SeahorseGkrItem *self); - -const gchar* seahorse_gkr_item_get_keyring_name (SeahorseGkrItem *self); - -GnomeKeyringItemInfo* seahorse_gkr_item_get_info (SeahorseGkrItem *self); - -void seahorse_gkr_item_set_info (SeahorseGkrItem *self, - GnomeKeyringItemInfo* info); - gboolean seahorse_gkr_item_has_secret (SeahorseGkrItem *self); -const gchar* seahorse_gkr_item_get_secret (SeahorseGkrItem *self); - -GnomeKeyringAttributeList* seahorse_gkr_item_get_attributes (SeahorseGkrItem *self); - -void seahorse_gkr_item_set_attributes (SeahorseGkrItem *self, - GnomeKeyringAttributeList* attrs); +SecretValue * seahorse_gkr_item_get_secret (SeahorseGkrItem *self); const gchar* seahorse_gkr_item_get_attribute (SeahorseGkrItem *self, const gchar *name); -const gchar* seahorse_gkr_find_string_attribute (GnomeKeyringAttributeList *attrs, - const gchar *name); - -GQuark seahorse_gkr_item_get_cannonical (const gchar *keyring_name, - guint32 item_id); +const gchar* seahorse_gkr_find_string_attribute (GHashTable *attrs, + const gchar *name); SeahorseGkrUse seahorse_gkr_item_get_use (SeahorseGkrItem *self); +void seahorse_gkr_item_set_secret (SeahorseGkrItem *self, + SecretValue *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_gkr_item_set_secret_finish (SeahorseGkrItem *self, + GAsyncResult *result, + GError **error); + #endif /* __SEAHORSE_GKR_ITEM_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-item-properties.c seahorse-3.6.3/gkr/seahorse-gkr-item-properties.c --- seahorse-3.2.2/gkr/seahorse-gkr-item-properties.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-item-properties.c 2012-11-09 11:08:13.000000000 +0100 @@ -25,16 +25,12 @@ #include "seahorse-gkr-dialogs.h" #include "seahorse-gkr-item.h" -#include "seahorse-gkr-source.h" -#include "seahorse-gkr-operation.h" #include "seahorse-bind.h" -#include "seahorse-gtkstock.h" +#include "seahorse-icons.h" #include "seahorse-object.h" #include "seahorse-object-widget.h" #include "seahorse-progress.h" -#include "seahorse-secure-buffer.h" -#include "seahorse-secure-memory.h" #include "seahorse-util.h" #include "seahorse-widget.h" @@ -150,7 +146,7 @@ static gboolean transform_attributes_server (const GValue *from, GValue *to) { - GnomeKeyringAttributeList *attrs; + GHashTable *attrs; attrs = g_value_get_boxed (from); if (attrs) g_value_set_string (to, seahorse_gkr_find_string_attribute (attrs, "server")); @@ -162,7 +158,7 @@ static gboolean transform_attributes_user (const GValue *from, GValue *to) { - GnomeKeyringAttributeList *attrs; + GHashTable *attrs; attrs = g_value_get_boxed (from); if (attrs) g_value_set_string (to, seahorse_gkr_find_string_attribute (attrs, "user")); @@ -176,7 +172,9 @@ { GtkWidget *expander; GtkEntry *entry; - const gchar *secret; + SecretValue *secret; + const gchar *password; + gsize length; expander = seahorse_widget_get_widget (swidget, "password-expander"); g_return_if_fail (expander); @@ -184,12 +182,18 @@ entry = g_object_get_data (G_OBJECT (swidget), "secure-password-entry"); g_return_if_fail (entry); + password = ""; + length = 0; + if (gtk_expander_get_expanded (GTK_EXPANDER (expander))) { secret = seahorse_gkr_item_get_secret (git); - gtk_entry_set_text (entry, secret ? secret : ""); - } else { - gtk_entry_set_text (entry, ""); + if (secret) + password = secret_value_get (secret, &length); } + + gtk_entry_buffer_set_text (gtk_entry_get_buffer (entry), + password, length); + g_object_set_data (G_OBJECT (entry), "changed", NULL); } @@ -203,10 +207,11 @@ GError *error = NULL; GtkWidget *expander; - if (seahorse_gkr_update_secret_finish (git, result, &error)) { + if (seahorse_gkr_item_set_secret_finish (git, result, &error)) { transfer_password (git, swidget); } else { + g_dbus_error_strip_remote_error (error); seahorse_util_show_error (seahorse_widget_get_toplevel (swidget), _("Couldn't change password."), error->message); g_clear_error (&error); @@ -223,10 +228,11 @@ password_activate (GtkEntry *entry, SeahorseWidget *swidget) { - SeahorseObject *object; + GObject *object; SeahorseGkrItem *git; GtkWidget *expander; GCancellable *cancellable; + SecretValue *value; object = SEAHORSE_OBJECT_WIDGET (swidget)->object; if (!object) @@ -251,9 +257,11 @@ gtk_widget_set_sensitive (expander, FALSE); cancellable = g_cancellable_new (); - seahorse_gkr_update_secret_async (git, gtk_entry_get_text (entry), cancellable, - on_update_password_ready, g_object_ref (swidget)); + value = secret_value_new (gtk_entry_get_text (entry), -1, "text/plain"); + seahorse_gkr_item_set_secret (git, value, cancellable, + on_update_password_ready, g_object_ref (swidget)); seahorse_progress_show (cancellable, _("Updating password"), TRUE); + secret_value_unref (value); g_object_unref (cancellable); } @@ -284,7 +292,7 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object; + GObject *object; SeahorseGkrItem *git; GtkWidget *widget; @@ -327,12 +335,13 @@ SeahorseGkrItem *git = SEAHORSE_GKR_ITEM (source); GError *error = NULL; - if (!seahorse_gkr_update_description_finish (git, result, &error)) { + if (!secret_item_set_label_finish (SECRET_ITEM (git), result, &error)) { /* Set back to original */ gtk_entry_set_text (closure->entry, - seahorse_object_get_label (SEAHORSE_OBJECT (git))); + secret_item_get_label (SECRET_ITEM (git))); + g_dbus_error_strip_remote_error (error); seahorse_util_show_error (seahorse_widget_get_toplevel (closure->swidget), _("Couldn't set description."), error->message); g_clear_error (&error); @@ -351,7 +360,7 @@ SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); item_description_closure *closure; GCancellable *cancellable; - SeahorseObject *object; + GObject *object; SeahorseGkrItem *git; object = SEAHORSE_OBJECT_WIDGET (swidget)->object; @@ -371,9 +380,8 @@ closure->entry = GTK_ENTRY (entry); cancellable = g_cancellable_new (); - seahorse_gkr_update_description_async (git, gtk_entry_get_text (GTK_ENTRY (entry)), - cancellable, on_item_description_complete, - closure); + secret_item_set_label (SECRET_ITEM (git), gtk_entry_get_text (GTK_ENTRY (entry)), + cancellable, on_item_description_complete, closure); seahorse_progress_show (cancellable, _("Updating password"), TRUE); g_object_unref (cancellable); } @@ -392,7 +400,7 @@ static void setup_main (SeahorseWidget *swidget) { - SeahorseObject *object; + GObject *object; GtkEntryBuffer *buffer; GtkWidget *widget; GtkWidget *box; @@ -400,7 +408,7 @@ object = SEAHORSE_OBJECT_WIDGET (swidget)->object; /* Setup the image properly */ - seahorse_bind_property ("icon", object, "stock", + seahorse_bind_property ("icon", object, "gicon", seahorse_widget_get_widget (swidget, "key-image")); /* Setup the label properly */ @@ -427,15 +435,15 @@ seahorse_widget_get_widget (swidget, "login-field"), NULL); /* Server name */ - seahorse_bind_property_full ("item-attributes", object, transform_attributes_server, "label", + seahorse_bind_property_full ("attributes", object, transform_attributes_server, "label", seahorse_widget_get_widget (swidget, "server-field"), NULL); /* User name */ - seahorse_bind_property_full ("item-attributes", object, transform_attributes_user, "label", + seahorse_bind_property_full ("attributes", object, transform_attributes_user, "label", seahorse_widget_get_widget (swidget, "login-field"), NULL); /* Create the password entry */ - buffer = seahorse_secure_buffer_new (); + buffer = gcr_secure_entry_buffer_new (); widget = gtk_entry_new_with_buffer (buffer); g_object_unref (buffer); @@ -467,36 +475,27 @@ static gboolean transform_item_details (const GValue *from, GValue *to) { - GnomeKeyringAttributeList *attrs; - GnomeKeyringAttribute *attr; + GHashTableIter iter; + GHashTable *attrs; GString *details; + gpointer key; + gpointer value; gchar *text; - guint i; g_return_val_if_fail (G_VALUE_TYPE (to) == G_TYPE_STRING, FALSE); attrs = g_value_get_boxed (from); details = g_string_new (NULL); if (attrs) { - /* Build up the display string */ - for(i = 0; i < attrs->len; ++i) { - attr = &(gnome_keyring_attribute_list_index (attrs, i)); - text = g_markup_escape_text (attr->name, -1); - g_string_append_printf (details, "%s: ", text); + g_hash_table_iter_init (&iter, attrs); + while (g_hash_table_iter_next (&iter, &key, &value)) { + if (g_str_has_prefix (key, "gkr:") || + g_str_has_prefix (key, "xdg:")) + continue; + text = g_markup_escape_text (key, -1); + g_string_append_printf (details, "%s: %s\n", + text, (gchar *)value); g_free (text); - switch (attr->type) { - case GNOME_KEYRING_ATTRIBUTE_TYPE_STRING: - text = g_markup_escape_text (attr->value.string, -1); - g_string_append_printf (details, "%s\n", text); - g_free (text); - break; - case GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32: - g_string_append_printf (details, "%u\n", attr->value.integer); - break; - default: - g_string_append (details, "[invalid]\n"); - break; - } } } @@ -507,7 +506,7 @@ static void setup_details (SeahorseWidget *swidget) { - SeahorseObject *object; + GObject *object; GtkWidget *widget; object = SEAHORSE_OBJECT_WIDGET (swidget)->object; @@ -515,8 +514,8 @@ widget = seahorse_widget_get_widget (swidget, "details-box"); g_return_if_fail (widget != NULL); gtk_label_set_use_markup (GTK_LABEL (widget), TRUE); - - seahorse_bind_property_full ("item-attributes", object, transform_item_details, + + seahorse_bind_property_full ("attributes", object, transform_item_details, "label", widget, NULL); } @@ -538,7 +537,7 @@ void seahorse_gkr_item_properties_show (SeahorseGkrItem *git, GtkWindow *parent) { - SeahorseObject *object = SEAHORSE_OBJECT (git); + GObject *object = G_OBJECT (git); SeahorseWidget *swidget = NULL; GtkWidget *widget; diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring.c seahorse-3.6.3/gkr/seahorse-gkr-keyring.c --- seahorse-3.2.2/gkr/seahorse-gkr-keyring.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring.c 2012-11-09 11:08:13.000000000 +0100 @@ -23,310 +23,354 @@ #include "config.h" #include "seahorse-gkr.h" +#include "seahorse-gkr-backend.h" +#include "seahorse-gkr-dialogs.h" +#include "seahorse-gkr-keyring-deleter.h" #include "seahorse-gkr-keyring.h" -#include "seahorse-gkr-operation.h" +#include "seahorse-gkr-actions.h" +#include "seahorse-action.h" +#include "seahorse-deletable.h" +#include "seahorse-lockable.h" #include "seahorse-progress.h" #include "seahorse-util.h" +#include "seahorse-viewable.h" + +#include #include enum { PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION, - PROP_KEYRING_NAME, + PROP_DESCRIPTION, PROP_KEYRING_INFO, - PROP_IS_DEFAULT + PROP_IS_DEFAULT, + PROP_URI, + PROP_ACTIONS, + PROP_LOCKABLE, + PROP_UNLOCKABLE, + + PROP_ICON, + PROP_DELETABLE }; struct _SeahorseGkrKeyringPrivate { - gchar *keyring_name; - gboolean is_default; - - gpointer req_info; - GnomeKeyringInfo *keyring_info; + GHashTable *items; }; -static void seahorse_source_iface (SeahorseSourceIface *iface); +static void seahorse_gkr_keyring_place_iface (SeahorsePlaceIface *iface); + +static void seahorse_keyring_collection_iface (GcrCollectionIface *iface); + +static void seahorse_keyring_deletable_iface (SeahorseDeletableIface *iface); + +static void seahorse_keyring_lockable_iface (SeahorseLockableIface *iface); + +static void seahorse_keyring_viewable_iface (SeahorseViewableIface *iface); -G_DEFINE_TYPE_EXTENDED (SeahorseGkrKeyring, seahorse_gkr_keyring, SEAHORSE_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); +G_DEFINE_TYPE_WITH_CODE (SeahorseGkrKeyring, seahorse_gkr_keyring, SECRET_TYPE_COLLECTION, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_keyring_collection_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_PLACE, seahorse_gkr_keyring_place_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_DELETABLE, seahorse_keyring_deletable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_LOCKABLE, seahorse_keyring_lockable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEWABLE, seahorse_keyring_viewable_iface); +); -static GType -boxed_type_keyring_info (void) +static void +refresh_collection (SeahorseGkrKeyring *self) { - static GType type = 0; - if (!type) - type = g_boxed_type_register_static ("GnomeKeyringInfo", - (GBoxedCopyFunc)gnome_keyring_info_copy, - (GBoxedFreeFunc)gnome_keyring_info_free); - return type; -} - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static void -received_keyring_info (GnomeKeyringResult result, GnomeKeyringInfo *info, gpointer data) -{ - SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (data); - self->pv->req_info = NULL; - - if (result == GNOME_KEYRING_RESULT_CANCELLED) - return; - - if (result != GNOME_KEYRING_RESULT_OK) { - /* TODO: Implement so that we can display an error icon, along with some text */ - g_message ("failed to retrieve info for keyring %s: %s", - self->pv->keyring_name, - gnome_keyring_result_to_message (result)); - return; + SecretCollection *collection = SECRET_COLLECTION (self); + SeahorseGkrItem *item; + const gchar *object_path; + GHashTableIter iter; + GHashTable *seen; + GList *items = NULL; + GList *l; + + seen = g_hash_table_new (g_str_hash, g_str_equal); + + if (!secret_collection_get_locked (collection)) + items = secret_collection_get_items (collection); + + for (l = items; l != NULL; l = g_list_next (l)) { + object_path = g_dbus_proxy_get_object_path (l->data); + item = l->data; + + g_hash_table_add (seen, (gpointer)object_path); + if (!g_hash_table_lookup (self->pv->items, object_path)) { + g_object_set (item, "place", self, NULL); + g_hash_table_insert (self->pv->items, + g_strdup (object_path), + g_object_ref (item)); + gcr_collection_emit_added (GCR_COLLECTION (self), G_OBJECT (item)); + } } - seahorse_gkr_keyring_set_info (self, info); + /* Remove any that we didn't find */ + g_hash_table_iter_init (&iter, self->pv->items); + while (g_hash_table_iter_next (&iter, (gpointer *)&object_path, NULL)) { + if (!g_hash_table_lookup (seen, object_path)) { + item = g_hash_table_lookup (self->pv->items, object_path); + g_object_ref (item); + g_object_set (item, "place", NULL, NULL); + g_hash_table_iter_remove (&iter); + gcr_collection_emit_removed (GCR_COLLECTION (self), G_OBJECT (item)); + g_object_unref (item); + } + } + + g_hash_table_destroy (seen); + g_list_free_full (items, g_object_unref); } static void -load_keyring_info (SeahorseGkrKeyring *self) +seahorse_gkr_keyring_load_async (SeahorsePlace *place, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - /* Already in progress */ - if (!self->pv->req_info) { - g_object_ref (self); - self->pv->req_info = gnome_keyring_get_info (self->pv->keyring_name, - received_keyring_info, - self, g_object_unref); - } + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (place); + GSimpleAsyncResult *async; + + async = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gkr_keyring_load_async); + + refresh_collection (self); + + g_simple_async_result_complete_in_idle (async); + g_object_unref (async); } static gboolean -require_keyring_info (SeahorseGkrKeyring *self) +seahorse_gkr_keyring_load_finish (SeahorsePlace *place, + GAsyncResult *result, + GError **error) { - if (!self->pv->keyring_info) - load_keyring_info (self); - return self->pv->keyring_info != NULL; -} + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (place), + seahorse_gkr_keyring_load_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; -/* ----------------------------------------------------------------------------- - * OBJECT - */ + return TRUE; +} -void -seahorse_gkr_keyring_realize (SeahorseGkrKeyring *self) +static void +on_aliases_changed (GObject *obj, + GParamSpec *pspec, + gpointer user_data) { - gchar *name, *markup; - - name = g_strdup_printf (_("Passwords: %s"), self->pv->keyring_name); - markup = g_markup_printf_escaped (_("Passwords: %s"), self->pv->keyring_name); - - g_object_set (self, - "label", name, - "markup", markup, - "nickname", self->pv->keyring_name, - "identifier", "", - "flags", SEAHORSE_FLAG_DELETABLE, - "icon", "folder", - "usage", SEAHORSE_USAGE_OTHER, - NULL); - - g_free (name); - g_free (markup); + g_object_notify (user_data, "is-default"); + g_object_notify (user_data, "description"); } -void -seahorse_gkr_keyring_refresh (SeahorseGkrKeyring *self) +static void +on_notify_items (GObject *obj, + GParamSpec *pspec, + gpointer user_data) { - if (self->pv->keyring_info) - load_keyring_info (self); + refresh_collection (SEAHORSE_GKR_KEYRING (obj)); } -typedef struct { - SeahorseGkrKeyring *keyring; - gpointer request; - GCancellable *cancellable; - gulong cancelled_sig; -} keyring_load_closure; +static void +on_notify_locked (GObject *obj, + GParamSpec *pspec, + gpointer user_data) +{ + refresh_collection (SEAHORSE_GKR_KEYRING (obj)); +} static void -keyring_load_free (gpointer data) +seahorse_gkr_keyring_init (SeahorseGkrKeyring *self) { - keyring_load_closure *closure = data; - if (closure->cancellable && closure->cancelled_sig) - g_signal_handler_disconnect (closure->cancellable, - closure->cancelled_sig); - if (closure->cancellable) - g_object_unref (closure->cancellable); - g_clear_object (&closure->keyring); - g_assert (!closure->request); - g_free (closure); + self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GKR_KEYRING, SeahorseGkrKeyringPrivate); + self->pv->items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); + g_signal_connect (self, "notify::items", G_CALLBACK (on_notify_items), NULL); + g_signal_connect (self, "notify::locked", G_CALLBACK (on_notify_locked), NULL); + g_signal_connect (seahorse_gkr_backend_get (), "notify::aliases", G_CALLBACK (on_aliases_changed), self); } -/* Remove the given key from the context */ static void -remove_key_from_context (gpointer kt, SeahorseObject *dummy, SeahorseSource *sksrc) +seahorse_gkr_keyring_finalize (GObject *obj) { - /* This function gets called as a GHFunc on the self->checks hashtable. */ - GQuark keyid = GPOINTER_TO_UINT (kt); - SeahorseObject *sobj; + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (obj); + + g_hash_table_destroy (self->pv->items); + g_signal_handlers_disconnect_by_func (self, on_notify_items, NULL); + g_signal_handlers_disconnect_by_func (self, on_notify_locked, NULL); + g_signal_handlers_disconnect_by_func (seahorse_gkr_backend_get (), on_aliases_changed, self); - sobj = seahorse_context_get_object (SCTX_APP (), sksrc, keyid); - if (sobj != NULL) - seahorse_context_remove_object (SCTX_APP (), sobj); + G_OBJECT_CLASS (seahorse_gkr_keyring_parent_class)->finalize (obj); } static void -insert_id_hashtable (SeahorseObject *object, gpointer user_data) +seahorse_gkr_keyring_get_property (GObject *obj, guint prop_id, GValue *value, + GParamSpec *pspec) { - g_hash_table_insert ((GHashTable*)user_data, - GUINT_TO_POINTER (seahorse_object_get_id (object)), - GUINT_TO_POINTER (TRUE)); + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (obj); + const gchar *object_path; + gchar *text; + + switch (prop_id) { + case PROP_DESCRIPTION: + g_value_set_string (value, seahorse_gkr_keyring_get_description (self)); + break; + case PROP_IS_DEFAULT: + g_value_set_boolean (value, seahorse_gkr_keyring_get_is_default (self)); + break; + case PROP_URI: + object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY (self)); + text = g_strdup_printf ("secret-service://%s", object_path); + g_value_take_string (value, text); + break; + case PROP_ACTIONS: + g_value_take_object (value, seahorse_gkr_keyring_actions_new (self)); + break; + case PROP_LOCKABLE: + g_value_set_boolean (value, !secret_collection_get_locked (SECRET_COLLECTION (self))); + break; + case PROP_UNLOCKABLE: + g_value_set_boolean (value, secret_collection_get_locked (SECRET_COLLECTION (self))); + break; + case PROP_DELETABLE: + g_value_set_boolean (value, TRUE); + break; + case PROP_ICON: + g_value_take_object (value, g_themed_icon_new ("folder")); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } } static void -on_keyring_load_list_item_ids (GnomeKeyringResult result, - GList *list, - gpointer user_data) +seahorse_gkr_keyring_class_init (SeahorseGkrKeyringClass *klass) { - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - keyring_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - SeahorseObjectPredicate pred; - SeahorseGkrItem *git; - const gchar *keyring_name; - GError *error = NULL; - GHashTable *checks; - guint32 item_id; - GQuark id; + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - closure->request = NULL; + g_type_class_add_private (klass, sizeof (SeahorseGkrKeyringPrivate)); - if (seahorse_gkr_propagate_error (result, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - return; - } + gobject_class->finalize = seahorse_gkr_keyring_finalize; + gobject_class->get_property = seahorse_gkr_keyring_get_property; - keyring_name = seahorse_gkr_keyring_get_name (closure->keyring); - g_return_if_fail (keyring_name); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_URI, "uri"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); + g_object_class_override_property (gobject_class, PROP_ICON, "icon"); - /* When loading new keys prepare a list of current */ - checks = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL); - seahorse_object_predicate_clear (&pred); - pred.source = SEAHORSE_SOURCE (closure->keyring); - pred.type = SEAHORSE_TYPE_GKR_ITEM; - seahorse_context_for_objects_full (SCTX_APP (), &pred, insert_id_hashtable, checks); - - while (list) { - item_id = GPOINTER_TO_UINT (list->data); - id = seahorse_gkr_item_get_cannonical (keyring_name, item_id); - - git = SEAHORSE_GKR_ITEM (seahorse_context_get_object (seahorse_context_instance (), - SEAHORSE_SOURCE (closure->keyring), id)); - if (!git) { - git = seahorse_gkr_item_new (SEAHORSE_SOURCE (closure->keyring), keyring_name, item_id); - - /* Add to context */ - seahorse_object_set_parent (SEAHORSE_OBJECT (git), SEAHORSE_OBJECT (closure->keyring)); - seahorse_context_take_object (seahorse_context_instance (), SEAHORSE_OBJECT (git)); - } + g_object_class_install_property (gobject_class, PROP_IS_DEFAULT, + g_param_spec_boolean ("is-default", "Is default", "Is the default keyring.", + FALSE, G_PARAM_READABLE)); - g_hash_table_remove (checks, GUINT_TO_POINTER (id)); - list = g_list_next (list); - } + g_object_class_override_property (gobject_class, PROP_LOCKABLE, "lockable"); + g_object_class_override_property (gobject_class, PROP_UNLOCKABLE, "unlockable"); + g_object_class_override_property (gobject_class, PROP_DELETABLE, "deletable"); +} - g_hash_table_foreach (checks, (GHFunc)remove_key_from_context, - SEAHORSE_SOURCE (closure->keyring)); +static void +seahorse_gkr_keyring_place_iface (SeahorsePlaceIface *iface) +{ + iface->load_async = seahorse_gkr_keyring_load_async; + iface->load_finish = seahorse_gkr_keyring_load_finish; +} - g_hash_table_destroy (checks); +static guint +seahorse_gkr_keyring_get_length (GcrCollection *collection) +{ + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (collection); + return g_hash_table_size (self->pv->items); +} - seahorse_progress_end (closure->cancellable, res); - g_simple_async_result_complete_in_idle (res); +static GList * +seahorse_gkr_keyring_get_objects (GcrCollection *collection) +{ + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (collection); + return g_hash_table_get_values (self->pv->items); } -static void -on_keyring_load_get_info (GnomeKeyringResult result, - GnomeKeyringInfo *info, - gpointer user_data) +static gboolean +seahorse_gkr_keyring_contains (GcrCollection *collection, + GObject *object) { - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - keyring_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - const gchar *name; + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (collection); - closure->request = NULL; + if (!SEAHORSE_IS_GKR_ITEM (object)) + return FALSE; + return g_hash_table_lookup (self->pv->items, g_dbus_proxy_get_object_path (G_DBUS_PROXY (object))) != NULL; +} - if (seahorse_gkr_propagate_error (result, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); +static void +seahorse_keyring_collection_iface (GcrCollectionIface *iface) +{ + iface->get_length = seahorse_gkr_keyring_get_length; + iface->get_objects = seahorse_gkr_keyring_get_objects; + iface->contains = seahorse_gkr_keyring_contains; +} - } else { - seahorse_gkr_keyring_set_info (closure->keyring, info); +static SeahorseDeleter * +seahorse_gkr_keyring_create_deleter (SeahorseDeletable *deletable) +{ + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (deletable); + return seahorse_gkr_keyring_deleter_new (self); +} - /* Locked, no items... */ - if (gnome_keyring_info_get_is_locked (info)) { - on_keyring_load_list_item_ids (GNOME_KEYRING_RESULT_OK, NULL, res); - - } else { - name = seahorse_gkr_keyring_get_name (closure->keyring); - closure->request = gnome_keyring_list_item_ids (name, - on_keyring_load_list_item_ids, - g_object_ref (res), g_object_unref); - } - } +static void +seahorse_keyring_deletable_iface (SeahorseDeletableIface *iface) +{ + iface->create_deleter = seahorse_gkr_keyring_create_deleter; } static void -on_keyring_load_cancelled (GCancellable *cancellable, - gpointer user_data) +on_keyring_lock_done (GObject *source, + GAsyncResult *result, + gpointer user_data) { - keyring_load_closure *closure = user_data; + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (g_async_result_get_source_object (user_data)); + GError *error = NULL; + + secret_service_lock_finish (SECRET_SERVICE (source), result, NULL, &error); + if (error != NULL) + g_simple_async_result_take_error (res, error); - if (closure->request) - gnome_keyring_cancel_request (closure->request); + refresh_collection (self); + g_simple_async_result_complete (res); + + g_object_unref (self); + g_object_unref (res); } static void -seahorse_gkr_keyring_load_async (SeahorseSource *source, +seahorse_gkr_keyring_lock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { - SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (source); - keyring_load_closure *closure; + SecretCollection *self = SECRET_COLLECTION (lockable); GSimpleAsyncResult *res; -#if TODO -/* cancellable = g_cancellable_new (); -g_cancellable_cancel (cancellable); */ -#endif + GList *objects; res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_gkr_keyring_load_async); + seahorse_gkr_keyring_lock_async); - closure = g_new0 (keyring_load_closure, 1); - closure->keyring = g_object_ref (self); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - g_simple_async_result_set_op_res_gpointer (res, closure, keyring_load_free); - - closure->request = gnome_keyring_get_info (seahorse_gkr_keyring_get_name (self), - on_keyring_load_get_info, - g_object_ref (res), g_object_unref); - - if (cancellable) - closure->cancelled_sig = g_cancellable_connect (cancellable, - G_CALLBACK (on_keyring_load_cancelled), - closure, NULL); - seahorse_progress_prep_and_begin (cancellable, res, NULL); + objects = g_list_prepend (NULL, self); + secret_service_lock (secret_collection_get_service (self), + objects, cancellable, on_keyring_lock_done, + g_object_ref (res)); + g_list_free (objects); g_object_unref (res); } static gboolean -seahorse_gkr_keyring_load_finish (SeahorseSource *source, +seahorse_gkr_keyring_lock_finish (SeahorseLockable *lockable, GAsyncResult *result, GError **error) { - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_gkr_keyring_load_async), FALSE); + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (lockable), + seahorse_gkr_keyring_lock_async), FALSE); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) return FALSE; @@ -334,200 +378,98 @@ return TRUE; } -static GObject* -seahorse_gkr_keyring_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - GObject *obj = G_OBJECT_CLASS (seahorse_gkr_keyring_parent_class)->constructor (type, n_props, props); - SeahorseGkrKeyring *self = NULL; - gchar *id; - - if (obj) { - self = SEAHORSE_GKR_KEYRING (obj); - - g_return_val_if_fail (self->pv->keyring_name, obj); - id = g_strdup_printf ("%s:%s", SEAHORSE_GKR_TYPE_STR, self->pv->keyring_name); - g_object_set (self, - "id", g_quark_from_string (id), - "usage", SEAHORSE_USAGE_NONE, - NULL); - g_free (id); - } - - return obj; -} - static void -seahorse_gkr_keyring_init (SeahorseGkrKeyring *self) +on_keyring_unlock_done (GObject *source, + GAsyncResult *result, + gpointer user_data) { - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GKR_KEYRING, SeahorseGkrKeyringPrivate); - g_object_set (self, "tag", SEAHORSE_GKR_TYPE, "location", SEAHORSE_LOCATION_LOCAL, NULL); -} + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (g_async_result_get_source_object (user_data)); + GError *error = NULL; -static void -seahorse_gkr_keyring_finalize (GObject *obj) -{ - SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (obj); - - if (self->pv->keyring_info) - gnome_keyring_info_free (self->pv->keyring_info); - self->pv->keyring_info = NULL; - g_assert (self->pv->req_info == NULL); - - g_free (self->pv->keyring_name); - self->pv->keyring_name = NULL; - - if (self->pv->keyring_info) - gnome_keyring_info_free (self->pv->keyring_info); - self->pv->keyring_info = NULL; - - G_OBJECT_CLASS (seahorse_gkr_keyring_parent_class)->finalize (obj); -} + secret_service_unlock_finish (SECRET_SERVICE (source), result, NULL, &error); + if (error != NULL) + g_simple_async_result_take_error (res, error); -static void -seahorse_gkr_keyring_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (obj); - - switch (prop_id) { - case PROP_KEYRING_NAME: - g_return_if_fail (self->pv->keyring_name == NULL); - self->pv->keyring_name = g_value_dup_string (value); - g_object_notify (obj, "keyring-name"); - break; - case PROP_KEYRING_INFO: - seahorse_gkr_keyring_set_info (self, g_value_get_boxed (value)); - break; - case PROP_IS_DEFAULT: - seahorse_gkr_keyring_set_is_default (self, g_value_get_boolean (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} + refresh_collection (self); + g_simple_async_result_complete (res); -static void -seahorse_gkr_keyring_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (obj); - - switch (prop_id) { - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_GKR_TYPE); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL); - break; - case PROP_KEYRING_NAME: - g_value_set_string (value, seahorse_gkr_keyring_get_name (self)); - break; - case PROP_KEYRING_INFO: - g_value_set_boxed (value, seahorse_gkr_keyring_get_info (self)); - break; - case PROP_IS_DEFAULT: - g_value_set_boolean (value, seahorse_gkr_keyring_get_is_default (self)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } + g_object_unref (self); + g_object_unref (res); } static void -seahorse_gkr_keyring_class_init (SeahorseGkrKeyringClass *klass) +seahorse_gkr_keyring_unlock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SecretCollection *self = SECRET_COLLECTION (lockable); + GSimpleAsyncResult *res; + GList *objects; - seahorse_gkr_keyring_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorseGkrKeyringPrivate)); + res = g_simple_async_result_new (G_OBJECT (lockable), callback, user_data, + seahorse_gkr_keyring_unlock_async); - gobject_class->constructor = seahorse_gkr_keyring_constructor; - gobject_class->finalize = seahorse_gkr_keyring_finalize; - gobject_class->set_property = seahorse_gkr_keyring_set_property; - gobject_class->get_property = seahorse_gkr_keyring_get_property; + objects = g_list_prepend (NULL, self); + secret_service_unlock (secret_collection_get_service (self), + objects, cancellable, on_keyring_unlock_done, + g_object_ref (res)); + g_list_free (objects); - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - - g_object_class_install_property (gobject_class, PROP_KEYRING_NAME, - g_param_spec_string ("keyring-name", "Gnome Keyring Name", "Name of keyring.", - "", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property (gobject_class, PROP_KEYRING_INFO, - g_param_spec_boxed ("keyring-info", "Gnome Keyring Info", "Info about keyring.", - boxed_type_keyring_info (), G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_IS_DEFAULT, - g_param_spec_boolean ("is-default", "Is default", "Is the default keyring.", - FALSE, G_PARAM_READWRITE)); + g_object_unref (res); } -static void -seahorse_source_iface (SeahorseSourceIface *iface) +static gboolean +seahorse_gkr_keyring_unlock_finish (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error) { - iface->load_async = seahorse_gkr_keyring_load_async; - iface->load_finish = seahorse_gkr_keyring_load_finish; -} + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (lockable), + seahorse_gkr_keyring_unlock_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; -/* ----------------------------------------------------------------------------- - * PUBLIC - */ + return TRUE; +} -SeahorseGkrKeyring* -seahorse_gkr_keyring_new (const gchar *keyring_name) +static void +seahorse_keyring_lockable_iface (SeahorseLockableIface *iface) { - return g_object_new (SEAHORSE_TYPE_GKR_KEYRING, "keyring-name", keyring_name, NULL); + iface->lock_async = seahorse_gkr_keyring_lock_async; + iface->lock_finish = seahorse_gkr_keyring_lock_finish; + iface->unlock_async = seahorse_gkr_keyring_unlock_async; + iface->unlock_finish = seahorse_gkr_keyring_unlock_finish; } -const gchar* -seahorse_gkr_keyring_get_name (SeahorseGkrKeyring *self) +static void +seahorse_gkr_keyring_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent) { - g_return_val_if_fail (SEAHORSE_IS_GKR_KEYRING (self), NULL); - return self->pv->keyring_name; + seahorse_gkr_keyring_properties_show (SEAHORSE_GKR_KEYRING (viewable), + parent); } -GnomeKeyringInfo* -seahorse_gkr_keyring_get_info (SeahorseGkrKeyring *self) +static void +seahorse_keyring_viewable_iface (SeahorseViewableIface *iface) { - g_return_val_if_fail (SEAHORSE_IS_GKR_KEYRING (self), NULL); - require_keyring_info (self); - return self->pv->keyring_info; + iface->show_viewer = seahorse_gkr_keyring_show_viewer; } -void -seahorse_gkr_keyring_set_info (SeahorseGkrKeyring *self, GnomeKeyringInfo *info) +const gchar * +seahorse_gkr_keyring_get_description (SeahorseGkrKeyring *self) { - GObject *obj; - - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING (self)); - - if (self->pv->keyring_info) - gnome_keyring_info_free (self->pv->keyring_info); - if (info) - self->pv->keyring_info = gnome_keyring_info_copy (info); - else - self->pv->keyring_info = NULL; - - obj = G_OBJECT (self); - g_object_freeze_notify (obj); - seahorse_gkr_keyring_realize (self); - g_object_notify (obj, "keyring-info"); - g_object_thaw_notify (obj); + g_return_val_if_fail (SEAHORSE_IS_GKR_KEYRING (self), NULL); + if (seahorse_gkr_backend_has_alias (NULL, "login", self)) + return _("A keyring that is automatically unlocked on login"); + return _("A keyring used to store passwords"); } gboolean seahorse_gkr_keyring_get_is_default (SeahorseGkrKeyring *self) { g_return_val_if_fail (SEAHORSE_IS_GKR_KEYRING (self), FALSE); - return self->pv->is_default; -} - -void -seahorse_gkr_keyring_set_is_default (SeahorseGkrKeyring *self, gboolean is_default) -{ - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING (self)); - self->pv->is_default = is_default; - g_object_notify (G_OBJECT (self), "is-default"); + return seahorse_gkr_backend_has_alias (NULL, "default", self); } diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring-commands.c seahorse-3.6.3/gkr/seahorse-gkr-keyring-commands.c --- seahorse-3.2.2/gkr/seahorse-gkr-keyring-commands.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring-commands.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,463 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-gkr-keyring-commands.h" - -#include "seahorse-gkr.h" -#include "seahorse-gkr-keyring.h" -#include "seahorse-gkr-dialogs.h" -#include "seahorse-gkr-operation.h" -#include "seahorse-gkr-source.h" - -#include "seahorse-progress.h" -#include "seahorse-registry.h" -#include "seahorse-source.h" -#include "seahorse-util.h" - -#include - -struct _SeahorseGkrKeyringCommandsPrivate { - GtkAction *action_lock; - GtkAction *action_unlock; - GtkAction *action_default; -}; - -G_DEFINE_TYPE (SeahorseGkrKeyringCommands, seahorse_gkr_keyring_commands, SEAHORSE_TYPE_COMMANDS); - -static const char* UI_KEYRING = ""\ -""\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -""; - -static SeahorseObjectPredicate keyring_predicate = { 0, }; - -static void on_view_selection_changed (SeahorseView *view, gpointer user_data); - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static void -on_refresh_all_keyrings_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseCommands *self = SEAHORSE_COMMANDS (user_data); - SeahorseView *view; - - g_return_if_fail (SEAHORSE_IS_COMMANDS (self)); - - view = seahorse_commands_get_view (self); - if (view != NULL) - on_view_selection_changed (view, self); - - g_object_unref (self); -} - -static void -refresh_all_keyrings (SeahorseCommands *commands) -{ - seahorse_source_load_async (SEAHORSE_SOURCE (seahorse_gkr_source_default ()), - NULL, on_refresh_all_keyrings_complete, - g_object_ref (commands)); -} - -/** - * on_gkr_add_keyring: - * @action: - * @unused: ignored - * - * calls the function that shows the add keyring window - */ -static void -on_gkr_add_keyring (GtkAction *action, gpointer unused) -{ - g_return_if_fail (GTK_IS_ACTION (action)); - seahorse_gkr_add_keyring_show (NULL); -} - -static void -on_gkr_add_item (GtkAction *action, gpointer unused) -{ - g_return_if_fail (GTK_IS_ACTION (action)); - seahorse_gkr_add_item_show (NULL); -} - -static const GtkActionEntry ENTRIES_NEW[] = { - { "gkr-add-keyring", "folder", N_("Password Keyring"), "", - N_("Used to store application and network passwords"), G_CALLBACK (on_gkr_add_keyring) }, - { "gkr-add-item", "emblem-readonly", N_("Stored Password"), "", - N_("Safely store a password or secret."), G_CALLBACK (on_gkr_add_item) } -}; - -static void -on_keyring_unlock_done (GnomeKeyringResult result, gpointer user_data) -{ - SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data); - - if (result != GNOME_KEYRING_RESULT_OK && - result != GNOME_KEYRING_RESULT_DENIED && - result != GNOME_KEYRING_RESULT_CANCELLED) { - seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)), - _("Couldn't unlock keyring"), - gnome_keyring_result_to_message (result)); - } - - refresh_all_keyrings (commands); -} - -static void -on_keyring_unlock (GtkAction *action, SeahorseGkrKeyringCommands *self) -{ - SeahorseView *view; - GList *keys, *l; - - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING_COMMANDS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - keys = seahorse_view_get_selected_matching (view, &keyring_predicate); - - for (l = keys; l; l = g_list_next (l)) { - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING (l->data)); - gnome_keyring_unlock (seahorse_gkr_keyring_get_name (l->data), NULL, - on_keyring_unlock_done, g_object_ref (self), g_object_unref); - } - - g_list_free (keys); -} - -static void -on_keyring_lock_done (GnomeKeyringResult result, gpointer user_data) -{ - SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data); - - if (result != GNOME_KEYRING_RESULT_OK && - result != GNOME_KEYRING_RESULT_DENIED && - result != GNOME_KEYRING_RESULT_CANCELLED) { - seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)), - _("Couldn't lock keyring"), - gnome_keyring_result_to_message (result)); - } - - refresh_all_keyrings (commands); -} - -static void -on_keyring_lock (GtkAction *action, SeahorseGkrKeyringCommands *self) -{ - SeahorseView *view; - GList *keyrings, *l; - - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING_COMMANDS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - keyrings = seahorse_view_get_selected_matching (view, &keyring_predicate); - - for (l = keyrings; l; l = g_list_next (l)) { - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING (l->data)); - gnome_keyring_lock (seahorse_gkr_keyring_get_name (l->data), - on_keyring_lock_done, g_object_ref (self), g_object_unref); - } - - g_list_free (keyrings); -} - -static void -on_set_default_keyring_done (GnomeKeyringResult result, gpointer user_data) -{ - SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data); - - if (result != GNOME_KEYRING_RESULT_OK && - result != GNOME_KEYRING_RESULT_DENIED && - result != GNOME_KEYRING_RESULT_CANCELLED) { - seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)), - _("Couldn't set default keyring"), - gnome_keyring_result_to_message (result)); - } - - refresh_all_keyrings (commands); -} - -static void -on_keyring_default (GtkAction *action, SeahorseGkrKeyringCommands *self) -{ - SeahorseView *view; - GList *keys; - - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING_COMMANDS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - keys = seahorse_view_get_selected_matching (view, &keyring_predicate); - - if (keys) { - gnome_keyring_set_default_keyring (seahorse_gkr_keyring_get_name (keys->data), - on_set_default_keyring_done, g_object_ref (self), g_object_unref); - } - - g_list_free (keys); - -} - -static void -on_change_password_done (GnomeKeyringResult result, gpointer user_data) -{ - SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data); - - if (result != GNOME_KEYRING_RESULT_OK && - result != GNOME_KEYRING_RESULT_DENIED && - result != GNOME_KEYRING_RESULT_CANCELLED) { - seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)), - _("Couldn't change keyring password"), - gnome_keyring_result_to_message (result)); - } - - refresh_all_keyrings (commands); -} - -static void -on_keyring_password (GtkAction *action, SeahorseGkrKeyringCommands *self) -{ - SeahorseView *view; - GList *keys, *l; - - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING_COMMANDS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - keys = seahorse_view_get_selected_matching (view, &keyring_predicate); - - for (l = keys; l; l = g_list_next (l)) { - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING (l->data)); - gnome_keyring_change_password (seahorse_gkr_keyring_get_name (l->data), NULL, NULL, - on_change_password_done, g_object_ref (self), g_object_unref); - } - - g_list_free (keys); -} - -static const GtkActionEntry ENTRIES_KEYRING[] = { - { "keyring-lock", NULL, N_("_Lock"), "", - N_("Lock the password storage keyring so a master password is required to unlock it."), G_CALLBACK (on_keyring_lock) }, - { "keyring-unlock", NULL, N_("_Unlock"), "", - N_("Unlock the password storage keyring with a master password so it is available for use."), G_CALLBACK (on_keyring_unlock) }, - { "keyring-default", NULL, N_("_Set as default"), "", - N_("Applications usually store new passwords in the default keyring."), G_CALLBACK (on_keyring_default) }, - { "keyring-password", NULL, N_("Change _Password"), "", - N_("Change the unlock password of the password storage keyring"), G_CALLBACK (on_keyring_password) } -}; - -static void -on_view_selection_changed (SeahorseView *view, gpointer user_data) -{ - SeahorseGkrKeyringCommands *self = user_data; - GnomeKeyringInfo *info; - gboolean locked = FALSE; - gboolean unlocked = FALSE; - gboolean can_default = FALSE; - GList *keys, *l; - - g_return_if_fail (SEAHORSE_IS_VIEW (view)); - g_return_if_fail (SEAHORSE_IS_GKR_KEYRING_COMMANDS (self)); - - keys = seahorse_view_get_selected_matching (view, &keyring_predicate); - for (l = keys; l; l = g_list_next (l)) { - info = seahorse_gkr_keyring_get_info (l->data); - if (info != NULL) { - if (gnome_keyring_info_get_is_locked (info)) - locked = TRUE; - else - unlocked = TRUE; - if (!seahorse_gkr_keyring_get_is_default (l->data)) - can_default = TRUE; - } - } - - g_list_free (keys); - - gtk_action_set_sensitive (self->pv->action_lock, unlocked); - gtk_action_set_sensitive (self->pv->action_unlock, locked); - gtk_action_set_sensitive (self->pv->action_default, can_default); -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_gkr_keyring_commands_show_properties (SeahorseCommands* base, SeahorseObject* object) -{ - GtkWindow *window; - - g_return_if_fail (SEAHORSE_IS_OBJECT (object)); - g_return_if_fail (seahorse_object_get_tag (object) == SEAHORSE_GKR_TYPE); - - window = seahorse_commands_get_window (base); - if (G_OBJECT_TYPE (object) == SEAHORSE_TYPE_GKR_KEYRING) - seahorse_gkr_keyring_properties_show (SEAHORSE_GKR_KEYRING (object), window); - - else - g_return_if_reached (); -} - -static void -on_delete_objects_complete (GObject *source, GAsyncResult *result, gpointer user_data) -{ - SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data); - GError *error = NULL; - GtkWidget *parent; - - if (!seahorse_gkr_delete_finish (result, &error)) { - parent = GTK_WIDGET (seahorse_commands_get_window (commands)); - seahorse_util_show_error (parent, _("Couldn't delete keyring"), error->message); - g_error_free (error); - } - - g_object_unref (commands); -} - -static gboolean -seahorse_gkr_keyring_commands_delete_objects (SeahorseCommands* commands, - GList* objects) -{ - GCancellable *cancellable; - gchar *prompt; - gboolean ret; - - if (!objects) - return TRUE; - - prompt = g_strdup_printf (_ ("Are you sure you want to delete the password keyring '%s'?"), - seahorse_object_get_label (objects->data)); - - ret = seahorse_util_prompt_delete (prompt, GTK_WIDGET (seahorse_commands_get_window (commands))); - - if (ret) { - cancellable = g_cancellable_new (); - seahorse_gkr_delete_async (objects, cancellable, - on_delete_objects_complete, - g_object_ref (commands)); - seahorse_progress_show (cancellable, ngettext ("Deleting keyring", "Deleting keyrings", - g_list_length (objects)), TRUE); - g_object_unref (cancellable); - } - - g_free (prompt); - return ret; -} - -static GObject* -seahorse_gkr_keyring_commands_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - SeahorseGkrKeyringCommands *self = SEAHORSE_GKR_KEYRING_COMMANDS (G_OBJECT_CLASS (seahorse_gkr_keyring_commands_parent_class)->constructor (type, n_props, props)); - GtkActionGroup *actions; - SeahorseView *view; - - g_return_val_if_fail (SEAHORSE_IS_GKR_KEYRING_COMMANDS (self), NULL); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - g_return_val_if_fail (view, NULL); - seahorse_view_register_commands (view, &keyring_predicate, SEAHORSE_COMMANDS (self)); - - actions = gtk_action_group_new ("gkr-keyring"); - gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (actions, ENTRIES_KEYRING, G_N_ELEMENTS (ENTRIES_KEYRING), self); - seahorse_view_register_ui (view, &keyring_predicate, UI_KEYRING, actions); - self->pv->action_lock = g_object_ref (gtk_action_group_get_action (actions, "keyring-lock")); - self->pv->action_unlock = g_object_ref (gtk_action_group_get_action (actions, "keyring-unlock")); - self->pv->action_default = g_object_ref (gtk_action_group_get_action (actions, "keyring-default")); - g_object_unref (actions); - - /* Watch and wait for selection changes and diddle lock/unlock */ - g_signal_connect (view, "selection-changed", G_CALLBACK (on_view_selection_changed), self); - - return G_OBJECT (self); -} - -static void -seahorse_gkr_keyring_commands_init (SeahorseGkrKeyringCommands *self) -{ - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GKR_KEYRING_COMMANDS, SeahorseGkrKeyringCommandsPrivate); -} - -static void -seahorse_gkr_keyring_commands_finalize (GObject *obj) -{ - SeahorseGkrKeyringCommands *self = SEAHORSE_GKR_KEYRING_COMMANDS (obj); - - g_object_unref (self->pv->action_lock); - self->pv->action_lock = NULL; - - g_object_unref (self->pv->action_unlock); - self->pv->action_unlock = NULL; - - g_object_unref (self->pv->action_default); - self->pv->action_default = NULL; - - G_OBJECT_CLASS (seahorse_gkr_keyring_commands_parent_class)->finalize (obj); -} - -static void -seahorse_gkr_keyring_commands_class_init (SeahorseGkrKeyringCommandsClass *klass) -{ - GtkActionGroup *actions; - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - SeahorseCommandsClass *cmd_class = SEAHORSE_COMMANDS_CLASS (klass); - - seahorse_gkr_keyring_commands_parent_class = g_type_class_peek_parent (klass); - - gobject_class->constructor = seahorse_gkr_keyring_commands_constructor; - gobject_class->finalize = seahorse_gkr_keyring_commands_finalize; - - cmd_class->show_properties = seahorse_gkr_keyring_commands_show_properties; - cmd_class->delete_objects = seahorse_gkr_keyring_commands_delete_objects; - - g_type_class_add_private (gobject_class, sizeof (SeahorseGkrKeyringCommandsPrivate)); - - /* Setup the predicate for these commands */ - keyring_predicate.type = SEAHORSE_TYPE_GKR_KEYRING; - - /* Register this class as a commands */ - seahorse_registry_register_type (seahorse_registry_get (), SEAHORSE_TYPE_GKR_KEYRING_COMMANDS, - SEAHORSE_GKR_TYPE_STR, "commands", NULL, NULL); - - /* Register this as a generator */ - actions = gtk_action_group_new ("gkr-generate"); - gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (actions, ENTRIES_NEW, G_N_ELEMENTS (ENTRIES_NEW), NULL); - seahorse_registry_register_object (NULL, G_OBJECT (actions), SEAHORSE_GKR_TYPE_STR, "generator", NULL); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - - diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring-commands.h seahorse-3.6.3/gkr/seahorse-gkr-keyring-commands.h --- seahorse-3.2.2/gkr/seahorse-gkr-keyring-commands.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring-commands.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_GKR_KEYRING_COMMANDS_H__ -#define __SEAHORSE_GKR_KEYRING_COMMANDS_H__ - -#include "seahorse-commands.h" - -#include - -#define SEAHORSE_TYPE_GKR_KEYRING_COMMANDS (seahorse_gkr_keyring_commands_get_type ()) -#define SEAHORSE_GKR_KEYRING_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_KEYRING_COMMANDS, SeahorseGkrKeyringCommands)) -#define SEAHORSE_GKR_KEYRING_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_KEYRING_COMMANDS, SeahorseGkrKeyringCommandsClass)) -#define SEAHORSE_IS_GKR_KEYRING_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_KEYRING_COMMANDS)) -#define SEAHORSE_IS_GKR_KEYRING_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_KEYRING_COMMANDS)) -#define SEAHORSE_GKR_KEYRING_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_KEYRING_COMMANDS, SeahorseGkrKeyringCommandsClass)) - -typedef struct _SeahorseGkrKeyringCommands SeahorseGkrKeyringCommands; -typedef struct _SeahorseGkrKeyringCommandsClass SeahorseGkrKeyringCommandsClass; -typedef struct _SeahorseGkrKeyringCommandsPrivate SeahorseGkrKeyringCommandsPrivate; - -struct _SeahorseGkrKeyringCommands { - SeahorseCommands parent; - SeahorseGkrKeyringCommandsPrivate *pv; -}; - -struct _SeahorseGkrKeyringCommandsClass { - SeahorseCommandsClass parent_class; -}; - -GType seahorse_gkr_keyring_commands_get_type (void); - -SeahorseGkrKeyringCommands* seahorse_gkr_keyring_commands_new (void); - -#endif /* __SEAHORSE_GKR_KEYRING_COMMANDS_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring-deleter.c seahorse-3.6.3/gkr/seahorse-gkr-keyring-deleter.c --- seahorse-3.2.2/gkr/seahorse-gkr-keyring-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring-deleter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,182 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-gkr-backend.h" +#include "seahorse-gkr-keyring-deleter.h" + +#include "seahorse-delete-dialog.h" + +#include + +#define SEAHORSE_GKR_KEYRING_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_KEYRING_DELETER, SeahorseGkrKeyringDeleterClass)) +#define SEAHORSE_IS_GKR_KEYRING_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_KEYRING_DELETER)) +#define SEAHORSE_GKR_KEYRING_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_KEYRING_DELETER, SeahorseGkrKeyringDeleterClass)) + +typedef struct _SeahorseGkrKeyringDeleterClass SeahorseGkrKeyringDeleterClass; + +struct _SeahorseGkrKeyringDeleter { + SeahorseDeleter parent; + SeahorseGkrKeyring *keyring; + GList *objects; +}; + +struct _SeahorseGkrKeyringDeleterClass { + SeahorseDeleterClass parent_class; +}; + +G_DEFINE_TYPE (SeahorseGkrKeyringDeleter, seahorse_gkr_keyring_deleter, SEAHORSE_TYPE_DELETER); + +static void +seahorse_gkr_keyring_deleter_init (SeahorseGkrKeyringDeleter *self) +{ + +} + +static void +seahorse_gkr_keyring_deleter_finalize (GObject *obj) +{ + SeahorseGkrKeyringDeleter *self = SEAHORSE_GKR_KEYRING_DELETER (obj); + + g_object_unref (self->keyring); + g_list_free (self->objects); + + G_OBJECT_CLASS (seahorse_gkr_keyring_deleter_parent_class)->finalize (obj); +} + +static GtkDialog * +seahorse_gkr_keyring_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorseGkrKeyringDeleter *self = SEAHORSE_GKR_KEYRING_DELETER (deleter); + GtkDialog *dialog; + + dialog = seahorse_delete_dialog_new (parent, + _("Are you sure you want to delete the password keyring '%s'?"), + secret_collection_get_label (SECRET_COLLECTION (self->keyring))); + + seahorse_delete_dialog_set_check_label (SEAHORSE_DELETE_DIALOG (dialog), _("I understand that all items will be permanently deleted.")); + seahorse_delete_dialog_set_check_require (SEAHORSE_DELETE_DIALOG (dialog), TRUE); + + return dialog; +} + +static GList * +seahorse_gkr_keyring_deleter_get_objects (SeahorseDeleter *deleter) +{ + SeahorseGkrKeyringDeleter *self = SEAHORSE_GKR_KEYRING_DELETER (deleter); + return self->objects; +} + +static gboolean +seahorse_gkr_keyring_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorseGkrKeyringDeleter *self = SEAHORSE_GKR_KEYRING_DELETER (deleter); + if (self->keyring) + return FALSE; + if (!SEAHORSE_IS_GKR_KEYRING (object)) + return FALSE; + self->keyring = g_object_ref (object); + self->objects = g_list_append (self->objects, self->keyring); + return TRUE; +} + +static void +on_delete_gkr_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + GError *error = NULL; + + secret_collection_delete_finish (SECRET_COLLECTION (source), result, &error); + if (error != NULL) + g_simple_async_result_take_error (res, error); + + g_simple_async_result_complete (res); + g_object_unref (res); +} + +static void +seahorse_gkr_keyring_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseGkrKeyringDeleter *self = SEAHORSE_GKR_KEYRING_DELETER (deleter); + GSimpleAsyncResult *res; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gkr_keyring_deleter_delete_async); + + secret_collection_delete (SECRET_COLLECTION (self->keyring), + cancellable, on_delete_gkr_complete, + g_object_ref (res)); + + g_object_unref (res); +} + +static gboolean +seahorse_gkr_keyring_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error) +{ + SeahorseGkrKeyringDeleter *self = SEAHORSE_GKR_KEYRING_DELETER (deleter); + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_gkr_keyring_deleter_delete_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +seahorse_gkr_keyring_deleter_class_init (SeahorseGkrKeyringDeleterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseDeleterClass *deleter_class = SEAHORSE_DELETER_CLASS (klass); + + gobject_class->finalize = seahorse_gkr_keyring_deleter_finalize; + + deleter_class->add_object = seahorse_gkr_keyring_deleter_add_object; + deleter_class->create_confirm = seahorse_gkr_keyring_deleter_create_confirm; + deleter_class->delete_async = seahorse_gkr_keyring_deleter_delete_async; + deleter_class->delete_finish = seahorse_gkr_keyring_deleter_delete_finish; + deleter_class->get_objects = seahorse_gkr_keyring_deleter_get_objects; +} + +SeahorseDeleter * +seahorse_gkr_keyring_deleter_new (SeahorseGkrKeyring *keyring) +{ + SeahorseDeleter *deleter; + + deleter = g_object_new (SEAHORSE_TYPE_GKR_KEYRING_DELETER, NULL); + if (!seahorse_deleter_add_object (deleter, G_OBJECT (keyring))) + g_assert_not_reached (); + + return deleter; +} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring-deleter.h seahorse-3.6.3/gkr/seahorse-gkr-keyring-deleter.h --- seahorse-3.2.2/gkr/seahorse-gkr-keyring-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_GKR_KEYRING_DELETER_H__ +#define __SEAHORSE_GKR_KEYRING_DELETER_H__ + +#include + +#include "seahorse-deleter.h" +#include "seahorse-gkr-keyring.h" + +#define SEAHORSE_TYPE_GKR_KEYRING_DELETER (seahorse_gkr_keyring_deleter_get_type ()) +#define SEAHORSE_GKR_KEYRING_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_KEYRING_DELETER, SeahorseGkrKeyringDeleter)) +#define SEAHORSE_IS_GKR_KEYRING_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_KEYRING_DELETER)) + +typedef struct _SeahorseGkrKeyringDeleter SeahorseGkrKeyringDeleter; + +GType seahorse_gkr_keyring_deleter_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_gkr_keyring_deleter_new (SeahorseGkrKeyring *keyring); + +#endif /* __SEAHORSE_GKR_KEYRING_DELETER_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring.h seahorse-3.6.3/gkr/seahorse-gkr-keyring.h --- seahorse-3.2.2/gkr/seahorse-gkr-keyring.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring.h 2012-08-21 12:23:16.000000000 +0200 @@ -22,11 +22,12 @@ #ifndef __SEAHORSE_GKR_KEYRING_H__ #define __SEAHORSE_GKR_KEYRING_H__ -#include - #include "seahorse-object.h" -#include +#include +#include + +#include #define SEAHORSE_TYPE_GKR_KEYRING (seahorse_gkr_keyring_get_type ()) #define SEAHORSE_GKR_KEYRING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_KEYRING, SeahorseGkrKeyring)) @@ -38,34 +39,20 @@ typedef struct _SeahorseGkrKeyring SeahorseGkrKeyring; typedef struct _SeahorseGkrKeyringClass SeahorseGkrKeyringClass; typedef struct _SeahorseGkrKeyringPrivate SeahorseGkrKeyringPrivate; - + struct _SeahorseGkrKeyring { - SeahorseObject parent; + SecretCollection parent; SeahorseGkrKeyringPrivate *pv; }; struct _SeahorseGkrKeyringClass { - SeahorseObjectClass parent_class; + SecretCollectionClass parent_class; }; GType seahorse_gkr_keyring_get_type (void); -SeahorseGkrKeyring* seahorse_gkr_keyring_new (const gchar *keyring_name); - -void seahorse_gkr_keyring_refresh (SeahorseGkrKeyring *self); - -void seahorse_gkr_keyring_realize (SeahorseGkrKeyring *self); - -const gchar* seahorse_gkr_keyring_get_name (SeahorseGkrKeyring *self); - -GnomeKeyringInfo* seahorse_gkr_keyring_get_info (SeahorseGkrKeyring *self); - -void seahorse_gkr_keyring_set_info (SeahorseGkrKeyring *self, - GnomeKeyringInfo *info); +const gchar * seahorse_gkr_keyring_get_description (SeahorseGkrKeyring *self); gboolean seahorse_gkr_keyring_get_is_default (SeahorseGkrKeyring *self); -void seahorse_gkr_keyring_set_is_default (SeahorseGkrKeyring *self, - gboolean is_default); - #endif /* __SEAHORSE_GKR_KEYRING_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring-properties.c seahorse-3.6.3/gkr/seahorse-gkr-keyring-properties.c --- seahorse-3.2.2/gkr/seahorse-gkr-keyring-properties.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring-properties.c 2012-08-21 12:23:16.000000000 +0200 @@ -26,7 +26,7 @@ #include #include "seahorse-bind.h" -#include "seahorse-gtkstock.h" +#include "seahorse-icons.h" #include "seahorse-object.h" #include "seahorse-object-widget.h" #include "seahorse-util.h" @@ -40,32 +40,26 @@ */ static gboolean -transform_keyring_created (const GValue *from, GValue *to) +transform_keyring_created (const GValue *from, + GValue *to) { - GnomeKeyringInfo *info; time_t time; - - info = g_value_get_boxed (from); - if (info) { - time = gnome_keyring_info_get_ctime (info); - g_value_take_string (to, seahorse_util_get_display_date_string (time)); - } - - if (!g_value_get_string (to)) - g_value_set_string (to, ""); - + + time = g_value_get_uint64 (from); + g_value_take_string (to, seahorse_util_get_display_date_string (time)); + return TRUE; } static void setup_main (SeahorseWidget *swidget) { - SeahorseObject *object; - + GObject *object; + object = SEAHORSE_OBJECT_WIDGET (swidget)->object; /* Setup the image properly */ - seahorse_bind_property ("icon", object, "stock", + seahorse_bind_property ("icon", object, "gicon", seahorse_widget_get_widget (swidget, "keyring-image")); /* The window title */ @@ -73,11 +67,11 @@ seahorse_widget_get_toplevel (swidget)); /* Setup the label properly */ - seahorse_bind_property ("keyring-name", object, "label", + seahorse_bind_property ("label", object, "label", seahorse_widget_get_widget (swidget, "name-field")); /* The date field */ - seahorse_bind_property_full ("keyring-info", object, transform_keyring_created, "label", + seahorse_bind_property_full ("created", object, transform_keyring_created, "label", seahorse_widget_get_widget (swidget, "created-field"), NULL); } @@ -102,9 +96,9 @@ void seahorse_gkr_keyring_properties_show (SeahorseGkrKeyring *gkr, GtkWindow *parent) { - SeahorseObject *object = SEAHORSE_OBJECT (gkr); + GObject *object = G_OBJECT (gkr); SeahorseWidget *swidget = NULL; - + swidget = seahorse_object_widget_new ("gkr-keyring", parent, object); /* This happens if the window is already open */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-keyring.xml seahorse-3.6.3/gkr/seahorse-gkr-keyring.xml --- seahorse-3.2.2/gkr/seahorse-gkr-keyring.xml 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/gkr/seahorse-gkr-keyring.xml 2012-08-21 12:23:16.000000000 +0200 @@ -51,9 +51,8 @@ True 0 0 - _Name: + Name: True - True GTK_FILL diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-module.c seahorse-3.6.3/gkr/seahorse-gkr-module.c --- seahorse-3.2.2/gkr/seahorse-gkr-module.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-module.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-gkr-module.h" - -#include "seahorse-gkr-dialogs.h" -#include "seahorse-gkr-item-commands.h" -#include "seahorse-gkr-keyring-commands.h" -#include "seahorse-gkr-source.h" - -#include "seahorse-context.h" - -#include - -void -seahorse_gkr_module_init (void) -{ - SeahorseSource *source; - - source = SEAHORSE_SOURCE (seahorse_gkr_source_new ()); - seahorse_context_take_source (NULL, source); - - /* Let these classes register themselves */ - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_GKR_SOURCE)); - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_GKR_ITEM_COMMANDS)); - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_GKR_KEYRING_COMMANDS)); -} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-module.h seahorse-3.6.3/gkr/seahorse-gkr-module.h --- seahorse-3.2.2/gkr/seahorse-gkr-module.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-module.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 SEAHORSEGKR_H_ -#define SEAHORSEGKR_H_ - -#define SEAHORSE_GKR_STR "gnome-keyring" -#define SEAHORSE_GKR (g_quark_from_static_string (SEAHORSE_GKR_STR)) - -void seahorse_gkr_module_init (void); - -#endif /*SEAHORSEGKR_H_*/ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-operation.c seahorse-3.6.3/gkr/seahorse-gkr-operation.c --- seahorse-3.2.2/gkr/seahorse-gkr-operation.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-operation.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,499 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include -#include - -#include - -#include "seahorse-gkr-operation.h" -#include "seahorse-progress.h" -#include "seahorse-util.h" -#include "seahorse-passphrase.h" - -#include -#include - -gboolean -seahorse_gkr_propagate_error (GnomeKeyringResult result, GError **error) -{ - static GQuark errorq = 0; - const gchar *message = NULL; - gint code = (gint)result; - - if (result == GNOME_KEYRING_RESULT_OK) - return FALSE; - - /* An error mark it as such */ - switch (result) { - case GNOME_KEYRING_RESULT_CANCELLED: - message = _("The operation was cancelled"); - code = G_IO_ERROR_CANCELLED; - errorq = G_IO_ERROR; - break; - case GNOME_KEYRING_RESULT_DENIED: - message = _("Access to the key ring was denied"); - break; - case GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON: - message = _("The gnome-keyring daemon is not running"); - break; - case GNOME_KEYRING_RESULT_ALREADY_UNLOCKED: - message = _("The key ring has already been unlocked"); - break; - case GNOME_KEYRING_RESULT_NO_SUCH_KEYRING: - message = _("No such key ring exists"); - break; - case GNOME_KEYRING_RESULT_IO_ERROR: - message = _("Couldn't communicate with key ring daemon"); - break; - case GNOME_KEYRING_RESULT_ALREADY_EXISTS: - message = _("The item already exists"); - break; - case GNOME_KEYRING_RESULT_BAD_ARGUMENTS: - g_warning ("bad arguments passed to gnome-keyring API"); - /* Fall through */ - default: - message = _("Internal error accessing gnome-keyring"); - break; - } - - if (!errorq) - errorq = g_quark_from_static_string ("seahorse-gnome-keyring"); - - g_set_error (error, errorq, code, "%s", message); - return TRUE; -} - -typedef struct { - GnomeKeyringItemInfo *info; - gchar *secret; - SeahorseGkrItem *item; - GCancellable *cancellable; - gulong cancelled_sig; - gpointer request; -} update_secret_closure; - -static void -update_secret_free (gpointer data) -{ - update_secret_closure *closure = data; - gnome_keyring_free_password (closure->secret); - g_object_unref (closure->item); - if (closure->cancellable && closure->cancelled_sig) - g_signal_handler_disconnect (closure->cancellable, - closure->cancelled_sig); - g_clear_object (&closure->cancellable); - gnome_keyring_item_info_free (closure->info); - g_assert (closure->request == NULL); - g_free (closure); -} - -static void -on_update_secret_set_info_complete (GnomeKeyringResult result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - update_secret_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - closure->request = NULL; - seahorse_progress_end (closure->cancellable, res); - - if (seahorse_gkr_propagate_error (result, &error)) - g_simple_async_result_take_error (res, error); - else - seahorse_gkr_item_set_info (closure->item, closure->info); - - g_simple_async_result_complete_in_idle (res); -} - -static void -on_update_secret_get_info_complete (GnomeKeyringResult result, - GnomeKeyringItemInfo *info, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - update_secret_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - closure->request = NULL; - - /* Operation to get info failed */ - if (seahorse_gkr_propagate_error (result, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - seahorse_progress_end (closure->cancellable, res); - - /* Update the description */ - } else { - closure->info = gnome_keyring_item_info_copy (info); - gnome_keyring_item_info_set_secret (closure->info, closure->secret); - - closure->request = gnome_keyring_item_set_info (seahorse_gkr_item_get_keyring_name (closure->item), - seahorse_gkr_item_get_item_id (closure->item), - closure->info, on_update_secret_set_info_complete, - g_object_ref (res), g_object_unref); - } - - gnome_keyring_free_password (closure->secret); - closure->secret = NULL; -} - -static void -on_update_secret_cancelled (GCancellable *cancellable, - gpointer user_data) -{ - update_secret_closure *closure = user_data; - - if (closure->request) - gnome_keyring_cancel_request (closure->request); -} - -void -seahorse_gkr_update_secret_async (SeahorseGkrItem *item, - const gchar *secret, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - update_secret_closure *closure; - - g_return_if_fail (SEAHORSE_IS_GKR_ITEM (item)); - g_return_if_fail (secret); - - res = g_simple_async_result_new (G_OBJECT (item), callback, user_data, - seahorse_gkr_update_secret_async); - - closure = g_new0 (update_secret_closure, 1); - closure->item = g_object_ref (item); - closure->secret = gnome_keyring_memory_strdup (secret); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - g_simple_async_result_set_op_res_gpointer (res, closure, update_secret_free); - - seahorse_progress_prep_and_begin (cancellable, res, NULL); - closure->request = gnome_keyring_item_get_info (seahorse_gkr_item_get_keyring_name (item), - seahorse_gkr_item_get_item_id (item), - on_update_secret_get_info_complete, - g_object_ref (res), g_object_unref); - - if (cancellable) - closure->cancelled_sig = g_cancellable_connect (cancellable, - G_CALLBACK (on_update_secret_cancelled), - closure, NULL); - g_object_unref (res); -} - -gboolean -seahorse_gkr_update_secret_finish (SeahorseGkrItem *item, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (item), FALSE); - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (item), - seahorse_gkr_update_secret_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} - -typedef struct { - GnomeKeyringItemInfo *info; - gchar *description; - SeahorseGkrItem *item; - gpointer request; - GCancellable *cancellable; - gulong cancelled_sig; -} update_description_closure; - -static void -update_description_free (gpointer data) -{ - update_description_closure *closure = data; - g_free (closure->description); - g_object_unref (closure->item); - if (closure->cancellable && closure->cancelled_sig) - g_signal_handler_disconnect (closure->cancellable, - closure->cancelled_sig); - g_clear_object (&closure->cancellable); - gnome_keyring_item_info_free (closure->info); - g_assert (closure->request == NULL); - g_free (closure); -} - -static void -on_update_description_set_info_complete (GnomeKeyringResult result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - update_description_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - closure->request = NULL; - seahorse_progress_end (closure->cancellable, res); - - if (seahorse_gkr_propagate_error (result, &error)) - g_simple_async_result_take_error (res, error); - else - seahorse_gkr_item_set_info (closure->item, closure->info); - - g_simple_async_result_complete_in_idle (res); -} - -static void -on_update_description_get_info_complete (GnomeKeyringResult result, - GnomeKeyringItemInfo *info, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - update_description_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - closure->request = NULL; - - /* Operation to get info failed */ - if (seahorse_gkr_propagate_error (result, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - seahorse_progress_end (closure->cancellable, res); - - /* The description hasn't changed */ - } else if (g_str_equal (closure->description, - gnome_keyring_item_info_get_display_name (info))) { - g_simple_async_result_complete_in_idle (res); - seahorse_progress_end (closure->cancellable, res); - - /* Update the description */ - } else { - closure->info = gnome_keyring_item_info_copy (info); - gnome_keyring_item_info_set_display_name (closure->info, closure->description); - - closure->request = gnome_keyring_item_set_info (seahorse_gkr_item_get_keyring_name (closure->item), - seahorse_gkr_item_get_item_id (closure->item), - closure->info, on_update_description_set_info_complete, - g_object_ref (res), g_object_unref); - } -} - -static void -on_update_description_cancelled (GCancellable *cancellable, - gpointer user_data) -{ - update_description_closure *closure = user_data; - - if (closure->request) - gnome_keyring_cancel_request (closure->request); -} - -void -seahorse_gkr_update_description_async (SeahorseGkrItem *item, - const gchar *description, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - update_description_closure *closure; - - g_return_if_fail (SEAHORSE_IS_GKR_ITEM (item)); - g_return_if_fail (description); - - res = g_simple_async_result_new (G_OBJECT (item), callback, user_data, - seahorse_gkr_update_description_async); - - closure = g_new0 (update_description_closure, 1); - closure->item = g_object_ref (item); - closure->description = g_strdup (description); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - g_simple_async_result_set_op_res_gpointer (res, closure, update_description_free); - - seahorse_progress_prep_and_begin (cancellable, res, NULL); - closure->request = gnome_keyring_item_get_info (seahorse_gkr_item_get_keyring_name (item), - seahorse_gkr_item_get_item_id (item), - on_update_description_get_info_complete, - g_object_ref (res), g_object_unref); - - if (cancellable) - closure->cancelled_sig = g_cancellable_connect (cancellable, - G_CALLBACK (on_update_description_cancelled), - closure, NULL); - g_object_unref (res); -} - -gboolean -seahorse_gkr_update_description_finish (SeahorseGkrItem *item, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (SEAHORSE_IS_GKR_ITEM (item), FALSE); - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (item), - seahorse_gkr_update_description_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} - -typedef struct { - gpointer request; - GQueue *objects; - GCancellable *cancellable; - gulong cancelled_sig; -} delete_gkr_closure; - -static void -delete_gkr_free (gpointer data) -{ - delete_gkr_closure *closure = data; - g_queue_foreach (closure->objects, (GFunc)g_object_unref, NULL); - g_queue_free (closure->objects); - if (closure->cancellable && closure->cancelled_sig) - g_signal_handler_disconnect (closure->cancellable, - closure->cancelled_sig); - g_clear_object (&closure->cancellable); - g_assert (!closure->request); - g_free (closure); -} - -static void delete_gkr_one_object (GSimpleAsyncResult *res); - -static void -on_delete_gkr_complete (GnomeKeyringResult result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - delete_gkr_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - SeahorseObject *object; - - closure->request = NULL; - object = g_queue_pop_head (closure->objects); - seahorse_progress_end (closure->cancellable, object); - - if (seahorse_gkr_propagate_error (result, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - - } else { - seahorse_context_remove_object (seahorse_context_instance (), - object); - delete_gkr_one_object (res); - } - - g_object_unref (object); -} - -static void -on_delete_gkr_cancelled (GCancellable *cancellable, - gpointer user_data) -{ - delete_gkr_closure *closure = user_data; - - if (closure->request) - gnome_keyring_cancel_request (closure->request); -} - -static void -delete_gkr_one_object (GSimpleAsyncResult *res) -{ - delete_gkr_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - SeahorseObject *object; - const gchar *keyring; - guint32 item; - - if (g_queue_is_empty (closure->objects)) { - g_simple_async_result_complete_in_idle (res); - return; - } - - g_assert (!closure->request); - object = g_queue_peek_head (closure->objects); - - seahorse_progress_begin (closure->cancellable, object); - if (SEAHORSE_IS_GKR_ITEM (object)) { - keyring = seahorse_gkr_item_get_keyring_name (SEAHORSE_GKR_ITEM (object)); - item = seahorse_gkr_item_get_item_id (SEAHORSE_GKR_ITEM (object)); - closure->request = gnome_keyring_item_delete (keyring, item, - on_delete_gkr_complete, - g_object_ref (res), g_object_unref); - } else if (SEAHORSE_IS_GKR_KEYRING (object)) { - keyring = seahorse_gkr_keyring_get_name (SEAHORSE_GKR_KEYRING (object)); - closure->request = gnome_keyring_delete (keyring, - on_delete_gkr_complete, - g_object_ref (res), g_object_unref); - } else { - g_assert_not_reached (); - } -} - -void -seahorse_gkr_delete_async (GList *objects, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - delete_gkr_closure *closure; - GList *l; - - res = g_simple_async_result_new (NULL, callback, user_data, - seahorse_gkr_delete_async); - - closure = g_new0 (delete_gkr_closure, 1); - closure->objects = g_queue_new (); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - g_simple_async_result_set_op_res_gpointer (res, closure, delete_gkr_free); - - for (l = objects; l != NULL; l = g_list_next (l)) { - g_return_if_fail (SEAHORSE_IS_GKR_ITEM (l->data) || SEAHORSE_IS_GKR_KEYRING (l->data)); - g_queue_push_tail (closure->objects, g_object_ref (l->data)); - seahorse_progress_prep (cancellable, l->data, NULL); - } - - delete_gkr_one_object (res); - - if (cancellable) - closure->cancelled_sig = g_cancellable_connect (cancellable, - G_CALLBACK (on_delete_gkr_cancelled), - closure, NULL); - - g_object_unref (res); -} - -gboolean -seahorse_gkr_delete_finish (GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, - seahorse_gkr_delete_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-operation.h seahorse-3.6.3/gkr/seahorse-gkr-operation.h --- seahorse-3.2.2/gkr/seahorse-gkr-operation.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-operation.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __SEAHORSE_GKR_OPERATION_H__ -#define __SEAHORSE_GKR_OPERATION_H__ - -#include "seahorse-gkr-source.h" -#include "seahorse-gkr-item.h" -#include "seahorse-gkr-keyring.h" - -gboolean seahorse_gkr_propagate_error (GnomeKeyringResult result, - GError **err); - -void seahorse_gkr_update_description_async (SeahorseGkrItem *item, - const gchar *description, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_gkr_update_description_finish (SeahorseGkrItem *item, - GAsyncResult *result, - GError **error); - -void seahorse_gkr_update_secret_async (SeahorseGkrItem *item, - const gchar *secret, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_gkr_update_secret_finish (SeahorseGkrItem *item, - GAsyncResult *result, - GError **error); - -void seahorse_gkr_delete_async (GList *objects, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_gkr_delete_finish (GAsyncResult *result, - GError **error); - -#endif /* __SEAHORSE_GKR_OPERATION_H__ */ diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-source.c seahorse-3.6.3/gkr/seahorse-gkr-source.c --- seahorse-3.2.2/gkr/seahorse-gkr-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-source.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,381 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include -#include - -#include - -#include "seahorse-passphrase.h" -#include "seahorse-progress.h" -#include "seahorse-registry.h" -#include "seahorse-secure-memory.h" -#include "seahorse-util.h" - -#include "seahorse-gkr-item.h" -#include "seahorse-gkr-keyring.h" -#include "seahorse-gkr-operation.h" -#include "seahorse-gkr-source.h" - -#include - -enum { - PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION, - PROP_FLAGS -}; - -static void seahorse_source_iface (SeahorseSourceIface *iface); - -G_DEFINE_TYPE_EXTENDED (SeahorseGkrSource, seahorse_gkr_source, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); - -static SeahorseGkrSource *default_source = NULL; - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - - -static GObject* -seahorse_gkr_source_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - SeahorseGkrSource *self = SEAHORSE_GKR_SOURCE (G_OBJECT_CLASS (seahorse_gkr_source_parent_class)->constructor (type, n_props, props)); - - g_return_val_if_fail (SEAHORSE_IS_GKR_SOURCE (self), NULL); - - if (default_source == NULL) - default_source = self; - - return G_OBJECT (self); - -} - -static void -seahorse_gkr_source_init (SeahorseGkrSource *self) -{ - self->pv = NULL; -} - -static void -seahorse_gkr_source_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_GKR); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL); - break; - case PROP_FLAGS: - g_value_set_uint (value, 0); - break; - } -} - -static void -seahorse_gkr_source_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - -} - -static void -seahorse_gkr_source_finalize (GObject *obj) -{ - SeahorseGkrSource *self = SEAHORSE_GKR_SOURCE (obj); - - if (default_source == self) - default_source = NULL; - - G_OBJECT_CLASS (seahorse_gkr_source_parent_class)->finalize (obj); -} - -static void -seahorse_gkr_source_class_init (SeahorseGkrSourceClass *klass) -{ - GObjectClass *gobject_class; - - seahorse_gkr_source_parent_class = g_type_class_peek_parent (klass); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->constructor = seahorse_gkr_source_constructor; - gobject_class->set_property = seahorse_gkr_source_set_property; - gobject_class->get_property = seahorse_gkr_source_get_property; - gobject_class->finalize = seahorse_gkr_source_finalize; - - g_object_class_install_property (gobject_class, PROP_FLAGS, - g_param_spec_uint ("flags", "Flags", "Object Source flags.", - 0, G_MAXUINT, 0, G_PARAM_READABLE)); - - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - - seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GKR_SOURCE, "source", "local", SEAHORSE_GKR_STR, NULL); -} - -typedef struct { - SeahorseGkrSource *source; - GCancellable *cancellable; - gulong cancelled_sig; - gpointer request; - gint num_loads; -} source_load_closure; - -static void -source_load_free (gpointer data) -{ - source_load_closure *closure = data; - g_assert (closure->request == NULL); - g_assert (closure->num_loads == 0); - if (closure->cancellable && closure->cancelled_sig) - g_signal_handler_disconnect (closure->cancellable, - closure->cancelled_sig); - g_clear_object (&closure->cancellable); - g_clear_object (&closure->source); - g_free (closure); -} - -static void -update_each_default_keyring (SeahorseObject *object, gpointer user_data) -{ - const gchar *default_name = user_data; - const gchar *keyring_name; - gboolean is_default; - - keyring_name = seahorse_gkr_keyring_get_name (SEAHORSE_GKR_KEYRING (object)); - g_return_if_fail (keyring_name); - - /* Remember default keyring could be null in strange circumstances */ - is_default = default_name && g_str_equal (keyring_name, default_name); - g_object_set (object, "is-default", is_default, NULL); -} - -static void -on_source_load_default_keyring (GnomeKeyringResult result, - const gchar *default_name, - gpointer user_data) -{ - SeahorseGkrSource *self = SEAHORSE_GKR_SOURCE (user_data); - SeahorseObjectPredicate pred; - - if (result != GNOME_KEYRING_RESULT_OK) { - if (result != GNOME_KEYRING_RESULT_CANCELLED) - g_warning ("couldn't get default keyring name: %s", gnome_keyring_result_to_message (result)); - return; - } - - seahorse_object_predicate_clear (&pred); - pred.source = SEAHORSE_SOURCE (self); - pred.type = SEAHORSE_TYPE_GKR_KEYRING; - seahorse_context_for_objects_full (NULL, &pred, update_each_default_keyring, (gpointer)default_name); -} - -static void -on_source_load_keyring_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - g_assert (closure->num_loads > 0); - closure->num_loads--; - seahorse_progress_end (closure->cancellable, source); - - if (!seahorse_source_load_finish (SEAHORSE_SOURCE (source), result, &error)) - g_simple_async_result_take_error (res, error); - - if (closure->num_loads == 0) - g_simple_async_result_complete (res); - - g_object_unref (res); -} - -static void -remove_each_keyring_from_context (const gchar *keyring_name, SeahorseObject *keyring, - gpointer unused) -{ - seahorse_context_remove_object (NULL, keyring); - seahorse_context_remove_source (NULL, SEAHORSE_SOURCE (keyring)); -} - -static void -insert_each_keyring_in_hashtable (SeahorseObject *object, gpointer user_data) -{ - g_hash_table_insert ((GHashTable*)user_data, - g_strdup (seahorse_gkr_keyring_get_name (SEAHORSE_GKR_KEYRING (object))), - g_object_ref (object)); -} - -static void -on_source_load_list_keyring_names_complete (GnomeKeyringResult result, - GList *list, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - SeahorseGkrKeyring *keyring; - SeahorseObjectPredicate pred; - GError *error = NULL; - gchar *keyring_name; - GHashTable *checks; - GList *l; - - closure->request = NULL; - - if (seahorse_gkr_propagate_error (result, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - return; - } - - /* Load up a list of all the current names */ - checks = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); - seahorse_object_predicate_clear (&pred); - pred.source = SEAHORSE_SOURCE (closure->source); - pred.type = SEAHORSE_TYPE_GKR_KEYRING; - seahorse_context_for_objects_full (NULL, &pred, insert_each_keyring_in_hashtable, checks); - - for (l = list; l; l = g_list_next (l)) { - keyring_name = l->data; - - /* Don't show the 'session' keyring */ - if (g_str_equal (keyring_name, "session")) - continue; - - keyring = g_hash_table_lookup (checks, keyring_name); - - /* Already have a keyring */ - if (keyring != NULL) { - g_object_ref (keyring); - g_hash_table_remove (checks, keyring_name); - - /* Create a new keyring for this one */ - } else { - keyring = seahorse_gkr_keyring_new (keyring_name); - g_object_set (keyring, "source", closure->source, NULL); - seahorse_context_add_source (NULL, SEAHORSE_SOURCE (keyring)); - seahorse_context_add_object (NULL, SEAHORSE_OBJECT (keyring)); - } - - /* Refresh the keyring as well, and track the load */ - seahorse_source_load_async (SEAHORSE_SOURCE (keyring), closure->cancellable, - on_source_load_keyring_complete, g_object_ref (res)); - seahorse_progress_prep_and_begin (closure->cancellable, keyring, NULL); - closure->num_loads++; - g_object_unref (keyring); - } - - g_hash_table_foreach (checks, (GHFunc)remove_each_keyring_from_context, NULL); - g_hash_table_destroy (checks); - - if (list == NULL) - g_simple_async_result_complete_in_idle (res); - - /* Get the default keyring in the background */ - gnome_keyring_get_default_keyring (on_source_load_default_keyring, - g_object_ref (closure->source), - g_object_unref); -} - -static void -on_source_load_cancelled (GCancellable *cancellable, - gpointer user_data) -{ - source_load_closure *closure = user_data; - - if (closure->request) - gnome_keyring_cancel_request (closure->request); -} - -static void -seahorse_gkr_source_load_async (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SeahorseGkrSource *self = SEAHORSE_GKR_SOURCE (source); - source_load_closure *closure; - GSimpleAsyncResult *res; - - res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_gkr_source_load_async); - closure = g_new0 (source_load_closure, 1); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - closure->source = g_object_ref (self); - g_simple_async_result_set_op_res_gpointer (res, closure, source_load_free); - - closure->request = gnome_keyring_list_keyring_names (on_source_load_list_keyring_names_complete, - g_object_ref (res), g_object_unref); - - if (cancellable) - closure->cancelled_sig = g_cancellable_connect (cancellable, - G_CALLBACK (on_source_load_cancelled), - closure, NULL); - - g_object_unref (res); -} - -static gboolean -seahorse_gkr_source_load_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_gkr_source_load_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} - -static void -seahorse_source_iface (SeahorseSourceIface *iface) -{ - iface->load_async = seahorse_gkr_source_load_async; - iface->load_finish = seahorse_gkr_source_load_finish; -} - -/* -------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorseGkrSource* -seahorse_gkr_source_new (void) -{ - return g_object_new (SEAHORSE_TYPE_GKR_SOURCE, NULL); -} - -SeahorseGkrSource* -seahorse_gkr_source_default (void) -{ - g_return_val_if_fail (default_source, NULL); - return default_source; -} diff -Nru seahorse-3.2.2/gkr/seahorse-gkr-source.h seahorse-3.6.3/gkr/seahorse-gkr-source.h --- seahorse-3.2.2/gkr/seahorse-gkr-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/gkr/seahorse-gkr-source.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * - * 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. - */ - -/** - * SeahorseGkrSource: A key source for gnome-keyring credentials - * - * - Derived from SeahorseSource - * - Adds the keys it loads to the SeahorseContext. - * - * Properties: - * ktype: (GQuark) The ktype (ie: SEAHORSE_GKR) of keys originating from this - key source. - * location: (SeahorseLocation) The location of keys that come from this - * source. (ie: SEAHORSE_LOCATION_LOCAL) - */ - -#ifndef __SEAHORSE_GKR_SOURCE_H__ -#define __SEAHORSE_GKR_SOURCE_H__ - -#include "seahorse-source.h" - -#define SEAHORSE_TYPE_GKR_SOURCE (seahorse_gkr_source_get_type ()) -#define SEAHORSE_GKR_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GKR_SOURCE, SeahorseGkrSource)) -#define SEAHORSE_GKR_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GKR_SOURCE, SeahorseGkrSourceClass)) -#define SEAHORSE_IS_GKR_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GKR_SOURCE)) -#define SEAHORSE_IS_GKR_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GKR_SOURCE)) -#define SEAHORSE_GKR_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GKR_SOURCE, SeahorseGkrSourceClass)) - -typedef struct _SeahorseGkrSource SeahorseGkrSource; -typedef struct _SeahorseGkrSourceClass SeahorseGkrSourceClass; -typedef struct _SeahorseGkrSourcePrivate SeahorseGkrSourcePrivate; - -struct _SeahorseGkrSource { - GObject parent; - SeahorseGkrSourcePrivate *pv; -}; - -struct _SeahorseGkrSourceClass { - GObjectClass parent_class; -}; - -GType seahorse_gkr_source_get_type (void); - -SeahorseGkrSource* seahorse_gkr_source_new (void); - -SeahorseGkrSource* seahorse_gkr_source_default (void); - -#endif /* __SEAHORSE_GKR_SOURCE_H__ */ diff -Nru seahorse-3.2.2/gnome-doc-utils.make seahorse-3.6.3/gnome-doc-utils.make --- seahorse-3.2.2/gnome-doc-utils.make 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/gnome-doc-utils.make 1970-01-01 01:00:00.000000000 +0100 @@ -1,655 +0,0 @@ -# gnome-doc-utils.make - make magic for building documentation -# Copyright (C) 2004-2005 Shaun McCance -# -# 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. -# -# 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. - -################################################################################ -## @@ Generating Header Files - -## @ DOC_H_FILE -## The name of the header file to generate -DOC_H_FILE ?= - -## @ DOC_H_DOCS -## The input DocBook files for generating the header file -DOC_H_DOCS ?= - -$(DOC_H_FILE): $(DOC_H_DOCS); - @rm -f $@.tmp; touch $@.tmp; - echo 'const gchar* documentation_credits[] = {' >> $@.tmp - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ - xsltproc --path "$$xmlpath" $(_credits) $$doc; \ - done | sort | uniq \ - | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ - | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp - echo ' NULL' >> $@.tmp - echo '};' >> $@.tmp - echo >> $@.tmp - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ - docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ - echo $$xmlpath; \ - ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ - for id in $$ids; do \ - echo '#define HELP_'`echo $$docid`'_'`echo $$id \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ - done; \ - echo >> $@.tmp; \ - done; - cp $@.tmp $@ && rm -f $@.tmp - -dist-check-gdu: -if !HAVE_GNOME_DOC_UTILS - @echo "*** GNOME Doc Utils must be installed in order to make dist" - @false -endif - -.PHONY: dist-doc-header -dist-doc-header: $(DOC_H_FILE) - @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ - $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; - -doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) - -.PHONY: clean-doc-header -_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) -clean-local: $(_clean_doc_header) -distclean-local: $(_clean_doc_header) -mostlyclean-local: $(_clean_doc_header) -maintainer-clean-local: $(_clean_doc_header) -clean-doc-header: - rm -f $(DOC_H_FILE) - -all: $(DOC_H_FILE) - - -################################################################################ -## @@ Generating Documentation Files - -## @ DOC_MODULE -## 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 ?= - -## @ DOC_INCLUDES -## Files included with XInclude -DOC_INCLUDES ?= - -## @ DOC_FIGURES -## Figures and other external data -DOC_FIGURES ?= - -## @ DOC_FORMATS -## The default formats to be built and installed -DOC_FORMATS ?= docbook -_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) - -## @ DOC_LINGUAS -## The languages this document is translated into -DOC_LINGUAS ?= -_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ - $(filter $(LINGUAS),$(DOC_LINGUAS)), \ - $(DOC_LINGUAS)) - -_DOC_ABS_SRCDIR = @abs_srcdir@ - - -################################################################################ -## 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 ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl - -if ENABLE_SK -_ENABLE_SK = true -_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` -_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` -_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml -endif - - -################################################################################ -## @@ Rules for OMF Files - -db2omf_args = \ - --stringparam db2omf.basename $(DOC_MODULE) \ - --stringparam db2omf.format $(3) \ - --stringparam db2omf.dtd \ - $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ - | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ - --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ - --stringparam db2omf.omf_dir "$(OMF_DIR)" \ - --stringparam db2omf.help_dir "$(HELP_DIR)" \ - --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ - $(if $(_ENABLE_SK), \ - --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ - $(_db2omf) $(2) - -## @ _DOC_OMF_IN -## The OMF input file -_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) - -## @ _DOC_OMF_DB -## The OMF files for DocBook output -_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) - -$(_DOC_OMF_DB) : $(_DOC_OMF_IN) -$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml - @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ - echo "The file '$(_skcontentslist)' does not exist." >&2; \ - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } - -## @ _DOC_OMF_HTML -## The OMF files for HTML output -_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) - -$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) -$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml -if ENABLE_SK - @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ - echo "The file '$(_skcontentslist)' does not exist" >&2; \ - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } -endif - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } - -## @ _DOC_OMF_ALL -## All OMF output files to be built -# FIXME -_DOC_OMF_ALL = \ - $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ - $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) - -.PHONY: omf -omf: $(_DOC_OMF_ALL) - - -################################################################################ -## @@ C Locale Documents - -## @ _DOC_C_MODULE -## 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)) - -## @ _DOC_C_XINCLUDES -## Files included with XInclude in the C locale -_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) - -## @ _DOC_C_DOCS -## All documentation files in the C locale -_DOC_C_DOCS = \ - $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ - $(_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_PAGES) - -## @ _DOC_C_FIGURES -## All figures and other external data in the C locale -_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ - $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) - -## @ _DOC_C_HTML -## All HTML documentation in the C locale -# FIXME: probably have to shell escape to determine the file names -_DOC_C_HTML = $(foreach f, \ - $(shell xsltproc --xinclude \ - --stringparam db.chunk.basename "$(DOC_MODULE)" \ - $(_chunks) "C/$(DOC_MODULE).xml"), \ - C/$(f).xhtml) - -############################################################################### -## @@ Other Locale Documentation - -## @ _DOC_POFILES -## The .po files used for translating the document -_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) - -.PHONY: po -po: $(_DOC_POFILES) - -## @ _DOC_MOFILES -## The .mo files used for translating the document -_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) - -.PHONY: mo -mo: $(_DOC_MOFILES) - -## @ _DOC_LC_MODULES -## The top-level documentation files in all other locales -_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 = \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ - $(lc)/$(notdir $(inc)) )) - -## @ _DOC_LC_HTML -## All HTML documentation in all other locales -# FIXME: probably have to shell escape to determine the file names -_DOC_LC_HTML = \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ - $(lc)/$(notdir $(doc)) )) - -## @ _DOC_LC_DOCS -## All documentation files in all other locales -_DOC_LC_DOCS = \ - $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ - $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) - -## @ _DOC_LC_FIGURES -## All figures and other external data in all other locales -_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ - $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) - -_DOC_SRC_FIGURES = \ - $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ - $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) - -$(_DOC_POFILES): - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - @if test ! -f $@ -a -f $(srcdir)/$@; then \ - echo "cp $(srcdir)/$@ $@"; \ - cp "$(srcdir)/$@" "$@"; \ - fi; - @docs=; \ - list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ - docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ - done; \ - if ! test -f $@; then \ - echo "(cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ - (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ - else \ - echo "(cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ - (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ - fi - -$(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< - -# FIXME: fix the dependancy -# FIXME: hook xml2po up -$(_DOC_LC_DOCS) : $(_DOC_MOFILES) -$(_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; \ - mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ - if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ - (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ - "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) - -## @ _DOC_POT -## A pot file -_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) -.PHONY: pot -pot: $(_DOC_POT) -$(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ - - -################################################################################ -## @@ All Documentation - -## @ _DOC_HTML_ALL -## All HTML documentation, only if it's built -_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ - $(_DOC_C_HTML) $(_DOC_LC_HTML)) - -_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) - -$(_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,$@) - - -################################################################################ -## All - -all: \ - $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ - $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ - $(_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) -clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) -clean-doc-lc: - rm -f $(_DOC_LC_DOCS) - rm -f $(_DOC_MOFILES) - @list='$(_DOC_POFILES)'; for po in $$list; do \ - if ! test "$$po" -ef "$(srcdir)/$$po"; then \ - echo "rm -f $$po"; \ - rm -f "$$po"; \ - fi; \ - done -# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x - @for lc in C $(_DOC_REAL_LINGUAS); do \ - if test -f "$$lc/.xml2po.mo"; then \ - echo "rm -f $$lc/.xml2po.mo"; \ - rm -f "$$lc/.xml2po.mo"; \ - fi; \ - done -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 \ - echo "rmdir $$dir"; \ - rmdir "$$dir"; \ - fi; \ - done; \ - done - -_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)$(DOC_ID),clean-doc-dir) - -clean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -distclean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -mostlyclean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -maintainer-clean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) - - - -################################################################################ -## 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) - -dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) - @for lc in C $(_DOC_REAL_LINGUAS); do \ - echo " $(mkinstalldirs) $(distdir)/$$lc"; \ - $(mkinstalldirs) "$(distdir)/$$lc"; \ - done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ - for doc in $$list; do \ - if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ - docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - if ! test -d "$(distdir)/$$docdir"; then \ - echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ - $(mkinstalldirs) "$(distdir)/$$docdir"; \ - fi; \ - echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ - $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ - done - -dist-doc-figs: $(_DOC_SRC_FIGURES) - @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ - for fig in $$list; do \ - if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$fig"; then \ - figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - if ! test -d "$(distdir)/$$figdir"; then \ - echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ - $(mkinstalldirs) "$(distdir)/$$figdir"; \ - fi; \ - echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ - $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ - fi; \ - done; - -dist-doc-omf: - @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ - $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" - -dist-doc-dsk: - @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ - $(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) - @for lc in C $(_DOC_REAL_LINGUAS); do \ - if test -f "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ - 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 - - - -################################################################################ -## 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)$(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) -# $(if $(_DOC_DSK_IN),install-doc-dsk) - -install-doc-docs: - @for lc in C $(_DOC_REAL_LINGUAS); do \ - 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_install_dir)/$$docdir"; \ - if ! test -d "$$docdir"; then \ - echo "$(mkinstalldirs) $$docdir"; \ - $(mkinstalldirs) "$$docdir"; \ - fi; \ - 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"; \ - else \ - figsymlink=true; \ - fi; \ - figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - 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/^.*\///'`; \ - 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 - -install-doc-html: - echo install-html - -install-doc-omf: - $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) - @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - 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_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)$(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) -# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) - -uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ - 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_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_install_dir)/$$omf"; \ - scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ - fi; \ - echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ - rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ - done diff -Nru seahorse-3.2.2/help/C/index.docbook seahorse-3.6.3/help/C/index.docbook --- seahorse-3.2.2/help/C/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/C/index.docbook 2012-09-18 13:11:21.000000000 +0200 @@ -0,0 +1,1419 @@ + + + + + + + seahorse-daemon"> + + key"> + +]> +
+ + &app; Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse Project + + + &legal; + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse Project + + + GNOME Documentation Project + + + + &app; Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + &app; Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + &app; Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + &app; Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + &app; Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version &appversion; of &app; + + Feedback + To report a bug or make a suggestion regarding the + &app; application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + &app; is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introduction + + You can use &app; to create and manage PGP and SSH keys. + + + &app; provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With &app; you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Getting Started + + Starting <application>&app;</application> + + You can start &app; + in the following ways: + + + + Applications menu + + Choose + + Accessories + Password and Keys + . + + + + Command Line + + + Type seahorse then press Return. + + + + + + + + When You Start <application>&app;</application> + + When you start &app;, the Password and Keys + window is displayed. + + +
+ The <application>&app;</application> Window + + + + + + + + Show the &app; window. + + + + +
+ + + The &app; window contains the following elements: + + + + Menubar + + The menus on the menubar contain all of the commands that you need to perform tasks in &app;. + + + Toolbar + + Use the toolbar to quickly access commonly-used commands. + + + Keys and Passwords Tabs + + Provides access to the keys and passwords in the keyring. + + + First time options + + Provides fast access to useful actions for first time users. From here you can: + + + Browse the help system, + + + Import keys in the keyring, + + + Create new keys. + + + + + + + + + + + + Creating OpenPGP Keys + + OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key + cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys + and certificates for exchanging public keys. + + + Public key cryptography is a concept which involves the use of two keys: + a public key, that you can give to anyone with whom + you would like to communicate, and a private key which is + private and must be kept secret. + + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + + Use similar practices to generating a strong password when choosing a + passphrase. The main difference between a password and a passphrase is that, + in a passphrase, spaces are valid characters. + + + + + Advanced options + + Expand the Advanced key options + section to specify the following options for a new key: + + + + Encryption Type + + + This field specifies the encryption algorithms used + to generate your keys. + + + + DSA ElGamal + + + This is the suggested choice as it will allow + you to encrypt, decrypt, sign and verify as needed. + + + + + DSA + + + Will allow signing only. + + + + + RSA + + + Will allow signing only. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. The longer the key, + the more secure it will be, provided a strong passphrase is + used. Conversely, performing any operation with a longer key + will require more time than it would with a shorter key. Acceptable + values are between 1024 and 4096 bits. At least 2048 bits is recommended. + + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Creating Secure Shell Keys + + Secure Shell (SSH) is a way of logging into a remote computer to execute commands + on that machine. + SSH keys are used in key-based authentication system, as an alternative to the default password + authentication system. + With key-based authentication there is no need to manually type a password to authenticate. + + + Secure Shell keys are made of two keys: a private key, that must be kept secret, + and a public key which can be uploaded to any computer you need to access. + + + To create a Secure Shell key: + + + + Choose FileNew... + + + Select Secure Shell Key and click Continue + + + Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. + + + Click Just Create Key to + create the new key, or Create and Set Up + to create the key and set up another computer to use it for authentication. + + + The Passphrase for New Secure Shell Key + dialog opens. + Enter the passphrase twice for your new key. + + + + Use similar practices to generating a + strong password when choosing a + passphrase. The main difference between a + password and a passphrase is that, in a + passphrase, spaces are valid characters. + + + + + + + + + Advanced options + + Expand the Advanced key options section to specify the following options for a new key: + + + + + Encryption Type + + + This field specifies the encryption + algorithms used to generate your key. + + + + RSA + + + Use the Rivest-ShamirAdleman + (RSA) algorithm to create the SSH key. + This is the preferred and more secure choice. + + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the SSH key. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. + The longer the key, the more secure it + will be, provided a strong passphrase is + used. Conversely, performing any + operation with a longer key will require + more time than it would with a shorter + key. Acceptable values are between 1024 + and 4096 bits. At least 2048 bits is recommended. + + + + + + + + + + + OpenPGP Key Properties + + The descriptions in this section apply to all OpenPGP keys. + + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + The fingerprint is a unique string of characters that exactly identifies a key. + + + + KeyID + + + The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 + characters of the fingerprint. Most of the time it is possible to identify a key with + only the KeyID, but occasionally two keys may have the same ID. + + + + + Type + + + Specifies the encryption algorithm used to generate a key. DSA keys can only sign. + ElGamal keys are used to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Trust + + Trust is an indication of how sure you are of a person's ability to correctly extend + the web of trust. When you are faced with a key you have not signed, the validity of + that person's key will be determined based on the signatures they have collected and + how well or not you trust the people who have made those signatures. By default, an + unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. + + + + Unknown: You are not familiar with the person's ability to sign keys correctly. + + + Never: This person cannot correctly sign keys. + + + Marginal: This person checks for photo ID before signing a key, but + does not necessarily scrutinize the IDs. + + + Full: This person scrutinizes each and every person's photo IDs before + signing them (e.g. they only sign keys that truely belong to the person asking for the signature). + + + Ultimate: This level of trust should only be assigned to your own keys. + + + + + + Enabling and Disabling Keys + + When a key is enabled, it can be used to perform encryption operations. + When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. + + + + + Expiration Date + + A key can no longer be used to perform key operations after it has expired. Changing a + key's expiration date to a point in the future re-enables it. A good general practice + would be to have a master key that never expires and multiple subkeys that do and are + signed by the master key. + + + + + User IDs + + User IDs allow multiple identities and email addresses to + be used with the same key. + + + They usually take the form of: + Name (comment) <email address> + + + + Adding a User ID + + Adding a user ID is useful when you want to have + an identity for your job and one for your friends. + + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + + You must enter at least 5 characters in this field. + + + + + + + Email Address + + + Your email address is how most + people will locate your key on a + key server or other key provider. + Make sure it is correct before + continuing. + + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + + The comment field can be used to + place any additional information + into the displayed name of your new + ID. This information can be + searched for on key servers. + + + + + + + + + Photo IDs + + Photo IDs allow a key owner to embed one or more pictures of themselves in a key. + These identities can be signed just like normal user IDs. A photo ID must be in JPEG + format and is recommended to be no larger than 240x288 pixels. + + If the chosen image is not of the required file type or size &app; + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Changing the Passphrase + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + + Enter the new passphrase and click OK. + + + + + Deleting a Key + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + + You can delete your keys, trusted keys and collected keys. + + + + + + + + + OpenPGP Subkey Properties + + Each OpenPGP key has a single master key used + to sign only. Subkeys are used to encrypt and + to sign as well. In this way, if your sub key is + compromised, you don't need to revoke your master key. + + + + ID + + + This is the identifier of the subkey. + + + + + Type + + + Specifies the encryption algorithm used to generate a subkey. + DSA keys can only sign, ElGamal + keys are used to encrypt while RSA keys are + used to sign or to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Status + + + Indicates the status of the key. + + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Adding a Subkey + + To add a subkey to a key, from the Subkeys + section click on Add button. + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Key Type + + + Specifies the encryption algorithm used to generate a subkey. + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the subkey. + This subkey can sign only. + + + + + ElGamal + + + Use the ElGamal algorithm to create the subkey. + This subkey can encrypt only. + + + + + RSA + + + Use the Rivest-Shamir Adleman (RSA) + algorithm to create the subkey. This subkey can be used to sign or encrypt, + but you have to create two different subkeys. + + + + + + + + Key Length + + + Indicates the length in bits of the subkey. + In general the longer the key, the more security it provides. + + + + + Expiration Date + + + Indicates the date the subkey can no longer be used. + + + + + + + + Changing a Subkey Expiration Date + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Revoking a Subkey + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + + The effect of revoking a subkey is immediate. + + + + + + Deleting a Subkey + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Secure Shell Key Properties + + The descriptions in this section apply to all SSH keys. + + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + + The fingerprint is a unique string of + characters that exactly identifies a key. + + + + + Algorithm + + + Specifies the encryption algorithm used to + generate a key. + + + + + Location + + + This is the location where the + private key + has been stored. + + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Deleting a Secure Shell Key + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importing Keys + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside &app;: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exporting Keys + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Signing a Key + + Signing another person's key means you are giving trust to that person. + Before signing a key, you have to carefully check the key's fingerprint + to be sure that the key really belongs to that person. + + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Preferences + + This section describes the preferences settable in &app; by choosing + + Edit + Preferences + from within &app;. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + + To change the unlock password of the keyring, first select the appropriate keyring and then + press Change Unlock Password button. You will then be prompted to + type the old password in the Old password text box, the new password in the + New password text box and + confirm it in the Confirm password text box. + To apply the settings, press Change. + If the old password is correct, you will get a status + message indicating the success of the operation. If the + old password is not correct you will be asked to check + its correctness. + + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Key Servers + + Keep your and other's keys up to date by syncing keys periodically with + remote keyservers. Syncing will make sure that you have the latest + signatures made on all of your keys so that the web of trust will be the + most useful. + + + &app; provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + + LDAP keyservers are less common, but use the standard LDAP + protocol to serve keys. + ldap://keyserver.pgp.com is a good LDAP + server. + + + + + + + + Key Sharing + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local &app; users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About &app; + + &app;, its associated plugins, the preferences applet and the panel + applet are known collectively as &project;. &project; was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about &project;, the project , please visit + the &project; web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/C/legal.xml seahorse-3.6.3/help/C/legal.xml --- seahorse-3.2.2/help/C/legal.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/C/legal.xml 2012-09-08 13:14:26.000000000 +0200 @@ -6,7 +6,7 @@ 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 + url="help:fdl">link or in the file COPYING-DOCS distributed with this manual. This manual is part of a collection of GNOME manuals diff -Nru seahorse-3.2.2/help/C/seahorse.xml seahorse-3.6.3/help/C/seahorse.xml --- seahorse-3.2.2/help/C/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/C/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1419 +0,0 @@ - - - - - - - seahorse-daemon"> - - key"> - -]> -
- - &app; Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - - - Seahorse Project - - - &legal; - - - Jacob - Perkins - - Seahorse Project - - - - - Adam - Schreiber - - Seahorse Project -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse Project - - - GNOME Documentation Project - - - - &app; Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - &app; Manual V0.10.1 - August 2008 - - - Adam Schreiber - sadam@clemson.edu - - - - - &app; Manual V0.9.1 - November 2006 - - - Milo Casagrande - milo_casagrande@yahoo.it - - - - - &app; Manual V0.9.0 - July 2005 - - Adam Schreiber - sadam@clemson.edu - - Seahorse Project - - - - &app; Manual V0.7.0 - February 2003 - - Jacob Perkins - - - Seahorse Project - - - - This manual describes version &appversion; of &app; - - Feedback - To report a bug or make a suggestion regarding the - &app; application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - &app; is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Encryption Keys - - - - - - Introduction - - You can use &app; to create and manage PGP and SSH keys. - - - &app; provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With &app; you can: - - - - Create and manage PGP and SSH keys, - - - Export and import PGP and SSH keys, - - - Share your keys with others, - - - - - - - - - Getting Started - - Starting <application>&app;</application> - - You can start &app; - in the following ways: - - - - Applications menu - - Choose - - Accessories - Password and Keys - . - - - - Command Line - - - Type seahorse then press Return. - - - - - - - - When You Start <application>&app;</application> - - When you start &app;, the Password and Keys - window is displayed. - - -
- The <application>&app;</application> Window - - - - - - - - Show the &app; window. - - - - -
- - - The &app; window contains the following elements: - - - - Menubar - - The menus on the menubar contain all of the commands that you need to perform tasks in &app;. - - - Toolbar - - Use the toolbar to quickly access commonly-used commands. - - - Keys and Passwords Tabs - - Provides access to the keys and passwords in the keyring. - - - First time options - - Provides fast access to useful actions for first time users. From here you can: - - - Browse the help system, - - - Import keys in the keyring, - - - Create new keys. - - - - - - - - - - - - Creating OpenPGP Keys - - OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key - cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys - and certificates for exchanging public keys. - - - Public key cryptography is a concept which involves the use of two keys: - a public key, that you can give to anyone with whom - you would like to communicate, and a private key which is - private and must be kept secret. - - - To create OpenPGP keys: - - - - Choose FileNew... - - - - - Select PGP Key and click Continue - - - - - Enter your full name (first - last), your e-mail address and any additional information. - You can also specify advanced options for the key: see below. - - - - - Click Create to create the new key pair. - - - - - The Passphrase for New PGP Key dialog will open. - Enter the passphrase twice for your new key. - - - - - - - Use similar practices to generating a strong password when choosing a - passphrase. The main difference between a password and a passphrase is that, - in a passphrase, spaces are valid characters. - - - - - Advanced options - - Expand the Advanced key options - section to specify the following options for a new key: - - - - Encryption Type - - - This field specifies the encryption algorithms used - to generate your keys. - - - - DSA ElGamal - - - This is the suggested choice as it will allow - you to encrypt, decrypt, sign and verify as needed. - - - - - DSA - - - Will allow signing only. - - - - - RSA - - - Will allow signing only. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. The longer the key, - the more secure it will be, provided a strong passphrase is - used. Conversely, performing any operation with a longer key - will require more time than it would with a shorter key. Acceptable - values are between 1024 and 4096 bits. At least 2048 bits is recommended. - - - - - Expiration Date - - - This is the date at which the key will cease to be usable for - performing encryption or signing operations. 6 months is a reasonable time - to set it to. You will have to either change the - expiration date or generate a new key or subkey after this amount - of time passes. - - - Sign your new key with your old one before it expires - to preserve your trust status. - - - - - - - - - - - - - Creating Secure Shell Keys - - Secure Shell (SSH) is a way of logging into a remote computer to execute commands - on that machine. - SSH keys are used in key-based authentication system, as an alternative to the default password - authentication system. - With key-based authentication there is no need to manually type a password to authenticate. - - - Secure Shell keys are made of two keys: a private key, that must be kept secret, - and a public key which can be uploaded to any computer you need to access. - - - To create a Secure Shell key: - - - - Choose FileNew... - - - Select Secure Shell Key and click Continue - - - Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. - - - Click Just Create Key to - create the new key, or Create and Set Up - to create the key and set up another computer to use it for authentication. - - - The Passphrase for New Secure Shell Key - dialog opens. - Enter the passphrase twice for your new key. - - - - Use similar practices to generating a - strong password when choosing a - passphrase. The main difference between a - password and a passphrase is that, in a - passphrase, spaces are valid characters. - - - - - - - - - Advanced options - - Expand the Advanced key options section to specify the following options for a new key: - - - - - Encryption Type - - - This field specifies the encryption - algorithms used to generate your key. - - - - RSA - - - Use the Rivest-ShamirAdleman - (RSA) algorithm to create the SSH key. - This is the preferred and more secure choice. - - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the SSH key. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. - The longer the key, the more secure it - will be, provided a strong passphrase is - used. Conversely, performing any - operation with a longer key will require - more time than it would with a shorter - key. Acceptable values are between 1024 - and 4096 bits. At least 2048 bits is recommended. - - - - - - - - - - - OpenPGP Key Properties - - The descriptions in this section apply to all OpenPGP keys. - - - - To view properties of a PGP key: - - - - Select the PGP key - from the main window, - - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Properties - - - - Fingerprint - - The fingerprint is a unique string of characters that exactly identifies a key. - - - - KeyID - - - The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 - characters of the fingerprint. Most of the time it is possible to identify a key with - only the KeyID, but occasionally two keys may have the same ID. - - - - - Type - - - Specifies the encryption algorithm used to generate a key. DSA keys can only sign. - ElGamal keys are used to encrypt. - - - - - Created - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Strength - - - Indicates the length in bits of a key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - - - Trust - - Trust is an indication of how sure you are of a person's ability to correctly extend - the web of trust. When you are faced with a key you have not signed, the validity of - that person's key will be determined based on the signatures they have collected and - how well or not you trust the people who have made those signatures. By default, an - unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. - - - - Unknown: You are not familiar with the person's ability to sign keys correctly. - - - Never: This person cannot correctly sign keys. - - - Marginal: This person checks for photo ID before signing a key, but - does not necessarily scrutinize the IDs. - - - Full: This person scrutinizes each and every person's photo IDs before - signing them (e.g. they only sign keys that truely belong to the person asking for the signature). - - - Ultimate: This level of trust should only be assigned to your own keys. - - - - - - Enabling and Disabling Keys - - When a key is enabled, it can be used to perform encryption operations. - When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. - - - - - Expiration Date - - A key can no longer be used to perform key operations after it has expired. Changing a - key's expiration date to a point in the future re-enables it. A good general practice - would be to have a master key that never expires and multiple subkeys that do and are - signed by the master key. - - - - - User IDs - - User IDs allow multiple identities and email addresses to - be used with the same key. - - - They usually take the form of: - Name (comment) <email address> - - - - Adding a User ID - - Adding a user ID is useful when you want to have - an identity for your job and one for your friends. - - - To add a user ID to a key: - - - - Select the key from the main window, - - - - - Double click on it or choose Properties from the toolbar, - - - - - Select the Names and Signatures tab, - - - - - Click on Add Name. - - - - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Full Name - - - Enter your full name in the form - <first> <last> - A middle name or initial is optional. - - - - - You must enter at least 5 characters in this field. - - - - - - - Email Address - - - Your email address is how most - people will locate your key on a - key server or other key provider. - Make sure it is correct before - continuing. - - - - - It should be of the form - <username>@<domainname> - - - - - - - Key Comment - - - The comment field can be used to - place any additional information - into the displayed name of your new - ID. This information can be - searched for on key servers. - - - - - - - - - Photo IDs - - Photo IDs allow a key owner to embed one or more pictures of themselves in a key. - These identities can be signed just like normal user IDs. A photo ID must be in JPEG - format and is recommended to be no larger than 240x288 pixels. - - If the chosen image is not of the required file type or size &app; - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Changing the Passphrase - - To change the passphrase assigned to a key: - - - - Select the key from the main window, - - - - - Double click on it or choose Properties from the toolbar, - - - - - Click on Change Passphrase. - - - - - - Enter the new passphrase and click OK. - - - - - Deleting a Key - - To delete a key from your keyring: - - - - Select the key from the main window, - - - - - Right click on it and choose Delete Key - or choose - - Edit - Delete Key - . - - - - - - - You can delete your keys, trusted keys and collected keys. - - - - - - - - - OpenPGP Subkey Properties - - Each OpenPGP key has a single master key used - to sign only. Subkeys are used to encrypt and - to sign as well. In this way, if your sub key is - compromised, you don't need to revoke your master key. - - - - ID - - - This is the identifier of the subkey. - - - - - Type - - - Specifies the encryption algorithm used to generate a subkey. - DSA keys can only sign, ElGamal - keys are used to encrypt while RSA keys are - used to sign or to encrypt. - - - - - Created - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Status - - - Indicates the status of the key. - - - - - Strength - - - Indicates the length in bits of the key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - Adding a Subkey - - To add a subkey to a key, from the Subkeys - section click on Add button. - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Key Type - - - Specifies the encryption algorithm used to generate a subkey. - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the subkey. - This subkey can sign only. - - - - - ElGamal - - - Use the ElGamal algorithm to create the subkey. - This subkey can encrypt only. - - - - - RSA - - - Use the Rivest-Shamir Adleman (RSA) - algorithm to create the subkey. This subkey can be used to sign or encrypt, - but you have to create two different subkeys. - - - - - - - - Key Length - - - Indicates the length in bits of the subkey. - In general the longer the key, the more security it provides. - - - - - Expiration Date - - - Indicates the date the subkey can no longer be used. - - - - - - - - Changing a Subkey Expiration Date - - To change a subkey expiration date, select - the subkey from the Subkeys - section, then: - - - - Click on the Expire button on the left, - - - - - From the date dialog choose the new expiration date or select - Never expires for no expiration date. - - - - - - - - Revoking a Subkey - - To revoke a subkey, select the subkey from the Subkeys - section, then: - - - - Click on the Revoke button on the left, - - - - - Choose a reason why to revoke the subkey: - - - - - No Reason - - - There isn't a specific reason to revoke the key. - - - - - Compromised - - - The key has been compromised. - - - - - Superseded - - - The key has been superseded by another one. - - - - - Not Used - - - The key is not used anymore. - - - - - - - - - Enter a description of why you are revoking the key, - - - - - Click on Revoke. - - - - - - - The effect of revoking a subkey is immediate. - - - - - - Deleting a Subkey - - To delete a subkey, select the subkey from the Subkeys - section, then: - - - - Click on the Delete button on the left. - - - - - - - - - - - Secure Shell Key Properties - - The descriptions in this section apply to all SSH keys. - - - To view properties of a SSH key: - - - - Select the Secure Shell key - from the main window, - - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Properties - - - - Fingerprint - - - The fingerprint is a unique string of - characters that exactly identifies a key. - - - - - Algorithm - - - Specifies the encryption algorithm used to - generate a key. - - - - - Location - - - This is the location where the - private key - has been stored. - - - - - Strength - - - Indicates the length in bits of a key. - In general the longer the key, the more - security it provides. - - - A long key is not enough to make up - for the use of a weak passphrase. - - - - - - - - - - - Deleting a Secure Shell Key - - To delete a Secure Shell key: - - - - Select the SSH key from the main window, - - - - - Right click on it and choose Delete key or choose - - Edit - Delete Key - . - - - - - - - - - - - Importing Keys - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside &app;: - - - - Select an ASCII armored public block of text, - - - - - Copy it to the clipboard, - - - - - Choose - - Edit - Paste Keys - . - - - - - - - - - - Exporting Keys - - To export keys, select the keys in the main window - and choose - - File - Export - . - - - You can also export keys to the clipboard in an - ASCII armored block of text: - - - - Select the keys in the main window, - - - - - Choose - - Edit - Copy Keys - . - - - - - - - - - - - Signing a Key - - Signing another person's key means you are giving trust to that person. - Before signing a key, you have to carefully check the key's fingerprint - to be sure that the key really belongs to that person. - - - To sign a key in your keyring: - - - - Select the key you want to sign from the - Trusted Keys or - Other Collected Keys tabs, - - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - - Select how carefully the key has been checked, - - - - - Indicate if the signature should be local to your keyring, - and if your signature can be revoked, - - - - - Click on Sign. - - - - - - - - - - Preferences - - This section describes the preferences settable in &app; by choosing - - Edit - Preferences - from within &app;. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - - To change the unlock password of the keyring, first select the appropriate keyring and then - press Change Unlock Password button. You will then be prompted to - type the old password in the Old password text box, the new password in the - New password text box and - confirm it in the Confirm password text box. - To apply the settings, press Change. - If the old password is correct, you will get a status - message indicating the success of the operation. If the - old password is not correct you will be asked to check - its correctness. - - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Key Servers - - Keep your and other's keys up to date by syncing keys periodically with - remote keyservers. Syncing will make sure that you have the latest - signatures made on all of your keys so that the web of trust will be the - most useful. - - - &app; provides support for HKP and LDAP keyservers. - - - - HKP Servers - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Keyservers - - - LDAP keyservers are less common, but use the standard LDAP - protocol to serve keys. - ldap://keyserver.pgp.com is a good LDAP - server. - - - - - - - - Key Sharing - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local &app; users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About &app; - - &app;, its associated plugins, the preferences applet and the panel - applet are known collectively as &project;. &project; was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about &project;, the project , please visit - the &project; web page. - - - To report a bug or make a suggestion regarding this application or - this manual, follow the directions in the - Feedback section of the GNOME User Guide. - - - 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 - is included with this documentation; another can be found in the file - COPYING included with the source code of this program. - - -
diff -Nru seahorse-3.2.2/help/ca/index.docbook seahorse-3.6.3/help/ca/index.docbook --- seahorse-3.2.2/help/ca/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ca/index.docbook 2012-11-09 17:35:35.000000000 +0100 @@ -0,0 +1,1254 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Projecte Seahorse + + + + + 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. + + Aquest manual forma part d'una col·lecció de manuals del GNOME distribuïts sota la GFDL. Si voleu distribuir aquest manual independentment de la col·lecció, podeu fer-ho afegint una còpia de la llicència al manual, tal com es descriu a la secció 6 de la llicència. + + Molts dels noms que les empreses utilitzen per a distingir els seus productes i serveis es consideren marques comercials. Quan aquests noms apareguin en qualsevol documentació del GNOME, si els membres del Projecte de documentació del GNOME han estat avisats pel que fa a les marques, els noms apareixeran en majúscules o amb les inicials en majúscules. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Projecte Seahorse + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Comentaris + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introducció + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Primers passos + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Menú Aplicacions + + Choose + + Accessories + Password and Keys + . + + + + Línia d'ordres + + Introduïu seahorse i premeu Retorn. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Barra de menú + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Barra d'eines + + Utilitzeu la barra d'eines per a accedir ràpidament a les ordres més utilitzades. + + + Pestanyes de claus i contrasenyes + + Proporciona accés a les claus i contrasenyes de l'anell de claus. + + + Opcions de primer cop + + Proporciona un accés ràpid a les accions útils per als usuaris principiants. Des d'aquí podeu: + + + Navegar pel sistema d'ajuda. + + + Importar claus a l'anell de claus, + + + Crear claus noves. + + + + + + + + + + + + Creació de claus OpenPGP + L'OpenPGP és un protocol no propietari per a xifrar correus electrònics amb la utilització de claus criptogràfiques públiques basades amb el PGP. Aquest defineix formats estàndard per als missatges xifrats, signatures, claus privades i certificats per a intercanviar claus públiques. + La criptografia amb clau pública és un concepte que involucra la utilització de dues claus: una clau pública, que podeu donar a qualsevol amb qui us voleu comunicar, i una clau privada que és privada i s'ha de mantenir en secret. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Utilitzeu procediments similars per a generar una contrasenya robusta quan trieu una contrasenya. La principal diferència entre aquesta contrasenya respecte les altres contrasenyes és que en aquesta els espais són caràcters vàlids. + + + + Opcions avançades + Expandiu la secció Opcions avançades de la clau per a especificar les opcions següents de la clau nova: + + + Encryption Type + + Aquest camp especifica els algoritmes de xifratge que s'utilitzen per a generar les vostres claus. + + + DSA ElGamal + + Aquesta és l'opció suggerida ja que us permet xifrar, desxifrar, signar i verificar quan sigui necessari. + + + + DSA + + Només us permetrà signar. + + + + RSA + + Només us permetrà signar. + + + + + + + Key Strength (bits) + + Aquesta és la longitud de la clau en bits. Com més llarga la clau, més segura serà, proporcionant una contrasenya robusta. No obstant, realitzar qualsevol operació amb una clau llarga necessitarà més temps que si utilitzeu una clau més curta. Els valors acceptables estan entre 1024 i 4096 bits. Com a mínim es recomana 2048 bits. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Creació de claus de l'intèrpret d'ordres segur + L'intèrpret d'ordres segur (SSH) és una manera d'entrar a un ordinador remot per a executar-hi ordres. Les claus SSH s'utilitzen en sistemes d'autenticació basats en claus, com una alternativa al sistema d'autenticació predeterminat basat en contrasenya. Amb el sistema d'autenticació basat en clau no hi ha cap necessitat d'introduir manualment una contrasenya per a autenticar-se. + Les claus de l'intèrpret d'ordres segur es componen de dues claus: una clau privada, que s'ha de mantenir en secret, i una clau pública que es pot pujar a qualsevol ordinador on necessiteu accedir. + Per a crear una clau de l'intèrpret d'ordres segur: + + + Choose FileNew... + + + Seleccioneu Clau d'intèrpret d'ordres segur i feu clic a Continua + + + Introduïu una descripció per a la utilitat de la clau. Podeu utilitzar el vostre correu electrònic o qualsevol altre recordatori. També podeu especificar opcions avançades per a la clau, vegeu a sota. + + + Feu clic a Només crea la clau per a crear la clau nova o a Crea i configura per a crear la clau i configurar un altre ordinador per a utilitzar-la com a autenticació. + + + S'obrirà el diàleg Contrasenya per a la clau nova de l'intèrpret d'ordres segur. Introduïu dos cops la contrasenya per a la clau nova. + + Utilitzeu procediments similars per a generar una contrasenya robusta quan trieu una contrasenya. La principal diferència entre aquesta contrasenya respecte les altres contrasenyes és que en aquesta els espais són caràcters vàlids. + + + + + + + + Opcions avançades + Expandiu la secció Opcions avançades de la clau per a especificar les opcions següents per a una clau nova: + + + + Encryption Type + + Aquest camp especifica els algorismes de xifrat utilitzats per a generar la vostra clau. + + + RSA + + Utilitzeu l'algorisme Rivest-ShamirAdleman (RSA) per a crear la clau SSH. Aquesta és l'opció preferida i més segura. + + + + DSA + + Utilitzeu el Digital Signature Algorithm (DSA) per a crear la clau SSH. + + + + + + + Key Strength (bits) + + Aquesta és la longitud de la clau en bits. Com més llarga la clau, més segura serà, proporcionant una contrasenya robusta. No obstant, realitzar qualsevol operació amb una clau llarga necessitarà més temps que si utilitzeu una clau més curta. Els valors acceptables estan entre 1024 i 4096 bits. Com a mínim es recomana 2048 bits. + + + + + + + + + + Propietats de la clau OpenPGP + Les descripcions d'aquesta secció s'apliquen a totes les claus OpenPGP. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Propietats + + + + Fingerprint + + L'empremta digital és una cadena de caràcters única que identifica exactament una clau. + + + + KeyID + + L'identificador de la clau és semblant a l'empremta digital. Tanmateix l'identificador de la clau només conté els últims 8 caràcters de l'empremta digital. La majoria de cops és possible identificar una clau amb només l'identificador de la clau, però a vegades dues claus poden tenir el mateix identificador. + + + + Type + + Especifica l'algorisme de xifrat utilitzat per a generar una clau. Les claus DSA només poden signar. Les claus ElGamal s'utilitzen per a xifrar. + + + + Created + + Indica la data en què es va crear la clau. + + + + Expires + + Indica la data en què la clau ja no es podrà utilitzar més. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Confiança + La confiança és un indicador de com de segur esteu sobre l'habilitat d'una persona per a estendre correctament la xarxa de confiança. Quan us trobeu amb una clau que no heu signat, la validesa de la clau d'aquesta persona es determinarà en base a les signatures que ha obtingut i quin grau de confiança teniu amb la gent que ha fet aquestes signatures. Per defecte, una clau desconeguda necessitarà tres signatures marginals o una signatura de completa confiança. + + Desconegut: no sabeu amb certesa l'habilitat de la persona per a signar correctament claus. + Mai: aquesta persona no pot signar correctament claus. + Marginal: aquesta persona comprova un identificador fotogràfic abans de signar una clau, però no necessàriament comprova els identificadors. + Completa: aquesta persona comprova cada un dels identificadors fotogràfics abans de signar-les (ex. només signen claus que realment pertanyen a la persona que sol·licita la signatura). + Absoluta: aquest nivell de confiança només s'hauria d'assignar a les vostres claus. + + + + + Com habilitar i inhabilitar claus + Quan una clau està habilitada, aquesta es pot utilitzar per a realitzar operacions de xifrat. Quan una clau està inhabilitada, no es pot utilitzar per a xifrar o verificar signatures realitzades amb ella. + + + + Data de venciment + Una clau no es pot utilitzar més per a realitzar operacions de clau després que hagi vençut. Canviar la data de venciment d'una clau a una data del futur la torna a habilitar. Una bona pràctica general seria tenir una clau mestra que mai venç i diverses subclaus que estiguessin signades per la clau mestra. + + + + Identificadors d'usuari + Els identificadors d'usuari permeten que una sola clau s'utilitzi per a diverses identitats i adreces de correu electrònic. + + They usually take the form of: + Name (comment) <email address> + + + + Com afegir un identificador d'usuari + Afegir un identificador d'usuari és útil quan voleu tenir un identificador per a la feina i un altre per als amics. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + Després de seguir les instruccions de sobre, es mostrarà un diàleg per a omplir. Els camps estan detallats a sota. + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + Com a mínim heu d'introduir 5 caràcters en aquest camp. + + + + + + Email Address + + L'adreça de correu electrònic és com la majoria de gent trobaran la vostra clau a un servidor de claus o un altre proveïdor de claus. Assegureu-vos que és correcte abans de continuar. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + El camp de comentari es pot utilitzar per a afegir qualsevol informació addicional al nom mostrat de l'identificador nou. Aquesta informació es pot cercar als servidors de claus. + + + + + + + + Identificadors fotogràfics + Els identificadors fotogràfics permeten al propietari d'una clau incrustar una o més fotografies d'un mateix a una clau. Aquestes identitats es poden signar de la mateixa manera que els identificadors d'usuari. Un identificador fotogràfic ha de ser en format JPEG i es recomana que no sigui més gran de 240x288 píxels. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Com canviar la contrasenya + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Introduïu la contrasenya nova i feu clic a D'acord. + + + + Com suprimir una clau + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + Podeu suprimir les claus personals, les claus de confiança i les claus obtingudes. + + + + + + + + Propietats de les subclaus OpenPGP + Cada clau OpenPGP té una sola clau mestra que només s'utilitza per a signar. Les subclaus s'utilitzen tant per a xifrar com per a signar. D'aquesta manera, si la vostra subclau s'ha compromès, no necessitareu revocar la vostra clau mestra. + + + ID + + Aquest és l'identificador de la subclau. + + + + Type + + Especifica l'algorisme de xifrat utilitzat per a generar una subclau. Les claus DSA només poden signar, les claus ElGamal s'utilitzen per a xifrar mentre que les claus RSA s'utilitzen per a signar o xifrar. + + + + Created + + Indica la data en què es va crear la clau. + + + + Expires + + Indica la data en què la clau ja no es podrà utilitzar més. + + + + Status + + Indica l'estat de la clau. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Com afegir una subclau + Per a afegir una subclau a una clau, des de la secció Subclaus feu clic al botó Afegeix. + Després de seguir les instruccions de sobre, es mostrarà un diàleg per a omplir. Els camps estan detallats a sota. + + + Tipus de clau + + Especifica l'algorisme de xifrat utilitzat per a generar una subclau. + + + DSA + + Utilitza el Digital Signature Algorithm (DSA) per a crear la subclau. Aquesta subclau només pot signar. + + + + ElGamal + + Utilitza l'algorisme ElGamal per a crear la subclau. Aquesta subclau només pot xifrar. + + + + RSA + + Utilitza l'algorisme Rivest-Shamir Adleman (RSA) per a crear la subclau. Aquesta subclau es pot utilitzar per a signar o xifrar, però heu de crear dues subclaus diferents. + + + + + + + Longitud de la clau + + Indica la longitud de la subclau en bits. En general com més llarga sigui la clau, proporciona més seguretat. + + + + Data de venciment + + Indica la data en què la subclau no es podrà utilitzar més. + + + + + + + Com canviar la data de venciment d'una subclau + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Revocar una subclau + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + L'efecte de revocar una subclau és immediat. + + + + + Suprimir una subclau + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Propietats de la clau de l'intèrpret d'ordres segur + Les descripcions d'aquesta secció s'apliquen a totes les claus SSH. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Propietats + + + + Fingerprint + + L'empremta digital és una cadena de caràcters única que identifica exactament una clau. + + + + Algorithm + + Especifica l'algorisme de xifrat utilitzat per a generar una clau. + + + + Location + + Aquesta és la ubicació on s'ha emmagatzemat la clau privada. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Com suprimir una clau de l'intèrpret d'ordres segur + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importació de claus + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exportació de claus + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Com signar una clau + Signar la clau d'una altra persona significa que esteu donant confiança a aquesta persona. Abans de signar una clau, hauríeu de comprovar detingudament l'empremta digital de la clau per a assegurar-vos que la clau realment pertany a aquella persona. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Preferències + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Anells de claus de contrasenyes + + Com crear anells de claus + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Com canviar les contrasenyes dels anells de claus. + Per a canviar la contrasenya de desblocat de l'anell de claus, primer seleccioneu l'anell de claus apropiat i després premeu el botó Canvia la contrasenya de desbloquejat. Se us sol·licitarà que introduïu la contrasenya antiga al quadre de text Contrasenya antiga, la contrasenya nova al quadre de text Contrasenya nova i confirmeu-la al quadre de text Confirmeu la contrasenya. Per a aplicar els paràmetres, premeu Canvia. Si la contrasenya antiga és correcte, obtindreu un missatge d'estat indicant que s'ha realitzat l'operació correctament. Si la contrasenya antiga no és correcte se us sol·licitarà que la comproveu. + + + Com suprimir anells de claus + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Servidors de claus + Mantingueu les vostres claus i les dels altres actualitzades sincronitzant les claus periòdicament amb servidors de clau remots. En sincronitzar us assegurareu que teniu les últimes signatures de totes les vostres claus de manera que la xarxa de confiança serà més útil. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + Els servidors de claus LDAP són menys comuns, però utilitzen el protocol estàndard LDAP per a servir les claus. El ldap://keyserver.pgp.com és un bon servidor LDAP. + + + + + + + Compartició de claus + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/ca/legal.xml seahorse-3.6.3/help/ca/legal.xml --- seahorse-3.2.2/help/ca/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ca/legal.xml 2012-11-09 17:35:35.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + Aquest manual forma part d'una col·lecció de manuals del GNOME distribuïts sota la GFDL. Si voleu distribuir aquest manual independentment de la col·lecció, podeu fer-ho afegint una còpia de la llicència al manual, tal com es descriu a la secció 6 de la llicència. + + Molts dels noms que les empreses utilitzen per a distingir els seus productes i serveis es consideren marques comercials. Quan aquests noms apareguin en qualsevol documentació del GNOME, si els membres del Projecte de documentació del GNOME han estat avisats pel que fa a les marques, els noms apareixeran en majúscules o amb les inicials en majúscules. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/ca/seahorse.xml seahorse-3.6.3/help/ca/seahorse.xml --- seahorse-3.2.2/help/ca/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/ca/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,991 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins i Adam Schreiber - 2008Joan Duran (jodufi@gmail.com) - - Projecte Seahorse - - - - Teniu permís per a copiar, distribuir i/o modificar aquest document, sota els termes de la Llicència de documentació lliure GNU (GFDL), versió 1.1 o qualsevol versió publicada posteriorment per la Free Software Foundation, sense seccions invariants, sense texts de portada i sense texts de contraportada. Podeu trobar una còpia de la GFDL en aquest enllaç o en el fitxer COPYING-DOCS distribuït amb aquest manual. - Aquest manual forma part d'una col·lecció de manuals del GNOME distribuïts sota la GFDL. Si voleu distribuir aquest manual independentment de la col·lecció, podeu fer-ho afegint una còpia de la llicència al manual, tal com es descriu a la secció 6 de la llicència. - - Molts dels noms que les empreses utilitzen per a distingir els seus productes i serveis es consideren marques comercials. Quan aquests noms apareguin en qualsevol documentació del GNOME, si els membres del Projecte de documentació del GNOME han estat avisats pel que fa a les marques, els noms apareixeran en majúscules o amb les inicials en majúscules. - - EL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT S'OFEREIXEN SOTA ELS TERMES DE LA LLICÈNCIA DE DOCUMENTACIÓ LLIURE DE GNU, TENINT EN COMPTE QUE: - - EL DOCUMENT S'OFEREIX «TAL COM ÉS», SENSE CAP TIPUS DE GARANTIA, NI EXPLÍCITA NI IMPLÍCITA; AIXÒ INCLOU, SENSE LIMITAR-S'HI, LES GARANTIES QUE EL DOCUMENT O LA VERSIÓ MODIFICADA DEL DOCUMENT NO TINGUI DEFECTES, SIGUI COMERCIALITZABLE, SIGUI ADEQUAT PER A UN ÚS CONCRET O NO INFRINGEIXI CAP LLEI. TOT EL RISC PEL QUE FA A LA QUALITAT, EXACTITUD I RENDIMENT DEL DOCUMENT O LA VERSIÓ MODIFICADA DEL DOCUMENT ÉS VOSTRE. EN CAS QUE EL DOCUMENT RESULTÉS DEFECTUÓS EN QUALSEVOL ASPECTE, VÓS (NO PAS L'ESCRIPTOR INICIAL, L'AUTOR O CAP ALTRE COL·LABORADOR) ASSUMIU TOT EL COST DE MANTENIMENT, REPARACIÓ O CORRECCIÓ. AQUESTA RENÚNCIA DE GARANTIA CONSTITUEIX UNA PART ESSENCIAL D'AQUESTA LLICÈNCIA. NO S'AUTORITZA L'ÚS DE CAP DOCUMENT O VERSIÓ MODIFICADA DEL DOCUMENT EXCEPTE SOTA AQUESTA RENÚNCIA DE GARANTIA; I - - - EN CAP CAS I SOTA CAP INTERPRETACIÓ LEGAL, JA SIGUI PER AGREUJAMENT (INCLOENT-HI LA NEGLIGÈNCIA), CONTRACTE O ALTRE CAS, L'AUTOR, L'ESCRIPTOR ORIGINAL, QUALSEVOL DELS COL·LABORADORS O DISTRIBUÏDORS DEL DOCUMENT O UNA VERSIÓ MODIFICADA DEL DOCUMENT NI CAP PROVEÏDOR D'AQUESTES PARTS NO SERAN RESPONSABLES DAVANT DE NINGÚ PER CAP DANY DIRECTE, INDIRECTE, ESPECIAL, ACCIDENTAL O CONSECUTIU DE QUALSEVOL TIPUS; AIXÒ INCLOU, SENSE LIMITAR-S'HI, ELS DANYS PER PÈRDUA DE CLIENTS, INTERRUPCIONS DE LA FEINA, FALLADA O MALFUNCIONAMENT DE L'ORDINADOR, O QUALSEVOL ALTRA PÈRDUA O DANY RELACIONAT AMB L'ÚS DEL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT, FINS I TOT SI S'HA INFORMAT AQUESTA PART DE LA POSSIBILITAT D'AQUESTS DANYS. - - - - - - - - Jacob - Perkins - - Projecte Seahorse - - - - - Adam - Schreiber - - Projecte Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Projecte Seahorse - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - Agost de 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - Novembre de 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - Juliol de 2005 - - Adam Schreiber sadam@clemson.edu - Projecte Seahorse - - - - Passwords and Keys Manual V0.7.0 - Febrer de 2003 - - Jacob Perkins - Projecte Seahorse - - - - This manual describes version 2.28.x of Passwords and Keys - - Comentaris - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Claus de xifratge - - - - - - Introducció - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Crear i gestionar claus PGP i SSH, - - - Exportar i importar claus PGP i SSH, - - - Compartir les vostres claus amb altres, - - - - - - - - - Primers passos - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Menú Aplicacions - - Choose - - Accessories - Password and Keys - . - - - - Línia d'ordres - - Introduïu seahorse i premeu Retorn. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Mostra la finestra del Passwords and Keys. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Barra de menú - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Barra d'eines - - Utilitzeu la barra d'eines per a accedir ràpidament a les ordres més utilitzades. - - - Pestanyes de claus i contrasenyes - - Proporciona accés a les claus i contrasenyes de l'anell de claus. - - - Opcions de primer cop - - Proporciona un accés ràpid a les accions útils per als usuaris principiants. Des d'aquí podeu: - - - Navegar pel sistema d'ajuda. - - - Importar claus a l'anell de claus, - - - Crear claus noves. - - - - - - - - - - - - Creació de claus OpenPGP - L'OpenPGP és un protocol no propietari per a xifrar correus electrònics amb la utilització de claus criptogràfiques públiques basades amb el PGP. Aquest defineix formats estàndard per als missatges xifrats, signatures, claus privades i certificats per a intercanviar claus públiques. - La criptografia amb clau pública és un concepte que involucra la utilització de dues claus: una clau pública, que podeu donar a qualsevol amb qui us voleu comunicar, i una clau privada que és privada i s'ha de mantenir en secret. - Per a crear claus OpenPGP: - - - Choose FileNew... - - - - Seleccioneu Clau PGP i feu clic a Continua - - - Introduïu el vostre nom complet (nom i cognoms), la vostra adreça de correu electrònic i qualsevol informació addicional. També podeu especificar opcions avançades per a la clau: vegeu a sota. - - - Feu clic a Crea per a crear la nova parella de claus. - - - S'obrirà el diàleg Contrasenya per a la clau PGP. Introduïu dos cops la contrasenya per a la clau nova. - - - - Utilitzeu procediments similars per a generar una contrasenya robusta quan trieu una contrasenya. La principal diferència entre aquesta contrasenya respecte les altres contrasenyes és que en aquesta els espais són caràcters vàlids. - - - - Opcions avançades - Expandiu la secció Opcions avançades de la clau per a especificar les opcions següents de la clau nova: - - - Tipus de xifratge - - Aquest camp especifica els algoritmes de xifratge que s'utilitzen per a generar les vostres claus. - - - DSA ElGamal - - Aquesta és l'opció suggerida ja que us permet xifrar, desxifrar, signar i verificar quan sigui necessari. - - - - DSA - - Només us permetrà signar. - - - - RSA - - Només us permetrà signar. - - - - - - - Força de la clau (bits) - - Aquesta és la longitud de la clau en bits. Com més llarga la clau, més segura serà, proporcionant una contrasenya robusta. No obstant, realitzar qualsevol operació amb una clau llarga necessitarà més temps que si utilitzeu una clau més curta. Els valors acceptables estan entre 1024 i 4096 bits. Com a mínim es recomana 2048 bits. - - - - Data de venciment - - Aquesta és la data en què la clau deixarà de ser útil per a realitzar xifrats o signar operacions. 6 mesos és un temps raonable a establir. Haureu de canviar la data de venciment o generar una clau o subclau nova després de que passi aquest període de temps. - Signeu la clau nova amb l'antiga abans que venci per a mantenir el vostre estat de confiança. - - - - - - - - - - - Creació de claus de l'intèrpret d'ordres segur - L'intèrpret d'ordres segur (SSH) és una manera d'entrar a un ordinador remot per a executar-hi ordres. Les claus SSH s'utilitzen en sistemes d'autenticació basats en claus, com una alternativa al sistema d'autenticació predeterminat basat en contrasenya. Amb el sistema d'autenticació basat en clau no hi ha cap necessitat d'introduir manualment una contrasenya per a autenticar-se. - Les claus de l'intèrpret d'ordres segur es componen de dues claus: una clau privada, que s'ha de mantenir en secret, i una clau pública que es pot pujar a qualsevol ordinador on necessiteu accedir. - Per a crear una clau de l'intèrpret d'ordres segur: - - - Choose FileNew... - - - Seleccioneu Clau d'intèrpret d'ordres segur i feu clic a Continua - - - Introduïu una descripció per a la utilitat de la clau. Podeu utilitzar el vostre correu electrònic o qualsevol altre recordatori. També podeu especificar opcions avançades per a la clau, vegeu a sota. - - - Feu clic a Només crea la clau per a crear la clau nova o a Crea i configura per a crear la clau i configurar un altre ordinador per a utilitzar-la com a autenticació. - - - S'obrirà el diàleg Contrasenya per a la clau nova de l'intèrpret d'ordres segur. Introduïu dos cops la contrasenya per a la clau nova. - - Utilitzeu procediments similars per a generar una contrasenya robusta quan trieu una contrasenya. La principal diferència entre aquesta contrasenya respecte les altres contrasenyes és que en aquesta els espais són caràcters vàlids. - - - - - - - - Opcions avançades - Expandiu la secció Opcions avançades de la clau per a especificar les opcions següents per a una clau nova: - - - - Tipus de xifratge - - Aquest camp especifica els algorismes de xifrat utilitzats per a generar la vostra clau. - - - RSA - - Utilitzeu l'algorisme Rivest-ShamirAdleman (RSA) per a crear la clau SSH. Aquesta és l'opció preferida i més segura. - - - - DSA - - Utilitzeu el Digital Signature Algorithm (DSA) per a crear la clau SSH. - - - - - - - Força de la clau (bits) - - Aquesta és la longitud de la clau en bits. Com més llarga la clau, més segura serà, proporcionant una contrasenya robusta. No obstant, realitzar qualsevol operació amb una clau llarga necessitarà més temps que si utilitzeu una clau més curta. Els valors acceptables estan entre 1024 i 4096 bits. Com a mínim es recomana 2048 bits. - - - - - - - - - - Propietats de la clau OpenPGP - Les descripcions d'aquesta secció s'apliquen a totes les claus OpenPGP. - - Per a visualitzar les propietats d'una clau PGP: - - Seleccioneu la clau PGP des de la finestra principal, - - - Feu-hi doble clic o trieu Propietats a la barra d'eines, - - - Seleccioneu la pestanya Detalls. - - - - - Propietats - - - - Empremta digital - - L'empremta digital és una cadena de caràcters única que identifica exactament una clau. - - - - Identificador de la clau - - L'identificador de la clau és semblant a l'empremta digital. Tanmateix l'identificador de la clau només conté els últims 8 caràcters de l'empremta digital. La majoria de cops és possible identificar una clau amb només l'identificador de la clau, però a vegades dues claus poden tenir el mateix identificador. - - - - Tipus - - Especifica l'algorisme de xifrat utilitzat per a generar una clau. Les claus DSA només poden signar. Les claus ElGamal s'utilitzen per a xifrar. - - - - Creada - - Indica la data en què es va crear la clau. - - - - Venç - - Indica la data en què la clau ja no es podrà utilitzar més. - - - - Força - - Indica la longitud en bits d'una clau. En general com més llarga la clau, proporciona més seguretat. - Una clau llarga no és suficient per a substituir la utilització d'una contrasenya dèbil. - - - - - - - - - Confiança - La confiança és un indicador de com de segur esteu sobre l'habilitat d'una persona per a estendre correctament la xarxa de confiança. Quan us trobeu amb una clau que no heu signat, la validesa de la clau d'aquesta persona es determinarà en base a les signatures que ha obtingut i quin grau de confiança teniu amb la gent que ha fet aquestes signatures. Per defecte, una clau desconeguda necessitarà tres signatures marginals o una signatura de completa confiança. - - Desconegut: no sabeu amb certesa l'habilitat de la persona per a signar correctament claus. - Mai: aquesta persona no pot signar correctament claus. - Marginal: aquesta persona comprova un identificador fotogràfic abans de signar una clau, però no necessàriament comprova els identificadors. - Completa: aquesta persona comprova cada un dels identificadors fotogràfics abans de signar-les (ex. només signen claus que realment pertanyen a la persona que sol·licita la signatura). - Absoluta: aquest nivell de confiança només s'hauria d'assignar a les vostres claus. - - - - - Com habilitar i inhabilitar claus - Quan una clau està habilitada, aquesta es pot utilitzar per a realitzar operacions de xifrat. Quan una clau està inhabilitada, no es pot utilitzar per a xifrar o verificar signatures realitzades amb ella. - - - - Data de venciment - Una clau no es pot utilitzar més per a realitzar operacions de clau després que hagi vençut. Canviar la data de venciment d'una clau a una data del futur la torna a habilitar. Una bona pràctica general seria tenir una clau mestra que mai venç i diverses subclaus que estiguessin signades per la clau mestra. - - - - Identificadors d'usuari - Els identificadors d'usuari permeten que una sola clau s'utilitzi per a diverses identitats i adreces de correu electrònic. - Normalment tenen la forma de: Nom (comentari) <adreça de correu electrònic> - - - Com afegir un identificador d'usuari - Afegir un identificador d'usuari és útil quan voleu tenir un identificador per a la feina i un altre per als amics. - Per a afegir un identificador d'usuari a una clau: - - Seleccioneu la clau des de la finestra principal. - - - Feu-hi doble clic o trieu Propietats a la barra d'eines. - - - Seleccioneu la pestanya Noms i signatures. - - - Feu clic a Afegeix un nom. - - - Després de seguir les instruccions de sobre, es mostrarà un diàleg per a omplir. Els camps estan detallats a sota. - - - Nom complet - - Introduïu el vostre nom complet de la forma <nom> <cognom> El segon cognom és opcional. - - - Com a mínim heu d'introduir 5 caràcters en aquest camp. - - - - - - Adreça de correu - - L'adreça de correu electrònic és com la majoria de gent trobaran la vostra clau a un servidor de claus o un altre proveïdor de claus. Assegureu-vos que és correcte abans de continuar. - - - Hauria de tenir la forma <nom d'usuari>@<nom del domini> - - - - - - Comentari de la clau - - El camp de comentari es pot utilitzar per a afegir qualsevol informació addicional al nom mostrat de l'identificador nou. Aquesta informació es pot cercar als servidors de claus. - - - - - - - - Identificadors fotogràfics - Els identificadors fotogràfics permeten al propietari d'una clau incrustar una o més fotografies d'un mateix a una clau. Aquestes identitats es poden signar de la mateixa manera que els identificadors d'usuari. Un identificador fotogràfic ha de ser en format JPEG i es recomana que no sigui més gran de 240x288 píxels. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Com canviar la contrasenya - Per a canviar la contrasenya assignada a una clau: - - Seleccioneu la clau des de la finestra principal. - - - Feu-hi doble clic o trieu Propietats a la barra d'eines, - - - Feu clic a Canvia la contrasenya. - - - Introduïu la contrasenya nova i feu clic a D'acord. - - - - Com suprimir una clau - Per a suprimir una clau de l'anell de claus: - - Seleccioneu la clau des de la finestra principal. - - - Feu-hi clic amb el botó secundari i trieu Suprimeix la clau o trieu EditaSuprimeix la clau. - - - - Podeu suprimir les claus personals, les claus de confiança i les claus obtingudes. - - - - - - - - Propietats de les subclaus OpenPGP - Cada clau OpenPGP té una sola clau mestra que només s'utilitza per a signar. Les subclaus s'utilitzen tant per a xifrar com per a signar. D'aquesta manera, si la vostra subclau s'ha compromès, no necessitareu revocar la vostra clau mestra. - - - Identificador - - Aquest és l'identificador de la subclau. - - - - Tipus - - Especifica l'algorisme de xifrat utilitzat per a generar una subclau. Les claus DSA només poden signar, les claus ElGamal s'utilitzen per a xifrar mentre que les claus RSA s'utilitzen per a signar o xifrar. - - - - Creada - - Indica la data en què es va crear la clau. - - - - Venç - - Indica la data en què la clau ja no es podrà utilitzar més. - - - - Estat - - Indica l'estat de la clau. - - - - Força - - Indica la longitud de la clau en bits. En general com més llarga sigui la clau, proporciona més seguretat. - Una clau llarga no és suficient per a substituir la utilització d'una contrasenya dèbil. - - - - - - - Com afegir una subclau - Per a afegir una subclau a una clau, des de la secció Subclaus feu clic al botó Afegeix. - Després de seguir les instruccions de sobre, es mostrarà un diàleg per a omplir. Els camps estan detallats a sota. - - - Tipus de clau - - Especifica l'algorisme de xifrat utilitzat per a generar una subclau. - - - DSA - - Utilitza el Digital Signature Algorithm (DSA) per a crear la subclau. Aquesta subclau només pot signar. - - - - ElGamal - - Utilitza l'algorisme ElGamal per a crear la subclau. Aquesta subclau només pot xifrar. - - - - RSA - - Utilitza l'algorisme Rivest-Shamir Adleman (RSA) per a crear la subclau. Aquesta subclau es pot utilitzar per a signar o xifrar, però heu de crear dues subclaus diferents. - - - - - - - Longitud de la clau - - Indica la longitud de la subclau en bits. En general com més llarga sigui la clau, proporciona més seguretat. - - - - Data de venciment - - Indica la data en què la subclau no es podrà utilitzar més. - - - - - - - Com canviar la data de venciment d'una subclau - Per a canviar la data de venciment d'una subclau, seleccioneu la subclau des de la secció Subclaus, llavors: - - Feu clic al botó Venç a l'esquerra. - - - Des del diàleg de data trieu la data de venciment nova o seleccioneu No venç mai per a què no venci. - - - - - - Revocar una subclau - Per a revocar una subclau, seleccioneu la subclau des de la secció Subclaus, llavors: - - Feu clic al botó Revoca a l'esquerra. - - - Trieu una raó perquè revoqueu la subclau: - - - - Sense motiu - - No hi ha cap motiu específic per a revocar la clau. - - - - Compromesa - - La clau ha estat compromesa. - - - - Reemplaçada - - La clau ha estat reemplaçada per una altra. - - - - No es fa servir - - La clau no es fa servir més. - - - - - - - Introduïu una descripció de perquè esteu revocant la clau. - - - Feu clic a Revoca. - - - - L'efecte de revocar una subclau és immediat. - - - - - Suprimir una subclau - Per a suprimir una subclau, seleccioneu la subclau des de la secció Subclaus, llavors: - - Feu clic al botó Suprimeix a l'esquerra. - - - - - - - - - Propietats de la clau de l'intèrpret d'ordres segur - Les descripcions d'aquesta secció s'apliquen a totes les claus SSH. - Per a visualitzar les propietats d'una clau SSH: - - Seleccioneu la clau de l'intèrpret d'ordres segur des de la finestra principal. - - - Feu-hi doble clic o trieu Propietats a la barra d'eines, - - - Seleccioneu la pestanya Detalls. - - - - - Propietats - - - - Empremta digital - - L'empremta digital és una cadena de caràcters única que identifica exactament una clau. - - - - Algorisme - - Especifica l'algorisme de xifrat utilitzat per a generar una clau. - - - - Ubicació - - Aquesta és la ubicació on s'ha emmagatzemat la clau privada. - - - - Força - - Indica la longitud en bits d'una clau. En general com més llarga la clau, proporciona més seguretat. - Una clau llarga no és suficient per a substituir la utilització d'una contrasenya dèbil. - - - - - - - - - Com suprimir una clau de l'intèrpret d'ordres segur - Per a suprimir una clau de l'intèrpret d'ordres segur: - - Seleccioneu la clau SSH des de la finestra principal. - - - Feu-hi clic amb el botó secundari i trieu Suprimeix la clau o trieu EditaSuprimeix la clau. - - - - - - - - - Importació de claus - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - Seleccioneu un bloc de text públic amb armadura ASCII. - - - Copieu-lo al porta-retalls. - - - Trieu EditaEnganxa les claus. - - - - - - - - - Exportació de claus - - To export keys, select the keys in the main window - and choose - - File - Export - . - - També podeu exportar claus al porta-retalls en un bloc de text amb armadura ASCII: - - Seleccioneu les claus a la finestra principal. - - - Trieu EditaCopia les claus. - - - - - - - - - Com signar una clau - Signar la clau d'una altra persona significa que esteu donant confiança a aquesta persona. Abans de signar una clau, hauríeu de comprovar detingudament l'empremta digital de la clau per a assegurar-vos que la clau realment pertany a aquella persona. - Per a signar una clau al vostre anell de claus: - - Seleccioneu la clau que voleu signar des de la pestanya Claus de confiança o Altres claus obtingudes. - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - Seleccioneu amb quina detenció s'ha comprovat la clau. - - - Indiqueu si la signatura hauria de ser local al vostre anell de claus i si la vostra signatura es pot revocar. - - - Feu clic a Signa. - - - - - - - - Preferències - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Anells de claus de contrasenyes - - Com crear anells de claus - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Com canviar les contrasenyes dels anells de claus. - Per a canviar la contrasenya de desblocat de l'anell de claus, primer seleccioneu l'anell de claus apropiat i després premeu el botó Canvia la contrasenya de desbloquejat. Se us sol·licitarà que introduïu la contrasenya antiga al quadre de text Contrasenya antiga, la contrasenya nova al quadre de text Contrasenya nova i confirmeu-la al quadre de text Confirmeu la contrasenya. Per a aplicar els paràmetres, premeu Canvia. Si la contrasenya antiga és correcte, obtindreu un missatge d'estat indicant que s'ha realitzat l'operació correctament. Si la contrasenya antiga no és correcte se us sol·licitarà que la comproveu. - - - Com suprimir anells de claus - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Servidors de claus - Mantingueu les vostres claus i les dels altres actualitzades sincronitzant les claus periòdicament amb servidors de clau remots. En sincronitzar us assegurareu que teniu les últimes signatures de totes les vostres claus de manera que la xarxa de confiança serà més útil. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - Servidors HKP - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - Servidors de claus LDAP - - Els servidors de claus LDAP són menys comuns, però utilitzen el protocol estàndard LDAP per a servir les claus. El ldap://keyserver.pgp.com és un bon servidor LDAP. - - - - - - - Compartició de claus - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - Per a informar d'un error o fer algun suggeriment relacionat amb aquesta aplicació o aquest manual, seguiu les indicacions a la secció de comentaris de la guia d'usuari del GNOME. - 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. S'inclou una còpia d'aquesta llicència amb aquesta documentació; se'n pot trobar una altre en el fitxer COPYING inclòs amb el codi font d'aquest programa. - -
diff -Nru seahorse-3.2.2/help/cs/index.docbook seahorse-3.6.3/help/cs/index.docbook --- seahorse-3.2.2/help/cs/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/cs/index.docbook 2012-11-09 17:35:36.000000000 +0100 @@ -0,0 +1,1252 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Projekt Seahorse + + + + + 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. + + Tato příručka je součástí kolekce příruček GNOME, distribuovaných pod licencí GNU FDL. Pokud chcete tento dokument šířit odděleně od kolekce, musíte přiložit kopii licence dle popisu v sekci 6 dané licence. + + Mnoho užívaných jmen určených k zviditelnění produktů nebo služeb jsou ochranné známky. Na místech, kde jsou tato jména v dokumentaci užita a členové Dokumentačního projektu GNOME jsou si vědomi skutečnosti, že se jedná o ochrannou známku, je takové jméno psáno velkými písmeny celé nebo s velkým písmenem na začátku. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Projekt Seahorse + + + Dokumentační projekt GNOME + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Ohlasy + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Úvod + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Začínáme + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Nabídka Aplikace + + Choose + + Accessories + Password and Keys + . + + + + Příkazový řádek + + Napište seahorse a zmáčkněte Return. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Panel nabídek + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Panel nástrojů + + Panel nástrojů můžete použít k rychlému přístupu k nejčastěji používaným funkcím. + + + Karty s klíči a hesly + + Poskytuje přístup ke klíčům a heslům v klíčence. + + + Volby při prvním spuštění + + Poskytuje rychlý přístup k neužitečnějším funkcím pro uživatele, kteří aplikaci spustili poprvé. Můžete zde najít: + + + Procházení nápovědy + + + Import klíčů do klíčenky + + + Vytvoření nového klíče + + + + + + + + + + + + Vytváření klíčů OpenPGP + OpenPGP je volně přístupný protokol na šifrování e-mailů s pomocí veřejného klíče založený na PGP. Definuje standardní formáty pro šifrované správy, podpisy, soukromé klíče a certifikáty pro výměnu veřejných klíčů. + Šifrování veřejným klíčem je koncept, který používá dva klíče: veřejný klíč, který můžete dát komukoliv, s kým chcete komunikovat a soukromý klíč, který je soukromý a musí zůstat bezpečně schovaný. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Když si budete vybírat ověřovací frázi, měli byste dodržet stejná pravidla, jako při vytváření silného hesla. Hlavní rozdíl mezi heslem a ověřovací frází je v tom, že pro ověřovací frázi jsou platnými znaky i mezery. + + + + Pokročilé možnosti + Rozbalte část Pokročilé možnosti, abyste mohli pro klíč zadat následující volby: + + + Encryption Type + + V tomto poli se určuje šifrovací algoritmus použitý ke generování klíčů. + + + DSA ElGamal + + Tato volba je doporučená, protože umožňuje šifrovat, dešifrovat, podepisovat a ověřovat podle potřeby. + + + + DSA + + Umožňuje pouze podepisování. + + + + RSA + + Umožňuje pouze podepisování. + + + + + + + Key Strength (bits) + + Udává délku klíče v bitech. Delší klíč je bezpečnější za předpokladu, že použijete silnou ověřovací frázi. Na druhou stranu, provádění operací s delším klíčem vyžaduje více času než s kratším. Přijatelné hodnoty jsou mezi 1024 a 4096 bitů. Doporučené je použít minimálně 2048 bitů. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Vytváření klíčů pro Secure Shell + Secure Shell (SSH) je způsob přihlašování ke vzdáleným počítačům za účelem spouštění příkazů na těchto počítačích. Klíče SSH se používají v ověřovacích systémech založených na klíči jako alternativa k výchozímu systému ověřování heslem. Při ověřování založeném na klíči není zapotřebí ručně psát ověřovací heslo. + Klíče Secure Shellu sestávají ze dvou klíčů: soukromého klíče, který musí být uložený v bezpečí, a veřejného klíče, který můžete nahrát na kterýkoliv počítač, ke kterému potřebujete přístup. + Vytvoření klíče pro Secure Shell: + + + Zvolte SouborNový. + + + Vyberte Klíč Secure Shellu a klikněte na tlačítko Pokračovat. + + + Zadejte popis, k čemu se bude klíč používat. Můžete použít svoji e-mailovou adresu nebo něco jiného vystihujícího účel. Můžete pro klíč také nastavit pokročilé volby, viz dále. + + + Klikněte na Pouze vytvořit klíč, aby se vytvořil nový klíč, nebo na Vytvořit a nastavit, aby se vytvořil klíč a nastavil další počítač, který jej použije pro ověřování. + + + Otevře se dialogové okno Ověřovací fráze pro nový klíč Secure Shellu. Zadejte dvakrát ověřovací frázi pro svůj nový klíč. + + Když si budete vybírat ověřovací frázi, měli byste dodržet stejná pravidla, jako při vytváření silného hesla. Hlavní rozdíl mezi heslem a ověřovací frází je v tom, že pro ověřovací frázi jsou platnými znaky i mezery. + + + + + + + + Pokročilé možnosti + Rozbalte část Pokročilé možnosti, abyste mohli pro nový klíč zadat následující volby: + + + + Encryption Type + + Toto pole určuje šifrovací algoritmus použitý pro generování klíče. + + + RSA + + Pro vytváření klíče SSH použít algoritmus Rivest-ShamirAdleman (RSA). Tato volba je upřednostňovaná a bezpečnější. + + + + DSA + + Pro vytváření klíče SSH použít Digital Signature Algorithm (DSA). + + + + + + + Key Strength (bits) + + Udává délku klíče v bitech. Delší klíč je bezpečnější za předpokladu, že použijete silnou ověřovací frázi. Na druhou stranu, provádění operací s delším klíčem vyžaduje více času než s kratším. Přijatelné hodnoty jsou mezi 1024 a 4096 bitů. Doporučené je použít minimálně 2048 bitů. + + + + + + + + + + Vlastnosti klíčů OpenPGP + Popisy v této kapitole platí pro všechny klíče OpenPGP. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Vlastnosti + + + + Fingerprint + + Otisk klíče je unikátní řetězec znaků, který jednoznačně klíč identifikuje. + + + + KeyID + + ID klíče je podobné otisku klíče. Akorát že ID klíče obsahuje pouze posledních 8 znaků z otisku klíče. Většinou je možné identifikovat klíč pouze pomocí ID klíče, ale sem tam se může stát, že dva klíče mohou mít stejné ID. + + + + Type + + Určuje šifrovací algoritmus použitý k vygenerování klíče. Klíče DSA lez použít pouze k podepsání. Klíče ElGamal jsou použitelné pro šifrování. + + + + Created + + Ukazuje datum, kdy byl klíč vytvořený. + + + + Expires + + Ukazuje datum, od kterého už se klíč nemůže používat. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Důvěryhodnost + Důvěryhodnost je indikátorem, jak jistí jste si způsobilostí osoby korektně rozšiřovat rozsah důvěry. Když stojíte před problémem, že klíč nemáte podepsaný, budou určující pro platnost osobního klíče podpisy, které jste sesbírali a jak moc věříte nebo nevěříte lidem, kteří tyto podpisy vytvářeli. Standardně vyžaduje neznámý klíč 3 podpisy s částečnou důvěryhodností nebo 1 plně důvěryhodný podpis. + + Neznámá: Nedokážete posoudit schopnost osoby podepisovat korektně klíče. + Žádná: Tato osoba nemůže klíče korektně podepisovat. + Částečná: Tato osoba před podepsání zkontroluje fotografické ID, ale nutně nezkoumá ostatní ID. + Plná: Tato osoba zkoumá navzájem a všechny fotografické ID osoby, před jejím podepsáním (např. podepisují pouze klíče, které skutečně náleží osobě, která žádá o podpis). + Bezmezná: Tato úroveň důvěryhodnosti by měla být přiřazená vašim vlastním klíčům. + + + + + Povolování a zakazování klíčů + Když je klíč povolený, může být použitý na provádění šifrovacích operací. Když je klíč zakázaný, nelze je použít na šifrování nebo vytváření ověřovacích podpisů. + + + + Datum propadnutí platnosti + Jakmile platnost klíče vyprší, klíč nemůže být nadále používán k provádění operací s klíčem. Posunutím data propadnutí dál do budoucna klíč znovu nabude platnosti. Dobrým zvykem v praxi je mít hlavní klíč, jehož platnost nikdy nekončí a více podklíčů, který mají datum propadnutí nastavené a jsou podepsané hlavním klíčem. + + + + Více ID uživatele + Více ID uživatele dovoluje použít s jedním klíčem více identit a e-mailových adres. + + They usually take the form of: + Name (comment) <email address> + + + + Přidávání ID uživatele + Přidání ID uživatele je dobré, pokud chcete mít jednu identitu pro pracovní záležitosti a druhou pro své přátele. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + Po provedení předchozích kroků spatříte dialogové okno, které musíte vyplnit. Jednotlivá pole jsou objasněná dále. + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + Do tohoto pole musíte zadat minimálně 5 znaků. + + + + + + Email Address + + Podle vaší e-mailové adresy většina lidí hledá váš klíč na serverech s klíči nebo u dalších poskytovatelů klíčů. Před pokračováním se proto ujistěte, že jste ji zadali správně. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + Pole s komentářem lze použít k zadání doplňujících informací k zobrazovanému jménu vašeho nového ID. Na některých serverech lze tyto informace použít na vyhledání klíče. + + + + + + + + Fotografické ID + Fotografické ID umožňuje vlastníkovi klíče připojit ke klíči jednu nebo více svých fotografií. Tyto identity lze podepsat podobně jako normální ID uživatelů. Fotografické ID musí být ve formátu JPEG a je doporučené, aby nebyly větší než 240×288 pixelů. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Změna ověřovací fráze + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Zadejte novou ověřovací frázi a klikněte na OK. + + + + Mazání klíče + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + Můžete mazat své osobní klíče, důvěryhodné klíče a ostatní nasbírané klíče. + + + + + + + + Vlastnosti podklíčů OpenPGP + Každý klíč OpenPGP má jeden hlavní klíč, který se používá pouze k podepisování. Podklíče se používají k šifrování i podepisování. Pokud dojde ke kompromitaci podklíče, nemusíte díky tomu zneplatnit svůj hlavní klíč. + + + ID + + To je identifikátor podklíče. + + + + Type + + Ukazuje šifrovací algoritmus použitý k vygenerování podklíče. Klíče DSA se mohou použít pouze k podepisování. Klíče ElGamal se používají k šifrování, zatímco klíče RSA se používají k podepisování nebo šifrování. + + + + Created + + Ukazuje datum, kdy byl klíč vytvořený. + + + + Expires + + Ukazuje datum, od kterého už se klíč nemůže používat. + + + + Status + + Ukazuje stav klíče. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Přidávání podklíčů + Pokud chcete do klíče přidat podklíč, tak v části Podklíče klikněte na tlačítko Přidat. + Po provedení předchozích kroků spatříte dialogové okno, které musíte vyplnit. Jednotlivá pole jsou objasněná dále. + + + Typ klíče + + Určuje šifrovací algoritmus použitý k vygenerování podklíče. + + + DSA + + K vytvoření podklíče použít Digital Signature Algorithm (DSA). Tímto podklíčem se může pouze podepisovat. + + + + ElGamal + + K vytvoření podklíče použít algoritmus ElGamal. Tímto podklíčem se může pouze šifrovat. + + + + RSA + + K vytvoření podklíče použít algoritmus Rivest-Shamir Adleman (RSA). Tímto podklíčem můžete podepisovat nebo šifrovat, ale musíte mít vytvořené dva různé podklíče. + + + + + + + Délka klíče + + Určuje délku podklíče v bitech. Obecně platí, že čím delší klíč, tím lepší bezpečnost. + + + + Datum propadnutí platnosti + + Určuje datum, po jehož vypršení se klíč již nemůže použít. + + + + + + + Změna data propadnutí podklíče + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Zneplatnění podklíče + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + Zneplatnění podklíče se projeví okamžitě. + + + + + Mazání podklíče + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Vlastnosti klíčů Secure Shellu + Popisy v této kapitole platí pro všechny klíče SSH. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Vlastnosti + + + + Fingerprint + + Otisk klíče je unikátní řetězec znaků, který jednoznačně klíč identifikuje. + + + + Algorithm + + Ukazuje šifrovací algoritmus použitý k vygenerování klíče. + + + + Location + + Jedná se o místo, kam byl uložen soukromý klíč. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Mazání klíče Secure Shellu + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importování klíčů + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exportování klíčů + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Podepisování klíče + Podepsání klíče jiné osoby znamená, že dáváte této osobě svoji důvěru. Před podepsáním klíče musíte pečlivě zkontrolovat otisk klíče, abyste si byl jist, že klíč náleží k dané osobě. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Předvolby + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Klíčenky s hesly + + Vytváření klíčenek + Pokud hodláte vytvořit novou klíčenku, tak zvolte v nabídce SouborNový a vyberte Klíčenka hesel. Zadejte název nové klíčenky a stiskněte Enter. + + + Změna hesel klíčenek + Pokud hodláte změnit heslo na odemykání klíčenky, tak nejprve vyberte odpovídající klíčenku a pak zmáčkněte tlačítko Změnit heslo. Budete dotázání na staré heslo v textovém poli Staré heslo, na nové heslo v textovém poli Heslo a na potvrzení nového hesla v textovém poli Potvrďte heslo. Zmáčknutím tlačítka Změnit se nastavení potvrdí k použití. Pokud bylo staré heslo zadané v pořádku, objeví se zpráva informující o úspěšné operaci. Pokud staré heslo nebylo správné, budete vyzváni, abyste jej zadali správně. + + + Odstraňování klíčenek + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Servery s klíči + Udržujte své i další klíče aktuální pomocí pravidelné synchronizace klíčů se vzdálenými servery s klíči. Synchronizace zajistí, abyste měli nejnovější podpisy vytvořené na všech svých klíčích a tak byl rozsah důvěry použitelnější. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + Servery s klíči LDAP jsou méně obvyklé, ale zase používají k obsluze klíčů standardní protokol LDAP. Dobrým serverem LDAP je ldap://keyserver.pgp.com. + + + + + + + Sdílení klíčů + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/cs/legal.xml seahorse-3.6.3/help/cs/legal.xml --- seahorse-3.2.2/help/cs/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/cs/legal.xml 2012-11-09 17:35:36.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + Tato příručka je součástí kolekce příruček GNOME, distribuovaných pod licencí GNU FDL. Pokud chcete tento dokument šířit odděleně od kolekce, musíte přiložit kopii licence dle popisu v sekci 6 dané licence. + + Mnoho užívaných jmen určených k zviditelnění produktů nebo služeb jsou ochranné známky. Na místech, kde jsou tato jména v dokumentaci užita a členové Dokumentačního projektu GNOME jsou si vědomi skutečnosti, že se jedná o ochrannou známku, je takové jméno psáno velkými písmeny celé nebo s velkým písmenem na začátku. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/cs/seahorse.xml seahorse-3.6.3/help/cs/seahorse.xml --- seahorse-3.2.2/help/cs/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/cs/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,960 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins a Adam Schreiber - 2009Marek Černocký (marek@manet.cz) - - Projekt Seahorse - - - - Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License, verze 1.1 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů předních desek a bez textů zadních desek. Kopie této licence je zahrnuta v oddílu jménem GNU Free Documentation License nebo v souboru COPYING-DOCS dodávaném s touto příručkou. - Tato příručka je součástí kolekce příruček GNOME, distribuovaných pod licencí GNU FDL. Pokud chcete tento dokument šířit odděleně od kolekce, musíte přiložit kopii licence dle popisu v sekci 6 dané licence. - - Mnoho užívaných jmen určených k zviditelnění produktů nebo služeb jsou ochranné známky. Na místech, kde jsou tato jména v dokumentaci užita a členové Dokumentačního projektu GNOME jsou si vědomi skutečnosti, že se jedná o ochrannou známku, je takové jméno psáno velkými písmeny celé nebo s velkým písmenem na začátku. - - DOKUMENT A JEHO UPRAVENÉ VERZE JSOU ŠÍŘENY V SOULADU SE ZNĚNÍM LICENCE GNU FREE DOCUMENTATION LICENSE S NÁSLEDUJÍCÍM USTANOVENÍM: - - DOKUMENT JE POSKYTOVÁN V PODOBĚ „JAK JE“ BEZ ZÁRUKY V JAKÉKOLIV PODOBĚ, NEPOSKYTUJÍ SE ANI ODVOZENÉ ZÁRUKY, ZÁRUKY, ŽE DOKUMENT, NEBO JEHO UPRAVENÁ VERZE, JE BEZCHYBNÝ NEBO ZÁRUKY PRODEJNOSTI, VHODNOSTI PRO URČITÝ ÚČEL NEBO NEPORUŠENOSTI. RIZIKO NEKVALITY, NEPŘESNOSTI A ŠPATNÉHO PROVEDENÍ DOKUMENTU, NEBO JEHO UPRAVENÉ VERZE, LEŽÍ NA VÁS. POKUD KVŮLI TOMUTO DOKUMENTU, NEBO JEHO UPRAVENÉ VERZI, NASTANE PROBLÉM, VY (NIKOLIV PŮVODNÍ AUTOR NEBO JAKÝKOLIV PŘISPĚVATEL) PŘEBÍRÁTE JAKÉKOLIV NÁKLADY ZA NUTNÉ ÚPRAVY, OPRAVY ČI SLUŽBY. TOTO PROHLÁŠENÍ O ZÁRUCE PŘEDSTAVUJE ZÁKLADNÍ SOUČÁST TÉTO LICENCE. BEZ TOHOTO PROHLÁŠENÍ NENÍ, PODLE TÉTO DOHODY, POVOLENO UŽÍVÁNÍ ANI ÚPRAVY TOHOTO DOKUMENTU; DÁLE - - - 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Í. - - - - - - - - Jacob - Perkins - - Projekt Seahorse - - - - - Adam - Schreiber - - Projekt Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - Dokumentační projekt GNOME -
- pcutler@foresightlinux.org -
- - - - - - - Projekt Seahorse - - - Dokumentační projekt GNOME - - - - Passwords and Keys Manual V2.11.0 - Květen 2009 - - Paul Cutler pcutler@foresightlinux.org - - - - Passwords and Keys Manual V0.10.1 - Srpen 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - Listopad 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - Červenec 2005 - - Adam Schreiber sadam@clemson.edu - Projekt Seahorse - - - - Passwords and Keys Manual V0.7.0 - Únor 2003 - - Jacob Perkins - Projekt Seahorse - - - - This manual describes version 2.28.x of Passwords and Keys - - Ohlasy - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Šifrovací klíče - - - - - - Úvod - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Vytvářet a spravovat klíče PGP a SSH - - - Exportovat a importovat klíče PGP a SSH - - - Sdílet své klíče s ostatními - - - - - - - - - Začínáme - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Nabídka Aplikace - - Choose - - Accessories - Password and Keys - . - - - - Příkazový řádek - - Napište seahorse a zmáčkněte Return. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Ukazuje okno aplikace Passwords and Keys - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Panel nabídek - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Panel nástrojů - - Panel nástrojů můžete použít k rychlému přístupu k nejčastěji používaným funkcím. - - - Karty s klíči a hesly - - Poskytuje přístup ke klíčům a heslům v klíčence. - - - Volby při prvním spuštění - - Poskytuje rychlý přístup k neužitečnějším funkcím pro uživatele, kteří aplikaci spustili poprvé. Můžete zde najít: - - - Procházení nápovědy - - - Import klíčů do klíčenky - - - Vytvoření nového klíče - - - - - - - - - - - - Vytváření klíčů OpenPGP - OpenPGP je volně přístupný protokol na šifrování e-mailů s pomocí veřejného klíče založený na PGP. Definuje standardní formáty pro šifrované správy, podpisy, soukromé klíče a certifikáty pro výměnu veřejných klíčů. - Šifrování veřejným klíčem je koncept, který používá dva klíče: veřejný klíč, který můžete dát komukoliv, s kým chcete komunikovat a soukromý klíč, který je soukromý a musí zůstat bezpečně schovaný. - Vytvoření klíčů OpenPGP: - - Zvolte SouborNový. - - - Vyberte Klíč PGP a klikněte na Pokračovat. - - - Zadejte celé své jméno (jméno a příjmení), svoji e-mailovou adresu a některé doplňující údaje. Můžete pro klíč také nastavit pokročilé volby: viz dále. - - - Kliknutím na Vytvořit vytvoříte nový pár klíčů. - - - Otevře se dialogové okno Heslo pro nový klíč PGP. Zadejte dvakrát ověřovací frázi pro nový klíč. - - - - Když si budete vybírat ověřovací frázi, měli byste dodržet stejná pravidla, jako při vytváření silného hesla. Hlavní rozdíl mezi heslem a ověřovací frází je v tom, že pro ověřovací frázi jsou platnými znaky i mezery. - - - - Pokročilé možnosti - Rozbalte část Pokročilé možnosti, abyste mohli pro klíč zadat následující volby: - - - Typ šifrování - - V tomto poli se určuje šifrovací algoritmus použitý ke generování klíčů. - - - DSA ElGamal - - Tato volba je doporučená, protože umožňuje šifrovat, dešifrovat, podepisovat a ověřovat podle potřeby. - - - - DSA - - Umožňuje pouze podepisování. - - - - RSA - - Umožňuje pouze podepisování. - - - - - - - Síla klíče (v bitech) - - Udává délku klíče v bitech. Delší klíč je bezpečnější za předpokladu, že použijete silnou ověřovací frázi. Na druhou stranu, provádění operací s delším klíčem vyžaduje více času než s kratším. Přijatelné hodnoty jsou mezi 1024 a 4096 bitů. Doporučené je použít minimálně 2048 bitů. - - - - Datum propadnutí platnosti - - Jedná se o den, kdy klíč přestane být použitelný pro operace šifrování a podepisování. Rozumnou dobou pro nastavení je 6 měsíců. Po uplynutí této doby budete buď muset datum propadnutí posunout nebo vygenerovat nový klíč nebo podklíč. - - - - - - - - - - Vytváření klíčů pro Secure Shell - Secure Shell (SSH) je způsob přihlašování ke vzdáleným počítačům za účelem spouštění příkazů na těchto počítačích. Klíče SSH se používají v ověřovacích systémech založených na klíči jako alternativa k výchozímu systému ověřování heslem. Při ověřování založeném na klíči není zapotřebí ručně psát ověřovací heslo. - Klíče Secure Shellu sestávají ze dvou klíčů: soukromého klíče, který musí být uložený v bezpečí, a veřejného klíče, který můžete nahrát na kterýkoliv počítač, ke kterému potřebujete přístup. - Vytvoření klíče pro Secure Shell: - - - Zvolte SouborNový. - - - Vyberte Klíč Secure Shellu a klikněte na tlačítko Pokračovat. - - - Zadejte popis, k čemu se bude klíč používat. Můžete použít svoji e-mailovou adresu nebo něco jiného vystihujícího účel. Můžete pro klíč také nastavit pokročilé volby, viz dále. - - - Klikněte na Pouze vytvořit klíč, aby se vytvořil nový klíč, nebo na Vytvořit a nastavit, aby se vytvořil klíč a nastavil další počítač, který jej použije pro ověřování. - - - Otevře se dialogové okno Ověřovací fráze pro nový klíč Secure Shellu. Zadejte dvakrát ověřovací frázi pro svůj nový klíč. - - Když si budete vybírat ověřovací frázi, měli byste dodržet stejná pravidla, jako při vytváření silného hesla. Hlavní rozdíl mezi heslem a ověřovací frází je v tom, že pro ověřovací frázi jsou platnými znaky i mezery. - - - - - - - - Pokročilé možnosti - Rozbalte část Pokročilé možnosti, abyste mohli pro nový klíč zadat následující volby: - - - - Typ šifrování - - Toto pole určuje šifrovací algoritmus použitý pro generování klíče. - - - RSA - - Pro vytváření klíče SSH použít algoritmus Rivest-ShamirAdleman (RSA). Tato volba je upřednostňovaná a bezpečnější. - - - - DSA - - Pro vytváření klíče SSH použít Digital Signature Algorithm (DSA). - - - - - - - Síla klíče (v bitech) - - Udává délku klíče v bitech. Delší klíč je bezpečnější za předpokladu, že použijete silnou ověřovací frázi. Na druhou stranu, provádění operací s delším klíčem vyžaduje více času než s kratším. Přijatelné hodnoty jsou mezi 1024 a 4096 bitů. Doporučené je použít minimálně 2048 bitů. - - - - - - - - - - Vlastnosti klíčů OpenPGP - Popisy v této kapitole platí pro všechny klíče OpenPGP. - - Pokud si chcete prohlédnut vlastnosti klíče PGP: - - V hlavním okně vyberte klíč PGP. - - - Dvojitě na něj klikněte nebo na panelu nástrojů zvolte Vlastnosti. - - - Zvolte kartu Detaily. - - - - - Vlastnosti - - - - Otisk klíče - - Otisk klíče je unikátní řetězec znaků, který jednoznačně klíč identifikuje. - - - - ID klíče - - ID klíče je podobné otisku klíče. Akorát že ID klíče obsahuje pouze posledních 8 znaků z otisku klíče. Většinou je možné identifikovat klíč pouze pomocí ID klíče, ale sem tam se může stát, že dva klíče mohou mít stejné ID. - - - - Typ - - Určuje šifrovací algoritmus použitý k vygenerování klíče. Klíče DSA lez použít pouze k podepsání. Klíče ElGamal jsou použitelné pro šifrování. - - - - Vytvořen - - Ukazuje datum, kdy byl klíč vytvořený. - - - - Vyprší - - Ukazuje datum, od kterého už se klíč nemůže používat. - - - - Síla - - Ukazuje délku klíče v bitech. Obecně lze říci, že čím delší klíč, tím lepší bezpečnost zaručuje. - Ale i dostatečně dlouhý klíč může být nevhodný k použití, pokud zvolíte slabou ověřovací frázi. - - - - - - - - - Důvěryhodnost - Důvěryhodnost je indikátorem, jak jistí jste si způsobilostí osoby korektně rozšiřovat rozsah důvěry. Když stojíte před problémem, že klíč nemáte podepsaný, budou určující pro platnost osobního klíče podpisy, které jste sesbírali a jak moc věříte nebo nevěříte lidem, kteří tyto podpisy vytvářeli. Standardně vyžaduje neznámý klíč 3 podpisy s částečnou důvěryhodností nebo 1 plně důvěryhodný podpis. - - Neznámá: Nedokážete posoudit schopnost osoby podepisovat korektně klíče. - Žádná: Tato osoba nemůže klíče korektně podepisovat. - Částečná: Tato osoba před podepsání zkontroluje fotografické ID, ale nutně nezkoumá ostatní ID. - Plná: Tato osoba zkoumá navzájem a všechny fotografické ID osoby, před jejím podepsáním (např. podepisují pouze klíče, které skutečně náleží osobě, která žádá o podpis). - Bezmezná: Tato úroveň důvěryhodnosti by měla být přiřazená vašim vlastním klíčům. - - - - - Povolování a zakazování klíčů - Když je klíč povolený, může být použitý na provádění šifrovacích operací. Když je klíč zakázaný, nelze je použít na šifrování nebo vytváření ověřovacích podpisů. - - - - Datum propadnutí platnosti - Jakmile platnost klíče vyprší, klíč nemůže být nadále používán k provádění operací s klíčem. Posunutím data propadnutí dál do budoucna klíč znovu nabude platnosti. Dobrým zvykem v praxi je mít hlavní klíč, jehož platnost nikdy nekončí a více podklíčů, který mají datum propadnutí nastavené a jsou podepsané hlavním klíčem. - - - - Více ID uživatele - Více ID uživatele dovoluje použít s jedním klíčem více identit a e-mailových adres. - ID uživatele má obvykle tvar: Jméno (komentář) <e-mailová adresa> - - - Přidávání ID uživatele - Přidání ID uživatele je dobré, pokud chcete mít jednu identitu pro pracovní záležitosti a druhou pro své přátele. - Když chcete ke klíči přidat ID uživatele: - - V hlavním okně vyberte klíč. - - - Dvojitě na něj klikněte nebo zvolte na panelu nástrojů Vlastnosti. - - - Zvolte kartu Jména a podpisy. - - - Klikněte na tlačítko Přidat jméno. - - - Po provedení předchozích kroků spatříte dialogové okno, které musíte vyplnit. Jednotlivá pole jsou objasněná dále. - - - Celé jméno - - Zadejte své celé jméno ve tvaru <jméno> <příjmení> Prostřední jméno nebo počáteční iniciála jsou volitelné. - - - Do tohoto pole musíte zadat minimálně 5 znaků. - - - - - - E-mail - - Podle vaší e-mailové adresy většina lidí hledá váš klíč na serverech s klíči nebo u dalších poskytovatelů klíčů. Před pokračováním se proto ujistěte, že jste ji zadali správně. - - - Měla by být ve tvaru <jméno_uživatele>@<nazev_domény> - - - - - - Komentář klíče - - Pole s komentářem lze použít k zadání doplňujících informací k zobrazovanému jménu vašeho nového ID. Na některých serverech lze tyto informace použít na vyhledání klíče. - - - - - - - - Fotografické ID - Fotografické ID umožňuje vlastníkovi klíče připojit ke klíči jednu nebo více svých fotografií. Tyto identity lze podepsat podobně jako normální ID uživatelů. Fotografické ID musí být ve formátu JPEG a je doporučené, aby nebyly větší než 240×288 pixelů. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Změna ověřovací fráze - Když chcete změnit ověřovací frázi náležející klíči: - - V hlavním okně vyberte klíč. - - - Dvojitě na něj klikněte nebo na panelu nástrojů zvolte Vlastnosti. - - - Klikněte na tlačítko Změnit heslo. - - - Zadejte novou ověřovací frázi a klikněte na OK. - - - - Mazání klíče - Pokud chcete klíč z vaší klíčenky vymazat: - - V hlavním okně vyberte klíč. - - - Klikněte na něj pravým tlačítkem a zvolte Smazat nebo zvolte UpravitSmazat. - - - - Můžete mazat své osobní klíče, důvěryhodné klíče a ostatní nasbírané klíče. - - - - - - - - Vlastnosti podklíčů OpenPGP - Každý klíč OpenPGP má jeden hlavní klíč, který se používá pouze k podepisování. Podklíče se používají k šifrování i podepisování. Pokud dojde ke kompromitaci podklíče, nemusíte díky tomu zneplatnit svůj hlavní klíč. - - - ID - - To je identifikátor podklíče. - - - - Typ - - Ukazuje šifrovací algoritmus použitý k vygenerování podklíče. Klíče DSA se mohou použít pouze k podepisování. Klíče ElGamal se používají k šifrování, zatímco klíče RSA se používají k podepisování nebo šifrování. - - - - Vytvořen - - Ukazuje datum, kdy byl klíč vytvořený. - - - - Vyprší - - Ukazuje datum, od kterého už se klíč nemůže používat. - - - - Stav - - Ukazuje stav klíče. - - - - Síla - - Ukazuje délku klíče v bitech. Obecně lze říci, že čím delší klíč, tím lepší zabezpečení poskytuje. - Ale i dostatečně dlouhý klíč může být nevhodný k použití, pokud zvolíte slabou ověřovací frázi. - - - - - - - Přidávání podklíčů - Pokud chcete do klíče přidat podklíč, tak v části Podklíče klikněte na tlačítko Přidat. - Po provedení předchozích kroků spatříte dialogové okno, které musíte vyplnit. Jednotlivá pole jsou objasněná dále. - - - Typ klíče - - Určuje šifrovací algoritmus použitý k vygenerování podklíče. - - - DSA - - K vytvoření podklíče použít Digital Signature Algorithm (DSA). Tímto podklíčem se může pouze podepisovat. - - - - ElGamal - - K vytvoření podklíče použít algoritmus ElGamal. Tímto podklíčem se může pouze šifrovat. - - - - RSA - - K vytvoření podklíče použít algoritmus Rivest-Shamir Adleman (RSA). Tímto podklíčem můžete podepisovat nebo šifrovat, ale musíte mít vytvořené dva různé podklíče. - - - - - - - Délka klíče - - Určuje délku podklíče v bitech. Obecně platí, že čím delší klíč, tím lepší bezpečnost. - - - - Datum propadnutí platnosti - - Určuje datum, po jehož vypršení se klíč již nemůže použít. - - - - - - - Změna data propadnutí podklíče - Pokud chcete u podklíče změnit datum, kdy vyprší jeho platnost, vyberte daný podklíč v části Podklíče a následně: - - Klikněte vlevo na tlačítko Vypršet. - - - V dialogovém okně vyberte nové datum propadnutí nebo zapněte Nevyprší nikdy, pokud nemá být žádné omezující datum nastavené. - - - - - - Zneplatnění podklíče - Pokud chcete podklíč zneplatnit, vyberte jej v části Podklíče a následně: - - Klikněte vlevo na tlačítko Odvolat. - - - Vyberte důvod, proč podklíč zneplatňujete: - - - - Bez důvodu - - Není žádný konkrétní důvod k zneplatnění klíče. - - - - Kompromitovaný - - Klíč byl kompromitován. - - - - Nahrazen - - Klíč byl nahrazen jiným klíčem. - - - - Nepoužívá se - - Klíč se již nadále nepoužívá. - - - - - - - Zadejte popis, proč klíč zneplatňujete. - - - Klikněte na tlačítko Odvolat. - - - - Zneplatnění podklíče se projeví okamžitě. - - - - - Mazání podklíče - Pokud chcete podklíč smazat, vyberte je v části Podklíče a následně: - - Klikněte vlevo na tlačítko Smazat. - - - - - - - - - Vlastnosti klíčů Secure Shellu - Popisy v této kapitole platí pro všechny klíče SSH. - Když si chcete prohlédnou vlastnosti klíče SSH: - - V hlavním okně vyberte klíč Secure Shellu. - - - Dvojitě na něj klikněte nebo na panelu nástrojů zvolte Vlastnosti. - - - Zvolte kartu Detaily. - - - - - Vlastnosti - - - - Otisk klíče - - Otisk klíče je unikátní řetězec znaků, který jednoznačně klíč identifikuje. - - - - Algoritmus - - Ukazuje šifrovací algoritmus použitý k vygenerování klíče. - - - - Umístění - - Jedná se o místo, kam byl uložen soukromý klíč. - - - - Síla - - Ukazuje délku klíče v bitech. Obecně lze říci, že čím delší klíč, tím lepší bezpečnost zaručuje. - Ale i dostatečně dlouhý klíč může být nevhodný k použití, pokud zvolíte slabou ověřovací frázi. - - - - - - - - - Mazání klíče Secure Shellu - Pokud chcete smazat klíč Secure Shellu: - - V hlavním okně vyberte klíč SSH. - - - Klikněte na něm pravým tlačítkem a zvolte Smazat nebo zvolte UpravitSmazat. - - - - - - - - - Importování klíčů - Pokud hodláte importovat klíče, tak zvolte SouborImportovat a v dialogu pro výběr souboru vyberte soubor, který obsahuje nejméně jeden veřejný klíč zakódovaný do ASCII. - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - Vyberte blok textu představující klíč zakódovaný v ASCII. - - - Zkopírujte jej do schránky. - - - Zvolte UpravitVložit. - - - - - - - - - Exportování klíčů - Pokud chcete klíče exportovat, vyberte je v hlavním okně a zvolte SouborExportovat. - Klíče také můžete exportovat jejich vložením do schránky v podobě bloku textu s klíčem zakódovaným v ASCII: - - Vyberte v hlavním okně klíče. - - - Zvolte UpravitKopírovat. - - - - - - - - - Podepisování klíče - Podepsání klíče jiné osoby znamená, že dáváte této osobě svoji důvěru. Před podepsáním klíče musíte pečlivě zkontrolovat otisk klíče, abyste si byl jist, že klíč náleží k dané osobě. - Když chcete podepsat klíč ve své klíčence: - - Vyberte na kartě Důvěryhodné klíče nebo Ostatní nasbírané klíče klíč, který chcete podepsat. - - - Zvolte Podepsat klíč na panelu nástrojů nebo SouborPodepsat klíč. - - - Zvolte, jak pečlivě byl klíč zkontrolován. - - - Určete, zda je podpis určený pouze pro vaši místní klíčenku a zda může být váš podpis odvolán. - - - Klikněte na tlačítko Podepsat. - - - - - - - - Předvolby - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Klíčenky s hesly - - Vytváření klíčenek - Pokud hodláte vytvořit novou klíčenku, tak zvolte v nabídce SouborNový a vyberte Klíčenka hesel. Zadejte název nové klíčenky a stiskněte Enter. - - - Změna hesel klíčenek - Pokud hodláte změnit heslo na odemykání klíčenky, tak nejprve vyberte odpovídající klíčenku a pak zmáčkněte tlačítko Změnit heslo. Budete dotázání na staré heslo v textovém poli Staré heslo, na nové heslo v textovém poli Heslo a na potvrzení nového hesla v textovém poli Potvrďte heslo. Zmáčknutím tlačítka Změnit se nastavení potvrdí k použití. Pokud bylo staré heslo zadané v pořádku, objeví se zpráva informující o úspěšné operaci. Pokud staré heslo nebylo správné, budete vyzváni, abyste jej zadali správně. - - - Odstraňování klíčenek - Pokud chcete odstranit klíčenku, nejdříve příslušnou klíčenku vyberte, a poté v nabídce zvolte UpravitSmazat. - - - - - Servery s klíči - Udržujte své i další klíče aktuální pomocí pravidelné synchronizace klíčů se vzdálenými servery s klíči. Synchronizace zajistí, abyste měli nejnovější podpisy vytvořené na všech svých klíčích a tak byl rozsah důvěry použitelnější. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - Servery HKP - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - Servery LDAP - - Servery s klíči LDAP jsou méně obvyklé, ale zase používají k obsluze klíčů standardní protokol LDAP. Dobrým serverem LDAP je ldap://keyserver.pgp.com. - - - - - - - Sdílení klíčů - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k této aplikaci nebo této příručce, postupujte dle instrukcí v Kapitole Ohlasy v Uživatelské příručce GNOME. - 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. Kopie této licence je součástí této dokumentace nebo ji můžete najít v souboru COPYING přiloženém ke zdrojovým kódům tohoto programu. - -
diff -Nru seahorse-3.2.2/help/de/de.po seahorse-3.6.3/help/de/de.po --- seahorse-3.2.2/help/de/de.po 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/de/de.po 2012-09-18 13:10:35.000000000 +0200 @@ -1,51 +1,67 @@ # German translation of the seahorse manual. -# Mario Blättermann , 2008-2011. +# Mario Blättermann , 2008-2012. # msgid "" msgstr "" "Project-Id-Version: seahorse help master\n" -"POT-Creation-Date: 2011-08-30 08:37+0000\n" -"PO-Revision-Date: 2011-09-01 13:05+0100\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2012-09-09 13:29+0000\n" +"PO-Revision-Date: 2012-09-09 16:38+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\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/seahorse.xml:224(None) +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "Mario Blättermann , 2008-2012" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:224(imagedata) +msgctxt "_" msgid "" -"@@image: 'figures/seahorse-window.png'; md5=d52b0902a24b89d5aadc50e64f471c7d" +"external ref='figures/seahorse-window.png' " +"md5='d52b0902a24b89d5aadc50e64f471c7d'" msgstr "translated" -#: C/seahorse.xml:16(title) +#: C/index.docbook:16(articleinfo/title) msgid "Passwords and Keys Manual" msgstr "»Passwörter und Verschlüsselung«-Handbuch" -#: C/seahorse.xml:18(year) -msgid "2005, 2006, 2007, 2008, 2009" -msgstr "2005, 2006, 2007, 2008, 2009" - -#: C/seahorse.xml:19(holder) -msgid "Jacob Perkins and Adam Schreiber" -msgstr "Jacob Perkins und Adam Schreiber" - -#: C/seahorse.xml:22(publishername) C/seahorse.xml:31(orgname) -#: C/seahorse.xml:43(orgname) C/seahorse.xml:63(publishername) -#: C/seahorse.xml:106(para) C/seahorse.xml:118(para) +#: C/index.docbook:17(articleinfo/copyright) +msgid "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins and Adam " +"Schreiber" +msgstr "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins und Adam " +"Schreiber" + +#: C/index.docbook:22(publisher/publishername) +#: C/index.docbook:63(publisher/publishername) +#: C/index.docbook:106(revdescription/para) +#: C/index.docbook:118(revdescription/para) msgid "Seahorse Project" msgstr "Seahorse-Projekt" -#: C/seahorse.xml:2(para) +#: C/index.docbook:2(legalnotice/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 " +"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 " @@ -53,10 +69,10 @@ "Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte " "sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt " "und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem " -"Link oder in der mit diesem " +"Link oder in der mit diesem " "Handbuch gelieferten Datei COPYING-DOCS." -#: C/seahorse.xml:12(para) +#: C/index.docbook:12(legalnotice/para) C/legal.xml:12(legalnotice/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, " @@ -69,7 +85,7 @@ "der Lizenz zum Handbuch hinzufügen, wie es in Abschnitt 6 der Lizenz " "beschrieben ist." -#: C/seahorse.xml:19(para) +#: C/index.docbook:19(legalnotice/para) C/legal.xml:19(legalnotice/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 " @@ -84,7 +100,7 @@ "großen Anfangsbuchstaben geschrieben, wenn das GNOME-Dokumentationsprojekt " "auf diese Warenzeichen hingewiesen wird." -#: C/seahorse.xml:35(para) +#: C/index.docbook:35(listitem/para) C/legal.xml:35(listitem/para) msgid "" "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " @@ -112,7 +128,7 @@ "EINES DOKUMENTS ODER EINER VERÄNDERTEN VERSION DES DOKUMENTS IST NICHT " "GESTATTET AUßER UNTER BEACHTUNG DIESES HAFTUNGSAUSSCHLUSSES UND" -#: C/seahorse.xml:55(para) +#: C/index.docbook:55(listitem/para) C/legal.xml:55(listitem/para) msgid "" "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " "NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " @@ -138,129 +154,126 @@ "AUCH WENN DIE OBEN GENANNTEN PARTEIEN ÜBER DIE MÖGLICHKEIT SOLCHER SCHÄDEN " "INFORMIERT WAREN." -#: C/seahorse.xml:28(para) +#: C/index.docbook:28(legalnotice/para) C/legal.xml:28(legalnotice/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: " -"" +"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <_:" +"orderedlist-1/>" 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: " - -#: C/seahorse.xml:28(firstname) -msgid "Jacob" -msgstr "Jacob" - -#: C/seahorse.xml:29(surname) -msgid "Perkins" -msgstr "Perkins" - -#: C/seahorse.xml:40(firstname) -msgid "Adam" -msgstr "Adam" +"WEITERGEHENDEN VERSTÄNDNIS, DASS: <_:orderedlist-1/>" -#: C/seahorse.xml:41(surname) -msgid "Schreiber" -msgstr "Schreiber" - -#: C/seahorse.xml:45(email) -msgid "sadam@clemson.edu" -msgstr "sadam@clemson.edu" +#: C/index.docbook:27(authorgroup/author) +msgid "" +"Jacob Perkins " +"Seahorse Project " +msgstr "" +"Jacob Perkins " +"Seahorse-Projekt " -#: C/seahorse.xml:50(firstname) -msgid "Paul" -msgstr "Paul" +#: C/index.docbook:39(authorgroup/author) +msgid "" +"Adam Schreiber " +"Seahorse Project
sadam@clemson.edu
" +msgstr "" +"Adam Schreiber " +"Seahorse-Projekt
sadam@clemson.edu
" -#: C/seahorse.xml:51(surname) -msgid "Cutler" -msgstr "Cutler" +#: C/index.docbook:49(authorgroup/author) +msgid "" +"Paul Cutler " +"GNOME Documentation Project
" +"pcutler@foresightlinux.org
" +msgstr "" +"Paul Cutler " +"GNOME-Dokumentationsprojekt
" +"pcutler@foresightlinux.org
" -#: C/seahorse.xml:53(orgname) C/seahorse.xml:66(publishername) +#: C/index.docbook:66(publisher/publishername) msgid "GNOME Documentation Project" msgstr "GNOME-Dokumentationsprojekt" -#: C/seahorse.xml:55(email) -msgid "pcutler@foresightlinux.org" -msgstr "pcutler@foresightlinux.org" - -#: C/seahorse.xml:70(revnumber) -msgid "Passwords and Keys Manual V2.11.0" -msgstr "»Passwörter und Verschlüsselung«-Handbuch V2.11.0" - -#: C/seahorse.xml:71(date) -msgid "May 2009" -msgstr "Mai 2009" - -#: C/seahorse.xml:73(para) +#: C/index.docbook:73(revdescription/para) msgid "Paul Cutler pcutler@foresightlinux.org" msgstr "Paul Cutler pcutler@foresightlinux.org" -#: C/seahorse.xml:80(revnumber) -msgid "Passwords and Keys Manual V0.10.1" -msgstr "»Passwörter und Verschlüsselung«-Handbuch V0.10.1" - -#: C/seahorse.xml:81(date) -msgid "August 2008" -msgstr "August 2008" +#: C/index.docbook:69(revhistory/revision) +msgid "" +"Passwords and Keys Manual V2.11.0 May 2009 <_:revdescription-1/>" +msgstr "" +"Passwörter-und-Verschlüsselung-Handbuch V2.11.0 " +"Mai 2009 <_:revdescription-1/>" -#: C/seahorse.xml:83(para) C/seahorse.xml:103(para) +#: C/index.docbook:83(revdescription/para) +#: C/index.docbook:103(revdescription/para) msgid "Adam Schreiber sadam@clemson.edu" msgstr "Adam Schreiber sadam@clemson.edu" -#: C/seahorse.xml:90(revnumber) -msgid "Passwords and Keys Manual V0.9.1" -msgstr "»Passwörter und Verschlüsselung«-Handbuch V0.9.1" - -#: C/seahorse.xml:91(date) -msgid "November 2006" -msgstr "November 2006" +#: C/index.docbook:79(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.10.1 August 2008 <_:revdescription-1/>" +msgstr "" +"Passwörter-und-Verschlüsselung-Handbuch V0.10.1 " +"August 2008 <_:revdescription-1/>" -#: C/seahorse.xml:93(para) +#: C/index.docbook:93(revdescription/para) msgid "Milo Casagrande milo_casagrande@yahoo.it" msgstr "Milo Casagrande milo_casagrande@yahoo.it" -#: C/seahorse.xml:100(revnumber) -msgid "Passwords and Keys Manual V0.9.0" -msgstr "»Passwörter und Verschlüsselung«-Handbuch V0.9.0" - -#: C/seahorse.xml:101(date) -msgid "July 2005" -msgstr "Juli 2005" - -#: C/seahorse.xml:110(revnumber) -msgid "Passwords and Keys Manual V0.7.0" -msgstr "»Passwörter und Verschlüsselung«-Handbuch V0.7.0" - -#: C/seahorse.xml:111(date) -msgid "February 2003" -msgstr "Februar 2003" +#: C/index.docbook:89(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.1 November 2006 <_:revdescription-1/>" +msgstr "" +"Passwörter-und-Verschlüsselung-Handbuch V0.9.1 " +"November 2006 <_:revdescription-1/>" -#: C/seahorse.xml:113(para) +#: C/index.docbook:99(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.0 July 2005 <_:revdescription-1/>" +msgstr "" +"Passwörter-und-Verschlüsselung-Handbuch V0.9.0 " +"Juli 2005 <_:revdescription-1/>" + +#: C/index.docbook:113(revdescription/para) msgid "Jacob Perkins" msgstr "Jacob Perkins" -#: C/seahorse.xml:122(releaseinfo) +#: C/index.docbook:109(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.7.0 February 2003 <_:revdescription-1/>" +msgstr "" +"Passwörter-und-Verschlüsselung-Handbuch V0.7.0 " +"Februar 2003 <_:revdescription-1/>" + +#: C/index.docbook:122(articleinfo/releaseinfo) msgid "This manual describes version 2.28.x of Passwords and Keys" msgstr "" "Dieses Handbuch beschreibt Version 2.28.x von »Passwörter und Verschlüsselung«" -#: C/seahorse.xml:124(title) +#: C/index.docbook:124(legalnotice/title) msgid "Feedback" msgstr "Rückmeldungen" -#: C/seahorse.xml:125(para) +#: C/index.docbook:125(legalnotice/para) msgid "" "To report a bug or make a suggestion regarding the Passwords and " "Keys application or this manual, follow the directions in the " -"Gnome Feedback Page." +"Gnome Feedback Page." msgstr "" "Um einen Fehler zu melden oder einen Vorschlag zur Anwendung " "Passwörter und Verschlüsselung oder zu diesem " -"Handbuch zu machen, folgen Sie den Anweisungen auf der GNOME-Seite für Rückmeldungen." -#: C/seahorse.xml:132(para) +#: C/index.docbook:132(abstract/para) msgid "" "Passwords and Keys is the application for managing " "encryption keys for the GNOME Desktop" @@ -268,23 +281,23 @@ "Passwörter und Verschlüsselung ist die Anwendung " "zum Verwalten von Verschlüsselungen für den GNOME-Desktop" -#: C/seahorse.xml:140(primary) -msgid "Seahorse" -msgstr "Seahorse" - -#: C/seahorse.xml:144(primary) -msgid "seahorse" -msgstr "seahorse" - -#: C/seahorse.xml:148(primary) -msgid "Encryption Keys" -msgstr "Verschlüsselungen" +#: C/index.docbook:139(article/indexterm) +msgid "Seahorse" +msgstr "Seahorse" + +#: C/index.docbook:143(article/indexterm) +msgid "seahorse" +msgstr "seahorse" + +#: C/index.docbook:147(article/indexterm) +msgid "Encryption Keys" +msgstr "Verschlüsselungen" -#: C/seahorse.xml:154(title) +#: C/index.docbook:154(sect1/title) msgid "Introduction" msgstr "Einführung" -#: C/seahorse.xml:155(para) +#: C/index.docbook:155(sect1/para) msgid "" "You can use Passwords and Keys to create and " "manage PGP and SSH keys." @@ -293,7 +306,7 @@ "Erzeugen und Verwalten von PGP- und SSH-" "Schlüsseln verwenden." -#: C/seahorse.xml:158(para) +#: C/index.docbook:158(sect1/para) msgid "" "Passwords and Keys provides a front end to many of " "the features of Gnu Privacy " @@ -306,34 +319,35 @@ "Programm kann in mehrere Komponenten des GNOME-Desktops integriert werden." -#: C/seahorse.xml:168(para) +#: C/index.docbook:168(listitem/para) msgid "Create and manage PGP and SSH keys," msgstr "PGP- und SSH-Schlüssel erzeugen und verwalten," -#: C/seahorse.xml:171(para) +#: C/index.docbook:171(listitem/para) msgid "Export and import PGP and SSH keys," msgstr "PGP- und SSH-Schlüssel exportieren und importieren," -#: C/seahorse.xml:174(para) +#: C/index.docbook:174(listitem/para) msgid "Share your keys with others," msgstr "Ihre Schlüssel für Andere freigeben," -#: C/seahorse.xml:163(para) +#: C/index.docbook:163(sect1/para) msgid "" -"With Passwords and Keys you can: " +"With Passwords and Keys you can: <_:itemizedlist-1/" +">" msgstr "" -"Mit Passwörter und Verschlüsselung können Sie: " -"" +"Mit Passwörter und Verschlüsselung können Sie: <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:183(title) +#: C/index.docbook:183(sect1/title) msgid "Getting Started" msgstr "Erste Schritte" -#: C/seahorse.xml:185(title) +#: C/index.docbook:185(sect2/title) msgid "Starting Passwords and Keys" msgstr "Starten von Passwörter und Verschlüsselung" -#: C/seahorse.xml:186(para) +#: C/index.docbook:186(sect2/para) msgid "" "You can start Passwords and Keys in the following " "ways:" @@ -341,34 +355,34 @@ "Sie können Passwörter und Verschlüsselung auf " "folgende Arten starten:" -#: C/seahorse.xml:192(term) +#: C/index.docbook:192(varlistentry/term) msgid "Applications menu" msgstr "Menü Anwendungen" -#: C/seahorse.xml:194(para) +#: C/index.docbook:194(listitem/para) msgid "" -"Choose AccessoriesPassword and " -"Keys." +"Choose Accessories Password and " +"Keys ." msgstr "" "Wählen Sie WerkzeugePasswörter " "und Verschlüsselung." -#: C/seahorse.xml:202(term) +#: C/index.docbook:202(varlistentry/term) msgid "Command Line" msgstr "Befehlszeile" -#: C/seahorse.xml:204(para) +#: C/index.docbook:204(listitem/para) msgid "Type seahorse then press Return." msgstr "" "Geben Sie den Befehl seahorse ein und drücken Sie dann " "Enter." -#: C/seahorse.xml:213(title) +#: C/index.docbook:213(sect2/title) msgid "When You Start Passwords and Keys" msgstr "" "Beim Start von Passwörter und Verschlüsselung" -#: C/seahorse.xml:214(para) +#: C/index.docbook:214(sect2/para) msgid "" "When you start Passwords and Keys, the " "Password and Keys window is displayed." @@ -377,19 +391,22 @@ "wird das Passwörter und Verschlüsselung-Fenster " "angezeigt." -#: C/seahorse.xml:220(title) +#: C/index.docbook:220(figure/title) msgid "The Passwords and Keys Window" msgstr "Das Passwörter und Verschlüsselung-Fenster" -#: C/seahorse.xml:228(application) -msgid "Passwords and Keys" -msgstr "Passwörter und Verschlüsselung" - -#: C/seahorse.xml:227(phrase) -msgid "Show the window." -msgstr "Zeigt das -Fenster." +#: C/index.docbook:222(screenshot/mediaobject) +msgid "" +" Show the Passwords and " +"Keys window. " +msgstr "" +" Zeigt das Fenster von " +"Passwörter und Verschlüsselung. " -#: C/seahorse.xml:235(para) +#: C/index.docbook:235(sect2/para) msgid "" "The Passwords and Keys window contains the " "following elements:" @@ -397,11 +414,11 @@ "Das Passwörter und Verschlüsselung-Fenster enthält " "die folgenden Elemente:" -#: C/seahorse.xml:240(term) +#: C/index.docbook:240(varlistentry/term) msgid "Menubar" msgstr "Menüleiste" -#: C/seahorse.xml:242(para) +#: C/index.docbook:242(listitem/para) msgid "" "The menus on the menubar contain all of the commands that you need to perform " "tasks in Passwords and Keys." @@ -410,30 +427,30 @@ "Ausführung von Aktionen in Passwörter und Verschlüsselung benötigen." -#: C/seahorse.xml:245(term) +#: C/index.docbook:245(varlistentry/term) msgid "Toolbar" msgstr "Werkzeugleiste" -#: C/seahorse.xml:247(para) +#: C/index.docbook:247(listitem/para) msgid "Use the toolbar to quickly access commonly-used commands." msgstr "" "Verwenden Sie die Werkzeugleiste zum schnellen Zugriff auf häufig benutzte " "Befehle." -#: C/seahorse.xml:250(term) +#: C/index.docbook:250(varlistentry/term) msgid "Keys and Passwords Tabs" msgstr "Reiter »Schlüssel« und »Passwörter«" -#: C/seahorse.xml:252(para) +#: C/index.docbook:252(listitem/para) msgid "Provides access to the keys and passwords in the keyring." msgstr "" "Ermöglichen den Zugriff auf die Schlüssel und die Passwörter im Schlüsselbund." -#: C/seahorse.xml:255(term) +#: C/index.docbook:255(varlistentry/term) msgid "First time options" msgstr "Erstmalige Optionen" -#: C/seahorse.xml:257(para) +#: C/index.docbook:257(listitem/para) msgid "" "Provides fast access to useful actions for first time users. From here you " "can:" @@ -441,23 +458,23 @@ "Bietet schnellen Zugriff auf nützliche Aktionen für Erstanwender. Von hier " "aus können Sie:" -#: C/seahorse.xml:260(para) +#: C/index.docbook:260(listitem/para) msgid "Browse the help system," msgstr "das Hilfesystem durchsuchen," -#: C/seahorse.xml:263(para) +#: C/index.docbook:263(listitem/para) msgid "Import keys in the keyring," msgstr "Schlüssel in den Schlüsselbund importieren," -#: C/seahorse.xml:266(para) +#: C/index.docbook:266(listitem/para) msgid "Create new keys." msgstr "neue Schlüssel erzeugen." -#: C/seahorse.xml:278(title) +#: C/index.docbook:278(sect1/title) msgid "Creating OpenPGP Keys" msgstr "Erzeugen von OpenPGP-Schlüsseln" -#: C/seahorse.xml:279(para) +#: C/index.docbook:279(sect1/para) msgid "" "OpenPGP is a non proprietary protocol for encrypting e-mail with the use of " "public key cryptography based on PGP. It defines standard " @@ -470,7 +487,7 @@ "Nachrichten, Unterschriften und geheime Schlüssel definiert. Es ist für den " "Austausch öffentlicher Schlüssel zertifiziert." -#: C/seahorse.xml:284(para) +#: C/index.docbook:284(sect1/para) msgid "" "Public key cryptography is a concept which involves the use of two keys: a " "public key, that you can give to anyone with whom you " @@ -483,7 +500,7 @@ "sowie einen geheimen Schlüssel, der rein privat ist und " "geheimgehalten werden muss." -#: C/seahorse.xml:294(para) C/seahorse.xml:427(para) +#: C/index.docbook:294(listitem/para) C/index.docbook:427(listitem/para) msgid "" "Choose FileNew..." @@ -491,14 +508,14 @@ "Wählen Sie DateiNeu." -#: C/seahorse.xml:299(para) +#: C/index.docbook:299(listitem/para) msgid "" "Select PGP Key and click Continue" msgstr "" "Wählen Sie PGP-Schlüssel und klicken Sie auf " "Weiter" -#: C/seahorse.xml:304(para) +#: C/index.docbook:304(listitem/para) msgid "" "Enter your full name (first - last), your e-mail address and any additional " "information. You can also specify advanced options for the key: see below." @@ -507,13 +524,13 @@ "eventuell zusätzliche Informationen ein. Sie können auch erweiterte Optionen " "für den Schlüssel eingeben. Siehe unten." -#: C/seahorse.xml:310(para) +#: C/index.docbook:310(listitem/para) msgid "Click Create to create the new key pair." msgstr "" "Klicken Sie auf Erzeugen, um ein neues Schlüsselpaar " "zu erzeugen." -#: C/seahorse.xml:315(para) +#: C/index.docbook:315(listitem/para) msgid "" "The Passphrase for New PGP Key dialog will open. Enter " "the passphrase twice for your new key." @@ -521,11 +538,11 @@ "Das Dialogfenster Kennwort des neuen PGP-Schlüssels wird " "geöffnet. Geben Sie das Kennwort für Ihren neuen Schlüssel zweimal ein." -#: C/seahorse.xml:290(para) -msgid "To create OpenPGP keys: " -msgstr "So erzeugen Sie OpenPGP-Schlüssel: " +#: C/index.docbook:290(sect1/para) +msgid "To create OpenPGP keys: <_:orderedlist-1/>" +msgstr "So erzeugen Sie OpenPGP-Schlüssel: <_:orderedlist-1/>" -#: C/seahorse.xml:323(para) C/seahorse.xml:446(para) +#: C/index.docbook:323(tip/para) C/index.docbook:446(tip/para) msgid "" "Use similar practices to generating a strong password when choosing a " "passphrase. The main difference between a password and a passphrase is that, " @@ -536,11 +553,11 @@ "einem Kennwort besteht darin, dass in einem Kennwort auch Leerzeichen gültige " "Zeichen sind." -#: C/seahorse.xml:331(title) C/seahorse.xml:460(title) +#: C/index.docbook:331(sect2/title) C/index.docbook:460(sect2/title) msgid "Advanced options" msgstr "Erweiterte Einstellungen" -#: C/seahorse.xml:332(para) +#: C/index.docbook:332(sect2/para) msgid "" "Expand the Advanced key options section to specify the " "following options for a new key:" @@ -548,22 +565,23 @@ "Öffnen Sie den Bereich Erweiterte Optionen, um " "folgende Optionen für den neuen Schlüssel zu wählen:" -#: C/seahorse.xml:338(guilabel) C/seahorse.xml:467(guilabel) -msgid "Encryption Type" -msgstr "Verschlüsselungs-Typ" +#: C/index.docbook:338(varlistentry/term) +#: C/index.docbook:467(varlistentry/term) +msgid "Encryption Type" +msgstr "Verschlüsselungstyp" -#: C/seahorse.xml:340(para) +#: C/index.docbook:340(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your keys." msgstr "" "Dieses Feld bezeichnet die Verschlüsselungsalgorithmen, die beim Erzeugen " "Ihrer Schlüssel benutzt werden." -#: C/seahorse.xml:346(term) +#: C/index.docbook:346(varlistentry/term) msgid "DSA ElGamal" msgstr "DSA ElGamal" -#: C/seahorse.xml:348(para) +#: C/index.docbook:348(listitem/para) msgid "" "This is the suggested choice as it will allow you to encrypt, decrypt, sign " "and verify as needed." @@ -571,25 +589,27 @@ "Dies ist die bevorzugte Wahl, weil damit Verschlüsseln, Entschlüsseln, " "Signieren und Überprüfen möglich sind." -#: C/seahorse.xml:355(acronym) C/seahorse.xml:485(acronym) -#: C/seahorse.xml:916(acronym) -msgid "DSA" -msgstr "DSA" +#: C/index.docbook:355(varlistentry/term) +#: C/index.docbook:485(varlistentry/term) +#: C/index.docbook:916(varlistentry/term) +msgid "DSA" +msgstr "DSA" -#: C/seahorse.xml:357(para) C/seahorse.xml:365(para) +#: C/index.docbook:357(listitem/para) C/index.docbook:365(listitem/para) msgid "Will allow signing only." msgstr "Erlaubt nur das Signieren." -#: C/seahorse.xml:363(acronym) C/seahorse.xml:475(acronym) -#: C/seahorse.xml:935(term) -msgid "RSA" -msgstr "RSA" - -#: C/seahorse.xml:374(guilabel) C/seahorse.xml:497(guilabel) -msgid "Key Strength (bits)" -msgstr "Schlüssellänge (Bit)" +#: C/index.docbook:363(varlistentry/term) +#: C/index.docbook:475(varlistentry/term) +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:374(varlistentry/term) +#: C/index.docbook:497(varlistentry/term) +msgid "Key Strength (bits)" +msgstr "Schlüssellänge (Bit)" -#: C/seahorse.xml:376(para) C/seahorse.xml:499(para) +#: C/index.docbook:376(listitem/para) C/index.docbook:499(listitem/para) msgid "" "This is the length of the key in bits. The longer the key, the more secure it " "will be, provided a strong passphrase is used. Conversely, performing any " @@ -604,12 +624,11 @@ "Schlüssellängen zwischen 1024 und 4096 Bit werden akzeptiert, jedoch sind " "mindestens 2048 Bit zu empfehlen." -#: C/seahorse.xml:386(guilabel) C/seahorse.xml:648(title) -#: C/seahorse.xml:957(term) -msgid "Expiration Date" -msgstr "Ablaufdatum" +#: C/index.docbook:386(varlistentry/term) +msgid "Expiration Date" +msgstr "Ablaufdatum" -#: C/seahorse.xml:395(para) +#: C/index.docbook:395(note/para) msgid "" "Sign your new key with your old one before it expires to preserve your trust " "status." @@ -617,24 +636,24 @@ "Signieren Sie Ihren neuen Schlüssel mit Ihrem alten Schlüssel, bevor er " "verfällt, um den Status Ihrer Vertrauenswürdigkeit zu bewahren." -#: C/seahorse.xml:388(para) +#: C/index.docbook:388(listitem/para) msgid "" "This is the date at which the key will cease to be usable for performing " "encryption or signing operations. 6 months is a reasonable time to set it to. " "You will have to either change the expiration date or generate a new key or " -"subkey after this amount of time passes. " +"subkey after this amount of time passes. <_:note-1/>" msgstr "" "Dies bezeichnet das Datum, bis zu welchem der Schlüssel für Verschlüsselungen " "oder Signaturen genutzt werden kann. Sechs Monate sind hierfür ein " "vernünftiger Wert. Nach dem Ende dieser Zeitspanne können Sie entweder das " "Ablaufdatum ändern oder einen neuen Schlüssel oder Unterschlüssel erzeugen. " -"" +"<_:note-1/>" -#: C/seahorse.xml:410(title) +#: C/index.docbook:410(sect1/title) msgid "Creating Secure Shell Keys" msgstr "Erzeugen von Secure-Shell-Schlüsseln" -#: C/seahorse.xml:411(para) +#: C/index.docbook:411(sect1/para) msgid "" "Secure Shell (SSH) is a way of logging into a remote " "computer to execute commands on that machine. SSH keys are used in key-based " @@ -649,7 +668,7 @@ "Durch die schlüsselbasierte Authentifizierung ist es nicht notwendig, ein " "Passwort per Hand einzugeben." -#: C/seahorse.xml:418(para) +#: C/index.docbook:418(sect1/para) msgid "" "Secure Shell keys are made of two keys: a private key, " "that must be kept secret, and a public key which can be " @@ -660,11 +679,11 @@ "öffentlichen Schlüssel, der zu jedem Computer übertragen " "werden kann, auf den Sie zugreifen wollen." -#: C/seahorse.xml:422(para) +#: C/index.docbook:422(sect1/para) msgid "To create a Secure Shell key:" msgstr "So erzeugen Sie einen SSH-Schlüssel." -#: C/seahorse.xml:430(para) +#: C/index.docbook:430(listitem/para) msgid "" "Select Secure Shell Key and click Continue" @@ -672,7 +691,7 @@ "Wählen Sie SSH-Schlüssel und klicken Sie dann auf " "Weiter." -#: C/seahorse.xml:433(para) +#: C/index.docbook:433(listitem/para) msgid "" "Enter a description of what the key is to be used for. You can use your e-" "mail address or any other reminder. You can also specify advanced options for " @@ -682,7 +701,7 @@ "Adresse oder etwas Ähnliches als Gedankenstütze verwenden. Außerdem können " "Sie erweiterte Optionen für den Schlüssel eingeben. Siehe unten." -#: C/seahorse.xml:436(para) +#: C/index.docbook:436(listitem/para) msgid "" "Click Just Create Key to create the new key, or " "Create and Set Up to create the key and set up another " @@ -693,7 +712,7 @@ "guibutton>, um den Schlüssel zu erzeugen und ihn für die Authentifizierung " "auf einem anderen Computer einzurichten." -#: C/seahorse.xml:441(para) +#: C/index.docbook:441(listitem/para) msgid "" "The Passphrase for New Secure Shell Key dialog opens. " "Enter the passphrase twice for your new key." @@ -701,7 +720,7 @@ "Das Dialogfenster Kennwort des neuen SSH-Schlüssels wird " "geöffnet. Geben Sie das Kennwort für Ihren neuen Schlüssel zweimal ein." -#: C/seahorse.xml:461(para) +#: C/index.docbook:461(sect2/para) msgid "" "Expand the Advanced key options section to specify the " "following options for a new key:" @@ -709,14 +728,14 @@ "Klappen Sie den Abschnitt Erweiterte Optionen aus, um " "folgende Optionen für einen neuen Schlüssel zu wählen." -#: C/seahorse.xml:469(para) +#: C/index.docbook:469(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your key." msgstr "" "In diesem Feld legen Sie den Verschlüsselungsalgorithmus zur Erzeugung Ihres " "Schlüssels fest." -#: C/seahorse.xml:477(para) +#: C/index.docbook:477(listitem/para) msgid "" "Use the Rivest-ShamirAdleman (RSA) " "algorithm to create the SSH key. This is the preferred and more secure choice." @@ -725,7 +744,7 @@ "(RSA) zur Erzeugung des SSH-Schlüssels. Dies sollten Sie " "aus Sicherheitsgründen bevorzugen." -#: C/seahorse.xml:487(para) +#: C/index.docbook:487(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the SSH key." @@ -733,46 +752,48 @@ "Verwendet den Digital Signature Algorithm-Algorithmus " "(DSA) zur Erzeugung des SSH-Schlüssels." -#: C/seahorse.xml:518(title) +#: C/index.docbook:518(sect1/title) msgid "OpenPGP Key Properties" msgstr "Eigenschaften von OpenPGP-Schlüsseln" -#: C/seahorse.xml:519(para) +#: C/index.docbook:519(sect1/para) msgid "The descriptions in this section apply to all OpenPGP keys." msgstr "" "Die Beschreibungen in diesem Abschnitt werden allen OpenPGP-Schlüsseln " "zugeordnet." -#: C/seahorse.xml:527(para) +#: C/index.docbook:527(listitem/para) msgid "Select the PGP key from the main window," msgstr "Wählen Sie den PGP-Schlüssel im Hauptfenster." -#: C/seahorse.xml:533(para) C/seahorse.xml:781(para) C/seahorse.xml:1093(para) +#: C/index.docbook:533(listitem/para) C/index.docbook:781(listitem/para) +#: C/index.docbook:1093(listitem/para) msgid "" "Double click on it or choose Properties from the toolbar," msgstr "" "Doppelklicken Sie darauf oder wählen Sie Eigenschaften " "in der Werkzeugleiste." -#: C/seahorse.xml:539(para) C/seahorse.xml:1099(para) +#: C/index.docbook:539(listitem/para) C/index.docbook:1099(listitem/para) msgid "Select the Details tab." msgstr "Wählen Sie den Reiter Details." -#: C/seahorse.xml:523(para) -msgid "To view properties of a PGP key: " +#: C/index.docbook:523(sect1/para) +msgid "To view properties of a PGP key: <_:itemizedlist-1/>" msgstr "" "So zeigen Sie die Eigenschaften eines PGP-Schlüssels an: " -"" +"<_:itemizedlist-1/>" -#: C/seahorse.xml:547(title) C/seahorse.xml:1107(title) +#: C/index.docbook:547(sect2/title) C/index.docbook:1107(sect2/title) msgid "Properties" msgstr "Eigenschaften" -#: C/seahorse.xml:551(guilabel) C/seahorse.xml:1111(guilabel) -msgid "Fingerprint" -msgstr "Fingerabdruck" +#: C/index.docbook:551(varlistentry/term) +#: C/index.docbook:1111(varlistentry/term) +msgid "Fingerprint" +msgstr "Fingerabdruck" -#: C/seahorse.xml:553(para) C/seahorse.xml:1113(para) +#: C/index.docbook:553(listitem/para) C/index.docbook:1113(listitem/para) msgid "" "The fingerprint is a unique string of characters that exactly identifies a " "key." @@ -780,11 +801,11 @@ "Der Fingerabdruck ist eine einzigartige Zeichenkette, die einen Schlüssel " "exakt identifiziert." -#: C/seahorse.xml:557(guilabel) -msgid "KeyID" -msgstr "Schlüsselkennung" +#: C/index.docbook:557(varlistentry/term) +msgid "KeyID" +msgstr "Schlüsselkennung" -#: C/seahorse.xml:559(para) +#: C/index.docbook:559(listitem/para) msgid "" "The KeyID is similar to the Fingerprint. However the KeyID only contains the " "last 8 characters of the fingerprint. Most of the time it is possible to " @@ -796,11 +817,12 @@ "möglich, einen Schlüssel nur über diese Schlüsselkennung zu identifizieren, " "doch gelegentlich haben auch zwei Schlüssel die gleiche Kennung." -#: C/seahorse.xml:567(guilabel) C/seahorse.xml:847(guilabel) -msgid "Type" -msgstr "Typ" +#: C/index.docbook:567(varlistentry/term) +#: C/index.docbook:847(varlistentry/term) +msgid "Type" +msgstr "Typ" -#: C/seahorse.xml:569(para) +#: C/index.docbook:569(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a key. DSA keys can only " "sign. ElGamal keys are used to encrypt." @@ -809,47 +831,51 @@ "Schlüssel können lediglich signieren, ElGamal-Schlüssel werden zur " "Verschlüsselung verwendet." -#: C/seahorse.xml:576(guilabel) C/seahorse.xml:858(guilabel) -msgid "Created" -msgstr "Erzeugt" +#: C/index.docbook:576(varlistentry/term) +#: C/index.docbook:858(varlistentry/term) +msgid "Created" +msgstr "Erstellt" -#: C/seahorse.xml:578(para) C/seahorse.xml:860(para) +#: C/index.docbook:578(listitem/para) C/index.docbook:860(listitem/para) msgid "Indicates the date the key was created." msgstr "Bezeichnet das Erzeugungsdatum des Schlüssels." -#: C/seahorse.xml:584(guilabel) C/seahorse.xml:866(guilabel) -msgid "Expires" -msgstr "Läuft ab" +#: C/index.docbook:584(varlistentry/term) +#: C/index.docbook:866(varlistentry/term) +msgid "Expires" +msgstr "Läuft ab" -#: C/seahorse.xml:586(para) C/seahorse.xml:868(para) +#: C/index.docbook:586(listitem/para) C/index.docbook:868(listitem/para) msgid "Indicates the date the key can no longer be used." msgstr "" "Gibt das Datum an, ab dem der Schlüssel nicht mehr verwendet werden kann." -#: C/seahorse.xml:592(guilabel) C/seahorse.xml:882(guilabel) -#: C/seahorse.xml:1139(guilabel) -msgid "Strength" -msgstr "Länge" +#: C/index.docbook:592(varlistentry/term) +#: C/index.docbook:882(varlistentry/term) +#: C/index.docbook:1139(varlistentry/term) +msgid "Strength" +msgstr "Länge" -#: C/seahorse.xml:598(para) C/seahorse.xml:888(para) C/seahorse.xml:1146(para) +#: C/index.docbook:598(note/para) C/index.docbook:888(note/para) +#: C/index.docbook:1146(note/para) msgid "A long key is not enough to make up for the use of a weak passphrase." msgstr "" "Ein langer Schlüssel allein reicht nicht aus, wenn das Kennwort zu schwach " "ist." -#: C/seahorse.xml:594(para) C/seahorse.xml:1141(para) +#: C/index.docbook:594(listitem/para) C/index.docbook:1141(listitem/para) msgid "" "Indicates the length in bits of a key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Bezeichnet die Schlüssellänge in bit. Vereinfacht ausgedrückt, je länger der " -"Schlüssel ist, umso mehr Sicherheit bietet er. " +"Schlüssel ist, umso mehr Sicherheit bietet er. <_:note-1/>" -#: C/seahorse.xml:610(title) +#: C/index.docbook:610(sect2/title) msgid "Trust" msgstr "Vertrauen" -#: C/seahorse.xml:611(para) +#: C/index.docbook:611(sect2/para) msgid "" "Trust is an indication of how sure you are of a person's ability to correctly " "extend the web of trust. When you are faced with a key you have not signed, " @@ -866,7 +892,7 @@ "erfordert ein unbekannter Schlüssel mindestens drei Signaturen geringfügiger " "Vertrauenswürdigkeit oder eine Signatur, der Sie absolut vertrauen." -#: C/seahorse.xml:619(para) +#: C/index.docbook:619(listitem/para) msgid "" "Unknown: You are not familiar with the person's ability " "to sign keys correctly." @@ -874,12 +900,12 @@ "Unbekannt: Sie können die Fähigkeiten der Person zum " "korrekten Signieren von Schlüsseln nicht einschätzen." -#: C/seahorse.xml:622(para) +#: C/index.docbook:622(listitem/para) msgid "Never: This person cannot correctly sign keys." msgstr "" "Nie: Diese Person kann Schlüssel nicht korrekt signieren." -#: C/seahorse.xml:625(para) +#: C/index.docbook:625(listitem/para) msgid "" "Marginal: This person checks for photo ID before signing " "a key, but does not necessarily scrutinize the IDs." @@ -888,7 +914,7 @@ "Kennung vor dem Signieren eines Schlüssels, aber überprüft nicht " "notwendigerweise die Kennung genauer." -#: C/seahorse.xml:629(para) +#: C/index.docbook:629(listitem/para) msgid "" "Full: This person scrutinizes each and every person's " "photo IDs before signing them (e.g. they only sign keys that truely belong to " @@ -899,7 +925,7 @@ "nur Schlüssel bestätigt werden, die mit Sicherheit der Person gehören, die um " "Bestätigung bittet." -#: C/seahorse.xml:633(para) +#: C/index.docbook:633(listitem/para) msgid "" "Ultimate: This level of trust should only be assigned to " "your own keys." @@ -907,11 +933,11 @@ "Absolut: Diese Stufe der Vertrauenswürdigkeit sollte " "ausschließlich Ihren eigenen Schlüsseln zugeordnet werden.." -#: C/seahorse.xml:640(title) +#: C/index.docbook:640(sect2/title) msgid "Enabling and Disabling Keys" msgstr "Aktivieren und Deaktivieren von Schlüsseln" -#: C/seahorse.xml:641(para) +#: C/index.docbook:641(sect2/para) msgid "" "When a key is enabled, it can be used to perform encryption operations. When " "a key is disabled, it cannot be used to encrypt to or verify signatures made " @@ -922,7 +948,11 @@ "er nicht zum Verschlüsseln oder zur Überprüfung von Signaturen verwendet " "werden." -#: C/seahorse.xml:649(para) +#: C/index.docbook:648(sect2/title) C/index.docbook:957(varlistentry/term) +msgid "Expiration Date" +msgstr "Ablaufdatum" + +#: C/index.docbook:649(sect2/para) msgid "" "A key can no longer be used to perform key operations after it has expired. " "Changing a key's expiration date to a point in the future re-enables it. A " @@ -935,11 +965,11 @@ "es empfehlenswert, einen Hauptschlüssel zu haben, der niemals verfällt, sowie " "mehrere Unterschlüssel, die mit dem Hauptschlüssel signiert wurden. " -#: C/seahorse.xml:658(title) +#: C/index.docbook:658(sect2/title) msgid "User IDs" msgstr "Benutzerkennungen" -#: C/seahorse.xml:659(para) +#: C/index.docbook:659(sect2/para) msgid "" "User IDs allow multiple identities and email addresses to be used with the " "same key." @@ -947,20 +977,20 @@ "Benutzerkennungen erlauben die Verwendung mehrerer Identitäten und E-Mail-" "Adressen mit dem gleichen Schlüssel." -#: C/seahorse.xml:665(programlisting) +#: C/index.docbook:665(para/programlisting) #, no-wrap msgid "Name (comment) <email address>" msgstr "Name (Kommentar) <E-Mail-Adresse>" -#: C/seahorse.xml:663(para) -msgid "They usually take the form of: " -msgstr "Üblicherweise wird folgende Form verwendet: " +#: C/index.docbook:663(sect2/para) +msgid "They usually take the form of: <_:programlisting-1/>" +msgstr "Üblicherweise wird folgende Form verwendet: <_:programlisting-1/>" -#: C/seahorse.xml:669(title) +#: C/index.docbook:669(sect3/title) msgid "Adding a User ID" msgstr "Hinzufügen einer Benutzerkennung" -#: C/seahorse.xml:670(para) +#: C/index.docbook:670(sect3/para) msgid "" "Adding a user ID is useful when you want to have an identity for your job and " "one for your friends." @@ -968,11 +998,12 @@ "Hinzufügen einer Benutzerkennung ist nützlich, wenn Sie eine Identität für " "Ihre Arbeit und eine weitere für Ihre Freunde nutzen wollen." -#: C/seahorse.xml:678(para) C/seahorse.xml:776(para) C/seahorse.xml:803(para) +#: C/index.docbook:678(listitem/para) C/index.docbook:776(listitem/para) +#: C/index.docbook:803(listitem/para) msgid "Select the key from the main window," msgstr "Wählen Sie einen Schlüssel im Hauptfenster aus," -#: C/seahorse.xml:683(para) +#: C/index.docbook:683(listitem/para) msgid "" "Double click on it or choose Properties from the " "toolbar," @@ -980,20 +1011,21 @@ "doppelklicken Sie darauf oder wählen Sie Eigenschaften " "in der Werkzeugleiste." -#: C/seahorse.xml:688(para) +#: C/index.docbook:688(listitem/para) msgid "Select the Names and Signatures tab," msgstr "Wählen Sie den Reiter Namen und Signaturen aus." -#: C/seahorse.xml:693(para) +#: C/index.docbook:693(listitem/para) msgid "Click on Add Name." msgstr "Klicken Sie auf Name hinzufügen." -#: C/seahorse.xml:674(para) -msgid "To add a user ID to a key: " +#: C/index.docbook:674(sect3/para) +msgid "To add a user ID to a key: <_:itemizedlist-1/>" msgstr "" -"So fügen Sie eine Benutzerkennung zu einem Schlüssel hinzu. " +"So fügen Sie eine Benutzerkennung zu einem Schlüssel hinzu: <_:itemizedlist-1/" +">" -#: C/seahorse.xml:699(para) C/seahorse.xml:903(para) +#: C/index.docbook:699(sect3/para) C/index.docbook:903(sect2/para) msgid "" "After following the instructions above, you will be presented with a dialog " "to fill in. The fields are detailed below." @@ -1001,32 +1033,32 @@ "Wenn Sie die oben stehenden Anweisungen befolgt haben, wird ein Eingabedialog " "angezeigt. Die Eingabefelder werden unten detailliert beschrieben." -#: C/seahorse.xml:705(guilabel) -msgid "Full Name" -msgstr "Vollständiger Name" +#: C/index.docbook:705(varlistentry/term) +msgid "Full Name" +msgstr "Voller Name" -#: C/seahorse.xml:709(programlisting) +#: C/index.docbook:709(para/programlisting) #, no-wrap msgid "<first> <last>" msgstr "<Vorname> <Nachname>" -#: C/seahorse.xml:707(para) +#: C/index.docbook:707(listitem/para) msgid "" -"Enter your full name in the form A middle name or initial is " -"optional." +"Enter your full name in the form <_:programlisting-1/> A middle name or " +"initial is optional." msgstr "" -"Geben Sie Ihren vollen Namen in der Form ein. Wahlweise " +"Geben Sie Ihren vollen Namen in der Form <_:programlisting-1/> ein. Wahlweise " "können Sie einen zweiten Vornamen oder dessen Anfangsbuchstaben eingeben." -#: C/seahorse.xml:714(para) +#: C/index.docbook:714(note/para) msgid "You must enter at least 5 characters in this field." msgstr "In dieses Feld müssen Sie mindestens 5 Zeichen eingeben." -#: C/seahorse.xml:722(guilabel) -msgid "Email Address" -msgstr "E-Mail-Adresse" +#: C/index.docbook:722(varlistentry/term) +msgid "Email Address" +msgstr "Email-Adresse" -#: C/seahorse.xml:724(para) +#: C/index.docbook:724(listitem/para) msgid "" "Your email address is how most people will locate your key on a key server or " "other key provider. Make sure it is correct before continuing." @@ -1035,20 +1067,20 @@ "Ihrer E-Mail-Adresse nach Ihrem Schlüssel gesucht. Stellen Sie zunächst " "sicher, dass diese korrekt eingegeben wurde. " -#: C/seahorse.xml:735(programlisting) +#: C/index.docbook:735(para/programlisting) #, no-wrap msgid "<username>@<domainname>" msgstr "<Benutzername>@<Domainname>" -#: C/seahorse.xml:733(para) -msgid "It should be of the form " -msgstr "Die E-Mail-Adresse sollte dieser Form folgen: " - -#: C/seahorse.xml:742(guilabel) -msgid "Key Comment" -msgstr "Optionaler Kommentar, der den Schlüssel beschreibt" +#: C/index.docbook:733(note/para) +msgid "It should be of the form <_:programlisting-1/>" +msgstr "Die E-Mail-Adresse sollte dieser Form folgen: <_:programlisting-1/>" + +#: C/index.docbook:742(varlistentry/term) +msgid "Key Comment" +msgstr "Schlüsselkommentar" -#: C/seahorse.xml:744(para) +#: C/index.docbook:744(listitem/para) msgid "" "The comment field can be used to place any additional information into the " "displayed name of your new ID. This information can be searched for on key " @@ -1058,11 +1090,11 @@ "anzuzeigende Information verwendet werden. Diese Information steht auch bei " "Suchvorgängen auf Schlüsselservern zur Verfügung." -#: C/seahorse.xml:758(title) +#: C/index.docbook:758(sect2/title) msgid "Photo IDs" msgstr "Foto-Kennungen" -#: C/seahorse.xml:759(para) +#: C/index.docbook:759(sect2/para) msgid "" "Photo IDs allow a key owner to embed one or more pictures of themselves in a " "key. These identities can be signed just like normal user IDs. A photo ID " @@ -1074,7 +1106,7 @@ "muss im JPEG-Format vorliegen und sollte nicht größer als 240 mal 288 Pixel " "sein." -#: C/seahorse.xml:763(para) +#: C/index.docbook:763(sect2/para) msgid "" "If the chosen image is not of the required file type or size " "Passwords and Keys can resize and convert it on " @@ -1085,32 +1117,32 @@ "application> das benötigte Bild direkt aus jedem von der GDK-Bibliothek unterstützten Format erzeugen." -#: C/seahorse.xml:771(title) +#: C/index.docbook:771(sect2/title) msgid "Changing the Passphrase" msgstr "Kennwort ändern" -#: C/seahorse.xml:786(para) +#: C/index.docbook:786(listitem/para) msgid "Click on Change Passphrase." msgstr "klicken Sie auf Kennwort ändern." -#: C/seahorse.xml:772(para) -msgid "To change the passphrase assigned to a key: " -msgstr "So ändern Sie das Kennwort eines Schlüssels. " +#: C/index.docbook:772(sect2/para) +msgid "To change the passphrase assigned to a key: <_:itemizedlist-1/>" +msgstr "So ändern Sie das Kennwort eines Schlüssels: <_:itemizedlist-1/>" -#: C/seahorse.xml:792(para) +#: C/index.docbook:792(sect2/para) msgid "Enter the new passphrase and click OK." msgstr "" "Geben Sie ein neues Kennwort ein und klicken Sie auf OK." -#: C/seahorse.xml:798(title) +#: C/index.docbook:798(sect2/title) msgid "Deleting a Key" msgstr "Entfernen eines Schlüssels" -#: C/seahorse.xml:808(para) +#: C/index.docbook:808(listitem/para) msgid "" "Right click on it and choose Delete Key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" "Klicken Sie mit der rechten Maustaste darauf und wählen Sie " @@ -1118,22 +1150,22 @@ "BearbeitenSchlüssel löschen." -#: C/seahorse.xml:799(para) -msgid "To delete a key from your keyring: " +#: C/index.docbook:799(sect2/para) +msgid "To delete a key from your keyring: <_:itemizedlist-1/>" msgstr "" -"So entfernen Sie einen Schlüssel aus Ihrem Schlüsselbund: " +"So entfernen Sie einen Schlüssel aus Ihrem Schlüsselbund: <_:itemizedlist-1/>" -#: C/seahorse.xml:820(para) +#: C/index.docbook:820(note/para) msgid "You can delete your keys, trusted keys and collected keys." msgstr "" "Sie können Ihre eigenen Schlüssel, vertrauenswürdige Schlüssel und gesammelte " "Schlüssel entfernen." -#: C/seahorse.xml:830(title) +#: C/index.docbook:830(sect1/title) msgid "OpenPGP Subkey Properties" msgstr "Eigenschaften eines OpenPGP-Unterschlüssels" -#: C/seahorse.xml:831(para) +#: C/index.docbook:831(sect1/para) msgid "" "Each OpenPGP key has a single master key used to sign only. Subkeys are used " "to encrypt and to sign as well. In this way, if your sub key is compromised, " @@ -1145,15 +1177,15 @@ "Ihren Hauptschlüssel nicht zu widerrufen, falls Ihr Unterschlüssel gefährdet " "ist." -#: C/seahorse.xml:839(guilabel) -msgid "ID" -msgstr "ID" +#: C/index.docbook:839(varlistentry/term) +msgid "ID" +msgstr "Kennung" -#: C/seahorse.xml:841(para) +#: C/index.docbook:841(listitem/para) msgid "This is the identifier of the subkey." msgstr "Dies ist die Kennung des Unterschlüssels." -#: C/seahorse.xml:849(para) +#: C/index.docbook:849(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a subkey. DSA keys can only sign, ElGamal keys are used to encrypt while " @@ -1164,27 +1196,27 @@ "Schlüssel werden zur Verschlüsselung verwendet und RSA-" "Schlüssel können sowohl signieren als auch verschlüsseln." -#: C/seahorse.xml:874(guilabel) -msgid "Status" -msgstr "Status" +#: C/index.docbook:874(varlistentry/term) +msgid "Status" +msgstr "Status" -#: C/seahorse.xml:876(para) +#: C/index.docbook:876(listitem/para) msgid "Indicates the status of the key." msgstr "Gibt den Status des Schlüssels an." -#: C/seahorse.xml:884(para) +#: C/index.docbook:884(listitem/para) msgid "" "Indicates the length in bits of the key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Gibt die Länge des Schlüssels in Bit an. Allgemein steigt die Sicherheit " -"eines Schlüssels mit dessen Länge. " +"eines Schlüssels mit dessen Länge. <_:note-1/>" -#: C/seahorse.xml:898(title) +#: C/index.docbook:898(sect2/title) msgid "Adding a Subkey" msgstr "Hinzufügen eines Unterschlüssels" -#: C/seahorse.xml:899(para) +#: C/index.docbook:899(sect2/para) msgid "" "To add a subkey to a key, from the Subkeys section click " "on Add button." @@ -1193,17 +1225,17 @@ "Abschnitt Unterschlüssel auf Hinzufügen." -#: C/seahorse.xml:909(term) +#: C/index.docbook:909(varlistentry/term) msgid "Key Type" msgstr "Schlüssel-Typ" -#: C/seahorse.xml:911(para) +#: C/index.docbook:911(listitem/para) msgid "Specifies the encryption algorithm used to generate a subkey." msgstr "" "Bezeichnet den Verschlüsselungs-Algorithmus zum Erzeugen eines " "Unterschlüssels." -#: C/seahorse.xml:918(para) +#: C/index.docbook:918(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the subkey. This subkey can sign only." @@ -1212,11 +1244,11 @@ "acronym>) zur Erzeugung des Unterschlüssels. Dieser Schlüssel kann nur zum " "Signieren verwendet werden." -#: C/seahorse.xml:926(term) +#: C/index.docbook:926(varlistentry/term) msgid "ElGamal" msgstr "ElGamal" -#: C/seahorse.xml:928(para) +#: C/index.docbook:928(listitem/para) msgid "" "Use the ElGamal algorithm to create the subkey. This " "subkey can encrypt only." @@ -1224,7 +1256,11 @@ "Verwendet den ElGamal-Algorithmus zur Erzeugung des " "Unterschlüssels. Dieser Schlüssel kann nur zum Verschlüsseln verwendet werden." -#: C/seahorse.xml:937(para) +#: C/index.docbook:935(varlistentry/term) +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:937(listitem/para) msgid "" "Use the Rivest-Shamir Adleman (RSA) " "algorithm to create the subkey. This subkey can be used to sign or encrypt, " @@ -1235,11 +1271,11 @@ "kann sowohl signieren als auch verschlüsseln, allerdings müssen dafür zwei " "verschiedene Unterschlüssel erzeugt werden." -#: C/seahorse.xml:948(term) +#: C/index.docbook:948(varlistentry/term) msgid "Key Length" msgstr "Schlüssellänge" -#: C/seahorse.xml:950(para) +#: C/index.docbook:950(listitem/para) msgid "" "Indicates the length in bits of the subkey. In general the longer the key, " "the more security it provides." @@ -1247,22 +1283,22 @@ "Bezeichnet die Länge des Schlüssel in Bit. Allgemein lässt sich sagen: Je " "länger der Schlüssel, desto sicherer ist er." -#: C/seahorse.xml:959(para) +#: C/index.docbook:959(listitem/para) msgid "Indicates the date the subkey can no longer be used." msgstr "" "Legt das Datum fest, ab dem der Unterschlüssel nicht mehr benutzt werden kann." -#: C/seahorse.xml:968(title) +#: C/index.docbook:968(sect2/title) msgid "Changing a Subkey Expiration Date" -msgstr "Ändern des Abalufdatums eines Unterschlüssels" +msgstr "Ändern des Ablaufdatums eines Unterschlüssels" -#: C/seahorse.xml:975(para) +#: C/index.docbook:975(listitem/para) msgid "Click on the Expire button on the left," msgstr "" -"Klicken Sie auf die Schaltfläche Expire an der linken " +"Klicken Sie auf den Knopf Ablaufdatum an der linken " "Seite." -#: C/seahorse.xml:980(para) +#: C/index.docbook:980(listitem/para) msgid "" "From the date dialog choose the new expiration date or select Never " "expires for no expiration date." @@ -1270,151 +1306,150 @@ "Im Datum-Dialog wählen Sie das neue Ablaufdatum oder wählen Läuft " "nie ab, um kein Ablaufdatum zu bestimmen." -#: C/seahorse.xml:969(para) +#: C/index.docbook:969(sect2/para) msgid "" "To change a subkey expiration date, select the subkey from the " -"Subkeys section, then: " +"Subkeys section, then: <_:itemizedlist-1/>" msgstr "" "Um das Ablaufdatum eines Unterschlüssels zu ändern, wählen Sie den " -"Unterschlüssel im Abschnitt Unterschlüssel, und dann: " -"" +"Unterschlüssel im Abschnitt Unterschlüssel, und dann: <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:990(title) +#: C/index.docbook:990(sect2/title) msgid "Revoking a Subkey" msgstr "Widerrufen eines Unterschlüssels" -#: C/seahorse.xml:996(para) +#: C/index.docbook:996(listitem/para) msgid "Click on the Revoke button on the left," msgstr "Klicken Sie auf Widerrufen an der linken Seite." -#: C/seahorse.xml:1001(para) +#: C/index.docbook:1001(listitem/para) msgid "Choose a reason why to revoke the subkey:" msgstr "Wählen Sie einen Grund, warum Sie den Unterschlüssel widerrufen. " -#: C/seahorse.xml:1007(term) +#: C/index.docbook:1007(varlistentry/term) msgid "No Reason" msgstr "Kein Grund" -#: C/seahorse.xml:1009(para) +#: C/index.docbook:1009(listitem/para) msgid "There isn't a specific reason to revoke the key." msgstr "Es gibt keinen bestimmten Grund, weswegen Sie den Schlüssel widerrufen." -#: C/seahorse.xml:1015(term) +#: C/index.docbook:1015(varlistentry/term) msgid "Compromised" msgstr "Unsicher" -#: C/seahorse.xml:1017(para) +#: C/index.docbook:1017(listitem/para) msgid "The key has been compromised." msgstr "Schlüssel ist nicht mehr sicher." -#: C/seahorse.xml:1023(term) +#: C/index.docbook:1023(varlistentry/term) msgid "Superseded" msgstr "Ersetzt" -#: C/seahorse.xml:1025(para) +#: C/index.docbook:1025(listitem/para) msgid "The key has been superseded by another one." msgstr "Der Schlüssel wurde durch einen anderen ersetzt." -#: C/seahorse.xml:1031(term) +#: C/index.docbook:1031(varlistentry/term) msgid "Not Used" msgstr "Nicht verwendet" -#: C/seahorse.xml:1033(para) +#: C/index.docbook:1033(listitem/para) msgid "The key is not used anymore." msgstr "Der Schlüssel wird nicht mehr benutzt." -#: C/seahorse.xml:1042(para) +#: C/index.docbook:1042(listitem/para) msgid "Enter a description of why you are revoking the key," msgstr "Geben Sie eine Beschreibung ein, warum Sie den Schlüssel widerrufen," -#: C/seahorse.xml:1047(para) +#: C/index.docbook:1047(listitem/para) msgid "Click on Revoke." msgstr "Klicken Sie auf Widerrufen." -#: C/seahorse.xml:991(para) +#: C/index.docbook:991(sect2/para) msgid "" "To revoke a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" "Um einen Unterschlüssel zu widerrufen, wählen Sie den Unterschlüssel im " -"Abschnitt Unterschlüssel, und dann: " +"Abschnitt Unterschlüssel, und dann: <_:itemizedlist-1/>" -#: C/seahorse.xml:1054(para) +#: C/index.docbook:1054(note/para) msgid "The effect of revoking a subkey is immediate." msgstr "Der Widerruf des Schlüssels wird unmittelbar ausgeführt." -#: C/seahorse.xml:1061(title) +#: C/index.docbook:1061(sect2/title) msgid "Deleting a Subkey" msgstr "Entfernen eines Unterschlüssels" -#: C/seahorse.xml:1067(para) +#: C/index.docbook:1067(listitem/para) msgid "Click on the Delete button on the left." msgstr "" -"Klicken Sie auf die Schaltfläche Löschen an der linken " -"Seite." +"Klicken Sie auf den Knopf Löschen an der linken Seite." -#: C/seahorse.xml:1062(para) +#: C/index.docbook:1062(sect2/para) msgid "" "To delete a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" "Um einen Unterschlüssel zu entfernen, wählen Sie diesen im Abschnitt " -"Unterschlüssel aus, und dann: " +"Unterschlüssel aus, und dann: <_:itemizedlist-1/>" -#: C/seahorse.xml:1079(title) +#: C/index.docbook:1079(sect1/title) msgid "Secure Shell Key Properties" msgstr "Eigenschaften von SSH-Schlüsseln" -#: C/seahorse.xml:1080(para) +#: C/index.docbook:1080(sect1/para) msgid "" "The descriptions in this section apply to all SSH keys." msgstr "" "Die Beschreibungen in diesem Abschnitt werden allen SSH-" "Schlüsseln zugeordnet." -#: C/seahorse.xml:1087(para) +#: C/index.docbook:1087(listitem/para) msgid "Select the Secure Shell key from the main window," msgstr "Wählen Sie den Secure-Shell-Schlüssel im Hauptfenster aus," -#: C/seahorse.xml:1083(para) -msgid "To view properties of a SSH key: " +#: C/index.docbook:1083(sect1/para) +msgid "To view properties of a SSH key: <_:itemizedlist-1/>" msgstr "" -"So zeigen Sie die Eigenschaften eines SSH-Schlüssels an. " -"" +"So zeigen Sie die Eigenschaften eines SSH-Schlüssels an: " +"<_:itemizedlist-1/>" -#: C/seahorse.xml:1120(guilabel) -msgid "Algorithm" -msgstr "Algorithmus" +#: C/index.docbook:1120(varlistentry/term) +msgid "Algorithm" +msgstr "Algorithmus" -#: C/seahorse.xml:1122(para) +#: C/index.docbook:1122(listitem/para) msgid "Specifies the encryption algorithm used to generate a key." msgstr "" "Legt den beim Erzeugen eines Schlüssels verwendeten " "Verschlüsselungsalgorithmus fest." -#: C/seahorse.xml:1129(guilabel) -msgid "Location" -msgstr "Ort" +#: C/index.docbook:1129(varlistentry/term) +msgid "Location" +msgstr "Ort" -#: C/seahorse.xml:1131(para) +#: C/index.docbook:1131(listitem/para) msgid "" "This is the location where the private key has been " "stored." msgstr "" "Dies bezeichnet den Speicherort des geheimen Schlüssels." -#: C/seahorse.xml:1159(title) +#: C/index.docbook:1159(sect2/title) msgid "Deleting a Secure Shell Key" msgstr "Entfernen eines SSH-Schlüssels" -#: C/seahorse.xml:1164(para) +#: C/index.docbook:1164(listitem/para) msgid "Select the SSH key from the main window," msgstr "Wählen Sie den SSH-Schlüssel im Hauptfenster aus." -#: C/seahorse.xml:1169(para) +#: C/index.docbook:1169(listitem/para) msgid "" "Right click on it and choose Delete key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" "Klicken Sie mit der rechten Maustaste darauf und wählen Sie " @@ -1422,93 +1457,90 @@ "BearbeitenSchlüssel löschen." -#: C/seahorse.xml:1160(para) -msgid "To delete a Secure Shell key: " -msgstr "So entfernen Sie einen Secure-Shell-Schlüssel. " +#: C/index.docbook:1160(sect2/para) +msgid "To delete a Secure Shell key: <_:itemizedlist-1/>" +msgstr "So entfernen Sie einen Secure-Shell-Schlüssel. <_:itemizedlist-1/>" -#: C/seahorse.xml:1185(title) +#: C/index.docbook:1185(sect1/title) msgid "Importing Keys" msgstr "Importieren von Schlüsseln" -# Habe ich das hier richtig verstanden? -#: C/seahorse.xml:1186(para) +#: C/index.docbook:1186(sect1/para) msgid "" -"To import keys choose FileImport and select, from the file chooser, a file " -"containing at least one ASCII armored public key." +"To import keys choose File " +"Import and select, from the file " +"chooser, a file containing at least one ASCII armored public key." msgstr "" "Um Schlüssel zu importieren, wählen Sie DateiImportieren und wählen im " "Dateidialog mindestens eine ASCII-Datei aus, die einen eingebetteten " "öffentlichen Schlüssel enthält." -#: C/seahorse.xml:1197(para) +#: C/index.docbook:1197(listitem/para) msgid "Select an ASCII armored public block of text," msgstr "" "Wählen Sie einen ASCII-Text mit einem eingebetteten öffentlichen Schlüssel " "aus," -#: C/seahorse.xml:1202(para) +#: C/index.docbook:1202(listitem/para) msgid "Copy it to the clipboard," msgstr "kopieren Sie die Auswahl in die Zwischenablage," -#: C/seahorse.xml:1207(para) +#: C/index.docbook:1207(listitem/para) msgid "" -"Choose EditPaste Keys." +"Choose Edit Paste Keys ." msgstr "" "Wählen Sie BearbeitenSchlüssel " "einfügen." -#: C/seahorse.xml:1193(para) +#: C/index.docbook:1193(sect1/para) msgid "" "Importing can also be performed by pasting the keys inside " -"Passwords and Keys: " +"Passwords and Keys: <_:itemizedlist-1/>" msgstr "" "Importieren von Schlüsseln kann auch durch Einfügen der Schlüssel in " "Passwörter und Verschlüsselung ausgeführt werden: " -"" +"<_:itemizedlist-1/>" -#: C/seahorse.xml:1222(title) +#: C/index.docbook:1222(sect1/title) msgid "Exporting Keys" msgstr "Exportieren von Schlüsseln" -#: C/seahorse.xml:1223(para) +#: C/index.docbook:1223(sect1/para) msgid "" -"To export keys, select the keys in the main window and choose " -"FileExport." +"To export keys, select the keys in the main window and choose " +"File Export ." msgstr "" "Um Schlüssel zu exportieren, wählen Sie die Schlüssel im Hauptfenster aus und " "wählen Sie DateiExportieren." -#: C/seahorse.xml:1236(para) +#: C/index.docbook:1236(listitem/para) msgid "Select the keys in the main window," msgstr "Wählen Sie die Schlüssel im Hauptfenster aus," -#: C/seahorse.xml:1241(para) +#: C/index.docbook:1241(listitem/para) msgid "" -"Choose EditCopy Keys." +"Choose Edit Copy Keys ." msgstr "" "Wählen Sie BearbeitenSchlüssel " "kopieren." -# Habe ich das hier richtig verstanden? -#: C/seahorse.xml:1231(para) +#: C/index.docbook:1231(sect1/para) msgid "" "You can also export keys to the clipboard in an ASCII armored block of text: " -"" +"<_:itemizedlist-1/>" msgstr "" "Sie können auch in einen ASCII-Text eingebettete Schlüssel in die " -"Zwischenablage exportieren: " +"Zwischenablage exportieren: <_:itemizedlist-1/>" -#: C/seahorse.xml:1257(title) +#: C/index.docbook:1257(sect1/title) msgid "Signing a Key" msgstr "Signieren eines Schlüssels" -#: C/seahorse.xml:1258(para) +#: C/index.docbook:1258(sect1/para) msgid "" "Signing another person's key means you are giving trust to that person. " "Before signing a key, you have to carefully check the key's fingerprint to be " @@ -1519,7 +1551,7 @@ "sorgfältig den Fingerabdruck des Schlüssels prüfen, um sichergehen zu können, " "dass der Schlüssel wirklich dieser Person zuzuordnen ist." -#: C/seahorse.xml:1267(para) +#: C/index.docbook:1267(listitem/para) msgid "" "Select the key you want to sign from the Trusted Keys or " "Other Collected Keys tabs," @@ -1528,21 +1560,20 @@ "Vertrauenswürdige Schlüssel oder Gesammelte " "Schlüssel aus," -#: C/seahorse.xml:1274(para) +#: C/index.docbook:1274(listitem/para) msgid "" -"Choose Sign from the toolbar or " -"FileSign," +"Choose Sign from the toolbar or " +"File Sign ," msgstr "" "Wählen Sie Signieren in der Werkzeugleiste oder " "DateiSignieren," -#: C/seahorse.xml:1283(para) +#: C/index.docbook:1283(listitem/para) msgid "Select how carefully the key has been checked," msgstr "Wählen Sie aus, wie sorgfältig Sie den Schlüssel überprüft haben." -#: C/seahorse.xml:1288(para) +#: C/index.docbook:1288(listitem/para) msgid "" "Indicate if the signature should be local to your keyring, and if your " "signature can be revoked," @@ -1550,24 +1581,24 @@ "Legt fest, ob die Signatur zu Ihrem lokalen Schlüsselbund gehören soll, und " "ob die Signatur widerrufen werden kann," -#: C/seahorse.xml:1294(para) +#: C/index.docbook:1294(listitem/para) msgid "Click on Sign." msgstr "Klicken Sie auf Signieren." -#: C/seahorse.xml:1263(para) -msgid "To sign a key in your keyring: " +#: C/index.docbook:1263(sect1/para) +msgid "To sign a key in your keyring: <_:itemizedlist-1/>" msgstr "" -"So signieren Sie einen Schlüssel in Ihrem Schlüsselbund: " +"So signieren Sie einen Schlüssel in Ihrem Schlüsselbund: <_:itemizedlist-1/>" -#: C/seahorse.xml:1305(title) +#: C/index.docbook:1305(sect1/title) msgid "Preferences" msgstr "Einstellungen" -#: C/seahorse.xml:1306(para) +#: C/index.docbook:1306(sect1/para) msgid "" "This section describes the preferences settable in Passwords and " -"Keys by choosing EditPreferences from within " +"Keys by choosing Edit " +"Preferences from within " "Passwords and Keys." msgstr "" "Dieser Abschnitt beschreibt die durch Auswahl von " @@ -1575,16 +1606,16 @@ "guimenuitem> in Passwörter und Verschlüsselung verfügbaren Einstellmöglichkeiten." -#: C/seahorse.xml:1315(title) +#: C/index.docbook:1315(sect2/title) msgid "Password Keyrings" msgstr "Passwort-Schüsselbünde" -#: C/seahorse.xml:1317(title) +#: C/index.docbook:1317(sect3/title) msgid "Creating Keyrings" msgstr "Erzeugen von Schlüsselbünden" # Habe ich das hier richtig verstanden? -#: C/seahorse.xml:1318(para) +#: C/index.docbook:1318(sect3/para) msgid "" "To create a new keyring, from the menu choose FileNew and choose " @@ -1597,11 +1628,11 @@ "Geben Sie einen Namen für den neuen Schlüsselbund ein und drücken Sie die " "Eingabetaste." -#: C/seahorse.xml:1323(title) +#: C/index.docbook:1323(sect3/title) msgid "Changing Keyring Passwords" msgstr "Ändern der Passwörter von Schlüsselbünden" -#: C/seahorse.xml:1324(para) +#: C/index.docbook:1324(sect3/para) msgid "" "To change the unlock password of the keyring, first select the appropriate " "keyring and then press Change Unlock Password button. " @@ -1626,14 +1657,14 @@ "war. Falls das alte Passwort nicht korrekt eingegeben wurde, werden Sie um " "dessen Überprüfung gebeten." -#: C/seahorse.xml:1338(title) +#: C/index.docbook:1338(sect3/title) msgid "Removing Keyrings" msgstr "Entfernen von Schlüsselbünden" -#: C/seahorse.xml:1339(para) +#: C/index.docbook:1339(sect3/para) msgid "" "To remove a keyring, first select the appropriate keyring and then from the " -"menu choose EditDeleteEdit Delete." msgstr "" "Um einen Schlüsselbund zu entfernen, wählen Sie zunächst den entsprechenden " @@ -1641,11 +1672,11 @@ "BearbeitenLöschen." -#: C/seahorse.xml:1347(title) +#: C/index.docbook:1347(sect2/title) msgid "Key Servers" msgstr "Schlüssel-Server" -#: C/seahorse.xml:1348(para) +#: C/index.docbook:1348(sect2/para) msgid "" "Keep your and other's keys up to date by syncing keys periodically with " "remote keyservers. Syncing will make sure that you have the latest signatures " @@ -1657,7 +1688,7 @@ "Signaturen Ihrer eigenen Schlüssel verfügen und dadurch aus den Ihnen " "erwiesenen Vertrauensbeweisen den größtmöglichen Nutzen ziehen." -#: C/seahorse.xml:1354(para) +#: C/index.docbook:1354(sect2/para) msgid "" "Passwords and Keys provides support for HKP and " "LDAP keyservers." @@ -1665,11 +1696,11 @@ "Passwörter und Verschlüsselung unterstützt HKP- " "und LDAP-Schlüsselserver." -#: C/seahorse.xml:1359(emphasis) -msgid "HKP Servers" -msgstr "HKP-Server" +#: C/index.docbook:1359(varlistentry/term) +msgid "HKP Servers" +msgstr "HKP-Server" -#: C/seahorse.xml:1361(para) +#: C/index.docbook:1361(listitem/para) msgid "" "HKP keyservers are ordinary web based keyservers such as the popular hkp://pool.sks-keyservers." @@ -1682,15 +1713,11 @@ "\"http://sks-keyservers.net\" type=\"http\">http://sks-keyservers.net " "erreichbar ist." -#: C/seahorse.xml:1369(acronym) -msgid "LDAP" -msgstr "LDAP" - -#: C/seahorse.xml:1369(emphasis) -msgid " Keyservers" -msgstr " Schlüsselserver" +#: C/index.docbook:1369(varlistentry/term) +msgid "LDAP Keyservers" +msgstr "LDAP-Schlüsselserver" -#: C/seahorse.xml:1371(para) +#: C/index.docbook:1371(listitem/para) msgid "" "LDAP keyservers are less common, but use the standard LDAP " "protocol to serve keys. ldap://keyserver.pgp." "com ist ein empfehlenswerter LDAP-Server." -#: C/seahorse.xml:1383(title) +#: C/index.docbook:1383(sect2/title) msgid "Key Sharing" msgstr "Schlüsselfreigabe" -#: C/seahorse.xml:1384(para) +#: C/index.docbook:1384(sect2/para) msgid "" "Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. " "Enabling key sharing will add the local Passwords and KeysPasswords and Keys, its associated plugins, the " "preferences applet and the panel applet are known collectively as Seahorse. " @@ -1743,21 +1770,21 @@ "Seahorse-Projekt besuchen Sie bitte die Seahorse-Website." -#: C/seahorse.xml:1404(para) +#: C/index.docbook:1404(sect1/para) msgid "" "To report a bug or make a suggestion regarding this application or this " -"manual, follow the directions in the Feedback section of the GNOME User Guide." msgstr "" "Um Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder zu diesem " -"Handbuch zu machen, folgen Sie den Anweisungen im GNOME-Benutzerhandbuch." +"Handbuch zu machen, folgen Sie den Anweisungen im GNOME-Benutzerhandbuch." -#: C/seahorse.xml:1409(para) +#: C/index.docbook:1409(sect1/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 is included with this " "documentation; another can be found in the file COPYING included with the " "source code of this program." @@ -1766,12 +1793,27 @@ "GNU General Public License, wie von der Free Software " "Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß " "Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version. Eine " -"Kopie dieser Lizenz ist in " +"Kopie dieser Lizenz ist in " "dieser Dokumentation enthalten, eine weitere in der Datei COPYING, die im " "Quellcode dieses Programms enthalten ist." -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/seahorse.xml:0(None) -msgid "translator-credits" -msgstr "Mario Blättermann , 2008-2011" +#: C/legal.xml:9(para/ulink) +msgid "link" +msgstr "Link" + +#: C/legal.xml:2(legalnotice/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 <_:ulink-1/> 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 " +"Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte " +"sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt " +"und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem <_:" +"ulink-1/> oder in der mit diesem Handbuch gelieferten Datei COPYING-DOCS." diff -Nru seahorse-3.2.2/help/de/index.docbook seahorse-3.6.3/help/de/index.docbook --- seahorse-3.2.2/help/de/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/de/index.docbook 2012-11-09 17:35:36.000000000 +0100 @@ -0,0 +1,854 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + »Passwörter und Verschlüsselung«-Handbuch + 2005, 2006, 2007, 2008, 2009 Jacob Perkins und Adam Schreiber + + Seahorse-Projekt + + + + Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem Link oder in der mit diesem Handbuch gelieferten Datei COPYING-DOCS. + Dieses Handbuch ist Teil einer Sammlung von GNOME-Handbüchern, die unter der GFDL veröffentlicht werden. Wenn Sie dieses Handbuch getrennt von der Sammlung weiterverbreiten möchten, können Sie das tun, indem Sie eine Kopie der Lizenz zum Handbuch hinzufügen, wie es in Abschnitt 6 der Lizenz beschrieben ist. + + Viele der Namen, die von Unternehmen verwendet werden, um ihre Produkte und Dienstleistungen von anderen zu unterscheiden, sind eingetragene Warenzeichen. An den Stellen, an denen diese Namen in einer GNOME-Dokumentation erscheinen, werden die Namen in Großbuchstaben oder mit einem großen Anfangsbuchstaben geschrieben, wenn das GNOME-Dokumentationsprojekt auf diese Warenzeichen hingewiesen wird. + + 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: + + DIESES DOKUMENT WIRD »WIE VORLIEGEND« GELIEFERT, OHNE GARANTIEN IRGENDEINER ART, SOWOHL AUSDRÜCKLICH GENANNTE ALS AUCH ANGEDEUTETE. DIES BEZIEHT SICH AUCH OHNE EINSCHRÄNKUNG AUF GARANTIEN, DASS DIESES DOKUMENT ODER VERÄNDERTE FASSUNGEN DIESES DOKUMENTS FREI VON HANDELSDEFEKTEN, FÜR EINEN BESTIMMTEN 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 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 GESTATTET AUßER UNTER BEACHTUNG DIESES HAFTUNGSAUSSCHLUSSES UND + + + UNTER KEINEN UMSTÄNDEN UND AUF BASIS KEINER RECHTSGRUNDLAGE, EGAL OB DURCH UNERLAUBTEN HANDLUNGEN (EINSCHLIEßLICH FAHRLÄSSIGKEIT), VERTRAG ODER 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. + + + + + + + Jacob Perkins Seahorse-Projekt + Adam Schreiber Seahorse-Projekt
sadam@clemson.edu
+ Paul Cutler GNOME-Dokumentationsprojekt
pcutler@foresightlinux.org
+ + + + + Seahorse-Projekt + + + GNOME-Dokumentationsprojekt + + + Passwörter-und-Verschlüsselung-Handbuch V2.11.0 Mai 2009 + Paul Cutler pcutler@foresightlinux.org + + Passwörter-und-Verschlüsselung-Handbuch V0.10.1 August 2008 + Adam Schreiber sadam@clemson.edu + + Passwörter-und-Verschlüsselung-Handbuch V0.9.1 November 2006 + Milo Casagrande milo_casagrande@yahoo.it + + Passwörter-und-Verschlüsselung-Handbuch V0.9.0 Juli 2005 + Adam Schreiber sadam@clemson.edu + Seahorse-Projekt + + Passwörter-und-Verschlüsselung-Handbuch V0.7.0 Februar 2003 + Jacob Perkins + Seahorse-Projekt + + + Dieses Handbuch beschreibt Version 2.28.x von »Passwörter und Verschlüsselung« + + Rückmeldungen + Um einen Fehler zu melden oder einen Vorschlag zur Anwendung Passwörter und Verschlüsselung oder zu diesem Handbuch zu machen, folgen Sie den Anweisungen auf der GNOME-Seite für Rückmeldungen. + + + + Passwörter und Verschlüsselung ist die Anwendung zum Verwalten von Verschlüsselungen für den GNOME-Desktop + + + + + + Mario Blättermann + + mario.blaettermann@gmail.com + + + + 2008-2012 + + Mario Blättermann + + + + Seahorse + + seahorse + + Verschlüsselungen + + + + + Einführung + Sie können Passwörter und Verschlüsselung zum Erzeugen und Verwalten von PGP- und SSH-Schlüsseln verwenden. + Passwörter und Verschlüsselung stellt eine grafische Benutzeroberfläche für viele Funktionen des Gnu Privacy Guard (GPG) zur Verfügung. Das Programm kann in mehrere Komponenten des GNOME-Desktops integriert werden. + Mit Passwörter und Verschlüsselung können Sie: + + + PGP- und SSH-Schlüssel erzeugen und verwalten, + + + PGP- und SSH-Schlüssel exportieren und importieren, + + + Ihre Schlüssel für Andere freigeben, + + + + + + + + Erste Schritte + + Starten von <application>Passwörter und Verschlüsselung</application> + Sie können Passwörter und Verschlüsselung auf folgende Arten starten: + + + Menü Anwendungen + + Wählen Sie WerkzeugePasswörter und Verschlüsselung. + + + + Befehlszeile + + Geben Sie den Befehl seahorse ein und drücken Sie dann Enter. + + + + + + + Beim Start von <application>Passwörter und Verschlüsselung</application> + Wenn Sie Passwörter und Verschlüsselung starten, wird das Passwörter und Verschlüsselung-Fenster angezeigt. + +
+ Das <application>Passwörter und Verschlüsselung</application>-Fenster + + Zeigt das Fenster von Passwörter und Verschlüsselung. + +
+ + Das Passwörter und Verschlüsselung-Fenster enthält die folgenden Elemente: + + + Menüleiste + + Die Menüs in der Menüleiste enthalten alle Befehle, die Sie für die Ausführung von Aktionen in Passwörter und Verschlüsselung benötigen. + + + Werkzeugleiste + + Verwenden Sie die Werkzeugleiste zum schnellen Zugriff auf häufig benutzte Befehle. + + + Reiter »Schlüssel« und »Passwörter« + + Ermöglichen den Zugriff auf die Schlüssel und die Passwörter im Schlüsselbund. + + + Erstmalige Optionen + + Bietet schnellen Zugriff auf nützliche Aktionen für Erstanwender. Von hier aus können Sie: + + + das Hilfesystem durchsuchen, + + + Schlüssel in den Schlüsselbund importieren, + + + neue Schlüssel erzeugen. + + + + + + + + + + + + Erzeugen von OpenPGP-Schlüsseln + OpenPGP ist ein offenes Protokoll zur Verschlüsselung von E-Mails mit einem öffentlichen Schlüssel, dessen Kryptografie auf PGP basiert. In diesem Protokoll werden Standardformate für verschlüsselte Nachrichten, Unterschriften und geheime Schlüssel definiert. Es ist für den Austausch öffentlicher Schlüssel zertifiziert. + Die Kryptografie öffentlicher Schlüssel ist ein Konzept, welches die Nutzung zweier Schlüssel beinhaltet: einen öffentlichen Schlüssel, den Sie an jeden Ihrer Kommunikationspartner weitergeben können, sowie einen geheimen Schlüssel, der rein privat ist und geheimgehalten werden muss. + So erzeugen Sie OpenPGP-Schlüssel: + + Wählen Sie DateiNeu. + + + Wählen Sie PGP-Schlüssel und klicken Sie auf Weiter + + + Geben Sie Ihren vollen Namen (Vorname - Nachname), Ihre E-Mail-Adresse und eventuell zusätzliche Informationen ein. Sie können auch erweiterte Optionen für den Schlüssel eingeben. Siehe unten. + + + Klicken Sie auf Erzeugen, um ein neues Schlüsselpaar zu erzeugen. + + + Das Dialogfenster Kennwort des neuen PGP-Schlüssels wird geöffnet. Geben Sie das Kennwort für Ihren neuen Schlüssel zweimal ein. + + + + Gehen sie beim Wählen eines Kennworts ähnlich vor wie beim Erzeugen eines starken Passworts. Der wichtigste Unterschied zwischen einem Passwort und einem Kennwort besteht darin, dass in einem Kennwort auch Leerzeichen gültige Zeichen sind. + + + + Erweiterte Einstellungen + Öffnen Sie den Bereich Erweiterte Optionen, um folgende Optionen für den neuen Schlüssel zu wählen: + + + Verschlüsselungstyp + + Dieses Feld bezeichnet die Verschlüsselungsalgorithmen, die beim Erzeugen Ihrer Schlüssel benutzt werden. + + + DSA ElGamal + + Dies ist die bevorzugte Wahl, weil damit Verschlüsseln, Entschlüsseln, Signieren und Überprüfen möglich sind. + + + + DSA + + Erlaubt nur das Signieren. + + + + RSA + + Erlaubt nur das Signieren. + + + + + + + Schlüssellänge (Bit) + + Dies bezeichnet die Länge des Schlüssels in Bit. Je länger der Schlüssel ist, umso sicherer ist er auch, vorausgesetzt, Sie verwenden ein sicheres Kennwort. Andererseits wird das Ausführen von Operationen mit einem längeren Schlüssel mehr Zeit in Anspruch nehmen als mit einem kürzeren Schlüssel. Schlüssellängen zwischen 1024 und 4096 Bit werden akzeptiert, jedoch sind mindestens 2048 Bit zu empfehlen. + + + + Ablaufdatum + + Dies bezeichnet das Datum, bis zu welchem der Schlüssel für Verschlüsselungen oder Signaturen genutzt werden kann. Sechs Monate sind hierfür ein vernünftiger Wert. Nach dem Ende dieser Zeitspanne können Sie entweder das Ablaufdatum ändern oder einen neuen Schlüssel oder Unterschlüssel erzeugen. + Signieren Sie Ihren neuen Schlüssel mit Ihrem alten Schlüssel, bevor er verfällt, um den Status Ihrer Vertrauenswürdigkeit zu bewahren. + + + + + + + + + + + Erzeugen von Secure-Shell-Schlüsseln + Die »Secure Shell« (SSH) bietet eine Möglichkeit, sich an einem entfernten Computer anzumelden, um dort Befehle auszuführen. SSH-Schlüssel werden in schlüsselbasierten Authentifizierungssystemen als Alternative zur standardmäßigen Authentifizierung mittels Passwort verwendet. Durch die schlüsselbasierte Authentifizierung ist es nicht notwendig, ein Passwort per Hand einzugeben. + Secure-Shell-Schlüssel bestehen aus zwei Schlüsseln: einem geheimen Schlüssel, der geheimgehalten werden muss, und einem öffentlichen Schlüssel, der zu jedem Computer übertragen werden kann, auf den Sie zugreifen wollen. + So erzeugen Sie einen SSH-Schlüssel. + + + Wählen Sie DateiNeu. + + + Wählen Sie SSH-Schlüssel und klicken Sie dann auf Weiter. + + + Geben Sie eine Beschreibung des Verwendungszwecks ein. Sie können Ihre E-Mail-Adresse oder etwas Ähnliches als Gedankenstütze verwenden. Außerdem können Sie erweiterte Optionen für den Schlüssel eingeben. Siehe unten. + + + Klicken Sie auf Lediglich Schlüssel erzeugen, um einen neuen Schlüssel zu erzeugen, oder auf Erstellen und Einrichten, um den Schlüssel zu erzeugen und ihn für die Authentifizierung auf einem anderen Computer einzurichten. + + + Das Dialogfenster Kennwort des neuen SSH-Schlüssels wird geöffnet. Geben Sie das Kennwort für Ihren neuen Schlüssel zweimal ein. + + Gehen sie beim Wählen eines Kennworts ähnlich vor wie beim Erzeugen eines starken Passworts. Der wichtigste Unterschied zwischen einem Passwort und einem Kennwort besteht darin, dass in einem Kennwort auch Leerzeichen gültige Zeichen sind. + + + + + + + + Erweiterte Einstellungen + Klappen Sie den Abschnitt Erweiterte Optionen aus, um folgende Optionen für einen neuen Schlüssel zu wählen. + + + + Verschlüsselungstyp + + In diesem Feld legen Sie den Verschlüsselungsalgorithmus zur Erzeugung Ihres Schlüssels fest. + + + RSA + + Verwendet den Rivest-ShamirAdleman-Algorithmus (RSA) zur Erzeugung des SSH-Schlüssels. Dies sollten Sie aus Sicherheitsgründen bevorzugen. + + + + DSA + + Verwendet den Digital Signature Algorithm-Algorithmus (DSA) zur Erzeugung des SSH-Schlüssels. + + + + + + + Schlüssellänge (Bit) + + Dies bezeichnet die Länge des Schlüssels in Bit. Je länger der Schlüssel ist, umso sicherer ist er auch, vorausgesetzt, Sie verwenden ein sicheres Kennwort. Andererseits wird das Ausführen von Operationen mit einem längeren Schlüssel mehr Zeit in Anspruch nehmen als mit einem kürzeren Schlüssel. Schlüssellängen zwischen 1024 und 4096 Bit werden akzeptiert, jedoch sind mindestens 2048 Bit zu empfehlen. + + + + + + + + + + Eigenschaften von OpenPGP-Schlüsseln + Die Beschreibungen in diesem Abschnitt werden allen OpenPGP-Schlüsseln zugeordnet. + + So zeigen Sie die Eigenschaften eines PGP-Schlüssels an: + + Wählen Sie den PGP-Schlüssel im Hauptfenster. + + + Doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. + + + Wählen Sie den Reiter Details. + + + + + Eigenschaften + + + + Fingerabdruck + + Der Fingerabdruck ist eine einzigartige Zeichenkette, die einen Schlüssel exakt identifiziert. + + + + Schlüsselkennung + + Die Schlüsselkennung entspricht dem Fingerabdruck, wobei die Schlüsselkennung lediglich die letzten 8 Zeichen des Fingerabdrucks enthält. Meist ist es möglich, einen Schlüssel nur über diese Schlüsselkennung zu identifizieren, doch gelegentlich haben auch zwei Schlüssel die gleiche Kennung. + + + + Typ + + Legt den zur Erzeugung eines Schlüssels verwendeten Algorithmus fest. DSA-Schlüssel können lediglich signieren, ElGamal-Schlüssel werden zur Verschlüsselung verwendet. + + + + Erstellt + + Bezeichnet das Erzeugungsdatum des Schlüssels. + + + + Läuft ab + + Gibt das Datum an, ab dem der Schlüssel nicht mehr verwendet werden kann. + + + + Länge + + Bezeichnet die Schlüssellänge in bit. Vereinfacht ausgedrückt, je länger der Schlüssel ist, umso mehr Sicherheit bietet er. + Ein langer Schlüssel allein reicht nicht aus, wenn das Kennwort zu schwach ist. + + + + + + + + + Vertrauen + Die Vertrauenswürdigkeit zeigt an, wie Sie eine Person bezüglich ihrer Verlässlichkeit einschätzen. Wenn Ihnen ein Schlüssel begegnet, den Sie nicht selbst signiert haben, wird die Gültigkeit des Schlüssels von dieser Person anhand der bisher gesammelten Signaturen sowie Ihrer Einschätzung der Vertrauenswürdigkeit der Ersteller dieser Signaturen eingestuft. Per Vorgabe erfordert ein unbekannter Schlüssel mindestens drei Signaturen geringfügiger Vertrauenswürdigkeit oder eine Signatur, der Sie absolut vertrauen. + + Unbekannt: Sie können die Fähigkeiten der Person zum korrekten Signieren von Schlüsseln nicht einschätzen. + Nie: Diese Person kann Schlüssel nicht korrekt signieren. + Geringfügig: Diese Person überprüft zwar die Foto-Kennung vor dem Signieren eines Schlüssels, aber überprüft nicht notwendigerweise die Kennung genauer. + Vollkommen: Diese Person prüft genauestens die Foto-Kennung jeder Person vor der Bestätigung. Das bedeutet, dass beispielsweise nur Schlüssel bestätigt werden, die mit Sicherheit der Person gehören, die um Bestätigung bittet. + Absolut: Diese Stufe der Vertrauenswürdigkeit sollte ausschließlich Ihren eigenen Schlüsseln zugeordnet werden.. + + + + + Aktivieren und Deaktivieren von Schlüsseln + Wenn ein Schlüssel aktiviert ist, kann er zur Ausführung von Verschlüsselungen verwendet werden. Wenn ein Schlüssel deaktiviert ist, kann er nicht zum Verschlüsseln oder zur Überprüfung von Signaturen verwendet werden. + + + + Ablaufdatum + Ein Schlüssel kann, nachdem er abgelaufen ist, nicht mehr für Verschlüsselungen verwendet werden. Das Ändern des Ablaufdatums auf einen zukünftigen Zeitpunkt stellt dessen Gültigkeit wieder her. In der Praxis ist es empfehlenswert, einen Hauptschlüssel zu haben, der niemals verfällt, sowie mehrere Unterschlüssel, die mit dem Hauptschlüssel signiert wurden. + + + + Benutzerkennungen + Benutzerkennungen erlauben die Verwendung mehrerer Identitäten und E-Mail-Adressen mit dem gleichen Schlüssel. + Üblicherweise wird folgende Form verwendet: Name (Kommentar) <E-Mail-Adresse> + + + Hinzufügen einer Benutzerkennung + Hinzufügen einer Benutzerkennung ist nützlich, wenn Sie eine Identität für Ihre Arbeit und eine weitere für Ihre Freunde nutzen wollen. + So fügen Sie eine Benutzerkennung zu einem Schlüssel hinzu: + + Wählen Sie einen Schlüssel im Hauptfenster aus, + + + doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. + + + Wählen Sie den Reiter Namen und Signaturen aus. + + + Klicken Sie auf Name hinzufügen. + + + Wenn Sie die oben stehenden Anweisungen befolgt haben, wird ein Eingabedialog angezeigt. Die Eingabefelder werden unten detailliert beschrieben. + + + Voller Name + + Geben Sie Ihren vollen Namen in der Form <Vorname> <Nachname> ein. Wahlweise können Sie einen zweiten Vornamen oder dessen Anfangsbuchstaben eingeben. + + + In dieses Feld müssen Sie mindestens 5 Zeichen eingeben. + + + + + + Email-Adresse + + Auf Schlüsselservern oder bei anderen Schlüsselanbietern wird meist anhand Ihrer E-Mail-Adresse nach Ihrem Schlüssel gesucht. Stellen Sie zunächst sicher, dass diese korrekt eingegeben wurde. + + + Die E-Mail-Adresse sollte dieser Form folgen: <username>@<domainname> + + + + + + Schlüsselkommentar + + Das Kommentarfeld kann für eine zusätzlich im Namen Ihrer neuen Kennung anzuzeigende Information verwendet werden. Diese Information steht auch bei Suchvorgängen auf Schlüsselservern zur Verfügung. + + + + + + + + Foto-Kennungen + Foto-Kennungen erlauben dem Eigentümer eines Schlüssels, ein oder mehrere Bilder von sich selbst in diesen Schlüssel einzubetten. Diese Kennungen können ebenso wie gewöhnliche Benutzerkennungen signiert werden. Ein Foto muss im JPEG-Format vorliegen und sollte nicht größer als 240 mal 288 Pixel sein. + Falls das gewählte Bild nicht im erforderlichen Dateityp oder der korrekten Größe vorliegt, kann Passwörter und Verschlüsselung das benötigte Bild direkt aus jedem von der GDK-Bibliothek unterstützten Format erzeugen. + + + + Kennwort ändern + So ändern Sie das Kennwort eines Schlüssels: + + Wählen Sie einen Schlüssel im Hauptfenster aus, + + + Doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. + + + klicken Sie auf Kennwort ändern. + + + Geben Sie ein neues Kennwort ein und klicken Sie auf OK. + + + + Entfernen eines Schlüssels + So entfernen Sie einen Schlüssel aus Ihrem Schlüsselbund: + + Wählen Sie einen Schlüssel im Hauptfenster aus, + + + Klicken Sie mit der rechten Maustaste darauf und wählen Sie Schlüssel löschen oder wählen Sie BearbeitenSchlüssel löschen. + + + + Sie können Ihre eigenen Schlüssel, vertrauenswürdige Schlüssel und gesammelte Schlüssel entfernen. + + + + + + + + Eigenschaften eines OpenPGP-Unterschlüssels + Jeder OpenPGP-Schlüssel hat einen einzelnen Hauptschlüssel, der nur zum Signieren verwendet werden kann. Unterschlüssel können dagegen sowohl zum Verschlüsseln als auch zum Signieren verewendet werden. Deshalb brauchen Sie Ihren Hauptschlüssel nicht zu widerrufen, falls Ihr Unterschlüssel gefährdet ist. + + + Kennung + + Dies ist die Kennung des Unterschlüssels. + + + + Typ + + Legt den zur Erzeugung eines Unterschlüssels verwendeten Algorithmus fest. DSA-Schlüssel können lediglich signieren, ElGamal-Schlüssel werden zur Verschlüsselung verwendet und RSA-Schlüssel können sowohl signieren als auch verschlüsseln. + + + + Erstellt + + Bezeichnet das Erzeugungsdatum des Schlüssels. + + + + Läuft ab + + Gibt das Datum an, ab dem der Schlüssel nicht mehr verwendet werden kann. + + + + Status + + Gibt den Status des Schlüssels an. + + + + Länge + + Gibt die Länge des Schlüssels in Bit an. Allgemein steigt die Sicherheit eines Schlüssels mit dessen Länge. + Ein langer Schlüssel allein reicht nicht aus, wenn das Kennwort zu schwach ist. + + + + + + + Hinzufügen eines Unterschlüssels + Zum Hinzufügen eines Unterschlüssels zu einem Schlüssel klicken Sie im Abschnitt Unterschlüssel auf Hinzufügen. + Wenn Sie die oben stehenden Anweisungen befolgt haben, wird ein Eingabedialog angezeigt. Die Eingabefelder werden unten detailliert beschrieben. + + + Schlüssel-Typ + + Bezeichnet den Verschlüsselungs-Algorithmus zum Erzeugen eines Unterschlüssels. + + + DSA + + Verwendet den Digital Signature Algorithm (DSA) zur Erzeugung des Unterschlüssels. Dieser Schlüssel kann nur zum Signieren verwendet werden. + + + + ElGamal + + Verwendet den ElGamal-Algorithmus zur Erzeugung des Unterschlüssels. Dieser Schlüssel kann nur zum Verschlüsseln verwendet werden. + + + + RSA + + Verwendet den Rivest-Shamir Adleman-Algorithmus (RSA) zur Erzeugung des Unterschlüssels. Dieser Schlüssel kann sowohl signieren als auch verschlüsseln, allerdings müssen dafür zwei verschiedene Unterschlüssel erzeugt werden. + + + + + + + Schlüssellänge + + Bezeichnet die Länge des Schlüssel in Bit. Allgemein lässt sich sagen: Je länger der Schlüssel, desto sicherer ist er. + + + + Ablaufdatum + + Legt das Datum fest, ab dem der Unterschlüssel nicht mehr benutzt werden kann. + + + + + + + Ändern des Ablaufdatums eines Unterschlüssels + Um das Ablaufdatum eines Unterschlüssels zu ändern, wählen Sie den Unterschlüssel im Abschnitt Unterschlüssel, und dann: + + Klicken Sie auf den Knopf Ablaufdatum an der linken Seite. + + + Im Datum-Dialog wählen Sie das neue Ablaufdatum oder wählen Läuft nie ab, um kein Ablaufdatum zu bestimmen. + + + + + + Widerrufen eines Unterschlüssels + Um einen Unterschlüssel zu widerrufen, wählen Sie den Unterschlüssel im Abschnitt Unterschlüssel, und dann: + + Klicken Sie auf Widerrufen an der linken Seite. + + + Wählen Sie einen Grund, warum Sie den Unterschlüssel widerrufen. + + + + Kein Grund + + Es gibt keinen bestimmten Grund, weswegen Sie den Schlüssel widerrufen. + + + + Unsicher + + Schlüssel ist nicht mehr sicher. + + + + Ersetzt + + Der Schlüssel wurde durch einen anderen ersetzt. + + + + Nicht verwendet + + Der Schlüssel wird nicht mehr benutzt. + + + + + + + Geben Sie eine Beschreibung ein, warum Sie den Schlüssel widerrufen, + + + Klicken Sie auf Widerrufen. + + + + Der Widerruf des Schlüssels wird unmittelbar ausgeführt. + + + + + Entfernen eines Unterschlüssels + Um einen Unterschlüssel zu entfernen, wählen Sie diesen im Abschnitt Unterschlüssel aus, und dann: + + Klicken Sie auf den Knopf Löschen an der linken Seite. + + + + + + + + + Eigenschaften von SSH-Schlüsseln + Die Beschreibungen in diesem Abschnitt werden allen SSH-Schlüsseln zugeordnet. + So zeigen Sie die Eigenschaften eines SSH-Schlüssels an: + + Wählen Sie den Secure-Shell-Schlüssel im Hauptfenster aus, + + + Doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. + + + Wählen Sie den Reiter Details. + + + + + Eigenschaften + + + + Fingerabdruck + + Der Fingerabdruck ist eine einzigartige Zeichenkette, die einen Schlüssel exakt identifiziert. + + + + Algorithmus + + Legt den beim Erzeugen eines Schlüssels verwendeten Verschlüsselungsalgorithmus fest. + + + + Ort + + Dies bezeichnet den Speicherort des geheimen Schlüssels. + + + + Länge + + Bezeichnet die Schlüssellänge in bit. Vereinfacht ausgedrückt, je länger der Schlüssel ist, umso mehr Sicherheit bietet er. + Ein langer Schlüssel allein reicht nicht aus, wenn das Kennwort zu schwach ist. + + + + + + + + + Entfernen eines SSH-Schlüssels + So entfernen Sie einen Secure-Shell-Schlüssel. + + Wählen Sie den SSH-Schlüssel im Hauptfenster aus. + + + Klicken Sie mit der rechten Maustaste darauf und wählen Sie Schlüssel löschen oder wählen Sie BearbeitenSchlüssel löschen. + + + + + + + + + Importieren von Schlüsseln + Um Schlüssel zu importieren, wählen Sie DateiImportieren und wählen im Dateidialog mindestens eine ASCII-Datei aus, die einen eingebetteten öffentlichen Schlüssel enthält. + Importieren von Schlüsseln kann auch durch Einfügen der Schlüssel in Passwörter und Verschlüsselung ausgeführt werden: + + Wählen Sie einen ASCII-Text mit einem eingebetteten öffentlichen Schlüssel aus, + + + kopieren Sie die Auswahl in die Zwischenablage, + + + Wählen Sie BearbeitenSchlüssel einfügen. + + + + + + + + Exportieren von Schlüsseln + Um Schlüssel zu exportieren, wählen Sie die Schlüssel im Hauptfenster aus und wählen Sie DateiExportieren. + Sie können auch in einen ASCII-Text eingebettete Schlüssel in die Zwischenablage exportieren: + + Wählen Sie die Schlüssel im Hauptfenster aus, + + + Wählen Sie BearbeitenSchlüssel kopieren. + + + + + + + + + Signieren eines Schlüssels + Das Signieren eines Schlüssels einer anderen Person bedeutet einen Vertrauensbeweis gegenüber dieser Person. Bevor Sie dies tun, sollten Sie sorgfältig den Fingerabdruck des Schlüssels prüfen, um sichergehen zu können, dass der Schlüssel wirklich dieser Person zuzuordnen ist. + So signieren Sie einen Schlüssel in Ihrem Schlüsselbund: + + Wählen Sie den Schlüssel, den Sie signieren wollen, in den Reitern Vertrauenswürdige Schlüssel oder Gesammelte Schlüssel aus, + + + Wählen Sie Signieren in der Werkzeugleiste oder DateiSignieren, + + + Wählen Sie aus, wie sorgfältig Sie den Schlüssel überprüft haben. + + + Legt fest, ob die Signatur zu Ihrem lokalen Schlüsselbund gehören soll, und ob die Signatur widerrufen werden kann, + + + Klicken Sie auf Signieren. + + + + + + + + Einstellungen + Dieser Abschnitt beschreibt die durch Auswahl von BearbeitenEinstellungen in Passwörter und Verschlüsselung verfügbaren Einstellmöglichkeiten. + + + Passwort-Schüsselbünde + + Erzeugen von Schlüsselbünden + Um einen neuen Schlüsselbund anzulegen, wählen Sie DateiImportieren und wählen dann Passwort-Schlüsselbund. Geben Sie einen Namen für den neuen Schlüsselbund ein und drücken Sie die Eingabetaste. + + + Ändern der Passwörter von Schlüsselbünden + Um das Passwort zum Entsperren des Schlüsselbunds zu ändern, wählen Sie zuerst den gewünschten Schlüsselbund aus und klicken dann auf Passwort zum Entsperren ändern. Sie werden aufgefordert, das alte Passwort in das Texteingabefeld Altes Passwort einzugeben. Danach werden Sie aufgefordert, das neue Passwort in das Texteingabefeld Neues Passwort einzugeben, sowie die Eingabe im Texteingabefeld Passwort bestätigen zu bestätigen. Um die Änderungen anzuwenden, klicken Sie auf Ändern. Wenn die Eingabe des alten Passworts korrekt war, erhalten Sie eine Statusnachricht, dass die Aktion erfolgreich war. Falls das alte Passwort nicht korrekt eingegeben wurde, werden Sie um dessen Überprüfung gebeten. + + + Entfernen von Schlüsselbünden + Um einen Schlüsselbund zu entfernen, wählen Sie zunächst den entsprechenden Schlüsselbund aus und wählen Sie anschließend BearbeitenLöschen. + + + + + Schlüssel-Server + Halten Sie Ihre eigenen Schlüssel und die Schlüssel Anderer auf dem aktuellen Stand, indem Sie die Schlüssel regelmäßig mit entfernten Schlüsselservern abgleichen. Das Abgleichen stellt sicher, dass Sie über die neuesten Signaturen Ihrer eigenen Schlüssel verfügen und dadurch aus den Ihnen erwiesenen Vertrauensbeweisen den größtmöglichen Nutzen ziehen. + Passwörter und Verschlüsselung unterstützt HKP- und LDAP-Schlüsselserver. + + + HKP-Server + + HKP-Schlüsselserver sind normale webbasierte Schlüsselserver, wie beispielsweise der populäre hkp://pool.sks-keyservers.net, der auch über http://sks-keyservers.net erreichbar ist. + + + + LDAP-Schlüsselserver + + LDAP-Schlüsselserver sind weniger gebräuchlich, aber verwenden das Standard-LDAP-Protokoll, um Schlüssel zur Verfügung zu stellen. ldap://keyserver.pgp.com ist ein empfehlenswerter LDAP-Server. + + + + + + + Schlüsselfreigabe + Die Schlüsselfreigabe erfolgt mittels DNS-SD, auch als Bonjour oder Rendezvous bekannt. Die Aktivierung der Schlüsselfreigabe fügt den öffentlichen Schlüsselbund des lokalen Benutzers von Passwörter und Verschlüsselung zum entfernten Suchdialog hinzu. Der Zugriff auf solche lokalen »Schlüsselserver« ist meist schneller als auf entfernte Server. + + + + + + + Info zu »Passwörter und Verschlüsselung« + Passwörter und Verschlüsselung, die zugehörigen Anwendungs-Plugins, das Einstellungs-Applet sowie das Panel-Applet werden unter dem Namen Seahorse zusammengefasst. Seahorse wurde von Jacob Perkins geschrieben. Die gegenwärtigen Hauptentwickler sind Stef Walter und Adam Schreiber. Dieses Handbuch stammt von Adam Schreiber. Die Website des Projekts wurde von Jim Pharis entworfen. Für weitere Informationen über das Seahorse-Projekt besuchen Sie bitte die Seahorse-Website. + Um Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder zu diesem Handbuch zu machen, folgen Sie den Anweisungen im GNOME-Benutzerhandbuch. + Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version. Eine Kopie dieser Lizenz ist in dieser Dokumentation enthalten, eine weitere in der Datei COPYING, die im Quellcode dieses Programms enthalten ist. + +
diff -Nru seahorse-3.2.2/help/de/legal.xml seahorse-3.6.3/help/de/legal.xml --- seahorse-3.2.2/help/de/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/de/legal.xml 2012-11-09 17:35:36.000000000 +0100 @@ -0,0 +1,16 @@ + + + Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem Link oder in der mit diesem Handbuch gelieferten Datei COPYING-DOCS. + Dieses Handbuch ist Teil einer Sammlung von GNOME-Handbüchern, die unter der GFDL veröffentlicht werden. Wenn Sie dieses Handbuch getrennt von der Sammlung weiterverbreiten möchten, können Sie das tun, indem Sie eine Kopie der Lizenz zum Handbuch hinzufügen, wie es in Abschnitt 6 der Lizenz beschrieben ist. + + Viele der Namen, die von Unternehmen verwendet werden, um ihre Produkte und Dienstleistungen von anderen zu unterscheiden, sind eingetragene Warenzeichen. An den Stellen, an denen diese Namen in einer GNOME-Dokumentation erscheinen, werden die Namen in Großbuchstaben oder mit einem großen Anfangsbuchstaben geschrieben, wenn das GNOME-Dokumentationsprojekt auf diese Warenzeichen hingewiesen wird. + + 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: + + DIESES DOKUMENT WIRD »WIE VORLIEGEND« GELIEFERT, OHNE GARANTIEN IRGENDEINER ART, SOWOHL AUSDRÜCKLICH GENANNTE ALS AUCH ANGEDEUTETE. DIES BEZIEHT SICH AUCH OHNE EINSCHRÄNKUNG AUF GARANTIEN, DASS DIESES DOKUMENT ODER VERÄNDERTE FASSUNGEN DIESES DOKUMENTS FREI VON HANDELSDEFEKTEN, FÜR EINEN BESTIMMTEN 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 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 GESTATTET AUßER UNTER BEACHTUNG DIESES HAFTUNGSAUSSCHLUSSES UND + + + UNTER KEINEN UMSTÄNDEN UND AUF BASIS KEINER RECHTSGRUNDLAGE, EGAL OB DURCH UNERLAUBTEN HANDLUNGEN (EINSCHLIEßLICH FAHRLÄSSIGKEIT), VERTRAG ODER 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. + + + diff -Nru seahorse-3.2.2/help/de/seahorse.xml seahorse-3.6.3/help/de/seahorse.xml --- seahorse-3.2.2/help/de/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/de/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,906 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - »Passwörter und Verschlüsselung«-Handbuch - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins und Adam Schreiber - 2008-2011Mario Blättermann (mariobl@freenet.de) - - Seahorse-Projekt - - - - Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem Link oder in der mit diesem Handbuch gelieferten Datei COPYING-DOCS. - Dieses Handbuch ist Teil einer Sammlung von GNOME-Handbüchern, die unter der GFDL veröffentlicht werden. Wenn Sie dieses Handbuch getrennt von der Sammlung weiterverbreiten möchten, können Sie das tun, indem Sie eine Kopie der Lizenz zum Handbuch hinzufügen, wie es in Abschnitt 6 der Lizenz beschrieben ist. - - Viele der Namen, die von Unternehmen verwendet werden, um ihre Produkte und Dienstleistungen von anderen zu unterscheiden, sind eingetragene Warenzeichen. An den Stellen, an denen diese Namen in einer GNOME-Dokumentation erscheinen, werden die Namen in Großbuchstaben oder mit einem großen Anfangsbuchstaben geschrieben, wenn das GNOME-Dokumentationsprojekt auf diese Warenzeichen hingewiesen wird. - - 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: - - DIESES DOKUMENT WIRD »WIE VORLIEGEND« GELIEFERT, OHNE GARANTIEN IRGENDEINER ART, SOWOHL AUSDRÜCKLICH GENANNTE ALS AUCH ANGEDEUTETE. DIES BEZIEHT SICH AUCH OHNE EINSCHRÄNKUNG AUF GARANTIEN, DASS DIESES DOKUMENT ODER VERÄNDERTE FASSUNGEN DIESES DOKUMENTS FREI VON HANDELSDEFEKTEN, FÜR EINEN BESTIMMTEN 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 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 GESTATTET AUßER UNTER BEACHTUNG DIESES HAFTUNGSAUSSCHLUSSES UND - - - UNTER KEINEN UMSTÄNDEN UND AUF BASIS KEINER RECHTSGRUNDLAGE, EGAL OB DURCH UNERLAUBTEN HANDLUNGEN (EINSCHLIEßLICH FAHRLÄSSIGKEIT), VERTRAG ODER 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. - - - - - - - - Jacob - Perkins - - Seahorse-Projekt - - - - - Adam - Schreiber - - Seahorse-Projekt -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME-Dokumentationsprojekt -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse-Projekt - - - GNOME-Dokumentationsprojekt - - - - »Passwörter und Verschlüsselung«-Handbuch V2.11.0 - Mai 2009 - - Paul Cutler pcutler@foresightlinux.org - - - - »Passwörter und Verschlüsselung«-Handbuch V0.10.1 - August 2008 - - Adam Schreiber sadam@clemson.edu - - - - »Passwörter und Verschlüsselung«-Handbuch V0.9.1 - November 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - »Passwörter und Verschlüsselung«-Handbuch V0.9.0 - Juli 2005 - - Adam Schreiber sadam@clemson.edu - Seahorse-Projekt - - - - »Passwörter und Verschlüsselung«-Handbuch V0.7.0 - Februar 2003 - - Jacob Perkins - Seahorse-Projekt - - - - Dieses Handbuch beschreibt Version 2.28.x von »Passwörter und Verschlüsselung« - - Rückmeldungen - Um einen Fehler zu melden oder einen Vorschlag zur Anwendung Passwörter und Verschlüsselung oder zu diesem Handbuch zu machen, folgen Sie den Anweisungen auf der GNOME-Seite für Rückmeldungen. - - - - Passwörter und Verschlüsselung ist die Anwendung zum Verwalten von Verschlüsselungen für den GNOME-Desktop - - - - - - Seahorse - - - - seahorse - - - - Verschlüsselungen - - - - - - Einführung - Sie können Passwörter und Verschlüsselung zum Erzeugen und Verwalten von PGP- und SSH-Schlüsseln verwenden. - Passwörter und Verschlüsselung stellt eine grafische Benutzeroberfläche für viele Funktionen des Gnu Privacy Guard (GPG) zur Verfügung. Das Programm kann in mehrere Komponenten des GNOME-Desktops integriert werden. - Mit Passwörter und Verschlüsselung können Sie: - - - PGP- und SSH-Schlüssel erzeugen und verwalten, - - - PGP- und SSH-Schlüssel exportieren und importieren, - - - Ihre Schlüssel für Andere freigeben, - - - - - - - - Erste Schritte - - Starten von <application>Passwörter und Verschlüsselung</application> - Sie können Passwörter und Verschlüsselung auf folgende Arten starten: - - - Menü Anwendungen - - Wählen Sie WerkzeugePasswörter und Verschlüsselung. - - - - Befehlszeile - - Geben Sie den Befehl seahorse ein und drücken Sie dann Enter. - - - - - - - Beim Start von <application>Passwörter und Verschlüsselung</application> - Wenn Sie Passwörter und Verschlüsselung starten, wird das Passwörter und Verschlüsselung-Fenster angezeigt. - -
- Das <application>Passwörter und Verschlüsselung</application>-Fenster - - - - - - - Zeigt das Passwörter und Verschlüsselung-Fenster. - - - -
- - Das Passwörter und Verschlüsselung-Fenster enthält die folgenden Elemente: - - - Menüleiste - - Die Menüs in der Menüleiste enthalten alle Befehle, die Sie für die Ausführung von Aktionen in Passwörter und Verschlüsselung benötigen. - - - Werkzeugleiste - - Verwenden Sie die Werkzeugleiste zum schnellen Zugriff auf häufig benutzte Befehle. - - - Reiter »Schlüssel« und »Passwörter« - - Ermöglichen den Zugriff auf die Schlüssel und die Passwörter im Schlüsselbund. - - - Erstmalige Optionen - - Bietet schnellen Zugriff auf nützliche Aktionen für Erstanwender. Von hier aus können Sie: - - - das Hilfesystem durchsuchen, - - - Schlüssel in den Schlüsselbund importieren, - - - neue Schlüssel erzeugen. - - - - - - - - - - - - Erzeugen von OpenPGP-Schlüsseln - OpenPGP ist ein offenes Protokoll zur Verschlüsselung von E-Mails mit einem öffentlichen Schlüssel, dessen Kryptografie auf PGP basiert. In diesem Protokoll werden Standardformate für verschlüsselte Nachrichten, Unterschriften und geheime Schlüssel definiert. Es ist für den Austausch öffentlicher Schlüssel zertifiziert. - Die Kryptografie öffentlicher Schlüssel ist ein Konzept, welches die Nutzung zweier Schlüssel beinhaltet: einen öffentlichen Schlüssel, den Sie an jeden Ihrer Kommunikationspartner weitergeben können, sowie einen geheimen Schlüssel, der rein privat ist und geheimgehalten werden muss. - So erzeugen Sie OpenPGP-Schlüssel: - - Wählen Sie DateiNeu. - - - Wählen Sie PGP-Schlüssel und klicken Sie auf Weiter - - - Geben Sie Ihren vollen Namen (Vorname - Nachname), Ihre E-Mail-Adresse und eventuell zusätzliche Informationen ein. Sie können auch erweiterte Optionen für den Schlüssel eingeben. Siehe unten. - - - Klicken Sie auf Erzeugen, um ein neues Schlüsselpaar zu erzeugen. - - - Das Dialogfenster Kennwort des neuen PGP-Schlüssels wird geöffnet. Geben Sie das Kennwort für Ihren neuen Schlüssel zweimal ein. - - - - Gehen sie beim Wählen eines Kennworts ähnlich vor wie beim Erzeugen eines starken Passworts. Der wichtigste Unterschied zwischen einem Passwort und einem Kennwort besteht darin, dass in einem Kennwort auch Leerzeichen gültige Zeichen sind. - - - - Erweiterte Einstellungen - Öffnen Sie den Bereich Erweiterte Optionen, um folgende Optionen für den neuen Schlüssel zu wählen: - - - Verschlüsselungs-Typ - - Dieses Feld bezeichnet die Verschlüsselungsalgorithmen, die beim Erzeugen Ihrer Schlüssel benutzt werden. - - - DSA ElGamal - - Dies ist die bevorzugte Wahl, weil damit Verschlüsseln, Entschlüsseln, Signieren und Überprüfen möglich sind. - - - - DSA - - Erlaubt nur das Signieren. - - - - RSA - - Erlaubt nur das Signieren. - - - - - - - Schlüssellänge (Bit) - - Dies bezeichnet die Länge des Schlüssels in Bit. Je länger der Schlüssel ist, umso sicherer ist er auch, vorausgesetzt, Sie verwenden ein sicheres Kennwort. Andererseits wird das Ausführen von Operationen mit einem längeren Schlüssel mehr Zeit in Anspruch nehmen als mit einem kürzeren Schlüssel. Schlüssellängen zwischen 1024 und 4096 Bit werden akzeptiert, jedoch sind mindestens 2048 Bit zu empfehlen. - - - - Ablaufdatum - - Dies bezeichnet das Datum, bis zu welchem der Schlüssel für Verschlüsselungen oder Signaturen genutzt werden kann. Sechs Monate sind hierfür ein vernünftiger Wert. Nach dem Ende dieser Zeitspanne können Sie entweder das Ablaufdatum ändern oder einen neuen Schlüssel oder Unterschlüssel erzeugen. - Signieren Sie Ihren neuen Schlüssel mit Ihrem alten Schlüssel, bevor er verfällt, um den Status Ihrer Vertrauenswürdigkeit zu bewahren. - - - - - - - - - - - Erzeugen von Secure-Shell-Schlüsseln - Die »Secure Shell« (SSH) bietet eine Möglichkeit, sich an einem entfernten Computer anzumelden, um dort Befehle auszuführen. SSH-Schlüssel werden in schlüsselbasierten Authentifizierungssystemen als Alternative zur standardmäßigen Authentifizierung mittels Passwort verwendet. Durch die schlüsselbasierte Authentifizierung ist es nicht notwendig, ein Passwort per Hand einzugeben. - Secure-Shell-Schlüssel bestehen aus zwei Schlüsseln: einem geheimen Schlüssel, der geheimgehalten werden muss, und einem öffentlichen Schlüssel, der zu jedem Computer übertragen werden kann, auf den Sie zugreifen wollen. - So erzeugen Sie einen SSH-Schlüssel. - - - Wählen Sie DateiNeu. - - - Wählen Sie SSH-Schlüssel und klicken Sie dann auf Weiter. - - - Geben Sie eine Beschreibung des Verwendungszwecks ein. Sie können Ihre E-Mail-Adresse oder etwas Ähnliches als Gedankenstütze verwenden. Außerdem können Sie erweiterte Optionen für den Schlüssel eingeben. Siehe unten. - - - Klicken Sie auf Lediglich Schlüssel erzeugen, um einen neuen Schlüssel zu erzeugen, oder auf Erstellen und Einrichten, um den Schlüssel zu erzeugen und ihn für die Authentifizierung auf einem anderen Computer einzurichten. - - - Das Dialogfenster Kennwort des neuen SSH-Schlüssels wird geöffnet. Geben Sie das Kennwort für Ihren neuen Schlüssel zweimal ein. - - Gehen sie beim Wählen eines Kennworts ähnlich vor wie beim Erzeugen eines starken Passworts. Der wichtigste Unterschied zwischen einem Passwort und einem Kennwort besteht darin, dass in einem Kennwort auch Leerzeichen gültige Zeichen sind. - - - - - - - - Erweiterte Einstellungen - Klappen Sie den Abschnitt Erweiterte Optionen aus, um folgende Optionen für einen neuen Schlüssel zu wählen. - - - - Verschlüsselungs-Typ - - In diesem Feld legen Sie den Verschlüsselungsalgorithmus zur Erzeugung Ihres Schlüssels fest. - - - RSA - - Verwendet den Rivest-ShamirAdleman-Algorithmus (RSA) zur Erzeugung des SSH-Schlüssels. Dies sollten Sie aus Sicherheitsgründen bevorzugen. - - - - DSA - - Verwendet den Digital Signature Algorithm-Algorithmus (DSA) zur Erzeugung des SSH-Schlüssels. - - - - - - - Schlüssellänge (Bit) - - Dies bezeichnet die Länge des Schlüssels in Bit. Je länger der Schlüssel ist, umso sicherer ist er auch, vorausgesetzt, Sie verwenden ein sicheres Kennwort. Andererseits wird das Ausführen von Operationen mit einem längeren Schlüssel mehr Zeit in Anspruch nehmen als mit einem kürzeren Schlüssel. Schlüssellängen zwischen 1024 und 4096 Bit werden akzeptiert, jedoch sind mindestens 2048 Bit zu empfehlen. - - - - - - - - - - Eigenschaften von OpenPGP-Schlüsseln - Die Beschreibungen in diesem Abschnitt werden allen OpenPGP-Schlüsseln zugeordnet. - - So zeigen Sie die Eigenschaften eines PGP-Schlüssels an: - - Wählen Sie den PGP-Schlüssel im Hauptfenster. - - - Doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. - - - Wählen Sie den Reiter Details. - - - - - Eigenschaften - - - - Fingerabdruck - - Der Fingerabdruck ist eine einzigartige Zeichenkette, die einen Schlüssel exakt identifiziert. - - - - Schlüsselkennung - - Die Schlüsselkennung entspricht dem Fingerabdruck, wobei die Schlüsselkennung lediglich die letzten 8 Zeichen des Fingerabdrucks enthält. Meist ist es möglich, einen Schlüssel nur über diese Schlüsselkennung zu identifizieren, doch gelegentlich haben auch zwei Schlüssel die gleiche Kennung. - - - - Typ - - Legt den zur Erzeugung eines Schlüssels verwendeten Algorithmus fest. DSA-Schlüssel können lediglich signieren, ElGamal-Schlüssel werden zur Verschlüsselung verwendet. - - - - Erzeugt - - Bezeichnet das Erzeugungsdatum des Schlüssels. - - - - Läuft ab - - Gibt das Datum an, ab dem der Schlüssel nicht mehr verwendet werden kann. - - - - Länge - - Bezeichnet die Schlüssellänge in bit. Vereinfacht ausgedrückt, je länger der Schlüssel ist, umso mehr Sicherheit bietet er. - Ein langer Schlüssel allein reicht nicht aus, wenn das Kennwort zu schwach ist. - - - - - - - - - Vertrauen - Die Vertrauenswürdigkeit zeigt an, wie Sie eine Person bezüglich ihrer Verlässlichkeit einschätzen. Wenn Ihnen ein Schlüssel begegnet, den Sie nicht selbst signiert haben, wird die Gültigkeit des Schlüssels von dieser Person anhand der bisher gesammelten Signaturen sowie Ihrer Einschätzung der Vertrauenswürdigkeit der Ersteller dieser Signaturen eingestuft. Per Vorgabe erfordert ein unbekannter Schlüssel mindestens drei Signaturen geringfügiger Vertrauenswürdigkeit oder eine Signatur, der Sie absolut vertrauen. - - Unbekannt: Sie können die Fähigkeiten der Person zum korrekten Signieren von Schlüsseln nicht einschätzen. - Nie: Diese Person kann Schlüssel nicht korrekt signieren. - Geringfügig: Diese Person überprüft zwar die Foto-Kennung vor dem Signieren eines Schlüssels, aber überprüft nicht notwendigerweise die Kennung genauer. - Vollkommen: Diese Person prüft genauestens die Foto-Kennung jeder Person vor der Bestätigung. Das bedeutet, dass beispielsweise nur Schlüssel bestätigt werden, die mit Sicherheit der Person gehören, die um Bestätigung bittet. - Absolut: Diese Stufe der Vertrauenswürdigkeit sollte ausschließlich Ihren eigenen Schlüsseln zugeordnet werden.. - - - - - Aktivieren und Deaktivieren von Schlüsseln - Wenn ein Schlüssel aktiviert ist, kann er zur Ausführung von Verschlüsselungen verwendet werden. Wenn ein Schlüssel deaktiviert ist, kann er nicht zum Verschlüsseln oder zur Überprüfung von Signaturen verwendet werden. - - - - Ablaufdatum - Ein Schlüssel kann, nachdem er abgelaufen ist, nicht mehr für Verschlüsselungen verwendet werden. Das Ändern des Ablaufdatums auf einen zukünftigen Zeitpunkt stellt dessen Gültigkeit wieder her. In der Praxis ist es empfehlenswert, einen Hauptschlüssel zu haben, der niemals verfällt, sowie mehrere Unterschlüssel, die mit dem Hauptschlüssel signiert wurden. - - - - Benutzerkennungen - Benutzerkennungen erlauben die Verwendung mehrerer Identitäten und E-Mail-Adressen mit dem gleichen Schlüssel. - Üblicherweise wird folgende Form verwendet: Name (Kommentar) <E-Mail-Adresse> - - - Hinzufügen einer Benutzerkennung - Hinzufügen einer Benutzerkennung ist nützlich, wenn Sie eine Identität für Ihre Arbeit und eine weitere für Ihre Freunde nutzen wollen. - So fügen Sie eine Benutzerkennung zu einem Schlüssel hinzu. - - Wählen Sie einen Schlüssel im Hauptfenster aus, - - - doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. - - - Wählen Sie den Reiter Namen und Signaturen aus. - - - Klicken Sie auf Name hinzufügen. - - - Wenn Sie die oben stehenden Anweisungen befolgt haben, wird ein Eingabedialog angezeigt. Die Eingabefelder werden unten detailliert beschrieben. - - - Vollständiger Name - - Geben Sie Ihren vollen Namen in der Form <Vorname> <Nachname> ein. Wahlweise können Sie einen zweiten Vornamen oder dessen Anfangsbuchstaben eingeben. - - - In dieses Feld müssen Sie mindestens 5 Zeichen eingeben. - - - - - - E-Mail-Adresse - - Auf Schlüsselservern oder bei anderen Schlüsselanbietern wird meist anhand Ihrer E-Mail-Adresse nach Ihrem Schlüssel gesucht. Stellen Sie zunächst sicher, dass diese korrekt eingegeben wurde. - - - Die E-Mail-Adresse sollte dieser Form folgen: <Benutzername>@<Domainname> - - - - - - Optionaler Kommentar, der den Schlüssel beschreibt - - Das Kommentarfeld kann für eine zusätzlich im Namen Ihrer neuen Kennung anzuzeigende Information verwendet werden. Diese Information steht auch bei Suchvorgängen auf Schlüsselservern zur Verfügung. - - - - - - - - Foto-Kennungen - Foto-Kennungen erlauben dem Eigentümer eines Schlüssels, ein oder mehrere Bilder von sich selbst in diesen Schlüssel einzubetten. Diese Kennungen können ebenso wie gewöhnliche Benutzerkennungen signiert werden. Ein Foto muss im JPEG-Format vorliegen und sollte nicht größer als 240 mal 288 Pixel sein. - Falls das gewählte Bild nicht im erforderlichen Dateityp oder der korrekten Größe vorliegt, kann Passwörter und Verschlüsselung das benötigte Bild direkt aus jedem von der GDK-Bibliothek unterstützten Format erzeugen. - - - - Kennwort ändern - So ändern Sie das Kennwort eines Schlüssels. - - Wählen Sie einen Schlüssel im Hauptfenster aus, - - - Doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. - - - klicken Sie auf Kennwort ändern. - - - Geben Sie ein neues Kennwort ein und klicken Sie auf OK. - - - - Entfernen eines Schlüssels - So entfernen Sie einen Schlüssel aus Ihrem Schlüsselbund: - - Wählen Sie einen Schlüssel im Hauptfenster aus, - - - Klicken Sie mit der rechten Maustaste darauf und wählen Sie Schlüssel löschen oder wählen Sie BearbeitenSchlüssel löschen. - - - - Sie können Ihre eigenen Schlüssel, vertrauenswürdige Schlüssel und gesammelte Schlüssel entfernen. - - - - - - - - Eigenschaften eines OpenPGP-Unterschlüssels - Jeder OpenPGP-Schlüssel hat einen einzelnen Hauptschlüssel, der nur zum Signieren verwendet werden kann. Unterschlüssel können dagegen sowohl zum Verschlüsseln als auch zum Signieren verewendet werden. Deshalb brauchen Sie Ihren Hauptschlüssel nicht zu widerrufen, falls Ihr Unterschlüssel gefährdet ist. - - - ID - - Dies ist die Kennung des Unterschlüssels. - - - - Typ - - Legt den zur Erzeugung eines Unterschlüssels verwendeten Algorithmus fest. DSA-Schlüssel können lediglich signieren, ElGamal-Schlüssel werden zur Verschlüsselung verwendet und RSA-Schlüssel können sowohl signieren als auch verschlüsseln. - - - - Erzeugt - - Bezeichnet das Erzeugungsdatum des Schlüssels. - - - - Läuft ab - - Gibt das Datum an, ab dem der Schlüssel nicht mehr verwendet werden kann. - - - - Status - - Gibt den Status des Schlüssels an. - - - - Länge - - Gibt die Länge des Schlüssels in Bit an. Allgemein steigt die Sicherheit eines Schlüssels mit dessen Länge. - Ein langer Schlüssel allein reicht nicht aus, wenn das Kennwort zu schwach ist. - - - - - - - Hinzufügen eines Unterschlüssels - Zum Hinzufügen eines Unterschlüssels zu einem Schlüssel klicken Sie im Abschnitt Unterschlüssel auf Hinzufügen. - Wenn Sie die oben stehenden Anweisungen befolgt haben, wird ein Eingabedialog angezeigt. Die Eingabefelder werden unten detailliert beschrieben. - - - Schlüssel-Typ - - Bezeichnet den Verschlüsselungs-Algorithmus zum Erzeugen eines Unterschlüssels. - - - DSA - - Verwendet den Digital Signature Algorithm (DSA) zur Erzeugung des Unterschlüssels. Dieser Schlüssel kann nur zum Signieren verwendet werden. - - - - ElGamal - - Verwendet den ElGamal-Algorithmus zur Erzeugung des Unterschlüssels. Dieser Schlüssel kann nur zum Verschlüsseln verwendet werden. - - - - RSA - - Verwendet den Rivest-Shamir Adleman-Algorithmus (RSA) zur Erzeugung des Unterschlüssels. Dieser Schlüssel kann sowohl signieren als auch verschlüsseln, allerdings müssen dafür zwei verschiedene Unterschlüssel erzeugt werden. - - - - - - - Schlüssellänge - - Bezeichnet die Länge des Schlüssel in Bit. Allgemein lässt sich sagen: Je länger der Schlüssel, desto sicherer ist er. - - - - Ablaufdatum - - Legt das Datum fest, ab dem der Unterschlüssel nicht mehr benutzt werden kann. - - - - - - - Ändern des Abalufdatums eines Unterschlüssels - Um das Ablaufdatum eines Unterschlüssels zu ändern, wählen Sie den Unterschlüssel im Abschnitt Unterschlüssel, und dann: - - Klicken Sie auf die Schaltfläche Expire an der linken Seite. - - - Im Datum-Dialog wählen Sie das neue Ablaufdatum oder wählen Läuft nie ab, um kein Ablaufdatum zu bestimmen. - - - - - - Widerrufen eines Unterschlüssels - Um einen Unterschlüssel zu widerrufen, wählen Sie den Unterschlüssel im Abschnitt Unterschlüssel, und dann: - - Klicken Sie auf Widerrufen an der linken Seite. - - - Wählen Sie einen Grund, warum Sie den Unterschlüssel widerrufen. - - - - Kein Grund - - Es gibt keinen bestimmten Grund, weswegen Sie den Schlüssel widerrufen. - - - - Unsicher - - Schlüssel ist nicht mehr sicher. - - - - Ersetzt - - Der Schlüssel wurde durch einen anderen ersetzt. - - - - Nicht verwendet - - Der Schlüssel wird nicht mehr benutzt. - - - - - - - Geben Sie eine Beschreibung ein, warum Sie den Schlüssel widerrufen, - - - Klicken Sie auf Widerrufen. - - - - Der Widerruf des Schlüssels wird unmittelbar ausgeführt. - - - - - Entfernen eines Unterschlüssels - Um einen Unterschlüssel zu entfernen, wählen Sie diesen im Abschnitt Unterschlüssel aus, und dann: - - Klicken Sie auf die Schaltfläche Löschen an der linken Seite. - - - - - - - - - Eigenschaften von SSH-Schlüsseln - Die Beschreibungen in diesem Abschnitt werden allen SSH-Schlüsseln zugeordnet. - So zeigen Sie die Eigenschaften eines SSH-Schlüssels an. - - Wählen Sie den Secure-Shell-Schlüssel im Hauptfenster aus, - - - Doppelklicken Sie darauf oder wählen Sie Eigenschaften in der Werkzeugleiste. - - - Wählen Sie den Reiter Details. - - - - - Eigenschaften - - - - Fingerabdruck - - Der Fingerabdruck ist eine einzigartige Zeichenkette, die einen Schlüssel exakt identifiziert. - - - - Algorithmus - - Legt den beim Erzeugen eines Schlüssels verwendeten Verschlüsselungsalgorithmus fest. - - - - Ort - - Dies bezeichnet den Speicherort des geheimen Schlüssels. - - - - Länge - - Bezeichnet die Schlüssellänge in bit. Vereinfacht ausgedrückt, je länger der Schlüssel ist, umso mehr Sicherheit bietet er. - Ein langer Schlüssel allein reicht nicht aus, wenn das Kennwort zu schwach ist. - - - - - - - - - Entfernen eines SSH-Schlüssels - So entfernen Sie einen Secure-Shell-Schlüssel. - - Wählen Sie den SSH-Schlüssel im Hauptfenster aus. - - - Klicken Sie mit der rechten Maustaste darauf und wählen Sie Schlüssel löschen oder wählen Sie BearbeitenSchlüssel löschen. - - - - - - - - - Importieren von Schlüsseln - Um Schlüssel zu importieren, wählen Sie DateiImportieren und wählen im Dateidialog mindestens eine ASCII-Datei aus, die einen eingebetteten öffentlichen Schlüssel enthält. - Importieren von Schlüsseln kann auch durch Einfügen der Schlüssel in Passwörter und Verschlüsselung ausgeführt werden: - - Wählen Sie einen ASCII-Text mit einem eingebetteten öffentlichen Schlüssel aus, - - - kopieren Sie die Auswahl in die Zwischenablage, - - - Wählen Sie BearbeitenSchlüssel einfügen. - - - - - - - - Exportieren von Schlüsseln - Um Schlüssel zu exportieren, wählen Sie die Schlüssel im Hauptfenster aus und wählen Sie DateiExportieren. - Sie können auch in einen ASCII-Text eingebettete Schlüssel in die Zwischenablage exportieren: - - Wählen Sie die Schlüssel im Hauptfenster aus, - - - Wählen Sie BearbeitenSchlüssel kopieren. - - - - - - - - - Signieren eines Schlüssels - Das Signieren eines Schlüssels einer anderen Person bedeutet einen Vertrauensbeweis gegenüber dieser Person. Bevor Sie dies tun, sollten Sie sorgfältig den Fingerabdruck des Schlüssels prüfen, um sichergehen zu können, dass der Schlüssel wirklich dieser Person zuzuordnen ist. - So signieren Sie einen Schlüssel in Ihrem Schlüsselbund: - - Wählen Sie den Schlüssel, den Sie signieren wollen, in den Reitern Vertrauenswürdige Schlüssel oder Gesammelte Schlüssel aus, - - - Wählen Sie Signieren in der Werkzeugleiste oder DateiSignieren, - - - Wählen Sie aus, wie sorgfältig Sie den Schlüssel überprüft haben. - - - Legt fest, ob die Signatur zu Ihrem lokalen Schlüsselbund gehören soll, und ob die Signatur widerrufen werden kann, - - - Klicken Sie auf Signieren. - - - - - - - - Einstellungen - Dieser Abschnitt beschreibt die durch Auswahl von BearbeitenEinstellungen in Passwörter und Verschlüsselung verfügbaren Einstellmöglichkeiten. - - - Passwort-Schüsselbünde - - Erzeugen von Schlüsselbünden - Um einen neuen Schlüsselbund anzulegen, wählen Sie DateiImportieren und wählen dann Passwort-Schlüsselbund. Geben Sie einen Namen für den neuen Schlüsselbund ein und drücken Sie die Eingabetaste. - - - Ändern der Passwörter von Schlüsselbünden - Um das Passwort zum Entsperren des Schlüsselbunds zu ändern, wählen Sie zuerst den gewünschten Schlüsselbund aus und klicken dann auf Passwort zum Entsperren ändern. Sie werden aufgefordert, das alte Passwort in das Texteingabefeld Altes Passwort einzugeben. Danach werden Sie aufgefordert, das neue Passwort in das Texteingabefeld Neues Passwort einzugeben, sowie die Eingabe im Texteingabefeld Passwort bestätigen zu bestätigen. Um die Änderungen anzuwenden, klicken Sie auf Ändern. Wenn die Eingabe des alten Passworts korrekt war, erhalten Sie eine Statusnachricht, dass die Aktion erfolgreich war. Falls das alte Passwort nicht korrekt eingegeben wurde, werden Sie um dessen Überprüfung gebeten. - - - Entfernen von Schlüsselbünden - Um einen Schlüsselbund zu entfernen, wählen Sie zunächst den entsprechenden Schlüsselbund aus und wählen Sie anschließend BearbeitenLöschen. - - - - - Schlüssel-Server - Halten Sie Ihre eigenen Schlüssel und die Schlüssel Anderer auf dem aktuellen Stand, indem Sie die Schlüssel regelmäßig mit entfernten Schlüsselservern abgleichen. Das Abgleichen stellt sicher, dass Sie über die neuesten Signaturen Ihrer eigenen Schlüssel verfügen und dadurch aus den Ihnen erwiesenen Vertrauensbeweisen den größtmöglichen Nutzen ziehen. - Passwörter und Verschlüsselung unterstützt HKP- und LDAP-Schlüsselserver. - - - HKP-Server - - HKP-Schlüsselserver sind normale webbasierte Schlüsselserver, wie beispielsweise der populäre hkp://pool.sks-keyservers.net, der auch über http://sks-keyservers.net erreichbar ist. - - - - LDAP Schlüsselserver - - LDAP-Schlüsselserver sind weniger gebräuchlich, aber verwenden das Standard-LDAP-Protokoll, um Schlüssel zur Verfügung zu stellen. ldap://keyserver.pgp.com ist ein empfehlenswerter LDAP-Server. - - - - - - - Schlüsselfreigabe - Die Schlüsselfreigabe erfolgt mittels DNS-SD, auch als Bonjour oder Rendezvous bekannt. Die Aktivierung der Schlüsselfreigabe fügt den öffentlichen Schlüsselbund des lokalen Benutzers von Passwörter und Verschlüsselung zum entfernten Suchdialog hinzu. Der Zugriff auf solche lokalen »Schlüsselserver« ist meist schneller als auf entfernte Server. - - - - - - - Info zu »Passwörter und Verschlüsselung« - Passwörter und Verschlüsselung, die zugehörigen Anwendungs-Plugins, das Einstellungs-Applet sowie das Panel-Applet werden unter dem Namen Seahorse zusammengefasst. Seahorse wurde von Jacob Perkins geschrieben. Die gegenwärtigen Hauptentwickler sind Stef Walter und Adam Schreiber. Dieses Handbuch stammt von Adam Schreiber. Die Website des Projekts wurde von Jim Pharis entworfen. Für weitere Informationen über das Seahorse-Projekt besuchen Sie bitte die Seahorse-Website. - Um Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder zu diesem Handbuch zu machen, folgen Sie den Anweisungen im GNOME-Benutzerhandbuch. - Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version. Eine Kopie dieser Lizenz ist in dieser Dokumentation enthalten, eine weitere in der Datei COPYING, die im Quellcode dieses Programms enthalten ist. - -
diff -Nru seahorse-3.2.2/help/el/el.po seahorse-3.6.3/help/el/el.po --- seahorse-3.2.2/help/el/el.po 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/el/el.po 2012-09-18 13:10:35.000000000 +0200 @@ -4,58 +4,105 @@ msgid "" msgstr "" "Project-Id-Version: el\n" -"POT-Creation-Date: 2009-11-06 04:14+0000\n" -"PO-Revision-Date: 2009-08-27 02:29+0300\n" -"Last-Translator: Μάριος Ζηντίλης \n" +"POT-Creation-Date: 2012-09-09 13:29+0000\n" +"PO-Revision-Date: 2012-09-10 11:49+0200\n" +"Last-Translator: Tom Tryfonidis \n" "Language-Team: Greek \n" +"Language: el\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/seahorse.xml:224(None) +# #-#-#-#-# gnome-power-manager.HEAD.el.po (el) #-#-#-#-# +# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# +# +# #-#-#-#-# procman.HEAD.el.po (el) #-#-#-#-# +# +# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# +# +# #-#-#-#-# accerciser.HEAD.el.po (accerciser) #-#-#-#-# +# #-#-#-#-# gnome-power-manager.HEAD.el.po (el) #-#-#-#-# +# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# +# +# #-#-#-#-# procman.HEAD.el.po (el) #-#-#-#-# +# +# #-#-#-#-# gnome-system-monitor.HEAD.el.po (el) #-#-#-#-# +# +# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# +# +# #-#-#-#-# gnome-system-monitor.HEAD.el.po (el) #-#-#-#-# +# +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +#| msgid "translator-credits" +msgctxt "_" +msgid "translator-credits" +msgstr "Φώτης Τσάμης , 2009" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:224(imagedata) +#| msgid "" +#| "@@image: 'figures/seahorse-window.png'; " +#| "md5=d52b0902a24b89d5aadc50e64f471c7d" +msgctxt "_" msgid "" -"@@image: 'figures/seahorse-window.png'; md5=d52b0902a24b89d5aadc50e64f471c7d" +"external ref='figures/seahorse-window.png' " +"md5='d52b0902a24b89d5aadc50e64f471c7d'" msgstr "" -"@@image: 'figures/seahorse-window.png'; md5=d52b0902a24b89d5aadc50e64f471c7d" +"external ref='figures/seahorse-window.png' " +"md5='d52b0902a24b89d5aadc50e64f471c7d'" -#: C/seahorse.xml:16(title) -msgid "Passwords and Encryption Keys Manual" +#: C/index.docbook:16(articleinfo/title) +msgid "Passwords and Keys Manual" msgstr "Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης" -#: C/seahorse.xml:18(year) -msgid "2005, 2006, 2007, 2008, 2009" -msgstr "2005, 2006, 2007, 2008, 2009" - -#: C/seahorse.xml:19(holder) -msgid "Jacob Perkins and Adam Schreiber" -msgstr "Jacob Perkins και Adam Schreiber" - -#: C/seahorse.xml:22(publishername) C/seahorse.xml:31(orgname) -#: C/seahorse.xml:43(orgname) C/seahorse.xml:63(publishername) -#: C/seahorse.xml:106(para) C/seahorse.xml:118(para) +#: C/index.docbook:17(articleinfo/copyright) +msgid "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins and Adam " +"Schreiber" +msgstr "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins και Adam " +"Schreiber" + +#: C/index.docbook:22(publisher/publishername) +#: C/index.docbook:63(publisher/publishername) +#: C/index.docbook:106(revdescription/para) +#: C/index.docbook:118(revdescription/para) msgid "Seahorse Project" msgstr "Έργο Seahorse" -#: C/seahorse.xml:2(para) +#: C/index.docbook:2(legalnotice/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." 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." +"of the GFDL at this link or in " +"the file COPYING-DOCS distributed with this manual." msgstr "" -"Σας παρέχεται άδεια να αντιγράψετε, διανείμετε ή/και να τροποποιήσετε το " -"υπάρχον κείμενο υπό τους όρους της άδειας GNU Free Documentation License " -"(GFDL), έκδοση 1.1, ή οποιαδήποτε μεταγενέστερη έκδοση που να έχει εκδοθεί " -"από το Free Software Foundation υπό τις προϋποθέσεις no Invariant Sections, " -"no Front-Cover Texts, και no Back-Cover Texts. Μπορείτε να βρείτε αντίγραφο " -"του GFDL σε αυτόν το σύνδεσμο " -"ή στο αρχείο COPYING-DOCS όπως διανέμεται με αυτή την τεκμηρίωση." +"Επιτρέπεται η αντιγραφή, αναδιανομή και/η τροποποίηση αυτού του εγγράφου υπό " +"τους όρους της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), Έκδοση 1.1 ή νεότερη " +"που εκδόθηκε από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Αμετάβλητα Τμήματα, " +"χωρίς Κείμενο Εξωφύλλου, και χωρίς Κείμενο Οπισθόφυλλου. Μπορείτε να βρείτε " +"ένα αντίγραφο της GFDL σε αυτό το σύνδεσμο ή στο αρχείο COPYING-DOCS που διανέμεται με αυτό το " +"εγχειρίδιο." -#: C/seahorse.xml:12(para) +#: C/index.docbook:12(legalnotice/para) C/legal.xml:12(legalnotice/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, " @@ -67,7 +114,7 @@ "εγχειρίδιο ξεχωριστά από τη συλλογή, οφείλετε να προσθέσετε στο εγχειρίδιο " "αντίγραφο της άδειας χρήσης, όπως προβλέπεται στο άρθρο 6 της άδειας." -#: C/seahorse.xml:19(para) +#: C/index.docbook:19(legalnotice/para) C/legal.xml:19(legalnotice/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 " @@ -81,7 +128,7 @@ "Τεκμηρίωσης του GNOME το γνωρίζουν, τότε αυτά τα ονόματα γράφονται με " "κεφαλαία γράμματα ή ξεκινούν με κεφαλαίο γράμμα." -#: C/seahorse.xml:35(para) +#: C/index.docbook:35(listitem/para) C/legal.xml:35(listitem/para) msgid "" "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " @@ -109,7 +156,7 @@ "ΤΡΟΠΟΠΟΙΗΜΕΝΟΥ ΕΓΓΡΑΦΟΥ ΕΞΟΥΣΙΟΔΟΤΕΙΤΑΙ ΕΦΕΞΗΣ, ΠΑΡΑ ΥΠΟ ΤΟΝ ΟΡΟ ΤΗΣ ΩΣ ΑΝΩ " "ΠΑΡΑΙΤΗΣΗΣ ΚΑΙ" -#: C/seahorse.xml:55(para) +#: C/index.docbook:55(listitem/para) C/legal.xml:55(listitem/para) msgid "" "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " "NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " @@ -129,172 +176,177 @@ "ΑΥΤΗΣ ΑΚΟΜΑ ΚΑΙ ΕΑΝ ΕΧΕΙ ΥΠΑΡΞΕΙ ΠΡΟΕΙΔΟΠΟΙΗΣΗ ΓΙΑ ΤΗΝ ΠΙΘΑΝΟΤΗΤΑ ΥΠΑΡΞΗΣ " "ΤΕΤΟΙΩΝ ΖΗΜΙΩΝ." -#: C/seahorse.xml:28(para) +#: C/index.docbook:28(legalnotice/para) C/legal.xml:28(legalnotice/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: " msgid "" "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " "OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " -"" +"<_:orderedlist-1/>" msgstr "" "ΤΟ ΈΓΓΡΑΦΟ ΚΑΙ ΤΡΟΠΟΠΟΙΗΜΕΝΕΣ ΕΚΔΟΣΕΙΣ ΑΥΤΟΥ ΠΑΡΕΧΟΝΤΑΙ ΥΠΟ ΤΟΥΣ ΟΡΟΥΣ ΤΗΣ " -"ΑΔΕΙΑΣ GNU FREE DOCUMENTATION ΜΕ ΤΗΝ ΠΕΡΑΙΤΕΡΩ ΔΙΕΥΚΡΙΝΙΣΗ ΟΤΙ: " +"ΑΔΕΙΑΣ GNU FREE DOCUMENTATION ΜΕ ΤΗΝ ΠΕΡΑΙΤΕΡΩ ΔΙΕΥΚΡΙΝΙΣΗ ΟΤΙ: <_:" +"orderedlist-1/>" + +#: C/index.docbook:27(authorgroup/author) +msgid "" +"Jacob Perkins " +"Seahorse Project " +msgstr "" +"Jacob Perkins " +"Έργο Seahorse " -#: C/seahorse.xml:28(firstname) -msgid "Jacob" -msgstr "Jacob" - -#: C/seahorse.xml:29(surname) -msgid "Perkins" -msgstr "Perkins" - -#: C/seahorse.xml:40(firstname) -msgid "Adam" -msgstr "Adam" - -#: C/seahorse.xml:41(surname) -msgid "Schreiber" -msgstr "Schreiber" - -#: C/seahorse.xml:45(email) -msgid "sadam@clemson.edu" -msgstr "sadam@clemson.edu" - -#: C/seahorse.xml:50(firstname) -msgid "Paul" -msgstr "Paul" - -#: C/seahorse.xml:51(surname) -msgid "Cutler" -msgstr "Cutler" +#: C/index.docbook:39(authorgroup/author) +msgid "" +"Adam Schreiber " +"Seahorse Project
sadam@clemson.edu
" +msgstr "" +"Adam Schreiber " +"Seahorse Project
sadam@clemson.edu
" + +#: C/index.docbook:49(authorgroup/author) +msgid "" +"Paul Cutler " +"GNOME Documentation Project
" +"pcutler@foresightlinux.org
" +msgstr "" +"Paul Cutler " +"Ομάδα τεκμηρίωσης GNOME " +"
pcutler@foresightlinux.org
" -#: C/seahorse.xml:53(orgname) C/seahorse.xml:66(publishername) +#: C/index.docbook:66(publisher/publishername) msgid "GNOME Documentation Project" msgstr "Έργο τεκμηρίωσης του GNOME" -#: C/seahorse.xml:55(email) -msgid "pcutler@foresightlinux.org" -msgstr "pcutler@foresightlinux.org" - -#: C/seahorse.xml:70(revnumber) -msgid "Passwords and Encryption Keys Manual V2.11.0" -msgstr "Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης, έκδοση 2.11.0" - -#: C/seahorse.xml:71(date) -msgid "May 2009" -msgstr "Μάιος 2009" - -#: C/seahorse.xml:73(para) +#: C/index.docbook:73(revdescription/para) msgid "Paul Cutler pcutler@foresightlinux.org" msgstr "Paul Cutler pcutler@foresightlinux.org" -#: C/seahorse.xml:80(revnumber) -msgid "Passwords and Encryption Keys Manual V0.10.1" -msgstr "Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.10.1" - -#: C/seahorse.xml:81(date) -msgid "August 2008" -msgstr "Αύγουστος 2008" +#: C/index.docbook:69(revhistory/revision) +msgid "" +"Passwords and Keys Manual V2.11.0 May 2009 <_:revdescription-1/>" +msgstr "" +"Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V2.11.0 Μάιος 2009 <_:revdescription-1/>" -#: C/seahorse.xml:83(para) C/seahorse.xml:103(para) +#: C/index.docbook:83(revdescription/para) +#: C/index.docbook:103(revdescription/para) msgid "Adam Schreiber sadam@clemson.edu" msgstr "Adam Schreiber sadam@clemson.edu" -#: C/seahorse.xml:90(revnumber) -msgid "Passwords and Encryption Keys Manual V0.9.1" -msgstr "Κωδικοί και κλειδιά κρυπτογράφησης V0.9.1" - -#: C/seahorse.xml:91(date) -msgid "November 2006" -msgstr "Νοέμβριος 2006" +#: C/index.docbook:79(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.10.1 August 2008 <_:revdescription-1/>" +msgstr "" +"Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.10.1 Αύγουστος 2008 <_:revdescription-1/>" -#: C/seahorse.xml:93(para) +#: C/index.docbook:93(revdescription/para) msgid "Milo Casagrande milo_casagrande@yahoo.it" msgstr "Milo Casagrande milo_casagrande@yahoo.it" -#: C/seahorse.xml:100(revnumber) -msgid "Passwords and Encryption Keys Manual V0.9.0" -msgstr "Κωδικοί και κλειδιά κρυπτογράφησης V0.9.0" - -#: C/seahorse.xml:101(date) -msgid "July 2005" -msgstr "Ιούλιος 2005" - -#: C/seahorse.xml:110(revnumber) -msgid "Passwords and Encryption Keys Manual V0.7.0" -msgstr "Κωδικοί και κλειδιά κρυπτογράφησης V0.7.0" +#: C/index.docbook:89(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.1 November 2006 <_:revdescription-1/>" +msgstr "" +"Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.9.1 Νοέμβριος 2006 <_:revdescription-1/>" -# #-#-#-#-# gnome-utils.HEAD.el.po (el) #-#-#-#-# -# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation") -#: C/seahorse.xml:111(date) -msgid "February 2003" -msgstr "Φεβρουάριος 2003" +#: C/index.docbook:99(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.0 July 2005 <_:revdescription-1/>" +msgstr "" +"Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.9.0 Ιούλιος 2005 <_:revdescription-1/>" -#: C/seahorse.xml:113(para) +#: C/index.docbook:113(revdescription/para) msgid "Jacob Perkins" msgstr "Jacob Perkins" -#: C/seahorse.xml:122(releaseinfo) -msgid "This manual describes version 2.28.x of Passwords and Encryption Keys" +#: C/index.docbook:109(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.7.0 February 2003 <_:revdescription-1/>" +msgstr "" +"Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.7.0 Φεβρουάριος 2003 <_:revdescription-1/>" + +#: C/index.docbook:122(articleinfo/releaseinfo) +msgid "This manual describes version 2.28.x of Passwords and Keys" msgstr "" "Αυτό το εγχειρίδιο περιγράφει την έκδοση 2.28.x του Κωδικοί και κλειδιά " "κρυπτογράφησης" -#: C/seahorse.xml:124(title) +#: C/index.docbook:124(legalnotice/title) msgid "Feedback" msgstr "Ανάδραση" -#: C/seahorse.xml:125(para) +#: C/index.docbook:125(legalnotice/para) +#| msgid "" +#| "To report a bug or make a suggestion regarding the Passwords " +#| "and Keys application or this manual, follow the directions " +#| "in the Gnome Feedback " +#| "Page." msgid "" "To report a bug or make a suggestion regarding the Passwords " -"and Encryption Keys application or this manual, follow the " -"directions in the Gnome " -"Feedback Page." +"and Keys application or this manual, follow the directions in " +"the Gnome Feedback Page." msgstr "" "Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με το " -"Κωδικοί και κλειδιά κρυπτογράφησης ή αυτό το " -"εγχειρίδιο, ακολουθήστε τις οδηγίες στη Κωδικοί και κλειδιά κρυπτογράφησης ή γι' αυτό το " +"εγχειρίδιο, ακολουθήστε τις οδηγίες στη Σελίδα ανάδρασης GNOME." -#: C/seahorse.xml:132(para) +#: C/index.docbook:132(abstract/para) msgid "" -"Passwords and Encryption Keys is the application " -"for managing encryption keys for the GNOME Desktop" +"Passwords and Keys is the application for " +"managing encryption keys for the GNOME Desktop" msgstr "" "Το Κωδικοί και κλειδιά κρυπτογράφησης είναι η " "εφαρμογή που διαχειρίζεται κλειδιά κρυπτογράφησης για την επιφάνεια εργασίας " "του GNOME" -#: C/seahorse.xml:140(primary) -msgid "Seahorse" -msgstr "Seahorse" - -#: C/seahorse.xml:144(primary) -msgid "seahorse" -msgstr "seahorse" - -#: C/seahorse.xml:148(primary) -msgid "Encryption Keys" -msgstr "Κλειδιά κρυπτογράφησης" +#: C/index.docbook:139(article/indexterm) +msgid "Seahorse" +msgstr "Seahorse" + +#: C/index.docbook:143(article/indexterm) +msgid "seahorse" +msgstr "seahorse" + +#: C/index.docbook:147(article/indexterm) +#| msgid "Encryption Keys" +msgid "Encryption Keys" +msgstr "Κλειδιά κρυπτογράφησης" -#: C/seahorse.xml:154(title) +#: C/index.docbook:154(sect1/title) msgid "Introduction" msgstr "Εισαγωγή" -#: C/seahorse.xml:155(para) +#: C/index.docbook:155(sect1/para) msgid "" -"You can use Passwords and Encryption Keys to " -"create and manage PGP and SSH keys." +"You can use Passwords and Keys to create and " +"manage PGP and SSH keys." msgstr "" "Μπορείτε να χρησιμοποιήσετε το Κωδικοί και κλειδιά " "κρυπτογράφησης για να δημιουργήσετε και να διαχειρίζεστε " "κλειδιά PGP και SSH." -#: C/seahorse.xml:158(para) +#: C/index.docbook:158(sect1/para) msgid "" -"Passwords and Encryption Keys provides a front " -"end to many of the features of Gnu Privacy Guard (GPG) and integrates with multiple " -"components of the GNOME desktop." +"Passwords and Keys provides a front end to many " +"of the features of Gnu " +"Privacy Guard (GPG) and integrates with multiple components of the " +"GNOME desktop." msgstr "" "Η εφαρμογή Κωδικοί και κλειδιά κρυπτογράφησης " "παρέχει ένα γραφικό περιβάλλον για πολλές από τις λειτουργίες του GNOME." -#: C/seahorse.xml:168(para) +#: C/index.docbook:168(listitem/para) msgid "Create and manage PGP and SSH keys," msgstr "Δημιουργία και διαχείριση κλειδιών PGP και SSH," -#: C/seahorse.xml:171(para) +#: C/index.docbook:171(listitem/para) msgid "Export and import PGP and SSH keys," msgstr "Εξαγωγή και εισαγωγή κλειδιών PGP και SSH," -#: C/seahorse.xml:174(para) +#: C/index.docbook:174(listitem/para) msgid "Share your keys with others," msgstr "Κοινή χρήση των κλειδιών σας με άλλους," -#: C/seahorse.xml:163(para) +#: C/index.docbook:163(sect1/para) +#| msgid "" +#| "With Passwords and Keys you can: " +#| "" msgid "" -"With Passwords and Encryption Keys you can: " -"" +"With Passwords and Keys you can: <_:" +"itemizedlist-1/>" msgstr "" "Με το Κωδικοί και κλειδιά κρυπτογράφησης " -"μπορείτε: " +"μπορείτε: <_:itemizedlist-1/>" -#: C/seahorse.xml:183(title) +#: C/index.docbook:183(sect1/title) msgid "Getting Started" msgstr "Ξεκινώντας" -#: C/seahorse.xml:185(title) -msgid "Starting Passwords and Encryption Keys" +#: C/index.docbook:185(sect2/title) +msgid "Starting Passwords and Keys" msgstr "" "Εκκίνηση του Κωδικοί και κλειδιά κρυπτογράφησης" -#: C/seahorse.xml:186(para) +#: C/index.docbook:186(sect2/para) msgid "" -"You can start Passwords and Encryption Keys in " -"the following ways:" +"You can start Passwords and Keys in the following " +"ways:" msgstr "" "Μπορείτε να ξεκινήσετε το Κωδικοί και κλειδιά κρυπτογράφησης με τους ακόλουθους τρόπους:" -#: C/seahorse.xml:192(term) +#: C/index.docbook:192(varlistentry/term) msgid "Applications menu" msgstr "Μενού Εφαρμογές" -#: C/seahorse.xml:194(para) +#: C/index.docbook:194(listitem/para) +#| msgid "" +#| "Choose AccessoriesPassword " +#| "and Keys." msgid "" -"Choose AccessoriesPassword and " -"Encryption Keys." +"Choose Accessories Password and " +"Keys ." msgstr "" -"Επιλέξτε ΒοηθήματαΚωδικοί και " -"κλειδιά κρυπτογράφησης." +"Επιλέξτε Βοηθήματα Κωδικοί και " +"κλειδιά κρυπτογράφησης ." -#: C/seahorse.xml:202(term) +#: C/index.docbook:202(varlistentry/term) msgid "Command Line" msgstr "Γραμμή εντολών" -#: C/seahorse.xml:204(para) +#: C/index.docbook:204(listitem/para) msgid "Type seahorse then press Return." msgstr "" "Πληκτρολογήστε seahorse, μετά πατήστε Return." -#: C/seahorse.xml:213(title) -msgid "When You Start Passwords and Encryption Keys" +#: C/index.docbook:213(sect2/title) +msgid "When You Start Passwords and Keys" msgstr "" "Όταν εκκινείτε το Κωδικοί και κλειδιά κρυπτογράφησης" -#: C/seahorse.xml:214(para) +#: C/index.docbook:214(sect2/para) msgid "" -"When you start Passwords and Encryption Keys, the " -"Password and Encryption Keys window is displayed." +"When you start Passwords and Keys, the " +"Password and Keys window is displayed." msgstr "" "Όταν εκκινείτε το Κωδικοί και κλειδιά κρυπτογράφησης, το παράθυρο Κωδικοί και κλειδιά κρυπτογράφησης εμφανίζεται." -#: C/seahorse.xml:220(title) -msgid "The Passwords and Encryption Keys Window" +#: C/index.docbook:220(figure/title) +msgid "The Passwords and Keys Window" msgstr "" "Το παράθυρο Κωδικοί και κλειδιά κρυπτογράφησης" -#: C/seahorse.xml:228(application) -msgid "Passwords and Encryption Keys" -msgstr "Κωδικοί και κλειδιά κρυπτογράφησης" - -#: C/seahorse.xml:227(phrase) -msgid "Show the window." -msgstr "Εμφάνιση του παραθύρου ." +#: C/index.docbook:222(screenshot/mediaobject) +msgid "" +" Show the Passwords " +"and Keys window. " +msgstr "" +" Το κύριο παράθυρο του " +"Κωδικοί και κλειδιά κρυπτογράφησης. " -#: C/seahorse.xml:235(para) +#: C/index.docbook:235(sect2/para) msgid "" -"The Passwords and Encryption Keys window contains " -"the following elements:" +"The Passwords and Keys window contains the " +"following elements:" msgstr "" "Το παράθυρο του Κωδικοί και κλειδιά κρυπτογράφησης περιλαμβάνει τα παρακάτω στοιχεία:" -#: C/seahorse.xml:240(term) +#: C/index.docbook:240(varlistentry/term) msgid "Menubar" msgstr "Γραμμή μενού" -#: C/seahorse.xml:242(para) +#: C/index.docbook:242(listitem/para) msgid "" "The menus on the menubar contain all of the commands that you need to " -"perform tasks in Passwords and Encryption Keys." +"perform tasks in Passwords and Keys." msgstr "" "Τα μενού στη γραμμή μενού περιέχουν όλες τις εντολές που θα χρειαστείτε για " "να δουλέψετε με το Κωδικοί και κλειδιά κρυπτογράφησης." -#: C/seahorse.xml:245(term) +#: C/index.docbook:245(varlistentry/term) msgid "Toolbar" msgstr "Εργαλειοθήκη" -#: C/seahorse.xml:247(para) +#: C/index.docbook:247(listitem/para) msgid "Use the toolbar to quickly access commonly-used commands." msgstr "" "Χρησιμοποιήστε την εργαλειοθήκη για να έχετε γρήγορη πρόσβαση σε συχνά " "χρησιμοποιούμενες εντολές." -#: C/seahorse.xml:250(term) +#: C/index.docbook:250(varlistentry/term) msgid "Keys and Passwords Tabs" msgstr "Στήλες κλειδιών και κωδικών" -#: C/seahorse.xml:252(para) +#: C/index.docbook:252(listitem/para) msgid "Provides access to the keys and passwords in the keyring." msgstr "" "Παρέχει πρόσβαση στα κλειδιά και στους κωδικούς πρόσβασης στην κλειδοθήκη." -#: C/seahorse.xml:255(term) +#: C/index.docbook:255(varlistentry/term) msgid "First time options" msgstr "Επιλογές πρώτης φοράς" -#: C/seahorse.xml:257(para) +#: C/index.docbook:257(listitem/para) msgid "" "Provides fast access to useful actions for first time users. From here you " "can:" @@ -441,23 +502,23 @@ "Παρέχει γρήγορη πρόσβαση σε χρήσιμες ενέργειες για αρχάριους χρήστες. Εδώ " "μπορείτε να κάνετε:" -#: C/seahorse.xml:260(para) +#: C/index.docbook:260(listitem/para) msgid "Browse the help system," msgstr "Περιήγηση στο σύστημα βοήθειας," -#: C/seahorse.xml:263(para) +#: C/index.docbook:263(listitem/para) msgid "Import keys in the keyring," msgstr "Εισαγωγή κλειδιών στην κλειδοθήκη," -#: C/seahorse.xml:266(para) +#: C/index.docbook:266(listitem/para) msgid "Create new keys." msgstr "Δημιουργία νέων κλειδιών." -#: C/seahorse.xml:278(title) +#: C/index.docbook:278(sect1/title) msgid "Creating OpenPGP Keys" msgstr "Δημιουργία κλειδιών OpenPGP" -#: C/seahorse.xml:279(para) +#: C/index.docbook:279(sect1/para) msgid "" "OpenPGP is a non proprietary protocol for encrypting e-mail with the use of " "public key cryptography based on PGP. It defines standard " @@ -469,7 +530,7 @@ "acronym>. Καθορίζει πρότυπα για κρυπτογραφημένα μηνύματα, υπογραφές, " "ιδιωτικά κλειδιά και πιστοποιητικά για τη συναλλαγή δημοσίων κλειδιών." -#: C/seahorse.xml:284(para) +#: C/index.docbook:284(sect1/para) msgid "" "Public key cryptography is a concept which involves the use of two keys: a " "public key, that you can give to anyone with whom you " @@ -481,7 +542,7 @@ "θέλετε να επικοινωνήσετε, και ένα ιδιωτικό κλειδί που " "είναι ιδιωτικό και πρέπει να διατηρήσετε μυστικό." -#: C/seahorse.xml:294(para) C/seahorse.xml:427(para) +#: C/index.docbook:294(listitem/para) C/index.docbook:427(listitem/para) msgid "" "Choose FileNew..." @@ -489,14 +550,14 @@ "Επιλέξτε ΑρχείοΝέο..." -#: C/seahorse.xml:299(para) +#: C/index.docbook:299(listitem/para) msgid "" "Select PGP Key and click Continue" msgstr "" "Επιλέξτε Κλειδί PGP και κάντε κλικ στο " "Συνέχεια" -#: C/seahorse.xml:304(para) +#: C/index.docbook:304(listitem/para) msgid "" "Enter your full name (first - last), your e-mail address and any additional " "information. You can also specify advanced options for the key: see below." @@ -505,13 +566,13 @@ "επιπρόσθετη πληροφορία. Μπορείτε επίσης να ορίσετε προχωρημένες ρυθμίσεις " "για το κλειδί: δείτε παρακάτω." -#: C/seahorse.xml:310(para) +#: C/index.docbook:310(listitem/para) msgid "Click Create to create the new key pair." msgstr "" "Κάντε κλικ στο Δημιουργία για να δημιουργήσετε το νέο " "ζευγάρι κλειδιών." -#: C/seahorse.xml:315(para) +#: C/index.docbook:315(listitem/para) msgid "" "The Passphrase for New PGP Key dialog will open. Enter " "the passphrase twice for your new key." @@ -519,11 +580,12 @@ "Ο διάλγος Συνθηματικό για νέο κλειδί PGP θα ανοίξει. " "Εισάγετε το συνθηματικό δύο φορές για το νέο σας κλειδί." -#: C/seahorse.xml:290(para) -msgid "To create OpenPGP keys: " -msgstr "Για να δημιουργήσετε κλειδιά OpenPGP: " +#: C/index.docbook:290(sect1/para) +#| msgid "To create OpenPGP keys: " +msgid "To create OpenPGP keys: <_:orderedlist-1/>" +msgstr "Για να δημιουργήσετε κλειδιά OpenPGP: <_:orderedlist-1/>" -#: C/seahorse.xml:323(para) C/seahorse.xml:446(para) +#: C/index.docbook:323(tip/para) C/index.docbook:446(tip/para) msgid "" "Use similar practices to generating a strong password when choosing a " "passphrase. The main difference between a password and a passphrase is that, " @@ -534,11 +596,11 @@ "κωδικό πρόσβασης και ένα συνθηματικό, είναι πως, σε ένα συνθηματικό, τα κενά " "είναι έγκυροι χαρακτήρες." -#: C/seahorse.xml:331(title) C/seahorse.xml:460(title) +#: C/index.docbook:331(sect2/title) C/index.docbook:460(sect2/title) msgid "Advanced options" msgstr "Επιλογές για προχωρημένους" -#: C/seahorse.xml:332(para) +#: C/index.docbook:332(sect2/para) msgid "" "Expand the Advanced key options section to specify " "the following options for a new key:" @@ -546,22 +608,23 @@ "Αναπτύξτε την κατηγορία Προχωρημένες επιλογές κλειδιού για να ορίσετε τις ακόλουθες επιλογές για ένα νέο κλειδί:" -#: C/seahorse.xml:338(guilabel) C/seahorse.xml:467(guilabel) -msgid "Encryption Type" -msgstr "Τύπος κρυπτογράφησης" +#: C/index.docbook:338(varlistentry/term) +#: C/index.docbook:467(varlistentry/term) +msgid "Encryption Type" +msgstr "Τύπος κρυπτογράφησης" -#: C/seahorse.xml:340(para) +#: C/index.docbook:340(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your keys." msgstr "" "Αυτό το πεδίο καθορίζει τους αλγόριθμους κρυπτογράφησης που χρησιμοποιούνται " "για την δημιουργία των κλειδιών σας." -#: C/seahorse.xml:346(term) +#: C/index.docbook:346(varlistentry/term) msgid "DSA ElGamal" msgstr "DSA ElGamal" -#: C/seahorse.xml:348(para) +#: C/index.docbook:348(listitem/para) msgid "" "This is the suggested choice as it will allow you to encrypt, decrypt, sign " "and verify as needed." @@ -569,25 +632,30 @@ "Αυτή είναι η προτεινόμενη επιλογή καθώς σας επιτρέπει να κρυπτογραφείτε, να " "αποκρυπτογραφείτε, να υπογράφετε και να επιβεβαιώνετε όπως χρειάζεται." -#: C/seahorse.xml:355(acronym) C/seahorse.xml:485(acronym) -#: C/seahorse.xml:916(acronym) -msgid "DSA" -msgstr "DSA" +#: C/index.docbook:355(varlistentry/term) +#: C/index.docbook:485(varlistentry/term) +#: C/index.docbook:916(varlistentry/term) +#| msgid "DSA ElGamal" +msgid "DSA" +msgstr "DSA" -#: C/seahorse.xml:357(para) C/seahorse.xml:365(para) +#: C/index.docbook:357(listitem/para) C/index.docbook:365(listitem/para) msgid "Will allow signing only." msgstr "Σας επιτρέπει μόνο να υπογράφετε." -#: C/seahorse.xml:363(acronym) C/seahorse.xml:475(acronym) -#: C/seahorse.xml:935(term) -msgid "RSA" -msgstr "RSA" - -#: C/seahorse.xml:374(guilabel) C/seahorse.xml:497(guilabel) -msgid "Key Strength (bits)" -msgstr "Ισχύς κλειδιού (ψηφία)" +#: C/index.docbook:363(varlistentry/term) +#: C/index.docbook:475(varlistentry/term) +#| msgid "DSA ElGamal" +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:374(varlistentry/term) +#: C/index.docbook:497(varlistentry/term) +#| msgid "Key Strength (bits)" +msgid "Key Strength (bits)" +msgstr "Ισχύς κλειδιού (ψηφία)" -#: C/seahorse.xml:376(para) C/seahorse.xml:499(para) +#: C/index.docbook:376(listitem/para) C/index.docbook:499(listitem/para) msgid "" "This is the length of the key in bits. The longer the key, the more secure " "it will be, provided a strong passphrase is used. Conversely, performing any " @@ -602,12 +670,11 @@ "αποδεκτές τιμές είναι ανάμεσα στα 1024 και στα 4096 ψηφία. Τουλάχιστον 2048 " "ψηφία προτείνονται." -#: C/seahorse.xml:386(guilabel) C/seahorse.xml:648(title) -#: C/seahorse.xml:957(term) -msgid "Expiration Date" -msgstr "Ημερομηνία λήξης" +#: C/index.docbook:386(varlistentry/term) +msgid "Expiration Date" +msgstr "Ημερομηνία λήξης" -#: C/seahorse.xml:395(para) +#: C/index.docbook:395(note/para) msgid "" "Sign your new key with your old one before it expires to preserve your trust " "status." @@ -615,24 +682,29 @@ "Υπογράψτε το νέο σας κλειδί με το παλιό σας πριν λήξει για να διατηρήσετε " "την κατάσταση εμπιστοσύνης σας." -#: C/seahorse.xml:388(para) +#: C/index.docbook:388(listitem/para) +#| msgid "" +#| "This is the date at which the key will cease to be usable for performing " +#| "encryption or signing operations. 6 months is a reasonable time to set it " +#| "to. You will have to either change the expiration date or generate a new " +#| "key or subkey after this amount of time passes. " msgid "" "This is the date at which the key will cease to be usable for performing " "encryption or signing operations. 6 months is a reasonable time to set it " "to. You will have to either change the expiration date or generate a new key " -"or subkey after this amount of time passes. " +"or subkey after this amount of time passes. <_:note-1/>" msgstr "" "Αυτή είναι η ημερομηνία όπου το κλειδί θα παύσει να είναι χρησιμοποιήσιμο " "για λειτουργίες κρυπτογράφησης ή ψηφιακής υπογραφής. Έξι μήνες είναι ένας " "τυπικός χρόνος που μπορείτε να καθορίσετε. Μετά το πέρας του χρονικού " "διαστήματος αυτού, θα χρειαστείτε είτε να αλλάξετε την ημερομηνία λήξης ή να " -"δημιουργήσετε ένα νέο κλειδί ή υπο-κλειδί. " +"δημιουργήσετε ένα νέο κλειδί ή υπο-κλειδί. <_:note-1/>" -#: C/seahorse.xml:410(title) +#: C/index.docbook:410(sect1/title) msgid "Creating Secure Shell Keys" msgstr "Δημιουργία κλειδιών ασφαλούς κελύφους" -#: C/seahorse.xml:411(para) +#: C/index.docbook:411(sect1/para) msgid "" "Secure Shell (SSH) is a way of logging into a remote " "computer to execute commands on that machine. SSH keys are used in key-based " @@ -648,7 +720,7 @@ "χρειάζεται να πληκτρολογείτε χειρωνακτικά έναν κωδικό πρόσβασης για να γίνει " "πιστοποίηση." -#: C/seahorse.xml:418(para) +#: C/index.docbook:418(sect1/para) msgid "" "Secure Shell keys are made of two keys: a private key, " "that must be kept secret, and a public key which can be " @@ -659,11 +731,11 @@ "δημόσιο κλειδί που μπορεί να τοποθετηθεί σε " "οποιονδήποτε υπολογιστή που θέλετε να έχετε πρόσβαση." -#: C/seahorse.xml:422(para) +#: C/index.docbook:422(sect1/para) msgid "To create a Secure Shell key:" msgstr "Για να δημιουργήσετε ένα κλειδί ασφαλούς κελύφους:" -#: C/seahorse.xml:430(para) +#: C/index.docbook:430(listitem/para) msgid "" "Select Secure Shell Key and click Continue" @@ -671,7 +743,7 @@ "Επιλέξτε Κλειδί Secure Shell (SSH) και κάντε κλικ στο " "Συνέχεια" -#: C/seahorse.xml:433(para) +#: C/index.docbook:433(listitem/para) msgid "" "Enter a description of what the key is to be used for. You can use your e-" "mail address or any other reminder. You can also specify advanced options " @@ -682,7 +754,7 @@ "Μπορείτε επίσης να ορίσετε προχωρημένες επιλογές για το κλειδί: δείτε " "παρακάτω." -#: C/seahorse.xml:436(para) +#: C/index.docbook:436(listitem/para) msgid "" "Click Just Create Key to create the new key, or " "Create and Set Up to create the key and set up " @@ -693,7 +765,7 @@ "guibutton> για να δημιουργήσετε το κλειδί και να ρυθμίσετε έναν άλλον " "υπολογιστή να το χρησιμοποιεί για πιστοποίηση." -#: C/seahorse.xml:441(para) +#: C/index.docbook:441(listitem/para) msgid "" "The Passphrase for New Secure Shell Key dialog opens. " "Enter the passphrase twice for your new key." @@ -701,7 +773,7 @@ "Ο διάλογος Συνθηματικό για νέο κλειδί Secure Shell (SSH) ανοίγει. Εισάγετε το συνθηματικό δύο φορές για το νέο σας κλειδί." -#: C/seahorse.xml:461(para) +#: C/index.docbook:461(sect2/para) msgid "" "Expand the Advanced key options section to specify the " "following options for a new key:" @@ -709,14 +781,14 @@ "Αναπτύξτε την κατηγορία Προχωρημένες επιλογές κλειδιού " "για να ορίσετε τις ακόλουθες επιλογές για ένα νέο κλειδί:" -#: C/seahorse.xml:469(para) +#: C/index.docbook:469(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your key." msgstr "" "Αυτό το πεδίο καθορίζει τους αλγόριθμους κρυπτογράφησης που χρησιμοποιούνται " "για την δημιουργία του κλειδιού σας." -#: C/seahorse.xml:477(para) +#: C/index.docbook:477(listitem/para) msgid "" "Use the Rivest-ShamirAdleman (RSA) " "algorithm to create the SSH key. This is the preferred and more secure " @@ -726,7 +798,7 @@ "(RSA) για να δημιουργήσετε το κλειδί SSH. Αυτό προτιμάται " "και είναι πιο ασφαλής επιλογή." -#: C/seahorse.xml:487(para) +#: C/index.docbook:487(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the SSH key." @@ -734,20 +806,21 @@ "Χρησιμοποιήστε τον Αλγόριθμο ψηφιακής υπογραφής " "(DSA) για να δημιουργήσετε το κλειδί SSH." -#: C/seahorse.xml:518(title) +#: C/index.docbook:518(sect1/title) msgid "OpenPGP Key Properties" msgstr "Ιδιότητες κλειδιού OpenPGP" -#: C/seahorse.xml:519(para) +#: C/index.docbook:519(sect1/para) msgid "The descriptions in this section apply to all OpenPGP keys." msgstr "" "Οι περιγραφές σε αυτή την ενότητα εφαρμόζονται σε όλα τα κλειδιά OpenPGP." -#: C/seahorse.xml:527(para) +#: C/index.docbook:527(listitem/para) msgid "Select the PGP key from the main window," msgstr "Επιλέξτε το κλειδί PGP από το κεντρικό παράθυρο." -#: C/seahorse.xml:533(para) C/seahorse.xml:781(para) C/seahorse.xml:1093(para) +#: C/index.docbook:533(listitem/para) C/index.docbook:781(listitem/para) +#: C/index.docbook:1093(listitem/para) msgid "" "Double click on it or choose Properties from the " "toolbar," @@ -755,27 +828,30 @@ "Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την " "εργαλειοθήκη," -#: C/seahorse.xml:539(para) C/seahorse.xml:1099(para) +#: C/index.docbook:539(listitem/para) C/index.docbook:1099(listitem/para) msgid "Select the Details tab." msgstr "Επιλέξτε την καρτέλα Λεπτομέρειες." -#: C/seahorse.xml:523(para) -msgid "To view properties of a PGP key: " +#: C/index.docbook:523(sect1/para) +#| msgid "To view properties of a PGP key: " +msgid "To view properties of a PGP key: <_:itemizedlist-1/>" msgstr "" -"Για να εμφανίσετε τις ιδιότητες ενός κλειδιού PGP: " -"" +"Για να εμφανίσετε τις ιδιότητες ενός κλειδιού PGP: <_:" +"itemizedlist-1/>" # #-#-#-#-# gtkhtml.HEAD.el.po (el) #-#-#-#-# # -#: C/seahorse.xml:547(title) C/seahorse.xml:1107(title) +#: C/index.docbook:547(sect2/title) C/index.docbook:1107(sect2/title) msgid "Properties" msgstr "Ιδιότητες" -#: C/seahorse.xml:551(guilabel) C/seahorse.xml:1111(guilabel) -msgid "Fingerprint" -msgstr "Δαχτυλικό αποτύπωμα" +#: C/index.docbook:551(varlistentry/term) +#: C/index.docbook:1111(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Fingerprint" +msgstr "Αποτύπωμα" -#: C/seahorse.xml:553(para) C/seahorse.xml:1113(para) +#: C/index.docbook:553(listitem/para) C/index.docbook:1113(listitem/para) msgid "" "The fingerprint is a unique string of characters that exactly identifies a " "key." @@ -783,11 +859,12 @@ "Το αποτύπωμα είναι μια μοναδική συμβολοσειρά χαρακτήρων που αναγνωρίζει " "ακριβώς ένα κλειδί." -#: C/seahorse.xml:557(guilabel) -msgid "KeyID" -msgstr "Ταυτότητα κλειδιού" +#: C/index.docbook:557(varlistentry/term) +#| msgid "Select the Details tab." +msgid "KeyID" +msgstr "Ταυτότητα κλειδιού" -#: C/seahorse.xml:559(para) +#: C/index.docbook:559(listitem/para) msgid "" "The KeyID is similar to the Fingerprint. However the KeyID only contains the " "last 8 characters of the fingerprint. Most of the time it is possible to " @@ -800,13 +877,13 @@ "ταυτότητα κλειδιού, αλλά σε κάποιες περιπτώσεις, δύο κλειδιά μπορεί να έχουν " "την ίδια ταυτότητα." -# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# -# -#: C/seahorse.xml:567(guilabel) C/seahorse.xml:847(guilabel) -msgid "Type" -msgstr "Τύπος" +#: C/index.docbook:567(varlistentry/term) +#: C/index.docbook:847(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Type" +msgstr "Τύπος" -#: C/seahorse.xml:569(para) +#: C/index.docbook:569(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a key. DSA keys can only " "sign. ElGamal keys are used to encrypt." @@ -815,47 +892,57 @@ "το κλειδί. Τα κλειδιά DSA μπορούν μόνο να χρησιμοποιηθούν σε υπογραφές. Τα " "κλειδιά ELGamal χρησιμοποιούνται για κρυπτογράφηση." -#: C/seahorse.xml:576(guilabel) C/seahorse.xml:858(guilabel) -msgid "Created" -msgstr "Δημιουργήθηκε" +#: C/index.docbook:576(varlistentry/term) +#: C/index.docbook:858(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Created" +msgstr "Δημιουργήθηκε" -#: C/seahorse.xml:578(para) C/seahorse.xml:860(para) +#: C/index.docbook:578(listitem/para) C/index.docbook:860(listitem/para) msgid "Indicates the date the key was created." msgstr "Δείχνει την ημερομηνία που το κλειδί δημιουργήθηκε." -#: C/seahorse.xml:584(guilabel) C/seahorse.xml:866(guilabel) -msgid "Expires" -msgstr "Λήγει" +#: C/index.docbook:584(varlistentry/term) +#: C/index.docbook:866(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Expires" +msgstr "Λήγει" -#: C/seahorse.xml:586(para) C/seahorse.xml:868(para) +#: C/index.docbook:586(listitem/para) C/index.docbook:868(listitem/para) msgid "Indicates the date the key can no longer be used." msgstr "" "Δείχνει την ημερομηνία που το κλειδί δεν θα μπορεί πλέον να χρησιμοποιηθεί." -#: C/seahorse.xml:592(guilabel) C/seahorse.xml:882(guilabel) -#: C/seahorse.xml:1139(guilabel) -msgid "Strength" -msgstr "Ισχύς" +#: C/index.docbook:592(varlistentry/term) +#: C/index.docbook:882(varlistentry/term) +#: C/index.docbook:1139(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Strength" +msgstr "Ισχύς" -#: C/seahorse.xml:598(para) C/seahorse.xml:888(para) C/seahorse.xml:1146(para) +#: C/index.docbook:598(note/para) C/index.docbook:888(note/para) +#: C/index.docbook:1146(note/para) msgid "A long key is not enough to make up for the use of a weak passphrase." msgstr "" "Ένα μεγάλο κλειδί δε προσφέρει σημαντικό επίπεδο ασφάλειας αν το συνθηματικό " "του είναι μικρό" -#: C/seahorse.xml:594(para) C/seahorse.xml:1141(para) +#: C/index.docbook:594(listitem/para) C/index.docbook:1141(listitem/para) +#| msgid "" +#| "Indicates the length in bits of a key. In general the longer the key, the " +#| "more security it provides. " msgid "" "Indicates the length in bits of a key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Δείχνει το μήκος σε ψηφία ενός κλειδιού. Γενικά, όσο πιο μεγάλο είναι ένα " -"κλειδί, τόσο πιο ασφαλές είναι. " +"κλειδί, τόσο πιο ασφαλές είναι. <_:note-1/>" -#: C/seahorse.xml:610(title) +#: C/index.docbook:610(sect2/title) msgid "Trust" msgstr "Εμπιστοσύνη" -#: C/seahorse.xml:611(para) +#: C/index.docbook:611(sect2/para) msgid "" "Trust is an indication of how sure you are of a person's ability to " "correctly extend the web of trust. When you are faced with a key you have " @@ -873,7 +960,7 @@ "θα χρειάζεται 3 υπογραφές με οριακή τιμή εμπιστοσύνης ή μια πλήρη " "εμπιστευόμενη υπογραφή." -#: C/seahorse.xml:619(para) +#: C/index.docbook:619(listitem/para) msgid "" "Unknown: You are not familiar with the person's ability " "to sign keys correctly." @@ -881,13 +968,13 @@ "Άγνωστη: Δεν γνωρίζετε την ικανότητα του ατόμου να " "υπογράφει σωστά τα κλειδιά." -#: C/seahorse.xml:622(para) +#: C/index.docbook:622(listitem/para) msgid "Never: This person cannot correctly sign keys." msgstr "" "Ποτέ: Αυτό το άτομο δεν μπορεί να υπογράψει σωστά τα " "κλειδιά." -#: C/seahorse.xml:625(para) +#: C/index.docbook:625(listitem/para) msgid "" "Marginal: This person checks for photo ID before " "signing a key, but does not necessarily scrutinize the IDs." @@ -895,7 +982,7 @@ "Οριακή: Αυτό το άτομο ελέγχει για φωτογραφική ταυτότητα " "πριν υπογράψει ένα κλειδί, αλλά δε διερευνά εξονυχιστικά τις ταυτότητες." -#: C/seahorse.xml:629(para) +#: C/index.docbook:629(listitem/para) msgid "" "Full: This person scrutinizes each and every person's " "photo IDs before signing them (e.g. they only sign keys that truely belong " @@ -905,7 +992,7 @@ "ταυτότητα πριν να τις υπογράψει ψηφιακά (π.χ. υπογράφουν μόνο κλειδιά που " "πραγματικά ανήκουν στο άτομο που ζητά την υπογραφή)." -#: C/seahorse.xml:633(para) +#: C/index.docbook:633(listitem/para) msgid "" "Ultimate: This level of trust should only be assigned " "to your own keys." @@ -913,11 +1000,11 @@ "Μέγιστη: Αυτό το επίπεδο εμπιστοσύνης πρέπει να " "ορίζεται στα δικά σας κλειδιά." -#: C/seahorse.xml:640(title) +#: C/index.docbook:640(sect2/title) msgid "Enabling and Disabling Keys" msgstr "Ενεργοποίηση και απενεργοποίηση κλειδιών" -#: C/seahorse.xml:641(para) +#: C/index.docbook:641(sect2/para) msgid "" "When a key is enabled, it can be used to perform encryption operations. When " "a key is disabled, it cannot be used to encrypt to or verify signatures made " @@ -928,7 +1015,11 @@ "δεν μπορεί να χρησιμοποιηθεί για την κρυπτογράφηση ή την επιβεβαίωση " "υπογραφών που δημιουργήθηκαν με αυτό." -#: C/seahorse.xml:649(para) +#: C/index.docbook:648(sect2/title) C/index.docbook:957(varlistentry/term) +msgid "Expiration Date" +msgstr "Ημερομηνία λήξης" + +#: C/index.docbook:649(sect2/para) msgid "" "A key can no longer be used to perform key operations after it has expired. " "Changing a key's expiration date to a point in the future re-enables it. A " @@ -941,11 +1032,11 @@ "κύριο κλειδί που δεν λήγει ποτέ και πολλά υπο-κλειδιά που λήγουν και είναι " "υπογεγραμμένα από το κύριο κλειδί." -#: C/seahorse.xml:658(title) +#: C/index.docbook:658(sect2/title) msgid "User IDs" msgstr "Ταυτότητες χρήστη" -#: C/seahorse.xml:659(para) +#: C/index.docbook:659(sect2/para) msgid "" "User IDs allow multiple identities and email addresses to be used with the " "same key." @@ -953,20 +1044,21 @@ "Οι ταυτότητες χρήστη (User ID) επιτρέπουν να χρησιμοποιηθούν πολλαπλές " "ταυτότητες και διευθύνσεις e-mail με το ίδιο κλειδί." -#: C/seahorse.xml:665(programlisting) +#: C/index.docbook:665(para/programlisting) #, no-wrap msgid "Name (comment) <email address>" msgstr "Όνομα (σχόλιο) <διεύθυνση ηλ. αλληλογραφίας>" -#: C/seahorse.xml:663(para) -msgid "They usually take the form of: " -msgstr "Συνήθως έχουν τη μορφή: " +#: C/index.docbook:663(sect2/para) +#| msgid "They usually take the form of: " +msgid "They usually take the form of: <_:programlisting-1/>" +msgstr "Συνήθως έχουν τη μορφή: <_:programlisting-1/>" -#: C/seahorse.xml:669(title) +#: C/index.docbook:669(sect3/title) msgid "Adding a User ID" msgstr "Προσθήκη μιας ταυτότητας χρήστη" -#: C/seahorse.xml:670(para) +#: C/index.docbook:670(sect3/para) msgid "" "Adding a user ID is useful when you want to have an identity for your job " "and one for your friends." @@ -974,11 +1066,12 @@ "Η προσθήκη μιας ταυτότητας χρήστη είναι χρήσιμη όταν θέλετε να έχετε μια " "ταυτότητα για την δουλειά σας και μια για τους φίλους σας." -#: C/seahorse.xml:678(para) C/seahorse.xml:776(para) C/seahorse.xml:803(para) +#: C/index.docbook:678(listitem/para) C/index.docbook:776(listitem/para) +#: C/index.docbook:803(listitem/para) msgid "Select the key from the main window," msgstr "Επιλέξτε το κλειδί από το κυρίως παράθυρο," -#: C/seahorse.xml:683(para) +#: C/index.docbook:683(listitem/para) msgid "" "Double click on it or choose Properties from the " "toolbar," @@ -986,19 +1079,21 @@ "Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από " "την εργαλειοθήκη," -#: C/seahorse.xml:688(para) +#: C/index.docbook:688(listitem/para) msgid "Select the Names and Signatures tab," msgstr "Επιλέξτε την καρτέλα Ονόματα και υπογραφές," -#: C/seahorse.xml:693(para) +#: C/index.docbook:693(listitem/para) msgid "Click on Add Name." msgstr "Κάντε κλικ στο Προσθήκη ονόματος." -#: C/seahorse.xml:674(para) -msgid "To add a user ID to a key: " -msgstr "Για να προσθέσετε μια ταυτότητα χρήστη σε ένα κλειδί: " +#: C/index.docbook:674(sect3/para) +#| msgid "To add a user ID to a key: " +msgid "To add a user ID to a key: <_:itemizedlist-1/>" +msgstr "" +"Για να προσθέσετε μια ταυτότητα χρήστη σε ένα κλειδί: <_:itemizedlist-1/>" -#: C/seahorse.xml:699(para) C/seahorse.xml:903(para) +#: C/index.docbook:699(sect3/para) C/index.docbook:903(sect2/para) msgid "" "After following the instructions above, you will be presented with a dialog " "to fill in. The fields are detailed below." @@ -1006,33 +1101,36 @@ "Αφού ακολουθήσετε τις παραπάνω οδηγίες, θα σας εμφανιστεί ένας διάλογος για " "να συμπληρώσετε. Τα πεδία αναλύονται παρακάτω." -#: C/seahorse.xml:705(guilabel) -msgid "Full Name" -msgstr "Πλήρες όνομα" +#: C/index.docbook:705(varlistentry/term) +msgid "Full Name" +msgstr "Πλήρες όνομα" -#: C/seahorse.xml:709(programlisting) +#: C/index.docbook:709(para/programlisting) #, no-wrap msgid "<first> <last>" msgstr "<όνομα> <επώνυμο>" -#: C/seahorse.xml:707(para) +#: C/index.docbook:707(listitem/para) +#| msgid "" +#| "Enter your full name in the form A middle name or " +#| "initial is optional." msgid "" -"Enter your full name in the form A middle name or initial " -"is optional." +"Enter your full name in the form <_:programlisting-1/> A middle name or " +"initial is optional." msgstr "" -"Εισάγετε το ονοματεπώνυμο σας στη φόρμα Το μεσαίο όνομα ή " -"αρχικά είναι προαιρετικά." +"Εισάγετε το ονοματεπώνυμο σας στη φόρμα <_:programlisting-1/> Το μεσαίο " +"όνομα ή αρχικά είναι προαιρετικά." -#: C/seahorse.xml:714(para) +#: C/index.docbook:714(note/para) msgid "You must enter at least 5 characters in this field." msgstr "Πρέπει να εισάγετε τουλάχιστον 5 χαρακτήρες σε αυτό το πεδίο." -# -#: C/seahorse.xml:722(guilabel) -msgid "Email Address" -msgstr "Ηλεκτρονική διεύθυνση" +#: C/index.docbook:722(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Email Address" +msgstr "Ηλεκτρονική διεύθυνση" -#: C/seahorse.xml:724(para) +#: C/index.docbook:724(listitem/para) msgid "" "Your email address is how most people will locate your key on a key server " "or other key provider. Make sure it is correct before continuing." @@ -1041,20 +1139,22 @@ "χρησιμοποιήσουν για να εντοπίσουν το κλειδί σας σε ένα εξυπηρετητή κλειδιών " "ή άλλο πάροχο κλειδιών. Επιβεβαιώστε ότι είναι ορθό πριν συνεχίσετε. " -#: C/seahorse.xml:735(programlisting) +#: C/index.docbook:735(para/programlisting) #, no-wrap msgid "<username>@<domainname>" msgstr "<username>@<domainname>" -#: C/seahorse.xml:733(para) -msgid "It should be of the form " -msgstr "Πρέπει να είναι της μορφής " - -#: C/seahorse.xml:742(guilabel) -msgid "Key Comment" -msgstr "Σχόλιο κλειδιού" +#: C/index.docbook:733(note/para) +#| msgid "It should be of the form " +msgid "It should be of the form <_:programlisting-1/>" +msgstr "Πρέπει να είναι της μορφής <_:programlisting-1/>" + +#: C/index.docbook:742(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Key Comment" +msgstr "Σχόλιο κλειδιού" -#: C/seahorse.xml:744(para) +#: C/index.docbook:744(listitem/para) msgid "" "The comment field can be used to place any additional information into the " "displayed name of your new ID. This information can be searched for on key " @@ -1064,11 +1164,11 @@ "πρόσθετη πληροφορία στο εμφανιζόμενο όνομα της νέας σας ταυτότητας (ID). " "Αυτές οι πληροφορίες μπορούν να αναζητηθούν στους εξυπηρετητές κλειδιών." -#: C/seahorse.xml:758(title) +#: C/index.docbook:758(sect2/title) msgid "Photo IDs" msgstr "Φωτογραφική ταυτότητα" -#: C/seahorse.xml:759(para) +#: C/index.docbook:759(sect2/para) msgid "" "Photo IDs allow a key owner to embed one or more pictures of themselves in a " "key. These identities can be signed just like normal user IDs. A photo ID " @@ -1081,66 +1181,73 @@ "Μια φωτογραφική ταυτότητα πρέπει να είναι σε μορφή JPEG και προτείνεται να " "μην είναι μεγαλύτερες από 240x288 εικονοστοιχεία." -#: C/seahorse.xml:763(para) +#: C/index.docbook:763(sect2/para) msgid "" "If the chosen image is not of the required file type or size " -"Passwords and Encryption Keys can resize and " -"convert it on the fly from any image format supported by the GDK library." +"Passwords and Keys can resize and convert it on " +"the fly from any image format supported by the GDK " +"library." msgstr "" "Αν η επιλεγμένη εικόνα δεν είναι του απαιτούμενου τύπου αρχείου ή μεγέθους, " "το Κωδικοί και κλειδιά κρυπτογράφησης μπορεί να " "αλλάξει το μέγεθος της και να την μετατρέψει επιτόπου από οποιονδήποτε τύπο " "αρχείου που υποστηρίζεται από την βιβλιοθήκη GDK." -#: C/seahorse.xml:771(title) +#: C/index.docbook:771(sect2/title) msgid "Changing the Passphrase" msgstr "Αλλαγή του συνθηματικού" -#: C/seahorse.xml:786(para) +#: C/index.docbook:786(listitem/para) msgid "Click on Change Passphrase." msgstr "Κάντε κλικ στο Αλλαγή συνθηματικού." -#: C/seahorse.xml:772(para) -msgid "To change the passphrase assigned to a key: " +#: C/index.docbook:772(sect2/para) +#| msgid "To change the passphrase assigned to a key: " +msgid "To change the passphrase assigned to a key: <_:itemizedlist-1/>" msgstr "" -"Για να αλλάξετε το συνθηματικό που έχει ορισθεί για ένα κλειδί: " +"Για να αλλάξετε το συνθηματικό που έχει ορισθεί για ένα κλειδί: <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:792(para) +#: C/index.docbook:792(sect2/para) msgid "Enter the new passphrase and click OK." msgstr "" "Εισάγετε το νέο συνθηματικό και κάντε κλικ στο OK." -#: C/seahorse.xml:798(title) +#: C/index.docbook:798(sect2/title) msgid "Deleting a Key" msgstr "Διαγραφή ενός κλειδιού" -#: C/seahorse.xml:808(para) +#: C/index.docbook:808(listitem/para) +#| msgid "" +#| "Right click on it and choose Delete Key or choose " +#| "EditDelete Key." msgid "" "Right click on it and choose Delete Key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" "Κάντε δεξί κλικ πάνω του και επιλέξτε Διαγραφή κλειδιού " -"ή επιλέξτε ΕπεξεργασίαΔιαγραφή " -"κλειδιού." +"ή επιλέξτε Επεξεργασία Διαγραφή " +"κλειδιού ." -#: C/seahorse.xml:799(para) -msgid "To delete a key from your keyring: " -msgstr "Για να διαγράψετε ένα κλειδί από την κλειδοθήκη σας: " +#: C/index.docbook:799(sect2/para) +#| msgid "To delete a key from your keyring: " +msgid "To delete a key from your keyring: <_:itemizedlist-1/>" +msgstr "" +"Για να διαγράψετε ένα κλειδί από την κλειδοθήκη σας: <_:itemizedlist-1/>" -#: C/seahorse.xml:820(para) +#: C/index.docbook:820(note/para) msgid "You can delete your keys, trusted keys and collected keys." msgstr "" "Μπορείτε να διαγράψετε τα κλειδιά σας, τα έμπιστα κλειδιά και τα συλλεγμένα " "κλειδιά." -#: C/seahorse.xml:830(title) +#: C/index.docbook:830(sect1/title) msgid "OpenPGP Subkey Properties" msgstr "Ιδιότητες υποκλειδιού OpenPGP" -#: C/seahorse.xml:831(para) +#: C/index.docbook:831(sect1/para) msgid "" "Each OpenPGP key has a single master key used to sign only. Subkeys are used " "to encrypt and to sign as well. In this way, if your sub key is compromised, " @@ -1151,16 +1258,16 @@ "και να κρυπτογράφουν. Με αυτό το τρόπο, αν ένα υπο-κλειδί παραβιαστεί, δε " "χρειάζεται να αναιρέσετε το γενικό σας κλειδί." -# -#: C/seahorse.xml:839(guilabel) -msgid "ID" -msgstr "Ταυτότητα" +#: C/index.docbook:839(varlistentry/term) +#| msgid "Select the Details tab." +msgid "ID" +msgstr "Ταυτότητα" -#: C/seahorse.xml:841(para) +#: C/index.docbook:841(listitem/para) msgid "This is the identifier of the subkey." msgstr "Αυτό είναι το αναγνωριστικό του υποκλειδιού." -#: C/seahorse.xml:849(para) +#: C/index.docbook:849(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a subkey. DSA keys can only sign, ElGamal keys are used to encrypt while " @@ -1172,27 +1279,31 @@ "τα κλειδιά RSA χρησιμοποιούνται για να υπογράψουν ή για " "να κρυπτογραφήσουν." -#: C/seahorse.xml:874(guilabel) -msgid "Status" -msgstr "Κατάσταση" +#: C/index.docbook:874(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Status" +msgstr "Κατάσταση" -#: C/seahorse.xml:876(para) +#: C/index.docbook:876(listitem/para) msgid "Indicates the status of the key." msgstr "Δείχνει την κατάσταση του κλειδιού." -#: C/seahorse.xml:884(para) +#: C/index.docbook:884(listitem/para) +#| msgid "" +#| "Indicates the length in bits of the key. In general the longer the key, " +#| "the more security it provides. " msgid "" "Indicates the length in bits of the key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Δείχνει το μήκος του κλειδιού σε ψηφία. Γενικά, όσο πιο μεγάλο το κλειδί, " -"τόσο πιο μεγάλη ασφάλεια παρέχει. " +"τόσο πιο μεγάλη ασφάλεια παρέχει. <_:note-1/>" -#: C/seahorse.xml:898(title) +#: C/index.docbook:898(sect2/title) msgid "Adding a Subkey" msgstr "Προσθήκη ενός υποκλειδιού" -#: C/seahorse.xml:899(para) +#: C/index.docbook:899(sect2/para) msgid "" "To add a subkey to a key, from the Subkeys section " "click on Add button." @@ -1201,17 +1312,17 @@ "Υποκλειδιά κάντε κλικ στο κουμπί Προσθήκη." -#: C/seahorse.xml:909(term) +#: C/index.docbook:909(varlistentry/term) msgid "Key Type" msgstr "Τύπος κλειδιού" -#: C/seahorse.xml:911(para) +#: C/index.docbook:911(listitem/para) msgid "Specifies the encryption algorithm used to generate a subkey." msgstr "" "Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για την δημιουργία " "ενός υποκλειδιού." -#: C/seahorse.xml:918(para) +#: C/index.docbook:918(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the subkey. This subkey can sign only." @@ -1220,11 +1331,11 @@ "(DSA) για να δημιουργήσετε το υποκλειδί. Αυτό το " "υποκλειδί θα μπορεί μόνο να υπογράψει." -#: C/seahorse.xml:926(term) +#: C/index.docbook:926(varlistentry/term) msgid "ElGamal" msgstr "ElGamal" -#: C/seahorse.xml:928(para) +#: C/index.docbook:928(listitem/para) msgid "" "Use the ElGamal algorithm to create the subkey. This " "subkey can encrypt only." @@ -1233,7 +1344,11 @@ "δημιουργήσετε το υποκλειδί. Αυτό το υποκλειδί θα μπορεί μόνο να " "κρυπτογραφήσει." -#: C/seahorse.xml:937(para) +#: C/index.docbook:935(varlistentry/term) +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:937(listitem/para) msgid "" "Use the Rivest-Shamir Adleman (RSA) " "algorithm to create the subkey. This subkey can be used to sign or encrypt, " @@ -1244,11 +1359,11 @@ "υποκλειδί μπορεί να χρησιμοποιηθεί για υπογραφή ή κρυπτογράφηση, αλλά θα " "πρέπει να δημιουργήσετε δύο διαφορετικά υποκλειδιά." -#: C/seahorse.xml:948(term) +#: C/index.docbook:948(varlistentry/term) msgid "Key Length" msgstr "Μήκος κλειδιού" -#: C/seahorse.xml:950(para) +#: C/index.docbook:950(listitem/para) msgid "" "Indicates the length in bits of the subkey. In general the longer the key, " "the more security it provides." @@ -1256,21 +1371,21 @@ "Δείχνει το μήκος του υποκλειδιού σε ψηφία. Γενικά, όσο πιο μεγάλο είναι το " "κλειδί, τόσο περισσότερη ασφάλεια παρέχει." -#: C/seahorse.xml:959(para) +#: C/index.docbook:959(listitem/para) msgid "Indicates the date the subkey can no longer be used." msgstr "" "Δείχνει την ημερομηνία που το υποκλειδί δεν θα μπορεί πλέον να " "χρησιμοποιηθεί." -#: C/seahorse.xml:968(title) +#: C/index.docbook:968(sect2/title) msgid "Changing a Subkey Expiration Date" msgstr "Αλλαγή της ημερομηνίας λήξης ενός κλειδιού" -#: C/seahorse.xml:975(para) +#: C/index.docbook:975(listitem/para) msgid "Click on the Expire button on the left," msgstr "Κάντε κλικ στο κουμπί Λήξη στα αριστερά," -#: C/seahorse.xml:980(para) +#: C/index.docbook:980(listitem/para) msgid "" "From the date dialog choose the new expiration date or select " "Never expires for no expiration date." @@ -1279,138 +1394,142 @@ "επιλέξτε Δε λήγει ποτέ αν δεν θέλετε να υπάρχει " "ημερομηνία λήξης." -#: C/seahorse.xml:969(para) +#: C/index.docbook:969(sect2/para) +#| msgid "" +#| "To change a subkey expiration date, select the subkey from the " +#| "Subkeys section, then: " msgid "" "To change a subkey expiration date, select the subkey from the " -"Subkeys section, then: " +"Subkeys section, then: <_:itemizedlist-1/>" msgstr "" "Για να αλλάξετε την ημερομηνία λήξης ενός υποκλειδιού, επιλέξτε το υποκλειδί " -"από την ενότητα Υποκλειδιά, και μετά: " +"από την ενότητα Υποκλειδιά, και μετά: <_:itemizedlist-1/" +">" -#: C/seahorse.xml:990(title) +#: C/index.docbook:990(sect2/title) msgid "Revoking a Subkey" msgstr "Ανάκληση ενός υποκλειδιού" -#: C/seahorse.xml:996(para) +#: C/index.docbook:996(listitem/para) msgid "Click on the Revoke button on the left," msgstr "Κάντε κλικ στο κουμπί Ανακάλεσε στα αριστερά," -#: C/seahorse.xml:1001(para) +#: C/index.docbook:1001(listitem/para) msgid "Choose a reason why to revoke the subkey:" msgstr "Επιλέξτε μια αιτία για την ανάκληση του κλειδιού:" -#: C/seahorse.xml:1007(term) +#: C/index.docbook:1007(varlistentry/term) msgid "No Reason" msgstr "Χωρίς αιτία" -#: C/seahorse.xml:1009(para) +#: C/index.docbook:1009(listitem/para) msgid "There isn't a specific reason to revoke the key." msgstr "Δεν υπάρχει κάποια αιτία για την ανάκληση του κλειδιού." -#: C/seahorse.xml:1015(term) +#: C/index.docbook:1015(varlistentry/term) msgid "Compromised" msgstr "Έχει διαρρεύσει" -#: C/seahorse.xml:1017(para) +#: C/index.docbook:1017(listitem/para) msgid "The key has been compromised." msgstr "Το κλειδί έχει διαρρεύσει." -#: C/seahorse.xml:1023(term) +#: C/index.docbook:1023(varlistentry/term) msgid "Superseded" msgstr "Έχει ξεπεραστεί" -#: C/seahorse.xml:1025(para) +#: C/index.docbook:1025(listitem/para) msgid "The key has been superseded by another one." msgstr "Το κλειδί έχει ξεπεραστεί από κάποιο άλλο." -#: C/seahorse.xml:1031(term) +#: C/index.docbook:1031(varlistentry/term) msgid "Not Used" msgstr "Εκτός χρήσης" -#: C/seahorse.xml:1033(para) +#: C/index.docbook:1033(listitem/para) msgid "The key is not used anymore." msgstr "Το κλειδί δεν χρησιμοποιείται πλέον." -#: C/seahorse.xml:1042(para) +#: C/index.docbook:1042(listitem/para) msgid "Enter a description of why you are revoking the key," msgstr "Εισάγετε μια περιγραφή της αιτίας που ανακαλείτε το κλειδί," -#: C/seahorse.xml:1047(para) +#: C/index.docbook:1047(listitem/para) msgid "Click on Revoke." msgstr "Κάντε κλικ στο Ανακάλεσε." -#: C/seahorse.xml:991(para) +#: C/index.docbook:991(sect2/para) +#| msgid "" +#| "To revoke a subkey, select the subkey from the Subkeys section, then: " msgid "" "To revoke a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" "Για να ανακαλέσετε ένα υποκλειδί, επιλέξτε το υποκλειδί από την ενότητα " -"Υποκλειδιά, και μετά: " +"Υποκλειδιά, και μετά: <_:itemizedlist-1/>" -#: C/seahorse.xml:1054(para) +#: C/index.docbook:1054(note/para) msgid "The effect of revoking a subkey is immediate." msgstr "Η ανάκληση ενός υποκλειδιού είναι άμεση." -#: C/seahorse.xml:1061(title) +#: C/index.docbook:1061(sect2/title) msgid "Deleting a Subkey" msgstr "Διαγραφή ενός υποκλειδιού" -#: C/seahorse.xml:1067(para) +#: C/index.docbook:1067(listitem/para) msgid "Click on the Delete button on the left." msgstr "Κάντε κλικ στο κουμπί Διαγραφή στα αριστερά." -#: C/seahorse.xml:1062(para) +#: C/index.docbook:1062(sect2/para) +#| msgid "" +#| "To delete a subkey, select the subkey from the Subkeys section, then: " msgid "" "To delete a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" "Για να διαγράψετε ένα υποκλειδί, επιλέξτε το υποκλειδί από την ενότητα " -"Υποκλειδιά, και μετά: " +"Υποκλειδιά, και μετά: <_:itemizedlist-1/>" -#: C/seahorse.xml:1079(title) +#: C/index.docbook:1079(sect1/title) msgid "Secure Shell Key Properties" msgstr "Ιδιότητες κλειδιού ασφαλούς κελύφους (SSH)" -#: C/seahorse.xml:1080(para) +#: C/index.docbook:1080(sect1/para) msgid "" "The descriptions in this section apply to all SSH keys." msgstr "" "Οι περιγραφές σε αυτή την ενότητα ισχύουν για όλα τα κλειδιά SSH." -#: C/seahorse.xml:1087(para) +#: C/index.docbook:1087(listitem/para) msgid "Select the Secure Shell key from the main window," msgstr "Επιλέξτε το κλειδί Secure Shell από το κύριο παράθυρο," -#: C/seahorse.xml:1083(para) -msgid "To view properties of a SSH key: " -msgstr "" -"Για να προβάλετε τις ιδιότητες ενός κλειδιού SSH: " -"" - -#: C/seahorse.xml:1120(guilabel) -msgid "Algorithm" -msgstr "Αλγόριθμος" +#: C/index.docbook:1083(sect1/para) +#| msgid "To view properties of a SSH key: " +msgid "To view properties of a SSH key: <_:itemizedlist-1/>" +msgstr "" +"Για να προβάλετε τις ιδιότητες ενός κλειδιού SSH: <_:" +"itemizedlist-1/>" + +#: C/index.docbook:1120(varlistentry/term) +msgid "Algorithm" +msgstr "Αλγόριθμος" -#: C/seahorse.xml:1122(para) +#: C/index.docbook:1122(listitem/para) msgid "Specifies the encryption algorithm used to generate a key." msgstr "" "Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για την δημιουργία " "ενός κλειδιού." -# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# -# -# #-#-#-#-# file-roller.HEAD.el.po (el) #-#-#-#-# -# -# #-#-#-#-# ekiga.gnome-2-14.el.po (el) #-#-#-#-# -# -# #-#-#-#-# libgnomeprintui.HEAD.el.po (el) #-#-#-#-# -# -#: C/seahorse.xml:1129(guilabel) -msgid "Location" -msgstr "Τοποθεσία" +#: C/index.docbook:1129(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Location" +msgstr "Τοποθεσία" -#: C/seahorse.xml:1131(para) +#: C/index.docbook:1131(listitem/para) msgid "" "This is the location where the private key has been " "stored." @@ -1418,107 +1537,131 @@ "Αυτή είναι η τοποθεσία που έχει αποθηκευτεί το ιδιωτικό κλειδί." -#: C/seahorse.xml:1159(title) +#: C/index.docbook:1159(sect2/title) msgid "Deleting a Secure Shell Key" msgstr "Διαγραφή ενός κλειδιού ασφαλούς κελύφους (Secure Shell)" -#: C/seahorse.xml:1164(para) +#: C/index.docbook:1164(listitem/para) msgid "Select the SSH key from the main window," msgstr "Επιλέξτε το κλειδί SSH από το κυρίως παράθυρο," -#: C/seahorse.xml:1169(para) +#: C/index.docbook:1169(listitem/para) +#| msgid "" +#| "Right click on it and choose Delete key or choose " +#| "EditDelete Key." msgid "" "Right click on it and choose Delete key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" "Κάντε δεξί κλικ πάνω του και επιλέξτε Διαγραφή κλειδιού " -"ή επιλέξτε ΕπεξεργασίαΔιαγραφή " -"κλειδιού." +"ή επιλέξτε Επεξεργασία Διαγραφή " +"κλειδιού ." -#: C/seahorse.xml:1160(para) -msgid "To delete a Secure Shell key: " -msgstr "Για να διαγράψετε ένα κλειδί ασφαλούς κελύφους: " +#: C/index.docbook:1160(sect2/para) +#| msgid "To delete a Secure Shell key: " +msgid "To delete a Secure Shell key: <_:itemizedlist-1/>" +msgstr "Για να διαγράψετε ένα κλειδί ασφαλούς κελύφους: <_:itemizedlist-1/>" -#: C/seahorse.xml:1185(title) +#: C/index.docbook:1185(sect1/title) msgid "Importing Keys" msgstr "Εισαγωγή κλειδιών" -#: C/seahorse.xml:1186(para) +#: C/index.docbook:1186(sect1/para) +#| msgid "" +#| "To import keys choose FileImport and select, from " +#| "the file chooser, a file containing at least one ASCII armored public key." msgid "" -"To import keys choose FileImport and select, from the " -"file chooser, a file containing at least one ASCII armored public key." -msgstr "" -"Για να εισάγετε κλειδιά, επιλέξτε ΑρχείοΕισαγωγή και επιλέξτε, από " -"τον επιλογέα αρχείων, ένα αρχείο που περιέχει τουλάχιστον ένα θωρακισμένο " +"To import keys choose File " +"Import and select, from the file " +"chooser, a file containing at least one ASCII armored public key." +msgstr "" +"Για να εισάγετε κλειδιά, επιλέξτε Αρχείο " +"Εισαγωγή και επιλέξτε, από τον " +"επιλογέα αρχείων, ένα αρχείο που περιέχει τουλάχιστον ένα θωρακισμένο " "δημόσιο κλειδί ASCII." -#: C/seahorse.xml:1197(para) +#: C/index.docbook:1197(listitem/para) msgid "Select an ASCII armored public block of text," msgstr "Επιλέξτε ένα θωρακισμένο δημόσιο μπλοκ κειμένου ASCII," -#: C/seahorse.xml:1202(para) +#: C/index.docbook:1202(listitem/para) msgid "Copy it to the clipboard," msgstr "Αντιγράψτε το στο πρόχειρο," -#: C/seahorse.xml:1207(para) +#: C/index.docbook:1207(listitem/para) +#| msgid "" +#| "Choose EditPaste Keys." msgid "" -"Choose EditPaste Keys." +"Choose Edit Paste Keys ." msgstr "" -"Επιλέξτε ΕπεξεργασίαΕπικόλληση " -"κλειδιών." +"Επιλέξτε Επεξεργασία Επικόλληση " +"κλειδιών ." -#: C/seahorse.xml:1193(para) +#: C/index.docbook:1193(sect1/para) +#| msgid "" +#| "Importing can also be performed by pasting the keys inside " +#| "Passwords and Keys: " msgid "" "Importing can also be performed by pasting the keys inside " -"Passwords and Encryption Keys: " +"Passwords and Keys: <_:itemizedlist-1/>" msgstr "" "Η εισαγωγή μπορεί επίσης να επιτευχθεί με την επικόλληση των κλειδιών μέσα " -"στο Κωδικοί και κλειδιά κρυπτογράφησης: " -"" +"στο Κωδικοί και κλειδιά κρυπτογράφησης: <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:1222(title) +#: C/index.docbook:1222(sect1/title) msgid "Exporting Keys" msgstr "Εξαγωγή κλειδιών" -#: C/seahorse.xml:1223(para) +#: C/index.docbook:1223(sect1/para) +#| msgid "" +#| "To export keys, select the keys in the main window and choose " +#| "FileExport." msgid "" -"To export keys, select the keys in the main window and choose " -"FileExport." +"To export keys, select the keys in the main window and choose " +"File Export ." msgstr "" "Για να κάνετε εξαγωγή κλειδιών, επιλέξτε τα κλειδιά στο κεντρικό παράθυρο " -"και επιλέξτε ΑρχείοΕξαγωγή." +"και επιλέξτε Αρχείο Εξαγωγή ." -#: C/seahorse.xml:1236(para) +#: C/index.docbook:1236(listitem/para) msgid "Select the keys in the main window," msgstr "Επιλέξτε τα κλειδιά στο κυρίως παράθυρο," -#: C/seahorse.xml:1241(para) +#: C/index.docbook:1241(listitem/para) +#| msgid "" +#| "Choose EditCopy Keys." msgid "" -"Choose EditCopy Keys." +"Choose Edit Copy Keys ." msgstr "" -"Επιλέξτε ΕπεξεργασίαΑντιγραφή " -"κλειδιών." +"Επιλέξτε Επεξεργασία Αντιγραφή " +"κλειδιών ." -#: C/seahorse.xml:1231(para) +#: C/index.docbook:1231(sect1/para) +#| msgid "" +#| "You can also export keys to the clipboard in an ASCII armored block of " +#| "text: " msgid "" "You can also export keys to the clipboard in an ASCII armored block of text: " -"" +"<_:itemizedlist-1/>" msgstr "" "Μπορείτε ακόμα να εξάγετε κλειδιά στο πρόχειρο ως ένα θωρακισμένο μπλοκ " -"κειμένου ASCII: " +"κειμένου ASCII: <_:itemizedlist-1/>" -#: C/seahorse.xml:1257(title) +#: C/index.docbook:1257(sect1/title) msgid "Signing a Key" msgstr "Υπογραφή ενός κλειδιού" -#: C/seahorse.xml:1258(para) +#: C/index.docbook:1258(sect1/para) msgid "" "Signing another person's key means you are giving trust to that person. " "Before signing a key, you have to carefully check the key's fingerprint to " @@ -1529,7 +1672,7 @@ "αποτύπωμα του κλειδιού για να είστε σίγουρος πως το κλειδί ανήκει πραγματικά " "σε αυτό το άτομο." -#: C/seahorse.xml:1267(para) +#: C/index.docbook:1267(listitem/para) msgid "" "Select the key you want to sign from the Trusted Keys " "or Other Collected Keys tabs," @@ -1538,21 +1681,23 @@ "Έμπιστα κλειδιά ή Άλλα συλλεγμένα κλειδιά" -#: C/seahorse.xml:1274(para) +#: C/index.docbook:1274(listitem/para) +#| msgid "" +#| "Choose Sign from the toolbar or " +#| "FileSign," msgid "" -"Choose Sign from the toolbar or " -"FileSign," +"Choose Sign from the toolbar or " +"File Sign ," msgstr "" -"Επιλέξτε Υπογραφή από την εργαλειοθήκη ή " -"ΑρχείοΥπογραφή," +"Επιλέξτε Υπογραφή από την εργαλειοθήκη ή " +"Αρχείο Υπογραφή ," -#: C/seahorse.xml:1283(para) +#: C/index.docbook:1283(listitem/para) msgid "Select how carefully the key has been checked," msgstr "Επιλέξτε πόσο προσεκτικά έχει ελεγχθεί το κλειδί," -#: C/seahorse.xml:1288(para) +#: C/index.docbook:1288(listitem/para) msgid "" "Indicate if the signature should be local to your keyring, and if your " "signature can be revoked," @@ -1560,60 +1705,62 @@ "Καθορίστε αν η ψηφιακή υπογραφή να είναι τοπική στην κλειδοθήκη σας και αν η " "ψηφιακή υπογραφή να μπορεί να αναιρεθεί." -#: C/seahorse.xml:1294(para) +#: C/index.docbook:1294(listitem/para) msgid "Click on Sign." msgstr "Κάντε κλικ στο Υπογραφή." -#: C/seahorse.xml:1263(para) -msgid "To sign a key in your keyring: " -msgstr "Για να υπογράψετε ένα κλειδί στην κλειδοθήκη σας: " +#: C/index.docbook:1263(sect1/para) +#| msgid "To sign a key in your keyring: " +msgid "To sign a key in your keyring: <_:itemizedlist-1/>" +msgstr "Για να υπογράψετε ένα κλειδί στην κλειδοθήκη σας: <_:itemizedlist-1/>" -#: C/seahorse.xml:1305(title) +#: C/index.docbook:1305(sect1/title) msgid "Preferences" msgstr "Προτιμήσεις" -#: C/seahorse.xml:1306(para) +#: C/index.docbook:1306(sect1/para) +#| msgid "" +#| "This section describes the preferences settable in Passwords " +#| "and Keys by choosing EditPreferences from within " +#| "Passwords and Keys." msgid "" "This section describes the preferences settable in Passwords " -"and Encryption Keys by choosing EditPreferences from within " -"Passwords and Encryption Keys." +"and Keys by choosing Edit " +"Preferences from within " +"Passwords and Keys." msgstr "" "Αυτό το τμήμα περιγράφει τις προτιμήσεις που μπορούν να καθοριστούν στην " "εφαρμογή Κωδικοί και κλειδιά κρυπτογράφησης με " -"επιλογή του ΕπεξεργασίαΠροτιμήσεις μέσα από την " +"επιλογή του Επεξεργασία " +"Προτιμήσεις μέσα από την " "Κωδικοί και κλειδιά κρυπτογράφησης." -#: C/seahorse.xml:1315(title) +#: C/index.docbook:1315(sect2/title) msgid "Password Keyrings" msgstr "Κλειδοθήκες κωδικών" -#: C/seahorse.xml:1317(title) +#: C/index.docbook:1317(sect3/title) msgid "Creating Keyrings" msgstr "Δημιουργία κλειδοθηκών" -#: C/seahorse.xml:1318(para) -#| msgid "" -#| "To import keys choose FileImport and select, from " -#| "the file chooser, a file containing at least one ASCII armored public key." +#: C/index.docbook:1318(sect3/para) msgid "" "To create a new keyring, from the menu choose FileNew and choose " "Password Keyring. Enter a name for the new keyring, " "and press enter." msgstr "" -"Για να δημιουργήσετε μια νέα κλειδοθήκη, επιλέξτε ΑρχείοΝέο και επιλέξτε " -"Κλειδοθήκη κωδικών. " -"Εισάγετε ένα όνομα για τη νέα κλειδοθήκη και πατήστε Enter." +"Για να δημιουργήσετε μια νέα κλειδοθήκη, επιλέξτε " +"ΑρχείοΝέο και επιλέξτε Κλειδοθήκη κωδικών. Εισάγετε " +"ένα όνομα για τη νέα κλειδοθήκη και πατήστε Enter." -#: C/seahorse.xml:1323(title) +#: C/index.docbook:1323(sect3/title) msgid "Changing Keyring Passwords" msgstr "Αλλαγή κωδικών πρόσβασης κλειδοθηκών" -#: C/seahorse.xml:1324(para) +#: C/index.docbook:1324(sect3/para) msgid "" "To change the unlock password of the keyring, first select the appropriate " "keyring and then press Change Unlock Password button. " @@ -1636,29 +1783,29 @@ "την επιτυχία της ενέργειας. Αν ο παλιός κωδικός είναι λανθασμένος, θα σας " "ζητηθεί να ελέγξετε την ορθότητα του." -#: C/seahorse.xml:1338(title) +#: C/index.docbook:1338(sect3/title) msgid "Removing Keyrings" msgstr "Διαγραφή κλειδοθηκών" -#: C/seahorse.xml:1339(para) +#: C/index.docbook:1339(sect3/para) #| msgid "" -#| "To export keys, select the keys in the main window and choose " -#| "FileExport." +#| "To remove a keyring, first select the appropriate keyring and then from " +#| "the menu choose EditDelete." msgid "" "To remove a keyring, first select the appropriate keyring and then from the " -"menu choose EditDeleteEdit Delete." msgstr "" -"Για να διαγράψετε μια κλειδοθήκη, πρώτα επιλέξτε τη κλειδοθήκη " -"και μετά από το μενού επιλέξτε Επεξεργασία" +"Για να διαγράψετε μια κλειδοθήκη, πρώτα επιλέξτε τη κλειδοθήκη και μετά από " +"το μενού επιλέξτε Επεξεργασία " "Διαγραφή." -#: C/seahorse.xml:1347(title) +#: C/index.docbook:1347(sect2/title) msgid "Key Servers" msgstr "Εξυπηρετητές κλειδιών" -#: C/seahorse.xml:1348(para) +#: C/index.docbook:1348(sect2/para) msgid "" "Keep your and other's keys up to date by syncing keys periodically with " "remote keyservers. Syncing will make sure that you have the latest " @@ -1671,39 +1818,36 @@ "κλειδιά σας οπότε ο δικτυακός ιστός εμπιστοσύνης (web of trust) θα είναι πιο " "χρήσιμος." -#: C/seahorse.xml:1354(para) +#: C/index.docbook:1354(sect2/para) msgid "" -"Passwords and Encryption Keys provides support " -"for HKP and LDAP keyservers." +"Passwords and Keys provides support for HKP and " +"LDAP keyservers." msgstr "" "Το Κωδικοί και κλειδιά κρυπτογράφησης υποστηρίζει " "τους εξυπηρετητές κλειδιών HKP και LDAP." -#: C/seahorse.xml:1359(emphasis) -msgid "HKP Servers" -msgstr "Εξυπηρετητές HKP" +#: C/index.docbook:1359(varlistentry/term) +msgid "HKP Servers" +msgstr "Εξυπηρετητές HKP" -#: C/seahorse.xml:1361(para) +#: C/index.docbook:1361(listitem/para) msgid "" "HKP keyservers are ordinary web based keyservers such as the popular hkp://pgp.mit.edu:11371, also accessible at http://pgp.mit.edu." +"url=\"hkp://pool.sks-keyservers.net\" type=\"hkp\">hkp://pool.sks-keyservers." +"net, also accessible at http://sks-keyservers.net." msgstr "" "Οι εξυπηρετητές κλειδιών HKP είναι τυπικοί εξυπηρετητές κλειδιών δικτυακού " -"ιστού, όπως το δημοφιλές hkp://pgp.mit.edu:11371, που είναι και προσβάσιμο από το http://pgp.mit.edu." - -#: C/seahorse.xml:1369(acronym) -msgid "LDAP" -msgstr "LDAP" - -#: C/seahorse.xml:1369(emphasis) -msgid " Keyservers" -msgstr " Εξυπηρετητές κλειδιών" +"ιστού, όπως το δημοφιλές hkp://pool.sks-keyservers.net, που είναι και προσβάσιμο από " +"το http://sks-" +"keyservers.net." + +#: C/index.docbook:1369(varlistentry/term) +msgid "LDAP Keyservers" +msgstr "Εξυπηρετητές κλειδιών LDAP" -#: C/seahorse.xml:1371(para) +#: C/index.docbook:1371(listitem/para) msgid "" "LDAP keyservers are less common, but use the standard " "LDAP protocol to serve keys. ldap://keyserver.pgp.com." -#: C/seahorse.xml:1383(title) +#: C/index.docbook:1383(sect2/title) msgid "Key Sharing" msgstr "Κοινή χρήση κλειδιών" -#: C/seahorse.xml:1384(para) +#: C/index.docbook:1384(sect2/para) msgid "" "Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. " -"Enabling key sharing will add the local Passwords and " -"Encryption Keys users' public key rings to the remote search " -"dialog. Using these local \"key servers\" will most likely be faster than " -"accessing remote servers." +"Enabling key sharing will add the local Passwords and Keys users' public key rings to the remote search dialog. Using " +"these local \"key servers\" will most likely be faster than accessing remote " +"servers." msgstr "" "Η διαμοίραση κλειδιών παρέχεται από το DNS-DS, γνωστό και ως Bonjour ή " "Rendevous. Η ενεργοποίηση του διαμοιρασμού κλειδιών προσθέτει τις τοπικές " @@ -1733,45 +1877,58 @@ "αυτών των τοπικών «εξυπηρετητών κλειδιών» είναι κατά πάσα πιθανότητα πιο " "γρήγορη από την προσπέλαση απομακρυσμένων εξυπηρετητών." -#: C/seahorse.xml:1396(title) -msgid "About Passwords and Encryption Keys" +#: C/index.docbook:1396(sect1/title) +msgid "About Passwords and Keys" msgstr "Περί του προγράμματος Κωδικοί και κλειδιά κρυπτογράφησης" -#: C/seahorse.xml:1397(para) +#: C/index.docbook:1397(sect1/para) msgid "" -"Passwords and Encryption Keys, its associated " -"plugins, the preferences applet and the panel applet are known collectively " -"as Seahorse. Seahorse was written by Jacob Perkins. The current maintainers " -"are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The " -"project's web site was designed by Jim Pharis. To find more information " -"about Seahorse, the project , please visit the Seahorse web page." +"Passwords and Keys, its associated plugins, the " +"preferences applet and the panel applet are known collectively as Seahorse. " +"Seahorse was written by Jacob Perkins. The current maintainers are Stef " +"Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's " +"web site was designed by Jim Pharis. To find more information about " +"Seahorse, the project , please visit the Seahorse web page." msgstr "" "Η εφαρμογή Κωδικοί και κλειδιά κρυπτογράφησης, τα " "πρόσθετα που παρέχει, η μικροεφαρμογή προτιμήσεων και η μικροεφαρμογή του " "πίνακα εφαρμογών είναι, ως σύνολο, γνωστά σαν Seahorse. Το Seahorse " "δημιουργήθηκε από τον Jacob Perkins. Οι τρέχοντες δημιουργοί είναι οι Stef " -"Walter και Adam Schreiber. Ο δικτυακός τόπος του έργου σχεδιάστηκε από τον " -"Jim Pharis. Για περισσότερες πληροφορίες για το Seahorse, το έργο, " -"παρακαλούμε επισκεφθείτε την Ιστοσελίδα του Seahorse." +"Walter και Adam Schreiber. Αυτό το εγχειρίδιο γράφτηκε από τον Adam " +"Schreiber. Ο δικτυακός τόπος του έργου σχεδιάστηκε από τον Jim Pharis. Για " +"περισσότερες πληροφορίες για το Seahorse, το έργο, παρακαλούμε επισκεφθείτε " +"την Ιστοσελίδα του Seahorse." -#: C/seahorse.xml:1404(para) +#: C/index.docbook:1404(sect1/para) +#| msgid "" +#| "To report a bug or make a suggestion regarding this application or this " +#| "manual, follow the directions in the Feedback section of the GNOME User Guide." msgid "" "To report a bug or make a suggestion regarding this application or this " -"manual, follow the directions in the Feedback section of the GNOME User Guide." msgstr "" "Για να αναφέρετε κάποιο πρόβλημα ή να κάνετε μια πρόταση σχετικά με αυτήν " "την εφαρμογή ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στην Ενότητα ανάδρασης του " -"οδηγού χρήστη GNOME." +"\"help:user-guide?feedback-bugs\" type=\"help\">Ενότητα ανάδρασης του οδηγού " +"χρήστη GNOME." -#: C/seahorse.xml:1409(para) +#: C/index.docbook:1409(sect1/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 is included with this " +#| "documentation; another can be found in the file COPYING included with the " +#| "source code of this program." 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 is included with this " "documentation; another can be found in the file COPYING included with the " "source code of this program." @@ -1779,35 +1936,182 @@ "Αυτό το πρόγραμμα διανέμεται υπό τους όρους της Γενικής Δημόσιας Άδειας GNU " "όπως δημοσιεύεται από το Ίδρυμα Ελεύθερου Λογισμικού, είτε με την έκδοση 2 " "της Άδειας, είτε (σαν επιλογή σας) με κάθε μεταγενέστερη έκδοση. Με αυτήν " -"την τεκμηρίωση συμπεριλαμβάνεται ένα αντίγραφο της άδειας, ένα άλλο μπορεί να βρεθεί στο αρχείο " "COPYING, με τον πηγαίο κώδικα του προγράμματος." -# #-#-#-#-# gnome-power-manager.HEAD.el.po (el) #-#-#-#-# +#: C/legal.xml:9(para/ulink) +msgid "link" +msgstr "σύνδεσμο" + +#: C/legal.xml:2(legalnotice/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." +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 <_:ulink-1/> or in the file COPYING-DOCS distributed " +"with this manual." +msgstr "" +"Παρέχεται άδεια για την αντιγραφή, διανομή και/ή τροποποίηση αυτού του " +"εγγράφου υπό τους όρους της GNU Free Documentation License (GFDL), Έκδοση " +"1.1 ή μεταγενέστερης που δημοσιεύεται από το Free Software Foundation χωρίς " +"αμετάβλητα τμήματα, χωρίς κείμενα πρωτοσέλιδου, και χωρίς κείμενα " +"οπισθόφυλλου. Μπορεί να βρείτε ένα αντίγραφο της GFDL στο <_:ulink-1/> ή στο " +"αρχείο COPYING-DOCS που διανέμεται με αυτό το εγχειρίδιο." + +#~ msgid "2005, 2006, 2007, 2008, 2009" +#~ msgstr "2005, 2006, 2007, 2008, 2009" + +#~ msgid "Jacob Perkins and Adam Schreiber" +#~ msgstr "Jacob Perkins και Adam Schreiber" + +#~ msgid "Jacob" +#~ msgstr "Jacob" + +#~ msgid "Perkins" +#~ msgstr "Perkins" + +#~ msgid "Adam" +#~ msgstr "Adam" + +#~ msgid "Schreiber" +#~ msgstr "Schreiber" + +#~ msgid "sadam@clemson.edu" +#~ msgstr "sadam@clemson.edu" + +#~ msgid "Paul" +#~ msgstr "Paul" + +#~ msgid "Cutler" +#~ msgstr "Cutler" + +#~ msgid "pcutler@foresightlinux.org" +#~ msgstr "pcutler@foresightlinux.org" + +#~| msgid "Passwords and Encryption Keys Manual V2.11.0" +#~ msgid "Passwords and Keys Manual V2.11.0" +#~ msgstr "Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V2.11.0" + +#~ msgid "May 2009" +#~ msgstr "Μάιος 2009" + +#~| msgid "Passwords and Encryption Keys Manual V0.10.1" +#~ msgid "Passwords and Keys Manual V0.10.1" +#~ msgstr "Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.10.1" + +#~ msgid "August 2008" +#~ msgstr "Αύγουστος 2008" + +#~| msgid "Passwords and Encryption Keys Manual V0.9.1" +#~ msgid "Passwords and Keys Manual V0.9.1" +#~ msgstr "Κωδικοί και κλειδιά κρυπτογράφησης V0.9.1" + +#~ msgid "November 2006" +#~ msgstr "Νοέμβριος 2006" + +#~| msgid "Passwords and Encryption Keys Manual V0.9.0" +#~ msgid "Passwords and Keys Manual V0.9.0" +#~ msgstr "Κωδικοί και κλειδιά κρυπτογράφησης V0.9.0" + +#~ msgid "July 2005" +#~ msgstr "Ιούλιος 2005" + +#~| msgid "Passwords and Encryption Keys Manual V0.7.0" +#~ msgid "Passwords and Keys Manual V0.7.0" +#~ msgstr "Κωδικοί και κλειδιά κρυπτογράφησης V0.7.0" + +# #-#-#-#-# gnome-utils.HEAD.el.po (el) #-#-#-#-# +# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation") +#~ msgid "February 2003" +#~ msgstr "Φεβρουάριος 2003" + +#~ msgid "Seahorse" +#~ msgstr "Seahorse" + +#~ msgid "seahorse" +#~ msgstr "seahorse" + +#~| msgid "Passwords and Encryption Keys" +#~ msgid "Passwords and Keys" +#~ msgstr "Κωδικοί και κλειδιά κρυπτογράφησης" + +#~ msgid "Show the window." +#~ msgstr "Εμφάνιση του παραθύρου ." + +#~ msgid "Encryption Type" +#~ msgstr "Τύπος κρυπτογράφησης" + +#~ msgid "DSA" +#~ msgstr "DSA" + +#~ msgid "Fingerprint" +#~ msgstr "Δαχτυλικό αποτύπωμα" + +#~ msgid "KeyID" +#~ msgstr "Ταυτότητα κλειδιού" + # #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# # -# #-#-#-#-# procman.HEAD.el.po (el) #-#-#-#-# +#~ msgid "Type" +#~ msgstr "Τύπος" + +#~ msgid "Created" +#~ msgstr "Δημιουργήθηκε" + +#~ msgid "Expires" +#~ msgstr "Λήγει" + +#~ msgid "Strength" +#~ msgstr "Ισχύς" + +#~ msgid "Full Name" +#~ msgstr "Πλήρες όνομα" + # -# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# +#~ msgid "Email Address" +#~ msgstr "Ηλεκτρονική διεύθυνση" + +#~ msgid "Key Comment" +#~ msgstr "Σχόλιο κλειδιού" + # -# #-#-#-#-# accerciser.HEAD.el.po (accerciser) #-#-#-#-# -# #-#-#-#-# gnome-power-manager.HEAD.el.po (el) #-#-#-#-# +#~ msgid "ID" +#~ msgstr "Ταυτότητα" + +#~ msgid "Status" +#~ msgstr "Κατάσταση" + +#~ msgid "Algorithm" +#~ msgstr "Αλγόριθμος" + # #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# # -# #-#-#-#-# procman.HEAD.el.po (el) #-#-#-#-# -# -# #-#-#-#-# gnome-system-monitor.HEAD.el.po (el) #-#-#-#-# +# #-#-#-#-# file-roller.HEAD.el.po (el) #-#-#-#-# # -# #-#-#-#-# nautilus.HEAD.el.po (el) #-#-#-#-# +# #-#-#-#-# ekiga.gnome-2-14.el.po (el) #-#-#-#-# # -# #-#-#-#-# gnome-system-monitor.HEAD.el.po (el) #-#-#-#-# +# #-#-#-#-# libgnomeprintui.HEAD.el.po (el) #-#-#-#-# # -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/seahorse.xml:0(None) -msgid "translator-credits" -msgstr "" -"Ελληνική μεταφραστική ομάδα GNOME\n" -"Φώτης Τσάμης " +#~ msgid "Location" +#~ msgstr "Τοποθεσία" + +#~ msgid "HKP Servers" +#~ msgstr "Εξυπηρετητές HKP" + +#~ msgid "LDAP" +#~ msgstr "LDAP" + +#~ msgid " Keyservers" +#~ msgstr " Εξυπηρετητές κλειδιών" #~ msgid "Backup your keys and keyring," #~ msgstr "Αντίγραφο ασφαλείας των κλειδιών και των κλειδοθηκών," diff -Nru seahorse-3.2.2/help/el/index.docbook seahorse-3.6.3/help/el/index.docbook --- seahorse-3.2.2/help/el/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/el/index.docbook 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,854 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης + 2005, 2006, 2007, 2008, 2009 Jacob Perkins και Adam Schreiber + + Έργο Seahorse + + + + Επιτρέπεται η αντιγραφή, αναδιανομή και/η τροποποίηση αυτού του εγγράφου υπό τους όρους της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), Έκδοση 1.1 ή νεότερη που εκδόθηκε από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Αμετάβλητα Τμήματα, χωρίς Κείμενο Εξωφύλλου, και χωρίς Κείμενο Οπισθόφυλλου. Μπορείτε να βρείτε ένα αντίγραφο της GFDL σε αυτό το σύνδεσμο ή στο αρχείο COPYING-DOCS που διανέμεται με αυτό το εγχειρίδιο. + Αυτό το εγχειρίδιο αποτελεί μέρος της συλλογής εγχειριδίων του GNOME που διανέμονται υπό τους όρους της GFDL. Αν επιθυμείτε να διανείμετε το παρόν εγχειρίδιο ξεχωριστά από τη συλλογή, οφείλετε να προσθέσετε στο εγχειρίδιο αντίγραφο της άδειας χρήσης, όπως προβλέπεται στο άρθρο 6 της άδειας. + + Πολλά από τα ονόματα που χρησιμοποιούνται από εταιρείες για να διακρίνουν τα προϊόντα και τις υπηρεσίες τους είναι κατατεθέντα σήματα. Όπου εμφανίζονται τέτοια ονόματα σε οποιαδήποτε τεκμηρίωση του GNOME. και τα μέλη του Έργου Τεκμηρίωσης του GNOME το γνωρίζουν, τότε αυτά τα ονόματα γράφονται με κεφαλαία γράμματα ή ξεκινούν με κεφαλαίο γράμμα. + + ΤΟ ΈΓΓΡΑΦΟ ΚΑΙ ΤΡΟΠΟΠΟΙΗΜΕΝΕΣ ΕΚΔΟΣΕΙΣ ΑΥΤΟΥ ΠΑΡΕΧΟΝΤΑΙ ΥΠΟ ΤΟΥΣ ΟΡΟΥΣ ΤΗΣ ΑΔΕΙΑΣ GNU FREE DOCUMENTATION ΜΕ ΤΗΝ ΠΕΡΑΙΤΕΡΩ ΔΙΕΥΚΡΙΝΙΣΗ ΟΤΙ: + + ΤΟ ΠΑΡΟΝ ΕΓΓΡΑΦΟ ΠΑΡΕΧΕΤΑΙ "ΩΣ ΕΧΕΙ", ΧΩΡΙΣ ΟΠΟΙΑΔΗΠΟΤΕ ΕΓΓΥΗΣΗ, ΕΚΠΕΦΡΑΣΜΕΝΗ Ή ΥΠΑΙΝΙΣΣΟΜΕΝΗ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΧΩΡΙΣ ΠΕΡΙΟΡΙΣΜΟΥΣ, ΕΓΓΥΗΣΕΩΝ ΟΤΙ ΤΟ ΕΓΓΡΑΦΟ Ή Η ΤΡΟΠΟΠΟΙΗΜΕΝΗ ΕΚΔΟΣΗ ΤΟΥ ΕΙΝΑΙ ΑΠΑΛΑΓΜΕΝΟ ΑΤΕΛΕΙΩΝ, ΕΜΠΟΡΕΥΣΙΜΟ, ΚΑΤΑΛΛΗΛΟ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΗ ΧΡΗΣΗ Ή ΑΠΑΡΑΒΙΑΣΤΟ. Ο ΧΡΗΣΤΗΣ ΑΝΑΛΑΜΒΑΝΕΙ ΚΑΘΕ ΚΙΝΔΥΝΟ ΠΟΥ ΜΠΟΡΕΙ ΝΑ ΠΡΟΚΥΨΕΙ ΩΣ ΠΡΟΣ ΤΗΝ ΠΟΙΟΤΗΤΑ, ΑΚΡΙΒΕΙΑ ΚΑΙ ΛΕΙΤΟΥΡΓΙΑ ΤΟΥ ΕΓΓΡΑΦΟΥ Ή ΤΩΝ ΤΡΟΠΟΠΟΙΗΜΕΝΩΝ ΕΚΔΟΣΕΩΝ ΤΟΥ. ΑΝ ΟΠΟΙΟΔΗΠΟΤΕ ΕΓΓΡΑΦΟ Ή ΤΡΟΠΟΠΟΙΗΜΕΝΗ ΕΚΔΟΣΗ ΤΟΥ ΑΠΟΔΕΙΧΘΟΥΝ ΕΛΛΑΤΩΜΑΤΙΚΑ ΜΕ ΟΠΟΙΟΝΔΗΠΟΤΕ ΤΡΟΠΟ, Ο ΤΕΛΙΚΟΣ ΧΡΗΣΤΗΣ (ΚΑΙ ΟΧΙ Ο ΑΡΧΙΚΟΣ ΣΥΓΓΡΑΦΕΑΣ, ΣΥΝΤΑΚΤΗΣ Ή ΟΠΟΙΟΣΔΗΠΟΤΕ ΤΟ ΔΙΕΝΗΜΕ) ΑΝΑΛΑΜΒΑΝΕΙ ΤΟ ΚΟΣΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΕΠΙΣΚΕΥΗΣ Ή ΔΙΟΡΘΩΣΗΣ. ΑΥΤΗ Η ΠΑΡΑΙΤΗΣΗ ΑΠΟ ΕΓΓΥΗΤΙΚΕΣ ΕΥΘΥΝΕΣ ΣΥΝΙΣΤΑ ΟΥΣΙΑΣΤΙΚΟ ΜΕΡΟΣ ΤΗΣ ΑΔΕΙΑΣ. ΟΥΔΕΜΙΑ ΧΡΗΣΗ ΟΙΟΥΔΗΠΟΤΕ ΕΓΓΡΑΦΟΥ Ή ΤΡΟΠΟΠΟΙΗΜΕΝΟΥ ΕΓΓΡΑΦΟΥ ΕΞΟΥΣΙΟΔΟΤΕΙΤΑΙ ΕΦΕΞΗΣ, ΠΑΡΑ ΥΠΟ ΤΟΝ ΟΡΟ ΤΗΣ ΩΣ ΑΝΩ ΠΑΡΑΙΤΗΣΗΣ ΚΑΙ + + + ΣΕ ΚΑΜΙΑ ΠΕΡΙΠΤΩΣΗ ΚΑΙ ΥΠΟ ΚΑΜΙΑ ΝΟΜΙΚΗ ΣΥΝΘΗΚΗ, ΕΙΤΕ ΜΕΣΩ ΣΥΜΒΟΛΑΙΩΝ Ή ΑΛΛΙΩΣ, ΔΕΝ ΕΥΘΥΝΟΝΤΑΙ Ο ΣΥΓΓΡΑΦΕΑΣ, Ο ΔΙΑΝΟΜΕΑΣ, Η ΑΛΛΟΣ ΣΥΝΥΠΕΥΘΥΝΟΣ ΓΙΑ ΤΗΝ ΣΥΓΓΡΑΦΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ, ΓΙΑ ΕΜΜΕΣΕΣ Η ΑΜΕΣΕΣ, ΤΥΧΑΙΕΣ Ή ΜΗ ΖΗΜΙΕΣ ΠΑΝΤΩΣ ΦΥΣΕΩΣ ΠΟΥ ΠΡΟΕΡΧΟΝΤΑΙ ΑΠΟ ΤΗΝ ΧΡΗΣΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ ΚΑΙ/Ή ΠΑΡΑΛΛΑΓΩΝ ΑΥΤΗΣ ΑΚΟΜΑ ΚΑΙ ΕΑΝ ΕΧΕΙ ΥΠΑΡΞΕΙ ΠΡΟΕΙΔΟΠΟΙΗΣΗ ΓΙΑ ΤΗΝ ΠΙΘΑΝΟΤΗΤΑ ΥΠΑΡΞΗΣ ΤΕΤΟΙΩΝ ΖΗΜΙΩΝ. + + + + + + + Jacob Perkins Έργο Seahorse + Adam Schreiber Seahorse Project
sadam@clemson.edu
+ Paul Cutler Ομάδα τεκμηρίωσης GNOME
pcutler@foresightlinux.org
 + + + + + Έργο Seahorse + + + Έργο τεκμηρίωσης του GNOME + + + Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V2.11.0 Μάιος 2009 + Paul Cutler pcutler@foresightlinux.org + + Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.10.1 Αύγουστος 2008 + Adam Schreiber sadam@clemson.edu + + Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.9.1 Νοέμβριος 2006 + Milo Casagrande milo_casagrande@yahoo.it + + Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.9.0 Ιούλιος 2005 + Adam Schreiber sadam@clemson.edu + Έργο Seahorse + + Εγχειρίδιο του Κωδικοί και κλειδιά κρυπτογράφησης V0.7.0 Φεβρουάριος 2003 + Jacob Perkins + Έργο Seahorse + + + Αυτό το εγχειρίδιο περιγράφει την έκδοση 2.28.x του Κωδικοί και κλειδιά κρυπτογράφησης + + Ανάδραση + Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με το Κωδικοί και κλειδιά κρυπτογράφησης ή γι' αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στη Σελίδα ανάδρασης GNOME. + + + + Το Κωδικοί και κλειδιά κρυπτογράφησης είναι η εφαρμογή που διαχειρίζεται κλειδιά κρυπτογράφησης για την επιφάνεια εργασίας του GNOME + + + + + + Φώτης Τσάμης + + ftsamis@gmail.com + + + + 2009 + + Φώτης Τσάμης + + + + Seahorse + + seahorse + + Κλειδιά κρυπτογράφησης + + + + + Εισαγωγή + Μπορείτε να χρησιμοποιήσετε το Κωδικοί και κλειδιά κρυπτογράφησης για να δημιουργήσετε και να διαχειρίζεστε κλειδιά PGP και SSH. + Η εφαρμογή Κωδικοί και κλειδιά κρυπτογράφησης παρέχει ένα γραφικό περιβάλλον για πολλές από τις λειτουργίες του Gnu Privacy Guard (GPG) και ενσωματώνει πολλές από τις δυνατότητες που προσφέρει η επιφάνεια εργασίας GNOME. + Με το Κωδικοί και κλειδιά κρυπτογράφησης μπορείτε: + + + Δημιουργία και διαχείριση κλειδιών PGP και SSH, + + + Εξαγωγή και εισαγωγή κλειδιών PGP και SSH, + + + Κοινή χρήση των κλειδιών σας με άλλους, + + + + + + + + Ξεκινώντας + + Εκκίνηση του <application>Κωδικοί και κλειδιά κρυπτογράφησης</application> + Μπορείτε να ξεκινήσετε το Κωδικοί και κλειδιά κρυπτογράφησης με τους ακόλουθους τρόπους: + + + Μενού Εφαρμογές + + Επιλέξτε Βοηθήματα Κωδικοί και κλειδιά κρυπτογράφησης . + + + + Γραμμή εντολών + + Πληκτρολογήστε seahorse, μετά πατήστε Return. + + + + + + + Όταν εκκινείτε το <application>Κωδικοί και κλειδιά κρυπτογράφησης</application> + Όταν εκκινείτε το Κωδικοί και κλειδιά κρυπτογράφησης, το παράθυρο Κωδικοί και κλειδιά κρυπτογράφησης εμφανίζεται. + +
+ Το παράθυρο <application>Κωδικοί και κλειδιά κρυπτογράφησης</application> + + Το κύριο παράθυρο του Κωδικοί και κλειδιά κρυπτογράφησης. + +
+ + Το παράθυρο του Κωδικοί και κλειδιά κρυπτογράφησης περιλαμβάνει τα παρακάτω στοιχεία: + + + Γραμμή μενού + + Τα μενού στη γραμμή μενού περιέχουν όλες τις εντολές που θα χρειαστείτε για να δουλέψετε με το Κωδικοί και κλειδιά κρυπτογράφησης. + + + Εργαλειοθήκη + + Χρησιμοποιήστε την εργαλειοθήκη για να έχετε γρήγορη πρόσβαση σε συχνά χρησιμοποιούμενες εντολές. + + + Στήλες κλειδιών και κωδικών + + Παρέχει πρόσβαση στα κλειδιά και στους κωδικούς πρόσβασης στην κλειδοθήκη. + + + Επιλογές πρώτης φοράς + + Παρέχει γρήγορη πρόσβαση σε χρήσιμες ενέργειες για αρχάριους χρήστες. Εδώ μπορείτε να κάνετε: + + + Περιήγηση στο σύστημα βοήθειας, + + + Εισαγωγή κλειδιών στην κλειδοθήκη, + + + Δημιουργία νέων κλειδιών. + + + + + + + + + + + + Δημιουργία κλειδιών OpenPGP + Το OpenPGP είναι ένα ανοιχτό πρωτόκολλο για την κρυπτογράφηση αλληλογραφίας με τη χρήση κρυπτογραφίας δημοσίου κλειδιού, βασιζόμενο στο PGP. Καθορίζει πρότυπα για κρυπτογραφημένα μηνύματα, υπογραφές, ιδιωτικά κλειδιά και πιστοποιητικά για τη συναλλαγή δημοσίων κλειδιών. + Η κρυπτογράφηση δημοσίου κλειδιού απαιτεί τη χρήση δύο κλειδιών: ένα δημόσιο κλειδί, που μπορείτε να δώσετε σε οποιονδήποτε θέλετε να επικοινωνήσετε, και ένα ιδιωτικό κλειδί που είναι ιδιωτικό και πρέπει να διατηρήσετε μυστικό. + Για να δημιουργήσετε κλειδιά OpenPGP: + + Επιλέξτε ΑρχείοΝέο... + + + Επιλέξτε Κλειδί PGP και κάντε κλικ στο Συνέχεια + + + Εισάγετε το πλήρες όνομα σας, την διεύθυνση e-mail σας και οποιαδήποτε επιπρόσθετη πληροφορία. Μπορείτε επίσης να ορίσετε προχωρημένες ρυθμίσεις για το κλειδί: δείτε παρακάτω. + + + Κάντε κλικ στο Δημιουργία για να δημιουργήσετε το νέο ζευγάρι κλειδιών. + + + Ο διάλγος Συνθηματικό για νέο κλειδί PGP θα ανοίξει. Εισάγετε το συνθηματικό δύο φορές για το νέο σας κλειδί. + + + + Χρησιμοποιήστε παρόμοιες πρακτικές για να δημιουργήσετε έναν ισχυρό κωδικό πρόσβασης όταν επιλέγετε ένα συνθηματικό. Η βασική διαφορά ανάμεσα σε έναν κωδικό πρόσβασης και ένα συνθηματικό, είναι πως, σε ένα συνθηματικό, τα κενά είναι έγκυροι χαρακτήρες. + + + + Επιλογές για προχωρημένους + Αναπτύξτε την κατηγορία Προχωρημένες επιλογές κλειδιού για να ορίσετε τις ακόλουθες επιλογές για ένα νέο κλειδί: + + + Τύπος κρυπτογράφησης + + Αυτό το πεδίο καθορίζει τους αλγόριθμους κρυπτογράφησης που χρησιμοποιούνται για την δημιουργία των κλειδιών σας. + + + DSA ElGamal + + Αυτή είναι η προτεινόμενη επιλογή καθώς σας επιτρέπει να κρυπτογραφείτε, να αποκρυπτογραφείτε, να υπογράφετε και να επιβεβαιώνετε όπως χρειάζεται. + + + + DSA + + Σας επιτρέπει μόνο να υπογράφετε. + + + + RSA + + Σας επιτρέπει μόνο να υπογράφετε. + + + + + + + Ισχύς κλειδιού (ψηφία) + + Αυτό είναι το μήκος του κλειδιού σε ψηφία. Όσο πιο μεγάλο το κλειδί, τόσο πιο μεγάλη ασφάλεια θα υπάρχει, δεδομένου πως χρησιμοποιείται ένα δυνατό συνθηματικό. Αντιστρόφως, η εκτέλεση οποιαδήποτε ενέργειας με ένα μεγάλο κλειδί θα απαιτεί περισσότερο χρόνο από ό,τι με ένα μικρότερο κλειδί. Οι αποδεκτές τιμές είναι ανάμεσα στα 1024 και στα 4096 ψηφία. Τουλάχιστον 2048 ψηφία προτείνονται. + + + + Ημερομηνία λήξης + + Αυτή είναι η ημερομηνία όπου το κλειδί θα παύσει να είναι χρησιμοποιήσιμο για λειτουργίες κρυπτογράφησης ή ψηφιακής υπογραφής. Έξι μήνες είναι ένας τυπικός χρόνος που μπορείτε να καθορίσετε. Μετά το πέρας του χρονικού διαστήματος αυτού, θα χρειαστείτε είτε να αλλάξετε την ημερομηνία λήξης ή να δημιουργήσετε ένα νέο κλειδί ή υπο-κλειδί. + Υπογράψτε το νέο σας κλειδί με το παλιό σας πριν λήξει για να διατηρήσετε την κατάσταση εμπιστοσύνης σας. + + + + + + + + + + + Δημιουργία κλειδιών ασφαλούς κελύφους + Το ασφαλές κέλυφος (SSH) είναι ένας τρόπος σύνδεσης σε απομακρυσμένο υπολογιστή για εκτέλεση εντολών σε αυτό το μηχάνημα. Τα κλειδιά SSH χρησιμοποιούνται στο σύστημα πιστοποίησης που βασίζεται στα κλειδιά, ως εναλλακτική στο προεπιλεγμένο σύστημα πιστοποίησης βασισμένο στους κωδικούς πρόσβασης. Με την πιστοποίηση που βασίζεται σε κλειδιά, δεν χρειάζεται να πληκτρολογείτε χειρωνακτικά έναν κωδικό πρόσβασης για να γίνει πιστοποίηση. + Τα κλειδιά ασφαλούς κελύφους αποτελούνται από δύο κλειδιά: ένα ιδιωτικό κλειδί, που πρέπει να είναι μυστικό, και ένα δημόσιο κλειδί που μπορεί να τοποθετηθεί σε οποιονδήποτε υπολογιστή που θέλετε να έχετε πρόσβαση. + Για να δημιουργήσετε ένα κλειδί ασφαλούς κελύφους: + + + Επιλέξτε ΑρχείοΝέο... + + + Επιλέξτε Κλειδί Secure Shell (SSH) και κάντε κλικ στο Συνέχεια + + + Εισάγετε μια περιγραφή της χρήσης αυτού του κλειδιού. Μπορείτε να χρησιμοποιήσετε την διεύθυνση e-mail σας ή οποιαδήποτε άλλη υπενθύμιση. Μπορείτε επίσης να ορίσετε προχωρημένες επιλογές για το κλειδί: δείτε παρακάτω. + + + Κάντε κλικ στο Μόνο δημιουργία κλειδιού για να δημιουργήσετε το νέο κλειδί, ή στο Δημιουργία και ρύθμιση για να δημιουργήσετε το κλειδί και να ρυθμίσετε έναν άλλον υπολογιστή να το χρησιμοποιεί για πιστοποίηση. + + + Ο διάλογος Συνθηματικό για νέο κλειδί Secure Shell (SSH) ανοίγει. Εισάγετε το συνθηματικό δύο φορές για το νέο σας κλειδί. + + Χρησιμοποιήστε παρόμοιες πρακτικές για να δημιουργήσετε έναν ισχυρό κωδικό πρόσβασης όταν επιλέγετε ένα συνθηματικό. Η βασική διαφορά ανάμεσα σε έναν κωδικό πρόσβασης και ένα συνθηματικό, είναι πως, σε ένα συνθηματικό, τα κενά είναι έγκυροι χαρακτήρες. + + + + + + + + Επιλογές για προχωρημένους + Αναπτύξτε την κατηγορία Προχωρημένες επιλογές κλειδιού για να ορίσετε τις ακόλουθες επιλογές για ένα νέο κλειδί: + + + + Τύπος κρυπτογράφησης + + Αυτό το πεδίο καθορίζει τους αλγόριθμους κρυπτογράφησης που χρησιμοποιούνται για την δημιουργία του κλειδιού σας. + + + RSA + + Χρησιμοποιήστε τον αλγόριθμο Rivest-ShamirAdleman (RSA) για να δημιουργήσετε το κλειδί SSH. Αυτό προτιμάται και είναι πιο ασφαλής επιλογή. + + + + DSA + + Χρησιμοποιήστε τον Αλγόριθμο ψηφιακής υπογραφής (DSA) για να δημιουργήσετε το κλειδί SSH. + + + + + + + Ισχύς κλειδιού (ψηφία) + + Αυτό είναι το μήκος του κλειδιού σε ψηφία. Όσο πιο μεγάλο το κλειδί, τόσο πιο μεγάλη ασφάλεια θα υπάρχει, δεδομένου πως χρησιμοποιείται ένα δυνατό συνθηματικό. Αντιστρόφως, η εκτέλεση οποιαδήποτε ενέργειας με ένα μεγάλο κλειδί θα απαιτεί περισσότερο χρόνο από ό,τι με ένα μικρότερο κλειδί. Οι αποδεκτές τιμές είναι ανάμεσα στα 1024 και στα 4096 ψηφία. Τουλάχιστον 2048 ψηφία προτείνονται. + + + + + + + + + + Ιδιότητες κλειδιού OpenPGP + Οι περιγραφές σε αυτή την ενότητα εφαρμόζονται σε όλα τα κλειδιά OpenPGP. + + Για να εμφανίσετε τις ιδιότητες ενός κλειδιού PGP: + + Επιλέξτε το κλειδί PGP από το κεντρικό παράθυρο. + + + Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, + + + Επιλέξτε την καρτέλα Λεπτομέρειες. + + + + + Ιδιότητες + + + + Αποτύπωμα + + Το αποτύπωμα είναι μια μοναδική συμβολοσειρά χαρακτήρων που αναγνωρίζει ακριβώς ένα κλειδί. + + + + Ταυτότητα κλειδιού + + Η ταυτότητα κλειδιού είναι παρόμοια με το αποτύπωμα. Εντούτοις, η ταυτότητα κλειδιού περιέχει μόνο τους τελευταίους 8 χαρακτήρες του αποτυπώματος. Τις περισσότερες φορές θα μπορείτε να αναγνωρίσετε ένα κλειδί μόνο με την ταυτότητα κλειδιού, αλλά σε κάποιες περιπτώσεις, δύο κλειδιά μπορεί να έχουν την ίδια ταυτότητα. + + + + Τύπος + + Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για να δημιουργηθεί το κλειδί. Τα κλειδιά DSA μπορούν μόνο να χρησιμοποιηθούν σε υπογραφές. Τα κλειδιά ELGamal χρησιμοποιούνται για κρυπτογράφηση. + + + + Δημιουργήθηκε + + Δείχνει την ημερομηνία που το κλειδί δημιουργήθηκε. + + + + Λήγει + + Δείχνει την ημερομηνία που το κλειδί δεν θα μπορεί πλέον να χρησιμοποιηθεί. + + + + Ισχύς + + Δείχνει το μήκος σε ψηφία ενός κλειδιού. Γενικά, όσο πιο μεγάλο είναι ένα κλειδί, τόσο πιο ασφαλές είναι. + Ένα μεγάλο κλειδί δε προσφέρει σημαντικό επίπεδο ασφάλειας αν το συνθηματικό του είναι μικρό + + + + + + + + + Εμπιστοσύνη + Η εμπιστοσύνη είναι ένα δείκτης του πόσο είσαι σίγουρος για την ικανότητα ενός ατόμου για να επεκτείνει ορθά το διαδικτυακό ιστό εμπιστοσύνης (web of trust). Όταν αντιμετωπίζεται ένα κλειδί που δεν έχετε υπογράψει, η εγκυρότητα του κλειδιού αυτού του ατόμου θα αποφασιστεί από τις υπογραφές που έχει συγκεντρώσει καθώς και το πόσο καλά ή όχι εμπιστεύεστε τα άτομα που έχουν κάνει αυτές τις ψηφιακές υπογραφές. Από προεπιλογή, ένα άγνωστο κλειδί θα χρειάζεται 3 υπογραφές με οριακή τιμή εμπιστοσύνης ή μια πλήρη εμπιστευόμενη υπογραφή. + + Άγνωστη: Δεν γνωρίζετε την ικανότητα του ατόμου να υπογράφει σωστά τα κλειδιά. + Ποτέ: Αυτό το άτομο δεν μπορεί να υπογράψει σωστά τα κλειδιά. + Οριακή: Αυτό το άτομο ελέγχει για φωτογραφική ταυτότητα πριν υπογράψει ένα κλειδί, αλλά δε διερευνά εξονυχιστικά τις ταυτότητες. + Πλήρης: Αυτό το άτομο διερευνά κάθε μία φωτογραφική ταυτότητα πριν να τις υπογράψει ψηφιακά (π.χ. υπογράφουν μόνο κλειδιά που πραγματικά ανήκουν στο άτομο που ζητά την υπογραφή). + Μέγιστη: Αυτό το επίπεδο εμπιστοσύνης πρέπει να ορίζεται στα δικά σας κλειδιά. + + + + + Ενεργοποίηση και απενεργοποίηση κλειδιών + Όταν ένα κλειδί είναι ενεργοποιημένο, μπορεί να χρησιμοποιηθεί για την εκτέλεση ενεργειών κρυπτογράφησης. Όταν ένα κλειδί είναι απενεργοποιημένο, δεν μπορεί να χρησιμοποιηθεί για την κρυπτογράφηση ή την επιβεβαίωση υπογραφών που δημιουργήθηκαν με αυτό. + + + + Ημερομηνία λήξης + Ένα κλειδί δεν μπορεί να χρησιμοποιηθεί για την εκτέλεση ενεργειών κλειδιού μετά την λήξη του. Η αλλαγή της ημερομηνίας λήξης ενός κλειδιού σε ένα σημείο στο μέλλον, το ενεργοποιεί ξανά. Μια καλή πρακτική είναι να έχετε ένα κύριο κλειδί που δεν λήγει ποτέ και πολλά υπο-κλειδιά που λήγουν και είναι υπογεγραμμένα από το κύριο κλειδί. + + + + Ταυτότητες χρήστη + Οι ταυτότητες χρήστη (User ID) επιτρέπουν να χρησιμοποιηθούν πολλαπλές ταυτότητες και διευθύνσεις e-mail με το ίδιο κλειδί. + Συνήθως έχουν τη μορφή: Όνομα (σχόλιο) <διεύθυνση ηλ. αλληλογραφίας> + + + Προσθήκη μιας ταυτότητας χρήστη + Η προσθήκη μιας ταυτότητας χρήστη είναι χρήσιμη όταν θέλετε να έχετε μια ταυτότητα για την δουλειά σας και μια για τους φίλους σας. + Για να προσθέσετε μια ταυτότητα χρήστη σε ένα κλειδί: + + Επιλέξτε το κλειδί από το κυρίως παράθυρο, + + + Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, + + + Επιλέξτε την καρτέλα Ονόματα και υπογραφές, + + + Κάντε κλικ στο Προσθήκη ονόματος. + + + Αφού ακολουθήσετε τις παραπάνω οδηγίες, θα σας εμφανιστεί ένας διάλογος για να συμπληρώσετε. Τα πεδία αναλύονται παρακάτω. + + + Πλήρες όνομα + + Εισάγετε το ονοματεπώνυμο σας στη φόρμα <όνομα> <επώνυμο> Το μεσαίο όνομα ή αρχικά είναι προαιρετικά. + + + Πρέπει να εισάγετε τουλάχιστον 5 χαρακτήρες σε αυτό το πεδίο. + + + + + + Ηλεκτρονική διεύθυνση + + Η διεύθυνση ηλ. αλληλογραφίας είναι ο τρόπος που οι περισσότεροι θα χρησιμοποιήσουν για να εντοπίσουν το κλειδί σας σε ένα εξυπηρετητή κλειδιών ή άλλο πάροχο κλειδιών. Επιβεβαιώστε ότι είναι ορθό πριν συνεχίσετε. + + + Πρέπει να είναι της μορφής <username>@<domainname> + + + + + + Σχόλιο κλειδιού + + Το πεδίο σχολίου μπορεί να χρησιμοποιηθεί για να τοποθετηθεί οποιαδήποτε πρόσθετη πληροφορία στο εμφανιζόμενο όνομα της νέας σας ταυτότητας (ID). Αυτές οι πληροφορίες μπορούν να αναζητηθούν στους εξυπηρετητές κλειδιών. + + + + + + + + Φωτογραφική ταυτότητα + Οι φωτογραφικές ταυτότητες επιτρέπουν σε ένα ιδιοκτήτη κλειδιού να ενσωματώσει μία ή περισσότερες εικόνες του σε ένα κλειδί. Αυτές οι ταυτότητες μπορούν να υπογραφούν σαν να ήταν κανονικές ταυτότητες χρήστη. Μια φωτογραφική ταυτότητα πρέπει να είναι σε μορφή JPEG και προτείνεται να μην είναι μεγαλύτερες από 240x288 εικονοστοιχεία. + Αν η επιλεγμένη εικόνα δεν είναι του απαιτούμενου τύπου αρχείου ή μεγέθους, το Κωδικοί και κλειδιά κρυπτογράφησης μπορεί να αλλάξει το μέγεθος της και να την μετατρέψει επιτόπου από οποιονδήποτε τύπο αρχείου που υποστηρίζεται από την βιβλιοθήκη GDK. + + + + Αλλαγή του συνθηματικού + Για να αλλάξετε το συνθηματικό που έχει ορισθεί για ένα κλειδί: + + Επιλέξτε το κλειδί από το κυρίως παράθυρο, + + + Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, + + + Κάντε κλικ στο Αλλαγή συνθηματικού. + + + Εισάγετε το νέο συνθηματικό και κάντε κλικ στο OK. + + + + Διαγραφή ενός κλειδιού + Για να διαγράψετε ένα κλειδί από την κλειδοθήκη σας: + + Επιλέξτε το κλειδί από το κυρίως παράθυρο, + + + Κάντε δεξί κλικ πάνω του και επιλέξτε Διαγραφή κλειδιού ή επιλέξτε Επεξεργασία Διαγραφή κλειδιού . + + + + Μπορείτε να διαγράψετε τα κλειδιά σας, τα έμπιστα κλειδιά και τα συλλεγμένα κλειδιά. + + + + + + + + Ιδιότητες υποκλειδιού OpenPGP + Κάθε κλειδί OpenPGP έχει ένα γενικό κλειδί (master key) που χρησιμοποιείται για υπογραφές μόνο. Τα υπο-κλειδιά χρησιμοποιούνται και για να υπογράφουν και να κρυπτογράφουν. Με αυτό το τρόπο, αν ένα υπο-κλειδί παραβιαστεί, δε χρειάζεται να αναιρέσετε το γενικό σας κλειδί. + + + Ταυτότητα + + Αυτό είναι το αναγνωριστικό του υποκλειδιού. + + + + Τύπος + + Ορίζει τον αλγόριθμο κρυπτογράφησης που θα χρησιμοποιηθεί για την δημιουργία ενός υποκλειδιού. Τα κλειδιά DSA μπορούν μόνο να υπογράψουν, τα κλειδιά ElGamal χρησιμοποιούνται για να κρυπτογραφήσουν ενώ τα κλειδιά RSA χρησιμοποιούνται για να υπογράψουν ή για να κρυπτογραφήσουν. + + + + Δημιουργήθηκε + + Δείχνει την ημερομηνία που το κλειδί δημιουργήθηκε. + + + + Λήγει + + Δείχνει την ημερομηνία που το κλειδί δεν θα μπορεί πλέον να χρησιμοποιηθεί. + + + + Κατάσταση + + Δείχνει την κατάσταση του κλειδιού. + + + + Ισχύς + + Δείχνει το μήκος του κλειδιού σε ψηφία. Γενικά, όσο πιο μεγάλο το κλειδί, τόσο πιο μεγάλη ασφάλεια παρέχει. + Ένα μεγάλο κλειδί δε προσφέρει σημαντικό επίπεδο ασφάλειας αν το συνθηματικό του είναι μικρό + + + + + + + Προσθήκη ενός υποκλειδιού + Για να κάνετε προσθήκη ενός υποκλειδιού σε ένα κλειδί, από την ενότητα Υποκλειδιά κάντε κλικ στο κουμπί Προσθήκη. + Αφού ακολουθήσετε τις παραπάνω οδηγίες, θα σας εμφανιστεί ένας διάλογος για να συμπληρώσετε. Τα πεδία αναλύονται παρακάτω. + + + Τύπος κλειδιού + + Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για την δημιουργία ενός υποκλειδιού. + + + DSA + + Χρησιμοποιήστε τον Digital Signature Algorithm (DSA) για να δημιουργήσετε το υποκλειδί. Αυτό το υποκλειδί θα μπορεί μόνο να υπογράψει. + + + + ElGamal + + Χρησιμοποιήστε τον αλγόριθμο ElGamal για να δημιουργήσετε το υποκλειδί. Αυτό το υποκλειδί θα μπορεί μόνο να κρυπτογραφήσει. + + + + RSA + + Χρσιμοποιήστε τον αλγόριθμο Rivest-Shamir Adleman (RSA) για να δημιουργήσετε το υποκλειδί. Αυτό το υποκλειδί μπορεί να χρησιμοποιηθεί για υπογραφή ή κρυπτογράφηση, αλλά θα πρέπει να δημιουργήσετε δύο διαφορετικά υποκλειδιά. + + + + + + + Μήκος κλειδιού + + Δείχνει το μήκος του υποκλειδιού σε ψηφία. Γενικά, όσο πιο μεγάλο είναι το κλειδί, τόσο περισσότερη ασφάλεια παρέχει. + + + + Ημερομηνία λήξης + + Δείχνει την ημερομηνία που το υποκλειδί δεν θα μπορεί πλέον να χρησιμοποιηθεί. + + + + + + + Αλλαγή της ημερομηνίας λήξης ενός κλειδιού + Για να αλλάξετε την ημερομηνία λήξης ενός υποκλειδιού, επιλέξτε το υποκλειδί από την ενότητα Υποκλειδιά, και μετά: + + Κάντε κλικ στο κουμπί Λήξη στα αριστερά, + + + Από τον διάλογο επιλογής ημερομηνίας, επιλέξτε την νέα ημερομηνία λήξης ή επιλέξτε Δε λήγει ποτέ αν δεν θέλετε να υπάρχει ημερομηνία λήξης. + + + + + + Ανάκληση ενός υποκλειδιού + Για να ανακαλέσετε ένα υποκλειδί, επιλέξτε το υποκλειδί από την ενότητα Υποκλειδιά, και μετά: + + Κάντε κλικ στο κουμπί Ανακάλεσε στα αριστερά, + + + Επιλέξτε μια αιτία για την ανάκληση του κλειδιού: + + + + Χωρίς αιτία + + Δεν υπάρχει κάποια αιτία για την ανάκληση του κλειδιού. + + + + Έχει διαρρεύσει + + Το κλειδί έχει διαρρεύσει. + + + + Έχει ξεπεραστεί + + Το κλειδί έχει ξεπεραστεί από κάποιο άλλο. + + + + Εκτός χρήσης + + Το κλειδί δεν χρησιμοποιείται πλέον. + + + + + + + Εισάγετε μια περιγραφή της αιτίας που ανακαλείτε το κλειδί, + + + Κάντε κλικ στο Ανακάλεσε. + + + + Η ανάκληση ενός υποκλειδιού είναι άμεση. + + + + + Διαγραφή ενός υποκλειδιού + Για να διαγράψετε ένα υποκλειδί, επιλέξτε το υποκλειδί από την ενότητα Υποκλειδιά, και μετά: + + Κάντε κλικ στο κουμπί Διαγραφή στα αριστερά. + + + + + + + + + Ιδιότητες κλειδιού ασφαλούς κελύφους (SSH) + Οι περιγραφές σε αυτή την ενότητα ισχύουν για όλα τα κλειδιά SSH. + Για να προβάλετε τις ιδιότητες ενός κλειδιού SSH: + + Επιλέξτε το κλειδί Secure Shell από το κύριο παράθυρο, + + + Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, + + + Επιλέξτε την καρτέλα Λεπτομέρειες. + + + + + Ιδιότητες + + + + Αποτύπωμα + + Το αποτύπωμα είναι μια μοναδική συμβολοσειρά χαρακτήρων που αναγνωρίζει ακριβώς ένα κλειδί. + + + + Αλγόριθμος + + Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για την δημιουργία ενός κλειδιού. + + + + Τοποθεσία + + Αυτή είναι η τοποθεσία που έχει αποθηκευτεί το ιδιωτικό κλειδί. + + + + Ισχύς + + Δείχνει το μήκος σε ψηφία ενός κλειδιού. Γενικά, όσο πιο μεγάλο είναι ένα κλειδί, τόσο πιο ασφαλές είναι. + Ένα μεγάλο κλειδί δε προσφέρει σημαντικό επίπεδο ασφάλειας αν το συνθηματικό του είναι μικρό + + + + + + + + + Διαγραφή ενός κλειδιού ασφαλούς κελύφους (Secure Shell) + Για να διαγράψετε ένα κλειδί ασφαλούς κελύφους: + + Επιλέξτε το κλειδί SSH από το κυρίως παράθυρο, + + + Κάντε δεξί κλικ πάνω του και επιλέξτε Διαγραφή κλειδιού ή επιλέξτε Επεξεργασία Διαγραφή κλειδιού . + + + + + + + + + Εισαγωγή κλειδιών + Για να εισάγετε κλειδιά, επιλέξτε Αρχείο Εισαγωγή και επιλέξτε, από τον επιλογέα αρχείων, ένα αρχείο που περιέχει τουλάχιστον ένα θωρακισμένο δημόσιο κλειδί ASCII. + Η εισαγωγή μπορεί επίσης να επιτευχθεί με την επικόλληση των κλειδιών μέσα στο Κωδικοί και κλειδιά κρυπτογράφησης: + + Επιλέξτε ένα θωρακισμένο δημόσιο μπλοκ κειμένου ASCII, + + + Αντιγράψτε το στο πρόχειρο, + + + Επιλέξτε Επεξεργασία Επικόλληση κλειδιών . + + + + + + + + Εξαγωγή κλειδιών + Για να κάνετε εξαγωγή κλειδιών, επιλέξτε τα κλειδιά στο κεντρικό παράθυρο και επιλέξτε Αρχείο Εξαγωγή . + Μπορείτε ακόμα να εξάγετε κλειδιά στο πρόχειρο ως ένα θωρακισμένο μπλοκ κειμένου ASCII: + + Επιλέξτε τα κλειδιά στο κυρίως παράθυρο, + + + Επιλέξτε Επεξεργασία Αντιγραφή κλειδιών . + + + + + + + + + Υπογραφή ενός κλειδιού + Η υπογραφή του κλειδιού ενός ατόμου σημαίνει πως δείχνετε εμπιστοσύνη σε αυτό το άτομο. Πριν υπογράψετε ένα κλειδί, πρέπει να ελέγξετε προσεκτικά το αποτύπωμα του κλειδιού για να είστε σίγουρος πως το κλειδί ανήκει πραγματικά σε αυτό το άτομο. + Για να υπογράψετε ένα κλειδί στην κλειδοθήκη σας: + + Επιλέξτε το κλειδί που θέλετε να υπογράψετε από της καρτέλες Έμπιστα κλειδιά ή Άλλα συλλεγμένα κλειδιά + + + Επιλέξτε Υπογραφή από την εργαλειοθήκη ή Αρχείο Υπογραφή , + + + Επιλέξτε πόσο προσεκτικά έχει ελεγχθεί το κλειδί, + + + Καθορίστε αν η ψηφιακή υπογραφή να είναι τοπική στην κλειδοθήκη σας και αν η ψηφιακή υπογραφή να μπορεί να αναιρεθεί. + + + Κάντε κλικ στο Υπογραφή. + + + + + + + + Προτιμήσεις + Αυτό το τμήμα περιγράφει τις προτιμήσεις που μπορούν να καθοριστούν στην εφαρμογή Κωδικοί και κλειδιά κρυπτογράφησης με επιλογή του Επεξεργασία Προτιμήσεις μέσα από την Κωδικοί και κλειδιά κρυπτογράφησης. + + + Κλειδοθήκες κωδικών + + Δημιουργία κλειδοθηκών + Για να δημιουργήσετε μια νέα κλειδοθήκη, επιλέξτε ΑρχείοΝέο και επιλέξτε Κλειδοθήκη κωδικών. Εισάγετε ένα όνομα για τη νέα κλειδοθήκη και πατήστε Enter. + + + Αλλαγή κωδικών πρόσβασης κλειδοθηκών + Για να αλλάξετε τον κωδικό ξεκλειδώματος της κλειδοθήκης, πρώτα επιλέξτε την κατάλληλη κλειδοθήκη και μετά πατήστε το κουμπί Αλλαγή κωδικού ξεκλειδώματος. Τότε θα σας ζητηθεί να εισάγετε τον παλιό κωδικό στο πεδίο κειμένου Παλιός κωδικός, τον νέο κωδικό στο πεδίο κειμένου Νέος κωδικός και να τον επιβεβαιώσετε στο πεδίο κειμένου Επιβεβαίωση κωδικού. Για να εφαρμόσετε τις αλλαγές, πατήστε Αλλαγή. Αν ο παλιός κωδικός είναι σωστός, θα λάβετε ένα μήνυμα κατάστασης που θα επιβεβαιώνει την επιτυχία της ενέργειας. Αν ο παλιός κωδικός είναι λανθασμένος, θα σας ζητηθεί να ελέγξετε την ορθότητα του. + + + Διαγραφή κλειδοθηκών + Για να διαγράψετε μια κλειδοθήκη, πρώτα επιλέξτε τη κλειδοθήκη και μετά από το μενού επιλέξτε Επεξεργασία Διαγραφή. + + + + + Εξυπηρετητές κλειδιών + Διατηρήστε τα κλειδιά σας καθώς και των άλλων ενημερωμένα με τον περιοδικό συγχρονισμό τους με απομακρυσμένους εξυπηρετητές κλειδιών. Ο συγχρονισμός σάς επιτρέπει να έχετε τις πιο πρόσφατες ψηφιακές υπογραφές σε όλα τα κλειδιά σας οπότε ο δικτυακός ιστός εμπιστοσύνης (web of trust) θα είναι πιο χρήσιμος. + Το Κωδικοί και κλειδιά κρυπτογράφησης υποστηρίζει τους εξυπηρετητές κλειδιών HKP και LDAP. + + + Εξυπηρετητές HKP + + Οι εξυπηρετητές κλειδιών HKP είναι τυπικοί εξυπηρετητές κλειδιών δικτυακού ιστού, όπως το δημοφιλές hkp://pool.sks-keyservers.net, που είναι και προσβάσιμο από το http://sks-keyservers.net. + + + + Εξυπηρετητές κλειδιών LDAP + + Οι εξυπηρετητές κλειδιών LDAP είναι λιγότερο κοινοί, αλλά χρησιμοποιούν το πρότυπο πρωτόκολλο LDAP για να παρέχουν κλειδιά. Ένας καλός εξυπηρετητής LDAP: ldap://keyserver.pgp.com. + + + + + + + Κοινή χρήση κλειδιών + Η διαμοίραση κλειδιών παρέχεται από το DNS-DS, γνωστό και ως Bonjour ή Rendevous. Η ενεργοποίηση του διαμοιρασμού κλειδιών προσθέτει τις τοπικές δημόσιες κλειδοθήκες του χρήστη από το Κωδικοί και κλειδιά κρυπτογράφησης στον απομακρυσμένο διάλογο αναζήτησης. Η χρήση αυτών των τοπικών «εξυπηρετητών κλειδιών» είναι κατά πάσα πιθανότητα πιο γρήγορη από την προσπέλαση απομακρυσμένων εξυπηρετητών. + + + + + + + Περί του προγράμματος Κωδικοί και κλειδιά κρυπτογράφησης + Η εφαρμογή Κωδικοί και κλειδιά κρυπτογράφησης, τα πρόσθετα που παρέχει, η μικροεφαρμογή προτιμήσεων και η μικροεφαρμογή του πίνακα εφαρμογών είναι, ως σύνολο, γνωστά σαν Seahorse. Το Seahorse δημιουργήθηκε από τον Jacob Perkins. Οι τρέχοντες δημιουργοί είναι οι Stef Walter και Adam Schreiber. Αυτό το εγχειρίδιο γράφτηκε από τον Adam Schreiber. Ο δικτυακός τόπος του έργου σχεδιάστηκε από τον Jim Pharis. Για περισσότερες πληροφορίες για το Seahorse, το έργο, παρακαλούμε επισκεφθείτε την Ιστοσελίδα του Seahorse. + Για να αναφέρετε κάποιο πρόβλημα ή να κάνετε μια πρόταση σχετικά με αυτήν την εφαρμογή ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στην Ενότητα ανάδρασης του οδηγού χρήστη GNOME. + Αυτό το πρόγραμμα διανέμεται υπό τους όρους της Γενικής Δημόσιας Άδειας GNU όπως δημοσιεύεται από το Ίδρυμα Ελεύθερου Λογισμικού, είτε με την έκδοση 2 της Άδειας, είτε (σαν επιλογή σας) με κάθε μεταγενέστερη έκδοση. Με αυτήν την τεκμηρίωση συμπεριλαμβάνεται ένα αντίγραφο της άδειας, ένα άλλο μπορεί να βρεθεί στο αρχείο COPYING, με τον πηγαίο κώδικα του προγράμματος. + +
diff -Nru seahorse-3.2.2/help/el/legal.xml seahorse-3.6.3/help/el/legal.xml --- seahorse-3.2.2/help/el/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/el/legal.xml 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,16 @@ + + + Παρέχεται άδεια για την αντιγραφή, διανομή και/ή τροποποίηση αυτού του εγγράφου υπό τους όρους της GNU Free Documentation License (GFDL), Έκδοση 1.1 ή μεταγενέστερης που δημοσιεύεται από το Free Software Foundation χωρίς αμετάβλητα τμήματα, χωρίς κείμενα πρωτοσέλιδου, και χωρίς κείμενα οπισθόφυλλου. Μπορεί να βρείτε ένα αντίγραφο της GFDL στο σύνδεσμο ή στο αρχείο COPYING-DOCS που διανέμεται με αυτό το εγχειρίδιο. + Αυτό το εγχειρίδιο αποτελεί μέρος της συλλογής εγχειριδίων του GNOME που διανέμονται υπό τους όρους της GFDL. Αν επιθυμείτε να διανείμετε το παρόν εγχειρίδιο ξεχωριστά από τη συλλογή, οφείλετε να προσθέσετε στο εγχειρίδιο αντίγραφο της άδειας χρήσης, όπως προβλέπεται στο άρθρο 6 της άδειας. + + Πολλά από τα ονόματα που χρησιμοποιούνται από εταιρείες για να διακρίνουν τα προϊόντα και τις υπηρεσίες τους είναι κατατεθέντα σήματα. Όπου εμφανίζονται τέτοια ονόματα σε οποιαδήποτε τεκμηρίωση του GNOME. και τα μέλη του Έργου Τεκμηρίωσης του GNOME το γνωρίζουν, τότε αυτά τα ονόματα γράφονται με κεφαλαία γράμματα ή ξεκινούν με κεφαλαίο γράμμα. + + ΤΟ ΈΓΓΡΑΦΟ ΚΑΙ ΤΡΟΠΟΠΟΙΗΜΕΝΕΣ ΕΚΔΟΣΕΙΣ ΑΥΤΟΥ ΠΑΡΕΧΟΝΤΑΙ ΥΠΟ ΤΟΥΣ ΟΡΟΥΣ ΤΗΣ ΑΔΕΙΑΣ GNU FREE DOCUMENTATION ΜΕ ΤΗΝ ΠΕΡΑΙΤΕΡΩ ΔΙΕΥΚΡΙΝΙΣΗ ΟΤΙ: + + ΤΟ ΠΑΡΟΝ ΕΓΓΡΑΦΟ ΠΑΡΕΧΕΤΑΙ "ΩΣ ΕΧΕΙ", ΧΩΡΙΣ ΟΠΟΙΑΔΗΠΟΤΕ ΕΓΓΥΗΣΗ, ΕΚΠΕΦΡΑΣΜΕΝΗ Ή ΥΠΑΙΝΙΣΣΟΜΕΝΗ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΧΩΡΙΣ ΠΕΡΙΟΡΙΣΜΟΥΣ, ΕΓΓΥΗΣΕΩΝ ΟΤΙ ΤΟ ΕΓΓΡΑΦΟ Ή Η ΤΡΟΠΟΠΟΙΗΜΕΝΗ ΕΚΔΟΣΗ ΤΟΥ ΕΙΝΑΙ ΑΠΑΛΑΓΜΕΝΟ ΑΤΕΛΕΙΩΝ, ΕΜΠΟΡΕΥΣΙΜΟ, ΚΑΤΑΛΛΗΛΟ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΗ ΧΡΗΣΗ Ή ΑΠΑΡΑΒΙΑΣΤΟ. Ο ΧΡΗΣΤΗΣ ΑΝΑΛΑΜΒΑΝΕΙ ΚΑΘΕ ΚΙΝΔΥΝΟ ΠΟΥ ΜΠΟΡΕΙ ΝΑ ΠΡΟΚΥΨΕΙ ΩΣ ΠΡΟΣ ΤΗΝ ΠΟΙΟΤΗΤΑ, ΑΚΡΙΒΕΙΑ ΚΑΙ ΛΕΙΤΟΥΡΓΙΑ ΤΟΥ ΕΓΓΡΑΦΟΥ Ή ΤΩΝ ΤΡΟΠΟΠΟΙΗΜΕΝΩΝ ΕΚΔΟΣΕΩΝ ΤΟΥ. ΑΝ ΟΠΟΙΟΔΗΠΟΤΕ ΕΓΓΡΑΦΟ Ή ΤΡΟΠΟΠΟΙΗΜΕΝΗ ΕΚΔΟΣΗ ΤΟΥ ΑΠΟΔΕΙΧΘΟΥΝ ΕΛΛΑΤΩΜΑΤΙΚΑ ΜΕ ΟΠΟΙΟΝΔΗΠΟΤΕ ΤΡΟΠΟ, Ο ΤΕΛΙΚΟΣ ΧΡΗΣΤΗΣ (ΚΑΙ ΟΧΙ Ο ΑΡΧΙΚΟΣ ΣΥΓΓΡΑΦΕΑΣ, ΣΥΝΤΑΚΤΗΣ Ή ΟΠΟΙΟΣΔΗΠΟΤΕ ΤΟ ΔΙΕΝΗΜΕ) ΑΝΑΛΑΜΒΑΝΕΙ ΤΟ ΚΟΣΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΕΠΙΣΚΕΥΗΣ Ή ΔΙΟΡΘΩΣΗΣ. ΑΥΤΗ Η ΠΑΡΑΙΤΗΣΗ ΑΠΟ ΕΓΓΥΗΤΙΚΕΣ ΕΥΘΥΝΕΣ ΣΥΝΙΣΤΑ ΟΥΣΙΑΣΤΙΚΟ ΜΕΡΟΣ ΤΗΣ ΑΔΕΙΑΣ. ΟΥΔΕΜΙΑ ΧΡΗΣΗ ΟΙΟΥΔΗΠΟΤΕ ΕΓΓΡΑΦΟΥ Ή ΤΡΟΠΟΠΟΙΗΜΕΝΟΥ ΕΓΓΡΑΦΟΥ ΕΞΟΥΣΙΟΔΟΤΕΙΤΑΙ ΕΦΕΞΗΣ, ΠΑΡΑ ΥΠΟ ΤΟΝ ΟΡΟ ΤΗΣ ΩΣ ΑΝΩ ΠΑΡΑΙΤΗΣΗΣ ΚΑΙ + + + ΣΕ ΚΑΜΙΑ ΠΕΡΙΠΤΩΣΗ ΚΑΙ ΥΠΟ ΚΑΜΙΑ ΝΟΜΙΚΗ ΣΥΝΘΗΚΗ, ΕΙΤΕ ΜΕΣΩ ΣΥΜΒΟΛΑΙΩΝ Ή ΑΛΛΙΩΣ, ΔΕΝ ΕΥΘΥΝΟΝΤΑΙ Ο ΣΥΓΓΡΑΦΕΑΣ, Ο ΔΙΑΝΟΜΕΑΣ, Η ΑΛΛΟΣ ΣΥΝΥΠΕΥΘΥΝΟΣ ΓΙΑ ΤΗΝ ΣΥΓΓΡΑΦΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ, ΓΙΑ ΕΜΜΕΣΕΣ Η ΑΜΕΣΕΣ, ΤΥΧΑΙΕΣ Ή ΜΗ ΖΗΜΙΕΣ ΠΑΝΤΩΣ ΦΥΣΕΩΣ ΠΟΥ ΠΡΟΕΡΧΟΝΤΑΙ ΑΠΟ ΤΗΝ ΧΡΗΣΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ ΚΑΙ/Ή ΠΑΡΑΛΛΑΓΩΝ ΑΥΤΗΣ ΑΚΟΜΑ ΚΑΙ ΕΑΝ ΕΧΕΙ ΥΠΑΡΞΕΙ ΠΡΟΕΙΔΟΠΟΙΗΣΗ ΓΙΑ ΤΗΝ ΠΙΘΑΝΟΤΗΤΑ ΥΠΑΡΞΗΣ ΤΕΤΟΙΩΝ ΖΗΜΙΩΝ. + + + diff -Nru seahorse-3.2.2/help/el/seahorse.xml seahorse-3.6.3/help/el/seahorse.xml --- seahorse-3.2.2/help/el/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/el/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,962 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins και Adam Schreiber - - - Έργο Seahorse - - - - Σας παρέχεται άδεια να αντιγράψετε, διανείμετε ή/και να τροποποιήσετε το υπάρχον κείμενο υπό τους όρους της άδειας GNU Free Documentation License (GFDL), έκδοση 1.1, ή οποιαδήποτε μεταγενέστερη έκδοση που να έχει εκδοθεί από το Free Software Foundation υπό τις προϋποθέσεις no Invariant Sections, no Front-Cover Texts, και no Back-Cover Texts. Μπορείτε να βρείτε αντίγραφο του GFDL σε αυτόν το σύνδεσμο ή στο αρχείο COPYING-DOCS όπως διανέμεται με αυτή την τεκμηρίωση. - Αυτό το εγχειρίδιο αποτελεί μέρος της συλλογής εγχειριδίων του GNOME που διανέμονται υπό τους όρους της GFDL. Αν επιθυμείτε να διανείμετε το παρόν εγχειρίδιο ξεχωριστά από τη συλλογή, οφείλετε να προσθέσετε στο εγχειρίδιο αντίγραφο της άδειας χρήσης, όπως προβλέπεται στο άρθρο 6 της άδειας. - - Πολλά από τα ονόματα που χρησιμοποιούνται από εταιρείες για να διακρίνουν τα προϊόντα και τις υπηρεσίες τους είναι κατατεθέντα σήματα. Όπου εμφανίζονται τέτοια ονόματα σε οποιαδήποτε τεκμηρίωση του GNOME. και τα μέλη του Έργου Τεκμηρίωσης του GNOME το γνωρίζουν, τότε αυτά τα ονόματα γράφονται με κεφαλαία γράμματα ή ξεκινούν με κεφαλαίο γράμμα. - - ΤΟ ΈΓΓΡΑΦΟ ΚΑΙ ΤΡΟΠΟΠΟΙΗΜΕΝΕΣ ΕΚΔΟΣΕΙΣ ΑΥΤΟΥ ΠΑΡΕΧΟΝΤΑΙ ΥΠΟ ΤΟΥΣ ΟΡΟΥΣ ΤΗΣ ΑΔΕΙΑΣ GNU FREE DOCUMENTATION ΜΕ ΤΗΝ ΠΕΡΑΙΤΕΡΩ ΔΙΕΥΚΡΙΝΙΣΗ ΟΤΙ: - - ΤΟ ΠΑΡΟΝ ΕΓΓΡΑΦΟ ΠΑΡΕΧΕΤΑΙ "ΩΣ ΕΧΕΙ", ΧΩΡΙΣ ΟΠΟΙΑΔΗΠΟΤΕ ΕΓΓΥΗΣΗ, ΕΚΠΕΦΡΑΣΜΕΝΗ Ή ΥΠΑΙΝΙΣΣΟΜΕΝΗ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΧΩΡΙΣ ΠΕΡΙΟΡΙΣΜΟΥΣ, ΕΓΓΥΗΣΕΩΝ ΟΤΙ ΤΟ ΕΓΓΡΑΦΟ Ή Η ΤΡΟΠΟΠΟΙΗΜΕΝΗ ΕΚΔΟΣΗ ΤΟΥ ΕΙΝΑΙ ΑΠΑΛΑΓΜΕΝΟ ΑΤΕΛΕΙΩΝ, ΕΜΠΟΡΕΥΣΙΜΟ, ΚΑΤΑΛΛΗΛΟ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΗ ΧΡΗΣΗ Ή ΑΠΑΡΑΒΙΑΣΤΟ. Ο ΧΡΗΣΤΗΣ ΑΝΑΛΑΜΒΑΝΕΙ ΚΑΘΕ ΚΙΝΔΥΝΟ ΠΟΥ ΜΠΟΡΕΙ ΝΑ ΠΡΟΚΥΨΕΙ ΩΣ ΠΡΟΣ ΤΗΝ ΠΟΙΟΤΗΤΑ, ΑΚΡΙΒΕΙΑ ΚΑΙ ΛΕΙΤΟΥΡΓΙΑ ΤΟΥ ΕΓΓΡΑΦΟΥ Ή ΤΩΝ ΤΡΟΠΟΠΟΙΗΜΕΝΩΝ ΕΚΔΟΣΕΩΝ ΤΟΥ. ΑΝ ΟΠΟΙΟΔΗΠΟΤΕ ΕΓΓΡΑΦΟ Ή ΤΡΟΠΟΠΟΙΗΜΕΝΗ ΕΚΔΟΣΗ ΤΟΥ ΑΠΟΔΕΙΧΘΟΥΝ ΕΛΛΑΤΩΜΑΤΙΚΑ ΜΕ ΟΠΟΙΟΝΔΗΠΟΤΕ ΤΡΟΠΟ, Ο ΤΕΛΙΚΟΣ ΧΡΗΣΤΗΣ (ΚΑΙ ΟΧΙ Ο ΑΡΧΙΚΟΣ ΣΥΓΓΡΑΦΕΑΣ, ΣΥΝΤΑΚΤΗΣ Ή ΟΠΟΙΟΣΔΗΠΟΤΕ ΤΟ ΔΙΕΝΗΜΕ) ΑΝΑΛΑΜΒΑΝΕΙ ΤΟ ΚΟΣΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΕΠΙΣΚΕΥΗΣ Ή ΔΙΟΡΘΩΣΗΣ. ΑΥΤΗ Η ΠΑΡΑΙΤΗΣΗ ΑΠΟ ΕΓΓΥΗΤΙΚΕΣ ΕΥΘΥΝΕΣ ΣΥΝΙΣΤΑ ΟΥΣΙΑΣΤΙΚΟ ΜΕΡΟΣ ΤΗΣ ΑΔΕΙΑΣ. ΟΥΔΕΜΙΑ ΧΡΗΣΗ ΟΙΟΥΔΗΠΟΤΕ ΕΓΓΡΑΦΟΥ Ή ΤΡΟΠΟΠΟΙΗΜΕΝΟΥ ΕΓΓΡΑΦΟΥ ΕΞΟΥΣΙΟΔΟΤΕΙΤΑΙ ΕΦΕΞΗΣ, ΠΑΡΑ ΥΠΟ ΤΟΝ ΟΡΟ ΤΗΣ ΩΣ ΑΝΩ ΠΑΡΑΙΤΗΣΗΣ ΚΑΙ - - - ΣΕ ΚΑΜΙΑ ΠΕΡΙΠΤΩΣΗ ΚΑΙ ΥΠΟ ΚΑΜΙΑ ΝΟΜΙΚΗ ΣΥΝΘΗΚΗ, ΕΙΤΕ ΜΕΣΩ ΣΥΜΒΟΛΑΙΩΝ Ή ΑΛΛΙΩΣ, ΔΕΝ ΕΥΘΥΝΟΝΤΑΙ Ο ΣΥΓΓΡΑΦΕΑΣ, Ο ΔΙΑΝΟΜΕΑΣ, Η ΑΛΛΟΣ ΣΥΝΥΠΕΥΘΥΝΟΣ ΓΙΑ ΤΗΝ ΣΥΓΓΡΑΦΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ, ΓΙΑ ΕΜΜΕΣΕΣ Η ΑΜΕΣΕΣ, ΤΥΧΑΙΕΣ Ή ΜΗ ΖΗΜΙΕΣ ΠΑΝΤΩΣ ΦΥΣΕΩΣ ΠΟΥ ΠΡΟΕΡΧΟΝΤΑΙ ΑΠΟ ΤΗΝ ΧΡΗΣΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ ΚΑΙ/Ή ΠΑΡΑΛΛΑΓΩΝ ΑΥΤΗΣ ΑΚΟΜΑ ΚΑΙ ΕΑΝ ΕΧΕΙ ΥΠΑΡΞΕΙ ΠΡΟΕΙΔΟΠΟΙΗΣΗ ΓΙΑ ΤΗΝ ΠΙΘΑΝΟΤΗΤΑ ΥΠΑΡΞΗΣ ΤΕΤΟΙΩΝ ΖΗΜΙΩΝ. - - - - - - - - Jacob - Perkins - - Έργο Seahorse - - - - - Adam - Schreiber - - Έργο Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - Έργο τεκμηρίωσης του GNOME -
- pcutler@foresightlinux.org -
- - - - - - - Έργο Seahorse - - - Έργο τεκμηρίωσης του GNOME - - - - Passwords and Keys Manual V2.11.0 - Μάιος 2009 - - Paul Cutler pcutler@foresightlinux.org - - - - Passwords and Keys Manual V0.10.1 - Αύγουστος 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - Νοέμβριος 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - Ιούλιος 2005 - - Adam Schreiber sadam@clemson.edu - Έργο Seahorse - - - - Passwords and Keys Manual V0.7.0 - Φεβρουάριος 2003 - - Jacob Perkins - Έργο Seahorse - - - - This manual describes version 2.28.x of Passwords and Keys - - Ανάδραση - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Κλειδιά κρυπτογράφησης - - - - - - Εισαγωγή - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Δημιουργία και διαχείριση κλειδιών PGP και SSH, - - - Εξαγωγή και εισαγωγή κλειδιών PGP και SSH, - - - Κοινή χρήση των κλειδιών σας με άλλους, - - - - - - - - - Ξεκινώντας - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Μενού Εφαρμογές - - Choose - - Accessories - Password and Keys - . - - - - Γραμμή εντολών - - Πληκτρολογήστε seahorse, μετά πατήστε Return. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Εμφάνιση του παραθύρου Passwords and Keys. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Γραμμή μενού - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Εργαλειοθήκη - - Χρησιμοποιήστε την εργαλειοθήκη για να έχετε γρήγορη πρόσβαση σε συχνά χρησιμοποιούμενες εντολές. - - - Στήλες κλειδιών και κωδικών - - Παρέχει πρόσβαση στα κλειδιά και στους κωδικούς πρόσβασης στην κλειδοθήκη. - - - Επιλογές πρώτης φοράς - - Παρέχει γρήγορη πρόσβαση σε χρήσιμες ενέργειες για αρχάριους χρήστες. Εδώ μπορείτε να κάνετε: - - - Περιήγηση στο σύστημα βοήθειας, - - - Εισαγωγή κλειδιών στην κλειδοθήκη, - - - Δημιουργία νέων κλειδιών. - - - - - - - - - - - - Δημιουργία κλειδιών OpenPGP - Το OpenPGP είναι ένα ανοιχτό πρωτόκολλο για την κρυπτογράφηση αλληλογραφίας με τη χρήση κρυπτογραφίας δημοσίου κλειδιού, βασιζόμενο στο PGP. Καθορίζει πρότυπα για κρυπτογραφημένα μηνύματα, υπογραφές, ιδιωτικά κλειδιά και πιστοποιητικά για τη συναλλαγή δημοσίων κλειδιών. - Η κρυπτογράφηση δημοσίου κλειδιού απαιτεί τη χρήση δύο κλειδιών: ένα δημόσιο κλειδί, που μπορείτε να δώσετε σε οποιονδήποτε θέλετε να επικοινωνήσετε, και ένα ιδιωτικό κλειδί που είναι ιδιωτικό και πρέπει να διατηρήσετε μυστικό. - Για να δημιουργήσετε κλειδιά OpenPGP: - - Επιλέξτε ΑρχείοΝέο... - - - Επιλέξτε Κλειδί PGP και κάντε κλικ στο Συνέχεια - - - Εισάγετε το πλήρες όνομα σας, την διεύθυνση e-mail σας και οποιαδήποτε επιπρόσθετη πληροφορία. Μπορείτε επίσης να ορίσετε προχωρημένες ρυθμίσεις για το κλειδί: δείτε παρακάτω. - - - Κάντε κλικ στο Δημιουργία για να δημιουργήσετε το νέο ζευγάρι κλειδιών. - - - Ο διάλγος Συνθηματικό για νέο κλειδί PGP θα ανοίξει. Εισάγετε το συνθηματικό δύο φορές για το νέο σας κλειδί. - - - - Χρησιμοποιήστε παρόμοιες πρακτικές για να δημιουργήσετε έναν ισχυρό κωδικό πρόσβασης όταν επιλέγετε ένα συνθηματικό. Η βασική διαφορά ανάμεσα σε έναν κωδικό πρόσβασης και ένα συνθηματικό, είναι πως, σε ένα συνθηματικό, τα κενά είναι έγκυροι χαρακτήρες. - - - - Επιλογές για προχωρημένους - Αναπτύξτε την κατηγορία Προχωρημένες επιλογές κλειδιού για να ορίσετε τις ακόλουθες επιλογές για ένα νέο κλειδί: - - - Τύπος κρυπτογράφησης - - Αυτό το πεδίο καθορίζει τους αλγόριθμους κρυπτογράφησης που χρησιμοποιούνται για την δημιουργία των κλειδιών σας. - - - DSA ElGamal - - Αυτή είναι η προτεινόμενη επιλογή καθώς σας επιτρέπει να κρυπτογραφείτε, να αποκρυπτογραφείτε, να υπογράφετε και να επιβεβαιώνετε όπως χρειάζεται. - - - - DSA - - Σας επιτρέπει μόνο να υπογράφετε. - - - - RSA - - Σας επιτρέπει μόνο να υπογράφετε. - - - - - - - Ισχύς κλειδιού (ψηφία) - - Αυτό είναι το μήκος του κλειδιού σε ψηφία. Όσο πιο μεγάλο το κλειδί, τόσο πιο μεγάλη ασφάλεια θα υπάρχει, δεδομένου πως χρησιμοποιείται ένα δυνατό συνθηματικό. Αντιστρόφως, η εκτέλεση οποιαδήποτε ενέργειας με ένα μεγάλο κλειδί θα απαιτεί περισσότερο χρόνο από ό,τι με ένα μικρότερο κλειδί. Οι αποδεκτές τιμές είναι ανάμεσα στα 1024 και στα 4096 ψηφία. Τουλάχιστον 2048 ψηφία προτείνονται. - - - - Ημερομηνία λήξης - - Αυτή είναι η ημερομηνία όπου το κλειδί θα παύσει να είναι χρησιμοποιήσιμο για λειτουργίες κρυπτογράφησης ή ψηφιακής υπογραφής. Έξι μήνες είναι ένας τυπικός χρόνος που μπορείτε να καθορίσετε. Μετά το πέρας του χρονικού διαστήματος αυτού, θα χρειαστείτε είτε να αλλάξετε την ημερομηνία λήξης ή να δημιουργήσετε ένα νέο κλειδί ή υπο-κλειδί. - Υπογράψτε το νέο σας κλειδί με το παλιό σας πριν λήξει για να διατηρήσετε την κατάσταση εμπιστοσύνης σας. - - - - - - - - - - - Δημιουργία κλειδιών ασφαλούς κελύφους - Το ασφαλές κέλυφος (SSH) είναι ένας τρόπος σύνδεσης σε απομακρυσμένο υπολογιστή για εκτέλεση εντολών σε αυτό το μηχάνημα. Τα κλειδιά SSH χρησιμοποιούνται στο σύστημα πιστοποίησης που βασίζεται στα κλειδιά, ως εναλλακτική στο προεπιλεγμένο σύστημα πιστοποίησης βασισμένο στους κωδικούς πρόσβασης. Με την πιστοποίηση που βασίζεται σε κλειδιά, δεν χρειάζεται να πληκτρολογείτε χειρωνακτικά έναν κωδικό πρόσβασης για να γίνει πιστοποίηση. - Τα κλειδιά ασφαλούς κελύφους αποτελούνται από δύο κλειδιά: ένα ιδιωτικό κλειδί, που πρέπει να είναι μυστικό, και ένα δημόσιο κλειδί που μπορεί να τοποθετηθεί σε οποιονδήποτε υπολογιστή που θέλετε να έχετε πρόσβαση. - Για να δημιουργήσετε ένα κλειδί ασφαλούς κελύφους: - - - Επιλέξτε ΑρχείοΝέο... - - - Επιλέξτε Κλειδί Secure Shell (SSH) και κάντε κλικ στο Συνέχεια - - - Εισάγετε μια περιγραφή της χρήσης αυτού του κλειδιού. Μπορείτε να χρησιμοποιήσετε την διεύθυνση e-mail σας ή οποιαδήποτε άλλη υπενθύμιση. Μπορείτε επίσης να ορίσετε προχωρημένες επιλογές για το κλειδί: δείτε παρακάτω. - - - Κάντε κλικ στο Μόνο δημιουργία κλειδιού για να δημιουργήσετε το νέο κλειδί, ή στο Δημιουργία και ρύθμιση για να δημιουργήσετε το κλειδί και να ρυθμίσετε έναν άλλον υπολογιστή να το χρησιμοποιεί για πιστοποίηση. - - - Ο διάλογος Συνθηματικό για νέο κλειδί Secure Shell (SSH) ανοίγει. Εισάγετε το συνθηματικό δύο φορές για το νέο σας κλειδί. - - Χρησιμοποιήστε παρόμοιες πρακτικές για να δημιουργήσετε έναν ισχυρό κωδικό πρόσβασης όταν επιλέγετε ένα συνθηματικό. Η βασική διαφορά ανάμεσα σε έναν κωδικό πρόσβασης και ένα συνθηματικό, είναι πως, σε ένα συνθηματικό, τα κενά είναι έγκυροι χαρακτήρες. - - - - - - - - Επιλογές για προχωρημένους - Αναπτύξτε την κατηγορία Προχωρημένες επιλογές κλειδιού για να ορίσετε τις ακόλουθες επιλογές για ένα νέο κλειδί: - - - - Τύπος κρυπτογράφησης - - Αυτό το πεδίο καθορίζει τους αλγόριθμους κρυπτογράφησης που χρησιμοποιούνται για την δημιουργία του κλειδιού σας. - - - RSA - - Χρησιμοποιήστε τον αλγόριθμο Rivest-ShamirAdleman (RSA) για να δημιουργήσετε το κλειδί SSH. Αυτό προτιμάται και είναι πιο ασφαλής επιλογή. - - - - DSA - - Χρησιμοποιήστε τον Αλγόριθμο ψηφιακής υπογραφής (DSA) για να δημιουργήσετε το κλειδί SSH. - - - - - - - Ισχύς κλειδιού (ψηφία) - - Αυτό είναι το μήκος του κλειδιού σε ψηφία. Όσο πιο μεγάλο το κλειδί, τόσο πιο μεγάλη ασφάλεια θα υπάρχει, δεδομένου πως χρησιμοποιείται ένα δυνατό συνθηματικό. Αντιστρόφως, η εκτέλεση οποιαδήποτε ενέργειας με ένα μεγάλο κλειδί θα απαιτεί περισσότερο χρόνο από ό,τι με ένα μικρότερο κλειδί. Οι αποδεκτές τιμές είναι ανάμεσα στα 1024 και στα 4096 ψηφία. Τουλάχιστον 2048 ψηφία προτείνονται. - - - - - - - - - - Ιδιότητες κλειδιού OpenPGP - Οι περιγραφές σε αυτή την ενότητα εφαρμόζονται σε όλα τα κλειδιά OpenPGP. - - Για να εμφανίσετε τις ιδιότητες ενός κλειδιού PGP: - - Επιλέξτε το κλειδί PGP από το κεντρικό παράθυρο. - - - Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, - - - Επιλέξτε την καρτέλα Λεπτομέρειες. - - - - - Ιδιότητες - - - - Δαχτυλικό αποτύπωμα - - Το αποτύπωμα είναι μια μοναδική συμβολοσειρά χαρακτήρων που αναγνωρίζει ακριβώς ένα κλειδί. - - - - Ταυτότητα κλειδιού - - Η ταυτότητα κλειδιού είναι παρόμοια με το αποτύπωμα. Εντούτοις, η ταυτότητα κλειδιού περιέχει μόνο τους τελευταίους 8 χαρακτήρες του αποτυπώματος. Τις περισσότερες φορές θα μπορείτε να αναγνωρίσετε ένα κλειδί μόνο με την ταυτότητα κλειδιού, αλλά σε κάποιες περιπτώσεις, δύο κλειδιά μπορεί να έχουν την ίδια ταυτότητα. - - - - Τύπος - - Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για να δημιουργηθεί το κλειδί. Τα κλειδιά DSA μπορούν μόνο να χρησιμοποιηθούν σε υπογραφές. Τα κλειδιά ELGamal χρησιμοποιούνται για κρυπτογράφηση. - - - - Δημιουργήθηκε - - Δείχνει την ημερομηνία που το κλειδί δημιουργήθηκε. - - - - Λήγει - - Δείχνει την ημερομηνία που το κλειδί δεν θα μπορεί πλέον να χρησιμοποιηθεί. - - - - Ισχύς - - Δείχνει το μήκος σε ψηφία ενός κλειδιού. Γενικά, όσο πιο μεγάλο είναι ένα κλειδί, τόσο πιο ασφαλές είναι. - Ένα μεγάλο κλειδί δε προσφέρει σημαντικό επίπεδο ασφάλειας αν το συνθηματικό του είναι μικρό - - - - - - - - - Εμπιστοσύνη - Η εμπιστοσύνη είναι ένα δείκτης του πόσο είσαι σίγουρος για την ικανότητα ενός ατόμου για να επεκτείνει ορθά το διαδικτυακό ιστό εμπιστοσύνης (web of trust). Όταν αντιμετωπίζεται ένα κλειδί που δεν έχετε υπογράψει, η εγκυρότητα του κλειδιού αυτού του ατόμου θα αποφασιστεί από τις υπογραφές που έχει συγκεντρώσει καθώς και το πόσο καλά ή όχι εμπιστεύεστε τα άτομα που έχουν κάνει αυτές τις ψηφιακές υπογραφές. Από προεπιλογή, ένα άγνωστο κλειδί θα χρειάζεται 3 υπογραφές με οριακή τιμή εμπιστοσύνης ή μια πλήρη εμπιστευόμενη υπογραφή. - - Άγνωστη: Δεν γνωρίζετε την ικανότητα του ατόμου να υπογράφει σωστά τα κλειδιά. - Ποτέ: Αυτό το άτομο δεν μπορεί να υπογράψει σωστά τα κλειδιά. - Οριακή: Αυτό το άτομο ελέγχει για φωτογραφική ταυτότητα πριν υπογράψει ένα κλειδί, αλλά δε διερευνά εξονυχιστικά τις ταυτότητες. - Πλήρης: Αυτό το άτομο διερευνά κάθε μία φωτογραφική ταυτότητα πριν να τις υπογράψει ψηφιακά (π.χ. υπογράφουν μόνο κλειδιά που πραγματικά ανήκουν στο άτομο που ζητά την υπογραφή). - Μέγιστη: Αυτό το επίπεδο εμπιστοσύνης πρέπει να ορίζεται στα δικά σας κλειδιά. - - - - - Ενεργοποίηση και απενεργοποίηση κλειδιών - Όταν ένα κλειδί είναι ενεργοποιημένο, μπορεί να χρησιμοποιηθεί για την εκτέλεση ενεργειών κρυπτογράφησης. Όταν ένα κλειδί είναι απενεργοποιημένο, δεν μπορεί να χρησιμοποιηθεί για την κρυπτογράφηση ή την επιβεβαίωση υπογραφών που δημιουργήθηκαν με αυτό. - - - - Ημερομηνία λήξης - Ένα κλειδί δεν μπορεί να χρησιμοποιηθεί για την εκτέλεση ενεργειών κλειδιού μετά την λήξη του. Η αλλαγή της ημερομηνίας λήξης ενός κλειδιού σε ένα σημείο στο μέλλον, το ενεργοποιεί ξανά. Μια καλή πρακτική είναι να έχετε ένα κύριο κλειδί που δεν λήγει ποτέ και πολλά υπο-κλειδιά που λήγουν και είναι υπογεγραμμένα από το κύριο κλειδί. - - - - Ταυτότητες χρήστη - Οι ταυτότητες χρήστη (User ID) επιτρέπουν να χρησιμοποιηθούν πολλαπλές ταυτότητες και διευθύνσεις e-mail με το ίδιο κλειδί. - Συνήθως έχουν τη μορφή: Όνομα (σχόλιο) <διεύθυνση ηλ. αλληλογραφίας> - - - Προσθήκη μιας ταυτότητας χρήστη - Η προσθήκη μιας ταυτότητας χρήστη είναι χρήσιμη όταν θέλετε να έχετε μια ταυτότητα για την δουλειά σας και μια για τους φίλους σας. - Για να προσθέσετε μια ταυτότητα χρήστη σε ένα κλειδί: - - Επιλέξτε το κλειδί από το κυρίως παράθυρο, - - - Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, - - - Επιλέξτε την καρτέλα Ονόματα και υπογραφές, - - - Κάντε κλικ στο Προσθήκη ονόματος. - - - Αφού ακολουθήσετε τις παραπάνω οδηγίες, θα σας εμφανιστεί ένας διάλογος για να συμπληρώσετε. Τα πεδία αναλύονται παρακάτω. - - - Πλήρες όνομα - - Εισάγετε το ονοματεπώνυμο σας στη φόρμα <όνομα> <επώνυμο> Το μεσαίο όνομα ή αρχικά είναι προαιρετικά. - - - Πρέπει να εισάγετε τουλάχιστον 5 χαρακτήρες σε αυτό το πεδίο. - - - - - - Ηλεκτρονική διεύθυνση - - Η διεύθυνση ηλ. αλληλογραφίας είναι ο τρόπος που οι περισσότεροι θα χρησιμοποιήσουν για να εντοπίσουν το κλειδί σας σε ένα εξυπηρετητή κλειδιών ή άλλο πάροχο κλειδιών. Επιβεβαιώστε ότι είναι ορθό πριν συνεχίσετε. - - - Πρέπει να είναι της μορφής <username>@<domainname> - - - - - - Σχόλιο κλειδιού - - Το πεδίο σχολίου μπορεί να χρησιμοποιηθεί για να τοποθετηθεί οποιαδήποτε πρόσθετη πληροφορία στο εμφανιζόμενο όνομα της νέας σας ταυτότητας (ID). Αυτές οι πληροφορίες μπορούν να αναζητηθούν στους εξυπηρετητές κλειδιών. - - - - - - - - Φωτογραφική ταυτότητα - Οι φωτογραφικές ταυτότητες επιτρέπουν σε ένα ιδιοκτήτη κλειδιού να ενσωματώσει μία ή περισσότερες εικόνες του σε ένα κλειδί. Αυτές οι ταυτότητες μπορούν να υπογραφούν σαν να ήταν κανονικές ταυτότητες χρήστη. Μια φωτογραφική ταυτότητα πρέπει να είναι σε μορφή JPEG και προτείνεται να μην είναι μεγαλύτερες από 240x288 εικονοστοιχεία. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Αλλαγή του συνθηματικού - Για να αλλάξετε το συνθηματικό που έχει ορισθεί για ένα κλειδί: - - Επιλέξτε το κλειδί από το κυρίως παράθυρο, - - - Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, - - - Κάντε κλικ στο Αλλαγή συνθηματικού. - - - Εισάγετε το νέο συνθηματικό και κάντε κλικ στο OK. - - - - Διαγραφή ενός κλειδιού - Για να διαγράψετε ένα κλειδί από την κλειδοθήκη σας: - - Επιλέξτε το κλειδί από το κυρίως παράθυρο, - - - Κάντε δεξί κλικ πάνω του και επιλέξτε Διαγραφή κλειδιού ή επιλέξτε ΕπεξεργασίαΔιαγραφή κλειδιού. - - - - Μπορείτε να διαγράψετε τα κλειδιά σας, τα έμπιστα κλειδιά και τα συλλεγμένα κλειδιά. - - - - - - - - Ιδιότητες υποκλειδιού OpenPGP - Κάθε κλειδί OpenPGP έχει ένα γενικό κλειδί (master key) που χρησιμοποιείται για υπογραφές μόνο. Τα υπο-κλειδιά χρησιμοποιούνται και για να υπογράφουν και να κρυπτογράφουν. Με αυτό το τρόπο, αν ένα υπο-κλειδί παραβιαστεί, δε χρειάζεται να αναιρέσετε το γενικό σας κλειδί. - - - Ταυτότητα - - Αυτό είναι το αναγνωριστικό του υποκλειδιού. - - - - Τύπος - - Ορίζει τον αλγόριθμο κρυπτογράφησης που θα χρησιμοποιηθεί για την δημιουργία ενός υποκλειδιού. Τα κλειδιά DSA μπορούν μόνο να υπογράψουν, τα κλειδιά ElGamal χρησιμοποιούνται για να κρυπτογραφήσουν ενώ τα κλειδιά RSA χρησιμοποιούνται για να υπογράψουν ή για να κρυπτογραφήσουν. - - - - Δημιουργήθηκε - - Δείχνει την ημερομηνία που το κλειδί δημιουργήθηκε. - - - - Λήγει - - Δείχνει την ημερομηνία που το κλειδί δεν θα μπορεί πλέον να χρησιμοποιηθεί. - - - - Κατάσταση - - Δείχνει την κατάσταση του κλειδιού. - - - - Ισχύς - - Δείχνει το μήκος του κλειδιού σε ψηφία. Γενικά, όσο πιο μεγάλο το κλειδί, τόσο πιο μεγάλη ασφάλεια παρέχει. - Ένα μεγάλο κλειδί δε προσφέρει σημαντικό επίπεδο ασφάλειας αν το συνθηματικό του είναι μικρό - - - - - - - Προσθήκη ενός υποκλειδιού - Για να κάνετε προσθήκη ενός υποκλειδιού σε ένα κλειδί, από την ενότητα Υποκλειδιά κάντε κλικ στο κουμπί Προσθήκη. - Αφού ακολουθήσετε τις παραπάνω οδηγίες, θα σας εμφανιστεί ένας διάλογος για να συμπληρώσετε. Τα πεδία αναλύονται παρακάτω. - - - Τύπος κλειδιού - - Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για την δημιουργία ενός υποκλειδιού. - - - DSA - - Χρησιμοποιήστε τον Digital Signature Algorithm (DSA) για να δημιουργήσετε το υποκλειδί. Αυτό το υποκλειδί θα μπορεί μόνο να υπογράψει. - - - - ElGamal - - Χρησιμοποιήστε τον αλγόριθμο ElGamal για να δημιουργήσετε το υποκλειδί. Αυτό το υποκλειδί θα μπορεί μόνο να κρυπτογραφήσει. - - - - RSA - - Χρσιμοποιήστε τον αλγόριθμο Rivest-Shamir Adleman (RSA) για να δημιουργήσετε το υποκλειδί. Αυτό το υποκλειδί μπορεί να χρησιμοποιηθεί για υπογραφή ή κρυπτογράφηση, αλλά θα πρέπει να δημιουργήσετε δύο διαφορετικά υποκλειδιά. - - - - - - - Μήκος κλειδιού - - Δείχνει το μήκος του υποκλειδιού σε ψηφία. Γενικά, όσο πιο μεγάλο είναι το κλειδί, τόσο περισσότερη ασφάλεια παρέχει. - - - - Ημερομηνία λήξης - - Δείχνει την ημερομηνία που το υποκλειδί δεν θα μπορεί πλέον να χρησιμοποιηθεί. - - - - - - - Αλλαγή της ημερομηνίας λήξης ενός κλειδιού - Για να αλλάξετε την ημερομηνία λήξης ενός υποκλειδιού, επιλέξτε το υποκλειδί από την ενότητα Υποκλειδιά, και μετά: - - Κάντε κλικ στο κουμπί Λήξη στα αριστερά, - - - Από τον διάλογο επιλογής ημερομηνίας, επιλέξτε την νέα ημερομηνία λήξης ή επιλέξτε Δε λήγει ποτέ αν δεν θέλετε να υπάρχει ημερομηνία λήξης. - - - - - - Ανάκληση ενός υποκλειδιού - Για να ανακαλέσετε ένα υποκλειδί, επιλέξτε το υποκλειδί από την ενότητα Υποκλειδιά, και μετά: - - Κάντε κλικ στο κουμπί Ανακάλεσε στα αριστερά, - - - Επιλέξτε μια αιτία για την ανάκληση του κλειδιού: - - - - Χωρίς αιτία - - Δεν υπάρχει κάποια αιτία για την ανάκληση του κλειδιού. - - - - Έχει διαρρεύσει - - Το κλειδί έχει διαρρεύσει. - - - - Έχει ξεπεραστεί - - Το κλειδί έχει ξεπεραστεί από κάποιο άλλο. - - - - Εκτός χρήσης - - Το κλειδί δεν χρησιμοποιείται πλέον. - - - - - - - Εισάγετε μια περιγραφή της αιτίας που ανακαλείτε το κλειδί, - - - Κάντε κλικ στο Ανακάλεσε. - - - - Η ανάκληση ενός υποκλειδιού είναι άμεση. - - - - - Διαγραφή ενός υποκλειδιού - Για να διαγράψετε ένα υποκλειδί, επιλέξτε το υποκλειδί από την ενότητα Υποκλειδιά, και μετά: - - Κάντε κλικ στο κουμπί Διαγραφή στα αριστερά. - - - - - - - - - Ιδιότητες κλειδιού ασφαλούς κελύφους (SSH) - Οι περιγραφές σε αυτή την ενότητα ισχύουν για όλα τα κλειδιά SSH. - Για να προβάλετε τις ιδιότητες ενός κλειδιού SSH: - - Επιλέξτε το κλειδί Secure Shell από το κύριο παράθυρο, - - - Κάντε διπλό κλικ πάνω του ή επιλέξτε Ιδιότητες από την εργαλειοθήκη, - - - Επιλέξτε την καρτέλα Λεπτομέρειες. - - - - - Ιδιότητες - - - - Δαχτυλικό αποτύπωμα - - Το αποτύπωμα είναι μια μοναδική συμβολοσειρά χαρακτήρων που αναγνωρίζει ακριβώς ένα κλειδί. - - - - Αλγόριθμος - - Ορίζει τον αλγόριθμο κρυπτογράφησης που χρησιμοποιείται για την δημιουργία ενός κλειδιού. - - - - Τοποθεσία - - Αυτή είναι η τοποθεσία που έχει αποθηκευτεί το ιδιωτικό κλειδί. - - - - Ισχύς - - Δείχνει το μήκος σε ψηφία ενός κλειδιού. Γενικά, όσο πιο μεγάλο είναι ένα κλειδί, τόσο πιο ασφαλές είναι. - Ένα μεγάλο κλειδί δε προσφέρει σημαντικό επίπεδο ασφάλειας αν το συνθηματικό του είναι μικρό - - - - - - - - - Διαγραφή ενός κλειδιού ασφαλούς κελύφους (Secure Shell) - Για να διαγράψετε ένα κλειδί ασφαλούς κελύφους: - - Επιλέξτε το κλειδί SSH από το κυρίως παράθυρο, - - - Κάντε δεξί κλικ πάνω του και επιλέξτε Διαγραφή κλειδιού ή επιλέξτε ΕπεξεργασίαΔιαγραφή κλειδιού. - - - - - - - - - Εισαγωγή κλειδιών - Για να εισάγετε κλειδιά, επιλέξτε ΑρχείοΕισαγωγή και επιλέξτε, από τον επιλογέα αρχείων, ένα αρχείο που περιέχει τουλάχιστον ένα θωρακισμένο δημόσιο κλειδί ASCII. - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - Επιλέξτε ένα θωρακισμένο δημόσιο μπλοκ κειμένου ASCII, - - - Αντιγράψτε το στο πρόχειρο, - - - Επιλέξτε ΕπεξεργασίαΕπικόλληση κλειδιών. - - - - - - - - - Εξαγωγή κλειδιών - Για να κάνετε εξαγωγή κλειδιών, επιλέξτε τα κλειδιά στο κεντρικό παράθυρο και επιλέξτε ΑρχείοΕξαγωγή. - Μπορείτε ακόμα να εξάγετε κλειδιά στο πρόχειρο ως ένα θωρακισμένο μπλοκ κειμένου ASCII: - - Επιλέξτε τα κλειδιά στο κυρίως παράθυρο, - - - Επιλέξτε ΕπεξεργασίαΑντιγραφή κλειδιών. - - - - - - - - - Υπογραφή ενός κλειδιού - Η υπογραφή του κλειδιού ενός ατόμου σημαίνει πως δείχνετε εμπιστοσύνη σε αυτό το άτομο. Πριν υπογράψετε ένα κλειδί, πρέπει να ελέγξετε προσεκτικά το αποτύπωμα του κλειδιού για να είστε σίγουρος πως το κλειδί ανήκει πραγματικά σε αυτό το άτομο. - Για να υπογράψετε ένα κλειδί στην κλειδοθήκη σας: - - Επιλέξτε το κλειδί που θέλετε να υπογράψετε από της καρτέλες Έμπιστα κλειδιά ή Άλλα συλλεγμένα κλειδιά - - - Επιλέξτε Υπογραφή από την εργαλειοθήκη ή ΑρχείοΥπογραφή, - - - Επιλέξτε πόσο προσεκτικά έχει ελεγχθεί το κλειδί, - - - Καθορίστε αν η ψηφιακή υπογραφή να είναι τοπική στην κλειδοθήκη σας και αν η ψηφιακή υπογραφή να μπορεί να αναιρεθεί. - - - Κάντε κλικ στο Υπογραφή. - - - - - - - - Προτιμήσεις - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Κλειδοθήκες κωδικών - - Δημιουργία κλειδοθηκών - Για να δημιουργήσετε μια νέα κλειδοθήκη, επιλέξτε ΑρχείοΝέο και επιλέξτε Κλειδοθήκη κωδικών. Εισάγετε ένα όνομα για τη νέα κλειδοθήκη και πατήστε Enter. - - - Αλλαγή κωδικών πρόσβασης κλειδοθηκών - Για να αλλάξετε τον κωδικό ξεκλειδώματος της κλειδοθήκης, πρώτα επιλέξτε την κατάλληλη κλειδοθήκη και μετά πατήστε το κουμπί Αλλαγή κωδικού ξεκλειδώματος. Τότε θα σας ζητηθεί να εισάγετε τον παλιό κωδικό στο πεδίο κειμένου Παλιός κωδικός, τον νέο κωδικό στο πεδίο κειμένου Νέος κωδικός και να τον επιβεβαιώσετε στο πεδίο κειμένου Επιβεβαίωση κωδικού. Για να εφαρμόσετε τις αλλαγές, πατήστε Αλλαγή. Αν ο παλιός κωδικός είναι σωστός, θα λάβετε ένα μήνυμα κατάστασης που θα επιβεβαιώνει την επιτυχία της ενέργειας. Αν ο παλιός κωδικός είναι λανθασμένος, θα σας ζητηθεί να ελέγξετε την ορθότητα του. - - - Διαγραφή κλειδοθηκών - Για να διαγράψετε μια κλειδοθήκη, πρώτα επιλέξτε τη κλειδοθήκη και μετά από το μενού επιλέξτε ΕπεξεργασίαΔιαγραφή. - - - - - Εξυπηρετητές κλειδιών - Διατηρήστε τα κλειδιά σας καθώς και των άλλων ενημερωμένα με τον περιοδικό συγχρονισμό τους με απομακρυσμένους εξυπηρετητές κλειδιών. Ο συγχρονισμός σάς επιτρέπει να έχετε τις πιο πρόσφατες ψηφιακές υπογραφές σε όλα τα κλειδιά σας οπότε ο δικτυακός ιστός εμπιστοσύνης (web of trust) θα είναι πιο χρήσιμος. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - Εξυπηρετητές HKP - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Εξυπηρετητές κλειδιών - - Οι εξυπηρετητές κλειδιών LDAP είναι λιγότερο κοινοί, αλλά χρησιμοποιούν το πρότυπο πρωτόκολλο LDAP για να παρέχουν κλειδιά. Ένας καλός εξυπηρετητής LDAP: ldap://keyserver.pgp.com. - - - - - - - Κοινή χρήση κλειδιών - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - Για να αναφέρετε κάποιο πρόβλημα ή να κάνετε μια πρόταση σχετικά με αυτήν την εφαρμογή ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στην Ενότητα ανάδρασης του οδηγού χρήστη GNOME. - Αυτό το πρόγραμμα διανέμεται υπό τους όρους της Γενικής Δημόσιας Άδειας GNU όπως δημοσιεύεται από το Ίδρυμα Ελεύθερου Λογισμικού, είτε με την έκδοση 2 της Άδειας, είτε (σαν επιλογή σας) με κάθε μεταγενέστερη έκδοση. Με αυτήν την τεκμηρίωση συμπεριλαμβάνεται ένα αντίγραφο της άδειας, ένα άλλο μπορεί να βρεθεί στο αρχείο COPYING, με τον πηγαίο κώδικα του προγράμματος. - -
diff -Nru seahorse-3.2.2/help/en_GB/index.docbook seahorse-3.6.3/help/en_GB/index.docbook --- seahorse-3.2.2/help/en_GB/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/en_GB/index.docbook 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,1254 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse Project + + + + + 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. + + 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 licence to the manual, as described in section 6 of the licence. + + 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. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse Project + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Feedback + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introduction + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Getting Started + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Applications menu + + Choose + + Accessories + Password and Keys + . + + + + Command Line + + Type seahorse then press Return. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Menubar + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Toolbar + + Use the toolbar to quickly access commonly-used commands. + + + Keys and Passwords Tabs + + Provides access to the keys and passwords in the keyring. + + + First time options + + Provides fast access to useful actions for first time users. From here you can: + + + Browse the help system, + + + Import keys in the keyring, + + + Create new keys. + + + + + + + + + + + + Creating OpenPGP Keys + OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys and certificates for exchanging public keys. + Public key cryptography is a concept which involves the use of two keys: a public key, that you can give to anyone with whom you would like to communicate, and a private key which is private and must be kept secret. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Use similar practises to generating a strong password when choosing a passphrase. The main difference between a password and a passphrase is that, in a passphrase, spaces are valid characters. + + + + Advanced options + Expand the Advanced key options section to specify the following options for a new key: + + + Encryption Type + + This field specifies the encryption algorithms used to generate your keys. + + + DSA ElGamal + + This is the suggested choice as it will allow you to encrypt, decrypt, sign and verify as needed. + + + + DSA + + Will allow signing only. + + + + RSA + + Will allow signing only. + + + + + + + Key Strength (bits) + + This is the length of the key in bits. The longer the key, the more secure it will be, provided a strong passphrase is used. Conversely, performing any operation with a longer key will require more time than it would with a shorter key. Acceptable values are between 1024 and 4096 bits. At least 2048 bits is recommended. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Creating Secure Shell Keys + Secure Shell (SSH) is a way of logging into a remote computer to execute commands on that machine. SSH keys are used in key-based authentication system, as an alternative to the default password authentication system. With key-based authentication there is no need to manually type a password to authenticate. + Secure Shell keys are made of two keys: a private key, that must be kept secret, and a public key which can be uploaded to any computer you need to access. + To create a Secure Shell key: + + + Choose FileNew... + + + Select Secure Shell Key and click Continue + + + Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. + + + Click Just Create Key to create the new key, or Create and Set Up to create the key and set up another computer to use it for authentication. + + + The Passphrase for New Secure Shell Key dialogue opens. Enter the passphrase twice for your new key. + + Use similar practises to generating a strong password when choosing a passphrase. The main difference between a password and a passphrase is that, in a passphrase, spaces are valid characters. + + + + + + + + Advanced options + Expand the Advanced key options section to specify the following options for a new key: + + + + Encryption Type + + This field specifies the encryption algorithms used to generate your key. + + + RSA + + Use the Rivest-ShamirAdleman (RSA) algorithm to create the SSH key. This is the preferred and more secure choice. + + + + DSA + + Use the Digital Signature Algorithm (DSA) to create the SSH key. + + + + + + + Key Strength (bits) + + This is the length of the key in bits. The longer the key, the more secure it will be, provided a strong passphrase is used. Conversely, performing any operation with a longer key will require more time than it would with a shorter key. Acceptable values are between 1024 and 4096 bits. At least 2048 bits is recommended. + + + + + + + + + + OpenPGP Key Properties + The descriptions in this section apply to all OpenPGP keys. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + The fingerprint is a unique string of characters that exactly identifies a key. + + + + KeyID + + The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 characters of the fingerprint. Most of the time it is possible to identify a key with only the KeyID, but occasionally two keys may have the same ID. + + + + Type + + Specifies the encryption algorithm used to generate a key. DSA keys can only sign. ElGamal keys are used to encrypt. + + + + Created + + Indicates the date the key was created. + + + + Expires + + Indicates the date the key can no longer be used. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Trust + Trust is an indication of how sure you are of a person's ability to correctly extend the web of trust. When you are faced with a key you have not signed, the validity of that person's key will be determined based on the signatures they have collected and how well or not you trust the people who have made those signatures. By default, an unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. + + Unknown: You are not familiar with the person's ability to sign keys correctly. + Never: This person cannot correctly sign keys. + Marginal: This person checks for photo ID before signing a key, but does not necessarily scrutinise the IDs. + Full: This person scrutinises each and every person's photo ID before signing them (e.g. they only sign keys that truely belong to the person asking for the signature). + Ultimate: This level of trust should only be assigned to your own keys. + + + + + Enabling and Disabling Keys + When a key is enabled, it can be used to perform encryption operations. When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. + + + + Expiration Date + A key can no longer be used to perform key operations after it has expired. Changing a key's expiration date to a point in the future re-enables it. A good general practice would be to have a master key that never expires and multiple subkeys that do and are signed by the master key. + + + + User IDs + User IDs allow multiple identities and email addresses to be used with the same key. + + They usually take the form of: + Name (comment) <email address> + + + + Adding a User ID + Adding a user ID is useful when you want to have an identity for your job and one for your friends. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + After following the instructions above, you will be presented with a dialogue to fill in. The fields are detailed below. + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + You must enter at least 5 characters in this field. + + + + + + Email Address + + Your email address is how most people will locate your key on a key server or other key provider. Make sure it is correct before continuing. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + The comment field can be used to place any additional information into the displayed name of your new ID. This information can be searched for on key servers. + + + + + + + + Photo IDs + A Photo ID allows a key owner to embed one or more pictures of themselves in a key. These identities can be signed just like a normal user ID. A photo ID must be in JPEG format and is recommended to be no larger than 240x288 pixels. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Changing the Passphrase + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Enter the new passphrase and click OK. + + + + Deleting a Key + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + You can delete your keys, trusted keys and collected keys. + + + + + + + + OpenPGP Subkey Properties + Each OpenPGP key has a single master key used to sign only. A subkey is used to encrypt and to sign as well. In this way, if your subkey is compromised, you don't need to revoke your master key. + + + ID + + This is the identifier of the subkey. + + + + Type + + Specifies the encryption algorithm used to generate a subkey. DSA keys can only sign, ElGamal keys are used to encrypt while RSA keys are used to sign or to encrypt. + + + + Created + + Indicates the date the key was created. + + + + Expires + + Indicates the date the key can no longer be used. + + + + Status + + Indicates the status of the key. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Adding a Subkey + To add a subkey to a key, from the Subkeys section click on Add button. + After following the instructions above, you will be presented with a dialogue to fill in. The fields are detailed below. + + + Key Type + + Specifies the encryption algorithm used to generate a subkey. + + + DSA + + Use the Digital Signature Algorithm (DSA) to create the subkey. This subkey can sign only. + + + + ElGamal + + Use the ElGamal algorithm to create the subkey. This subkey can encrypt only. + + + + RSA + + Use the Rivest-Shamir Adleman (RSA) algorithm to create the subkey. This subkey can be used to sign or encrypt, but you have to create two different subkeys. + + + + + + + Key Length + + Indicates the length in bits of the subkey. In general the longer the key, the more security it provides. + + + + Expiration Date + + Indicates the date the subkey can no longer be used. + + + + + + + Changing a Subkey Expiration Date + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Revoking a Subkey + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + The effect of revoking a subkey is immediate. + + + + + Deleting a Subkey + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Secure Shell Key Properties + The descriptions in this section apply to all SSH keys. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + The fingerprint is a unique string of characters that exactly identifies a key. + + + + Algorithm + + Specifies the encryption algorithm used to generate a key. + + + + Location + + This is the location where the private key has been stored. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Deleting a Secure Shell Key + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importing Keys + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exporting Keys + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Signing a Key + Signing another person's key means you are giving trust to that person. Before signing a key, you have to carefully check the key's fingerprint to be sure that the key really belongs to that person. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Preferences + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + To change the unlock password of the keyring, first select the appropriate keyring and then press the Change Unlock Password button. You will then be prompted to type the old password in the Old password text box, the new password in the New password text box and confirm it in the Confirm password text box. To apply the settings, press Change. If the old password is correct, you will get a status message indicating the success of the operation. If the old password is not correct you will be asked to check its correctness. + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Key Servers + Keep your and other's keys up to date by synchronising keys periodically with remote keyservers. Synchronising will make sure that you have the latest signatures made on all of your keys so that the web of trust will be the most useful. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + LDAP keyservers are less common, but use the standard LDAP protocol to serve keys. ldap://keyserver.pgp.com is a good LDAP server. + + + + + + + Key Sharing + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/en_GB/legal.xml seahorse-3.6.3/help/en_GB/legal.xml --- seahorse-3.2.2/help/en_GB/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/en_GB/legal.xml 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + 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 licence to the manual, as described in section 6 of the licence. + + 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. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/en_GB/seahorse.xml seahorse-3.6.3/help/en_GB/seahorse.xml --- seahorse-3.2.2/help/en_GB/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/en_GB/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,991 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - 2007David Lodge (dave@cirt.net) - - Seahorse Project - - - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation Licence (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. - 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 licence to the manual, as described in section 6 of the licence. - - 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. - - DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENCE 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 LICENCE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORISED 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. - - - - - - - - Jacob - Perkins - - Seahorse Project - - - - - Adam - Schreiber - - Seahorse Project -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse Project - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - August 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - November 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - July 2005 - - Adam Schreiber sadam@clemson.edu - Seahorse Project - - - - Passwords and Keys Manual V0.7.0 - February 2003 - - Jacob Perkins - Seahorse Project - - - - This manual describes version 2.28.x of Passwords and Keys - - Feedback - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Encryption Keys - - - - - - Introduction - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Create and manage PGP and SSH keys, - - - Export and import PGP and SSH keys, - - - Share your keys with others, - - - - - - - - - Getting Started - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Applications menu - - Choose - - Accessories - Password and Keys - . - - - - Command Line - - Type seahorse then press Return. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Show the Passwords and Keys window. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Menubar - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Toolbar - - Use the toolbar to quickly access commonly-used commands. - - - Keys and Passwords Tabs - - Provides access to the keys and passwords in the keyring. - - - First time options - - Provides fast access to useful actions for first time users. From here you can: - - - Browse the help system, - - - Import keys in the keyring, - - - Create new keys. - - - - - - - - - - - - Creating OpenPGP Keys - OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys and certificates for exchanging public keys. - Public key cryptography is a concept which involves the use of two keys: a public key, that you can give to anyone with whom you would like to communicate, and a private key which is private and must be kept secret. - To create OpenPGP keys: - - - Choose FileNew... - - - - Select PGP Key and click Continue - - - Enter your full name (first - last), your e-mail address and any additional information. You can also specify advanced options for the key: see below. - - - Click Create to create the new key pair. - - - The Passphrase for New PGP Key dialogue will open. Enter the passphrase twice for your new key. - - - - Use similar practises to generating a strong password when choosing a passphrase. The main difference between a password and a passphrase is that, in a passphrase, spaces are valid characters. - - - - Advanced options - Expand the Advanced key options section to specify the following options for a new key: - - - Encryption Type - - This field specifies the encryption algorithms used to generate your keys. - - - DSA ElGamal - - This is the suggested choice as it will allow you to encrypt, decrypt, sign and verify as needed. - - - - DSA - - Will allow signing only. - - - - RSA - - Will allow signing only. - - - - - - - Key Strength (bits) - - This is the length of the key in bits. The longer the key, the more secure it will be, provided a strong passphrase is used. Conversely, performing any operation with a longer key will require more time than it would with a shorter key. Acceptable values are between 1024 and 4096 bits. At least 2048 bits is recommended. - - - - Expiration Date - - This is the date at which the key will cease to be usable for performing encryption or signing operations. 6 months is a reasonable time to set it to. You will have to either change the expiration date or generate a new key or subkey after this amount of time passes. - Sign your new key with your old one before it expires to preserve your trust status. - - - - - - - - - - - Creating Secure Shell Keys - Secure Shell (SSH) is a way of logging into a remote computer to execute commands on that machine. SSH keys are used in key-based authentication system, as an alternative to the default password authentication system. With key-based authentication there is no need to manually type a password to authenticate. - Secure Shell keys are made of two keys: a private key, that must be kept secret, and a public key which can be uploaded to any computer you need to access. - To create a Secure Shell key: - - - Choose FileNew... - - - Select Secure Shell Key and click Continue - - - Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. - - - Click Just Create Key to create the new key, or Create and Set Up to create the key and set up another computer to use it for authentication. - - - The Passphrase for New Secure Shell Key dialogue opens. Enter the passphrase twice for your new key. - - Use similar practises to generating a strong password when choosing a passphrase. The main difference between a password and a passphrase is that, in a passphrase, spaces are valid characters. - - - - - - - - Advanced options - Expand the Advanced key options section to specify the following options for a new key: - - - - Encryption Type - - This field specifies the encryption algorithms used to generate your key. - - - RSA - - Use the Rivest-ShamirAdleman (RSA) algorithm to create the SSH key. This is the preferred and more secure choice. - - - - DSA - - Use the Digital Signature Algorithm (DSA) to create the SSH key. - - - - - - - Key Strength (bits) - - This is the length of the key in bits. The longer the key, the more secure it will be, provided a strong passphrase is used. Conversely, performing any operation with a longer key will require more time than it would with a shorter key. Acceptable values are between 1024 and 4096 bits. At least 2048 bits is recommended. - - - - - - - - - - OpenPGP Key Properties - The descriptions in this section apply to all OpenPGP keys. - - To view properties of a PGP key: - - Select the PGP key from the main window, - - - Double click on it or choose Properties from the toolbar, - - - Select the Details tab. - - - - - Properties - - - - Fingerprint - - The fingerprint is a unique string of characters that exactly identifies a key. - - - - KeyID - - The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 characters of the fingerprint. Most of the time it is possible to identify a key with only the KeyID, but occasionally two keys may have the same ID. - - - - Type - - Specifies the encryption algorithm used to generate a key. DSA keys can only sign. ElGamal keys are used to encrypt. - - - - Created - - Indicates the date the key was created. - - - - Expires - - Indicates the date the key can no longer be used. - - - - Strength - - Indicates the length in bits of a key. In general the longer the key, the more security it provides. - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - Trust - Trust is an indication of how sure you are of a person's ability to correctly extend the web of trust. When you are faced with a key you have not signed, the validity of that person's key will be determined based on the signatures they have collected and how well or not you trust the people who have made those signatures. By default, an unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. - - Unknown: You are not familiar with the person's ability to sign keys correctly. - Never: This person cannot correctly sign keys. - Marginal: This person checks for photo ID before signing a key, but does not necessarily scrutinise the IDs. - Full: This person scrutinises each and every person's photo ID before signing them (e.g. they only sign keys that truely belong to the person asking for the signature). - Ultimate: This level of trust should only be assigned to your own keys. - - - - - Enabling and Disabling Keys - When a key is enabled, it can be used to perform encryption operations. When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. - - - - Expiration Date - A key can no longer be used to perform key operations after it has expired. Changing a key's expiration date to a point in the future re-enables it. A good general practice would be to have a master key that never expires and multiple subkeys that do and are signed by the master key. - - - - User IDs - User IDs allow multiple identities and email addresses to be used with the same key. - They usually take the form of: Name (comment) <email address> - - - Adding a User ID - Adding a user ID is useful when you want to have an identity for your job and one for your friends. - To add a user ID to a key: - - Select the key from the main window, - - - Double click on it or choose Properties from the toolbar, - - - Select the Names and Signatures tab, - - - Click on Add Name. - - - After following the instructions above, you will be presented with a dialogue to fill in. The fields are detailed below. - - - Full Name - - Enter your full name in the form <first> <last> A middle name or initial is optional. - - - You must enter at least 5 characters in this field. - - - - - - Email Address - - Your email address is how most people will locate your key on a key server or other key provider. Make sure it is correct before continuing. - - - It should be of the form <username>@<domainname> - - - - - - Key Comment - - The comment field can be used to place any additional information into the displayed name of your new ID. This information can be searched for on key servers. - - - - - - - - Photo IDs - A Photo ID allows a key owner to embed one or more pictures of themselves in a key. These identities can be signed just like a normal user ID. A photo ID must be in JPEG format and is recommended to be no larger than 240x288 pixels. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Changing the Passphrase - To change the passphrase assigned to a key: - - Select the key from the main window, - - - Double click on it or choose Properties from the toolbar, - - - Click on Change Passphrase. - - - Enter the new passphrase and click OK. - - - - Deleting a Key - To delete a key from your keyring: - - Select the key from the main window, - - - Right click on it and choose Delete Key or choose EditDelete Key. - - - - You can delete your keys, trusted keys and collected keys. - - - - - - - - OpenPGP Subkey Properties - Each OpenPGP key has a single master key used to sign only. A subkey is used to encrypt and to sign as well. In this way, if your subkey is compromised, you don't need to revoke your master key. - - - ID - - This is the identifier of the subkey. - - - - Type - - Specifies the encryption algorithm used to generate a subkey. DSA keys can only sign, ElGamal keys are used to encrypt while RSA keys are used to sign or to encrypt. - - - - Created - - Indicates the date the key was created. - - - - Expires - - Indicates the date the key can no longer be used. - - - - Status - - Indicates the status of the key. - - - - Strength - - Indicates the length in bits of the key. In general the longer the key, the more security it provides. - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - Adding a Subkey - To add a subkey to a key, from the Subkeys section click on Add button. - After following the instructions above, you will be presented with a dialogue to fill in. The fields are detailed below. - - - Key Type - - Specifies the encryption algorithm used to generate a subkey. - - - DSA - - Use the Digital Signature Algorithm (DSA) to create the subkey. This subkey can sign only. - - - - ElGamal - - Use the ElGamal algorithm to create the subkey. This subkey can encrypt only. - - - - RSA - - Use the Rivest-Shamir Adleman (RSA) algorithm to create the subkey. This subkey can be used to sign or encrypt, but you have to create two different subkeys. - - - - - - - Key Length - - Indicates the length in bits of the subkey. In general the longer the key, the more security it provides. - - - - Expiration Date - - Indicates the date the subkey can no longer be used. - - - - - - - Changing a Subkey Expiration Date - To change a subkey expiration date, select the subkey from the Subkeys section, then: - - Click on the Expire button on the left, - - - From the date dialogue choose the new expiration date or select Never expires for no expiration date. - - - - - - Revoking a Subkey - To revoke a subkey, select the subkey from the Subkeys section, then: - - Click on the Revoke button on the left, - - - Choose a reason why to revoke the subkey: - - - - No Reason - - There isn't a specific reason to revoke the key. - - - - Compromised - - The key has been compromised. - - - - Superseded - - The key has been superseded by another one. - - - - Not Used - - The key is not used anymore. - - - - - - - Enter a description of why you are revoking the key, - - - Click on Revoke. - - - - The effect of revoking a subkey is immediate. - - - - - Deleting a Subkey - To delete a subkey, select the subkey from the Subkeys section, then: - - Click on the Delete button on the left. - - - - - - - - - Secure Shell Key Properties - The descriptions in this section apply to all SSH keys. - To view properties of a SSH key: - - Select the Secure Shell key from the main window, - - - Double click on it or choose Properties from the toolbar, - - - Select the Details tab. - - - - - Properties - - - - Fingerprint - - The fingerprint is a unique string of characters that exactly identifies a key. - - - - Algorithm - - Specifies the encryption algorithm used to generate a key. - - - - Location - - This is the location where the private key has been stored. - - - - Strength - - Indicates the length in bits of a key. In general the longer the key, the more security it provides. - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - Deleting a Secure Shell Key - To delete a Secure Shell key: - - Select the SSH key from the main window, - - - Right click on it and choose Delete key or choose EditDelete Key. - - - - - - - - - Importing Keys - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - Select an ASCII armoured public block of text, - - - Copy it to the clipboard, - - - Choose EditPaste Keys. - - - - - - - - - Exporting Keys - - To export keys, select the keys in the main window - and choose - - File - Export - . - - You can also export keys to the clipboard in an ASCII armoured block of text: - - Select the keys in the main window, - - - Choose EditCopy Keys. - - - - - - - - - Signing a Key - Signing another person's key means you are giving trust to that person. Before signing a key, you have to carefully check the key's fingerprint to be sure that the key really belongs to that person. - To sign a key in your keyring: - - Select the key you want to sign from the Trusted Keys or Other Collected Keys tabs, - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - Select how carefully the key has been checked, - - - Indicate if the signature should be local to your keyring, and if your signature can be revoked, - - - Click on Sign. - - - - - - - - Preferences - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - To change the unlock password of the keyring, first select the appropriate keyring and then press the Change Unlock Password button. You will then be prompted to type the old password in the Old password text box, the new password in the New password text box and confirm it in the Confirm password text box. To apply the settings, press Change. If the old password is correct, you will get a status message indicating the success of the operation. If the old password is not correct you will be asked to check its correctness. - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Key Servers - Keep your and other's keys up to date by synchronising keys periodically with remote keyservers. Synchronising will make sure that you have the latest signatures made on all of your keys so that the web of trust will be the most useful. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKP Servers - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Keyservers - - LDAP keyservers are less common, but use the standard LDAP protocol to serve keys. ldap://keyserver.pgp.com is a good LDAP server. - - - - - - - Key Sharing - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - To report a bug or make a suggestion regarding this application or this manual, follow the directions in the Feedback section of the GNOME User Guide. - 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 is included with this documentation; another can be found in the file COPYING included with the source code of this program. - -
diff -Nru seahorse-3.2.2/help/es/es.po seahorse-3.6.3/help/es/es.po --- seahorse-3.2.2/help/es/es.po 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/es/es.po 2012-09-18 13:10:35.000000000 +0200 @@ -2,67 +2,86 @@ # translation of seahorse manual to Spanish # # Jorge Gonzalez , 2009. -# Daniel Mustieles , 2011. # # Jorge González , 2007, 2008, 2009. , 2011. , 2011. +# Daniel Mustieles , 2011. , 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse-help.master\n" -"POT-Creation-Date: 2011-08-30 17:02+0000\n" -"PO-Revision-Date: 2011-08-30 19:13+0200\n" -"Last-Translator: Jorge González \n" -"Language-Team: Español; Castellano \n" +"POT-Creation-Date: 2012-09-10 16:28+0000\n" +"PO-Revision-Date: 2012-09-12 11:11+0200\n" +"Last-Translator: Daniel Mustieles \n" +"Language-Team: Español \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/seahorse.xml:224(None) +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "" +"Daniel Mustieles , 2011, 2012\n" +"Jorge González , 2007-2008" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:224(imagedata) +msgctxt "_" msgid "" -"@@image: 'figures/seahorse-window.png'; md5=d52b0902a24b89d5aadc50e64f471c7d" +"external ref='figures/seahorse-window.png' " +"md5='d52b0902a24b89d5aadc50e64f471c7d'" msgstr "" -"@@image: 'figures/seahorse-window.png'; md5=d52b0902a24b89d5aadc50e64f471c7d" +"external ref='figures/seahorse-window.png' " +"md5='d52b0902a24b89d5aadc50e64f471c7d'" -#: C/seahorse.xml:16(title) +#: C/index.docbook:16(articleinfo/title) msgid "Passwords and Keys Manual" msgstr "Manual de Contraseñas y claves" -#: C/seahorse.xml:18(year) -msgid "2005, 2006, 2007, 2008, 2009" -msgstr "2005, 2006, 2007, 2008, 2009" - -#: C/seahorse.xml:19(holder) -msgid "Jacob Perkins and Adam Schreiber" -msgstr "Jacob Perkins y Adam Schreiber" - -#: C/seahorse.xml:22(publishername) C/seahorse.xml:31(orgname) -#: C/seahorse.xml:43(orgname) C/seahorse.xml:63(publishername) -#: C/seahorse.xml:106(para) C/seahorse.xml:118(para) +#: C/index.docbook:17(articleinfo/copyright) +msgid "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins and Adam " +"Schreiber" +msgstr "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins and Adam " +"Schreiber" + +#: C/index.docbook:22(publisher/publishername) +#: C/index.docbook:63(publisher/publishername) +#: C/index.docbook:106(revdescription/para) +#: C/index.docbook:118(revdescription/para) msgid "Seahorse Project" msgstr "Proyecto Seahorse" -#: C/seahorse.xml:2(para) +#: C/index.docbook:2(legalnotice/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." +"of the GFDL at this link or in " +"the file COPYING-DOCS distributed with this manual." msgstr "" -"Se otorga permiso para copiar, distribuir y/o modificar este documento bajo " -"los términos de la Licencia de Documentación Libre de GNU, Versión 1.1 o " -"cualquier otra versión posterior publicada por la Free Software Foundation; " -"sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de " -"Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este " -"enlace o en el archivo " -"COPYING-DOCS distribuido con este manual." +"Se concede autorización para copiar, distribuir o modificar este documento " +"según los términos de la GFDL (GNU Free Documentation License), Versión 1.1, " +"o cualquier otra versión posterior publicada por Free Software Foundation " +"sin secciones invariables, textos de portada ni textos de contraportada. " +"Podrá encontrar una copia de la GFDL en este enlace o en el archivo COPYING-DOCS distribuido con " +"este manual." -#: C/seahorse.xml:12(para) +#: C/index.docbook:12(legalnotice/para) C/legal.xml:12(legalnotice/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, " @@ -74,7 +93,7 @@ "puede hacerlo añadiendo una copia de la licencia al manual, tal como se " "describe en la sección 6 de la licencia." -#: C/seahorse.xml:19(para) +#: C/index.docbook:19(legalnotice/para) C/legal.xml:19(legalnotice/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 " @@ -88,7 +107,7 @@ "de Documentación de GNOME están al corriente de esas marcas comerciales, " "entonces los nombres se pondrán en mayúsculas o con la inicial en mayúsculas." -#: C/seahorse.xml:35(para) +#: C/index.docbook:35(listitem/para) C/legal.xml:35(listitem/para) msgid "" "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " @@ -115,7 +134,7 @@ "NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO " "DE LA RENUNCIA;Y" -#: C/seahorse.xml:55(para) +#: C/index.docbook:55(listitem/para) C/legal.xml:55(listitem/para) msgid "" "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " "NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " @@ -141,129 +160,131 @@ "ELLO, INCLUSO SI SE HABÍA COMUNICADO A AQUELLA PARTE LA POSIBILIDAD DE TALES " "DAÑOS." -#: C/seahorse.xml:28(para) +#: C/index.docbook:28(legalnotice/para) C/legal.xml:28(legalnotice/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: " -"" +"<_:orderedlist-1/>" msgstr "" -"ESTE DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN SEGÚN " -"LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU " -"(GFDL) Y TENIENDO EN CUENTA QUE: " - -#: C/seahorse.xml:28(firstname) -msgid "Jacob" -msgstr "Jacob" +"EL DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN CON " +"SUJECIÓN A LOS TÉRMINOS DE LA GFDL, QUEDANDO BIEN ENTENDIDO, ADEMÁS, QUE: <_:" +"orderedlist-1/>" -#: C/seahorse.xml:29(surname) -msgid "Perkins" -msgstr "Perkins" - -#: C/seahorse.xml:40(firstname) -msgid "Adam" -msgstr "Adam" - -#: C/seahorse.xml:41(surname) -msgid "Schreiber" -msgstr "Schreiber" - -#: C/seahorse.xml:45(email) -msgid "sadam@clemson.edu" -msgstr "sadam@clemson.edu" +#: C/index.docbook:27(authorgroup/author) +msgid "" +"Jacob Perkins " +"Seahorse Project " +msgstr "" +"Jacob Perkins " +"Proyecto Seahorse " -#: C/seahorse.xml:50(firstname) -msgid "Paul" -msgstr "Paul" +#: C/index.docbook:39(authorgroup/author) +msgid "" +"Adam Schreiber " +"Seahorse Project
sadam@clemson.edu
" +msgstr "" +"Adam Schreiber " +"Proyecto Seahorse
sadam@clemson.edu
" -#: C/seahorse.xml:51(surname) -msgid "Cutler" -msgstr "Cutler" +#: C/index.docbook:49(authorgroup/author) +msgid "" +"Paul Cutler " +"GNOME Documentation Project
" +"pcutler@foresightlinux.org
" +msgstr "" +"Paul Cutler " +"Proyecto de documentación de GNOME
" +"pcutler@foresightlinux.org
" -#: C/seahorse.xml:53(orgname) C/seahorse.xml:66(publishername) +#: C/index.docbook:66(publisher/publishername) msgid "GNOME Documentation Project" msgstr "Proyecto de documentación de Gnome" -#: C/seahorse.xml:55(email) -msgid "pcutler@foresightlinux.org" -msgstr "pcutler@foresightlinux.org" - -#: C/seahorse.xml:70(revnumber) -msgid "Passwords and Keys Manual V2.11.0" -msgstr "Manual de Contraseñas y claves V2.11.0" - -#: C/seahorse.xml:71(date) -msgid "May 2009" -msgstr "Mayo de 2009" - -#: C/seahorse.xml:73(para) +#: C/index.docbook:73(revdescription/para) msgid "Paul Cutler pcutler@foresightlinux.org" msgstr "Paul Cutler pcutler@foresightlinux.org" -#: C/seahorse.xml:80(revnumber) -msgid "Passwords and Keys Manual V0.10.1" -msgstr "Manual de Contraseñas y claves V0.10.1" - -#: C/seahorse.xml:81(date) -msgid "August 2008" -msgstr "Agosto de 2008" +#: C/index.docbook:69(revhistory/revision) +msgid "" +"Passwords and Keys Manual V2.11.0 May 2009 <_:revdescription-1/>" +msgstr "" +"Versión 2.11.0 del manual de Contraseñas y claves " +"mayo de 2009 <_:revdescription-1/>" -#: C/seahorse.xml:83(para) C/seahorse.xml:103(para) +#: C/index.docbook:83(revdescription/para) +#: C/index.docbook:103(revdescription/para) msgid "Adam Schreiber sadam@clemson.edu" msgstr "Adam Schreiber sadam@clemson.edu" -#: C/seahorse.xml:90(revnumber) -msgid "Passwords and Keys Manual V0.9.1" -msgstr "Manual de Contraseñas y claves V0.9.1" - -#: C/seahorse.xml:91(date) -msgid "November 2006" -msgstr "noviembre de 2006" +#: C/index.docbook:79(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.10.1 August 2008 <_:revdescription-1/>" +msgstr "" +"Versión 0.10.1 del manual de Contraseñas y claves " +"agosto de 2008 <_:revdescription-1/>" -#: C/seahorse.xml:93(para) +#: C/index.docbook:93(revdescription/para) msgid "Milo Casagrande milo_casagrande@yahoo.it" msgstr "Milo Casagrande milo_casagrande@yahoo.it" -#: C/seahorse.xml:100(revnumber) -msgid "Passwords and Keys Manual V0.9.0" -msgstr "Manual de Contraseñas y claves V.0.9.0" - -#: C/seahorse.xml:101(date) -msgid "July 2005" -msgstr "julio de 2005" - -#: C/seahorse.xml:110(revnumber) -msgid "Passwords and Keys Manual V0.7.0" -msgstr "Manual de Contraseñas y claves V.7.0" - -#: C/seahorse.xml:111(date) -msgid "February 2003" -msgstr "febrero de 2003" +#: C/index.docbook:89(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.1 November 2006 <_:revdescription-1/>" +msgstr "" +"Versión 0.9.1 del manual de Contraseñas y claves " +"noviembre de 2006 <_:revdescription-1/>" + +#: C/index.docbook:99(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.0 July 2005 <_:revdescription-1/>" +msgstr "" +"Versión 0.9.0 del manual de Contraseñas y claves " +"julio de 2005 <_:revdescription-1/>" -#: C/seahorse.xml:113(para) +#: C/index.docbook:113(revdescription/para) msgid "Jacob Perkins" msgstr "Jacob Perkins" -#: C/seahorse.xml:122(releaseinfo) +#: C/index.docbook:109(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.7.0 February 2003 <_:revdescription-1/>" +msgstr "" +"Versión 0.7.0 del manual de Contraseñas y claves " +"febrero de 2003 <_:revdescription-1/>" + +#: C/index.docbook:122(articleinfo/releaseinfo) msgid "This manual describes version 2.28.x of Passwords and Keys" msgstr "Este manual describe la versión 2.28.x de Contraseñas y claves" -#: C/seahorse.xml:124(title) +#: C/index.docbook:124(legalnotice/title) msgid "Feedback" msgstr "Comentarios" -#: C/seahorse.xml:125(para) +#: C/index.docbook:125(legalnotice/para) +#| msgid "" +#| "To report a bug or make a suggestion regarding the Passwords " +#| "and Keys application or this manual, follow the directions " +#| "in the Gnome Feedback " +#| "Page." msgid "" "To report a bug or make a suggestion regarding the Passwords " "and Keys application or this manual, follow the directions in " -"the Gnome Feedback PageGnome Feedback Page." msgstr "" "Para informar de un error o hacer alguna sugerencia respecto de la " "aplicación Contraseñas y claves o este manual, " -"siga las indicaciones en la página de contacto de GNOME." +"siga las indicaciones en la página de comentarios de GNOME." -#: C/seahorse.xml:132(para) +#: C/index.docbook:132(abstract/para) msgid "" "Passwords and Keys is the application for " "managing encryption keys for the GNOME Desktop" @@ -271,23 +292,24 @@ "Contraseñas y claves es la aplicación para " "administrar claves de cifrado para el Escritorio GNOME" -#: C/seahorse.xml:140(primary) -msgid "Seahorse" -msgstr "Seahorse" - -#: C/seahorse.xml:144(primary) -msgid "seahorse" -msgstr "seahorse" - -#: C/seahorse.xml:148(primary) -msgid "Encryption Keys" -msgstr "Claves de cifrado" +#: C/index.docbook:139(article/indexterm) +msgid "Seahorse" +msgstr "Seahorse" + +#: C/index.docbook:143(article/indexterm) +msgid "seahorse" +msgstr "seahorse" + +#: C/index.docbook:147(article/indexterm) +#| msgid "Encryption Keys" +msgid "Encryption Keys" +msgstr "Claves de cifrado" -#: C/seahorse.xml:154(title) +#: C/index.docbook:154(sect1/title) msgid "Introduction" msgstr "Introducción" -#: C/seahorse.xml:155(para) +#: C/index.docbook:155(sect1/para) msgid "" "You can use Passwords and Keys to create and " "manage PGP and SSH keys." @@ -295,7 +317,7 @@ "Puede usar Contraseñas y claves para crear y " "administrar claves PGP y SSH." -#: C/seahorse.xml:158(para) +#: C/index.docbook:158(sect1/para) msgid "" "Passwords and Keys provides a front end to many " "of the features of Gnu " @@ -307,33 +329,38 @@ "\"http\">Gnu Privacy Guard (GPG) y se integra con muchos de los " "componentes del escritorio GNOME." -#: C/seahorse.xml:168(para) +#: C/index.docbook:168(listitem/para) msgid "Create and manage PGP and SSH keys," msgstr "Crear y administrar claves PGP y SSH," -#: C/seahorse.xml:171(para) +#: C/index.docbook:171(listitem/para) msgid "Export and import PGP and SSH keys," msgstr "Exportar e importar claves PGP y SSH," -#: C/seahorse.xml:174(para) +#: C/index.docbook:174(listitem/para) msgid "Share your keys with others," msgstr "Compartir sus claves con otros," -#: C/seahorse.xml:163(para) +#: C/index.docbook:163(sect1/para) +#| msgid "" +#| "With Passwords and Keys you can: " msgid "" -"With Passwords and Keys you can: " +"With Passwords and Keys you can: <_:itemizedlist-" +"1/>" msgstr "" -"Con Contraseñas y claves puede: " +"Con Contraseñas y claves puede: <_:itemizedlist-1/" +">" -#: C/seahorse.xml:183(title) +#: C/index.docbook:183(sect1/title) msgid "Getting Started" msgstr "Inicio" -#: C/seahorse.xml:185(title) +#: C/index.docbook:185(sect2/title) msgid "Starting Passwords and Keys" msgstr "Iniciar Contraseñas y claves" -#: C/seahorse.xml:186(para) +#: C/index.docbook:186(sect2/para) msgid "" "You can start Passwords and Keys in the following " "ways:" @@ -341,32 +368,35 @@ "Puede iniciar Contraseñas y claves de las " "siguientes formas:" -#: C/seahorse.xml:192(term) +#: C/index.docbook:192(varlistentry/term) msgid "Applications menu" msgstr "Menú Aplicaciones" -#: C/seahorse.xml:194(para) +#: C/index.docbook:194(listitem/para) +#| msgid "" +#| "Choose AccessoriesPassword " +#| "and Keys." msgid "" -"Choose AccessoriesPassword and " -"Keys." +"Choose Accessories Password and " +"Keys ." msgstr "" "Elija AccesoriosContraseñas y " "claves." -#: C/seahorse.xml:202(term) +#: C/index.docbook:202(varlistentry/term) msgid "Command Line" msgstr "Línea de comandos" -#: C/seahorse.xml:204(para) +#: C/index.docbook:204(listitem/para) msgid "Type seahorse then press Return." msgstr "" "Escriba seahorse y después pulse Retorno." -#: C/seahorse.xml:213(title) +#: C/index.docbook:213(sect2/title) msgid "When You Start Passwords and Keys" msgstr "Iniciar Contraseñas y claves" -#: C/seahorse.xml:214(para) +#: C/index.docbook:214(sect2/para) msgid "" "When you start Passwords and Keys, the " "Password and Keys window is displayed." @@ -374,19 +404,22 @@ "Al iniciar Contraseñas y claves, se mostrará la " "ventana de Contraseñas y claves." -#: C/seahorse.xml:220(title) +#: C/index.docbook:220(figure/title) msgid "The Passwords and Keys Window" msgstr "La ventana de Contraseñas y claves" -#: C/seahorse.xml:228(application) -msgid "Passwords and Keys" -msgstr "Manual de Contraseñas y claves" - -#: C/seahorse.xml:227(phrase) -msgid "Show the window." -msgstr "Muestra la ventana de ." +#: C/index.docbook:222(screenshot/mediaobject) +msgid "" +" Show the Passwords " +"and Keys window. " +msgstr "" +" Muestra la ventana de " +"Contraseñas y claves window. " -#: C/seahorse.xml:235(para) +#: C/index.docbook:235(sect2/para) msgid "" "The Passwords and Keys window contains the " "following elements:" @@ -394,11 +427,11 @@ "La ventana de Contraseñas y claves contiene los " "siguientes elementos:" -#: C/seahorse.xml:240(term) +#: C/index.docbook:240(varlistentry/term) msgid "Menubar" msgstr "Barra de menú" -#: C/seahorse.xml:242(para) +#: C/index.docbook:242(listitem/para) msgid "" "The menus on the menubar contain all of the commands that you need to " "perform tasks in Passwords and Keys." @@ -406,30 +439,30 @@ "Los menús de la barra de menú contienen todos los comandos que necesita para " "realizar tareas con Contraseñas y claves." -#: C/seahorse.xml:245(term) +#: C/index.docbook:245(varlistentry/term) msgid "Toolbar" msgstr "Barra de herramientas" -#: C/seahorse.xml:247(para) +#: C/index.docbook:247(listitem/para) msgid "Use the toolbar to quickly access commonly-used commands." msgstr "" "Use la barra de herramientas para acceder rápidamente a los comandos más " "usados." -#: C/seahorse.xml:250(term) +#: C/index.docbook:250(varlistentry/term) msgid "Keys and Passwords Tabs" msgstr "Pestañas de claves y contraseñas" -#: C/seahorse.xml:252(para) +#: C/index.docbook:252(listitem/para) msgid "Provides access to the keys and passwords in the keyring." msgstr "" "Proporciona acceso a las claves y contraseñas en el depósito de claves." -#: C/seahorse.xml:255(term) +#: C/index.docbook:255(varlistentry/term) msgid "First time options" msgstr "Opciones noveles" -#: C/seahorse.xml:257(para) +#: C/index.docbook:257(listitem/para) msgid "" "Provides fast access to useful actions for first time users. From here you " "can:" @@ -437,23 +470,23 @@ "Proporciona acceso rápido a acciones útiles para los usuarios noveles. Desde " "aquí puede:" -#: C/seahorse.xml:260(para) +#: C/index.docbook:260(listitem/para) msgid "Browse the help system," msgstr "Navegar por el sistema de ayuda, " -#: C/seahorse.xml:263(para) +#: C/index.docbook:263(listitem/para) msgid "Import keys in the keyring," msgstr "Importar claves al depósito," -#: C/seahorse.xml:266(para) +#: C/index.docbook:266(listitem/para) msgid "Create new keys." msgstr "Crear claves nuevas." -#: C/seahorse.xml:278(title) +#: C/index.docbook:278(sect1/title) msgid "Creating OpenPGP Keys" msgstr "Crear claves OpenPGP" -#: C/seahorse.xml:279(para) +#: C/index.docbook:279(sect1/para) msgid "" "OpenPGP is a non proprietary protocol for encrypting e-mail with the use of " "public key cryptography based on PGP. It defines standard " @@ -465,7 +498,7 @@ "formatos estándar para los mensajes cifrados, firmas, claves públicas y " "certificados para intercambiar claves públicas." -#: C/seahorse.xml:284(para) +#: C/index.docbook:284(sect1/para) msgid "" "Public key cryptography is a concept which involves the use of two keys: a " "public key, that you can give to anyone with whom you " @@ -477,7 +510,7 @@ "con el que quiera comunicarse, y una clave privada que " "es privada y debe mantenerse en secreto." -#: C/seahorse.xml:294(para) C/seahorse.xml:427(para) +#: C/index.docbook:294(listitem/para) C/index.docbook:427(listitem/para) msgid "" "Choose FileNew..." @@ -485,14 +518,14 @@ "Elija ArchivoNueva..." -#: C/seahorse.xml:299(para) +#: C/index.docbook:299(listitem/para) msgid "" "Select PGP Key and click Continue" msgstr "" "Seleccione Clave PGP y pulse Continuar" -#: C/seahorse.xml:304(para) +#: C/index.docbook:304(listitem/para) msgid "" "Enter your full name (first - last), your e-mail address and any additional " "information. You can also specify advanced options for the key: see below." @@ -501,11 +534,11 @@ "electrónico y cualquier información adicional. También puede especificar " "opciones avanzadas para la clave: vea más abajo." -#: C/seahorse.xml:310(para) +#: C/index.docbook:310(listitem/para) msgid "Click Create to create the new key pair." msgstr "Pulse Crear para crear el nuevo par de claves." -#: C/seahorse.xml:315(para) +#: C/index.docbook:315(listitem/para) msgid "" "The Passphrase for New PGP Key dialog will open. Enter " "the passphrase twice for your new key." @@ -513,11 +546,12 @@ "Se abrirá el diálogo Frase de paso para la nueva clave PGP. Introduzca dos veces la frase de paso para su nueva clave." -#: C/seahorse.xml:290(para) -msgid "To create OpenPGP keys: " -msgstr "Para crear claves OpenPGP: " +#: C/index.docbook:290(sect1/para) +#| msgid "To create OpenPGP keys: " +msgid "To create OpenPGP keys: <_:orderedlist-1/>" +msgstr "Para crear claves OpenPGP: <_:orderedlist-1/>" -#: C/seahorse.xml:323(para) C/seahorse.xml:446(para) +#: C/index.docbook:323(tip/para) C/index.docbook:446(tip/para) msgid "" "Use similar practices to generating a strong password when choosing a " "passphrase. The main difference between a password and a passphrase is that, " @@ -527,11 +561,11 @@ "frase de paso. La principal diferencia entre una contraseña y una frase de " "paso es que en una frase de paso los espacios son caracteres válidos." -#: C/seahorse.xml:331(title) C/seahorse.xml:460(title) +#: C/index.docbook:331(sect2/title) C/index.docbook:460(sect2/title) msgid "Advanced options" msgstr "Opciones avanzadas" -#: C/seahorse.xml:332(para) +#: C/index.docbook:332(sect2/para) msgid "" "Expand the Advanced key options section to specify " "the following options for a new key:" @@ -539,22 +573,23 @@ "Expanda la sección Opciones avanzadas de la clave " "para especificar las siguientes opciones para una nueva clave:" -#: C/seahorse.xml:338(guilabel) C/seahorse.xml:467(guilabel) -msgid "Encryption Type" -msgstr "Tipo de cifrado" +#: C/index.docbook:338(varlistentry/term) +#: C/index.docbook:467(varlistentry/term) +msgid "Encryption Type" +msgstr "Tipo de cifrado" -#: C/seahorse.xml:340(para) +#: C/index.docbook:340(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your keys." msgstr "" "Este campo especifica los algoritmos de cifrado usados para generar sus " "claves." -#: C/seahorse.xml:346(term) +#: C/index.docbook:346(varlistentry/term) msgid "DSA ElGamal" msgstr "DSA ElGamal" -#: C/seahorse.xml:348(para) +#: C/index.docbook:348(listitem/para) msgid "" "This is the suggested choice as it will allow you to encrypt, decrypt, sign " "and verify as needed." @@ -562,25 +597,28 @@ "Esta es la opción sugerida ya que le permite cifrar, descifrar, firmar y " "verificar cuando sea necesario." -#: C/seahorse.xml:355(acronym) C/seahorse.xml:485(acronym) -#: C/seahorse.xml:916(acronym) -msgid "DSA" -msgstr "DSA" +#: C/index.docbook:355(varlistentry/term) +#: C/index.docbook:485(varlistentry/term) +#: C/index.docbook:916(varlistentry/term) +msgid "DSA" +msgstr "DSA" -#: C/seahorse.xml:357(para) C/seahorse.xml:365(para) +#: C/index.docbook:357(listitem/para) C/index.docbook:365(listitem/para) msgid "Will allow signing only." msgstr "Sólo permite firmado." -#: C/seahorse.xml:363(acronym) C/seahorse.xml:475(acronym) -#: C/seahorse.xml:935(term) -msgid "RSA" -msgstr "RSA" - -#: C/seahorse.xml:374(guilabel) C/seahorse.xml:497(guilabel) -msgid "Key Strength (bits)" -msgstr "Fortaleza de la clave (bits)" +#: C/index.docbook:363(varlistentry/term) +#: C/index.docbook:475(varlistentry/term) +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:374(varlistentry/term) +#: C/index.docbook:497(varlistentry/term) +#| msgid "Key Strength (bits)" +msgid "Key Strength (bits)" +msgstr "Fortaleza de la clave (bits)" -#: C/seahorse.xml:376(para) C/seahorse.xml:499(para) +#: C/index.docbook:376(listitem/para) C/index.docbook:499(listitem/para) msgid "" "This is the length of the key in bits. The longer the key, the more secure " "it will be, provided a strong passphrase is used. Conversely, performing any " @@ -594,12 +632,11 @@ "clave más corta. Los valores aceptables están entre los 1024 y 4096 bits. Se " "recomiendan 2048 bits al menos." -#: C/seahorse.xml:386(guilabel) C/seahorse.xml:648(title) -#: C/seahorse.xml:957(term) -msgid "Expiration Date" -msgstr "Fecha de caducidad" +#: C/index.docbook:386(varlistentry/term) +msgid "Expiration Date" +msgstr "Fecha de expiración" -#: C/seahorse.xml:395(para) +#: C/index.docbook:395(note/para) msgid "" "Sign your new key with your old one before it expires to preserve your trust " "status." @@ -607,23 +644,28 @@ "Firme su nueva clave con la vieja antes de que caduque para preservar su " "estado de confianza." -#: C/seahorse.xml:388(para) +#: C/index.docbook:388(listitem/para) +#| msgid "" +#| "This is the date at which the key will cease to be usable for performing " +#| "encryption or signing operations. 6 months is a reasonable time to set it " +#| "to. You will have to either change the expiration date or generate a new " +#| "key or subkey after this amount of time passes. " msgid "" "This is the date at which the key will cease to be usable for performing " "encryption or signing operations. 6 months is a reasonable time to set it " "to. You will have to either change the expiration date or generate a new key " -"or subkey after this amount of time passes. " +"or subkey after this amount of time passes. <_:note-1/>" msgstr "" "Esta es la fecha en la que la clave dejará de ser útil para realizar cifrado " "u operaciones de firma. 6 meses es un tiempo razonable para ello. Tendrá que " "cambiar la fecha de caducidad o generar una nueva clave o subclave después " -"de que pase este espacio de tiempo. " +"de que pase este espacio de tiempo. <_:note-1/>" -#: C/seahorse.xml:410(title) +#: C/index.docbook:410(sect1/title) msgid "Creating Secure Shell Keys" msgstr "Crear claves de shell seguras" -#: C/seahorse.xml:411(para) +#: C/index.docbook:411(sect1/para) msgid "" "Secure Shell (SSH) is a way of logging into a remote " "computer to execute commands on that machine. SSH keys are used in key-based " @@ -638,7 +680,7 @@ "Con el sistema de autenticación basado en clave no existe la necesidad de " "escribir una contraseña para autenticarse." -#: C/seahorse.xml:418(para) +#: C/index.docbook:418(sect1/para) msgid "" "Secure Shell keys are made of two keys: a private key, " "that must be kept secret, and a public key which can be " @@ -648,11 +690,11 @@ "emphasis>, que se debe mantener en secreto, y una clave pública que puede ser cargada en cualquier equipo que necesite acceder." -#: C/seahorse.xml:422(para) +#: C/index.docbook:422(sect1/para) msgid "To create a Secure Shell key:" msgstr "Para crear una clave de shell segura:" -#: C/seahorse.xml:430(para) +#: C/index.docbook:430(listitem/para) msgid "" "Select Secure Shell Key and click Continue" @@ -660,7 +702,7 @@ "Seleccione Clave de shell segura y pulse " "Continuar" -#: C/seahorse.xml:433(para) +#: C/index.docbook:433(listitem/para) msgid "" "Enter a description of what the key is to be used for. You can use your e-" "mail address or any other reminder. You can also specify advanced options " @@ -670,7 +712,7 @@ "correo electrónico o algo que le sirva para recordarlo. También puede " "especificar opciones avanzadas para la clave: vea más abajo." -#: C/seahorse.xml:436(para) +#: C/index.docbook:436(listitem/para) msgid "" "Click Just Create Key to create the new key, or " "Create and Set Up to create the key and set up " @@ -680,7 +722,7 @@ "o Crear y configurar para crear la clave y configurar " "otro equipo para usar la autenticación." -#: C/seahorse.xml:441(para) +#: C/index.docbook:441(listitem/para) msgid "" "The Passphrase for New Secure Shell Key dialog opens. " "Enter the passphrase twice for your new key." @@ -688,7 +730,7 @@ "Se abrirá el diálogo Frase de paso para la nueva clave de shell " "segura. Introduzca la frase de paso dos veces para su nueva clave." -#: C/seahorse.xml:461(para) +#: C/index.docbook:461(sect2/para) msgid "" "Expand the Advanced key options section to specify the " "following options for a new key:" @@ -696,13 +738,13 @@ "Expanda la sección Opciones avanzadas de la clave para " "especificar las siguientes opciones para una nueva clave:" -#: C/seahorse.xml:469(para) +#: C/index.docbook:469(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your key." msgstr "" "Este campo especifica los algoritmos de cifrado usados para generar su clave." -#: C/seahorse.xml:477(para) +#: C/index.docbook:477(listitem/para) msgid "" "Use the Rivest-ShamirAdleman (RSA) " "algorithm to create the SSH key. This is the preferred and more secure " @@ -712,7 +754,7 @@ "acronym>) para crear la clave SSH. Esta es la elección preferida y más " "segura." -#: C/seahorse.xml:487(para) +#: C/index.docbook:487(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the SSH key." @@ -720,21 +762,22 @@ "Use el Algoritmo de firma digital (DSA) para crear la clave SSH." -#: C/seahorse.xml:518(title) +#: C/index.docbook:518(sect1/title) msgid "OpenPGP Key Properties" msgstr "Propiedades de la clave OpenPGP" -#: C/seahorse.xml:519(para) +#: C/index.docbook:519(sect1/para) msgid "The descriptions in this section apply to all OpenPGP keys." msgstr "" "Las descripciones en esta sección se aplican a todas las claves OpenPGP." -#: C/seahorse.xml:527(para) +#: C/index.docbook:527(listitem/para) msgid "Select the PGP key from the main window," msgstr "" "Seleccione la clave PGP de la ventana del menú principal," -#: C/seahorse.xml:533(para) C/seahorse.xml:781(para) C/seahorse.xml:1093(para) +#: C/index.docbook:533(listitem/para) C/index.docbook:781(listitem/para) +#: C/index.docbook:1093(listitem/para) msgid "" "Double click on it or choose Properties from the " "toolbar," @@ -742,25 +785,28 @@ "Pulse dos veces sobre ella o elija Propiedades de la " "barra de herramientas," -#: C/seahorse.xml:539(para) C/seahorse.xml:1099(para) +#: C/index.docbook:539(listitem/para) C/index.docbook:1099(listitem/para) msgid "Select the Details tab." msgstr "Seleccione la pestaña Detalles." -#: C/seahorse.xml:523(para) -msgid "To view properties of a PGP key: " +#: C/index.docbook:523(sect1/para) +#| msgid "To view properties of a PGP key: " +msgid "To view properties of a PGP key: <_:itemizedlist-1/>" msgstr "" -"Para ver las propiedades de una clave PGP: " +"Para ver las propiedades de una clave PGP: <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:547(title) C/seahorse.xml:1107(title) +#: C/index.docbook:547(sect2/title) C/index.docbook:1107(sect2/title) msgid "Properties" msgstr "Propiedades" -#: C/seahorse.xml:551(guilabel) C/seahorse.xml:1111(guilabel) -msgid "Fingerprint" -msgstr "Huella" +#: C/index.docbook:551(varlistentry/term) +#: C/index.docbook:1111(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Fingerprint" +msgstr "Huella" -#: C/seahorse.xml:553(para) C/seahorse.xml:1113(para) +#: C/index.docbook:553(listitem/para) C/index.docbook:1113(listitem/para) msgid "" "The fingerprint is a unique string of characters that exactly identifies a " "key." @@ -768,11 +814,12 @@ "La huella es una cadena de caracteres única que identifica exactamente a la " "clave." -#: C/seahorse.xml:557(guilabel) -msgid "KeyID" -msgstr "ID de la clave" +#: C/index.docbook:557(varlistentry/term) +#| msgid "Select the Details tab." +msgid "KeyID" +msgstr "ID de la clave" -#: C/seahorse.xml:559(para) +#: C/index.docbook:559(listitem/para) msgid "" "The KeyID is similar to the Fingerprint. However the KeyID only contains the " "last 8 characters of the fingerprint. Most of the time it is possible to " @@ -784,11 +831,12 @@ "posible identificar una clave sólo con la ID de la clave, pero " "ocasionalmente dos claves pueden tener la misma ID." -#: C/seahorse.xml:567(guilabel) C/seahorse.xml:847(guilabel) -msgid "Type" -msgstr "Tipo" +#: C/index.docbook:567(varlistentry/term) +#: C/index.docbook:847(varlistentry/term) +msgid "Type" +msgstr "Tipo" -#: C/seahorse.xml:569(para) +#: C/index.docbook:569(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a key. DSA keys can only " "sign. ElGamal keys are used to encrypt." @@ -796,46 +844,55 @@ "Especifica el algoritmo de cifrado usado para generar la clave. Las claves " "DSA sólo pueden firmar. Las claves ElGamal se usan para cifrar." -#: C/seahorse.xml:576(guilabel) C/seahorse.xml:858(guilabel) -msgid "Created" -msgstr "Creada" +#: C/index.docbook:576(varlistentry/term) +#: C/index.docbook:858(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Created" +msgstr "Creada" -#: C/seahorse.xml:578(para) C/seahorse.xml:860(para) +#: C/index.docbook:578(listitem/para) C/index.docbook:860(listitem/para) msgid "Indicates the date the key was created." msgstr "Indica la fecha en la que la clave fue creada." -#: C/seahorse.xml:584(guilabel) C/seahorse.xml:866(guilabel) -msgid "Expires" -msgstr "Caduca" +#: C/index.docbook:584(varlistentry/term) +#: C/index.docbook:866(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Expires" +msgstr "Expira" -#: C/seahorse.xml:586(para) C/seahorse.xml:868(para) +#: C/index.docbook:586(listitem/para) C/index.docbook:868(listitem/para) msgid "Indicates the date the key can no longer be used." msgstr "Indica la fecha a partir de la cual la clave no se puede usar más." -#: C/seahorse.xml:592(guilabel) C/seahorse.xml:882(guilabel) -#: C/seahorse.xml:1139(guilabel) -msgid "Strength" -msgstr "Fortaleza" +#: C/index.docbook:592(varlistentry/term) +#: C/index.docbook:882(varlistentry/term) +#: C/index.docbook:1139(varlistentry/term) +msgid "Strength" +msgstr "Fortaleza" -#: C/seahorse.xml:598(para) C/seahorse.xml:888(para) C/seahorse.xml:1146(para) +#: C/index.docbook:598(note/para) C/index.docbook:888(note/para) +#: C/index.docbook:1146(note/para) msgid "A long key is not enough to make up for the use of a weak passphrase." msgstr "" "Una clave larga no es suficiente para sustituir el uso de una frase de paso " "débil." -#: C/seahorse.xml:594(para) C/seahorse.xml:1141(para) +#: C/index.docbook:594(listitem/para) C/index.docbook:1141(listitem/para) +#| msgid "" +#| "Indicates the length in bits of a key. In general the longer the key, the " +#| "more security it provides. " msgid "" "Indicates the length in bits of a key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Indica la longitud de una clave en bits. En general, cuanto más larga es la " -"clave, más seguridad proporciona. " +"clave, más seguridad proporciona. <_:note-1/>" -#: C/seahorse.xml:610(title) +#: C/index.docbook:610(sect2/title) msgid "Trust" msgstr "Confianza" -#: C/seahorse.xml:611(para) +#: C/index.docbook:611(sect2/para) msgid "" "Trust is an indication of how sure you are of a person's ability to " "correctly extend the web of trust. When you are faced with a key you have " @@ -852,7 +909,7 @@ "predeterminada, una clave desconocida requiere 3 firmas con cierta confianza " "marginal o una 1 firma de plena confianza." -#: C/seahorse.xml:619(para) +#: C/index.docbook:619(listitem/para) msgid "" "Unknown: You are not familiar with the person's ability " "to sign keys correctly." @@ -860,13 +917,13 @@ "Desconocido: No sabe con certeza la habilidad de la " "persona para firmar claves correctamente." -#: C/seahorse.xml:622(para) +#: C/index.docbook:622(listitem/para) msgid "Never: This person cannot correctly sign keys." msgstr "" "Nunca: Esta persona no puede firmar claves " "correctamente." -#: C/seahorse.xml:625(para) +#: C/index.docbook:625(listitem/para) msgid "" "Marginal: This person checks for photo ID before " "signing a key, but does not necessarily scrutinize the IDs." @@ -875,7 +932,7 @@ "fotográfica antes de firmar una clave, pero no escrutina la identificación " "necesariamente." -#: C/seahorse.xml:629(para) +#: C/index.docbook:629(listitem/para) msgid "" "Full: This person scrutinizes each and every person's " "photo IDs before signing them (e.g. they only sign keys that truely belong " @@ -885,7 +942,7 @@ "de identificación de cada persona antes de firmarlas (ej. sólo firman claves " "que verdaderamente pertenezcan a esa persona, preguntando por la firma)." -#: C/seahorse.xml:633(para) +#: C/index.docbook:633(listitem/para) msgid "" "Ultimate: This level of trust should only be assigned " "to your own keys." @@ -893,11 +950,11 @@ "Máximo: Este nivel de confianza sólo se debería asignar " "a sus propias claves." -#: C/seahorse.xml:640(title) +#: C/index.docbook:640(sect2/title) msgid "Enabling and Disabling Keys" msgstr "Activar y desactivar claves" -#: C/seahorse.xml:641(para) +#: C/index.docbook:641(sect2/para) msgid "" "When a key is enabled, it can be used to perform encryption operations. When " "a key is disabled, it cannot be used to encrypt to or verify signatures made " @@ -907,7 +964,11 @@ "cifrado. Cuando se desactiva una clave, no se puede usar para cifrar o " "comprobar firmas realizadas con ella." -#: C/seahorse.xml:649(para) +#: C/index.docbook:648(sect2/title) C/index.docbook:957(varlistentry/term) +msgid "Expiration Date" +msgstr "Fecha de caducidad" + +#: C/index.docbook:649(sect2/para) msgid "" "A key can no longer be used to perform key operations after it has expired. " "Changing a key's expiration date to a point in the future re-enables it. A " @@ -920,11 +981,11 @@ "nunca caduca y múltiples subclaves que estuviesen firmadas por la clave " "maestra." -#: C/seahorse.xml:658(title) +#: C/index.docbook:658(sect2/title) msgid "User IDs" msgstr "Identificación de usuarios" -#: C/seahorse.xml:659(para) +#: C/index.docbook:659(sect2/para) msgid "" "User IDs allow multiple identities and email addresses to be used with the " "same key." @@ -932,20 +993,20 @@ "Las identificaciones de usuario permiten que una sola clave se use para " "múltiples identidades y correos electrónicos." -#: C/seahorse.xml:665(programlisting) +#: C/index.docbook:665(para/programlisting) #, no-wrap msgid "Name (comment) <email address>" msgstr "Nombre (comentario) <correo electrónico>" -#: C/seahorse.xml:663(para) -msgid "They usually take the form of: " -msgstr "Generalmente toman la forma de: " +#: C/index.docbook:663(sect2/para) +msgid "They usually take the form of: <_:programlisting-1/>" +msgstr "Generalmente toman la forma de: <_:programlisting-1/>" -#: C/seahorse.xml:669(title) +#: C/index.docbook:669(sect3/title) msgid "Adding a User ID" msgstr "Añadir una identidad de usuario" -#: C/seahorse.xml:670(para) +#: C/index.docbook:670(sect3/para) msgid "" "Adding a user ID is useful when you want to have an identity for your job " "and one for your friends." @@ -953,11 +1014,12 @@ "Añadir una identidad de usuario es útil cuando quiere tener una identidad " "para su trabajo y otra para sus amigos." -#: C/seahorse.xml:678(para) C/seahorse.xml:776(para) C/seahorse.xml:803(para) +#: C/index.docbook:678(listitem/para) C/index.docbook:776(listitem/para) +#: C/index.docbook:803(listitem/para) msgid "Select the key from the main window," msgstr "Seleccione la clave de la ventana principal." -#: C/seahorse.xml:683(para) +#: C/index.docbook:683(listitem/para) msgid "" "Double click on it or choose Properties from the " "toolbar," @@ -965,20 +1027,20 @@ "Pulse dos veces sobre ella o elija Propiedades de la " "barra de herramientas." -#: C/seahorse.xml:688(para) +#: C/index.docbook:688(listitem/para) msgid "Select the Names and Signatures tab," msgstr "Seleccione la pestaña Nombres y firmas," -#: C/seahorse.xml:693(para) +#: C/index.docbook:693(listitem/para) msgid "Click on Add Name." msgstr "Pulse en Añadir nombre." -#: C/seahorse.xml:674(para) -msgid "To add a user ID to a key: " +#: C/index.docbook:674(sect3/para) +msgid "To add a user ID to a key: <_:itemizedlist-1/>" msgstr "" -"Para añadir una identificación de usuario a una clave: " +"Para añadir una identificación de usuario a una clave: <_:itemizedlist-1/>" -#: C/seahorse.xml:699(para) C/seahorse.xml:903(para) +#: C/index.docbook:699(sect3/para) C/index.docbook:903(sect2/para) msgid "" "After following the instructions above, you will be presented with a dialog " "to fill in. The fields are detailed below." @@ -986,32 +1048,36 @@ "Después de las instrucciones anteriores, se le presentará un diálogo para " "rellenar. Los campos se detallan a continuación." -#: C/seahorse.xml:705(guilabel) -msgid "Full Name" -msgstr "Nombre completo" +#: C/index.docbook:705(varlistentry/term) +msgid "Full Name" +msgstr "Nombre completo" -#: C/seahorse.xml:709(programlisting) +#: C/index.docbook:709(para/programlisting) #, no-wrap msgid "<first> <last>" msgstr "<nombre> <apellido>" -#: C/seahorse.xml:707(para) +#: C/index.docbook:707(listitem/para) +#| msgid "" +#| "Enter your full name in the form A middle name or " +#| "initial is optional." msgid "" -"Enter your full name in the form A middle name or initial " -"is optional." +"Enter your full name in the form <_:programlisting-1/> A middle name or " +"initial is optional." msgstr "" -"Introduzca su nombre completo en el formulario . Las " -"iniciales o un segundo son opcionales." +"Introduzca su nombre completo en el formulario <_:programlisting-1/>. Las " +"iniciales o un segundo nombre son opcionales." -#: C/seahorse.xml:714(para) +#: C/index.docbook:714(note/para) msgid "You must enter at least 5 characters in this field." msgstr "Debe introducir al menos 5 caracteres en este campo." -#: C/seahorse.xml:722(guilabel) -msgid "Email Address" -msgstr "Dirección de correo electrónico" +#: C/index.docbook:722(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Email Address" +msgstr "Dirección de correo-e" -#: C/seahorse.xml:724(para) +#: C/index.docbook:724(listitem/para) msgid "" "Your email address is how most people will locate your key on a key server " "or other key provider. Make sure it is correct before continuing." @@ -1020,20 +1086,21 @@ "las personas localizarán su clave en un servidor de claves u otro proveedor " "de claves. Antes de continuar, asegúrese de que es correcto." -#: C/seahorse.xml:735(programlisting) +#: C/index.docbook:735(para/programlisting) #, no-wrap msgid "<username>@<domainname>" msgstr "<nombre de usuario>@<nombre de dominio>" -#: C/seahorse.xml:733(para) -msgid "It should be of the form " -msgstr "Debería ser de la forma " - -#: C/seahorse.xml:742(guilabel) -msgid "Key Comment" -msgstr "Comentario de la clave" +#: C/index.docbook:733(note/para) +msgid "It should be of the form <_:programlisting-1/>" +msgstr "Debería ser de la forma <_:programlisting-1/>" + +#: C/index.docbook:742(varlistentry/term) +#| msgid "Select the Details tab." +msgid "Key Comment" +msgstr "Comentario de la clave" -#: C/seahorse.xml:744(para) +#: C/index.docbook:744(listitem/para) msgid "" "The comment field can be used to place any additional information into the " "displayed name of your new ID. This information can be searched for on key " @@ -1043,11 +1110,11 @@ "adicional en el nombre mostrado de su nueva identidad. Esta información se " "puede buscar en los servidores de claves." -#: C/seahorse.xml:758(title) +#: C/index.docbook:758(sect2/title) msgid "Photo IDs" msgstr "Identificación fotográfica" -#: C/seahorse.xml:759(para) +#: C/index.docbook:759(sect2/para) msgid "" "Photo IDs allow a key owner to embed one or more pictures of themselves in a " "key. These identities can be signed just like normal user IDs. A photo ID " @@ -1060,12 +1127,7 @@ "fotográfica debe estar en formato JPEG y se recomienda que no sea más grande " "de 240x288 píxeles." -#: C/seahorse.xml:763(para) -#| msgid "" -#| "If the chosen image is not of the required file type or size " -#| "Passwords and Encryption Keys can resize and " -#| "convert it on the fly from any image format supported by the " -#| "GDK library." +#: C/index.docbook:763(sect2/para) msgid "" "If the chosen image is not of the required file type or size " "Passwords and Keys can resize and convert it on " @@ -1077,50 +1139,56 @@ "convertirla al vuelo a un formato de imagen soportado por la biblioteca " "GDK." -#: C/seahorse.xml:771(title) +#: C/index.docbook:771(sect2/title) msgid "Changing the Passphrase" msgstr "Cambiar la frase de paso" -#: C/seahorse.xml:786(para) +#: C/index.docbook:786(listitem/para) msgid "Click on Change Passphrase." msgstr "Pulse en Cambiar frase de paso." -#: C/seahorse.xml:772(para) -msgid "To change the passphrase assigned to a key: " -msgstr "Para cambiar la frase de paso asignada a una clave: " +#: C/index.docbook:772(sect2/para) +#| msgid "To change the passphrase assigned to a key: " +msgid "To change the passphrase assigned to a key: <_:itemizedlist-1/>" +msgstr "" +"Para cambiar la frase de paso asignada a una clave: <_:itemizedlist-1/>" -#: C/seahorse.xml:792(para) +#: C/index.docbook:792(sect2/para) msgid "Enter the new passphrase and click OK." msgstr "" "Introduzca la nueva frase de paso y pulse Aceptar." -#: C/seahorse.xml:798(title) +#: C/index.docbook:798(sect2/title) msgid "Deleting a Key" -msgstr "Borrar una clave" +msgstr "Eliminar una clave" -#: C/seahorse.xml:808(para) +#: C/index.docbook:808(listitem/para) +#| msgid "" +#| "Right click on it and choose Delete Key or choose " +#| "EditDelete Key." msgid "" "Right click on it and choose Delete Key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" -"Pulse con el botón derecho sobre ella y elija Borrar clave o elija EditarBorrar " +"Pulse con el botón derecho sobre ella y elija Eliminar clave o elija EditarEliminar " "clave." -#: C/seahorse.xml:799(para) -msgid "To delete a key from your keyring: " -msgstr "Para borrar una clave de su depósito de claves: " +#: C/index.docbook:799(sect2/para) +msgid "To delete a key from your keyring: <_:itemizedlist-1/>" +msgstr "Para eliminar una clave de su depósito de claves: <_:itemizedlist-1/>" -#: C/seahorse.xml:820(para) +#: C/index.docbook:820(note/para) msgid "You can delete your keys, trusted keys and collected keys." -msgstr "Puede borrar sus claves, claves confiadas y claves coleccionadas." +msgstr "Puede eliminar sus claves, claves confiadas y claves coleccionadas." -#: C/seahorse.xml:830(title) +#: C/index.docbook:830(sect1/title) msgid "OpenPGP Subkey Properties" msgstr "Propiedades de las subclaves OpenPGP" -#: C/seahorse.xml:831(para) +#: C/index.docbook:831(sect1/para) msgid "" "Each OpenPGP key has a single master key used to sign only. Subkeys are used " "to encrypt and to sign as well. In this way, if your sub key is compromised, " @@ -1130,15 +1198,15 @@ "Las subclaves se usan tanto para cifrar como para firmar. En este sentido, " "si su subclave está comprometida, no necesita revocar su clave maestra." -#: C/seahorse.xml:839(guilabel) -msgid "ID" -msgstr "ID" +#: C/index.docbook:839(varlistentry/term) +msgid "ID" +msgstr "ID" -#: C/seahorse.xml:841(para) +#: C/index.docbook:841(listitem/para) msgid "This is the identifier of the subkey." msgstr "Este es el identificador de la subclave." -#: C/seahorse.xml:849(para) +#: C/index.docbook:849(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a subkey. DSA keys can only sign, ElGamal keys are used to encrypt while " @@ -1149,27 +1217,30 @@ "para cifrar, mientras que las claves RSA se usan para " "firmar o cifrar." -#: C/seahorse.xml:874(guilabel) -msgid "Status" -msgstr "Estado" +#: C/index.docbook:874(varlistentry/term) +msgid "Status" +msgstr "Estado" -#: C/seahorse.xml:876(para) +#: C/index.docbook:876(listitem/para) msgid "Indicates the status of the key." msgstr "Indica el estado de la clave." -#: C/seahorse.xml:884(para) +#: C/index.docbook:884(listitem/para) +#| msgid "" +#| "Indicates the length in bits of the key. In general the longer the key, " +#| "the more security it provides. " msgid "" "Indicates the length in bits of the key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Indica la longitud en bits de la clave. En general, cuanto más larga es la " -"clave, más seguridad proporciona. " +"clave, más seguridad proporciona. <_:note-1/>" -#: C/seahorse.xml:898(title) +#: C/index.docbook:898(sect2/title) msgid "Adding a Subkey" msgstr "Añadir una subclave" -#: C/seahorse.xml:899(para) +#: C/index.docbook:899(sect2/para) msgid "" "To add a subkey to a key, from the Subkeys section " "click on Add button." @@ -1177,15 +1248,15 @@ "Para añadir una subclave a una clave, desde la sección Subclaves pulse el botón Añadir." -#: C/seahorse.xml:909(term) +#: C/index.docbook:909(varlistentry/term) msgid "Key Type" msgstr "Tipo de clave" -#: C/seahorse.xml:911(para) +#: C/index.docbook:911(listitem/para) msgid "Specifies the encryption algorithm used to generate a subkey." msgstr "Especifica el algoritmo de cifrado usado para general la subclave." -#: C/seahorse.xml:918(para) +#: C/index.docbook:918(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the subkey. This subkey can sign only." @@ -1193,11 +1264,11 @@ "Use el Use el Algoritmo de firma digital (DSA) para crear la subclave. Esta subclave sólo puede firmar." -#: C/seahorse.xml:926(term) +#: C/index.docbook:926(varlistentry/term) msgid "ElGamal" msgstr "ElGamal" -#: C/seahorse.xml:928(para) +#: C/index.docbook:928(listitem/para) msgid "" "Use the ElGamal algorithm to create the subkey. This " "subkey can encrypt only." @@ -1205,7 +1276,11 @@ "Use el algoritmo ElGamal para crear la subclave. Esta " "subclave sólo puede cifrar." -#: C/seahorse.xml:937(para) +#: C/index.docbook:935(varlistentry/term) +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:937(listitem/para) msgid "" "Use the Rivest-Shamir Adleman (RSA) " "algorithm to create the subkey. This subkey can be used to sign or encrypt, " @@ -1215,11 +1290,11 @@ "acronym>) para crear la subclave. Esta subclave se puede usar para firmar o " "cifrar, pero debe crear dos subclaves diferentes." -#: C/seahorse.xml:948(term) +#: C/index.docbook:948(varlistentry/term) msgid "Key Length" msgstr "Longitud de la clave" -#: C/seahorse.xml:950(para) +#: C/index.docbook:950(listitem/para) msgid "" "Indicates the length in bits of the subkey. In general the longer the key, " "the more security it provides." @@ -1227,19 +1302,19 @@ "Indica la longitud de una subclave en bits. En general, cuanto más larga es " "la clave, más seguridad proporciona." -#: C/seahorse.xml:959(para) +#: C/index.docbook:959(listitem/para) msgid "Indicates the date the subkey can no longer be used." msgstr "Indica la fecha a partir de la cual la subclave no se puede usar más." -#: C/seahorse.xml:968(title) +#: C/index.docbook:968(sect2/title) msgid "Changing a Subkey Expiration Date" msgstr "Cambiar la fecha de caducidad de una subclave" -#: C/seahorse.xml:975(para) +#: C/index.docbook:975(listitem/para) msgid "Click on the Expire button on the left," msgstr "Pulse en el botón Caducidad en la izquierda," -#: C/seahorse.xml:980(para) +#: C/index.docbook:980(listitem/para) msgid "" "From the date dialog choose the new expiration date or select " "Never expires for no expiration date." @@ -1247,128 +1322,134 @@ "Elija la nueva fecha de caducidad del diálogo o seleccione nunca " "caduca para que no exista fecha de caducidad." -#: C/seahorse.xml:969(para) +#: C/index.docbook:969(sect2/para) +#| msgid "" +#| "To change a subkey expiration date, select the subkey from the " +#| "Subkeys section, then: " msgid "" "To change a subkey expiration date, select the subkey from the " -"Subkeys section, then: " +"Subkeys section, then: <_:itemizedlist-1/>" msgstr "" "Para cambiar la fecha de caducidad de una subclave, elija la subclave de la " -"sección Subclaves, después: " +"sección Subclaves y: <_:itemizedlist-1/>" -#: C/seahorse.xml:990(title) +#: C/index.docbook:990(sect2/title) msgid "Revoking a Subkey" msgstr "Revocar una subclave" -#: C/seahorse.xml:996(para) +#: C/index.docbook:996(listitem/para) msgid "Click on the Revoke button on the left," msgstr "Pulse en el botón de Revocar en la izquierda," -#: C/seahorse.xml:1001(para) +#: C/index.docbook:1001(listitem/para) msgid "Choose a reason why to revoke the subkey:" msgstr "Elija una razón para revocar la subclave:" -#: C/seahorse.xml:1007(term) +#: C/index.docbook:1007(varlistentry/term) msgid "No Reason" msgstr "No hay motivos" -#: C/seahorse.xml:1009(para) +#: C/index.docbook:1009(listitem/para) msgid "There isn't a specific reason to revoke the key." msgstr "No existe una razón específica para revocar la clave." -#: C/seahorse.xml:1015(term) +#: C/index.docbook:1015(varlistentry/term) msgid "Compromised" msgstr "Comprometida" -#: C/seahorse.xml:1017(para) +#: C/index.docbook:1017(listitem/para) msgid "The key has been compromised." msgstr "La clave está comprometida." -#: C/seahorse.xml:1023(term) +#: C/index.docbook:1023(varlistentry/term) msgid "Superseded" msgstr "Reemplazada" -#: C/seahorse.xml:1025(para) +#: C/index.docbook:1025(listitem/para) msgid "The key has been superseded by another one." msgstr "La clave ha sido reemplazada por otra." -#: C/seahorse.xml:1031(term) +#: C/index.docbook:1031(varlistentry/term) msgid "Not Used" msgstr "Sin uso" -#: C/seahorse.xml:1033(para) +#: C/index.docbook:1033(listitem/para) msgid "The key is not used anymore." msgstr "La clave no se usa más." -#: C/seahorse.xml:1042(para) +#: C/index.docbook:1042(listitem/para) msgid "Enter a description of why you are revoking the key," msgstr "Introduzca una descripción de porqué está revocando la clave," -#: C/seahorse.xml:1047(para) +#: C/index.docbook:1047(listitem/para) msgid "Click on Revoke." msgstr "Pulse en Revocar." -#: C/seahorse.xml:991(para) +#: C/index.docbook:991(sect2/para) +#| msgid "" +#| "To revoke a subkey, select the subkey from the Subkeys section, then: " msgid "" "To revoke a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" "Para revocar una subclave, seleccione la subclave de la sección " -"Subclaves, después: " +"Subclaves y: <_:itemizedlist-1/>" -#: C/seahorse.xml:1054(para) +#: C/index.docbook:1054(note/para) msgid "The effect of revoking a subkey is immediate." msgstr "El efecto de revocar una subclave es inmediato." -#: C/seahorse.xml:1061(title) +#: C/index.docbook:1061(sect2/title) msgid "Deleting a Subkey" -msgstr "Borrar una subclave" +msgstr "Eliminar una subclave" -#: C/seahorse.xml:1067(para) +#: C/index.docbook:1067(listitem/para) msgid "Click on the Delete button on the left." -msgstr "Pulse en el botón Borrar en la izquierda." +msgstr "Pulse en el botón Eliminar en la izquierda." -#: C/seahorse.xml:1062(para) +#: C/index.docbook:1062(sect2/para) msgid "" "To delete a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" -"Para borrar una subclave, seleccione la subclave de la sección " -"Subclaves, después: " +"Para eliminar una subclave, seleccione la subclave de la sección " +"Subclaves, después: <_:itemizedlist-1/>" -#: C/seahorse.xml:1079(title) +#: C/index.docbook:1079(sect1/title) msgid "Secure Shell Key Properties" msgstr "Propiedades de las claves de shell seguras (SSH)" -#: C/seahorse.xml:1080(para) +#: C/index.docbook:1080(sect1/para) msgid "" "The descriptions in this section apply to all SSH keys." msgstr "" "Las descripciones en esta sección se aplican a todas las claves " "SSH." -#: C/seahorse.xml:1087(para) +#: C/index.docbook:1087(listitem/para) msgid "Select the Secure Shell key from the main window," msgstr "Seleccione la clave de shell segura de la ventana principal," -#: C/seahorse.xml:1083(para) -msgid "To view properties of a SSH key: " +#: C/index.docbook:1083(sect1/para) +msgid "To view properties of a SSH key: <_:itemizedlist-1/>" msgstr "" -"Para ver las propiedades de una clave SSH: " +"Para ver las propiedades de una clave SSH: <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:1120(guilabel) -msgid "Algorithm" -msgstr "Algoritmo" +#: C/index.docbook:1120(varlistentry/term) +msgid "Algorithm" +msgstr "Algoritmo" -#: C/seahorse.xml:1122(para) +#: C/index.docbook:1122(listitem/para) msgid "Specifies the encryption algorithm used to generate a key." msgstr "Especifica el algoritmo de cifrado a usar para generar una clave." -#: C/seahorse.xml:1129(guilabel) -msgid "Location" -msgstr "Ubicación" +#: C/index.docbook:1129(varlistentry/term) +msgid "Location" +msgstr "Ubicación" -#: C/seahorse.xml:1131(para) +#: C/index.docbook:1131(listitem/para) msgid "" "This is the location where the private key has been " "stored." @@ -1376,109 +1457,129 @@ "Esta es la ubicación donde se ha almacenado la clave privada." -#: C/seahorse.xml:1159(title) +#: C/index.docbook:1159(sect2/title) msgid "Deleting a Secure Shell Key" -msgstr "Borrar una clave de shell segura (SSH)" +msgstr "Eliminar una clave de shell segura (SSH)" -#: C/seahorse.xml:1164(para) +#: C/index.docbook:1164(listitem/para) msgid "Select the SSH key from the main window," msgstr "Seleccione la clave SSH de la ventana principal," -#: C/seahorse.xml:1169(para) +#: C/index.docbook:1169(listitem/para) +#| msgid "" +#| "Right click on it and choose Delete key or choose " +#| "EditDelete Key." msgid "" "Right click on it and choose Delete key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" -"Pulse con el botón derecho y elija Borrar clave o elija " -"EditarBorrar claveEliminar clave o " +"elija EditarEliminar clave." -#: C/seahorse.xml:1160(para) -msgid "To delete a Secure Shell key: " -msgstr "Para borrar una clave de shell segura: " +#: C/index.docbook:1160(sect2/para) +msgid "To delete a Secure Shell key: <_:itemizedlist-1/>" +msgstr "Para eliminar una clave de shell segura: <_:itemizedlist-1/>" -#: C/seahorse.xml:1185(title) +#: C/index.docbook:1185(sect1/title) msgid "Importing Keys" msgstr "Importar claves" -#: C/seahorse.xml:1186(para) -msgid "" -"To import keys choose FileImport and select, from the " -"file chooser, a file containing at least one ASCII armored public key." +#: C/index.docbook:1186(sect1/para) +#| msgid "" +#| "To import keys choose FileImport and select, from " +#| "the file chooser, a file containing at least one ASCII armored public key." +msgid "" +"To import keys choose File " +"Import and select, from the file " +"chooser, a file containing at least one ASCII armored public key." msgstr "" "Para importar claves elija ArchivoImportar y seleccione, del " "selector de archivos, un archivo que contenga al menos una clave pública con " "armadura ASCII." -#: C/seahorse.xml:1197(para) +#: C/index.docbook:1197(listitem/para) msgid "Select an ASCII armored public block of text," msgstr "Seleccione un bloque de texto público con armadura ASCII," -#: C/seahorse.xml:1202(para) +#: C/index.docbook:1202(listitem/para) msgid "Copy it to the clipboard," msgstr "Cópielo al portapapeles," -#: C/seahorse.xml:1207(para) +#: C/index.docbook:1207(listitem/para) +#| msgid "" +#| "Choose EditPaste Keys." msgid "" -"Choose EditPaste Keys." +"Choose Edit Paste Keys ." msgstr "" "Elija EditarPegar claves." -#: C/seahorse.xml:1193(para) +#: C/index.docbook:1193(sect1/para) #| msgid "" #| "Importing can also be performed by pasting the keys inside " -#| "Passwords and Encryption Keys: " +#| "Passwords and Keys: " msgid "" "Importing can also be performed by pasting the keys inside " -"Passwords and Keys: " +"Passwords and Keys: <_:itemizedlist-1/>" msgstr "" "Las claves también se pueden importar pegándolas en Contraseñas " -"y claves: " +"y claves: <_:itemizedlist-1/>" -#: C/seahorse.xml:1222(title) +#: C/index.docbook:1222(sect1/title) msgid "Exporting Keys" msgstr "Exportar claves" -#: C/seahorse.xml:1223(para) +#: C/index.docbook:1223(sect1/para) +#| msgid "" +#| "To export keys, select the keys in the main window and choose " +#| "FileExport." msgid "" -"To export keys, select the keys in the main window and choose " -"FileExport." +"To export keys, select the keys in the main window and choose " +"File Export ." msgstr "" "Para exportar claves, seleccione las claves en la ventana principal y elija " "ArchivoExportar." -#: C/seahorse.xml:1236(para) +#: C/index.docbook:1236(listitem/para) msgid "Select the keys in the main window," msgstr "Seleccione las claves en la ventana principal," -#: C/seahorse.xml:1241(para) +#: C/index.docbook:1241(listitem/para) +#| msgid "" +#| "Choose EditCopy Keys." msgid "" -"Choose EditCopy Keys." +"Choose Edit Copy Keys ." msgstr "" "Elija EditarCopiar claves." -#: C/seahorse.xml:1231(para) +#: C/index.docbook:1231(sect1/para) +#| msgid "" +#| "You can also export keys to the clipboard in an ASCII armored block of " +#| "text: " msgid "" "You can also export keys to the clipboard in an ASCII armored block of text: " -"" +"<_:itemizedlist-1/>" msgstr "" "También puede exportar claves al portapapeles en un bloque de texto con " -"armadura ASCII: " +"armadura ASCII: <_:itemizedlist-1/>" -#: C/seahorse.xml:1257(title) +#: C/index.docbook:1257(sect1/title) msgid "Signing a Key" msgstr "Firmar claves" -#: C/seahorse.xml:1258(para) +#: C/index.docbook:1258(sect1/para) msgid "" "Signing another person's key means you are giving trust to that person. " "Before signing a key, you have to carefully check the key's fingerprint to " @@ -1488,7 +1589,7 @@ "persona. Antes de firmar una clave, debe comprobar cuidadosamente la huella " "de la clave, asegúrese de que la clave realmente pertenece a esa persona." -#: C/seahorse.xml:1267(para) +#: C/index.docbook:1267(listitem/para) msgid "" "Select the key you want to sign from the Trusted Keys " "or Other Collected Keys tabs," @@ -1496,21 +1597,24 @@ "Seleccione la clave que quiere firmar de las pestañas Claves " "confiadas u Otras claves reunidas," -#: C/seahorse.xml:1274(para) +#: C/index.docbook:1274(listitem/para) +#| msgid "" +#| "Choose Sign from the toolbar or " +#| "FileSign," msgid "" -"Choose Sign from the toolbar or " -"FileSign," +"Choose Sign from the toolbar or " +"File Sign ," msgstr "" "Elija Firmar de la barra de herramientas o " "ArchivoFirmar," -#: C/seahorse.xml:1283(para) +#: C/index.docbook:1283(listitem/para) msgid "Select how carefully the key has been checked," msgstr "Seleccione con qué minuciosidad ha comprobado la clave," -#: C/seahorse.xml:1288(para) +#: C/index.docbook:1288(listitem/para) msgid "" "Indicate if the signature should be local to your keyring, and if your " "signature can be revoked," @@ -1518,28 +1622,28 @@ "Indica si la firma debería ser local a su depósito de claves y si su firma " "puede revocarse," -#: C/seahorse.xml:1294(para) +#: C/index.docbook:1294(listitem/para) msgid "Click on Sign." msgstr "Pulse Firmar." -#: C/seahorse.xml:1263(para) -msgid "To sign a key in your keyring: " -msgstr "Para firmar una clave en su depósito de claves: " +#: C/index.docbook:1263(sect1/para) +msgid "To sign a key in your keyring: <_:itemizedlist-1/>" +msgstr "Para firmar una clave en su depósito de claves: <_:itemizedlist-1/>" -#: C/seahorse.xml:1305(title) +#: C/index.docbook:1305(sect1/title) msgid "Preferences" msgstr "Preferencias" -#: C/seahorse.xml:1306(para) +#: C/index.docbook:1306(sect1/para) #| msgid "" #| "This section describes the preferences settable in Passwords " -#| "and Encryption Keys by choosing Edit by choosing EditPreferences from within " -#| "Passwords and Encryption Keys." +#| "Passwords and Keys." msgid "" "This section describes the preferences settable in Passwords " -"and Keys by choosing EditPreferences from within " +"and Keys by choosing Edit " +"Preferences from within " "Passwords and Keys." msgstr "" "Esta sección describe las preferencias configurables en " @@ -1547,15 +1651,15 @@ "EditarPreferencias en Contraseñas y claves." -#: C/seahorse.xml:1315(title) +#: C/index.docbook:1315(sect2/title) msgid "Password Keyrings" msgstr "Depósitos de claves" -#: C/seahorse.xml:1317(title) +#: C/index.docbook:1317(sect3/title) msgid "Creating Keyrings" msgstr "Crear depósitos" -#: C/seahorse.xml:1318(para) +#: C/index.docbook:1318(sect3/para) msgid "" "To create a new keyring, from the menu choose FileNew and choose " @@ -1567,11 +1671,11 @@ "Depósito de contraseñas. Introduzca un nombre para el " "depósito nuevo y pulse intro." -#: C/seahorse.xml:1323(title) +#: C/index.docbook:1323(sect3/title) msgid "Changing Keyring Passwords" msgstr "Cambiar las contraseñas de los depósitos de claves" -#: C/seahorse.xml:1324(para) +#: C/index.docbook:1324(sect3/para) msgid "" "To change the unlock password of the keyring, first select the appropriate " "keyring and then press Change Unlock Password button. " @@ -1594,25 +1698,29 @@ "obtendrá un mensaje de estado indicando el éxito de la operación. Si la " "contraseña antigua no es correcta se le pedirá que la compruebe." -#: C/seahorse.xml:1338(title) +#: C/index.docbook:1338(sect3/title) msgid "Removing Keyrings" msgstr "Quitar depósitos de claves" -#: C/seahorse.xml:1339(para) +#: C/index.docbook:1339(sect3/para) +#| msgid "" +#| "To remove a keyring, first select the appropriate keyring and then from " +#| "the menu choose EditDelete." msgid "" "To remove a keyring, first select the appropriate keyring and then from the " -"menu choose EditDeleteEdit Delete." msgstr "" "Para quitar un depósito primero seleccione el depósito apropiado y después, " -"del menú, elija EditarBorrarEditarEliminar." -#: C/seahorse.xml:1347(title) +#: C/index.docbook:1347(sect2/title) msgid "Key Servers" msgstr "Servidores de claves" -#: C/seahorse.xml:1348(para) +#: C/index.docbook:1348(sect2/para) msgid "" "Keep your and other's keys up to date by syncing keys periodically with " "remote keyservers. Syncing will make sure that you have the latest " @@ -1624,10 +1732,7 @@ "de que tiene las últimas firmas en todas sus claves de tal forma que la red " "de confianza será más útil." -#: C/seahorse.xml:1354(para) -#| msgid "" -#| "Passwords and Encryption Keys provides support " -#| "for HKP and LDAP keyservers." +#: C/index.docbook:1354(sect2/para) msgid "" "Passwords and Keys provides support for HKP and " "LDAP keyservers." @@ -1635,11 +1740,11 @@ "Contraseñas y claves proporciona soporte para " "servidores de claves HKP y LDAP." -#: C/seahorse.xml:1359(emphasis) -msgid "HKP Servers" -msgstr "Servidores HKP" +#: C/index.docbook:1359(varlistentry/term) +msgid "HKP Servers" +msgstr "Servidores HKP" -#: C/seahorse.xml:1361(para) +#: C/index.docbook:1361(listitem/para) msgid "" "HKP keyservers are ordinary web based keyservers such as the popular hkp://pool.sks-keyservers." @@ -1652,15 +1757,11 @@ "http://sks-keyservers." "net." -#: C/seahorse.xml:1369(acronym) -msgid "LDAP" -msgstr "LDAP" - -#: C/seahorse.xml:1369(emphasis) -msgid " Keyservers" -msgstr " servidores de claves" +#: C/index.docbook:1369(varlistentry/term) +msgid "LDAP Keyservers" +msgstr "Servidores de claves LDAP" -#: C/seahorse.xml:1371(para) +#: C/index.docbook:1371(listitem/para) msgid "" "LDAP keyservers are less common, but use the standard " "LDAP protocol to serve keys. ldap://keyserver.pgp.com es un " "buen servidor LDAP." -#: C/seahorse.xml:1383(title) +#: C/index.docbook:1383(sect2/title) msgid "Key Sharing" msgstr "Compartición de claves" -#: C/seahorse.xml:1384(para) -#| msgid "" -#| "Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. " -#| "Enabling key sharing will add the local Passwords and " -#| "Encryption Keys users' public key rings to the remote " -#| "search dialog. Using these local \"key servers\" will most likely be " -#| "faster than accessing remote servers." +#: C/index.docbook:1384(sect2/para) msgid "" "Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. " "Enabling key sharing will add the local Passwords and KeysPasswords and Encryption Keys, its associated " -#| "plugins, the preferences applet and the panel applet are known " -#| "collectively as Seahorse. Seahorse was written by Jacob Perkins. The " -#| "current maintainers are Stef Walter and Adam Schreiber. This manual is by " -#| "Adam Schreiber. The project's web site was designed by Jim Pharis. To " -#| "find more information about Seahorse, the project , please visit the " -#| "Seahorse web page." +#: C/index.docbook:1397(sect1/para) msgid "" "Passwords and Keys, its associated plugins, the " "preferences applet and the panel applet are known collectively as Seahorse. " @@ -1728,36 +1813,175 @@ "acerca de Seahorse, el proyecto, visite la página web de Seahorse." -#: C/seahorse.xml:1404(para) +#: C/index.docbook:1404(sect1/para) msgid "" "To report a bug or make a suggestion regarding this application or this " -"manual, follow the directions in the Feedback section of the GNOME User Guide." msgstr "" -"Para informar de un fallo, o hacer alguna sugerencia concerniente a esta " -"aplicación o este manual, siga las indicaciones en la Página de comentarios de la Guía " -"del usuario de GNOME." +"Para informar de un error o hacer alguna sugerencia concerniente a esta " +"aplicación o este manual, siga las indicaciones en este página de comentarios de la Guía " +"de usuario de GNOME." -#: C/seahorse.xml:1409(para) +#: C/index.docbook:1409(sect1/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 is included with this " "documentation; another can be found in the file COPYING included with the " "source code of this program." msgstr "" -"Este programa se distribuye bajo los términos de la Licencia Pública General " -"GNU tal como la publica la Free Software Foundation; tanto en la versión 2 " -"de la Licencia, o (a su opción) cualquier otra versión posterior. Se incluye " +"Este programa se distribuye bajo los términos de la Licencia Pública General " +"GNU tal como la publica la Free Software Foundation; tanto en la versión 2 " +"de la Licencia, o (a su opción) cualquier otra versión posterior. Se incluye " " una copia de esta licencia " -"en esta documentación, otra copia se puede encontrar en el archivo COPYING " -"incluido con el código fuente de este programa." +"en esta documentación, otra copia se puede encontrar en el archivo COPYING " +"incluido con el código fuente de este programa." -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/seahorse.xml:0(None) -msgid "translator-credits" +#: C/legal.xml:9(para/ulink) +msgid "link" +msgstr "enlace" + +#: C/legal.xml:2(legalnotice/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 <_:ulink-1/> or in the file COPYING-DOCS distributed " +"with this manual." msgstr "" -"Daniel Mustieles , 2011\n" -"Jorge González , 2007-2008" +"Se concede permiso para copiar, distribuir o modificar este documento según " +"las condiciones de la GNU Free Documentation License (GFDL), Versión 1.1 o " +"cualquier versión posterior publicada por la Free Software Foundation sin " +"Secciones invariantes, Textos de portada y Textos de contraportada. " +"Encontrará una copia de la GFDL en este <_:ulink-1/> o en el archivo COPYING-" +"DOCS distribuido con este manual." + +#~ msgid "2005, 2006, 2007, 2008, 2009" +#~ msgstr "2005, 2006, 2007, 2008, 2009" + +#~ msgid "Jacob Perkins and Adam Schreiber" +#~ msgstr "Jacob Perkins y Adam Schreiber" + +#~ msgid "Jacob" +#~ msgstr "Jacob" + +#~ msgid "Perkins" +#~ msgstr "Perkins" + +#~ msgid "Adam" +#~ msgstr "Adam" + +#~ msgid "Schreiber" +#~ msgstr "Schreiber" + +#~ msgid "sadam@clemson.edu" +#~ msgstr "sadam@clemson.edu" + +#~ msgid "Paul" +#~ msgstr "Paul" + +#~ msgid "Cutler" +#~ msgstr "Cutler" + +#~ msgid "pcutler@foresightlinux.org" +#~ msgstr "pcutler@foresightlinux.org" + +#~ msgid "Passwords and Keys Manual V2.11.0" +#~ msgstr "Manual de Contraseñas y claves V2.11.0" + +#~ msgid "May 2009" +#~ msgstr "Mayo de 2009" + +#~ msgid "Passwords and Keys Manual V0.10.1" +#~ msgstr "Manual de Contraseñas y claves V0.10.1" + +#~ msgid "August 2008" +#~ msgstr "Agosto de 2008" + +#~ msgid "Passwords and Keys Manual V0.9.1" +#~ msgstr "Manual de Contraseñas y claves V0.9.1" + +#~ msgid "November 2006" +#~ msgstr "noviembre de 2006" + +#~ msgid "Passwords and Keys Manual V0.9.0" +#~ msgstr "Manual de Contraseñas y claves V.0.9.0" + +#~ msgid "July 2005" +#~ msgstr "julio de 2005" + +#~ msgid "Passwords and Keys Manual V0.7.0" +#~ msgstr "Manual de Contraseñas y claves V.7.0" + +#~ msgid "February 2003" +#~ msgstr "febrero de 2003" + +#~ msgid "Seahorse" +#~ msgstr "Seahorse" + +#~ msgid "seahorse" +#~ msgstr "seahorse" + +#~ msgid "Passwords and Keys" +#~ msgstr "Manual de Contraseñas y claves" + +#~ msgid "Show the window." +#~ msgstr "Muestra la ventana de ." + +#~ msgid "Encryption Type" +#~ msgstr "Tipo de cifrado" + +#~ msgid "DSA" +#~ msgstr "DSA" + +#~ msgid "Fingerprint" +#~ msgstr "Huella" + +#~ msgid "KeyID" +#~ msgstr "ID de la clave" + +#~ msgid "Type" +#~ msgstr "Tipo" + +#~ msgid "Created" +#~ msgstr "Creada" + +#~ msgid "Expires" +#~ msgstr "Caduca" + +#~ msgid "Strength" +#~ msgstr "Fortaleza" + +#~ msgid "Full Name" +#~ msgstr "Nombre completo" + +#~ msgid "Email Address" +#~ msgstr "Dirección de correo electrónico" + +#~ msgid "Key Comment" +#~ msgstr "Comentario de la clave" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Status" +#~ msgstr "Estado" + +#~ msgid "Algorithm" +#~ msgstr "Algoritmo" + +#~ msgid "Location" +#~ msgstr "Ubicación" + +#~ msgid "HKP Servers" +#~ msgstr "Servidores HKP" + +#~ msgid "LDAP" +#~ msgstr "LDAP" + +#~ msgid " Keyservers" +#~ msgstr " servidores de claves" diff -Nru seahorse-3.2.2/help/es/index.docbook seahorse-3.6.3/help/es/index.docbook --- seahorse-3.2.2/help/es/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/es/index.docbook 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,869 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Manual de Contraseñas y claves + 2005, 2006, 2007, 2008, 2009 Jacob Perkins and Adam Schreiber + + Proyecto Seahorse + + + + Se concede autorización para copiar, distribuir o modificar este documento según los términos de la GFDL (GNU Free Documentation License), Versión 1.1, o cualquier otra versión posterior publicada por Free Software Foundation sin secciones invariables, textos de portada ni textos de contraportada. Podrá encontrar una copia de la GFDL en este enlace o en el archivo COPYING-DOCS distribuido con este manual. + Este manual es parte de una colección de manuales de GNOME distribuido bajo la GFDL. Si quiere distribuir este manual por separado de la colección, puede hacerlo añadiendo una copia de la licencia al manual, tal como se describe en la sección 6 de la licencia. + + Muchos de los nombres usados por compañías para distinguir sus productos y servicios son mencionados como marcas comerciales. Donde esos nombres aparezcan en cualquier documentación de GNOME, y los miembros del Proyecto de Documentación de GNOME están al corriente de esas marcas comerciales, entonces los nombres se pondrán en mayúsculas o con la inicial en mayúsculas. + + EL DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN CON SUJECIÓN A LOS TÉRMINOS DE LA GFDL, QUEDANDO BIEN ENTENDIDO, ADEMÁS, QUE: + + EL DOCUMENTO SE PROPORCIONA "TAL CUAL", SIN GARANTÍA DE NINGÚN TIPO, NI EXPLÍCITA NI IMPLÍCITA INCLUYENDO, SIN LIMITACIÓN, GARANTÍA DE QUE EL DOCUMENTO O VERSIÓN MODIFICADA DE ÉSTE CAREZCA DE DEFECTOS COMERCIALES, SEA ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO EL RIESGO RELATIVO A LA CALIDAD, PRECISIÓN Y UTILIDAD DEL DOCUMENTO O SU VERSIÓN MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÓN MODIFICADA DE AQUÉL RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO EL REDACTOR INICIAL, AUTOR O CONTRIBUYENTE) ASUMIRÁ LOS COSTES DE TODA REPARACIÓN, MANTENIMIENTO O CORRECCIÓN NECESARIOS. ESTA RENUNCIA DE GARANTÍA ES UNA PARTE ESENCIAL DE ESTA LICENCIA. NO SE AUTORIZA EL USO DE NINGÚN DOCUMENTO NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO DE LA RENUNCIA;Y + + + EN NINGUNA CIRCUNSTANCIA NI SEGÚN NINGÚN ARGUMENTO LEGAL, SEA POR MOTIVOS CULPOSOS (INCLUIDA LA NEGLIGENCIA), CONTRACTUALES O DE OTRO TIPO, NI EL AUTOR, NI EL REDACTOR INICIAL, NI CUALQUIER COLABORADOR, NI CUALQUIER DISTRIBUIDOR DEL DOCUMENTO O VERSIÓN MODIFICADA DEL MISMO, NI CUALQUIER PROVEEDOR DE CUALQUIERA DE DICHAS PARTES, SERÁN RESPONSABLES, ANTE NINGÚN TERCERO, DE NINGÚN DAÑO O PERJUICIO DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O CONSIGUIENTE DE NINGÚN TIPO, INCLUIDOS, SIN LIMITACIÓN, LOS DAÑOS POR PÉRDIDA DE FONDO DE COMERCIO, INTERRUPCIÓN DEL TRABAJO, FALLO O MAL FUNCIONAMIENTO INFORMÁTICO, NI CUALQUIER OTRO DAÑO O PÉRDIDA DERIVADOS DEL USO DEL DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO, O RELACIONADO CON ELLO, INCLUSO SI SE HABÍA COMUNICADO A AQUELLA PARTE LA POSIBILIDAD DE TALES DAÑOS. + + + + + + + Jacob Perkins Proyecto Seahorse + Adam Schreiber Proyecto Seahorse
sadam@clemson.edu
+ Paul Cutler Proyecto de documentación de GNOME
pcutler@foresightlinux.org
+ + + + + Proyecto Seahorse + + + Proyecto de documentación de Gnome + + + Versión 2.11.0 del manual de Contraseñas y claves mayo de 2009 + Paul Cutler pcutler@foresightlinux.org + + Versión 0.10.1 del manual de Contraseñas y claves agosto de 2008 + Adam Schreiber sadam@clemson.edu + + Versión 0.9.1 del manual de Contraseñas y claves noviembre de 2006 + Milo Casagrande milo_casagrande@yahoo.it + + Versión 0.9.0 del manual de Contraseñas y claves julio de 2005 + Adam Schreiber sadam@clemson.edu + Proyecto Seahorse + + Versión 0.7.0 del manual de Contraseñas y claves febrero de 2003 + Jacob Perkins + Proyecto Seahorse + + + Este manual describe la versión 2.28.x de Contraseñas y claves + + Comentarios + Para informar de un error o hacer alguna sugerencia respecto de la aplicación Contraseñas y claves o este manual, siga las indicaciones en la página de comentarios de GNOME. + + + + Contraseñas y claves es la aplicación para administrar claves de cifrado para el Escritorio GNOME + + + + + + Daniel Mustieles + + daniel.mustieles@gmail.com + + + + 2011 + + 2012 + + Daniel Mustieles + + + + + Jorge González + + jorgegonz@svn.gnome.org + + + + 2007-2008 + + Jorge González + + + + Seahorse + + seahorse + + Claves de cifrado + + + + + Introducción + Puede usar Contraseñas y claves para crear y administrar claves PGP y SSH. + Contraseñas y claves proporciona un interfaz para muchas de las características de Gnu Privacy Guard (GPG) y se integra con muchos de los componentes del escritorio GNOME. + Con Contraseñas y claves puede: + + + Crear y administrar claves PGP y SSH, + + + Exportar e importar claves PGP y SSH, + + + Compartir sus claves con otros, + + + + + + + + Inicio + + Iniciar <application>Contraseñas y claves</application> + Puede iniciar Contraseñas y claves de las siguientes formas: + + + Menú Aplicaciones + + Elija AccesoriosContraseñas y claves. + + + + Línea de comandos + + Escriba seahorse y después pulse Retorno. + + + + + + + Iniciar <application>Contraseñas y claves</application> + Al iniciar Contraseñas y claves, se mostrará la ventana de Contraseñas y claves. + +
+ La ventana de <application>Contraseñas y claves</application> + + Muestra la ventana de Contraseñas y claves window. + +
+ + La ventana de Contraseñas y claves contiene los siguientes elementos: + + + Barra de menú + + Los menús de la barra de menú contienen todos los comandos que necesita para realizar tareas con Contraseñas y claves. + + + Barra de herramientas + + Use la barra de herramientas para acceder rápidamente a los comandos más usados. + + + Pestañas de claves y contraseñas + + Proporciona acceso a las claves y contraseñas en el depósito de claves. + + + Opciones noveles + + Proporciona acceso rápido a acciones útiles para los usuarios noveles. Desde aquí puede: + + + Navegar por el sistema de ayuda, + + + Importar claves al depósito, + + + Crear claves nuevas. + + + + + + + + + + + + Crear claves OpenPGP + OpenPGP es un protocolo no propietario para cifrar correo electrónico usando claves criptográficas públicas basadas en PGP. Define formatos estándar para los mensajes cifrados, firmas, claves públicas y certificados para intercambiar claves públicas. + La criptografía de clave pública es un concepto que involucra el uso de dos claves: una clave pública, que puede dar a cualquiera con el que quiera comunicarse, y una clave privada que es privada y debe mantenerse en secreto. + Para crear claves OpenPGP: + + Elija ArchivoNueva... + + + Seleccione Clave PGP y pulse Continuar + + + Introduzca su nombre completo (nombre - apellido), su dirección de correo electrónico y cualquier información adicional. También puede especificar opciones avanzadas para la clave: vea más abajo. + + + Pulse Crear para crear el nuevo par de claves. + + + Se abrirá el diálogo Frase de paso para la nueva clave PGP. Introduzca dos veces la frase de paso para su nueva clave. + + + + Use procedimientos similares para generar claves fuertes cuando elija una frase de paso. La principal diferencia entre una contraseña y una frase de paso es que en una frase de paso los espacios son caracteres válidos. + + + + Opciones avanzadas + Expanda la sección Opciones avanzadas de la clave para especificar las siguientes opciones para una nueva clave: + + + Tipo de cifrado + + Este campo especifica los algoritmos de cifrado usados para generar sus claves. + + + DSA ElGamal + + Esta es la opción sugerida ya que le permite cifrar, descifrar, firmar y verificar cuando sea necesario. + + + + DSA + + Sólo permite firmado. + + + + RSA + + Sólo permite firmado. + + + + + + + Fortaleza de la clave (bits) + + Esta es la longitud de la clave en bits. Cuanto más larga sea la clave más segura será, proporcionando una frase de paso fuerte. No obstante, realizar operaciones con una clave más larga requerirá más tiempo que si usa una clave más corta. Los valores aceptables están entre los 1024 y 4096 bits. Se recomiendan 2048 bits al menos. + + + + Fecha de expiración + + Esta es la fecha en la que la clave dejará de ser útil para realizar cifrado u operaciones de firma. 6 meses es un tiempo razonable para ello. Tendrá que cambiar la fecha de caducidad o generar una nueva clave o subclave después de que pase este espacio de tiempo. + Firme su nueva clave con la vieja antes de que caduque para preservar su estado de confianza. + + + + + + + + + + + Crear claves de shell seguras + Las claves de shell seguras (SSH) es una forma de registrarse en un equipo remoto para ejecutar comandos en esa máquina. Las claves SSH se usan en sistemas de autenticación basados en claves, como una alternativa al sistema de autenticación predeterminado basado en contraseña. Con el sistema de autenticación basado en clave no existe la necesidad de escribir una contraseña para autenticarse. + Las claves SSH se componen de dos claves, una clave privada, que se debe mantener en secreto, y una clave pública que puede ser cargada en cualquier equipo que necesite acceder. + Para crear una clave de shell segura: + + + Elija ArchivoNueva... + + + Seleccione Clave de shell segura y pulse Continuar + + + Introduzca una descripción para lo que debe usarse la clave. Puede usar su correo electrónico o algo que le sirva para recordarlo. También puede especificar opciones avanzadas para la clave: vea más abajo. + + + Pulse Sólo crear la clave para crear la nueva clave, o Crear y configurar para crear la clave y configurar otro equipo para usar la autenticación. + + + Se abrirá el diálogo Frase de paso para la nueva clave de shell segura. Introduzca la frase de paso dos veces para su nueva clave. + + Use procedimientos similares para generar claves fuertes cuando elija una frase de paso. La principal diferencia entre una contraseña y una frase de paso es que en una frase de paso los espacios son caracteres válidos. + + + + + + + + Opciones avanzadas + Expanda la sección Opciones avanzadas de la clave para especificar las siguientes opciones para una nueva clave: + + + + Tipo de cifrado + + Este campo especifica los algoritmos de cifrado usados para generar su clave. + + + RSA + + Use el algoritmo Rivest-ShamirAdleman (RSA) para crear la clave SSH. Esta es la elección preferida y más segura. + + + + DSA + + Use el Algoritmo de firma digital (DSA) para crear la clave SSH. + + + + + + + Fortaleza de la clave (bits) + + Esta es la longitud de la clave en bits. Cuanto más larga sea la clave más segura será, proporcionando una frase de paso fuerte. No obstante, realizar operaciones con una clave más larga requerirá más tiempo que si usa una clave más corta. Los valores aceptables están entre los 1024 y 4096 bits. Se recomiendan 2048 bits al menos. + + + + + + + + + + Propiedades de la clave OpenPGP + Las descripciones en esta sección se aplican a todas las claves OpenPGP. + + Para ver las propiedades de una clave PGP: + + Seleccione la clave PGP de la ventana del menú principal, + + + Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas, + + + Seleccione la pestaña Detalles. + + + + + Propiedades + + + + Huella + + La huella es una cadena de caracteres única que identifica exactamente a la clave. + + + + ID de la clave + + La ID de la clave es similar a la huella. No obstante la ID de la clave sólo contiene los últimos 8 caracteres de la huella. La mayoría de las veces es posible identificar una clave sólo con la ID de la clave, pero ocasionalmente dos claves pueden tener la misma ID. + + + + Tipo + + Especifica el algoritmo de cifrado usado para generar la clave. Las claves DSA sólo pueden firmar. Las claves ElGamal se usan para cifrar. + + + + Creada + + Indica la fecha en la que la clave fue creada. + + + + Expira + + Indica la fecha a partir de la cual la clave no se puede usar más. + + + + Fortaleza + + Indica la longitud de una clave en bits. En general, cuanto más larga es la clave, más seguridad proporciona. + Una clave larga no es suficiente para sustituir el uso de una frase de paso débil. + + + + + + + + + Confianza + La confianza es un indicador de cómo de seguro está sobre la habilidad de una persona para extender correctamente la red de confianza. Cuando se enfrente a una clave que no haya firmado, la validez de la clave de esa persona estará determinada en base a las firmas que haya coleccionado y de cuánto confía en esas personas que han usado sus firmas. De forma predeterminada, una clave desconocida requiere 3 firmas con cierta confianza marginal o una 1 firma de plena confianza. + + Desconocido: No sabe con certeza la habilidad de la persona para firmar claves correctamente. + Nunca: Esta persona no puede firmar claves correctamente. + Marginal: Esta persona comprueba una identificación fotográfica antes de firmar una clave, pero no escrutina la identificación necesariamente. + Completa: Esta persona escrutina cada una de las fotos de identificación de cada persona antes de firmarlas (ej. sólo firman claves que verdaderamente pertenezcan a esa persona, preguntando por la firma). + Máximo: Este nivel de confianza sólo se debería asignar a sus propias claves. + + + + + Activar y desactivar claves + Cuando se activa una clave, se puede usar para realizar operaciones de cifrado. Cuando se desactiva una clave, no se puede usar para cifrar o comprobar firmas realizadas con ella. + + + + Fecha de caducidad + Una clave no se podrá seguir usando para realizar operaciones después de que haya caducado. Cambiar la fecha de expiración de una clave a un punto futuro la reactivará. Una buena práctica general sería tener una clave maestra que nunca caduca y múltiples subclaves que estuviesen firmadas por la clave maestra. + + + + Identificación de usuarios + Las identificaciones de usuario permiten que una sola clave se use para múltiples identidades y correos electrónicos. + Generalmente toman la forma de: Nombre (comentario) <correo electrónico> + + + Añadir una identidad de usuario + Añadir una identidad de usuario es útil cuando quiere tener una identidad para su trabajo y otra para sus amigos. + Para añadir una identificación de usuario a una clave: + + Seleccione la clave de la ventana principal. + + + Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas. + + + Seleccione la pestaña Nombres y firmas, + + + Pulse en Añadir nombre. + + + Después de las instrucciones anteriores, se le presentará un diálogo para rellenar. Los campos se detallan a continuación. + + + Nombre completo + + Introduzca su nombre completo en el formulario <nombre> <apellido>. Las iniciales o un segundo nombre son opcionales. + + + Debe introducir al menos 5 caracteres en este campo. + + + + + + Dirección de correo-e + + La dirección de su correo electrónico es la forma en la que la mayoría de las personas localizarán su clave en un servidor de claves u otro proveedor de claves. Antes de continuar, asegúrese de que es correcto. + + + Debería ser de la forma <username>@<domainname> + + + + + + Comentario de la clave + + El campo de comentario se puede usar para añadir cualquier información adicional en el nombre mostrado de su nueva identidad. Esta información se puede buscar en los servidores de claves. + + + + + + + + Identificación fotográfica + La identificación fotográfica permite al propietario de una clave empotrar una o más fotografías de si mismos en una clave. Estas identidades pueden estar firmadas al igual que las identidades de usuario. Una identificación fotográfica debe estar en formato JPEG y se recomienda que no sea más grande de 240x288 píxeles. + Si la imagen elegida no es del tipo de archivo o tamaño requeridos, Contraseñas y claves puede redimensionarla y convertirla al vuelo a un formato de imagen soportado por la biblioteca GDK. + + + + Cambiar la frase de paso + Para cambiar la frase de paso asignada a una clave: + + Seleccione la clave de la ventana principal. + + + Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas, + + + Pulse en Cambiar frase de paso. + + + Introduzca la nueva frase de paso y pulse Aceptar. + + + + Eliminar una clave + Para eliminar una clave de su depósito de claves: + + Seleccione la clave de la ventana principal. + + + Pulse con el botón derecho sobre ella y elija Eliminar clave o elija EditarEliminar clave. + + + + Puede eliminar sus claves, claves confiadas y claves coleccionadas. + + + + + + + + Propiedades de las subclaves OpenPGP + Cada clave OpenPGP tiene una sola clave maestra que sólo se usa para firmar. Las subclaves se usan tanto para cifrar como para firmar. En este sentido, si su subclave está comprometida, no necesita revocar su clave maestra. + + + ID + + Este es el identificador de la subclave. + + + + Tipo + + Especifica el algoritmo de cifrado usado para generar la subclave. Las claves DSA sólo pueden firmar, las claves ElGamal se usan para cifrar, mientras que las claves RSA se usan para firmar o cifrar. + + + + Creada + + Indica la fecha en la que la clave fue creada. + + + + Expira + + Indica la fecha a partir de la cual la clave no se puede usar más. + + + + Estado + + Indica el estado de la clave. + + + + Fortaleza + + Indica la longitud en bits de la clave. En general, cuanto más larga es la clave, más seguridad proporciona. + Una clave larga no es suficiente para sustituir el uso de una frase de paso débil. + + + + + + + Añadir una subclave + Para añadir una subclave a una clave, desde la sección Subclaves pulse el botón Añadir. + Después de las instrucciones anteriores, se le presentará un diálogo para rellenar. Los campos se detallan a continuación. + + + Tipo de clave + + Especifica el algoritmo de cifrado usado para general la subclave. + + + DSA + + Use el Use el Algoritmo de firma digital (DSA) para crear la subclave. Esta subclave sólo puede firmar. + + + + ElGamal + + Use el algoritmo ElGamal para crear la subclave. Esta subclave sólo puede cifrar. + + + + RSA + + Use el algoritmo Rivest-ShamirAdleman (RSA) para crear la subclave. Esta subclave se puede usar para firmar o cifrar, pero debe crear dos subclaves diferentes. + + + + + + + Longitud de la clave + + Indica la longitud de una subclave en bits. En general, cuanto más larga es la clave, más seguridad proporciona. + + + + Fecha de caducidad + + Indica la fecha a partir de la cual la subclave no se puede usar más. + + + + + + + Cambiar la fecha de caducidad de una subclave + Para cambiar la fecha de caducidad de una subclave, elija la subclave de la sección Subclaves y: + + Pulse en el botón Caducidad en la izquierda, + + + Elija la nueva fecha de caducidad del diálogo o seleccione nunca caduca para que no exista fecha de caducidad. + + + + + + Revocar una subclave + Para revocar una subclave, seleccione la subclave de la sección Subclaves y: + + Pulse en el botón de Revocar en la izquierda, + + + Elija una razón para revocar la subclave: + + + + No hay motivos + + No existe una razón específica para revocar la clave. + + + + Comprometida + + La clave está comprometida. + + + + Reemplazada + + La clave ha sido reemplazada por otra. + + + + Sin uso + + La clave no se usa más. + + + + + + + Introduzca una descripción de porqué está revocando la clave, + + + Pulse en Revocar. + + + + El efecto de revocar una subclave es inmediato. + + + + + Eliminar una subclave + Para eliminar una subclave, seleccione la subclave de la sección Subclaves, después: + + Pulse en el botón Eliminar en la izquierda. + + + + + + + + + Propiedades de las claves de shell seguras (SSH) + Las descripciones en esta sección se aplican a todas las claves SSH. + Para ver las propiedades de una clave SSH: + + Seleccione la clave de shell segura de la ventana principal, + + + Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas, + + + Seleccione la pestaña Detalles. + + + + + Propiedades + + + + Huella + + La huella es una cadena de caracteres única que identifica exactamente a la clave. + + + + Algoritmo + + Especifica el algoritmo de cifrado a usar para generar una clave. + + + + Ubicación + + Esta es la ubicación donde se ha almacenado la clave privada. + + + + Fortaleza + + Indica la longitud de una clave en bits. En general, cuanto más larga es la clave, más seguridad proporciona. + Una clave larga no es suficiente para sustituir el uso de una frase de paso débil. + + + + + + + + + Eliminar una clave de shell segura (SSH) + Para eliminar una clave de shell segura: + + Seleccione la clave SSH de la ventana principal, + + + Pulse con el botón derecho y elija Eliminar clave o elija EditarEliminar clave. + + + + + + + + + Importar claves + Para importar claves elija ArchivoImportar y seleccione, del selector de archivos, un archivo que contenga al menos una clave pública con armadura ASCII. + Las claves también se pueden importar pegándolas en Contraseñas y claves: + + Seleccione un bloque de texto público con armadura ASCII, + + + Cópielo al portapapeles, + + + Elija EditarPegar claves. + + + + + + + + Exportar claves + Para exportar claves, seleccione las claves en la ventana principal y elija ArchivoExportar. + También puede exportar claves al portapapeles en un bloque de texto con armadura ASCII: + + Seleccione las claves en la ventana principal, + + + Elija EditarCopiar claves. + + + + + + + + + Firmar claves + Firmar la clave de otra persona significa que está dando confianza a esa persona. Antes de firmar una clave, debe comprobar cuidadosamente la huella de la clave, asegúrese de que la clave realmente pertenece a esa persona. + Para firmar una clave en su depósito de claves: + + Seleccione la clave que quiere firmar de las pestañas Claves confiadas u Otras claves reunidas, + + + Elija Firmar de la barra de herramientas o ArchivoFirmar, + + + Seleccione con qué minuciosidad ha comprobado la clave, + + + Indica si la firma debería ser local a su depósito de claves y si su firma puede revocarse, + + + Pulse Firmar. + + + + + + + + Preferencias + Esta sección describe las preferencias configurables en Contraseñas y claves eligiendo EditarPreferencias en Contraseñas y claves. + + + Depósitos de claves + + Crear depósitos + Para crear un depósito nuevo elija, del menú, ArchivoNueva y seleccione Depósito de contraseñas. Introduzca un nombre para el depósito nuevo y pulse intro. + + + Cambiar las contraseñas de los depósitos de claves + Para cambiar la contraseña maestra para el depósito de claves, primero seleccione el depósito de claves apropiado y después pulse el botón Cambiar la contraseña de desbloqueo, Después se le pedirá que escriba la contraseña antigua en la caja de texto Contraseña antigua, la contraseña nueva en la caja de texto Contraseña y la confirmación en la caja de texto Confirmar contraseña. Para aplicar los ajustes pulse Cambiar. Si la contraseña antigua es correcta obtendrá un mensaje de estado indicando el éxito de la operación. Si la contraseña antigua no es correcta se le pedirá que la compruebe. + + + Quitar depósitos de claves + Para quitar un depósito primero seleccione el depósito apropiado y después, del menú, elija EditarEliminar. + + + + + Servidores de claves + Mantenga sus claves y las de otros actualizadas sincronizando las claves periódicamente con servidores de claves remotos. Al sincronizar se asegurará de que tiene las últimas firmas en todas sus claves de tal forma que la red de confianza será más útil. + Contraseñas y claves proporciona soporte para servidores de claves HKP y LDAP. + + + Servidores HKP + + Los servidores de claves HKP son servidores de claves ordinarios, basados en web, tales como el popular hkp://pool.sks-keyservers.net, también accesible desde http://sks-keyservers.net. + + + + Servidores de claves LDAP + + Los servidores de claves LDAP son menos comunes, pero usan el protocolo estándar LDAP para servir claves. ldap://keyserver.pgp.com es un buen servidor LDAP. + + + + + + + Compartición de claves + La compartición de claves la proporciona DNS-SD, también conocido por Bonjour o Rendevous. Activar la compartición de claves añadirá a los usuarios locales de Contraseñas y claves depósitos de claves al diálogo de búsqueda remota. Usar estos «servidores de claves» locales será bastante más rápido que acceder a los servidores remotos. + + + + + + + Acerca de Contraseñas y claves + Contraseñas y claves, sus complementos asociados, las miniaplicaciones de preferencias y del panel se conocen en conjunto como Seahorse. Jacob Perkins escribió Seahorse. Los mantenedores actuales son Stef Walter y Adam Schreiber. Adam Schreiber escribió este manual. Jim Pharis diseñó la página web del proyecto. Para obtener más información acerca de Seahorse, el proyecto, visite la página web de Seahorse. + Para informar de un error o hacer alguna sugerencia concerniente a esta aplicación o este manual, siga las indicaciones en este página de comentarios de la Guía de usuario de GNOME. + Este programa se distribuye bajo los términos de la Licencia Pública General GNU tal como la publica la Free Software Foundation; tanto en la versión 2 de la Licencia, o (a su opción) cualquier otra versión posterior. Se incluye una copia de esta licencia en esta documentación, otra copia se puede encontrar en el archivo COPYING incluido con el código fuente de este programa. + +
diff -Nru seahorse-3.2.2/help/es/legal.xml seahorse-3.6.3/help/es/legal.xml --- seahorse-3.2.2/help/es/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/es/legal.xml 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,16 @@ + + + Se concede permiso para copiar, distribuir o modificar este documento según las condiciones de la GNU Free Documentation License (GFDL), Versión 1.1 o cualquier versión posterior publicada por la Free Software Foundation sin Secciones invariantes, Textos de portada y Textos de contraportada. Encontrará una copia de la GFDL en este enlace o en el archivo COPYING-DOCS distribuido con este manual. + Este manual es parte de una colección de manuales de GNOME distribuido bajo la GFDL. Si quiere distribuir este manual por separado de la colección, puede hacerlo añadiendo una copia de la licencia al manual, tal como se describe en la sección 6 de la licencia. + + Muchos de los nombres usados por compañías para distinguir sus productos y servicios son mencionados como marcas comerciales. Donde esos nombres aparezcan en cualquier documentación de GNOME, y los miembros del Proyecto de Documentación de GNOME están al corriente de esas marcas comerciales, entonces los nombres se pondrán en mayúsculas o con la inicial en mayúsculas. + + EL DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN CON SUJECIÓN A LOS TÉRMINOS DE LA GFDL, QUEDANDO BIEN ENTENDIDO, ADEMÁS, QUE: + + EL DOCUMENTO SE PROPORCIONA "TAL CUAL", SIN GARANTÍA DE NINGÚN TIPO, NI EXPLÍCITA NI IMPLÍCITA INCLUYENDO, SIN LIMITACIÓN, GARANTÍA DE QUE EL DOCUMENTO O VERSIÓN MODIFICADA DE ÉSTE CAREZCA DE DEFECTOS COMERCIALES, SEA ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO EL RIESGO RELATIVO A LA CALIDAD, PRECISIÓN Y UTILIDAD DEL DOCUMENTO O SU VERSIÓN MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÓN MODIFICADA DE AQUÉL RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO EL REDACTOR INICIAL, AUTOR O CONTRIBUYENTE) ASUMIRÁ LOS COSTES DE TODA REPARACIÓN, MANTENIMIENTO O CORRECCIÓN NECESARIOS. ESTA RENUNCIA DE GARANTÍA ES UNA PARTE ESENCIAL DE ESTA LICENCIA. NO SE AUTORIZA EL USO DE NINGÚN DOCUMENTO NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO DE LA RENUNCIA;Y + + + EN NINGUNA CIRCUNSTANCIA NI SEGÚN NINGÚN ARGUMENTO LEGAL, SEA POR MOTIVOS CULPOSOS (INCLUIDA LA NEGLIGENCIA), CONTRACTUALES O DE OTRO TIPO, NI EL AUTOR, NI EL REDACTOR INICIAL, NI CUALQUIER COLABORADOR, NI CUALQUIER DISTRIBUIDOR DEL DOCUMENTO O VERSIÓN MODIFICADA DEL MISMO, NI CUALQUIER PROVEEDOR DE CUALQUIERA DE DICHAS PARTES, SERÁN RESPONSABLES, ANTE NINGÚN TERCERO, DE NINGÚN DAÑO O PERJUICIO DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O CONSIGUIENTE DE NINGÚN TIPO, INCLUIDOS, SIN LIMITACIÓN, LOS DAÑOS POR PÉRDIDA DE FONDO DE COMERCIO, INTERRUPCIÓN DEL TRABAJO, FALLO O MAL FUNCIONAMIENTO INFORMÁTICO, NI CUALQUIER OTRO DAÑO O PÉRDIDA DERIVADOS DEL USO DEL DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO, O RELACIONADO CON ELLO, INCLUSO SI SE HABÍA COMUNICADO A AQUELLA PARTE LA POSIBILIDAD DE TALES DAÑOS. + + + diff -Nru seahorse-3.2.2/help/es/seahorse.xml seahorse-3.6.3/help/es/seahorse.xml --- seahorse-3.2.2/help/es/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/es/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,906 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Manual de Contraseñas y claves - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins y Adam Schreiber - 2011Daniel Mustieles (daniel.mustieles@gmail.com)2007-2008Jorge González (jorgegonz@svn.gnome.org) - - Proyecto Seahorse - - - - Se otorga permiso para copiar, distribuir y/o modificar este documento bajo los términos de la Licencia de Documentación Libre de GNU, Versión 1.1 o cualquier otra versión posterior publicada por la Free Software Foundation; sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este enlace o en el archivo COPYING-DOCS distribuido con este manual. - Este manual es parte de una colección de manuales de GNOME distribuido bajo la GFDL. Si quiere distribuir este manual por separado de la colección, puede hacerlo añadiendo una copia de la licencia al manual, tal como se describe en la sección 6 de la licencia. - - Muchos de los nombres usados por compañías para distinguir sus productos y servicios son mencionados como marcas comerciales. Donde esos nombres aparezcan en cualquier documentación de GNOME, y los miembros del Proyecto de Documentación de GNOME están al corriente de esas marcas comerciales, entonces los nombres se pondrán en mayúsculas o con la inicial en mayúsculas. - - ESTE DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN SEGÚN LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU (GFDL) Y TENIENDO EN CUENTA QUE: - - EL DOCUMENTO SE PROPORCIONA "TAL CUAL", SIN GARANTÍA DE NINGÚN TIPO, NI EXPLÍCITA NI IMPLÍCITA INCLUYENDO, SIN LIMITACIÓN, GARANTÍA DE QUE EL DOCUMENTO O VERSIÓN MODIFICADA DE ÉSTE CAREZCA DE DEFECTOS COMERCIALES, SEA ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO EL RIESGO RELATIVO A LA CALIDAD, PRECISIÓN Y UTILIDAD DEL DOCUMENTO O SU VERSIÓN MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÓN MODIFICADA DE AQUÉL RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO EL REDACTOR INICIAL, AUTOR O CONTRIBUYENTE) ASUMIRÁ LOS COSTES DE TODA REPARACIÓN, MANTENIMIENTO O CORRECCIÓN NECESARIOS. ESTA RENUNCIA DE GARANTÍA ES UNA PARTE ESENCIAL DE ESTA LICENCIA. NO SE AUTORIZA EL USO DE NINGÚN DOCUMENTO NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO DE LA RENUNCIA;Y - - - EN NINGUNA CIRCUNSTANCIA NI SEGÚN NINGÚN ARGUMENTO LEGAL, SEA POR MOTIVOS CULPOSOS (INCLUIDA LA NEGLIGENCIA), CONTRACTUALES O DE OTRO TIPO, NI EL AUTOR, NI EL REDACTOR INICIAL, NI CUALQUIER COLABORADOR, NI CUALQUIER DISTRIBUIDOR DEL DOCUMENTO O VERSIÓN MODIFICADA DEL MISMO, NI CUALQUIER PROVEEDOR DE CUALQUIERA DE DICHAS PARTES, SERÁN RESPONSABLES, ANTE NINGÚN TERCERO, DE NINGÚN DAÑO O PERJUICIO DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O CONSIGUIENTE DE NINGÚN TIPO, INCLUIDOS, SIN LIMITACIÓN, LOS DAÑOS POR PÉRDIDA DE FONDO DE COMERCIO, INTERRUPCIÓN DEL TRABAJO, FALLO O MAL FUNCIONAMIENTO INFORMÁTICO, NI CUALQUIER OTRO DAÑO O PÉRDIDA DERIVADOS DEL USO DEL DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO, O RELACIONADO CON ELLO, INCLUSO SI SE HABÍA COMUNICADO A AQUELLA PARTE LA POSIBILIDAD DE TALES DAÑOS. - - - - - - - - Jacob - Perkins - - Proyecto Seahorse - - - - - Adam - Schreiber - - Proyecto Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - Proyecto de documentación de Gnome -
- pcutler@foresightlinux.org -
- - - - - - - Proyecto Seahorse - - - Proyecto de documentación de Gnome - - - - Manual de Contraseñas y claves V2.11.0 - Mayo de 2009 - - Paul Cutler pcutler@foresightlinux.org - - - - Manual de Contraseñas y claves V0.10.1 - Agosto de 2008 - - Adam Schreiber sadam@clemson.edu - - - - Manual de Contraseñas y claves V0.9.1 - noviembre de 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Manual de Contraseñas y claves V.0.9.0 - julio de 2005 - - Adam Schreiber sadam@clemson.edu - Proyecto Seahorse - - - - Manual de Contraseñas y claves V.7.0 - febrero de 2003 - - Jacob Perkins - Proyecto Seahorse - - - - Este manual describe la versión 2.28.x de Contraseñas y claves - - Comentarios - Para informar de un error o hacer alguna sugerencia respecto de la aplicación Contraseñas y claves o este manual, siga las indicaciones en la página de contacto de GNOME. - - - - Contraseñas y claves es la aplicación para administrar claves de cifrado para el Escritorio GNOME - - - - - - Seahorse - - - - seahorse - - - - Claves de cifrado - - - - - - Introducción - Puede usar Contraseñas y claves para crear y administrar claves PGP y SSH. - Contraseñas y claves proporciona un interfaz para muchas de las características de Gnu Privacy Guard (GPG) y se integra con muchos de los componentes del escritorio GNOME. - Con Contraseñas y claves puede: - - - Crear y administrar claves PGP y SSH, - - - Exportar e importar claves PGP y SSH, - - - Compartir sus claves con otros, - - - - - - - - Inicio - - Iniciar <application>Contraseñas y claves</application> - Puede iniciar Contraseñas y claves de las siguientes formas: - - - Menú Aplicaciones - - Elija AccesoriosContraseñas y claves. - - - - Línea de comandos - - Escriba seahorse y después pulse Retorno. - - - - - - - Iniciar <application>Contraseñas y claves</application> - Al iniciar Contraseñas y claves, se mostrará la ventana de Contraseñas y claves. - -
- La ventana de <application>Contraseñas y claves</application> - - - - - - - Muestra la ventana de Manual de Contraseñas y claves. - - - -
- - La ventana de Contraseñas y claves contiene los siguientes elementos: - - - Barra de menú - - Los menús de la barra de menú contienen todos los comandos que necesita para realizar tareas con Contraseñas y claves. - - - Barra de herramientas - - Use la barra de herramientas para acceder rápidamente a los comandos más usados. - - - Pestañas de claves y contraseñas - - Proporciona acceso a las claves y contraseñas en el depósito de claves. - - - Opciones noveles - - Proporciona acceso rápido a acciones útiles para los usuarios noveles. Desde aquí puede: - - - Navegar por el sistema de ayuda, - - - Importar claves al depósito, - - - Crear claves nuevas. - - - - - - - - - - - - Crear claves OpenPGP - OpenPGP es un protocolo no propietario para cifrar correo electrónico usando claves criptográficas públicas basadas en PGP. Define formatos estándar para los mensajes cifrados, firmas, claves públicas y certificados para intercambiar claves públicas. - La criptografía de clave pública es un concepto que involucra el uso de dos claves: una clave pública, que puede dar a cualquiera con el que quiera comunicarse, y una clave privada que es privada y debe mantenerse en secreto. - Para crear claves OpenPGP: - - Elija ArchivoNueva... - - - Seleccione Clave PGP y pulse Continuar - - - Introduzca su nombre completo (nombre - apellido), su dirección de correo electrónico y cualquier información adicional. También puede especificar opciones avanzadas para la clave: vea más abajo. - - - Pulse Crear para crear el nuevo par de claves. - - - Se abrirá el diálogo Frase de paso para la nueva clave PGP. Introduzca dos veces la frase de paso para su nueva clave. - - - - Use procedimientos similares para generar claves fuertes cuando elija una frase de paso. La principal diferencia entre una contraseña y una frase de paso es que en una frase de paso los espacios son caracteres válidos. - - - - Opciones avanzadas - Expanda la sección Opciones avanzadas de la clave para especificar las siguientes opciones para una nueva clave: - - - Tipo de cifrado - - Este campo especifica los algoritmos de cifrado usados para generar sus claves. - - - DSA ElGamal - - Esta es la opción sugerida ya que le permite cifrar, descifrar, firmar y verificar cuando sea necesario. - - - - DSA - - Sólo permite firmado. - - - - RSA - - Sólo permite firmado. - - - - - - - Fortaleza de la clave (bits) - - Esta es la longitud de la clave en bits. Cuanto más larga sea la clave más segura será, proporcionando una frase de paso fuerte. No obstante, realizar operaciones con una clave más larga requerirá más tiempo que si usa una clave más corta. Los valores aceptables están entre los 1024 y 4096 bits. Se recomiendan 2048 bits al menos. - - - - Fecha de caducidad - - Esta es la fecha en la que la clave dejará de ser útil para realizar cifrado u operaciones de firma. 6 meses es un tiempo razonable para ello. Tendrá que cambiar la fecha de caducidad o generar una nueva clave o subclave después de que pase este espacio de tiempo. - Firme su nueva clave con la vieja antes de que caduque para preservar su estado de confianza. - - - - - - - - - - - Crear claves de shell seguras - Las claves de shell seguras (SSH) es una forma de registrarse en un equipo remoto para ejecutar comandos en esa máquina. Las claves SSH se usan en sistemas de autenticación basados en claves, como una alternativa al sistema de autenticación predeterminado basado en contraseña. Con el sistema de autenticación basado en clave no existe la necesidad de escribir una contraseña para autenticarse. - Las claves SSH se componen de dos claves, una clave privada, que se debe mantener en secreto, y una clave pública que puede ser cargada en cualquier equipo que necesite acceder. - Para crear una clave de shell segura: - - - Elija ArchivoNueva... - - - Seleccione Clave de shell segura y pulse Continuar - - - Introduzca una descripción para lo que debe usarse la clave. Puede usar su correo electrónico o algo que le sirva para recordarlo. También puede especificar opciones avanzadas para la clave: vea más abajo. - - - Pulse Sólo crear la clave para crear la nueva clave, o Crear y configurar para crear la clave y configurar otro equipo para usar la autenticación. - - - Se abrirá el diálogo Frase de paso para la nueva clave de shell segura. Introduzca la frase de paso dos veces para su nueva clave. - - Use procedimientos similares para generar claves fuertes cuando elija una frase de paso. La principal diferencia entre una contraseña y una frase de paso es que en una frase de paso los espacios son caracteres válidos. - - - - - - - - Opciones avanzadas - Expanda la sección Opciones avanzadas de la clave para especificar las siguientes opciones para una nueva clave: - - - - Tipo de cifrado - - Este campo especifica los algoritmos de cifrado usados para generar su clave. - - - RSA - - Use el algoritmo Rivest-ShamirAdleman (RSA) para crear la clave SSH. Esta es la elección preferida y más segura. - - - - DSA - - Use el Algoritmo de firma digital (DSA) para crear la clave SSH. - - - - - - - Fortaleza de la clave (bits) - - Esta es la longitud de la clave en bits. Cuanto más larga sea la clave más segura será, proporcionando una frase de paso fuerte. No obstante, realizar operaciones con una clave más larga requerirá más tiempo que si usa una clave más corta. Los valores aceptables están entre los 1024 y 4096 bits. Se recomiendan 2048 bits al menos. - - - - - - - - - - Propiedades de la clave OpenPGP - Las descripciones en esta sección se aplican a todas las claves OpenPGP. - - Para ver las propiedades de una clave PGP: - - Seleccione la clave PGP de la ventana del menú principal, - - - Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas, - - - Seleccione la pestaña Detalles. - - - - - Propiedades - - - - Huella - - La huella es una cadena de caracteres única que identifica exactamente a la clave. - - - - ID de la clave - - La ID de la clave es similar a la huella. No obstante la ID de la clave sólo contiene los últimos 8 caracteres de la huella. La mayoría de las veces es posible identificar una clave sólo con la ID de la clave, pero ocasionalmente dos claves pueden tener la misma ID. - - - - Tipo - - Especifica el algoritmo de cifrado usado para generar la clave. Las claves DSA sólo pueden firmar. Las claves ElGamal se usan para cifrar. - - - - Creada - - Indica la fecha en la que la clave fue creada. - - - - Caduca - - Indica la fecha a partir de la cual la clave no se puede usar más. - - - - Fortaleza - - Indica la longitud de una clave en bits. En general, cuanto más larga es la clave, más seguridad proporciona. - Una clave larga no es suficiente para sustituir el uso de una frase de paso débil. - - - - - - - - - Confianza - La confianza es un indicador de cómo de seguro está sobre la habilidad de una persona para extender correctamente la red de confianza. Cuando se enfrente a una clave que no haya firmado, la validez de la clave de esa persona estará determinada en base a las firmas que haya coleccionado y de cuánto confía en esas personas que han usado sus firmas. De forma predeterminada, una clave desconocida requiere 3 firmas con cierta confianza marginal o una 1 firma de plena confianza. - - Desconocido: No sabe con certeza la habilidad de la persona para firmar claves correctamente. - Nunca: Esta persona no puede firmar claves correctamente. - Marginal: Esta persona comprueba una identificación fotográfica antes de firmar una clave, pero no escrutina la identificación necesariamente. - Completa: Esta persona escrutina cada una de las fotos de identificación de cada persona antes de firmarlas (ej. sólo firman claves que verdaderamente pertenezcan a esa persona, preguntando por la firma). - Máximo: Este nivel de confianza sólo se debería asignar a sus propias claves. - - - - - Activar y desactivar claves - Cuando se activa una clave, se puede usar para realizar operaciones de cifrado. Cuando se desactiva una clave, no se puede usar para cifrar o comprobar firmas realizadas con ella. - - - - Fecha de caducidad - Una clave no se podrá seguir usando para realizar operaciones después de que haya caducado. Cambiar la fecha de expiración de una clave a un punto futuro la reactivará. Una buena práctica general sería tener una clave maestra que nunca caduca y múltiples subclaves que estuviesen firmadas por la clave maestra. - - - - Identificación de usuarios - Las identificaciones de usuario permiten que una sola clave se use para múltiples identidades y correos electrónicos. - Generalmente toman la forma de: Nombre (comentario) <correo electrónico> - - - Añadir una identidad de usuario - Añadir una identidad de usuario es útil cuando quiere tener una identidad para su trabajo y otra para sus amigos. - Para añadir una identificación de usuario a una clave: - - Seleccione la clave de la ventana principal. - - - Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas. - - - Seleccione la pestaña Nombres y firmas, - - - Pulse en Añadir nombre. - - - Después de las instrucciones anteriores, se le presentará un diálogo para rellenar. Los campos se detallan a continuación. - - - Nombre completo - - Introduzca su nombre completo en el formulario <nombre> <apellido>. Las iniciales o un segundo son opcionales. - - - Debe introducir al menos 5 caracteres en este campo. - - - - - - Dirección de correo electrónico - - La dirección de su correo electrónico es la forma en la que la mayoría de las personas localizarán su clave en un servidor de claves u otro proveedor de claves. Antes de continuar, asegúrese de que es correcto. - - - Debería ser de la forma <nombre de usuario>@<nombre de dominio> - - - - - - Comentario de la clave - - El campo de comentario se puede usar para añadir cualquier información adicional en el nombre mostrado de su nueva identidad. Esta información se puede buscar en los servidores de claves. - - - - - - - - Identificación fotográfica - La identificación fotográfica permite al propietario de una clave empotrar una o más fotografías de si mismos en una clave. Estas identidades pueden estar firmadas al igual que las identidades de usuario. Una identificación fotográfica debe estar en formato JPEG y se recomienda que no sea más grande de 240x288 píxeles. - Si la imagen elegida no es del tipo de archivo o tamaño requeridos, Contraseñas y claves puede redimensionarla y convertirla al vuelo a un formato de imagen soportado por la biblioteca GDK. - - - - Cambiar la frase de paso - Para cambiar la frase de paso asignada a una clave: - - Seleccione la clave de la ventana principal. - - - Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas, - - - Pulse en Cambiar frase de paso. - - - Introduzca la nueva frase de paso y pulse Aceptar. - - - - Borrar una clave - Para borrar una clave de su depósito de claves: - - Seleccione la clave de la ventana principal. - - - Pulse con el botón derecho sobre ella y elija Borrar clave o elija EditarBorrar clave. - - - - Puede borrar sus claves, claves confiadas y claves coleccionadas. - - - - - - - - Propiedades de las subclaves OpenPGP - Cada clave OpenPGP tiene una sola clave maestra que sólo se usa para firmar. Las subclaves se usan tanto para cifrar como para firmar. En este sentido, si su subclave está comprometida, no necesita revocar su clave maestra. - - - ID - - Este es el identificador de la subclave. - - - - Tipo - - Especifica el algoritmo de cifrado usado para generar la subclave. Las claves DSA sólo pueden firmar, las claves ElGamal se usan para cifrar, mientras que las claves RSA se usan para firmar o cifrar. - - - - Creada - - Indica la fecha en la que la clave fue creada. - - - - Caduca - - Indica la fecha a partir de la cual la clave no se puede usar más. - - - - Estado - - Indica el estado de la clave. - - - - Fortaleza - - Indica la longitud en bits de la clave. En general, cuanto más larga es la clave, más seguridad proporciona. - Una clave larga no es suficiente para sustituir el uso de una frase de paso débil. - - - - - - - Añadir una subclave - Para añadir una subclave a una clave, desde la sección Subclaves pulse el botón Añadir. - Después de las instrucciones anteriores, se le presentará un diálogo para rellenar. Los campos se detallan a continuación. - - - Tipo de clave - - Especifica el algoritmo de cifrado usado para general la subclave. - - - DSA - - Use el Use el Algoritmo de firma digital (DSA) para crear la subclave. Esta subclave sólo puede firmar. - - - - ElGamal - - Use el algoritmo ElGamal para crear la subclave. Esta subclave sólo puede cifrar. - - - - RSA - - Use el algoritmo Rivest-ShamirAdleman (RSA) para crear la subclave. Esta subclave se puede usar para firmar o cifrar, pero debe crear dos subclaves diferentes. - - - - - - - Longitud de la clave - - Indica la longitud de una subclave en bits. En general, cuanto más larga es la clave, más seguridad proporciona. - - - - Fecha de caducidad - - Indica la fecha a partir de la cual la subclave no se puede usar más. - - - - - - - Cambiar la fecha de caducidad de una subclave - Para cambiar la fecha de caducidad de una subclave, elija la subclave de la sección Subclaves, después: - - Pulse en el botón Caducidad en la izquierda, - - - Elija la nueva fecha de caducidad del diálogo o seleccione nunca caduca para que no exista fecha de caducidad. - - - - - - Revocar una subclave - Para revocar una subclave, seleccione la subclave de la sección Subclaves, después: - - Pulse en el botón de Revocar en la izquierda, - - - Elija una razón para revocar la subclave: - - - - No hay motivos - - No existe una razón específica para revocar la clave. - - - - Comprometida - - La clave está comprometida. - - - - Reemplazada - - La clave ha sido reemplazada por otra. - - - - Sin uso - - La clave no se usa más. - - - - - - - Introduzca una descripción de porqué está revocando la clave, - - - Pulse en Revocar. - - - - El efecto de revocar una subclave es inmediato. - - - - - Borrar una subclave - Para borrar una subclave, seleccione la subclave de la sección Subclaves, después: - - Pulse en el botón Borrar en la izquierda. - - - - - - - - - Propiedades de las claves de shell seguras (SSH) - Las descripciones en esta sección se aplican a todas las claves SSH. - Para ver las propiedades de una clave SSH: - - Seleccione la clave de shell segura de la ventana principal, - - - Pulse dos veces sobre ella o elija Propiedades de la barra de herramientas, - - - Seleccione la pestaña Detalles. - - - - - Propiedades - - - - Huella - - La huella es una cadena de caracteres única que identifica exactamente a la clave. - - - - Algoritmo - - Especifica el algoritmo de cifrado a usar para generar una clave. - - - - Ubicación - - Esta es la ubicación donde se ha almacenado la clave privada. - - - - Fortaleza - - Indica la longitud de una clave en bits. En general, cuanto más larga es la clave, más seguridad proporciona. - Una clave larga no es suficiente para sustituir el uso de una frase de paso débil. - - - - - - - - - Borrar una clave de shell segura (SSH) - Para borrar una clave de shell segura: - - Seleccione la clave SSH de la ventana principal, - - - Pulse con el botón derecho y elija Borrar clave o elija EditarBorrar clave. - - - - - - - - - Importar claves - Para importar claves elija ArchivoImportar y seleccione, del selector de archivos, un archivo que contenga al menos una clave pública con armadura ASCII. - Las claves también se pueden importar pegándolas en Contraseñas y claves: - - Seleccione un bloque de texto público con armadura ASCII, - - - Cópielo al portapapeles, - - - Elija EditarPegar claves. - - - - - - - - Exportar claves - Para exportar claves, seleccione las claves en la ventana principal y elija ArchivoExportar. - También puede exportar claves al portapapeles en un bloque de texto con armadura ASCII: - - Seleccione las claves en la ventana principal, - - - Elija EditarCopiar claves. - - - - - - - - - Firmar claves - Firmar la clave de otra persona significa que está dando confianza a esa persona. Antes de firmar una clave, debe comprobar cuidadosamente la huella de la clave, asegúrese de que la clave realmente pertenece a esa persona. - Para firmar una clave en su depósito de claves: - - Seleccione la clave que quiere firmar de las pestañas Claves confiadas u Otras claves reunidas, - - - Elija Firmar de la barra de herramientas o ArchivoFirmar, - - - Seleccione con qué minuciosidad ha comprobado la clave, - - - Indica si la firma debería ser local a su depósito de claves y si su firma puede revocarse, - - - Pulse Firmar. - - - - - - - - Preferencias - Esta sección describe las preferencias configurables en Contraseñas y claves eligiendo EditarPreferencias en Contraseñas y claves. - - - Depósitos de claves - - Crear depósitos - Para crear un depósito nuevo elija, del menú, ArchivoNueva y seleccione Depósito de contraseñas. Introduzca un nombre para el depósito nuevo y pulse intro. - - - Cambiar las contraseñas de los depósitos de claves - Para cambiar la contraseña maestra para el depósito de claves, primero seleccione el depósito de claves apropiado y después pulse el botón Cambiar la contraseña de desbloqueo, Después se le pedirá que escriba la contraseña antigua en la caja de texto Contraseña antigua, la contraseña nueva en la caja de texto Contraseña y la confirmación en la caja de texto Confirmar contraseña. Para aplicar los ajustes pulse Cambiar. Si la contraseña antigua es correcta obtendrá un mensaje de estado indicando el éxito de la operación. Si la contraseña antigua no es correcta se le pedirá que la compruebe. - - - Quitar depósitos de claves - Para quitar un depósito primero seleccione el depósito apropiado y después, del menú, elija EditarBorrar. - - - - - Servidores de claves - Mantenga sus claves y las de otros actualizadas sincronizando las claves periódicamente con servidores de claves remotos. Al sincronizar se asegurará de que tiene las últimas firmas en todas sus claves de tal forma que la red de confianza será más útil. - Contraseñas y claves proporciona soporte para servidores de claves HKP y LDAP. - - - Servidores HKP - - Los servidores de claves HKP son servidores de claves ordinarios, basados en web, tales como el popular hkp://pool.sks-keyservers.net, también accesible desde http://sks-keyservers.net. - - - - LDAP servidores de claves - - Los servidores de claves LDAP son menos comunes, pero usan el protocolo estándar LDAP para servir claves. ldap://keyserver.pgp.com es un buen servidor LDAP. - - - - - - - Compartición de claves - La compartición de claves la proporciona DNS-SD, también conocido por Bonjour o Rendevous. Activar la compartición de claves añadirá a los usuarios locales de Contraseñas y claves depósitos de claves al diálogo de búsqueda remota. Usar estos «servidores de claves» locales será bastante más rápido que acceder a los servidores remotos. - - - - - - - Acerca de Contraseñas y claves - Contraseñas y claves, sus complementos asociados, las miniaplicaciones de preferencias y del panel se conocen en conjunto como Seahorse. Jacob Perkins escribió Seahorse. Los mantenedores actuales son Stef Walter y Adam Schreiber. Adam Schreiber escribió este manual. Jim Pharis diseñó la página web del proyecto. Para obtener más información acerca de Seahorse, el proyecto, visite la página web de Seahorse. - Para informar de un fallo, o hacer alguna sugerencia concerniente a esta aplicación o este manual, siga las indicaciones en la Página de comentarios de la Guía del usuario de GNOME. - Este programa se distribuye bajo los términos de la Licencia Pública General GNU tal como la publica la Free Software Foundation; tanto en la versión 2 de la Licencia, o (a su opción) cualquier otra versión posterior. Se incluye una copia de esta licencia en esta documentación, otra copia se puede encontrar en el archivo COPYING incluido con el código fuente de este programa. - -
diff -Nru seahorse-3.2.2/help/eu/index.docbook seahorse-3.6.3/help/eu/index.docbook --- seahorse-3.2.2/help/eu/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/eu/index.docbook 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,1265 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse proiektua + + + + + 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. + + Eskuliburu hau GFDL lizentziarekin banatzen diren GNOME eskuliburuen bildumakoa da. Eskuliburu hau bildumatik bereizita banatu nahi baduzu, banatu dezakezu, baina eskuliburuari lizentziaren kopia bat gehitu beharko diozu lizentzian bertan 6. atalean azaltzen den bezala. + + Enpresek beren produktu eta zerbitzuak bereizteko erabiltzen dituzten izen asko marka erregistratu gisa hartu behar dira. Izen horiek GNOMEren edozein agiritan agertzen direnean, eta GNOMEren Dokumentazio Proiektuko kideak marka komertzialak direla konturatzen direnean, izen horiek maiuskulaz idatzita agertuko dira, osorik edo hasierako letra bakarrik. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse proiektua + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Ohar-bidaltzea + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Sarrera + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Erabiltzen hastea + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Aplikazioak menua + + Choose + + Accessories + Password and Keys + . + + + + Komando-lerroa + + Idatzi seahorse, eta sakatu Sartu. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Menu-barra + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Tresna-barra + + Erabili tresna-barra gehien erabiltzen diren komandoetara azkar sartzeko. + + + Gakoen eta pasahitzen fitxak + + Gako sortako gakoetarako eta pasahitzetarako sarbidea ematen du. + + + Oinarrizko aukerak + + Ekintza erabilgarrietarako sarbide azkarra eskaintzen die erabiltzaile hasiberriei. Aukera honetan, hauek egin ditzakezu: + + + Laguntza-sisteman nabigatu, + + + Gakoak gako sortara inportatu, + + + Gako berriak sortu. + + + + + + + + + + + + OpenPGP gakoak sortzea + Posta elektronikoa enkriptatzeko jabedun gabeko protokoloa da OpenPGP. PGPn oinarritutako gako publikoaren kriptografia erabiltzen du. Enkriptatutako mezuen, sinaduren, gako pribatuen eta ziurtagirien formatu estandarrak zehazten ditu, gako publikoak trukatzeko. + Gako publikoaren kriptografiak bi gakoren erabilera nahasten du: gako publiko bat (jakinarazi nahi diozun edozeini eman diezaiokezu), eta gako pribatu bat (pribatua da eta ezkutuan gorde behar da). + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Pasaesaldia aukeratzeko, erabili pasahitz sendo bat aukeratzeko erabiliko zenukeen prozedura bera. Pasahitz baten eta pasaesaldi baten arteko ezberdintasun nagusia da pasaesaldian zuriuneak onartzen direla. + + + + Aukera aurreratuak + Zabaldu Gako-aukera aurreratuak atala, gako berri baterako aukera hauek zehazteko: + + + Encryption Type + + Alor honek gako berria sortzeko erabiltzen diren enkriptatze-algoritmoak zehazten ditu. + + + DSA ElGamal + + Hori da aholkatzen dugun aukera, behar duzuna enkriptatzeko, desenkriptatzeko, sinatzeko eta egiaztatzeko aukera emango baitizu. + + + + DSA + + Sinatzeko aukera soilik emango dizu. + + + + RSA + + Sinatzeko aukera soilik emango dizu. + + + + + + + Key Strength (bits) + + Gakoaren luzera da bitetan. Gakoa zenbat eta handiagoa, orduan eta seguruagoa izango da, baldin eta pasaesaldi sendo bat erabiltzen baduzu. Bestalde, gako handi batekin gako txikiago batekin baino denbora gehiago beharko da eragiketa bat egiteko. 1.024 eta 4.096 bit arteko balioak onartzen dira. Gutxienez, 2.048 bit izatea gomendatzen da. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Shell seguruaren gakoak sortzea + Shell segurua (SSH) urrutiko ordenagailu batera konektatu eta komandoak exekutatzeko modua da. SSH gakoak gakoetan oinarrituriko autentifikazio-sistemetan erabiltzen dira, lehenespenezko pasahitzaren autentifikazio-sistemaren ordezko moduan. Gakoetan oinarritutako autentifikazioan ez da pasahitzik idatzi behar identifikatzeko. + Shell seguruaren gakoak bi gakoz osatuta daude: gako pribatu bat, isilpean gorde behar dena, eta gako publiko bat, sartu behar duzun edozein ordenagailutan kargatu dezakezuna. + Shell seguruaren gako bat sortzea: + + + Choose FileNew... + + + Hautatu Shell seguruaren gakoa eta egin klik Jarraitu botoian. + + + Gakoa zertarako erabili behar den deskriba ezazu. Zure helbide elektronikoa edo beste edozein oroigarri erabil dezakezu. Gakorako aukera aurreratuak ere zehaztu ditzakezu: ikus behean. + + + Egin klik Gakoa sortu soilik botoian gako berria sortzeko, edo Sortu eta konfiguratu botoian gakoa sortu eta beste ordenagailu batek autentifikazioa erabil dezan konfiguratzeko. + + + Shell seguruaren gako berriaren pasaesaldia elkarrizketa-koadroa irekiko da. Idatzi gako berriaren pasaesaldia bi bider. + + Pasaesaldia aukeratzeko, erabili pasahitz sendo bat aukeratzeko erabiliko zenukeen prozedura bera. Pasahitz baten eta pasaesaldi baten arteko ezberdintasun nagusia da pasaesaldian zuriuneak onartzen direla. + + + + + + + + Aukera aurreratuak + Zabaldu Gako-aukera aurreratuak atala gako berri baten aukerak zehazteko: + + + + Encryption Type + + Alor honek gako berria sortzeko erabiltzen diren enkriptatze-algoritmoak zehazten ditu. + + + RSA + + Erabili Rivest-ShamirAdleman algoritmoa (RSA) SSH gakoa sortzeko. Hau da hobesten den eta seguruena den aukera. + + + + DSA + + Erabili Sinadura digitalaren algoritmoa (DSA) SSH gakoa sortzeko. + + + + + + + Key Strength (bits) + + Gakoaren luzera da bitetan. Gakoa zenbat eta handiagoa, orduan eta seguruagoa izango da, baldin eta pasaesaldi sendo bat erabiltzen baduzu. Bestalde, gako handi batekin gako txikiago batekin baino denbora gehiago beharko da eragiketa bat egiteko. 1.024 eta 4.096 bit arteko balioak onartzen dira. Gutxienez, 2.048 bit izatea gomendatzen da. + + + + + + + + + + OpenPGP Gakoaren propietateak + Atal honetako deskribapenak OpenPGP gako guztietan aplikatuko dira. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Propietateak + + + + Fingerprint + + Gakoa identifikatzen duen ezaugarri-kate bat da hatz-marka. + + + + KeyID + + Gakoaren identifikazioa hatz-markaren antzekoa da. Hala ere, Gakoaren identifikazioak hatz-markaren azken 8 karaktereak soilik ditu. Gehienetan gako bat Gakoaren identifikazioarekin soilik identifikatzeko aukera dago, baina batzuetan bi gakok identifikazio bera izan dezakete. + + + + Type + + Gako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. DSA gakoak sinatzeko soilik erabil daitezke. ElGamal gakoak enkriptatzeko erabiltzen dira. + + + + Created + + Gakoa sortu zen data adierazten du. + + + + Expires + + Adierazten du zein datatik aurrera ezingo den gakoa gehiago erabili. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Fidagarritasuna + Fidagarritasunak adierazten du zenbateraino zauden ziur pertsona batek gaitasuna duela sare fidagarria zuzen zabaltzeko. Zuk sinatu ez duzun gako baten aurrean aurkitzen zarenean, bildu dituen sinaduretan eta sinatu duten pertsonengan duzun fidagarritasunean oinarrituko da pertsona horren gakoaren balioa. Lehenespenez, gako ezezagun batek garrantzi gutxiko hiru sinadura edo fidagarritasun osoko sinadura bat beharko du. + + Ezezaguna: ez dakizu pertsona hori gai den gakoak zuzen sinatzeko. + Inoiz ere ez: pertsona horrek ezin ditu gakoak zuzen sinatu. + Marjinala: pertsona horrek argazki-identifikazioa egiaztatzen du gako bat sinatu aurretik, baina ez ditu ezinbestean identifikazioak aztertzen. + Osoa: pertsona horrek pertsona guztien identifikazio-argazkiak aztertzen ditu sinatu aurretik (hau da, benetan pertsona bati dagozkion gakoak soilik sinatzen ditu, eta, horretarako, pertsona horren sinadura eskatzen du) + Azkena: fidagarritasun-maila hau zure gakoetan soilik ezarri beharko litzateke. + + + + + Gakoak aktibatzea eta desaktibatzea + Gako bat aktibatuta baldin badago, enkriptatzeko erabil daiteke. Gako bat desaktibatuta baldin badago, ezin da ez enkriptatzeko ez eta sinadurak egiaztatzeko erabili. + + + + Iraungitze-data + Gako bat iraungita baldin badago, ezingo da gehiago erabili. Gako baten iraungitze-data luzatzean, berriro ere aktibatzen da. Onena litzake inoiz iraungitzen ez den gako maisu bat izatea eta gako horrekin sinatutako zenbait azpigako izatea. + + + + Erabiltzaileen identifikazioa + Erabiltzaileen identifikazioak gako berarekin hainbat identitate eta helbide elektroniko erabiltzeko aukera ematen du. + + They usually take the form of: + Name (comment) <email address> + + + + Erabiltzaile-identifikazioa gehitzea + Erabiltzaile-identifikazio bat gehitzea erabilgarria da lanerako identitate bat eta lagunentzako beste bat eduki nahi duzunean. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + Gaineko argibideei jarraitu ondoren, elkarrizketa-koadro bat agertzen da. Bete behar dituzun eremuak hemen zehaztuta dauzkazu: + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + Gutxienez bost karaktere idatzi behar dituzu eremu honetan. + + + + + + Email Address + + Zure helbide elektronikoaren bidez kokatuko du jendeak zure gakoa gako-zerbitzari batean edo beste gako-hornitzaile batean. Ziurtatu zuzen dagoela jarraitu aurretik. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + Zure identifikazio berriaren izenari informazio gehigarria eransteko, iruzkinaren eremua erabil daiteke. Informazio hori gako-zerbitzarietan bila daiteke. + + + + + + + + Identifikazio-argazkiak + Gakoaren jabearen argazki bat edo gehiago txertatzeko aukera ematen du identifikazio-argazkiak Identitate hauek erabiltzaile-identifikazio normalen moduan sina daitezke. Identifikazio-argazkiek JPEG formatuan egon behar dute, eta 240x288 pixel baino gehiagokoak ez izatea gomendatzen da. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Pasaesaldia aldatzea + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Idatzi pasaesaldi berria eta sakatu Ados. + + + + Gako bat ezabatzea + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + Gakoak, gako fidagarriak eta bildutako gakoak ezaba ditzakezu. + + + + + + + + OpenPGP Azpigakoen propietateak + OpenPGP gako bakoitzak gako maisu bat erabiltzen du sinatzeko. Azpigakoak enkriptatzeko eta sinatzeko erabiltzen dira. Hala, zure azpigakoa itunduta baldin badago, ez duzu gako maisua errebokatu beharrik. + + + ID + + Hau da azpigakoaren identifikatzailea. + + + + Type + + Azpigako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. DSA gakoek sinatu soilik egin dezakete, ElGamal gakoak enkriptatzeko erabiltzen dira eta RSA gakoak sinatzeko edo enkriptatzeko erabiltzen dira. + + + + Created + + Gakoa sortu zen data adierazten du. + + + + Expires + + Adierazten du zein datatik aurrera ezingo den gakoa gehiago erabili. + + + + Status + + Mezuaren egoera adierazten du. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Azpigako bat gehitzea + Gako batean azpigako bat gehitzeko, egin klik Azpigakoak menuko Gehitu botoian + Gaineko argibideei jarraitu ondoren, elkarrizketa-koadro bat agertzen da. Bete behar dituzun eremuak hemen zehaztuta dauzkazu: + + + Gako mota + + Azpigako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. + + + DSA + + Erabili Sinadura digitalaren algoritmoa (DSA) azpigakoa sortzeko. Azpigakoak sinatu soilik egin dezake. + + + + ElGamal + + Erabili ElGamal algoritmoa azpigako bat sortzeko. Azpigakoak enkriptatu soilik egin dezake. + + + + RSA + + Erabili Rivest-Shamir Adleman algoritmoa (RSA) azpigakoa sortzeko. Azpigako hori sinatzeko edo enkriptatzeko erabil daiteke, baina bi azpigako sortu beharko dituzu. + + + + + + + Gakoaren luzera + + Azpigakoaren luzera adierazten du bitetan. Orokorrean gakoa zenbat eta luzeagoa izan, orduan eta segurtasun gehiago emango dizu. + + + + Iraungitze-data + + Adierazten du zer datatik aurrera ezin izango den azpigakoa gehiago erabili. + + + + + + + Azpigakoaren iraungitze-data aldatzea + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Azpigako bat errebokatzea + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + Azpigakoa mementoan errebokatuko da. + + + + + Azpigako bat ezabatzea + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Shell seguruaren gakoen propietateak + Atal honetako deskribapenak SSH gako guztietan aplikatuko dira. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Propietateak + + + + Fingerprint + + Gakoa identifikatzen duen ezaugarri-kate bat da hatz-marka. + + + + Algorithm + + Gako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. + + + + Location + + Kokaleku honetan gorde dira gako pribatuak. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Shell seguruaren gako bat ezabatzea + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Gakoak inportatzea + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Gakoak esportatzea + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Gako bat sinatzea + Beste norbaiten gakoa sinatzeak esan nahi du pertsona horri fidagarritasuna ematen diozula. Gako bat sinatu baino lehenago, egiaztatu gakoaren hatz-markak seguruak direla eta gakoa benetan pertsona horrena dela. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Hobespenak + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + + To change the unlock password of the keyring, first select the appropriate keyring and then + press Change Unlock Password button. You will then be prompted to + type the old password in the Old password text box, the new password in the + New password text box and + confirm it in the Confirm password text box. + To apply the settings, press Change. + If the old password is correct, you will get a status + message indicating the success of the operation. If the + old password is not correct you will be asked to check + its correctness. + + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Gako-zerbitzariak + Zure gakoak eta besteenak eguneratuta edukitzen ditu; horretarako, aldian behin urrutiko gako-zerbitzariekin sinkronizatzen ditu. Sinkronizazioak ziurtatuko du azken sinadurak gako guztietan edukiko dituzula, eta, beraz, sare fidagarria erabilgarriagoa izango da. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + LDAP gako-zerbitzariak ez dira hain arruntak, baina LDAP protokolo estandarra erabiltzen dute gakoak zerbitzatzeko. ldap://keyserver.pgp.com LDAP zerbitzari ona da. + + + + + + + Gakoak partekatzea + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/eu/legal.xml seahorse-3.6.3/help/eu/legal.xml --- seahorse-3.2.2/help/eu/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/eu/legal.xml 2012-11-09 17:35:37.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + Eskuliburu hau GFDL lizentziarekin banatzen diren GNOME eskuliburuen bildumakoa da. Eskuliburu hau bildumatik bereizita banatu nahi baduzu, banatu dezakezu, baina eskuliburuari lizentziaren kopia bat gehitu beharko diozu lizentzian bertan 6. atalean azaltzen den bezala. + + Enpresek beren produktu eta zerbitzuak bereizteko erabiltzen dituzten izen asko marka erregistratu gisa hartu behar dira. Izen horiek GNOMEren edozein agiritan agertzen direnean, eta GNOMEren Dokumentazio Proiektuko kideak marka komertzialak direla konturatzen direnean, izen horiek maiuskulaz idatzita agertuko dira, osorik edo hasierako letra bakarrik. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/eu/seahorse.xml seahorse-3.6.3/help/eu/seahorse.xml --- seahorse-3.2.2/help/eu/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/eu/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1002 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins eta Adam Schreiber - 2008.Hizkuntza Politikarako Sailburuordetza (hizpol@ej.gv.es) - - Seahorse proiektua - - - - Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko, Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1 bertsioan edo berriago batean ezarritako baldintzetan, atal aldaezinik gabe, aurreko azaleko testurik gabe eta atzeko azaleko testurik gabe. GFDL lizentziaren kopia esteka honetan edo eskuliburu honekin batera ematen den COPYING-DOCS fitxategian aurkituko duzu. - Eskuliburu hau GFDL lizentziarekin banatzen diren GNOME eskuliburuen bildumakoa da. Eskuliburu hau bildumatik bereizita banatu nahi baduzu, banatu dezakezu, baina eskuliburuari lizentziaren kopia bat gehitu beharko diozu lizentzian bertan 6. atalean azaltzen den bezala. - - Enpresek beren produktu eta zerbitzuak bereizteko erabiltzen dituzten izen asko marka erregistratu gisa hartu behar dira. Izen horiek GNOMEren edozein agiritan agertzen direnean, eta GNOMEren Dokumentazio Proiektuko kideak marka komertzialak direla konturatzen direnean, izen horiek maiuskulaz idatzita agertuko dira, osorik edo hasierako letra bakarrik. - - DOKUMENTUA ETA DOKUMENTUAREN BERTSIO ALDATUAK GNU DOKUMENTAZIO LIBREAREN LIZENTZIAREN BALDINTZEN ARABERA EMATEN DIRA, ETA ONDOREN ZEHAZTEN DIRENAK ONARTZERA BEHARTZEN DUTE: - - DOKUMENTUA "DAGOEN-DAGOENEAN" EMATEN DA, INOLAKO BERMERIK GABE, EZ ESPRESUKI ADIERAZITAKORIK ETA EZ INPLIZITURIK ERE; BESTEAK BESTE EZ DA BERMATZEN DOKUMENTUA EDO BERTSIO ALDATUA AKATSIK GABEA DENIK, MERKATURATZEKO EDO XEDE JAKIN BATERAKO EGOKIA DENIK EDO ARAURIK HAUSTEN EZ DUENIK, HORI GUZTIA MUGARIK GABE. DOKUMENTUAREN EDO DOKUMENTUAREN BERTSIO ALDATUAREN KALITATEARI, ZEHAZTASUNARI ETA PERFORMANTZIARI BURUZKO ERANTZUKIZUN OSOA ZUREA DA. DOKUMENTUREN BATEK EDO BERTSIO ALDATUREN BATEK EDOZEIN MOTATAKO AKATSIK IZANEZ GERO, ZUK (EZ HASIERAKO IDAZLEAK, EZ EGILEAK ETA EZ INONGO KOLABORATZAILEK) ZEURE GAIN HARTU BEHARKO DUZU BERRIKUSTEKO, KONPONTZEKO EDO ZUZENTZEKO BEHAR DIREN ZERBITZU GUZTIEN KOSTUA. BERME-UKATZE HAU LIZENTZIA HONEN FUNTSEZKO ZATIA DA. EZ DA BAIMENIK EMATEN EZEIN DOKUMENTU EDO BERTSIO ALDATU ERABILTZEKO, BALDIN ETA EZ BADA BERME-UKATZE HAU ONARTZEN. - - - EZIN IZANGO DA INONGO ZIRKUNSTANTZIARIK EDO LEGE-TEORIARIK OINARRI HARTU --EZ ERANTZUKIZUN ZIBILARI BURUZKORIK (ZABARKERIA BARNE HARTUTA), EZ KONTRATUARI BURUZKORIK, EZ BESTERIK-- DOKUMENTU HONEN EDO BERTSIO ALDATU BATEN EGILEA, HASIERAKO IDAZLEA, EDOZEIN KOLABORATZAILE EDO BANATZAILE, EDO ALDERDI HORIEN EDOZEIN HORNITZAILE BESTE PERTSONA BATEN AURREAN ERANTZULE EGITEKO, PERTSONA HORREK EDOZEIN MOTATAKO KALTEA JASAN DUELAKO (ZUZENEKOA, ZEHARKAKOA, BEREZIA, INTZIDENTALA EDO ONDORIOZKOA), HALA NOLA (ETA MUGARIK GABE) BEZEROAK GALTZEA, LANA ETEN BEHARRA, ORDENAGAILUAK EZ IBILTZEA EDO GAIZKI IBILTZEA, EDO DOKUMENTUA NAHIZ HAREN BERTSIO ALDATUAK ERABILTZETIK ONDORIOZTATZEN DIREN EDO ERABILERA HORREKIN ZERIKUSIA DUTEN KALTEAK EDO GALERAK, ALDERDIARI KALTE HORIEK GERTA ZITEZKEELA ADITZERA EMAN BAZAIO ERE. - - - - - - - - Jacob - Perkins - - Seahorse proiektua - - - - - Adam - Schreiber - - Seahorse proiektua -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse proiektua - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - August 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - 2006ko azaroa - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - 2005eko uztaila - - Adam Schreiber sadam@clemson.edu - Seahorse proiektua - - - - Passwords and Keys Manual V0.7.0 - 2003ko otsaila - - Jacob Perkins - Seahorse proiektua - - - - This manual describes version 2.28.x of Passwords and Keys - - Ohar-bidaltzea - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Enkriptatze-gakoak - - - - - - Sarrera - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - PGP eta SSH gakoak sortzea eta kudeatzea, - - - PGP eta SSH gakoak esportatzea eta inportatzea, - - - Gakoak besteekin partekatzea, - - - - - - - - - Erabiltzen hastea - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Aplikazioak menua - - Choose - - Accessories - Password and Keys - . - - - - Komando-lerroa - - Idatzi seahorse, eta sakatu Sartu. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Erakutsi Passwords and Keys leihoa. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Menu-barra - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Tresna-barra - - Erabili tresna-barra gehien erabiltzen diren komandoetara azkar sartzeko. - - - Gakoen eta pasahitzen fitxak - - Gako sortako gakoetarako eta pasahitzetarako sarbidea ematen du. - - - Oinarrizko aukerak - - Ekintza erabilgarrietarako sarbide azkarra eskaintzen die erabiltzaile hasiberriei. Aukera honetan, hauek egin ditzakezu: - - - Laguntza-sisteman nabigatu, - - - Gakoak gako sortara inportatu, - - - Gako berriak sortu. - - - - - - - - - - - - OpenPGP gakoak sortzea - Posta elektronikoa enkriptatzeko jabedun gabeko protokoloa da OpenPGP. PGPn oinarritutako gako publikoaren kriptografia erabiltzen du. Enkriptatutako mezuen, sinaduren, gako pribatuen eta ziurtagirien formatu estandarrak zehazten ditu, gako publikoak trukatzeko. - Gako publikoaren kriptografiak bi gakoren erabilera nahasten du: gako publiko bat (jakinarazi nahi diozun edozeini eman diezaiokezu), eta gako pribatu bat (pribatua da eta ezkutuan gorde behar da). - OpenPGP gakoak sortzeko: - - - Choose FileNew... - - - - Hautatu PGP Gakoa eta egin klik Jarraitu botoian. - - - Sar ezazu izen osoa (izena – abizena), helbide elektronikoa eta informazio osagarria. Gakorako aukera aurreratuak ere zehaztu ditzakezu: ikus behean. - - - Egin klik Sortu botoian gako pare berri bat sortzeko. - - - PGP gako berriaren pasaesaldia elkarrizketa-koadroa irekiko da. Idatzi bi bider gako berriaren pasaesaldia. - - - - Pasaesaldia aukeratzeko, erabili pasahitz sendo bat aukeratzeko erabiliko zenukeen prozedura bera. Pasahitz baten eta pasaesaldi baten arteko ezberdintasun nagusia da pasaesaldian zuriuneak onartzen direla. - - - - Aukera aurreratuak - Zabaldu Gako-aukera aurreratuak atala, gako berri baterako aukera hauek zehazteko: - - - Enkriptatze mota - - Alor honek gako berria sortzeko erabiltzen diren enkriptatze-algoritmoak zehazten ditu. - - - DSA ElGamal - - Hori da aholkatzen dugun aukera, behar duzuna enkriptatzeko, desenkriptatzeko, sinatzeko eta egiaztatzeko aukera emango baitizu. - - - - DSA - - Sinatzeko aukera soilik emango dizu. - - - - RSA - - Sinatzeko aukera soilik emango dizu. - - - - - - - Gakoaren indarra (bitetan) - - Gakoaren luzera da bitetan. Gakoa zenbat eta handiagoa, orduan eta seguruagoa izango da, baldin eta pasaesaldi sendo bat erabiltzen baduzu. Bestalde, gako handi batekin gako txikiago batekin baino denbora gehiago beharko da eragiketa bat egiteko. 1.024 eta 4.096 bit arteko balioak onartzen dira. Gutxienez, 2.048 bit izatea gomendatzen da. - - - - Iraungitze-data - - Data honetatik aurrera gakoa ez da erabilgarri izango enkriptazioak egiteko edo operazioak sinatzeko. 6 hilabete zentzuzko epea da horretarako. Iraungitze-data aldatu edo gako berri bat sortu beharko duzu epe hori igaro denean. - Sinatu gako berria gako zaharrarekin (iraungi baino lehenago) fidagarritasun-maila mantentzeko. - - - - - - - - - - - Shell seguruaren gakoak sortzea - Shell segurua (SSH) urrutiko ordenagailu batera konektatu eta komandoak exekutatzeko modua da. SSH gakoak gakoetan oinarrituriko autentifikazio-sistemetan erabiltzen dira, lehenespenezko pasahitzaren autentifikazio-sistemaren ordezko moduan. Gakoetan oinarritutako autentifikazioan ez da pasahitzik idatzi behar identifikatzeko. - Shell seguruaren gakoak bi gakoz osatuta daude: gako pribatu bat, isilpean gorde behar dena, eta gako publiko bat, sartu behar duzun edozein ordenagailutan kargatu dezakezuna. - Shell seguruaren gako bat sortzea: - - - Choose FileNew... - - - Hautatu Shell seguruaren gakoa eta egin klik Jarraitu botoian. - - - Gakoa zertarako erabili behar den deskriba ezazu. Zure helbide elektronikoa edo beste edozein oroigarri erabil dezakezu. Gakorako aukera aurreratuak ere zehaztu ditzakezu: ikus behean. - - - Egin klik Gakoa sortu soilik botoian gako berria sortzeko, edo Sortu eta konfiguratu botoian gakoa sortu eta beste ordenagailu batek autentifikazioa erabil dezan konfiguratzeko. - - - Shell seguruaren gako berriaren pasaesaldia elkarrizketa-koadroa irekiko da. Idatzi gako berriaren pasaesaldia bi bider. - - Pasaesaldia aukeratzeko, erabili pasahitz sendo bat aukeratzeko erabiliko zenukeen prozedura bera. Pasahitz baten eta pasaesaldi baten arteko ezberdintasun nagusia da pasaesaldian zuriuneak onartzen direla. - - - - - - - - Aukera aurreratuak - Zabaldu Gako-aukera aurreratuak atala gako berri baten aukerak zehazteko: - - - - Enkriptatze mota - - Alor honek gako berria sortzeko erabiltzen diren enkriptatze-algoritmoak zehazten ditu. - - - RSA - - Erabili Rivest-ShamirAdleman algoritmoa (RSA) SSH gakoa sortzeko. Hau da hobesten den eta seguruena den aukera. - - - - DSA - - Erabili Sinadura digitalaren algoritmoa (DSA) SSH gakoa sortzeko. - - - - - - - Gakoaren indarra (bitetan) - - Gakoaren luzera da bitetan. Gakoa zenbat eta handiagoa, orduan eta seguruagoa izango da, baldin eta pasaesaldi sendo bat erabiltzen baduzu. Bestalde, gako handi batekin gako txikiago batekin baino denbora gehiago beharko da eragiketa bat egiteko. 1.024 eta 4.096 bit arteko balioak onartzen dira. Gutxienez, 2.048 bit izatea gomendatzen da. - - - - - - - - - - OpenPGP Gakoaren propietateak - Atal honetako deskribapenak OpenPGP gako guztietan aplikatuko dira. - - PGP gako baten propietateak ikusteko: - - Hautatu PGP gakoa leiho nagusian. - - - Egin klik bi aldiz edo aukeratu Propietateak tresna-barran. - - - Hautatu Xehetasunak fitxa. - - - - - Propietateak - - - - Hatz-marka - - Gakoa identifikatzen duen ezaugarri-kate bat da hatz-marka. - - - - Gakoaren identifikazioa - - Gakoaren identifikazioa hatz-markaren antzekoa da. Hala ere, Gakoaren identifikazioak hatz-markaren azken 8 karaktereak soilik ditu. Gehienetan gako bat Gakoaren identifikazioarekin soilik identifikatzeko aukera dago, baina batzuetan bi gakok identifikazio bera izan dezakete. - - - - Mota - - Gako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. DSA gakoak sinatzeko soilik erabil daitezke. ElGamal gakoak enkriptatzeko erabiltzen dira. - - - - Sortuta - - Gakoa sortu zen data adierazten du. - - - - Iraungitze-data - - Adierazten du zein datatik aurrera ezingo den gakoa gehiago erabili. - - - - Indarra - - Gakoaren luzera adierazten du bitetan. Orokorrean gakoa zenbat eta luzeagoa izan, orduan eta segurtasun gehiago emango dizu. - Gako luze bat ez da nahikoa pasaesaldi ahul baten erabilera ordezteko. - - - - - - - - - Fidagarritasuna - Fidagarritasunak adierazten du zenbateraino zauden ziur pertsona batek gaitasuna duela sare fidagarria zuzen zabaltzeko. Zuk sinatu ez duzun gako baten aurrean aurkitzen zarenean, bildu dituen sinaduretan eta sinatu duten pertsonengan duzun fidagarritasunean oinarrituko da pertsona horren gakoaren balioa. Lehenespenez, gako ezezagun batek garrantzi gutxiko hiru sinadura edo fidagarritasun osoko sinadura bat beharko du. - - Ezezaguna: ez dakizu pertsona hori gai den gakoak zuzen sinatzeko. - Inoiz ere ez: pertsona horrek ezin ditu gakoak zuzen sinatu. - Marjinala: pertsona horrek argazki-identifikazioa egiaztatzen du gako bat sinatu aurretik, baina ez ditu ezinbestean identifikazioak aztertzen. - Osoa: pertsona horrek pertsona guztien identifikazio-argazkiak aztertzen ditu sinatu aurretik (hau da, benetan pertsona bati dagozkion gakoak soilik sinatzen ditu, eta, horretarako, pertsona horren sinadura eskatzen du) - Azkena: fidagarritasun-maila hau zure gakoetan soilik ezarri beharko litzateke. - - - - - Gakoak aktibatzea eta desaktibatzea - Gako bat aktibatuta baldin badago, enkriptatzeko erabil daiteke. Gako bat desaktibatuta baldin badago, ezin da ez enkriptatzeko ez eta sinadurak egiaztatzeko erabili. - - - - Iraungitze-data - Gako bat iraungita baldin badago, ezingo da gehiago erabili. Gako baten iraungitze-data luzatzean, berriro ere aktibatzen da. Onena litzake inoiz iraungitzen ez den gako maisu bat izatea eta gako horrekin sinatutako zenbait azpigako izatea. - - - - Erabiltzaileen identifikazioa - Erabiltzaileen identifikazioak gako berarekin hainbat identitate eta helbide elektroniko erabiltzeko aukera ematen du. - Forma hemendik hartzen dute normalean: Izena (iruzkina) <helbide elektronikoa> - - - Erabiltzaile-identifikazioa gehitzea - Erabiltzaile-identifikazio bat gehitzea erabilgarria da lanerako identitate bat eta lagunentzako beste bat eduki nahi duzunean. - Gako batean erabiltzaile-identifikazio bat gehitzea: - - Hautatu gakoa leiho nagusitik. - - - Egin klik bikoitza edo aukeratu tresna-barrako Propietateak, - - - Hautatu Izenak eta sinadurak fitxa. - - - Egin klik Gehitu izena.botoian. - - - Gaineko argibideei jarraitu ondoren, elkarrizketa-koadro bat agertzen da. Bete behar dituzun eremuak hemen zehaztuta dauzkazu: - - - Izen-abizenak - - Idatzi izen-abizenak <izena> <abizena>-en. Bigarren abizena edo inizialak ez dira beharrezkoak. - - - Gutxienez bost karaktere idatzi behar dituzu eremu honetan. - - - - - - Helbide elektronikoa - - Zure helbide elektronikoaren bidez kokatuko du jendeak zure gakoa gako-zerbitzari batean edo beste gako-hornitzaile batean. Ziurtatu zuzen dagoela jarraitu aurretik. - - - <erabiltzaile-izena>>@<domeinu-izena>en formakoa izan beharko luke. - - - - - - Gakoaren iruzkina - - Zure identifikazio berriaren izenari informazio gehigarria eransteko, iruzkinaren eremua erabil daiteke. Informazio hori gako-zerbitzarietan bila daiteke. - - - - - - - - Identifikazio-argazkiak - Gakoaren jabearen argazki bat edo gehiago txertatzeko aukera ematen du identifikazio-argazkiak Identitate hauek erabiltzaile-identifikazio normalen moduan sina daitezke. Identifikazio-argazkiek JPEG formatuan egon behar dute, eta 240x288 pixel baino gehiagokoak ez izatea gomendatzen da. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Pasaesaldia aldatzea - Gako baten pasaesaldia aldatzeko: - - Hautatu gakoa leiho nagusitik. - - - Egin klik bi aldiz edo aukeratu Propietateak tresna-barran. - - - Egin klik Aldatu botoian. - - - Idatzi pasaesaldi berria eta sakatu Ados. - - - - Gako bat ezabatzea - Zure gako sortatik gako bat ezabatzeko: - - Hautatu gakoa leiho nagusitik. - - - Egin klik eskuineko botoiaz gainean eta aukeratu Ezabatu gakoa edo aukeratu EditatuEzabatu gakoa. - - - - Gakoak, gako fidagarriak eta bildutako gakoak ezaba ditzakezu. - - - - - - - - OpenPGP Azpigakoen propietateak - OpenPGP gako bakoitzak gako maisu bat erabiltzen du sinatzeko. Azpigakoak enkriptatzeko eta sinatzeko erabiltzen dira. Hala, zure azpigakoa itunduta baldin badago, ez duzu gako maisua errebokatu beharrik. - - - Identifikazioa - - Hau da azpigakoaren identifikatzailea. - - - - Mota - - Azpigako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. DSA gakoek sinatu soilik egin dezakete, ElGamal gakoak enkriptatzeko erabiltzen dira eta RSA gakoak sinatzeko edo enkriptatzeko erabiltzen dira. - - - - Sortuta - - Gakoa sortu zen data adierazten du. - - - - Iraungitze-data - - Adierazten du zein datatik aurrera ezingo den gakoa gehiago erabili. - - - - Egoera - - Mezuaren egoera adierazten du. - - - - Indarra - - Gakoaren luzera adierazten du bitetan. Orokorrean gakoa zenbat eta luzeagoa izan, orduan eta segurtasun gehiago emango dizu. - Gako luze bat ez da nahikoa pasaesaldi ahul baten erabilera ordezteko. - - - - - - - Azpigako bat gehitzea - Gako batean azpigako bat gehitzeko, egin klik Azpigakoak menuko Gehitu botoian - Gaineko argibideei jarraitu ondoren, elkarrizketa-koadro bat agertzen da. Bete behar dituzun eremuak hemen zehaztuta dauzkazu: - - - Gako mota - - Azpigako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. - - - DSA - - Erabili Sinadura digitalaren algoritmoa (DSA) azpigakoa sortzeko. Azpigakoak sinatu soilik egin dezake. - - - - ElGamal - - Erabili ElGamal algoritmoa azpigako bat sortzeko. Azpigakoak enkriptatu soilik egin dezake. - - - - RSA - - Erabili Rivest-Shamir Adleman algoritmoa (RSA) azpigakoa sortzeko. Azpigako hori sinatzeko edo enkriptatzeko erabil daiteke, baina bi azpigako sortu beharko dituzu. - - - - - - - Gakoaren luzera - - Azpigakoaren luzera adierazten du bitetan. Orokorrean gakoa zenbat eta luzeagoa izan, orduan eta segurtasun gehiago emango dizu. - - - - Iraungitze-data - - Adierazten du zer datatik aurrera ezin izango den azpigakoa gehiago erabili. - - - - - - - Azpigakoaren iraungitze-data aldatzea - Azpigako baten iraungitze-data aldatzeko, hautatu azpigakoa Azpigakoak sailean, eta: - - Egin klik ezkerreko Iraungi botoian. - - - Dataren elkarrizketa-koadroan aukeratu iraungitze-data berria edo hautatu Ez da iraungitzen iraungitze-datarik izan ez dezan. - - - - - - Azpigako bat errebokatzea - Azpigako bat errebokatzeko, hautatu azpigakoa Azpigakoak sailean, eta: - - Egin klik ezkerreko Errebokatu botoian. - - - Aukeratu azpigakoa errebokatzeko arrazoia: - - - - Ez dago arrazoirik - - Ez dago arrazoi zehatzik gakoa errebokatzeko. - - - - Itunduta - - Gakoa itundu egin da. - - - - Ordeztuta - - Beste gako batek zure gakoa ordeztu du. - - - - Erabili gabe - - Gakoa ez da gehiago erabiliko. - - - - - - - Idatz ezazu zergatik ari zaren gakoa errebokatzen, - - - Egin klik Errebokatu botoian. - - - - Azpigakoa mementoan errebokatuko da. - - - - - Azpigako bat ezabatzea - Azpigako bat ezabatzeko, hautatu azpigakoa Azpigakoak sailean, eta: - - Egin klik ezkerreko Ezabatu botoian. - - - - - - - - - Shell seguruaren gakoen propietateak - Atal honetako deskribapenak SSH gako guztietan aplikatuko dira. - SSH gako baten propietateak ikusteko: - - Hautatu Shell seguruaren gakoa leiho nagusian, - - - Egin klik bi aldiz edo aukeratu Propietateak tresna-barran. - - - Hautatu Xehetasunak fitxa. - - - - - Propietateak - - - - Hatz-marka - - Gakoa identifikatzen duen ezaugarri-kate bat da hatz-marka. - - - - Algoritmoa - - Gako bat sortzeko erabilitako enkriptatze-algoritmoa zehazten du. - - - - Kokalekua - - Kokaleku honetan gorde dira gako pribatuak. - - - - Indarra - - Gakoaren luzera adierazten du bitetan. Orokorrean gakoa zenbat eta luzeagoa izan, orduan eta segurtasun gehiago emango dizu. - Gako luze bat ez da nahikoa pasaesaldi ahul baten erabilera ordezteko. - - - - - - - - - Shell seguruaren gako bat ezabatzea - Shell seguruaren gako bat ezabatzeko: - - Hautatu SSH gakoa leiho nagusian, - - - Egin klik eskuineko botoiaz gainean eta hautatu Ezabatu gakoa edo hautatu EditatuEzabatu gakoa. - - - - - - - - - Gakoak inportatzea - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - Hautatu ASCII armadura duen testu-bloke publiko bat, - - - Kopiatu arbelean, - - - Aukeratu EditatuKopiatu gakoak. - - - - - - - - - Gakoak esportatzea - - To export keys, select the keys in the main window - and choose - - File - Export - . - - Gakoak arbelera ere esporta ditzakezu ASCII armadura duen testu-bloke batean: - - Hautatu gakoak leiho nagusian, - - - Aukeratu EditatuKopiatu gakoak. - - - - - - - - - Gako bat sinatzea - Beste norbaiten gakoa sinatzeak esan nahi du pertsona horri fidagarritasuna ematen diozula. Gako bat sinatu baino lehenago, egiaztatu gakoaren hatz-markak seguruak direla eta gakoa benetan pertsona horrena dela. - Zure gako sortako gako bat sinatzeko: - - Hautatu sinatu nahi duzun gakoa Gako fidagarriak edo Bildutako beste gakoak fitxetan. - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - Hautatu gakoa frogatzeko erabili den arreta-maila. - - - Adierazi ea sinadurak eta gako sortak kokaleku berekoak izan behar duten eta ea sinadura erreboka daitekeen. - - - Egin klik Sinatu botoian. - - - - - - - - Hobespenak - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - - To change the unlock password of the keyring, first select the appropriate keyring and then - press Change Unlock Password button. You will then be prompted to - type the old password in the Old password text box, the new password in the - New password text box and - confirm it in the Confirm password text box. - To apply the settings, press Change. - If the old password is correct, you will get a status - message indicating the success of the operation. If the - old password is not correct you will be asked to check - its correctness. - - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Gako-zerbitzariak - Zure gakoak eta besteenak eguneratuta edukitzen ditu; horretarako, aldian behin urrutiko gako-zerbitzariekin sinkronizatzen ditu. Sinkronizazioak ziurtatuko du azken sinadurak gako guztietan edukiko dituzula, eta, beraz, sare fidagarria erabilgarriagoa izango da. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKP Zerbitzariak - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Gako-zerbitzariak - - LDAP gako-zerbitzariak ez dira hain arruntak, baina LDAP protokolo estandarra erabiltzen dute gakoak zerbitzatzeko. ldap://keyserver.pgp.com LDAP zerbitzari ona da. - - - - - - - Gakoak partekatzea - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - Programa-errore baten berri emateko, edo aplikazioari nahiz eskuliburuari buruzko iradokizunak egiteko, ikus azalpenak: GNOMEren erabiltzailearen gida . - Programa hau Free Software Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan edo (nahiago baduzu) bertsio berriago batean jasotako baldintzen arabera banatzen da. Lizentzia horren kopia dator dokumentazio honekin; beste kopia bat iturburu-kodetan sartutako COPYING fitxategian aurkituko duzu. - -
diff -Nru seahorse-3.2.2/help/fr/fr.po seahorse-3.6.3/help/fr/fr.po --- seahorse-3.2.2/help/fr/fr.po 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/fr/fr.po 2012-09-18 13:10:35.000000000 +0200 @@ -9,59 +9,78 @@ msgid "" msgstr "" "Project-Id-Version: seahorse HEAD fr\n" -"POT-Creation-Date: 2011-08-30 08:37+0000\n" +"POT-Creation-Date: 2012-09-12 09:22+0000\n" "PO-Revision-Date: 2009-09-19 20:43+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" +"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/seahorse.xml:224(None) +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "" +"Claude Paroz , 2007-2009\n" +"Yann Simon , 2007" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:224(imagedata) +msgctxt "_" msgid "" -"@@image: 'figures/seahorse-window.png'; md5=d52b0902a24b89d5aadc50e64f471c7d" +"external ref='figures/seahorse-window.png' " +"md5='d52b0902a24b89d5aadc50e64f471c7d'" msgstr "" -"@@image: 'figures/seahorse-window.png'; md5=d52b0902a24b89d5aadc50e64f471c7d" +"external ref='figures/seahorse-window.png' " +"md5='d52b0902a24b89d5aadc50e64f471c7d'" -#: C/seahorse.xml:16(title) +#: C/index.docbook:16(articleinfo/title) msgid "Passwords and Keys Manual" msgstr "Manuel de Mots de passe et clés" -#: C/seahorse.xml:18(year) -msgid "2005, 2006, 2007, 2008, 2009" -msgstr "2005, 2006, 2007, 2008, 2009" - -#: C/seahorse.xml:19(holder) -msgid "Jacob Perkins and Adam Schreiber" -msgstr "Jacob Perkins et Adam Schreiber" - -#: C/seahorse.xml:22(publishername) C/seahorse.xml:31(orgname) -#: C/seahorse.xml:43(orgname) C/seahorse.xml:63(publishername) -#: C/seahorse.xml:106(para) C/seahorse.xml:118(para) +#: C/index.docbook:17(articleinfo/copyright) +msgid "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins and Adam " +"Schreiber" +msgstr "" +"2005, 2006, 2007, 2008, 2009 Jacob Perkins et Adam " +"Schreiber" + +#: C/index.docbook:22(publisher/publishername) +#: C/index.docbook:63(publisher/publishername) +#: C/index.docbook:106(revdescription/para) +#: C/index.docbook:118(revdescription/para) msgid "Seahorse Project" msgstr "Projet Seahorse" # Mentions légales -#: C/seahorse.xml:2(para) +#: C/index.docbook:2(legalnotice/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." +"of the GFDL at this link or in " +"the file COPYING-DOCS distributed with this manual." msgstr "" "Permission vous est donnée de copier, distribuer et/ou modifier ce document " "selon les termes de la Licence GNU Free Documentation License, Version 1.1 " "ou ultérieure publiée par la Free Software Foundation sans section " "inaltérable, sans texte de première page de couverture ni texte de dernière " "page de couverture. Vous trouverez un exemplaire de cette licence en suivant " -"ce lien ou dans le fichier " +"ce lien ou dans le fichier " "COPYING-DOCS fourni avec le présent manuel." -#: C/seahorse.xml:12(para) +#: C/index.docbook:12(legalnotice/para) C/legal.xml:12(legalnotice/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, " @@ -74,7 +93,7 @@ "exemplaire de la licence au document, comme indiqué dans la section 6 de " "celle-ci." -#: C/seahorse.xml:19(para) +#: C/index.docbook:19(legalnotice/para) C/legal.xml:19(legalnotice/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 " @@ -88,7 +107,7 @@ "Documentation GNOME sont informés de l'existence de ces marques déposées, " "soit ces noms entiers, soit leur première lettre est en majuscule." -#: C/seahorse.xml:35(para) +#: C/index.docbook:35(listitem/para) C/legal.xml:35(listitem/para) msgid "" "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " @@ -115,7 +134,7 @@ "SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ " "SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; " -#: C/seahorse.xml:55(para) +#: C/index.docbook:55(listitem/para) C/legal.xml:55(listitem/para) msgid "" "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " "NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " @@ -140,129 +159,126 @@ "VERSIONS MODIFIÉES, MÊME SI LADITE PARTIE A ÉTÉ INFORMÉE DE L'ÉVENTUALITÉ DE " "TELS DOMMAGES." -#: C/seahorse.xml:28(para) +#: C/index.docbook:28(legalnotice/para) C/legal.xml:28(legalnotice/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: " -"" +"<_:orderedlist-1/>" msgstr "" "LE PRÉSENT DOCUMENT ET SES VERSIONS MODIFIÉES SONT FOURNIS SELON LES TERMES " -"DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE : " - -#: C/seahorse.xml:28(firstname) -msgid "Jacob" -msgstr "Jacob" - -#: C/seahorse.xml:29(surname) -msgid "Perkins" -msgstr "Perkins" - -#: C/seahorse.xml:40(firstname) -msgid "Adam" -msgstr "Adam" +"DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE : <_:orderedlist-1/>" -#: C/seahorse.xml:41(surname) -msgid "Schreiber" -msgstr "Schreiber" - -#: C/seahorse.xml:45(email) -msgid "sadam@clemson.edu" -msgstr "sadam@clemson.edu" +#: C/index.docbook:27(authorgroup/author) +msgid "" +"Jacob Perkins " +"Seahorse Project " +msgstr "" +"Jacob Perkins " +"Projet Seahorse " -#: C/seahorse.xml:50(firstname) -msgid "Paul" -msgstr "Paul" +#: C/index.docbook:39(authorgroup/author) +msgid "" +"Adam Schreiber " +"Seahorse Project
sadam@clemson.edu
" +msgstr "" +"Adam Schreiber " +"Projet Seahorse
sadam@clemson.edu
" -#: C/seahorse.xml:51(surname) -msgid "Cutler" -msgstr "Cutler" +#: C/index.docbook:49(authorgroup/author) +msgid "" +"Paul Cutler " +"GNOME Documentation Project
" +"pcutler@foresightlinux.org
" +msgstr "" +"Paul Cutler " +"Projet de documentation GNOME
" +"pcutler@foresightlinux.org
" -#: C/seahorse.xml:53(orgname) C/seahorse.xml:66(publishername) +#: C/index.docbook:66(publisher/publishername) msgid "GNOME Documentation Project" msgstr "Projet de documentation GNOME" -#: C/seahorse.xml:55(email) -msgid "pcutler@foresightlinux.org" -msgstr "pcutler@foresightlinux.org" - -#: C/seahorse.xml:70(revnumber) -msgid "Passwords and Keys Manual V2.11.0" -msgstr "Manuel de Mots de passe et clés v2.11.0" - -#: C/seahorse.xml:71(date) -msgid "May 2009" -msgstr "Mai 2009" - -#: C/seahorse.xml:73(para) +#: C/index.docbook:73(revdescription/para) msgid "Paul Cutler pcutler@foresightlinux.org" msgstr "Paul Cutler pcutler@foresightlinux.org" -#: C/seahorse.xml:80(revnumber) -msgid "Passwords and Keys Manual V0.10.1" -msgstr "Manuel de Mots de passe et clés v0.10.1" - -#: C/seahorse.xml:81(date) -msgid "August 2008" -msgstr "Août 2008" +#: C/index.docbook:69(revhistory/revision) +msgid "" +"Passwords and Keys Manual V2.11.0 May 2009 <_:revdescription-1/>" +msgstr "" +"Manuel de Mots de passe et clés V2.11.0 Mai " +"2009 <_:revdescription-1/>" -#: C/seahorse.xml:83(para) C/seahorse.xml:103(para) +#: C/index.docbook:83(revdescription/para) +#: C/index.docbook:103(revdescription/para) msgid "Adam Schreiber sadam@clemson.edu" msgstr "Adam Schreiber sadam@clemson.edu" -#: C/seahorse.xml:90(revnumber) -msgid "Passwords and Keys Manual V0.9.1" -msgstr "Manuel de Mots de passe et clés V0.9.1" - -#: C/seahorse.xml:91(date) -msgid "November 2006" -msgstr "Novembre 2006" +#: C/index.docbook:79(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.10.1 August 2008 <_:revdescription-1/>" +msgstr "" +"Manuel de Mots de passe et clés V0.10.1 Août " +"2008 <_:revdescription-1/>" -#: C/seahorse.xml:93(para) +#: C/index.docbook:93(revdescription/para) msgid "Milo Casagrande milo_casagrande@yahoo.it" msgstr "Milo Casagrande milo_casagrande@yahoo.it" -#: C/seahorse.xml:100(revnumber) -msgid "Passwords and Keys Manual V0.9.0" -msgstr "Manuel de Mots de passe et clés V0.9.0" - -#: C/seahorse.xml:101(date) -msgid "July 2005" -msgstr "Juillet 2005" - -#: C/seahorse.xml:110(revnumber) -msgid "Passwords and Keys Manual V0.7.0" -msgstr "Manuel de Mots de passe et clés V0.7.0" - -#: C/seahorse.xml:111(date) -msgid "February 2003" -msgstr "Février 2003" +#: C/index.docbook:89(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.1 November 2006 <_:revdescription-1/>" +msgstr "" +"Manuel de Mots de passe et clés V0.9.1 Novembre " +"2006 <_:revdescription-1/>" + +#: C/index.docbook:99(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.9.0 July 2005 <_:revdescription-1/>" +msgstr "" +"Manuel de Mots de passe et clés V0.9.0 Juillet " +"2005 <_:revdescription-1/>" -#: C/seahorse.xml:113(para) +#: C/index.docbook:113(revdescription/para) msgid "Jacob Perkins" msgstr "Jacob Perkins" -#: C/seahorse.xml:122(releaseinfo) +#: C/index.docbook:109(revhistory/revision) +msgid "" +"Passwords and Keys Manual V0.7.0 February 2003 <_:revdescription-1/>" +msgstr "" +"Manuel de Mots de passe et clés V0.7.0 Février " +"2003 <_:revdescription-1/>" + +#: C/index.docbook:122(articleinfo/releaseinfo) msgid "This manual describes version 2.28.x of Passwords and Keys" msgstr "Ce manuel documente la version 2.28.x de Mots de passe et clés" # Autres chaînes -#: C/seahorse.xml:124(title) +#: C/index.docbook:124(legalnotice/title) msgid "Feedback" msgstr "Votre avis" -#: C/seahorse.xml:125(para) +#: C/index.docbook:125(legalnotice/para) msgid "" "To report a bug or make a suggestion regarding the Passwords " "and Keys application or this manual, follow the directions in " -"the Gnome Feedback PageGnome Feedback Page." msgstr "" "Pour rapporter une anomalie ou émettre une suggestion concernant " "Mots de passe et clés ou ce manuel, procédez " -"comme indiqué sur la page " +"comme indiqué sur la page " "de réactions sur GNOME." -#: C/seahorse.xml:132(para) +#: C/index.docbook:132(abstract/para) msgid "" "Passwords and Keys is the application for " "managing encryption keys for the GNOME Desktop" @@ -270,23 +286,23 @@ "Mots de passe et clés est l'application de " "gestion des clés de chiffrement du bureau GNOME" -#: C/seahorse.xml:140(primary) -msgid "Seahorse" -msgstr "Seahorse" - -#: C/seahorse.xml:144(primary) -msgid "seahorse" -msgstr "seahorse" - -#: C/seahorse.xml:148(primary) -msgid "Encryption Keys" -msgstr "Clés de chiffrement" +#: C/index.docbook:139(article/indexterm) +msgid "Seahorse" +msgstr "Seahorse" + +#: C/index.docbook:143(article/indexterm) +msgid "seahorse" +msgstr "seahorse" + +#: C/index.docbook:147(article/indexterm) +msgid "Encryption Keys" +msgstr "Clés de chiffrement" -#: C/seahorse.xml:154(title) +#: C/index.docbook:154(sect1/title) msgid "Introduction" msgstr "Introduction" -#: C/seahorse.xml:155(para) +#: C/index.docbook:155(sect1/para) msgid "" "You can use Passwords and Keys to create and " "manage PGP and SSH keys." @@ -294,7 +310,7 @@ "Vous pouvez utiliser Mots de passe et clés pour " "créer et gérer des clés PGP et SSH." -#: C/seahorse.xml:158(para) +#: C/index.docbook:158(sect1/para) msgid "" "Passwords and Keys provides a front end to many " "of the features of Gnu " @@ -306,34 +322,35 @@ "\"http\">Gnu Privacy Guard (GPG) et s'intègre avec plusieurs " "composants du bureau GNOME." -#: C/seahorse.xml:168(para) +#: C/index.docbook:168(listitem/para) msgid "Create and manage PGP and SSH keys," msgstr "Créer et gérer des clés PGP et SSH" -#: C/seahorse.xml:171(para) +#: C/index.docbook:171(listitem/para) msgid "Export and import PGP and SSH keys," msgstr "Exporter et importer des clés PGP et SSH" -#: C/seahorse.xml:174(para) +#: C/index.docbook:174(listitem/para) msgid "Share your keys with others," msgstr "Partager vos clés avec d'autres" -#: C/seahorse.xml:163(para) +#: C/index.docbook:163(sect1/para) msgid "" -"With Passwords and Keys you can: " +"With Passwords and Keys you can: <_:" +"itemizedlist-1/>" msgstr "" -"Avec Mots de passe et clés, vous pouvez : " -"" +"Avec Mots de passe et clés, vous pouvez : <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:183(title) +#: C/index.docbook:183(sect1/title) msgid "Getting Started" msgstr "Premiers pas" -#: C/seahorse.xml:185(title) +#: C/index.docbook:185(sect2/title) msgid "Starting Passwords and Keys" msgstr "Démarrage de Mots de passe et clés" -#: C/seahorse.xml:186(para) +#: C/index.docbook:186(sect2/para) msgid "" "You can start Passwords and Keys in the following " "ways:" @@ -341,33 +358,33 @@ "Vous pouvez lancer Mots de passe et clés à l'aide " "des procédures suivantes :" -#: C/seahorse.xml:192(term) +#: C/index.docbook:192(varlistentry/term) msgid "Applications menu" msgstr "Menu Applications" -#: C/seahorse.xml:194(para) +#: C/index.docbook:194(listitem/para) msgid "" -"Choose AccessoriesPassword and " -"Keys." +"Choose Accessories Password and " +"Keys ." msgstr "" "Choisissez AccessoiresMots de " "passe et clés." -#: C/seahorse.xml:202(term) +#: C/index.docbook:202(varlistentry/term) msgid "Command Line" msgstr "Ligne de commande" -#: C/seahorse.xml:204(para) +#: C/index.docbook:204(listitem/para) msgid "Type seahorse then press Return." msgstr "" "Saisissez seahorse, puis appuyez sur Entrée." -#: C/seahorse.xml:213(title) +#: C/index.docbook:213(sect2/title) msgid "When You Start Passwords and Keys" msgstr "Après le démarrage de Mots de passe et clés" -#: C/seahorse.xml:214(para) +#: C/index.docbook:214(sect2/para) msgid "" "When you start Passwords and Keys, the " "Password and Keys window is displayed." @@ -375,19 +392,21 @@ "Au démarrage de Mots de passe et clés, la fenêtre " "ci-dessous apparaît." -#: C/seahorse.xml:220(title) +#: C/index.docbook:220(figure/title) msgid "The Passwords and Keys Window" msgstr "La fenêtre de Mots de passe et clés" -#: C/seahorse.xml:228(application) -msgid "Passwords and Keys" -msgstr "Mots de passe et clés" - -#: C/seahorse.xml:227(phrase) -msgid "Show the window." -msgstr "Montre la fenêtre de ." +#: C/index.docbook:222(screenshot/mediaobject) +msgid "" +" Show the Passwords " +"and Keys window. " +msgstr "" +" Montre la fenêtre " +"Mots de passe et clés. " -#: C/seahorse.xml:235(para) +#: C/index.docbook:235(sect2/para) msgid "" "The Passwords and Keys window contains the " "following elements:" @@ -395,11 +414,11 @@ "La fenêtre de Mots de passe et clés contient les " "éléments suivants :" -#: C/seahorse.xml:240(term) +#: C/index.docbook:240(varlistentry/term) msgid "Menubar" msgstr "Barre de menus" -#: C/seahorse.xml:242(para) +#: C/index.docbook:242(listitem/para) msgid "" "The menus on the menubar contain all of the commands that you need to " "perform tasks in Passwords and Keys." @@ -407,29 +426,29 @@ "Les menus de la barre de menus contiennent toutes les commandes nécessaires " "à l'utilisation de Mots de passe et clés." -#: C/seahorse.xml:245(term) +#: C/index.docbook:245(varlistentry/term) msgid "Toolbar" msgstr "Barre d'outils" -#: C/seahorse.xml:247(para) +#: C/index.docbook:247(listitem/para) msgid "Use the toolbar to quickly access commonly-used commands." msgstr "" "Utilisez la barre d'outils pour accéder rapidement aux commandes les plus " "fréquemment utilisées." -#: C/seahorse.xml:250(term) +#: C/index.docbook:250(varlistentry/term) msgid "Keys and Passwords Tabs" msgstr "Onglets Clés et mots de passe" -#: C/seahorse.xml:252(para) +#: C/index.docbook:252(listitem/para) msgid "Provides access to the keys and passwords in the keyring." msgstr "Donnent accès aux clés et aux mots de passe du trousseau." -#: C/seahorse.xml:255(term) +#: C/index.docbook:255(varlistentry/term) msgid "First time options" msgstr "Options de premier démarrage" -#: C/seahorse.xml:257(para) +#: C/index.docbook:257(listitem/para) msgid "" "Provides fast access to useful actions for first time users. From here you " "can:" @@ -437,23 +456,23 @@ "Donnent un accès rapide aux opérations pertinentes pour débuter. À partir de " "là, vous pouvez :" -#: C/seahorse.xml:260(para) +#: C/index.docbook:260(listitem/para) msgid "Browse the help system," msgstr "Naviguer dans le système d'aide" -#: C/seahorse.xml:263(para) +#: C/index.docbook:263(listitem/para) msgid "Import keys in the keyring," msgstr "Importer des clés dans le trousseau" -#: C/seahorse.xml:266(para) +#: C/index.docbook:266(listitem/para) msgid "Create new keys." msgstr "Créer de nouvelles clés" -#: C/seahorse.xml:278(title) +#: C/index.docbook:278(sect1/title) msgid "Creating OpenPGP Keys" msgstr "Création de clés OpenPGP" -#: C/seahorse.xml:279(para) +#: C/index.docbook:279(sect1/para) msgid "" "OpenPGP is a non proprietary protocol for encrypting e-mail with the use of " "public key cryptography based on PGP. It defines standard " @@ -465,7 +484,7 @@ "définit des formats standards de messages chiffrés, de signatures, de clé " "privées et de certificats pour échanger des clés publiques." -#: C/seahorse.xml:284(para) +#: C/index.docbook:284(sect1/para) msgid "" "Public key cryptography is a concept which involves the use of two keys: a " "public key, that you can give to anyone with whom you " @@ -477,7 +496,7 @@ "transmettre à tous ceux avec qui vous voulez communiquer, et une " "clé privée qui est privée et doit rester secrète." -#: C/seahorse.xml:294(para) C/seahorse.xml:427(para) +#: C/index.docbook:294(listitem/para) C/index.docbook:427(listitem/para) msgid "" "Choose FileNew..." @@ -485,14 +504,14 @@ "Choisissez FichierNouveau..." -#: C/seahorse.xml:299(para) +#: C/index.docbook:299(listitem/para) msgid "" "Select PGP Key and click Continue" msgstr "" "Sélectionnez Clé PGP et cliquez sur " "Continuer" -#: C/seahorse.xml:304(para) +#: C/index.docbook:304(listitem/para) msgid "" "Enter your full name (first - last), your e-mail address and any additional " "information. You can also specify advanced options for the key: see below." @@ -501,13 +520,13 @@ "toute information supplémentaire. Vous pouvez aussi spécifier des options " "avancées pour la clé (voir ci-après)." -#: C/seahorse.xml:310(para) +#: C/index.docbook:310(listitem/para) msgid "Click Create to create the new key pair." msgstr "" "Cliquez sur Créer pour créer une nouvelle paire de " "clés." -#: C/seahorse.xml:315(para) +#: C/index.docbook:315(listitem/para) msgid "" "The Passphrase for New PGP Key dialog will open. Enter " "the passphrase twice for your new key." @@ -516,11 +535,11 @@ "guilabel> apparaît. Saisissez deux fois la phrase de passe pour la nouvelle " "clé." -#: C/seahorse.xml:290(para) -msgid "To create OpenPGP keys: " -msgstr "Pour créer des clés OpenPGP : " +#: C/index.docbook:290(sect1/para) +msgid "To create OpenPGP keys: <_:orderedlist-1/>" +msgstr "Pour créer des clés OpenPGP : <_:orderedlist-1/>" -#: C/seahorse.xml:323(para) C/seahorse.xml:446(para) +#: C/index.docbook:323(tip/para) C/index.docbook:446(tip/para) msgid "" "Use similar practices to generating a strong password when choosing a " "passphrase. The main difference between a password and a passphrase is that, " @@ -531,11 +550,11 @@ "de passe et une phrase de passe est que dans cette dernière, les espaces " "sont des caractères valides." -#: C/seahorse.xml:331(title) C/seahorse.xml:460(title) +#: C/index.docbook:331(sect2/title) C/index.docbook:460(sect2/title) msgid "Advanced options" msgstr "Options avancées" -#: C/seahorse.xml:332(para) +#: C/index.docbook:332(sect2/para) msgid "" "Expand the Advanced key options section to specify " "the following options for a new key:" @@ -543,21 +562,22 @@ "Étendez la section Options avancées de clé pour " "spécifier les options suivantes d'une nouvelle clé :" -#: C/seahorse.xml:338(guilabel) C/seahorse.xml:467(guilabel) -msgid "Encryption Type" -msgstr "Type de chiffrement" +#: C/index.docbook:338(varlistentry/term) +#: C/index.docbook:467(varlistentry/term) +msgid "Encryption Type" +msgstr "Type de chiffrement" -#: C/seahorse.xml:340(para) +#: C/index.docbook:340(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your keys." msgstr "" "Ce champ spécifie l'algorithme de chiffrement utilisé pour générer vos clés." -#: C/seahorse.xml:346(term) +#: C/index.docbook:346(varlistentry/term) msgid "DSA ElGamal" msgstr "DSA ElGamal" -#: C/seahorse.xml:348(para) +#: C/index.docbook:348(listitem/para) msgid "" "This is the suggested choice as it will allow you to encrypt, decrypt, sign " "and verify as needed." @@ -565,25 +585,27 @@ "Ce choix suggéré vous permettra de chiffer, déchiffrer, signer et vérifier " "selon vos besoins." -#: C/seahorse.xml:355(acronym) C/seahorse.xml:485(acronym) -#: C/seahorse.xml:916(acronym) -msgid "DSA" -msgstr "DSA" +#: C/index.docbook:355(varlistentry/term) +#: C/index.docbook:485(varlistentry/term) +#: C/index.docbook:916(varlistentry/term) +msgid "DSA" +msgstr "DSA" -#: C/seahorse.xml:357(para) C/seahorse.xml:365(para) +#: C/index.docbook:357(listitem/para) C/index.docbook:365(listitem/para) msgid "Will allow signing only." msgstr "Ne permet que la signature." -#: C/seahorse.xml:363(acronym) C/seahorse.xml:475(acronym) -#: C/seahorse.xml:935(term) -msgid "RSA" -msgstr "RSA" - -#: C/seahorse.xml:374(guilabel) C/seahorse.xml:497(guilabel) -msgid "Key Strength (bits)" -msgstr "Force de la clé (bits)" +#: C/index.docbook:363(varlistentry/term) +#: C/index.docbook:475(varlistentry/term) +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:374(varlistentry/term) +#: C/index.docbook:497(varlistentry/term) +msgid "Key Strength (bits)" +msgstr "Force de la clé (bits)" -#: C/seahorse.xml:376(para) C/seahorse.xml:499(para) +#: C/index.docbook:376(listitem/para) C/index.docbook:499(listitem/para) msgid "" "This is the length of the key in bits. The longer the key, the more secure " "it will be, provided a strong passphrase is used. Conversely, performing any " @@ -597,12 +619,11 @@ "s'exécuter qu'avec une clé courte. Les valeurs acceptables se situent entre " "1024 et 4096 bits. La recommandation est d'au moins 2048 bits." -#: C/seahorse.xml:386(guilabel) C/seahorse.xml:648(title) -#: C/seahorse.xml:957(term) -msgid "Expiration Date" -msgstr "Date d'expiration" +#: C/index.docbook:386(varlistentry/term) +msgid "Expiration Date" +msgstr "Date d'expiration" -#: C/seahorse.xml:395(para) +#: C/index.docbook:395(note/para) msgid "" "Sign your new key with your old one before it expires to preserve your trust " "status." @@ -610,23 +631,23 @@ "Signez votre nouvelle clé avec l'ancienne avant qu'elle expire pour " "préserver son capital de confiance." -#: C/seahorse.xml:388(para) +#: C/index.docbook:388(listitem/para) msgid "" "This is the date at which the key will cease to be usable for performing " "encryption or signing operations. 6 months is a reasonable time to set it " "to. You will have to either change the expiration date or generate a new key " -"or subkey after this amount of time passes. " +"or subkey after this amount of time passes. <_:note-1/>" msgstr "" "C'est la date à partir de laquelle la clé cessera d'être utilisable pour " "effectuer des opérations de chiffrement ou de signature. Six mois est une " "durée raisonnable. Passé ce délai, vous devrez soit changer la date " -"d'expiration, soit générer une nouvelle clé ou sous-clé. " +"d'expiration, soit générer une nouvelle clé ou sous-clé. <_:note-1/>" -#: C/seahorse.xml:410(title) +#: C/index.docbook:410(sect1/title) msgid "Creating Secure Shell Keys" msgstr "Création de clés Secure Shell" -#: C/seahorse.xml:411(para) +#: C/index.docbook:411(sect1/para) msgid "" "Secure Shell (SSH) is a way of logging into a remote " "computer to execute commands on that machine. SSH keys are used in key-based " @@ -641,7 +662,7 @@ "Avec l'authentification basée sur les clés, il n'est pas nécessaire de " "saisir manuellement un mot de passe pour être authentifié." -#: C/seahorse.xml:418(para) +#: C/index.docbook:418(sect1/para) msgid "" "Secure Shell keys are made of two keys: a private key, " "that must be kept secret, and a public key which can be " @@ -652,11 +673,11 @@ "publique qui peut être envoyée vers tout ordinateur auquel vous " "avez besoin d'accéder." -#: C/seahorse.xml:422(para) +#: C/index.docbook:422(sect1/para) msgid "To create a Secure Shell key:" msgstr "Pour créer une clé Secure Shell :" -#: C/seahorse.xml:430(para) +#: C/index.docbook:430(listitem/para) msgid "" "Select Secure Shell Key and click Continue" @@ -664,7 +685,7 @@ "Sélectionnez clé Secure Shell et cliquez sur " "Continuer" -#: C/seahorse.xml:433(para) +#: C/index.docbook:433(listitem/para) msgid "" "Enter a description of what the key is to be used for. You can use your e-" "mail address or any other reminder. You can also specify advanced options " @@ -674,7 +695,7 @@ "utiliser votre courriel ou tout autre indice. Vous pouvez également " "spécifier des options avancées pour la clé (voir ci-après)." -#: C/seahorse.xml:436(para) +#: C/index.docbook:436(listitem/para) msgid "" "Click Just Create Key to create the new key, or " "Create and Set Up to create the key and set up " @@ -685,7 +706,7 @@ "configurer un autre ordinateur pour qu'il reconnaisse cette clé lors de " "l'authentification." -#: C/seahorse.xml:441(para) +#: C/index.docbook:441(listitem/para) msgid "" "The Passphrase for New Secure Shell Key dialog opens. " "Enter the passphrase twice for your new key." @@ -694,7 +715,7 @@ "Shell apparaît. Saisissez deux fois la phrase de passe pour votre " "nouvelle clé." -#: C/seahorse.xml:461(para) +#: C/index.docbook:461(sect2/para) msgid "" "Expand the Advanced key options section to specify the " "following options for a new key:" @@ -702,13 +723,13 @@ "Développez la section Options avancées de clé afin de " "spécifier les options suivantes pour une nouvelle clé :" -#: C/seahorse.xml:469(para) +#: C/index.docbook:469(listitem/para) msgid "" "This field specifies the encryption algorithms used to generate your key." msgstr "" "Ce champ spécifie l'algorithme de chiffrement utilisé pour générer la clé." -#: C/seahorse.xml:477(para) +#: C/index.docbook:477(listitem/para) msgid "" "Use the Rivest-ShamirAdleman (RSA) " "algorithm to create the SSH key. This is the preferred and more secure " @@ -718,7 +739,7 @@ "(RSA) pour créer la clé SSH. C'est le choix préconisé et " "le plus sûr." -#: C/seahorse.xml:487(para) +#: C/index.docbook:487(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the SSH key." @@ -726,21 +747,22 @@ "Utilise l'algorithme Digital Signature Algorithm " "(DSA) pour créer la clé SSH." -#: C/seahorse.xml:518(title) +#: C/index.docbook:518(sect1/title) msgid "OpenPGP Key Properties" msgstr "Propriétés de clé OpenPGP" -#: C/seahorse.xml:519(para) +#: C/index.docbook:519(sect1/para) msgid "The descriptions in this section apply to all OpenPGP keys." msgstr "" "Les descriptions dans cette section s'appliquent à toutes les clés OpenPGP." -#: C/seahorse.xml:527(para) +#: C/index.docbook:527(listitem/para) msgid "Select the PGP key from the main window," msgstr "" "Sélectionnez la clé PGP dans la fenêtre principale ;" -#: C/seahorse.xml:533(para) C/seahorse.xml:781(para) C/seahorse.xml:1093(para) +#: C/index.docbook:533(listitem/para) C/index.docbook:781(listitem/para) +#: C/index.docbook:1093(listitem/para) msgid "" "Double click on it or choose Properties from the " "toolbar," @@ -748,25 +770,26 @@ "Double-cliquez sur la clé ou choisissez Propriétés dans " "la barre d'outils ;" -#: C/seahorse.xml:539(para) C/seahorse.xml:1099(para) +#: C/index.docbook:539(listitem/para) C/index.docbook:1099(listitem/para) msgid "Select the Details tab." msgstr "Sélectionnez l'onglet Détails." -#: C/seahorse.xml:523(para) -msgid "To view properties of a PGP key: " +#: C/index.docbook:523(sect1/para) +msgid "To view properties of a PGP key: <_:itemizedlist-1/>" msgstr "" -"Pour afficher les propriétés d'une clé PGP : " +"Pour afficher les propriétés d'une clé PGP : <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:547(title) C/seahorse.xml:1107(title) +#: C/index.docbook:547(sect2/title) C/index.docbook:1107(sect2/title) msgid "Properties" msgstr "Propriétés" -#: C/seahorse.xml:551(guilabel) C/seahorse.xml:1111(guilabel) -msgid "Fingerprint" -msgstr "Empreinte" +#: C/index.docbook:551(varlistentry/term) +#: C/index.docbook:1111(varlistentry/term) +msgid "Fingerprint" +msgstr "Empreinte" -#: C/seahorse.xml:553(para) C/seahorse.xml:1113(para) +#: C/index.docbook:553(listitem/para) C/index.docbook:1113(listitem/para) msgid "" "The fingerprint is a unique string of characters that exactly identifies a " "key." @@ -774,11 +797,11 @@ "L'empreinte est une chaîne de caractères unique qui identifie précisément " "une clé." -#: C/seahorse.xml:557(guilabel) -msgid "KeyID" -msgstr "Identifiant de clé" +#: C/index.docbook:557(varlistentry/term) +msgid "KeyID" +msgstr "Identifiant de clé" -#: C/seahorse.xml:559(para) +#: C/index.docbook:559(listitem/para) msgid "" "The KeyID is similar to the Fingerprint. However the KeyID only contains the " "last 8 characters of the fingerprint. Most of the time it is possible to " @@ -791,11 +814,12 @@ "l'identifiant de clé, mais il peut arriver que deux clés possèdent le même " "identifiant." -#: C/seahorse.xml:567(guilabel) C/seahorse.xml:847(guilabel) -msgid "Type" -msgstr "Type" +#: C/index.docbook:567(varlistentry/term) +#: C/index.docbook:847(varlistentry/term) +msgid "Type" +msgstr "Type" -#: C/seahorse.xml:569(para) +#: C/index.docbook:569(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a key. DSA keys can only " "sign. ElGamal keys are used to encrypt." @@ -803,46 +827,50 @@ "Spécifie l'algorithme de chiffrement utilisé pour générer la clé. Les clés " "DSA ne peuvent que signer. Les clés ElGamal sont utilisées pour chiffrer." -#: C/seahorse.xml:576(guilabel) C/seahorse.xml:858(guilabel) -msgid "Created" -msgstr "Créée le" +#: C/index.docbook:576(varlistentry/term) +#: C/index.docbook:858(varlistentry/term) +msgid "Created" +msgstr "Créée l" -#: C/seahorse.xml:578(para) C/seahorse.xml:860(para) +#: C/index.docbook:578(listitem/para) C/index.docbook:860(listitem/para) msgid "Indicates the date the key was created." msgstr "Indique la date de création de la clé." -#: C/seahorse.xml:584(guilabel) C/seahorse.xml:866(guilabel) -msgid "Expires" -msgstr "Expiration" +#: C/index.docbook:584(varlistentry/term) +#: C/index.docbook:866(varlistentry/term) +msgid "Expires" +msgstr "Expiration" -#: C/seahorse.xml:586(para) C/seahorse.xml:868(para) +#: C/index.docbook:586(listitem/para) C/index.docbook:868(listitem/para) msgid "Indicates the date the key can no longer be used." msgstr "" "Indique la date à partir de laquelle la clé ne pourra plus être utilisée." -#: C/seahorse.xml:592(guilabel) C/seahorse.xml:882(guilabel) -#: C/seahorse.xml:1139(guilabel) -msgid "Strength" -msgstr "Force" +#: C/index.docbook:592(varlistentry/term) +#: C/index.docbook:882(varlistentry/term) +#: C/index.docbook:1139(varlistentry/term) +msgid "Strength" +msgstr "Force" -#: C/seahorse.xml:598(para) C/seahorse.xml:888(para) C/seahorse.xml:1146(para) +#: C/index.docbook:598(note/para) C/index.docbook:888(note/para) +#: C/index.docbook:1146(note/para) msgid "A long key is not enough to make up for the use of a weak passphrase." msgstr "" "Une clé longue ne suffit pas à compenser la faiblesse d'une phrase de passe." -#: C/seahorse.xml:594(para) C/seahorse.xml:1141(para) +#: C/index.docbook:594(listitem/para) C/index.docbook:1141(listitem/para) msgid "" "Indicates the length in bits of a key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Indique la longueur de la clé en bits. En général, plus la clé est longue, " -"plus elle offre de sécurité. " +"plus elle offre de sécurité. <_:note-1/>" -#: C/seahorse.xml:610(title) +#: C/index.docbook:610(sect2/title) msgid "Trust" msgstr "Confiance" -#: C/seahorse.xml:611(para) +#: C/index.docbook:611(sect2/para) msgid "" "Trust is an indication of how sure you are of a person's ability to " "correctly extend the web of trust. When you are faced with a key you have " @@ -859,7 +887,7 @@ "clé inconnue nécessite 3 signatures avec une valeur de confiance marginale " "ou une signature complètement fiable." -#: C/seahorse.xml:619(para) +#: C/index.docbook:619(listitem/para) msgid "" "Unknown: You are not familiar with the person's ability " "to sign keys correctly." @@ -867,13 +895,13 @@ "Inconnu : vous n'avez aucune idée de la capacité de " "cette personne à signer correctement des clés." -#: C/seahorse.xml:622(para) +#: C/index.docbook:622(listitem/para) msgid "Never: This person cannot correctly sign keys." msgstr "" "Jamais : cette personne n'est pas apte à signer " "correctement des clés." -#: C/seahorse.xml:625(para) +#: C/index.docbook:625(listitem/para) msgid "" "Marginal: This person checks for photo ID before " "signing a key, but does not necessarily scrutinize the IDs." @@ -882,7 +910,7 @@ "l'identifiant avant de signer une clé, mais n'examine pas nécessairement " "l'identifiant de manière minutieuse." -#: C/seahorse.xml:629(para) +#: C/index.docbook:629(listitem/para) msgid "" "Full: This person scrutinizes each and every person's " "photo IDs before signing them (e.g. they only sign keys that truely belong " @@ -893,7 +921,7 @@ "(par exemple, elle ne signe que les clés qui appartiennent réellement à la " "personne demandant la signature)." -#: C/seahorse.xml:633(para) +#: C/index.docbook:633(listitem/para) msgid "" "Ultimate: This level of trust should only be assigned " "to your own keys." @@ -901,11 +929,11 @@ "Ultime : ce niveau de confiance ne devrait s'appliquer " "qu'à vos propres clés." -#: C/seahorse.xml:640(title) +#: C/index.docbook:640(sect2/title) msgid "Enabling and Disabling Keys" msgstr "Activation et désactivation de clés" -#: C/seahorse.xml:641(para) +#: C/index.docbook:641(sect2/para) msgid "" "When a key is enabled, it can be used to perform encryption operations. When " "a key is disabled, it cannot be used to encrypt to or verify signatures made " @@ -916,7 +944,11 @@ "être utilisée pour chiffrer ou pour vérifier des signatures qu'elle a " "produites." -#: C/seahorse.xml:649(para) +#: C/index.docbook:648(sect2/title) C/index.docbook:957(varlistentry/term) +msgid "Expiration Date" +msgstr "Date d'expiration" + +#: C/index.docbook:649(sect2/para) msgid "" "A key can no longer be used to perform key operations after it has expired. " "Changing a key's expiration date to a point in the future re-enables it. A " @@ -929,11 +961,11 @@ "principale qui n'expire jamais et plusieurs sous-clés avec expiration et " "signées par la clé principale." -#: C/seahorse.xml:658(title) +#: C/index.docbook:658(sect2/title) msgid "User IDs" msgstr "Identifiants utilisateur" -#: C/seahorse.xml:659(para) +#: C/index.docbook:659(sect2/para) msgid "" "User IDs allow multiple identities and email addresses to be used with the " "same key." @@ -941,21 +973,22 @@ "Les identifiants utilisateur permettent d'avoir plusieurs identités et " "adresses électroniques dans une même clé." -#: C/seahorse.xml:665(programlisting) +#: C/index.docbook:665(para/programlisting) #, no-wrap msgid "Name (comment) <email address>" msgstr "Nom (commentaire) <adresse électronique>" -#: C/seahorse.xml:663(para) -msgid "They usually take the form of: " +#: C/index.docbook:663(sect2/para) +msgid "They usually take the form of: <_:programlisting-1/>" msgstr "" -"Ils se présentent habituellement sous la forme suivante : " +"Ils se présentent habituellement sous la forme suivante : <_:" +"programlisting-1/>" -#: C/seahorse.xml:669(title) +#: C/index.docbook:669(sect3/title) msgid "Adding a User ID" msgstr "Ajout d'un identifiant utilisateur" -#: C/seahorse.xml:670(para) +#: C/index.docbook:670(sect3/para) msgid "" "Adding a user ID is useful when you want to have an identity for your job " "and one for your friends." @@ -963,11 +996,12 @@ "L'ajout d'un identifiant utilisateur est utile lorsque vous voulez disposer " "d'une identité pour votre travail et d'une autre pour vos amis." -#: C/seahorse.xml:678(para) C/seahorse.xml:776(para) C/seahorse.xml:803(para) +#: C/index.docbook:678(listitem/para) C/index.docbook:776(listitem/para) +#: C/index.docbook:803(listitem/para) msgid "Select the key from the main window," msgstr "Sélectionnez la clé dans la fenêtre principale ;" -#: C/seahorse.xml:683(para) +#: C/index.docbook:683(listitem/para) msgid "" "Double click on it or choose Properties from the " "toolbar," @@ -975,19 +1009,20 @@ "Double-cliquez sur la clé ou choisissez Propriétés " "dans la barre d'outils ;" -#: C/seahorse.xml:688(para) +#: C/index.docbook:688(listitem/para) msgid "Select the Names and Signatures tab," msgstr "Sélectionnez l'onglet Noms et signatures ;" -#: C/seahorse.xml:693(para) +#: C/index.docbook:693(listitem/para) msgid "Click on Add Name." msgstr "Cliquez sur Ajouter nom." -#: C/seahorse.xml:674(para) -msgid "To add a user ID to a key: " -msgstr "Pour ajouter un identifiant utilisateur à une clé : " +#: C/index.docbook:674(sect3/para) +msgid "To add a user ID to a key: <_:itemizedlist-1/>" +msgstr "" +"Pour ajouter un identifiant utilisateur à une clé : <_:itemizedlist-1/>" -#: C/seahorse.xml:699(para) C/seahorse.xml:903(para) +#: C/index.docbook:699(sect3/para) C/index.docbook:903(sect2/para) msgid "" "After following the instructions above, you will be presented with a dialog " "to fill in. The fields are detailed below." @@ -995,32 +1030,32 @@ "Après avoir suivi les instructions ci-dessus, une boîte de dialogue apparaît " "dans laquelle vous devez compléter des champs comme détaillé ci-dessous." -#: C/seahorse.xml:705(guilabel) -msgid "Full Name" -msgstr "Nom complet" +#: C/index.docbook:705(varlistentry/term) +msgid "Full Name" +msgstr "Nom complet" -#: C/seahorse.xml:709(programlisting) +#: C/index.docbook:709(para/programlisting) #, no-wrap msgid "<first> <last>" msgstr "<prénom> <nom>" -#: C/seahorse.xml:707(para) +#: C/index.docbook:707(listitem/para) msgid "" -"Enter your full name in the form A middle name or initial " -"is optional." +"Enter your full name in the form <_:programlisting-1/> A middle name or " +"initial is optional." msgstr "" -"Saisissez votre nom complet sous la forme Un deuxième nom " -"ou une initiale sont facultatifs." +"Saisissez votre nom complet sous la forme <_:programlisting-1/> Un deuxième " +"nom ou une initiale sont facultatifs." -#: C/seahorse.xml:714(para) +#: C/index.docbook:714(note/para) msgid "You must enter at least 5 characters in this field." msgstr "Vous devez saisir au moins 5 caractères dans ce champ." -#: C/seahorse.xml:722(guilabel) -msgid "Email Address" -msgstr "Adresse électronique" +#: C/index.docbook:722(varlistentry/term) +msgid "Email Address" +msgstr "Adresse électronique" -#: C/seahorse.xml:724(para) +#: C/index.docbook:724(listitem/para) msgid "" "Your email address is how most people will locate your key on a key server " "or other key provider. Make sure it is correct before continuing." @@ -1029,20 +1064,20 @@ "sur un serveur de clé ou un autre service similaire. Assurez-vous qu'elle " "soit correcte avant de continuer." -#: C/seahorse.xml:735(programlisting) +#: C/index.docbook:735(para/programlisting) #, no-wrap msgid "<username>@<domainname>" msgstr "<nom-d'utilisateur>@<nom-de-domaine>" -#: C/seahorse.xml:733(para) -msgid "It should be of the form " -msgstr "Elle devrait apparaître sous la forme " - -#: C/seahorse.xml:742(guilabel) -msgid "Key Comment" -msgstr "Commentaire" +#: C/index.docbook:733(note/para) +msgid "It should be of the form <_:programlisting-1/>" +msgstr "Elle devrait apparaître sous la forme <_:programlisting-1/>" + +#: C/index.docbook:742(varlistentry/term) +msgid "Key Comment" +msgstr "Commentaire" -#: C/seahorse.xml:744(para) +#: C/index.docbook:744(listitem/para) msgid "" "The comment field can be used to place any additional information into the " "displayed name of your new ID. This information can be searched for on key " @@ -1052,11 +1087,11 @@ "supplémentaire dans le nom de votre nouvel identifiant. Cette information " "peut être recherchée sur les serveurs de clés." -#: C/seahorse.xml:758(title) +#: C/index.docbook:758(sect2/title) msgid "Photo IDs" msgstr "Identifiants photo" -#: C/seahorse.xml:759(para) +#: C/index.docbook:759(sect2/para) msgid "" "Photo IDs allow a key owner to embed one or more pictures of themselves in a " "key. These identities can be signed just like normal user IDs. A photo ID " @@ -1069,7 +1104,7 @@ "être en format JPEG et il est recommandé que sa taille ne dépasse pas " "240x288 pixels." -#: C/seahorse.xml:763(para) +#: C/index.docbook:763(sect2/para) msgid "" "If the chosen image is not of the required file type or size " "Passwords and Keys can resize and convert it on " @@ -1081,53 +1116,53 @@ "la convertir à la volée à partir de n'importe quel format d'image pris en " "charge par la bibliothèque GDK." -#: C/seahorse.xml:771(title) +#: C/index.docbook:771(sect2/title) msgid "Changing the Passphrase" msgstr "Modification de la phrase de passe" -#: C/seahorse.xml:786(para) +#: C/index.docbook:786(listitem/para) msgid "Click on Change Passphrase." msgstr "Cliquez sur Changer la phrase de passe." -#: C/seahorse.xml:772(para) -msgid "To change the passphrase assigned to a key: " +#: C/index.docbook:772(sect2/para) +msgid "To change the passphrase assigned to a key: <_:itemizedlist-1/>" msgstr "" -"Pour modifier la phrase de passe attribuée à une clé : " +"Pour modifier la phrase de passe attribuée à une clé : <_:itemizedlist-1/>" -#: C/seahorse.xml:792(para) +#: C/index.docbook:792(sect2/para) msgid "Enter the new passphrase and click OK." msgstr "" "Saisissez la nouvelle phrase de passe et cliquez sur Valider." -#: C/seahorse.xml:798(title) +#: C/index.docbook:798(sect2/title) msgid "Deleting a Key" msgstr "Suppression d'une clé" -#: C/seahorse.xml:808(para) +#: C/index.docbook:808(listitem/para) msgid "" "Right click on it and choose Delete Key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" "Faites un clic droit sur la clé et choisissez Effacer la clé ou choisissez ÉditionEffacer la clé." -#: C/seahorse.xml:799(para) -msgid "To delete a key from your keyring: " -msgstr "Pour supprimer une clé de votre trousseau : " +#: C/index.docbook:799(sect2/para) +msgid "To delete a key from your keyring: <_:itemizedlist-1/>" +msgstr "Pour supprimer une clé de votre trousseau : <_:itemizedlist-1/>" -#: C/seahorse.xml:820(para) +#: C/index.docbook:820(note/para) msgid "You can delete your keys, trusted keys and collected keys." msgstr "" "Vous pouvez supprimer vos clés, les clés de confiance et les clés récoltées." -#: C/seahorse.xml:830(title) +#: C/index.docbook:830(sect1/title) msgid "OpenPGP Subkey Properties" msgstr "Propriétés des sous-clés OpenPGP" -#: C/seahorse.xml:831(para) +#: C/index.docbook:831(sect1/para) msgid "" "Each OpenPGP key has a single master key used to sign only. Subkeys are used " "to encrypt and to sign as well. In this way, if your sub key is compromised, " @@ -1138,15 +1173,15 @@ "signer. Ainsi, si une sous-clé est compromise, vous n'avez pas besoin de " "révoquer votre clé principale." -#: C/seahorse.xml:839(guilabel) -msgid "ID" -msgstr "Identifiant" +#: C/index.docbook:839(varlistentry/term) +msgid "ID" +msgstr "Identifiant" -#: C/seahorse.xml:841(para) +#: C/index.docbook:841(listitem/para) msgid "This is the identifier of the subkey." msgstr "C'est l'identifiant de la sous-clé." -#: C/seahorse.xml:849(para) +#: C/index.docbook:849(listitem/para) msgid "" "Specifies the encryption algorithm used to generate a subkey. DSA keys can only sign, ElGamal keys are used to encrypt while " @@ -1157,27 +1192,27 @@ "permettent de chiffrer, alors que les clés RSA peuvent " "signer et chiffrer." -#: C/seahorse.xml:874(guilabel) -msgid "Status" -msgstr "État" +#: C/index.docbook:874(varlistentry/term) +msgid "Status" +msgstr "État" -#: C/seahorse.xml:876(para) +#: C/index.docbook:876(listitem/para) msgid "Indicates the status of the key." msgstr "Indique l'état de la clé." -#: C/seahorse.xml:884(para) +#: C/index.docbook:884(listitem/para) msgid "" "Indicates the length in bits of the key. In general the longer the key, the " -"more security it provides. " +"more security it provides. <_:note-1/>" msgstr "" "Indique la longueur de la clé en bits. En général, plus la clé est longue, " -"plus elle offre de sécurité. " +"plus elle offre de sécurité. <_:note-1/>" -#: C/seahorse.xml:898(title) +#: C/index.docbook:898(sect2/title) msgid "Adding a Subkey" msgstr "Ajout d'une sous-clé" -#: C/seahorse.xml:899(para) +#: C/index.docbook:899(sect2/para) msgid "" "To add a subkey to a key, from the Subkeys section " "click on Add button." @@ -1185,15 +1220,15 @@ "Pour ajouter une sous-clé à une clé, cliquez sur le bouton " "Ajouter de la section Sous-clés." -#: C/seahorse.xml:909(term) +#: C/index.docbook:909(varlistentry/term) msgid "Key Type" msgstr "Type de clé" -#: C/seahorse.xml:911(para) +#: C/index.docbook:911(listitem/para) msgid "Specifies the encryption algorithm used to generate a subkey." msgstr "Indique l'algorithme de chiffrement utilisé pour générer la sous-clé." -#: C/seahorse.xml:918(para) +#: C/index.docbook:918(listitem/para) msgid "" "Use the Digital Signature Algorithm (DSA) to create the subkey. This subkey can sign only." @@ -1202,11 +1237,11 @@ "Algorithm) pour créer la sous-clé. Une sous-clé de ce type peut " "uniquement signer." -#: C/seahorse.xml:926(term) +#: C/index.docbook:926(varlistentry/term) msgid "ElGamal" msgstr "ElGamal" -#: C/seahorse.xml:928(para) +#: C/index.docbook:928(listitem/para) msgid "" "Use the ElGamal algorithm to create the subkey. This " "subkey can encrypt only." @@ -1214,7 +1249,11 @@ "Utilise l'algorithme ElGamal pour créer la sous-clé. Ce " "type de sous-clé peut uniquement chiffrer." -#: C/seahorse.xml:937(para) +#: C/index.docbook:935(varlistentry/term) +msgid "RSA" +msgstr "RSA" + +#: C/index.docbook:937(listitem/para) msgid "" "Use the Rivest-Shamir Adleman (RSA) " "algorithm to create the subkey. This subkey can be used to sign or encrypt, " @@ -1224,11 +1263,11 @@ "Adleman) pour créer la sous-clé. Ce type de sous-clé peut signer " "ou chiffrer, mais vous devez alors créer deux sous-clés différentes." -#: C/seahorse.xml:948(term) +#: C/index.docbook:948(varlistentry/term) msgid "Key Length" msgstr "Longueur de clé" -#: C/seahorse.xml:950(para) +#: C/index.docbook:950(listitem/para) msgid "" "Indicates the length in bits of the subkey. In general the longer the key, " "the more security it provides." @@ -1236,20 +1275,20 @@ "Indique la longueur de la sous-clé en bits. En général, plus la clé est " "longue, plus elle offre de sécurité." -#: C/seahorse.xml:959(para) +#: C/index.docbook:959(listitem/para) msgid "Indicates the date the subkey can no longer be used." msgstr "" "Indique la date à partir de laquelle la sous-clé ne peut plus être utilisée." -#: C/seahorse.xml:968(title) +#: C/index.docbook:968(sect2/title) msgid "Changing a Subkey Expiration Date" msgstr "Modification de la date d'expiration d'une sous-clé" -#: C/seahorse.xml:975(para) +#: C/index.docbook:975(listitem/para) msgid "Click on the Expire button on the left," msgstr "Cliquez sur le bouton Expiration sur la gauche" -#: C/seahorse.xml:980(para) +#: C/index.docbook:980(listitem/para) msgid "" "From the date dialog choose the new expiration date or select " "Never expires for no expiration date." @@ -1258,233 +1297,232 @@ "ou sélectionnez N'expire jamais si vous souhaitez que " "la clé n'expire jamais." -#: C/seahorse.xml:969(para) +#: C/index.docbook:969(sect2/para) msgid "" "To change a subkey expiration date, select the subkey from the " -"Subkeys section, then: " +"Subkeys section, then: <_:itemizedlist-1/>" msgstr "" "Pour modifier la date d'expiration d'une sous-clé, sélectionnez la sous-clé " -"dans la section Sous-clés, puis : " +"dans la section Sous-clés, puis : <_:itemizedlist-1/>" -#: C/seahorse.xml:990(title) +#: C/index.docbook:990(sect2/title) msgid "Revoking a Subkey" msgstr "Révocation d'une sous-clé" -#: C/seahorse.xml:996(para) +#: C/index.docbook:996(listitem/para) msgid "Click on the Revoke button on the left," msgstr "Cliquez sur le bouton Révoquer sur la gauche" -#: C/seahorse.xml:1001(para) +#: C/index.docbook:1001(listitem/para) msgid "Choose a reason why to revoke the subkey:" msgstr "Choisissez la raison de révocation de la sous-clé :" -#: C/seahorse.xml:1007(term) +#: C/index.docbook:1007(varlistentry/term) msgid "No Reason" msgstr "Aucune raison" -#: C/seahorse.xml:1009(para) +#: C/index.docbook:1009(listitem/para) msgid "There isn't a specific reason to revoke the key." msgstr "Il n'y a aucune raison particulière de révoquer la clé." -#: C/seahorse.xml:1015(term) +#: C/index.docbook:1015(varlistentry/term) msgid "Compromised" msgstr "Compromise" -#: C/seahorse.xml:1017(para) +#: C/index.docbook:1017(listitem/para) msgid "The key has been compromised." msgstr "La clé a été compromise." -#: C/seahorse.xml:1023(term) +#: C/index.docbook:1023(varlistentry/term) msgid "Superseded" msgstr "Remplacée" -#: C/seahorse.xml:1025(para) +#: C/index.docbook:1025(listitem/para) msgid "The key has been superseded by another one." msgstr "La clé a été remplacée par une autre." -#: C/seahorse.xml:1031(term) +#: C/index.docbook:1031(varlistentry/term) msgid "Not Used" msgstr "Non utilisée" -#: C/seahorse.xml:1033(para) +#: C/index.docbook:1033(listitem/para) msgid "The key is not used anymore." msgstr "La clé n'est plus utilisée." -#: C/seahorse.xml:1042(para) +#: C/index.docbook:1042(listitem/para) msgid "Enter a description of why you are revoking the key," msgstr "Saisissez une description expliquant la révocation de la clé" -#: C/seahorse.xml:1047(para) +#: C/index.docbook:1047(listitem/para) msgid "Click on Revoke." msgstr "Cliquez sur le bouton Révoquer." -#: C/seahorse.xml:991(para) +#: C/index.docbook:991(sect2/para) msgid "" "To revoke a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" "Pour révoquer une sous-clé, sélectionnez-la dans la section des " -"Sous-clés, puis : " +"Sous-clés, puis : <_:itemizedlist-1/>" -#: C/seahorse.xml:1054(para) +#: C/index.docbook:1054(note/para) msgid "The effect of revoking a subkey is immediate." msgstr "L'effet de révocation d'une sous-clé est immédiat." -#: C/seahorse.xml:1061(title) +#: C/index.docbook:1061(sect2/title) msgid "Deleting a Subkey" msgstr "Suppression d'une sous-clé" -#: C/seahorse.xml:1067(para) +#: C/index.docbook:1067(listitem/para) msgid "Click on the Delete button on the left." msgstr "Cliquez sur le bouton Supprimer sur la gauche." -#: C/seahorse.xml:1062(para) +#: C/index.docbook:1062(sect2/para) msgid "" "To delete a subkey, select the subkey from the Subkeys " -"section, then: " +"section, then: <_:itemizedlist-1/>" msgstr "" "Pour supprimer une sous-clé, sélectionnez-la dans la section des " -"Sous-clés, puis : " +"Sous-clés, puis : <_:itemizedlist-1/>" -#: C/seahorse.xml:1079(title) +#: C/index.docbook:1079(sect1/title) msgid "Secure Shell Key Properties" msgstr "Propriétés de clé Secure Shell" -#: C/seahorse.xml:1080(para) +#: C/index.docbook:1080(sect1/para) msgid "" "The descriptions in this section apply to all SSH keys." msgstr "" "Les descriptions de cette section sont applicables à toutes les clés " "SSH." -#: C/seahorse.xml:1087(para) +#: C/index.docbook:1087(listitem/para) msgid "Select the Secure Shell key from the main window," msgstr "Sélectionnez la clé Secure Shell dans la fenêtre principale" -#: C/seahorse.xml:1083(para) -msgid "To view properties of a SSH key: " +#: C/index.docbook:1083(sect1/para) +msgid "To view properties of a SSH key: <_:itemizedlist-1/>" msgstr "" -"Pour afficher les propriétés d'une clé SSH : " +"Pour afficher les propriétés d'une clé SSH : <_:" +"itemizedlist-1/>" -#: C/seahorse.xml:1120(guilabel) -msgid "Algorithm" -msgstr "Algorithme" +#: C/index.docbook:1120(varlistentry/term) +msgid "Algorithm" +msgstr "Algorithme" -#: C/seahorse.xml:1122(para) +#: C/index.docbook:1122(listitem/para) msgid "Specifies the encryption algorithm used to generate a key." msgstr "Indique l'algorithme de chiffrement utilisé pour générer la clé." -#: C/seahorse.xml:1129(guilabel) -msgid "Location" -msgstr "Emplacement" +#: C/index.docbook:1129(varlistentry/term) +msgid "Location" +msgstr "Emplacement" -#: C/seahorse.xml:1131(para) +#: C/index.docbook:1131(listitem/para) msgid "" "This is the location where the private key has been " "stored." msgstr "C'est l'emplacement de stockage de la clé privée." -#: C/seahorse.xml:1159(title) +#: C/index.docbook:1159(sect2/title) msgid "Deleting a Secure Shell Key" msgstr "Suppression d'une clé Secure Shell" -#: C/seahorse.xml:1164(para) +#: C/index.docbook:1164(listitem/para) msgid "Select the SSH key from the main window," msgstr "Sélectionnez la clé SSH dans la fenêtre principale" -#: C/seahorse.xml:1169(para) +#: C/index.docbook:1169(listitem/para) msgid "" "Right click on it and choose Delete key or choose " -"EditDelete Key Edit Delete Key ." msgstr "" "Faites un clic droit sur la clé et choisissez Effacer la clé ou choisissez ÉditionEffacer la clé." +"guilabel> ou choisissez Édition " +"Effacer la clé." -#: C/seahorse.xml:1160(para) -msgid "To delete a Secure Shell key: " -msgstr "Pour supprimer une clé Secure Shell : " +#: C/index.docbook:1160(sect2/para) +msgid "To delete a Secure Shell key: <_:itemizedlist-1/>" +msgstr "Pour supprimer une clé Secure Shell : <_:itemizedlist-1/>" -#: C/seahorse.xml:1185(title) +#: C/index.docbook:1185(sect1/title) msgid "Importing Keys" msgstr "Importation de clés" -#: C/seahorse.xml:1186(para) +#: C/index.docbook:1186(sect1/para) msgid "" -"To import keys choose FileImport and select, from the " -"file chooser, a file containing at least one ASCII armored public key." -msgstr "" -"Pour importer des clés, choisissez FichierImporter et choisissez dans " -"le sélecteur de fichiers un fichier contenant au moins une clé publique avec " +"To import keys choose File " +"Import and select, from the file " +"chooser, a file containing at least one ASCII armored public key." +msgstr "" +"Pour importer des clés, choisissez Fichier " +"Importer et choisissez dans le " +"sélecteur de fichiers un fichier contenant au moins une clé publique avec " "armure ASCII." -#: C/seahorse.xml:1197(para) +#: C/index.docbook:1197(listitem/para) msgid "Select an ASCII armored public block of text," msgstr "Sélectionnez un bloc de texte avec armure ASCII publique" -#: C/seahorse.xml:1202(para) +#: C/index.docbook:1202(listitem/para) msgid "Copy it to the clipboard," msgstr "Copiez-le dans le presse-papiers" -#: C/seahorse.xml:1207(para) +#: C/index.docbook:1207(listitem/para) msgid "" -"Choose EditPaste Keys." +"Choose Edit Paste Keys ." msgstr "" -"Choisissez ÉditionColler les " +"Choisissez Édition Coller les " "clés." -#: C/seahorse.xml:1193(para) +#: C/index.docbook:1193(sect1/para) msgid "" "Importing can also be performed by pasting the keys inside " -"Passwords and Keys: " +"Passwords and Keys: <_:itemizedlist-1/>" msgstr "" "L'importation peut aussi être effectuée en collant les clés dans " -"Mots de passe et clés : " +"Mots de passe et clés : <_:itemizedlist-1/>" -#: C/seahorse.xml:1222(title) +#: C/index.docbook:1222(sect1/title) msgid "Exporting Keys" msgstr "Exportation de clés" -#: C/seahorse.xml:1223(para) +#: C/index.docbook:1223(sect1/para) msgid "" -"To export keys, select the keys in the main window and choose " -"FileExport." +"To export keys, select the keys in the main window and choose " +"File Export ." msgstr "" "Pour exporter des clés, sélectionnez-les dans la fenêtre principale et " -"choisissez FichierExporterFichier Exporter." -#: C/seahorse.xml:1236(para) +#: C/index.docbook:1236(listitem/para) msgid "Select the keys in the main window," msgstr "Sélectionnez les clés dans la fenêtre principale" -#: C/seahorse.xml:1241(para) +#: C/index.docbook:1241(listitem/para) msgid "" -"Choose EditCopy Keys." +"Choose Edit Copy Keys ." msgstr "" -"Choisissez ÉditionCopier les " +"Choisissez Édition Copier les " "clés." -#: C/seahorse.xml:1231(para) +#: C/index.docbook:1231(sect1/para) msgid "" "You can also export keys to the clipboard in an ASCII armored block of text: " -"" +"<_:itemizedlist-1/>" msgstr "" "Vous pouvez aussi exporter des clés dans le presse-papiers dans un bloc de " -"texte avec armure ASCII : " +"texte avec armure ASCII : <_:itemizedlist-1/>" -#: C/seahorse.xml:1257(title) +#: C/index.docbook:1257(sect1/title) msgid "Signing a Key" msgstr "Signature d'une clé" -#: C/seahorse.xml:1258(para) +#: C/index.docbook:1258(sect1/para) msgid "" "Signing another person's key means you are giving trust to that person. " "Before signing a key, you have to carefully check the key's fingerprint to " @@ -1495,7 +1533,7 @@ "soigneusement l'empreinte de la clé afin de vous assurer qu'elle appartient " "réellement à cette personne." -#: C/seahorse.xml:1267(para) +#: C/index.docbook:1267(listitem/para) msgid "" "Select the key you want to sign from the Trusted Keys " "or Other Collected Keys tabs," @@ -1504,21 +1542,20 @@ "Clés de confiance ou Autres clés obtenues" -#: C/seahorse.xml:1274(para) +#: C/index.docbook:1274(listitem/para) msgid "" -"Choose Sign from the toolbar or " -"FileSign," +"Choose Sign from the toolbar or " +"File Sign ," msgstr "" "Choisissez Signer dans la barre d'outils ou " -"FichierSignerFichier Signer" -#: C/seahorse.xml:1283(para) +#: C/index.docbook:1283(listitem/para) msgid "Select how carefully the key has been checked," msgstr "Sélectionnez le degré de précaution avec lequel la clé a été vérifiée" -#: C/seahorse.xml:1288(para) +#: C/index.docbook:1288(listitem/para) msgid "" "Indicate if the signature should be local to your keyring, and if your " "signature can be revoked," @@ -1526,39 +1563,39 @@ "Indiquez si la signature doit se limiter localement à votre trousseau et si " "la signature peut être révoquée" -#: C/seahorse.xml:1294(para) +#: C/index.docbook:1294(listitem/para) msgid "Click on Sign." msgstr "Cliquez sur le bouton Signer." -#: C/seahorse.xml:1263(para) -msgid "To sign a key in your keyring: " -msgstr "Pour signer une clé de votre trousseau : " +#: C/index.docbook:1263(sect1/para) +msgid "To sign a key in your keyring: <_:itemizedlist-1/>" +msgstr "Pour signer une clé de votre trousseau : <_:itemizedlist-1/>" -#: C/seahorse.xml:1305(title) +#: C/index.docbook:1305(sect1/title) msgid "Preferences" msgstr "Préférences" -#: C/seahorse.xml:1306(para) +#: C/index.docbook:1306(sect1/para) msgid "" "This section describes the preferences settable in Passwords " -"and Keys by choosing EditPreferences from within " +"and Keys by choosing Edit " +"Preferences from within " "Passwords and Keys." msgstr "" "Cette section décrit les préférences configurables dans Mots de " "passe et clés en choisissant ÉditionPréférences à partir de " +"guimenu> Préférences à partir de " "Mots de passe et clés de chiffrement." -#: C/seahorse.xml:1315(title) +#: C/index.docbook:1315(sect2/title) msgid "Password Keyrings" msgstr "Trousseaux de mots de passe" -#: C/seahorse.xml:1317(title) +#: C/index.docbook:1317(sect3/title) msgid "Creating Keyrings" msgstr "Création de trousseaux" -#: C/seahorse.xml:1318(para) +#: C/index.docbook:1318(sect3/para) msgid "" "To create a new keyring, from the menu choose FileNew and choose " @@ -1571,11 +1608,11 @@ "guibutton>. Saisissez un nom pour le nouveau trousseau, puis appuyez sur " "Entrée." -#: C/seahorse.xml:1323(title) +#: C/index.docbook:1323(sect3/title) msgid "Changing Keyring Passwords" msgstr "Modification des mots de passe de trousseau" -#: C/seahorse.xml:1324(para) +#: C/index.docbook:1324(sect3/para) msgid "" "To change the unlock password of the keyring, first select the appropriate " "keyring and then press Change Unlock Password button. " @@ -1599,25 +1636,25 @@ "indiquant que l'opération a réussi. Dans le cas contraire, on vous demande " "de ressaisir correctement ce mot de passe." -#: C/seahorse.xml:1338(title) +#: C/index.docbook:1338(sect3/title) msgid "Removing Keyrings" msgstr "Suppression de trousseaux" -#: C/seahorse.xml:1339(para) +#: C/index.docbook:1339(sect3/para) msgid "" "To remove a keyring, first select the appropriate keyring and then from the " -"menu choose EditDeleteEdit Delete." msgstr "" "Pour supprimer un trousseau de clés, sélectionnez premièrement le trousseau " -"concerné, puis choisissez ÉditionSupprimer." +"concerné, puis choisissez Édition " +"Supprimer." -#: C/seahorse.xml:1347(title) +#: C/index.docbook:1347(sect2/title) msgid "Key Servers" msgstr "Serveurs de clés" -#: C/seahorse.xml:1348(para) +#: C/index.docbook:1348(sect2/para) msgid "" "Keep your and other's keys up to date by syncing keys periodically with " "remote keyservers. Syncing will make sure that you have the latest " @@ -1630,7 +1667,7 @@ "toutes les clés afin de tirer le plus grand bénéfice du « réseau de " "confiance »." -#: C/seahorse.xml:1354(para) +#: C/index.docbook:1354(sect2/para) msgid "" "Passwords and Keys provides support for HKP and " "LDAP keyservers." @@ -1638,11 +1675,11 @@ "Mots de passe et clés prend en charge les " "serveurs de clés HKP et LDAP." -#: C/seahorse.xml:1359(emphasis) -msgid "HKP Servers" -msgstr "Serveurs HKP" +#: C/index.docbook:1359(varlistentry/term) +msgid "HKP Servers" +msgstr "Serveurs HKP" -#: C/seahorse.xml:1361(para) +#: C/index.docbook:1361(listitem/para) msgid "" "HKP keyservers are ordinary web based keyservers such as the popular hkp://pool.sks-keyservers." @@ -1655,15 +1692,11 @@ "\"http://sks-keyservers.net\" type=\"http\">http://sks-keyservers.net." -#: C/seahorse.xml:1369(acronym) -msgid "LDAP" -msgstr "LDAP" - -#: C/seahorse.xml:1369(emphasis) -msgid " Keyservers" -msgstr "Serveurs de clés " +#: C/index.docbook:1369(varlistentry/term) +msgid "LDAP Keyservers" +msgstr "Serveurs de clés LDAP" -#: C/seahorse.xml:1371(para) +#: C/index.docbook:1371(listitem/para) msgid "" "LDAP keyservers are less common, but use the standard " "LDAP protocol to serve keys. ldap://keyserver.pgp.com " "est un bon serveur LDAP." -#: C/seahorse.xml:1383(title) +#: C/index.docbook:1383(sect2/title) msgid "Key Sharing" msgstr "Partage de clés" -#: C/seahorse.xml:1384(para) +#: C/index.docbook:1384(sect2/para) msgid "" "Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. " "Enabling key sharing will add the local Passwords and KeysMots de passe et " "clés à la boîte de dialogue de recherche de clés distantes. " -"L'utilisation de ces « serveurs de clés » locaux est probablement plus rapide " -"que l'accès à des serveurs distants." +"L'utilisation de ces « serveurs de clés » locaux est probablement plus " +"rapide que l'accès à des serveurs distants." -#: C/seahorse.xml:1396(title) +#: C/index.docbook:1396(sect1/title) msgid "About Passwords and Keys" msgstr "À propos de Mots de passe et clés" -#: C/seahorse.xml:1397(para) +#: C/index.docbook:1397(sect1/para) msgid "" "Passwords and Keys, its associated plugins, the " "preferences applet and the panel applet are known collectively as Seahorse. " @@ -1716,22 +1749,22 @@ "\"http://www.gnome.org/projects/seahorse/\" type=\"http\">page Web de " "Seahorse [en anglais]." -#: C/seahorse.xml:1404(para) +#: C/index.docbook:1404(sect1/para) msgid "" "To report a bug or make a suggestion regarding this application or this " -"manual, follow the directions in the Feedback section of the GNOME User Guide." msgstr "" "Pour rapporter une anomalie ou émettre une suggestion concernant cette " -"application ou ce manuel, procédez comme indiqué dans la section sur les rapports d'anomalie du Guide " -"d'utilisation du bureau GNOME." +"application ou ce manuel, procédez comme indiqué dans la section sur les rapports d'anomalie " +"du Guide d'utilisation du bureau GNOME." -#: C/seahorse.xml:1409(para) +#: C/index.docbook:1409(sect1/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 is included with this " "documentation; another can be found in the file COPYING included with the " "source code of this program." @@ -1739,13 +1772,154 @@ "Ce programme est distribué selon les termes de la GNU General Public " "License, tels que publiés par la Free Software Foundation ; soit la version " "2 de cette licence ou (à votre choix) toute version ultérieure. Une copie de cette licence est inclue " +"url=\"help:gpl\" type=\"help\">copie de cette licence est inclue " "dans cette documentation ; une autre se trouve dans le fichier COPYING " "inclus dans le code source de ce programme." -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/seahorse.xml:0(None) -msgid "translator-credits" +#: C/legal.xml:9(para/ulink) +msgid "link" +msgstr "lien" + +# Mentions légales +#: C/legal.xml:2(legalnotice/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 <_:ulink-1/> or in the file COPYING-DOCS distributed " +"with this manual." msgstr "" -"Claude Paroz , 2007-2009\n" -"Yann Simon , 2007" +"Permission vous est donnée de copier, distribuer et/ou modifier ce document " +"selon les termes de la Licence GNU Free Documentation License, Version 1.1 " +"ou ultérieure publiée par la Free Software Foundation sans section " +"inaltérable, sans texte de première page de couverture ni texte de dernière " +"page de couverture. Vous trouverez un exemplaire de cette licence en suivant " +"ce <_:ulink-1/> ou dans le fichier COPYING-DOCS fourni avec le présent " +"manuel." + +#~ msgid "2005, 2006, 2007, 2008, 2009" +#~ msgstr "2005, 2006, 2007, 2008, 2009" + +#~ msgid "Jacob Perkins and Adam Schreiber" +#~ msgstr "Jacob Perkins et Adam Schreiber" + +#~ msgid "Jacob" +#~ msgstr "Jacob" + +#~ msgid "Perkins" +#~ msgstr "Perkins" + +#~ msgid "Adam" +#~ msgstr "Adam" + +#~ msgid "Schreiber" +#~ msgstr "Schreiber" + +#~ msgid "sadam@clemson.edu" +#~ msgstr "sadam@clemson.edu" + +#~ msgid "Paul" +#~ msgstr "Paul" + +#~ msgid "Cutler" +#~ msgstr "Cutler" + +#~ msgid "pcutler@foresightlinux.org" +#~ msgstr "pcutler@foresightlinux.org" + +#~ msgid "Passwords and Keys Manual V2.11.0" +#~ msgstr "Manuel de Mots de passe et clés v2.11.0" + +#~ msgid "May 2009" +#~ msgstr "Mai 2009" + +#~ msgid "Passwords and Keys Manual V0.10.1" +#~ msgstr "Manuel de Mots de passe et clés v0.10.1" + +#~ msgid "August 2008" +#~ msgstr "Août 2008" + +#~ msgid "Passwords and Keys Manual V0.9.1" +#~ msgstr "Manuel de Mots de passe et clés V0.9.1" + +#~ msgid "November 2006" +#~ msgstr "Novembre 2006" + +#~ msgid "Passwords and Keys Manual V0.9.0" +#~ msgstr "Manuel de Mots de passe et clés V0.9.0" + +#~ msgid "July 2005" +#~ msgstr "Juillet 2005" + +#~ msgid "Passwords and Keys Manual V0.7.0" +#~ msgstr "Manuel de Mots de passe et clés V0.7.0" + +#~ msgid "February 2003" +#~ msgstr "Février 2003" + +#~ msgid "Seahorse" +#~ msgstr "Seahorse" + +#~ msgid "seahorse" +#~ msgstr "seahorse" + +#~ msgid "Passwords and Keys" +#~ msgstr "Mots de passe et clés" + +#~ msgid "Show the window." +#~ msgstr "Montre la fenêtre de ." + +#~ msgid "Encryption Type" +#~ msgstr "Type de chiffrement" + +#~ msgid "DSA" +#~ msgstr "DSA" + +#~ msgid "Fingerprint" +#~ msgstr "Empreinte" + +#~ msgid "KeyID" +#~ msgstr "Identifiant de clé" + +#~ msgid "Type" +#~ msgstr "Type" + +#~ msgid "Created" +#~ msgstr "Créée le" + +#~ msgid "Expires" +#~ msgstr "Expiration" + +#~ msgid "Strength" +#~ msgstr "Force" + +#~ msgid "Full Name" +#~ msgstr "Nom complet" + +#~ msgid "Email Address" +#~ msgstr "Adresse électronique" + +#~ msgid "Key Comment" +#~ msgstr "Commentaire" + +#~ msgid "ID" +#~ msgstr "Identifiant" + +#~ msgid "Status" +#~ msgstr "État" + +#~ msgid "Algorithm" +#~ msgstr "Algorithme" + +#~ msgid "Location" +#~ msgstr "Emplacement" + +#~ msgid "HKP Servers" +#~ msgstr "Serveurs HKP" + +#~ msgid "LDAP" +#~ msgstr "LDAP" + +#~ msgid " Keyservers" +#~ msgstr "Serveurs de clés " diff -Nru seahorse-3.2.2/help/fr/index.docbook seahorse-3.6.3/help/fr/index.docbook --- seahorse-3.2.2/help/fr/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/fr/index.docbook 2012-11-09 17:35:38.000000000 +0100 @@ -0,0 +1,871 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Manuel de Mots de passe et clés + 2005, 2006, 2007, 2008, 2009 Jacob Perkins et Adam Schreiber + + Projet Seahorse + + + + Permission vous est donnée de copier, distribuer et/ou modifier ce document selon les termes de la Licence GNU Free Documentation License, Version 1.1 ou ultérieure publiée par la Free Software Foundation sans section inaltérable, sans texte de première page de couverture ni texte de dernière page de couverture. Vous trouverez un exemplaire de cette licence en suivant ce lien ou dans le fichier COPYING-DOCS fourni avec le présent manuel. + Ce manuel fait partie de la collection de manuels GNOME distribués selon les termes de la licence de documentation libre GNU. Si vous souhaitez distribuer ce manuel indépendamment de la collection, vous devez joindre un exemplaire de la licence au document, comme indiqué dans la section 6 de celle-ci. + + La plupart des noms utilisés par les entreprises pour distinguer leurs produits et services sont des marques déposées. Lorsque ces noms apparaissent dans la documentation GNOME et que les membres du projet de Documentation GNOME sont informés de l'existence de ces marques déposées, soit ces noms entiers, soit leur première lettre est en majuscule. + + LE PRÉSENT DOCUMENT ET SES VERSIONS MODIFIÉES SONT FOURNIS SELON LES TERMES DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE : + + LE PRÉSENT DOCUMENT EST FOURNI « TEL QUEL », SANS AUCUNE GARANTIE, EXPRESSE OU IMPLICITE, Y COMPRIS, ET SANS LIMITATION, LES GARANTIES DE MARCHANDABILITÉ, D'ADÉQUATION À UN OBJECTIF PARTICULIER OU DE NON INFRACTION DU DOCUMENT OU DE SA VERSION MODIFIÉE. L'UTILISATEUR ASSUME TOUT RISQUE RELATIF À LA QUALITÉ, À LA PERTINENCE ET À LA PERFORMANCE DU DOCUMENT OU DE SA VERSION DE MISE À JOUR. SI LE DOCUMENT OU SA VERSION MODIFIÉE S'AVÉRAIT DÉFECTUEUSE, L'UTILISATEUR (ET NON LE RÉDACTEUR INITIAL, L'AUTEUR, NI TOUT AUTRE PARTICIPANT) ENDOSSERA LES COÛTS DE TOUTE INTERVENTION, RÉPARATION OU CORRECTION NÉCESSAIRE. CETTE DÉNÉGATION DE RESPONSABILITÉ CONSTITUE UNE PARTIE ESSENTIELLE DE CETTE LICENCE. AUCUNE UTILISATION DE CE DOCUMENT OU DE SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; + + + EN AUCUNE CIRCONSTANCE ET SOUS AUCUNE INTERPRÉTATION DE LA LOI, QU'IL S'AGISSE D'UN DÉLIT CIVIL (Y COMPRIS LA NÉGLIGENCE), CONTRACTUEL OU AUTRE, L'AUTEUR, LE RÉDACTEUR INITIAL, TOUT PARTICIPANT OU TOUT DISTRIBUTEUR DE CE DOCUMENT OU DE SA VERSION MODIFIÉE, OU TOUT FOURNISSEUR DE L'UNE DE CES PARTIES NE POURRA ÊTRE TENU RESPONSABLE À L'ÉGARD DE QUICONQUE POUR TOUT DOMMAGE DIRECT, INDIRECT, PARTICULIER, OU ACCIDENTEL DE TOUT TYPE Y COMPRIS, SANS LIMITATION, LES DOMMAGES LIÉS À LA PERTE DE CLIENTÈLE, À UN ARRÊT DE TRAVAIL, À UNE DÉFAILLANCE OU UN MAUVAIS FONCTIONNEMENT INFORMATIQUE, OU À TOUT AUTRE DOMMAGE OU PERTE LIÉE À L'UTILISATION DU DOCUMENT ET DE SES VERSIONS MODIFIÉES, MÊME SI LADITE PARTIE A ÉTÉ INFORMÉE DE L'ÉVENTUALITÉ DE TELS DOMMAGES. + + + + + + + Jacob Perkins Projet Seahorse + Adam Schreiber Projet Seahorse
sadam@clemson.edu
+ Paul Cutler Projet de documentation GNOME
pcutler@foresightlinux.org
+ + + + + Projet Seahorse + + + Projet de documentation GNOME + + + Manuel de Mots de passe et clés V2.11.0 Mai 2009 + Paul Cutler pcutler@foresightlinux.org + + Manuel de Mots de passe et clés V0.10.1 Août 2008 + Adam Schreiber sadam@clemson.edu + + Manuel de Mots de passe et clés V0.9.1 Novembre 2006 + Milo Casagrande milo_casagrande@yahoo.it + + Manuel de Mots de passe et clés V0.9.0 Juillet 2005 + Adam Schreiber sadam@clemson.edu + Projet Seahorse + + Manuel de Mots de passe et clés V0.7.0 Février 2003 + Jacob Perkins + Projet Seahorse + + + Ce manuel documente la version 2.28.x de Mots de passe et clés + + Votre avis + Pour rapporter une anomalie ou émettre une suggestion concernant Mots de passe et clés ou ce manuel, procédez comme indiqué sur la page de réactions sur GNOME. + + + + Mots de passe et clés est l'application de gestion des clés de chiffrement du bureau GNOME + + + + + + Claude Paroz + + claude@2xlibre.net + + + + 2007-2009 + + Claude Paroz + + + + + Yann Simon + + yann.simon.fr@gmail.com + + + + 2007 + + Yann Simon + + + + Seahorse + + seahorse + + Clés de chiffrement + + + + + Introduction + Vous pouvez utiliser Mots de passe et clés pour créer et gérer des clés PGP et SSH. + Mots de passe et clés fournit une interface pour la plupart des fonctionnalités de Gnu Privacy Guard (GPG) et s'intègre avec plusieurs composants du bureau GNOME. + Avec Mots de passe et clés, vous pouvez : + + + Créer et gérer des clés PGP et SSH + + + Exporter et importer des clés PGP et SSH + + + Partager vos clés avec d'autres + + + + + + + + Premiers pas + + Démarrage de <application>Mots de passe et clés</application> + Vous pouvez lancer Mots de passe et clés à l'aide des procédures suivantes : + + + Menu Applications + + Choisissez AccessoiresMots de passe et clés. + + + + Ligne de commande + + Saisissez seahorse, puis appuyez sur Entrée. + + + + + + + Après le démarrage de <application>Mots de passe et clés</application> + Au démarrage de Mots de passe et clés, la fenêtre ci-dessous apparaît. + +
+ La fenêtre de <application>Mots de passe et clés</application> + + Montre la fenêtre Mots de passe et clés. + +
+ + La fenêtre de Mots de passe et clés contient les éléments suivants : + + + Barre de menus + + Les menus de la barre de menus contiennent toutes les commandes nécessaires à l'utilisation de Mots de passe et clés. + + + Barre d'outils + + Utilisez la barre d'outils pour accéder rapidement aux commandes les plus fréquemment utilisées. + + + Onglets Clés et mots de passe + + Donnent accès aux clés et aux mots de passe du trousseau. + + + Options de premier démarrage + + Donnent un accès rapide aux opérations pertinentes pour débuter. À partir de là, vous pouvez : + + + Naviguer dans le système d'aide + + + Importer des clés dans le trousseau + + + Créer de nouvelles clés + + + + + + + + + + + + Création de clés OpenPGP + OpenPGP est un protocole non propriétaire pour chiffrer des courriels via une cryptographie à clé publique basée sur PGP. Il définit des formats standards de messages chiffrés, de signatures, de clé privées et de certificats pour échanger des clés publiques. + La cryprographie à clé publique est un concept qui implique l'utilisation de deux clés : une clé publique que vous pouvez transmettre à tous ceux avec qui vous voulez communiquer, et une clé privée qui est privée et doit rester secrète. + Pour créer des clés OpenPGP : + + Choisissez FichierNouveau... + + + Sélectionnez Clé PGP et cliquez sur Continuer + + + Saisissez votre nom complet (prénom - nom), votre adresse électronique et toute information supplémentaire. Vous pouvez aussi spécifier des options avancées pour la clé (voir ci-après). + + + Cliquez sur Créer pour créer une nouvelle paire de clés. + + + La boîte de dialogue Phrase de passe pour la nouvelle clé PGP apparaît. Saisissez deux fois la phrase de passe pour la nouvelle clé. + + + + Utilisez pour les phrases de passe les mêmes techniques que pour la génération de mots de passe solides. La différence principale entre un mot de passe et une phrase de passe est que dans cette dernière, les espaces sont des caractères valides. + + + + Options avancées + Étendez la section Options avancées de clé pour spécifier les options suivantes d'une nouvelle clé : + + + Type de chiffrement + + Ce champ spécifie l'algorithme de chiffrement utilisé pour générer vos clés. + + + DSA ElGamal + + Ce choix suggéré vous permettra de chiffer, déchiffrer, signer et vérifier selon vos besoins. + + + + DSA + + Ne permet que la signature. + + + + RSA + + Ne permet que la signature. + + + + + + + Force de la clé (bits) + + C'est la longueur de la clé en bits. Plus la clé est longue, plus elle sera sûre, pour autant que la phrase de passe utilisée soit solide. Par contre, les opérations utilisant une plus longue clé prennent aussi plus de temps à s'exécuter qu'avec une clé courte. Les valeurs acceptables se situent entre 1024 et 4096 bits. La recommandation est d'au moins 2048 bits. + + + + Date d'expiration + + C'est la date à partir de laquelle la clé cessera d'être utilisable pour effectuer des opérations de chiffrement ou de signature. Six mois est une durée raisonnable. Passé ce délai, vous devrez soit changer la date d'expiration, soit générer une nouvelle clé ou sous-clé. + Signez votre nouvelle clé avec l'ancienne avant qu'elle expire pour préserver son capital de confiance. + + + + + + + + + + + Création de clés Secure Shell + Secure Shell (SSH) est une manière de se connecter à un ordinateur distant pour exécuter des commandes sur cette machine. Les clés SSH sont utilisées dans des systèmes basés sur l'authentification par clés, en alternative du système par défaut d'authentification par mot de passe. Avec l'authentification basée sur les clés, il n'est pas nécessaire de saisir manuellement un mot de passe pour être authentifié. + Les clés Secure Shell sont composées de deux clés : une clé privée, qui doit être gardée secrète, et une clé publique qui peut être envoyée vers tout ordinateur auquel vous avez besoin d'accéder. + Pour créer une clé Secure Shell : + + + Choisissez FichierNouveau... + + + Sélectionnez clé Secure Shell et cliquez sur Continuer + + + Saisissez une description décrivant l'usage prévu de la clé. Vous pouvez utiliser votre courriel ou tout autre indice. Vous pouvez également spécifier des options avancées pour la clé (voir ci-après). + + + Cliquez sur Créer seulement pour créer la nouvelle clé ou sur Créer et configurer pour créer la clé et configurer un autre ordinateur pour qu'il reconnaisse cette clé lors de l'authentification. + + + La boîte de dialogue Phrase de passe pour la nouvelle clé Secure Shell apparaît. Saisissez deux fois la phrase de passe pour votre nouvelle clé. + + Utilisez pour les phrases de passe les mêmes techniques que pour la génération de mots de passe solides. La différence principale entre un mot de passe et une phrase de passe est que dans cette dernière, les espaces sont des caractères valides. + + + + + + + + Options avancées + Développez la section Options avancées de clé afin de spécifier les options suivantes pour une nouvelle clé : + + + + Type de chiffrement + + Ce champ spécifie l'algorithme de chiffrement utilisé pour générer la clé. + + + RSA + + Utilise l'algorithme Rivest-ShamirAdleman (RSA) pour créer la clé SSH. C'est le choix préconisé et le plus sûr. + + + + DSA + + Utilise l'algorithme Digital Signature Algorithm (DSA) pour créer la clé SSH. + + + + + + + Force de la clé (bits) + + C'est la longueur de la clé en bits. Plus la clé est longue, plus elle sera sûre, pour autant que la phrase de passe utilisée soit solide. Par contre, les opérations utilisant une plus longue clé prennent aussi plus de temps à s'exécuter qu'avec une clé courte. Les valeurs acceptables se situent entre 1024 et 4096 bits. La recommandation est d'au moins 2048 bits. + + + + + + + + + + Propriétés de clé OpenPGP + Les descriptions dans cette section s'appliquent à toutes les clés OpenPGP. + + Pour afficher les propriétés d'une clé PGP : + + Sélectionnez la clé PGP dans la fenêtre principale ; + + + Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; + + + Sélectionnez l'onglet Détails. + + + + + Propriétés + + + + Empreinte + + L'empreinte est une chaîne de caractères unique qui identifie précisément une clé. + + + + Identifiant de clé + + L'identifiant de la clé (KeyID) est comparable à l'empreinte. Cependant, l'identifiant ne contient que les 8 derniers caractères de l'empreinte. Il est possible la plupart du temps d'identifier une clé uniquement avec l'identifiant de clé, mais il peut arriver que deux clés possèdent le même identifiant. + + + + Type + + Spécifie l'algorithme de chiffrement utilisé pour générer la clé. Les clés DSA ne peuvent que signer. Les clés ElGamal sont utilisées pour chiffrer. + + + + Créée l + + Indique la date de création de la clé. + + + + Expiration + + Indique la date à partir de laquelle la clé ne pourra plus être utilisée. + + + + Force + + Indique la longueur de la clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. + Une clé longue ne suffit pas à compenser la faiblesse d'une phrase de passe. + + + + + + + + + Confiance + La confiance est une indication de votre certitude qu'une personne est capable d'étendre le réseau de confiance. Lorsque vous rencontrez une clé que vous n'avez pas signée, la validité de la clé de cette personne sera déterminée sur la base des signatures qu'elle a collectée et sur la confiance dont vous faites preuve envers les signataires. Par défaut, une clé inconnue nécessite 3 signatures avec une valeur de confiance marginale ou une signature complètement fiable. + + Inconnu : vous n'avez aucune idée de la capacité de cette personne à signer correctement des clés. + Jamais : cette personne n'est pas apte à signer correctement des clés. + Marginale : cette personne contrôle la photo de l'identifiant avant de signer une clé, mais n'examine pas nécessairement l'identifiant de manière minutieuse. + Complète : cette personne examine attentivement la photo attachée à l'identifiant de chaque personne avant de signer une clé (par exemple, elle ne signe que les clés qui appartiennent réellement à la personne demandant la signature). + Ultime : ce niveau de confiance ne devrait s'appliquer qu'à vos propres clés. + + + + + Activation et désactivation de clés + Lorsqu'une clé est active, elle peut être utilisée pour effectuer des opérations de chiffrement. Lorsqu'elle n'est plus active, elle ne peut plus être utilisée pour chiffrer ou pour vérifier des signatures qu'elle a produites. + + + + Date d'expiration + Après son expiration, une clé ne peut plus être utilisée pour effectuer des opérations de clé. La modification de la date d'expiration d'une clé vers une date future la réactive. Un bon principe général serait d'avoir une clé principale qui n'expire jamais et plusieurs sous-clés avec expiration et signées par la clé principale. + + + + Identifiants utilisateur + Les identifiants utilisateur permettent d'avoir plusieurs identités et adresses électroniques dans une même clé. + Ils se présentent habituellement sous la forme suivante : Nom (commentaire) <adresse électronique> + + + Ajout d'un identifiant utilisateur + L'ajout d'un identifiant utilisateur est utile lorsque vous voulez disposer d'une identité pour votre travail et d'une autre pour vos amis. + Pour ajouter un identifiant utilisateur à une clé : + + Sélectionnez la clé dans la fenêtre principale ; + + + Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; + + + Sélectionnez l'onglet Noms et signatures ; + + + Cliquez sur Ajouter nom. + + + Après avoir suivi les instructions ci-dessus, une boîte de dialogue apparaît dans laquelle vous devez compléter des champs comme détaillé ci-dessous. + + + Nom complet + + Saisissez votre nom complet sous la forme <prénom> <nom> Un deuxième nom ou une initiale sont facultatifs. + + + Vous devez saisir au moins 5 caractères dans ce champ. + + + + + + Adresse électronique + + Votre adresse électronique est le moyen privilégié de découvrir votre clé sur un serveur de clé ou un autre service similaire. Assurez-vous qu'elle soit correcte avant de continuer. + + + Elle devrait apparaître sous la forme <username>@<domainname> + + + + + + Commentaire + + Le champ commentaire peut être employé pour fournir toute information supplémentaire dans le nom de votre nouvel identifiant. Cette information peut être recherchée sur les serveurs de clés. + + + + + + + + Identifiants photo + Un identifiant photo permet à un propriétaire de clé d'insérer une ou plusieurs images portraits dans une clé. Ces identifiants peuvent être signés comme un identifiant utilisateur normal. Un identifiant photo doit être en format JPEG et il est recommandé que sa taille ne dépasse pas 240x288 pixels. + Si l'image choisie n'est pas du bon type de fichier ou de la bonne taille, Mots de passe et clés peut la redimensionner et la convertir à la volée à partir de n'importe quel format d'image pris en charge par la bibliothèque GDK. + + + + Modification de la phrase de passe + Pour modifier la phrase de passe attribuée à une clé : + + Sélectionnez la clé dans la fenêtre principale ; + + + Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; + + + Cliquez sur Changer la phrase de passe. + + + Saisissez la nouvelle phrase de passe et cliquez sur Valider. + + + + Suppression d'une clé + Pour supprimer une clé de votre trousseau : + + Sélectionnez la clé dans la fenêtre principale ; + + + Faites un clic droit sur la clé et choisissez Effacer la clé ou choisissez ÉditionEffacer la clé. + + + + Vous pouvez supprimer vos clés, les clés de confiance et les clés récoltées. + + + + + + + + Propriétés des sous-clés OpenPGP + Chaque clé OpenPGP dispose d'une clé principale unique utilisée seulement pour signer. Les sous-clés sont utilisées pour chiffrer et également pour signer. Ainsi, si une sous-clé est compromise, vous n'avez pas besoin de révoquer votre clé principale. + + + Identifiant + + C'est l'identifiant de la sous-clé. + + + + Type + + Spécifie l'algorithme de chiffrement utilisé pour générer une sous-clé. Les clés DSA ne peuvent que signer, les clés ElGamal permettent de chiffrer, alors que les clés RSA peuvent signer et chiffrer. + + + + Créée l + + Indique la date de création de la clé. + + + + Expiration + + Indique la date à partir de laquelle la clé ne pourra plus être utilisée. + + + + État + + Indique l'état de la clé. + + + + Force + + Indique la longueur de la clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. + Une clé longue ne suffit pas à compenser la faiblesse d'une phrase de passe. + + + + + + + Ajout d'une sous-clé + Pour ajouter une sous-clé à une clé, cliquez sur le bouton Ajouter de la section Sous-clés. + Après avoir suivi les instructions ci-dessus, une boîte de dialogue apparaît dans laquelle vous devez compléter des champs comme détaillé ci-dessous. + + + Type de clé + + Indique l'algorithme de chiffrement utilisé pour générer la sous-clé. + + + DSA + + Utilise l'algorithme DSA (Digital Signature Algorithm) pour créer la sous-clé. Une sous-clé de ce type peut uniquement signer. + + + + ElGamal + + Utilise l'algorithme ElGamal pour créer la sous-clé. Ce type de sous-clé peut uniquement chiffrer. + + + + RSA + + Utilise l'algorithme RSA (Rivest-Shamir Adleman) pour créer la sous-clé. Ce type de sous-clé peut signer ou chiffrer, mais vous devez alors créer deux sous-clés différentes. + + + + + + + Longueur de clé + + Indique la longueur de la sous-clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. + + + + Date d'expiration + + Indique la date à partir de laquelle la sous-clé ne peut plus être utilisée. + + + + + + + Modification de la date d'expiration d'une sous-clé + Pour modifier la date d'expiration d'une sous-clé, sélectionnez la sous-clé dans la section Sous-clés, puis : + + Cliquez sur le bouton Expiration sur la gauche + + + Dans la boîte de dialogue de date, choisissez la nouvelle date d'expiration ou sélectionnez N'expire jamais si vous souhaitez que la clé n'expire jamais. + + + + + + Révocation d'une sous-clé + Pour révoquer une sous-clé, sélectionnez-la dans la section des Sous-clés, puis : + + Cliquez sur le bouton Révoquer sur la gauche + + + Choisissez la raison de révocation de la sous-clé : + + + + Aucune raison + + Il n'y a aucune raison particulière de révoquer la clé. + + + + Compromise + + La clé a été compromise. + + + + Remplacée + + La clé a été remplacée par une autre. + + + + Non utilisée + + La clé n'est plus utilisée. + + + + + + + Saisissez une description expliquant la révocation de la clé + + + Cliquez sur le bouton Révoquer. + + + + L'effet de révocation d'une sous-clé est immédiat. + + + + + Suppression d'une sous-clé + Pour supprimer une sous-clé, sélectionnez-la dans la section des Sous-clés, puis : + + Cliquez sur le bouton Supprimer sur la gauche. + + + + + + + + + Propriétés de clé Secure Shell + Les descriptions de cette section sont applicables à toutes les clés SSH. + Pour afficher les propriétés d'une clé SSH : + + Sélectionnez la clé Secure Shell dans la fenêtre principale + + + Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; + + + Sélectionnez l'onglet Détails. + + + + + Propriétés + + + + Empreinte + + L'empreinte est une chaîne de caractères unique qui identifie précisément une clé. + + + + Algorithme + + Indique l'algorithme de chiffrement utilisé pour générer la clé. + + + + Emplacement + + C'est l'emplacement de stockage de la clé privée. + + + + Force + + Indique la longueur de la clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. + Une clé longue ne suffit pas à compenser la faiblesse d'une phrase de passe. + + + + + + + + + Suppression d'une clé Secure Shell + Pour supprimer une clé Secure Shell : + + Sélectionnez la clé SSH dans la fenêtre principale + + + Faites un clic droit sur la clé et choisissez Effacer la clé ou choisissez Édition Effacer la clé. + + + + + + + + + Importation de clés + Pour importer des clés, choisissez Fichier Importer et choisissez dans le sélecteur de fichiers un fichier contenant au moins une clé publique avec armure ASCII. + L'importation peut aussi être effectuée en collant les clés dans Mots de passe et clés : + + Sélectionnez un bloc de texte avec armure ASCII publique + + + Copiez-le dans le presse-papiers + + + Choisissez Édition Coller les clés. + + + + + + + + Exportation de clés + Pour exporter des clés, sélectionnez-les dans la fenêtre principale et choisissez Fichier Exporter. + Vous pouvez aussi exporter des clés dans le presse-papiers dans un bloc de texte avec armure ASCII : + + Sélectionnez les clés dans la fenêtre principale + + + Choisissez Édition Copier les clés. + + + + + + + + + Signature d'une clé + La signature de la clé d'une autre personne signifie que vous avez confiance en cette personne. Avant de signer une clé, vous devez vérifier soigneusement l'empreinte de la clé afin de vous assurer qu'elle appartient réellement à cette personne. + Pour signer une clé de votre trousseau : + + Sélectionnez la clé que vous souhaitez signer dans les onglets Clés de confiance ou Autres clés obtenues + + + Choisissez Signer dans la barre d'outils ou Fichier Signer + + + Sélectionnez le degré de précaution avec lequel la clé a été vérifiée + + + Indiquez si la signature doit se limiter localement à votre trousseau et si la signature peut être révoquée + + + Cliquez sur le bouton Signer. + + + + + + + + Préférences + Cette section décrit les préférences configurables dans Mots de passe et clés en choisissant Édition Préférences à partir de Mots de passe et clés de chiffrement. + + + Trousseaux de mots de passe + + Création de trousseaux + Pour créer un nouveau trousseau de clés, choisissez FichierNouveau et sélectionnez Trousseau de mots de passe. Saisissez un nom pour le nouveau trousseau, puis appuyez sur Entrée. + + + Modification des mots de passe de trousseau + Pour changer le mot de passe de déverrouillage du trousseau, sélectionnez d'abord le trousseau concerné, puis cliquez sur le bouton Modifier le mot de passe de déverrouillage. Vous devez alors saisir l'ancien mot de passe dans la zone de texte Ancien mot de passe, le nouveau mot de passe dans la zone de texte Nouveau mot de passe et confirmer ce dernier dans la zone Confirmer le mot de passe. Pour appliquer le changement, cliquez sur Modifier. Si l'ancien mot de passe a été correctement saisi, vous obtenez un message vous indiquant que l'opération a réussi. Dans le cas contraire, on vous demande de ressaisir correctement ce mot de passe. + + + Suppression de trousseaux + Pour supprimer un trousseau de clés, sélectionnez premièrement le trousseau concerné, puis choisissez Édition Supprimer. + + + + + Serveurs de clés + Gardez à jour vos clés et celles que vous avez récoltées en les synchronisant périodiquement avec des serveurs de clés distants. La synchronisation permet de s'assurer d'avoir les dernières signatures sur toutes les clés afin de tirer le plus grand bénéfice du « réseau de confiance ». + Mots de passe et clés prend en charge les serveurs de clés HKP et LDAP. + + + Serveurs HKP + + Les serveurs de clés HKP sont des serveurs Web ordinaires tels que le populaire hkp://pool.sks-keyservers.net, également accessible à l'adresse http://sks-keyservers.net. + + + + Serveurs de clés LDAP + + Les serveurs de clés LDAP sont moins courants, mais utilisent le protocole LDAP standard pour fournir les clés. ldap://keyserver.pgp.com est un bon serveur LDAP. + + + + + + + Partage de clés + Le partage de clés est fourni par DNS-SD, également connu sous le nom de Bonjour ou Rendezvous. L'activation du partage de clés ajoute les trousseaux locaux de clés publiques des utilisateurs de Mots de passe et clés à la boîte de dialogue de recherche de clés distantes. L'utilisation de ces « serveurs de clés » locaux est probablement plus rapide que l'accès à des serveurs distants. + + + + + + + À propos de Mots de passe et clés + Mots de passe et clés, ses greffons, l'applet des préférences et l'applet de tableau de bord sont connus globalement sous le nom de Seahorse. Seahorse a été écrit par Jacob Perkins. Les mainteneurs actuels sont Stef Walter et Adam Schreiber. Ce manuel a été écrit par Adam Schreiber. Le site Web du projet a été conçu par Jim Pharis. Pour trouver plus d'informations à propos du projet Seahorse, consultez la page Web de Seahorse [en anglais]. + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + Ce programme est distribué selon les termes de la GNU General Public License, tels que publiés par la Free Software Foundation ; soit la version 2 de cette licence ou (à votre choix) toute version ultérieure. Une copie de cette licence est inclue dans cette documentation ; une autre se trouve dans le fichier COPYING inclus dans le code source de ce programme. + +
diff -Nru seahorse-3.2.2/help/fr/legal.xml seahorse-3.6.3/help/fr/legal.xml --- seahorse-3.2.2/help/fr/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/fr/legal.xml 2012-11-09 17:35:38.000000000 +0100 @@ -0,0 +1,16 @@ + + + Permission vous est donnée de copier, distribuer et/ou modifier ce document selon les termes de la Licence GNU Free Documentation License, Version 1.1 ou ultérieure publiée par la Free Software Foundation sans section inaltérable, sans texte de première page de couverture ni texte de dernière page de couverture. Vous trouverez un exemplaire de cette licence en suivant ce lien ou dans le fichier COPYING-DOCS fourni avec le présent manuel. + Ce manuel fait partie de la collection de manuels GNOME distribués selon les termes de la licence de documentation libre GNU. Si vous souhaitez distribuer ce manuel indépendamment de la collection, vous devez joindre un exemplaire de la licence au document, comme indiqué dans la section 6 de celle-ci. + + La plupart des noms utilisés par les entreprises pour distinguer leurs produits et services sont des marques déposées. Lorsque ces noms apparaissent dans la documentation GNOME et que les membres du projet de Documentation GNOME sont informés de l'existence de ces marques déposées, soit ces noms entiers, soit leur première lettre est en majuscule. + + LE PRÉSENT DOCUMENT ET SES VERSIONS MODIFIÉES SONT FOURNIS SELON LES TERMES DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE : + + LE PRÉSENT DOCUMENT EST FOURNI « TEL QUEL », SANS AUCUNE GARANTIE, EXPRESSE OU IMPLICITE, Y COMPRIS, ET SANS LIMITATION, LES GARANTIES DE MARCHANDABILITÉ, D'ADÉQUATION À UN OBJECTIF PARTICULIER OU DE NON INFRACTION DU DOCUMENT OU DE SA VERSION MODIFIÉE. L'UTILISATEUR ASSUME TOUT RISQUE RELATIF À LA QUALITÉ, À LA PERTINENCE ET À LA PERFORMANCE DU DOCUMENT OU DE SA VERSION DE MISE À JOUR. SI LE DOCUMENT OU SA VERSION MODIFIÉE S'AVÉRAIT DÉFECTUEUSE, L'UTILISATEUR (ET NON LE RÉDACTEUR INITIAL, L'AUTEUR, NI TOUT AUTRE PARTICIPANT) ENDOSSERA LES COÛTS DE TOUTE INTERVENTION, RÉPARATION OU CORRECTION NÉCESSAIRE. CETTE DÉNÉGATION DE RESPONSABILITÉ CONSTITUE UNE PARTIE ESSENTIELLE DE CETTE LICENCE. AUCUNE UTILISATION DE CE DOCUMENT OU DE SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; + + + EN AUCUNE CIRCONSTANCE ET SOUS AUCUNE INTERPRÉTATION DE LA LOI, QU'IL S'AGISSE D'UN DÉLIT CIVIL (Y COMPRIS LA NÉGLIGENCE), CONTRACTUEL OU AUTRE, L'AUTEUR, LE RÉDACTEUR INITIAL, TOUT PARTICIPANT OU TOUT DISTRIBUTEUR DE CE DOCUMENT OU DE SA VERSION MODIFIÉE, OU TOUT FOURNISSEUR DE L'UNE DE CES PARTIES NE POURRA ÊTRE TENU RESPONSABLE À L'ÉGARD DE QUICONQUE POUR TOUT DOMMAGE DIRECT, INDIRECT, PARTICULIER, OU ACCIDENTEL DE TOUT TYPE Y COMPRIS, SANS LIMITATION, LES DOMMAGES LIÉS À LA PERTE DE CLIENTÈLE, À UN ARRÊT DE TRAVAIL, À UNE DÉFAILLANCE OU UN MAUVAIS FONCTIONNEMENT INFORMATIQUE, OU À TOUT AUTRE DOMMAGE OU PERTE LIÉE À L'UTILISATION DU DOCUMENT ET DE SES VERSIONS MODIFIÉES, MÊME SI LADITE PARTIE A ÉTÉ INFORMÉE DE L'ÉVENTUALITÉ DE TELS DOMMAGES. + + + diff -Nru seahorse-3.2.2/help/fr/seahorse.xml seahorse-3.6.3/help/fr/seahorse.xml --- seahorse-3.2.2/help/fr/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/fr/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,906 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Manuel de Mots de passe et clés - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins et Adam Schreiber - 2007-2009Claude Paroz (claude@2xlibre.net)2007Yann Simon (yann.simon.fr@gmail.com) - - Projet Seahorse - - - - Permission vous est donnée de copier, distribuer et/ou modifier ce document selon les termes de la Licence GNU Free Documentation License, Version 1.1 ou ultérieure publiée par la Free Software Foundation sans section inaltérable, sans texte de première page de couverture ni texte de dernière page de couverture. Vous trouverez un exemplaire de cette licence en suivant ce lien ou dans le fichier COPYING-DOCS fourni avec le présent manuel. - Ce manuel fait partie de la collection de manuels GNOME distribués selon les termes de la licence de documentation libre GNU. Si vous souhaitez distribuer ce manuel indépendamment de la collection, vous devez joindre un exemplaire de la licence au document, comme indiqué dans la section 6 de celle-ci. - - La plupart des noms utilisés par les entreprises pour distinguer leurs produits et services sont des marques déposées. Lorsque ces noms apparaissent dans la documentation GNOME et que les membres du projet de Documentation GNOME sont informés de l'existence de ces marques déposées, soit ces noms entiers, soit leur première lettre est en majuscule. - - LE PRÉSENT DOCUMENT ET SES VERSIONS MODIFIÉES SONT FOURNIS SELON LES TERMES DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE : - - LE PRÉSENT DOCUMENT EST FOURNI « TEL QUEL », SANS AUCUNE GARANTIE, EXPRESSE OU IMPLICITE, Y COMPRIS, ET SANS LIMITATION, LES GARANTIES DE MARCHANDABILITÉ, D'ADÉQUATION À UN OBJECTIF PARTICULIER OU DE NON INFRACTION DU DOCUMENT OU DE SA VERSION MODIFIÉE. L'UTILISATEUR ASSUME TOUT RISQUE RELATIF À LA QUALITÉ, À LA PERTINENCE ET À LA PERFORMANCE DU DOCUMENT OU DE SA VERSION DE MISE À JOUR. SI LE DOCUMENT OU SA VERSION MODIFIÉE S'AVÉRAIT DÉFECTUEUSE, L'UTILISATEUR (ET NON LE RÉDACTEUR INITIAL, L'AUTEUR, NI TOUT AUTRE PARTICIPANT) ENDOSSERA LES COÛTS DE TOUTE INTERVENTION, RÉPARATION OU CORRECTION NÉCESSAIRE. CETTE DÉNÉGATION DE RESPONSABILITÉ CONSTITUE UNE PARTIE ESSENTIELLE DE CETTE LICENCE. AUCUNE UTILISATION DE CE DOCUMENT OU DE SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; - - - EN AUCUNE CIRCONSTANCE ET SOUS AUCUNE INTERPRÉTATION DE LA LOI, QU'IL S'AGISSE D'UN DÉLIT CIVIL (Y COMPRIS LA NÉGLIGENCE), CONTRACTUEL OU AUTRE, L'AUTEUR, LE RÉDACTEUR INITIAL, TOUT PARTICIPANT OU TOUT DISTRIBUTEUR DE CE DOCUMENT OU DE SA VERSION MODIFIÉE, OU TOUT FOURNISSEUR DE L'UNE DE CES PARTIES NE POURRA ÊTRE TENU RESPONSABLE À L'ÉGARD DE QUICONQUE POUR TOUT DOMMAGE DIRECT, INDIRECT, PARTICULIER, OU ACCIDENTEL DE TOUT TYPE Y COMPRIS, SANS LIMITATION, LES DOMMAGES LIÉS À LA PERTE DE CLIENTÈLE, À UN ARRÊT DE TRAVAIL, À UNE DÉFAILLANCE OU UN MAUVAIS FONCTIONNEMENT INFORMATIQUE, OU À TOUT AUTRE DOMMAGE OU PERTE LIÉE À L'UTILISATION DU DOCUMENT ET DE SES VERSIONS MODIFIÉES, MÊME SI LADITE PARTIE A ÉTÉ INFORMÉE DE L'ÉVENTUALITÉ DE TELS DOMMAGES. - - - - - - - - Jacob - Perkins - - Projet Seahorse - - - - - Adam - Schreiber - - Projet Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - Projet de documentation GNOME -
- pcutler@foresightlinux.org -
- - - - - - - Projet Seahorse - - - Projet de documentation GNOME - - - - Manuel de Mots de passe et clés v2.11.0 - Mai 2009 - - Paul Cutler pcutler@foresightlinux.org - - - - Manuel de Mots de passe et clés v0.10.1 - Août 2008 - - Adam Schreiber sadam@clemson.edu - - - - Manuel de Mots de passe et clés V0.9.1 - Novembre 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Manuel de Mots de passe et clés V0.9.0 - Juillet 2005 - - Adam Schreiber sadam@clemson.edu - Projet Seahorse - - - - Manuel de Mots de passe et clés V0.7.0 - Février 2003 - - Jacob Perkins - Projet Seahorse - - - - Ce manuel documente la version 2.28.x de Mots de passe et clés - - Votre avis - Pour rapporter une anomalie ou émettre une suggestion concernant Mots de passe et clés ou ce manuel, procédez comme indiqué sur la page de réactions sur GNOME. - - - - Mots de passe et clés est l'application de gestion des clés de chiffrement du bureau GNOME - - - - - - Seahorse - - - - seahorse - - - - Clés de chiffrement - - - - - - Introduction - Vous pouvez utiliser Mots de passe et clés pour créer et gérer des clés PGP et SSH. - Mots de passe et clés fournit une interface pour la plupart des fonctionnalités de Gnu Privacy Guard (GPG) et s'intègre avec plusieurs composants du bureau GNOME. - Avec Mots de passe et clés, vous pouvez : - - - Créer et gérer des clés PGP et SSH - - - Exporter et importer des clés PGP et SSH - - - Partager vos clés avec d'autres - - - - - - - - Premiers pas - - Démarrage de <application>Mots de passe et clés</application> - Vous pouvez lancer Mots de passe et clés à l'aide des procédures suivantes : - - - Menu Applications - - Choisissez AccessoiresMots de passe et clés. - - - - Ligne de commande - - Saisissez seahorse, puis appuyez sur Entrée. - - - - - - - Après le démarrage de <application>Mots de passe et clés</application> - Au démarrage de Mots de passe et clés, la fenêtre ci-dessous apparaît. - -
- La fenêtre de <application>Mots de passe et clés</application> - - - - - - - Montre la fenêtre de Mots de passe et clés. - - - -
- - La fenêtre de Mots de passe et clés contient les éléments suivants : - - - Barre de menus - - Les menus de la barre de menus contiennent toutes les commandes nécessaires à l'utilisation de Mots de passe et clés. - - - Barre d'outils - - Utilisez la barre d'outils pour accéder rapidement aux commandes les plus fréquemment utilisées. - - - Onglets Clés et mots de passe - - Donnent accès aux clés et aux mots de passe du trousseau. - - - Options de premier démarrage - - Donnent un accès rapide aux opérations pertinentes pour débuter. À partir de là, vous pouvez : - - - Naviguer dans le système d'aide - - - Importer des clés dans le trousseau - - - Créer de nouvelles clés - - - - - - - - - - - - Création de clés OpenPGP - OpenPGP est un protocole non propriétaire pour chiffrer des courriels via une cryptographie à clé publique basée sur PGP. Il définit des formats standards de messages chiffrés, de signatures, de clé privées et de certificats pour échanger des clés publiques. - La cryprographie à clé publique est un concept qui implique l'utilisation de deux clés : une clé publique que vous pouvez transmettre à tous ceux avec qui vous voulez communiquer, et une clé privée qui est privée et doit rester secrète. - Pour créer des clés OpenPGP : - - Choisissez FichierNouveau... - - - Sélectionnez Clé PGP et cliquez sur Continuer - - - Saisissez votre nom complet (prénom - nom), votre adresse électronique et toute information supplémentaire. Vous pouvez aussi spécifier des options avancées pour la clé (voir ci-après). - - - Cliquez sur Créer pour créer une nouvelle paire de clés. - - - La boîte de dialogue Phrase de passe pour la nouvelle clé PGP apparaît. Saisissez deux fois la phrase de passe pour la nouvelle clé. - - - - Utilisez pour les phrases de passe les mêmes techniques que pour la génération de mots de passe solides. La différence principale entre un mot de passe et une phrase de passe est que dans cette dernière, les espaces sont des caractères valides. - - - - Options avancées - Étendez la section Options avancées de clé pour spécifier les options suivantes d'une nouvelle clé : - - - Type de chiffrement - - Ce champ spécifie l'algorithme de chiffrement utilisé pour générer vos clés. - - - DSA ElGamal - - Ce choix suggéré vous permettra de chiffer, déchiffrer, signer et vérifier selon vos besoins. - - - - DSA - - Ne permet que la signature. - - - - RSA - - Ne permet que la signature. - - - - - - - Force de la clé (bits) - - C'est la longueur de la clé en bits. Plus la clé est longue, plus elle sera sûre, pour autant que la phrase de passe utilisée soit solide. Par contre, les opérations utilisant une plus longue clé prennent aussi plus de temps à s'exécuter qu'avec une clé courte. Les valeurs acceptables se situent entre 1024 et 4096 bits. La recommandation est d'au moins 2048 bits. - - - - Date d'expiration - - C'est la date à partir de laquelle la clé cessera d'être utilisable pour effectuer des opérations de chiffrement ou de signature. Six mois est une durée raisonnable. Passé ce délai, vous devrez soit changer la date d'expiration, soit générer une nouvelle clé ou sous-clé. - Signez votre nouvelle clé avec l'ancienne avant qu'elle expire pour préserver son capital de confiance. - - - - - - - - - - - Création de clés Secure Shell - Secure Shell (SSH) est une manière de se connecter à un ordinateur distant pour exécuter des commandes sur cette machine. Les clés SSH sont utilisées dans des systèmes basés sur l'authentification par clés, en alternative du système par défaut d'authentification par mot de passe. Avec l'authentification basée sur les clés, il n'est pas nécessaire de saisir manuellement un mot de passe pour être authentifié. - Les clés Secure Shell sont composées de deux clés : une clé privée, qui doit être gardée secrète, et une clé publique qui peut être envoyée vers tout ordinateur auquel vous avez besoin d'accéder. - Pour créer une clé Secure Shell : - - - Choisissez FichierNouveau... - - - Sélectionnez clé Secure Shell et cliquez sur Continuer - - - Saisissez une description décrivant l'usage prévu de la clé. Vous pouvez utiliser votre courriel ou tout autre indice. Vous pouvez également spécifier des options avancées pour la clé (voir ci-après). - - - Cliquez sur Créer seulement pour créer la nouvelle clé ou sur Créer et configurer pour créer la clé et configurer un autre ordinateur pour qu'il reconnaisse cette clé lors de l'authentification. - - - La boîte de dialogue Phrase de passe pour la nouvelle clé Secure Shell apparaît. Saisissez deux fois la phrase de passe pour votre nouvelle clé. - - Utilisez pour les phrases de passe les mêmes techniques que pour la génération de mots de passe solides. La différence principale entre un mot de passe et une phrase de passe est que dans cette dernière, les espaces sont des caractères valides. - - - - - - - - Options avancées - Développez la section Options avancées de clé afin de spécifier les options suivantes pour une nouvelle clé : - - - - Type de chiffrement - - Ce champ spécifie l'algorithme de chiffrement utilisé pour générer la clé. - - - RSA - - Utilise l'algorithme Rivest-ShamirAdleman (RSA) pour créer la clé SSH. C'est le choix préconisé et le plus sûr. - - - - DSA - - Utilise l'algorithme Digital Signature Algorithm (DSA) pour créer la clé SSH. - - - - - - - Force de la clé (bits) - - C'est la longueur de la clé en bits. Plus la clé est longue, plus elle sera sûre, pour autant que la phrase de passe utilisée soit solide. Par contre, les opérations utilisant une plus longue clé prennent aussi plus de temps à s'exécuter qu'avec une clé courte. Les valeurs acceptables se situent entre 1024 et 4096 bits. La recommandation est d'au moins 2048 bits. - - - - - - - - - - Propriétés de clé OpenPGP - Les descriptions dans cette section s'appliquent à toutes les clés OpenPGP. - - Pour afficher les propriétés d'une clé PGP : - - Sélectionnez la clé PGP dans la fenêtre principale ; - - - Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; - - - Sélectionnez l'onglet Détails. - - - - - Propriétés - - - - Empreinte - - L'empreinte est une chaîne de caractères unique qui identifie précisément une clé. - - - - Identifiant de clé - - L'identifiant de la clé (KeyID) est comparable à l'empreinte. Cependant, l'identifiant ne contient que les 8 derniers caractères de l'empreinte. Il est possible la plupart du temps d'identifier une clé uniquement avec l'identifiant de clé, mais il peut arriver que deux clés possèdent le même identifiant. - - - - Type - - Spécifie l'algorithme de chiffrement utilisé pour générer la clé. Les clés DSA ne peuvent que signer. Les clés ElGamal sont utilisées pour chiffrer. - - - - Créée le - - Indique la date de création de la clé. - - - - Expiration - - Indique la date à partir de laquelle la clé ne pourra plus être utilisée. - - - - Force - - Indique la longueur de la clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. - Une clé longue ne suffit pas à compenser la faiblesse d'une phrase de passe. - - - - - - - - - Confiance - La confiance est une indication de votre certitude qu'une personne est capable d'étendre le réseau de confiance. Lorsque vous rencontrez une clé que vous n'avez pas signée, la validité de la clé de cette personne sera déterminée sur la base des signatures qu'elle a collectée et sur la confiance dont vous faites preuve envers les signataires. Par défaut, une clé inconnue nécessite 3 signatures avec une valeur de confiance marginale ou une signature complètement fiable. - - Inconnu : vous n'avez aucune idée de la capacité de cette personne à signer correctement des clés. - Jamais : cette personne n'est pas apte à signer correctement des clés. - Marginale : cette personne contrôle la photo de l'identifiant avant de signer une clé, mais n'examine pas nécessairement l'identifiant de manière minutieuse. - Complète : cette personne examine attentivement la photo attachée à l'identifiant de chaque personne avant de signer une clé (par exemple, elle ne signe que les clés qui appartiennent réellement à la personne demandant la signature). - Ultime : ce niveau de confiance ne devrait s'appliquer qu'à vos propres clés. - - - - - Activation et désactivation de clés - Lorsqu'une clé est active, elle peut être utilisée pour effectuer des opérations de chiffrement. Lorsqu'elle n'est plus active, elle ne peut plus être utilisée pour chiffrer ou pour vérifier des signatures qu'elle a produites. - - - - Date d'expiration - Après son expiration, une clé ne peut plus être utilisée pour effectuer des opérations de clé. La modification de la date d'expiration d'une clé vers une date future la réactive. Un bon principe général serait d'avoir une clé principale qui n'expire jamais et plusieurs sous-clés avec expiration et signées par la clé principale. - - - - Identifiants utilisateur - Les identifiants utilisateur permettent d'avoir plusieurs identités et adresses électroniques dans une même clé. - Ils se présentent habituellement sous la forme suivante : Nom (commentaire) <adresse électronique> - - - Ajout d'un identifiant utilisateur - L'ajout d'un identifiant utilisateur est utile lorsque vous voulez disposer d'une identité pour votre travail et d'une autre pour vos amis. - Pour ajouter un identifiant utilisateur à une clé : - - Sélectionnez la clé dans la fenêtre principale ; - - - Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; - - - Sélectionnez l'onglet Noms et signatures ; - - - Cliquez sur Ajouter nom. - - - Après avoir suivi les instructions ci-dessus, une boîte de dialogue apparaît dans laquelle vous devez compléter des champs comme détaillé ci-dessous. - - - Nom complet - - Saisissez votre nom complet sous la forme <prénom> <nom> Un deuxième nom ou une initiale sont facultatifs. - - - Vous devez saisir au moins 5 caractères dans ce champ. - - - - - - Adresse électronique - - Votre adresse électronique est le moyen privilégié de découvrir votre clé sur un serveur de clé ou un autre service similaire. Assurez-vous qu'elle soit correcte avant de continuer. - - - Elle devrait apparaître sous la forme <nom-d'utilisateur>@<nom-de-domaine> - - - - - - Commentaire - - Le champ commentaire peut être employé pour fournir toute information supplémentaire dans le nom de votre nouvel identifiant. Cette information peut être recherchée sur les serveurs de clés. - - - - - - - - Identifiants photo - Un identifiant photo permet à un propriétaire de clé d'insérer une ou plusieurs images portraits dans une clé. Ces identifiants peuvent être signés comme un identifiant utilisateur normal. Un identifiant photo doit être en format JPEG et il est recommandé que sa taille ne dépasse pas 240x288 pixels. - Si l'image choisie n'est pas du bon type de fichier ou de la bonne taille, Mots de passe et clés peut la redimensionner et la convertir à la volée à partir de n'importe quel format d'image pris en charge par la bibliothèque GDK. - - - - Modification de la phrase de passe - Pour modifier la phrase de passe attribuée à une clé : - - Sélectionnez la clé dans la fenêtre principale ; - - - Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; - - - Cliquez sur Changer la phrase de passe. - - - Saisissez la nouvelle phrase de passe et cliquez sur Valider. - - - - Suppression d'une clé - Pour supprimer une clé de votre trousseau : - - Sélectionnez la clé dans la fenêtre principale ; - - - Faites un clic droit sur la clé et choisissez Effacer la clé ou choisissez ÉditionEffacer la clé. - - - - Vous pouvez supprimer vos clés, les clés de confiance et les clés récoltées. - - - - - - - - Propriétés des sous-clés OpenPGP - Chaque clé OpenPGP dispose d'une clé principale unique utilisée seulement pour signer. Les sous-clés sont utilisées pour chiffrer et également pour signer. Ainsi, si une sous-clé est compromise, vous n'avez pas besoin de révoquer votre clé principale. - - - Identifiant - - C'est l'identifiant de la sous-clé. - - - - Type - - Spécifie l'algorithme de chiffrement utilisé pour générer une sous-clé. Les clés DSA ne peuvent que signer, les clés ElGamal permettent de chiffrer, alors que les clés RSA peuvent signer et chiffrer. - - - - Créée le - - Indique la date de création de la clé. - - - - Expiration - - Indique la date à partir de laquelle la clé ne pourra plus être utilisée. - - - - État - - Indique l'état de la clé. - - - - Force - - Indique la longueur de la clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. - Une clé longue ne suffit pas à compenser la faiblesse d'une phrase de passe. - - - - - - - Ajout d'une sous-clé - Pour ajouter une sous-clé à une clé, cliquez sur le bouton Ajouter de la section Sous-clés. - Après avoir suivi les instructions ci-dessus, une boîte de dialogue apparaît dans laquelle vous devez compléter des champs comme détaillé ci-dessous. - - - Type de clé - - Indique l'algorithme de chiffrement utilisé pour générer la sous-clé. - - - DSA - - Utilise l'algorithme DSA (Digital Signature Algorithm) pour créer la sous-clé. Une sous-clé de ce type peut uniquement signer. - - - - ElGamal - - Utilise l'algorithme ElGamal pour créer la sous-clé. Ce type de sous-clé peut uniquement chiffrer. - - - - RSA - - Utilise l'algorithme RSA (Rivest-Shamir Adleman) pour créer la sous-clé. Ce type de sous-clé peut signer ou chiffrer, mais vous devez alors créer deux sous-clés différentes. - - - - - - - Longueur de clé - - Indique la longueur de la sous-clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. - - - - Date d'expiration - - Indique la date à partir de laquelle la sous-clé ne peut plus être utilisée. - - - - - - - Modification de la date d'expiration d'une sous-clé - Pour modifier la date d'expiration d'une sous-clé, sélectionnez la sous-clé dans la section Sous-clés, puis : - - Cliquez sur le bouton Expiration sur la gauche - - - Dans la boîte de dialogue de date, choisissez la nouvelle date d'expiration ou sélectionnez N'expire jamais si vous souhaitez que la clé n'expire jamais. - - - - - - Révocation d'une sous-clé - Pour révoquer une sous-clé, sélectionnez-la dans la section des Sous-clés, puis : - - Cliquez sur le bouton Révoquer sur la gauche - - - Choisissez la raison de révocation de la sous-clé : - - - - Aucune raison - - Il n'y a aucune raison particulière de révoquer la clé. - - - - Compromise - - La clé a été compromise. - - - - Remplacée - - La clé a été remplacée par une autre. - - - - Non utilisée - - La clé n'est plus utilisée. - - - - - - - Saisissez une description expliquant la révocation de la clé - - - Cliquez sur le bouton Révoquer. - - - - L'effet de révocation d'une sous-clé est immédiat. - - - - - Suppression d'une sous-clé - Pour supprimer une sous-clé, sélectionnez-la dans la section des Sous-clés, puis : - - Cliquez sur le bouton Supprimer sur la gauche. - - - - - - - - - Propriétés de clé Secure Shell - Les descriptions de cette section sont applicables à toutes les clés SSH. - Pour afficher les propriétés d'une clé SSH : - - Sélectionnez la clé Secure Shell dans la fenêtre principale - - - Double-cliquez sur la clé ou choisissez Propriétés dans la barre d'outils ; - - - Sélectionnez l'onglet Détails. - - - - - Propriétés - - - - Empreinte - - L'empreinte est une chaîne de caractères unique qui identifie précisément une clé. - - - - Algorithme - - Indique l'algorithme de chiffrement utilisé pour générer la clé. - - - - Emplacement - - C'est l'emplacement de stockage de la clé privée. - - - - Force - - Indique la longueur de la clé en bits. En général, plus la clé est longue, plus elle offre de sécurité. - Une clé longue ne suffit pas à compenser la faiblesse d'une phrase de passe. - - - - - - - - - Suppression d'une clé Secure Shell - Pour supprimer une clé Secure Shell : - - Sélectionnez la clé SSH dans la fenêtre principale - - - Faites un clic droit sur la clé et choisissez Effacer la clé ou choisissez ÉditionEffacer la clé. - - - - - - - - - Importation de clés - Pour importer des clés, choisissez FichierImporter et choisissez dans le sélecteur de fichiers un fichier contenant au moins une clé publique avec armure ASCII. - L'importation peut aussi être effectuée en collant les clés dans Mots de passe et clés : - - Sélectionnez un bloc de texte avec armure ASCII publique - - - Copiez-le dans le presse-papiers - - - Choisissez ÉditionColler les clés. - - - - - - - - Exportation de clés - Pour exporter des clés, sélectionnez-les dans la fenêtre principale et choisissez FichierExporter. - Vous pouvez aussi exporter des clés dans le presse-papiers dans un bloc de texte avec armure ASCII : - - Sélectionnez les clés dans la fenêtre principale - - - Choisissez ÉditionCopier les clés. - - - - - - - - - Signature d'une clé - La signature de la clé d'une autre personne signifie que vous avez confiance en cette personne. Avant de signer une clé, vous devez vérifier soigneusement l'empreinte de la clé afin de vous assurer qu'elle appartient réellement à cette personne. - Pour signer une clé de votre trousseau : - - Sélectionnez la clé que vous souhaitez signer dans les onglets Clés de confiance ou Autres clés obtenues - - - Choisissez Signer dans la barre d'outils ou FichierSigner - - - Sélectionnez le degré de précaution avec lequel la clé a été vérifiée - - - Indiquez si la signature doit se limiter localement à votre trousseau et si la signature peut être révoquée - - - Cliquez sur le bouton Signer. - - - - - - - - Préférences - Cette section décrit les préférences configurables dans Mots de passe et clés en choisissant ÉditionPréférences à partir de Mots de passe et clés de chiffrement. - - - Trousseaux de mots de passe - - Création de trousseaux - Pour créer un nouveau trousseau de clés, choisissez FichierNouveau et sélectionnez Trousseau de mots de passe. Saisissez un nom pour le nouveau trousseau, puis appuyez sur Entrée. - - - Modification des mots de passe de trousseau - Pour changer le mot de passe de déverrouillage du trousseau, sélectionnez d'abord le trousseau concerné, puis cliquez sur le bouton Modifier le mot de passe de déverrouillage. Vous devez alors saisir l'ancien mot de passe dans la zone de texte Ancien mot de passe, le nouveau mot de passe dans la zone de texte Nouveau mot de passe et confirmer ce dernier dans la zone Confirmer le mot de passe. Pour appliquer le changement, cliquez sur Modifier. Si l'ancien mot de passe a été correctement saisi, vous obtenez un message vous indiquant que l'opération a réussi. Dans le cas contraire, on vous demande de ressaisir correctement ce mot de passe. - - - Suppression de trousseaux - Pour supprimer un trousseau de clés, sélectionnez premièrement le trousseau concerné, puis choisissez ÉditionSupprimer. - - - - - Serveurs de clés - Gardez à jour vos clés et celles que vous avez récoltées en les synchronisant périodiquement avec des serveurs de clés distants. La synchronisation permet de s'assurer d'avoir les dernières signatures sur toutes les clés afin de tirer le plus grand bénéfice du « réseau de confiance ». - Mots de passe et clés prend en charge les serveurs de clés HKP et LDAP. - - - Serveurs HKP - - Les serveurs de clés HKP sont des serveurs Web ordinaires tels que le populaire hkp://pool.sks-keyservers.net, également accessible à l'adresse http://sks-keyservers.net. - - - - Serveurs de clés LDAP - - Les serveurs de clés LDAP sont moins courants, mais utilisent le protocole LDAP standard pour fournir les clés. ldap://keyserver.pgp.com est un bon serveur LDAP. - - - - - - - Partage de clés - Le partage de clés est fourni par DNS-SD, également connu sous le nom de Bonjour ou Rendezvous. L'activation du partage de clés ajoute les trousseaux locaux de clés publiques des utilisateurs de Mots de passe et clés à la boîte de dialogue de recherche de clés distantes. L'utilisation de ces « serveurs de clés » locaux est probablement plus rapide que l'accès à des serveurs distants. - - - - - - - À propos de Mots de passe et clés - Mots de passe et clés, ses greffons, l'applet des préférences et l'applet de tableau de bord sont connus globalement sous le nom de Seahorse. Seahorse a été écrit par Jacob Perkins. Les mainteneurs actuels sont Stef Walter et Adam Schreiber. Ce manuel a été écrit par Adam Schreiber. Le site Web du projet a été conçu par Jim Pharis. Pour trouver plus d'informations à propos du projet Seahorse, consultez la page Web de Seahorse [en anglais]. - Pour rapporter une anomalie ou émettre une suggestion concernant cette application ou ce manuel, procédez comme indiqué dans la section sur les rapports d'anomalie du Guide d'utilisation du bureau GNOME. - Ce programme est distribué selon les termes de la GNU General Public License, tels que publiés par la Free Software Foundation ; soit la version 2 de cette licence ou (à votre choix) toute version ultérieure. Une copie de cette licence est inclue dans cette documentation ; une autre se trouve dans le fichier COPYING inclus dans le code source de ce programme. - -
diff -Nru seahorse-3.2.2/help/gl/index.docbook seahorse-3.6.3/help/gl/index.docbook --- seahorse-3.2.2/help/gl/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/gl/index.docbook 2012-11-09 17:35:38.000000000 +0100 @@ -0,0 +1,1493 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse Project + + + + + 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. + + 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. + + + + 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. + + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse Project + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Feedback + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introduction + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Getting Started + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Applications menu + + Choose + + Accessories + Password and Keys + . + + + + Command Line + + + Type seahorse then press Return. + + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Menubar + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Toolbar + + Use the toolbar to quickly access commonly-used commands. + + + Keys and Passwords Tabs + + Provides access to the keys and passwords in the keyring. + + + First time options + + Provides fast access to useful actions for first time users. From here you can: + + + Browse the help system, + + + Import keys in the keyring, + + + Create new keys. + + + + + + + + + + + + Creating OpenPGP Keys + + OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key + cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys + and certificates for exchanging public keys. + + + Public key cryptography is a concept which involves the use of two keys: + a public key, that you can give to anyone with whom + you would like to communicate, and a private key which is + private and must be kept secret. + + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + + Use similar practices to generating a strong password when choosing a + passphrase. The main difference between a password and a passphrase is that, + in a passphrase, spaces are valid characters. + + + + + Advanced options + + Expand the Advanced key options + section to specify the following options for a new key: + + + + Encryption Type + + + This field specifies the encryption algorithms used + to generate your keys. + + + + DSA ElGamal + + + This is the suggested choice as it will allow + you to encrypt, decrypt, sign and verify as needed. + + + + + DSA + + + Will allow signing only. + + + + + RSA + + + Will allow signing only. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. The longer the key, + the more secure it will be, provided a strong passphrase is + used. Conversely, performing any operation with a longer key + will require more time than it would with a shorter key. Acceptable + values are between 1024 and 4096 bits. At least 2048 bits is recommended. + + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Creating Secure Shell Keys + + Secure Shell (SSH) is a way of logging into a remote computer to execute commands + on that machine. + SSH keys are used in key-based authentication system, as an alternative to the default password + authentication system. + With key-based authentication there is no need to manually type a password to authenticate. + + + Secure Shell keys are made of two keys: a private key, that must be kept secret, + and a public key which can be uploaded to any computer you need to access. + + + To create a Secure Shell key: + + + + Choose FileNew... + + + Select Secure Shell Key and click Continue + + + Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. + + + Click Just Create Key to + create the new key, or Create and Set Up + to create the key and set up another computer to use it for authentication. + + + The Passphrase for New Secure Shell Key + dialog opens. + Enter the passphrase twice for your new key. + + + + Use similar practices to generating a + strong password when choosing a + passphrase. The main difference between a + password and a passphrase is that, in a + passphrase, spaces are valid characters. + + + + + + + + + Advanced options + + Expand the Advanced key options section to specify the following options for a new key: + + + + + Encryption Type + + + This field specifies the encryption + algorithms used to generate your key. + + + + RSA + + + Use the Rivest-ShamirAdleman + (RSA) algorithm to create the SSH key. + This is the preferred and more secure choice. + + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the SSH key. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. + The longer the key, the more secure it + will be, provided a strong passphrase is + used. Conversely, performing any + operation with a longer key will require + more time than it would with a shorter + key. Acceptable values are between 1024 + and 4096 bits. At least 2048 bits is recommended. + + + + + + + + + + + OpenPGP Key Properties + + The descriptions in this section apply to all OpenPGP keys. + + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + The fingerprint is a unique string of characters that exactly identifies a key. + + + + KeyID + + + The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 + characters of the fingerprint. Most of the time it is possible to identify a key with + only the KeyID, but occasionally two keys may have the same ID. + + + + + Type + + + Specifies the encryption algorithm used to generate a key. DSA keys can only sign. + ElGamal keys are used to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Trust + + Trust is an indication of how sure you are of a person's ability to correctly extend + the web of trust. When you are faced with a key you have not signed, the validity of + that person's key will be determined based on the signatures they have collected and + how well or not you trust the people who have made those signatures. By default, an + unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. + + + + Unknown: You are not familiar with the person's ability to sign keys correctly. + + + Never: This person cannot correctly sign keys. + + + Marginal: This person checks for photo ID before signing a key, but + does not necessarily scrutinize the IDs. + + + Full: This person scrutinizes each and every person's photo IDs before + signing them (e.g. they only sign keys that truely belong to the person asking for the signature). + + + Ultimate: This level of trust should only be assigned to your own keys. + + + + + + Enabling and Disabling Keys + + When a key is enabled, it can be used to perform encryption operations. + When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. + + + + + Expiration Date + + A key can no longer be used to perform key operations after it has expired. Changing a + key's expiration date to a point in the future re-enables it. A good general practice + would be to have a master key that never expires and multiple subkeys that do and are + signed by the master key. + + + + + User IDs + + User IDs allow multiple identities and email addresses to + be used with the same key. + + + They usually take the form of: + Name (comment) <email address> + + + + Adding a User ID + + Adding a user ID is useful when you want to have + an identity for your job and one for your friends. + + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + + You must enter at least 5 characters in this field. + + + + + + + Email Address + + + Your email address is how most + people will locate your key on a + key server or other key provider. + Make sure it is correct before + continuing. + + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + + The comment field can be used to + place any additional information + into the displayed name of your new + ID. This information can be + searched for on key servers. + + + + + + + + + Photo IDs + + Photo IDs allow a key owner to embed one or more pictures of themselves in a key. + These identities can be signed just like normal user IDs. A photo ID must be in JPEG + format and is recommended to be no larger than 240x288 pixels. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Changing the Passphrase + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + + Enter the new passphrase and click OK. + + + + + Deleting a Key + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + + You can delete your keys, trusted keys and collected keys. + + + + + + + + + OpenPGP Subkey Properties + + Each OpenPGP key has a single master key used + to sign only. Subkeys are used to encrypt and + to sign as well. In this way, if your sub key is + compromised, you don't need to revoke your master key. + + + + ID + + + This is the identifier of the subkey. + + + + + Type + + + Specifies the encryption algorithm used to generate a subkey. + DSA keys can only sign, ElGamal + keys are used to encrypt while RSA keys are + used to sign or to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Status + + + Indicates the status of the key. + + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Adding a Subkey + + To add a subkey to a key, from the Subkeys + section click on Add button. + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Key Type + + + Specifies the encryption algorithm used to generate a subkey. + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the subkey. + This subkey can sign only. + + + + + ElGamal + + + Use the ElGamal algorithm to create the subkey. + This subkey can encrypt only. + + + + + RSA + + + Use the Rivest-Shamir Adleman (RSA) + algorithm to create the subkey. This subkey can be used to sign or encrypt, + but you have to create two different subkeys. + + + + + + + + Key Length + + + Indicates the length in bits of the subkey. + In general the longer the key, the more security it provides. + + + + + Expiration Date + + + Indicates the date the subkey can no longer be used. + + + + + + + + Changing a Subkey Expiration Date + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Revoking a Subkey + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + + The effect of revoking a subkey is immediate. + + + + + + Deleting a Subkey + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Secure Shell Key Properties + + The descriptions in this section apply to all SSH keys. + + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + + The fingerprint is a unique string of + characters that exactly identifies a key. + + + + + Algorithm + + + Specifies the encryption algorithm used to + generate a key. + + + + + Location + + + This is the location where the + private key + has been stored. + + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Deleting a Secure Shell Key + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importing Keys + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exporting Keys + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Signing a Key + + Signing another person's key means you are giving trust to that person. + Before signing a key, you have to carefully check the key's fingerprint + to be sure that the key really belongs to that person. + + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Preferences + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + + To change the unlock password of the keyring, first select the appropriate keyring and then + press Change Unlock Password button. You will then be prompted to + type the old password in the Old password text box, the new password in the + New password text box and + confirm it in the Confirm password text box. + To apply the settings, press Change. + If the old password is correct, you will get a status + message indicating the success of the operation. If the + old password is not correct you will be asked to check + its correctness. + + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Key Servers + + Keep your and other's keys up to date by syncing keys periodically with + remote keyservers. Syncing will make sure that you have the latest + signatures made on all of your keys so that the web of trust will be the + most useful. + + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + + LDAP keyservers are less common, but use the standard LDAP + protocol to serve keys. + ldap://keyserver.pgp.com is a good LDAP + server. + + + + + + + + Key Sharing + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/gl/legal.xml seahorse-3.6.3/help/gl/legal.xml --- seahorse-3.2.2/help/gl/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/gl/legal.xml 2012-11-09 17:35:38.000000000 +0100 @@ -0,0 +1,75 @@ + + + + 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. + + 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. + + + + 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. + + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/gl/seahorse.xml seahorse-3.6.3/help/gl/seahorse.xml --- seahorse-3.2.2/help/gl/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/gl/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1491 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - - - Seahorse Project - - - - - 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. - - 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. - - - - 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. - - - - 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. - - - - - - - - - - Jacob - Perkins - - Seahorse Project - - - - - Adam - Schreiber - - Seahorse Project -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse Project - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - August 2008 - - - Adam Schreiber - sadam@clemson.edu - - - - - Passwords and Keys Manual V0.9.1 - November 2006 - - - Milo Casagrande - milo_casagrande@yahoo.it - - - - - Passwords and Keys Manual V0.9.0 - July 2005 - - Adam Schreiber - sadam@clemson.edu - - Seahorse Project - - - - Passwords and Keys Manual V0.7.0 - February 2003 - - Jacob Perkins - - - Seahorse Project - - - - This manual describes version 2.28.x of Passwords and Keys - - Feedback - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Encryption Keys - - - - - - Introduction - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Create and manage PGP and SSH keys, - - - Export and import PGP and SSH keys, - - - Share your keys with others, - - - - - - - - - Getting Started - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Applications menu - - Choose - - Accessories - Password and Keys - . - - - - Command Line - - - Type seahorse then press Return. - - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - - Show the Passwords and Keys window. - - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Menubar - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Toolbar - - Use the toolbar to quickly access commonly-used commands. - - - Keys and Passwords Tabs - - Provides access to the keys and passwords in the keyring. - - - First time options - - Provides fast access to useful actions for first time users. From here you can: - - - Browse the help system, - - - Import keys in the keyring, - - - Create new keys. - - - - - - - - - - - - Creating OpenPGP Keys - - OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key - cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys - and certificates for exchanging public keys. - - - Public key cryptography is a concept which involves the use of two keys: - a public key, that you can give to anyone with whom - you would like to communicate, and a private key which is - private and must be kept secret. - - - To create OpenPGP keys: - - - - Choose FileNew... - - - - - Select PGP Key and click Continue - - - - - Enter your full name (first - last), your e-mail address and any additional information. - You can also specify advanced options for the key: see below. - - - - - Click Create to create the new key pair. - - - - - The Passphrase for New PGP Key dialog will open. - Enter the passphrase twice for your new key. - - - - - - - Use similar practices to generating a strong password when choosing a - passphrase. The main difference between a password and a passphrase is that, - in a passphrase, spaces are valid characters. - - - - - Advanced options - - Expand the Advanced key options - section to specify the following options for a new key: - - - - Encryption Type - - - This field specifies the encryption algorithms used - to generate your keys. - - - - DSA ElGamal - - - This is the suggested choice as it will allow - you to encrypt, decrypt, sign and verify as needed. - - - - - DSA - - - Will allow signing only. - - - - - RSA - - - Will allow signing only. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. The longer the key, - the more secure it will be, provided a strong passphrase is - used. Conversely, performing any operation with a longer key - will require more time than it would with a shorter key. Acceptable - values are between 1024 and 4096 bits. At least 2048 bits is recommended. - - - - - Expiration Date - - - This is the date at which the key will cease to be usable for - performing encryption or signing operations. 6 months is a reasonable time - to set it to. You will have to either change the - expiration date or generate a new key or subkey after this amount - of time passes. - - - Sign your new key with your old one before it expires - to preserve your trust status. - - - - - - - - - - - - - Creating Secure Shell Keys - - Secure Shell (SSH) is a way of logging into a remote computer to execute commands - on that machine. - SSH keys are used in key-based authentication system, as an alternative to the default password - authentication system. - With key-based authentication there is no need to manually type a password to authenticate. - - - Secure Shell keys are made of two keys: a private key, that must be kept secret, - and a public key which can be uploaded to any computer you need to access. - - - To create a Secure Shell key: - - - - Choose FileNew... - - - Select Secure Shell Key and click Continue - - - Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. - - - Click Just Create Key to - create the new key, or Create and Set Up - to create the key and set up another computer to use it for authentication. - - - The Passphrase for New Secure Shell Key - dialog opens. - Enter the passphrase twice for your new key. - - - - Use similar practices to generating a - strong password when choosing a - passphrase. The main difference between a - password and a passphrase is that, in a - passphrase, spaces are valid characters. - - - - - - - - - Advanced options - - Expand the Advanced key options section to specify the following options for a new key: - - - - - Encryption Type - - - This field specifies the encryption - algorithms used to generate your key. - - - - RSA - - - Use the Rivest-ShamirAdleman - (RSA) algorithm to create the SSH key. - This is the preferred and more secure choice. - - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the SSH key. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. - The longer the key, the more secure it - will be, provided a strong passphrase is - used. Conversely, performing any - operation with a longer key will require - more time than it would with a shorter - key. Acceptable values are between 1024 - and 4096 bits. At least 2048 bits is recommended. - - - - - - - - - - - OpenPGP Key Properties - - The descriptions in this section apply to all OpenPGP keys. - - - - To view properties of a PGP key: - - - - Select the PGP key - from the main window, - - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Properties - - - - Fingerprint - - The fingerprint is a unique string of characters that exactly identifies a key. - - - - KeyID - - - The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 - characters of the fingerprint. Most of the time it is possible to identify a key with - only the KeyID, but occasionally two keys may have the same ID. - - - - - Type - - - Specifies the encryption algorithm used to generate a key. DSA keys can only sign. - ElGamal keys are used to encrypt. - - - - - Created - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Strength - - - Indicates the length in bits of a key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - - - Trust - - Trust is an indication of how sure you are of a person's ability to correctly extend - the web of trust. When you are faced with a key you have not signed, the validity of - that person's key will be determined based on the signatures they have collected and - how well or not you trust the people who have made those signatures. By default, an - unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. - - - - Unknown: You are not familiar with the person's ability to sign keys correctly. - - - Never: This person cannot correctly sign keys. - - - Marginal: This person checks for photo ID before signing a key, but - does not necessarily scrutinize the IDs. - - - Full: This person scrutinizes each and every person's photo IDs before - signing them (e.g. they only sign keys that truely belong to the person asking for the signature). - - - Ultimate: This level of trust should only be assigned to your own keys. - - - - - - Enabling and Disabling Keys - - When a key is enabled, it can be used to perform encryption operations. - When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. - - - - - Expiration Date - - A key can no longer be used to perform key operations after it has expired. Changing a - key's expiration date to a point in the future re-enables it. A good general practice - would be to have a master key that never expires and multiple subkeys that do and are - signed by the master key. - - - - - User IDs - - User IDs allow multiple identities and email addresses to - be used with the same key. - - - They usually take the form of: - Name (comment) <email address> - - - - Adding a User ID - - Adding a user ID is useful when you want to have - an identity for your job and one for your friends. - - - To add a user ID to a key: - - - - Select the key from the main window, - - - - - Double click on it or choose Properties from the toolbar, - - - - - Select the Names and Signatures tab, - - - - - Click on Add Name. - - - - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Full Name - - - Enter your full name in the form - <first> <last> - A middle name or initial is optional. - - - - - You must enter at least 5 characters in this field. - - - - - - - Email Address - - - Your email address is how most - people will locate your key on a - key server or other key provider. - Make sure it is correct before - continuing. - - - - - It should be of the form - <username>@<domainname> - - - - - - - Key Comment - - - The comment field can be used to - place any additional information - into the displayed name of your new - ID. This information can be - searched for on key servers. - - - - - - - - - Photo IDs - - Photo IDs allow a key owner to embed one or more pictures of themselves in a key. - These identities can be signed just like normal user IDs. A photo ID must be in JPEG - format and is recommended to be no larger than 240x288 pixels. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Changing the Passphrase - - To change the passphrase assigned to a key: - - - - Select the key from the main window, - - - - - Double click on it or choose Properties from the toolbar, - - - - - Click on Change Passphrase. - - - - - - Enter the new passphrase and click OK. - - - - - Deleting a Key - - To delete a key from your keyring: - - - - Select the key from the main window, - - - - - Right click on it and choose Delete Key - or choose - - Edit - Delete Key - . - - - - - - - You can delete your keys, trusted keys and collected keys. - - - - - - - - - OpenPGP Subkey Properties - - Each OpenPGP key has a single master key used - to sign only. Subkeys are used to encrypt and - to sign as well. In this way, if your sub key is - compromised, you don't need to revoke your master key. - - - - ID - - - This is the identifier of the subkey. - - - - - Type - - - Specifies the encryption algorithm used to generate a subkey. - DSA keys can only sign, ElGamal - keys are used to encrypt while RSA keys are - used to sign or to encrypt. - - - - - Created - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Status - - - Indicates the status of the key. - - - - - Strength - - - Indicates the length in bits of the key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - Adding a Subkey - - To add a subkey to a key, from the Subkeys - section click on Add button. - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Key Type - - - Specifies the encryption algorithm used to generate a subkey. - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the subkey. - This subkey can sign only. - - - - - ElGamal - - - Use the ElGamal algorithm to create the subkey. - This subkey can encrypt only. - - - - - RSA - - - Use the Rivest-Shamir Adleman (RSA) - algorithm to create the subkey. This subkey can be used to sign or encrypt, - but you have to create two different subkeys. - - - - - - - - Key Length - - - Indicates the length in bits of the subkey. - In general the longer the key, the more security it provides. - - - - - Expiration Date - - - Indicates the date the subkey can no longer be used. - - - - - - - - Changing a Subkey Expiration Date - - To change a subkey expiration date, select - the subkey from the Subkeys - section, then: - - - - Click on the Expire button on the left, - - - - - From the date dialog choose the new expiration date or select - Never expires for no expiration date. - - - - - - - - Revoking a Subkey - - To revoke a subkey, select the subkey from the Subkeys - section, then: - - - - Click on the Revoke button on the left, - - - - - Choose a reason why to revoke the subkey: - - - - - No Reason - - - There isn't a specific reason to revoke the key. - - - - - Compromised - - - The key has been compromised. - - - - - Superseded - - - The key has been superseded by another one. - - - - - Not Used - - - The key is not used anymore. - - - - - - - - - Enter a description of why you are revoking the key, - - - - - Click on Revoke. - - - - - - - The effect of revoking a subkey is immediate. - - - - - - Deleting a Subkey - - To delete a subkey, select the subkey from the Subkeys - section, then: - - - - Click on the Delete button on the left. - - - - - - - - - - - Secure Shell Key Properties - - The descriptions in this section apply to all SSH keys. - - - To view properties of a SSH key: - - - - Select the Secure Shell key - from the main window, - - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Properties - - - - Fingerprint - - - The fingerprint is a unique string of - characters that exactly identifies a key. - - - - - Algorithm - - - Specifies the encryption algorithm used to - generate a key. - - - - - Location - - - This is the location where the - private key - has been stored. - - - - - Strength - - - Indicates the length in bits of a key. - In general the longer the key, the more - security it provides. - - - A long key is not enough to make up - for the use of a weak passphrase. - - - - - - - - - - - Deleting a Secure Shell Key - - To delete a Secure Shell key: - - - - Select the SSH key from the main window, - - - - - Right click on it and choose Delete key or choose - - Edit - Delete Key - . - - - - - - - - - - - Importing Keys - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - - Select an ASCII armored public block of text, - - - - - Copy it to the clipboard, - - - - - Choose - - Edit - Paste Keys - . - - - - - - - - - - Exporting Keys - - To export keys, select the keys in the main window - and choose - - File - Export - . - - - You can also export keys to the clipboard in an - ASCII armored block of text: - - - - Select the keys in the main window, - - - - - Choose - - Edit - Copy Keys - . - - - - - - - - - - - Signing a Key - - Signing another person's key means you are giving trust to that person. - Before signing a key, you have to carefully check the key's fingerprint - to be sure that the key really belongs to that person. - - - To sign a key in your keyring: - - - - Select the key you want to sign from the - Trusted Keys or - Other Collected Keys tabs, - - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - - Select how carefully the key has been checked, - - - - - Indicate if the signature should be local to your keyring, - and if your signature can be revoked, - - - - - Click on Sign. - - - - - - - - - - Preferences - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - - To change the unlock password of the keyring, first select the appropriate keyring and then - press Change Unlock Password button. You will then be prompted to - type the old password in the Old password text box, the new password in the - New password text box and - confirm it in the Confirm password text box. - To apply the settings, press Change. - If the old password is correct, you will get a status - message indicating the success of the operation. If the - old password is not correct you will be asked to check - its correctness. - - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Key Servers - - Keep your and other's keys up to date by syncing keys periodically with - remote keyservers. Syncing will make sure that you have the latest - signatures made on all of your keys so that the web of trust will be the - most useful. - - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKP Servers - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Keyservers - - - LDAP keyservers are less common, but use the standard LDAP - protocol to serve keys. - ldap://keyserver.pgp.com is a good LDAP - server. - - - - - - - - Key Sharing - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - - To report a bug or make a suggestion regarding this application or - this manual, follow the directions in the - Feedback section of the GNOME User Guide. - - - 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 - is included with this documentation; another can be found in the file - COPYING included with the source code of this program. - - -
diff -Nru seahorse-3.2.2/help/it/index.docbook seahorse-3.6.3/help/it/index.docbook --- seahorse-3.2.2/help/it/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/it/index.docbook 2012-11-09 17:35:38.000000000 +0100 @@ -0,0 +1,1254 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Progetto Seahorse + + + + + 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. + + Questo manuale fa parte di una raccolta di manuali GNOME distribuita in conformità con la GFDL. Per poter distribuire questo manuale separatamente, è necessario inserirvi una copia della licenza, come descritto nella sezione 6 della licenza. + + Molti dei nomi usati dalle aziende per distinguere i propri prodotti e servizi sono rivendicati come marchi. Quando questi nomi compaiono nella documentazione di GNOME, e i partecipanti al GNOME Documentation Project sono consapevoli del loro utilizzo, essi vengono scritti in lettere maiuscole o con l'iniziale maiuscola. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Progetto Seahorse + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Commenti + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introduzione + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Per iniziare + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Menù Applicazioni + + Choose + + Accessories + Password and Keys + . + + + + Riga di comando + + Digitare seahorse e premere Invio. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Barra dei menù + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Barra degli strumenti + + La barra degli strumenti fornisce un accesso rapido ai comandi più utilizzati. + + + Le schede delle chiavi e delle password + + Consentono l'accesso alle chiavi e alle password presenti nel portachiavi. + + + Opzioni iniziali + + Fornisce un accesso rapido ad alcune azioni per i nuovi utenti. Da qui è possibile: + + + sfogliare il manuale dell'applicazione, + + + importare chiavi nel portachiavi, + + + creare nuove chiavi. + + + + + + + + + + + + Creare chiavi OpenPGP + OpenPGP è un protocollo, libero, basato su PGP, per la cifratura di email, che sfrutta la crittografia a chiave pubblica. OpenPGP definisce uno standard per messaggi cifrati, firme, chiavi private e certificati per lo scambio di chiavi pubbliche. + La crittografia a chiave pubblica è un concetto che implica l'uso di due chiavi: una chiave pubblica, che è possibile condividere con tutti quelli con cui si desidera comunicare, e una chiave privata che è appunto privata e deve essere tenuta segreta. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Nello scegliere una passphrase, utilizzare le stesse tecniche per scegliere una password robusta. La differenza tra una password e una passphrase è che, in una passphrase, gli spazi sono caratteri validi. + + + + Opzioni avanzate + Espandere la sezione Opzioni avanzate per specificare le seguenti opzioni per una nuova chiave: + + + Encryption Type + + Questo campo specifica l'algoritmo di cifratura usato per generare le chiavi. + + + DSA ELGamal + + Questa è la scelta ottimale dato che consente di cifrare, decifrare, firmare e verificare come necessario. + + + + DSA + + Consente solo di firmare. + + + + RSA + + Consente solo di firmare. + + + + + + + Key Strength (bits) + + Questa è la lunghezza della chiave in bit. Più lunga la chiave, più sicura sarà, a patto che venga usata una passphrase robusta. Svolgere una qualsiasi azione con una chiave molto lunga richiede più tempo. Valori validi vanno da 1024 a 4096 bit. Sono raccomandati almeno 2048 bit. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Creare chiavi Secure Shell + Secure Shell (SSH) è un metodo con cui eseguire il login su macchine remote per eseguire dei comandi su tali macchine. Le chiavi SSH vengono utilizzate in un sistema di autenticazione basato sulle chiavi, come alternativa al sistema basato sulle password. Con tale sistema non c'è la necessità di digitare la password per l'autenticazione. + Le chiavi Secure Shell sono composte da: una chiave privata, che deve essere tenuta segreta, e una chiave pubblica che può essere caricata su qualsiasi computer sia necessario accedere. + Per creare una chiave Secure Shell: + + + Choose FileNew... + + + Selezionare Chiave Secure Shell e fare clic su Continua + + + Inserire una descrizione per l'utilizzo della chiave. È possibile utilizzare il proprio indirizzo email o qualsiasi altra informazione. È anche possibile specificare delle opzioni avanzate: consultare più sotto. + + + Fare clic su Crea per creare la nuova chiave o Crea e configura per creare la chiave e configurare un altro computer per l'autenticazione. + + + Il dialogo Passphrase per la nuova chiave Secure Shell si apre. Inserire la passphrase per la nuova chiave due volte. + + Nello scegliere una passphrase, utilizzare le stesse tecniche per scegliere una password robusta. La differenza tra una password e una passphrase è che, in una passphrase, gli spazi sono caratteri validi. + + + + + + + + Opzioni avanzate + Espandere la sezione Opzioni avanzate per specificare le seguenti opzioni per una nuova chiave: + + + + Encryption Type + + Questo campo indica l'algoritmo di cifratura usato per generare la chiave. + + + RSA + + Utilizza l'algoritmo Rivest-ShamirAdleman (RSA) per creare la chiave SSH. È la scelta predefinita e la più sicura. + + + + DSA + + Utilizza l'algoritmo Digital Signature Algorithm (DSA) per creare la chiave SSH. + + + + + + + Key Strength (bits) + + Questa è la lunghezza della chiave in bit. Più lunga la chiave, più sicura sarà, a patto che venga usata una passphrase robusta. Svolgere una qualsiasi azione con una chiave molto lunga richiede più tempo. Valori validi vanno da 1024 a 4096 bit. Sono raccomandati almeno 2048 bit. + + + + + + + + + + Proprietà delle chiavi OpenPGP + Le descrizioni riportate in questa sezione si applicano a tutte le chiavi OpenPGP. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Proprietà + + + + Fingerprint + + L'impronta è una stringa di caratteri che identifica univocamente una chiave. + + + + KeyID + + L'ID della chiave è simile all'impronta, ma contiene solamente gli ultimi otto caratteri dell'impronta. La maggior parte delle volte è possibile identificare una chiave solo con l'«ID chiave», ma può accadere che due chiavi abbiano lo stesso ID. + + + + Type + + Specifica l'algoritmo di cifratura utilizzato per generare una chiave. Le chiavi generate con DSA possono solo firmare, quelle generate con ElGamal sono utilizzate per cifrare. + + + + Created + + Indica la data in cui la chiave è stata creata. + + + + Expires + + Indica la data in cui la chiave non può più essere usata. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Fiducia + La fiducia è un indice di quanto sicuri si è riguardo l'abilità di un'altra persona di estendere la propria rete della fiducia. Quando si incontra una chiave che non riporta la propria firma, la validità di quella chiave sarà basata sulle firme presenti su di essa e sulla fiducia riposta nelle persone che l'hanno firmata. In modo predefinito, una chiave sconosciuta necessita di tre firme con una fiducia marginale o di una firma con piena fiducia. + + Sconosciuta: non si è a conoscenza delle capacità di firmare altre chiavi di questa persona. + Nessuna: questa persona non può firmare correttamente alcuna chiave. + Marginale: questa persona controlla almeno le fotografie dei documenti di identificazione, ma non controlla a fondo il documento. + Piena: questa persona controlla approfonditamente i documenti di ogni persona prima di apporre la propria firma (firma solo le chiavi che appartengono alla persona che ne fa richiesta). + Completa: questo livello di fiducia dovrebbe essere posto solo alle proprie chiavi. + + + + + Abilitare e disabilitare le chiavi + Quando una chiave è abilitata, è possibile utilizzarla per cifrare; quando è disabilitata non è possibile né cifrare né verificare le firme poste con essa. + + + + Data di scadenza + Una chiave non può essere utilizzata per svolgere nessun tipo di operazione una volta scaduta. Spostare la data di scadenza di una chiave più avanti nel tempo la riabilita. Potrebbe essere molto utile avere una chiave principale che non scade mai e molte sottochiavi, firmate dalla chiave principale, che invece scadono. + + + + ID utente + Gli ID utente consentono di utilizzare più identificativi e indirizzi email con la stessa chiave. + + They usually take the form of: + Name (comment) <email address> + + + + Aggiungere un ID utente + Aggiungere un ID utente è utile quando si desidera avere un'identità per il proprio lavoro e una per i propri conoscenti. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + Dopo aver seguito le istruzioni precedenti, viene presentato un dialogo con alcuni campi da completare. I campi sono descritti più sotto. + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + È necessario inserire almeno cinque caratteri in questo campo. + + + + + + Email Address + + Solitamente, l'indirizzo email è il metodo di ricerca più usato all'interno di un server di chiavi. Assicurarsi che sia corretto prima di continuare. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + Il campo del commento può essere utilizzato per inserire qualsiasi altra informazione all'interno della nuova ID. Questa informazione può essere utilizzata per la ricerca nei server. + + + + + + + + ID fotografici + Gli ID fotografici consentono al proprietario di una chiave di inserire una o più immagini all'interno di una chiave. Queste identità possono essere firmate come dei normali ID utente. Un ID fotografico deve essere nel formato JPEG e non più grande di 240x288 pixel. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Cambiare la passphrase + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Inserire la nuova passphrase e fare clic su Ok. + + + + Cancellare una chiave + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + È possibile cancellare le proprie chiavi, le chiavi fidate e le chiavi collezionate. + + + + + + + + Proprietà delle sottochiavi OpenPGP + Ogni chiave OpenPGP possiede una chiave principale che viene utilizzata solo per firmare. Le sottochiavi sono usate per cifrare e anche per firmare. In questo modo, se la propria sottochiave viene compromessa, non è necessario revocare la chiave principale. + + + ID + + Questo è l'identificativo della sottochiave. + + + + Type + + Indica l'algoritmo di cifratura usato per generare la sottochiave. Le chiavi DSA possono solamente firmare, quelle ElGamal sono utilizzare per cifrare mentre quelle RSA sia per firmare che per cifrare. + + + + Created + + Indica la data in cui la chiave è stata creata. + + + + Expires + + Indica la data in cui la chiave non può più essere usata. + + + + Status + + Indica lo stato della chiave. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Aggiungere una sottochiave + Per aggiungere una sottochiave a una chiave, nella sezione Sottochiavi fare clic sul pulsante Aggiungi. + Dopo aver seguito le istruzioni precedenti, viene presentato un dialogo con alcuni campi da completare. I campi sono descritti più sotto. + + + Tipo chiave + + Indica l'algoritmo di cifratura utilizzato nel generare la sottochiave. + + + DSA + + Utilizza l'algoritmo Digital Signature Algorithm (DSA) per creare la sottochiave. Questa può essere usata solo per firmare. + + + + ElGamal + + Utilizza l'algoritmo ElGamal per creare la sottochiave. Questa può essere usata solo per cifrare. + + + + RSA + + Utilizza l'algoritmo Rivest-Shamir Adleman (RSA) per creare la sottochiave. Questa può essere usata sia per firmare che per cifrare, ma è necessario creare due sottochiavi differenti. + + + + + + + Lunghezza chiave + + Indica la lunghezza in bit della sottochiave. Solitamente, più lunga la chiave, più sicurezza fornisce. + + + + Data di scadenza + + Indica la data in cui la sottochiave non può più essere usata. + + + + + + + Cambiare la data di scadenza di un sottochiave + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Revocare una sottochiave + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + La revoca di una sottochiave è immediata. + + + + + Cancellare una sottochiave + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Proprietà delle chiavi Secure Shell + Le descrizioni all'interno di questa sezione si applicano a tutte le chiavi SSH. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Proprietà + + + + Fingerprint + + L'impronta è una stringa di caratteri che identifica univocamente una chiave. + + + + Algorithm + + Indica l'algoritmo di cifratura usato per generare la chiave. + + + + Location + + Questa è la posizione in cui la chiave privata è stata salvata. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Cancellare una chiave Secure Shell + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importare chiavi + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Esportare chiavi + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Firmare una chiave + Firmare la chiave di un'altra persona significa porre della fiducia in tale persona. Prima di firmare una chiave, è necessario controllare attentamente l'impronta della chiave per accertarsi che appartenga proprio a quella persona. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Preferenze di cifratura + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Portachiavi + + Creare portachiavi + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Cambiare la password del portachiavi + Per modificare la password di sblocco del portachiavi, selezionare il portachiavi desiderato e fare clic sul pulsante Cambia password di sblocco. Digitare nella casella di testo Vecchia password la vecchia password, digitare la nuova password nella casella di testo Password e confermarla in Conferma password. Per applicare le impostazioni, fare clic su Cambia. Se la vecchia password è corretta, viene visualizzato un messaggio indicante il successo dell'operazione, se la password non è corretta viene chiesto di controllarne la correttezza. + + + Eliminare un portachiavi + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Server di chiavi + È utile mantenere le proprie chiavi aggiornate sincronizzandole periodicamente con un server di chiavi. In questo modo, le firme presenti sulle proprie chiavi e il web della fiducia saranno sempre aggiornati. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + I server di chiavi LDAP sono meno comuni, ma utilizzano il protocollo standard LDAP. ldap://keyserver.pgp.com è un server LDAP valido. + + + + + + + Condivisione chiavi + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/it/legal.xml seahorse-3.6.3/help/it/legal.xml --- seahorse-3.2.2/help/it/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/it/legal.xml 2012-11-09 17:35:38.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + Questo manuale fa parte di una raccolta di manuali GNOME distribuita in conformità con la GFDL. Per poter distribuire questo manuale separatamente, è necessario inserirvi una copia della licenza, come descritto nella sezione 6 della licenza. + + Molti dei nomi usati dalle aziende per distinguere i propri prodotti e servizi sono rivendicati come marchi. Quando questi nomi compaiono nella documentazione di GNOME, e i partecipanti al GNOME Documentation Project sono consapevoli del loro utilizzo, essi vengono scritti in lettere maiuscole o con l'iniziale maiuscola. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/it/seahorse.xml seahorse-3.6.3/help/it/seahorse.xml --- seahorse-3.2.2/help/it/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/it/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,991 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins e Adam Schreiber - - - Progetto Seahorse - - - - Questo documento può essere copiato, distribuito e/o modificato solo 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 è disponibile su questo collegamento o nel file COPYING-DOCS distribuito con questo manuale. - Questo manuale fa parte di una raccolta di manuali GNOME distribuita in conformità con la GFDL. Per poter distribuire questo manuale separatamente, è necessario inserirvi una copia della licenza, come descritto nella sezione 6 della licenza. - - Molti dei nomi usati dalle aziende per distinguere i propri prodotti e servizi sono rivendicati come marchi. Quando questi nomi compaiono nella documentazione di GNOME, e i partecipanti al GNOME Documentation Project sono consapevoli del loro utilizzo, essi vengono scritti in lettere maiuscole o con l'iniziale maiuscola. - - QUESTO DOCUMENTO E LE SUE VERSIONI MODIFICATE VENGONO FORNITI IN BASE AI TERMINI DELLA GNU FREE DOCUMENTATION LICENSE, CON L'INTESA CHE: - - IL DOCUMENTO VIENE FORNITO SENZA GARANZIE DI ALCUN TIPO, ESPLICITE O IMPLICITE, INCLUSE, MA SENZA LIMITAZIONE, LE GARANZIE ATTESTANTI CHE IL DOCUMENTO O LE SUE VERSIONI MODIFICATE SIANO PRIVI DI DIFETTI, COMMERCIALIZZABILI, IDONEI A UN DETERMINATO SCOPO O CHE NON VIOLINO DIRITTI DI TERZI. SI DECLINA QUALUNQUE RESPONSABILITÀ RIGUARDO AI RISCHI INERENTI LA QUALITÀ, L'ACCURATEZZA E LE PRESTAZIONI DEL DOCUMENTO O DI UNA SUA VERSIONE MODIFICATA. QUALORA UN DOCUMENTO O UNA SUA VERSIONE MODIFICATA DOVESSERO PRESENTARE QUALUNQUE TIPO DI DIFETTO, IL COSTO DI EVENTUALI INTERVENTI DI ASSISTENZA, RIPARAZIONE O CORREZIONE SARÀ A CARICO DELL'UTENTE (NON DEL REDATTORE INIZIALE, DELL'AUTORE O DI ALTRI COLLABORATORI). QUESTA LIMITAZIONE DELLA GARANZIA COSTITUISCE PARTE ESSENZIALE DELLA LICENZA. L'USO DEL DOCUMENTO O DELLE SUE VERSIONI MODIFICATE È CONSENTITO SOLO ENTRO I TERMINI DI QUESTA LIMITAZIONE DELLA GARANZIA; - - - IN NESSUNA CIRCOSTANZA E PER NESSUNA RAGIONE LEGALE, INCLUSI I PRINCIPI DI COLPA (INCLUSA LA NEGLIGENZA), ACCORDO CONTRATTUALE O ALTRO, SARÀ POSSIBILE CONSIDERARE L'AUTORE, IL REDATTORE INIZIALE, GLI ALTRI COLLABORATORI, QUALUNQUE DISTRIBUTORE DEL DOCUMENTO O DI UNA SUA VERSIONE MODIFICATA O QUALUNQUE FORNITORE DELLE PERSONE CITATE, RESPONSABILE NEI CONFRONTI DI QUALUNQUE PERSONA PER DANNI DIRETTI, INDIRETTI, SPECIALI, INCIDENTALI O CONSEGUENTI DI QUALUNQUE NATURA, INCLUSI, MA SENZA LIMITAZIONE, I DANNI PER PERDITA DI AVVIAMENTO, INTERRUZIONE DEL LAVORO, GUASTO O MALFUNZIONAMENTO DEL COMPUTER O QUALUNQUE ALTRO DANNO O PERDITA DERIVANTE O CORRELATA ALL'USO DEL DOCUMENTO O DI UNA SUA VERSIONE MODIFICATA, ANCHE QUALORA LE PERSONE CITATE FOSSERO STATE INFORMATE DELLA POSSIBILITÀ DI TALI DANNI. - - - - - - - - Jacob - Perkins - - Progetto Seahorse - - - - - Adam - Schreiber - - Progetto Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Progetto Seahorse - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - Agosto 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - Novembre 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - Luglio 2005 - - Adam Schreiber sadam@clemson.edu - Progetto Seahorse - - - - Passwords and Keys Manual V0.7.0 - Febbraio 2003 - - Jacob Perkins - Progetto Seahorse - - - - This manual describes version 2.28.x of Passwords and Keys - - Commenti - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Chiavi di cifratura - - - - - - Introduzione - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - creare e gestire chiavi PGP e SSH, - - - esportare e importare chiavi PGP e SSH, - - - condividere le proprie chiavi, - - - - - - - - - Per iniziare - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Menù Applicazioni - - Choose - - Accessories - Password and Keys - . - - - - Riga di comando - - Digitare seahorse e premere Invio. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Mostra la finestra di Passwords and Keys. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Barra dei menù - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Barra degli strumenti - - La barra degli strumenti fornisce un accesso rapido ai comandi più utilizzati. - - - Le schede delle chiavi e delle password - - Consentono l'accesso alle chiavi e alle password presenti nel portachiavi. - - - Opzioni iniziali - - Fornisce un accesso rapido ad alcune azioni per i nuovi utenti. Da qui è possibile: - - - sfogliare il manuale dell'applicazione, - - - importare chiavi nel portachiavi, - - - creare nuove chiavi. - - - - - - - - - - - - Creare chiavi OpenPGP - OpenPGP è un protocollo, libero, basato su PGP, per la cifratura di email, che sfrutta la crittografia a chiave pubblica. OpenPGP definisce uno standard per messaggi cifrati, firme, chiavi private e certificati per lo scambio di chiavi pubbliche. - La crittografia a chiave pubblica è un concetto che implica l'uso di due chiavi: una chiave pubblica, che è possibile condividere con tutti quelli con cui si desidera comunicare, e una chiave privata che è appunto privata e deve essere tenuta segreta. - Per creare chiavi OpenPGP: - - - Choose FileNew... - - - - Selezionare Chiave PGP e fare clic su Continua - - - Inserire il proprio nome completo (nome - cognome), il proprio indirizzo email e qualsiasi altra informazione. È anche possibile specificare delle opzioni avanzate: consultare più sotto. - - - Fare clic su Crea per creare una nuova coppia di chiavi. - - - Il dialogo Passphrase per la nuova chiave PGP si apre. Inserire la passphrase per la nuova chiave due volte. - - - - Nello scegliere una passphrase, utilizzare le stesse tecniche per scegliere una password robusta. La differenza tra una password e una passphrase è che, in una passphrase, gli spazi sono caratteri validi. - - - - Opzioni avanzate - Espandere la sezione Opzioni avanzate per specificare le seguenti opzioni per una nuova chiave: - - - Tipo di cifratura - - Questo campo specifica l'algoritmo di cifratura usato per generare le chiavi. - - - DSA ELGamal - - Questa è la scelta ottimale dato che consente di cifrare, decifrare, firmare e verificare come necessario. - - - - DSA - - Consente solo di firmare. - - - - RSA - - Consente solo di firmare. - - - - - - - Dimensione della chiave (bit) - - Questa è la lunghezza della chiave in bit. Più lunga la chiave, più sicura sarà, a patto che venga usata una passphrase robusta. Svolgere una qualsiasi azione con una chiave molto lunga richiede più tempo. Valori validi vanno da 1024 a 4096 bit. Sono raccomandati almeno 2048 bit. - - - - Data di scadenza - - Questa è la data in cui la propria chiave perderà la sua validità nell'eseguire operazioni di cifratura e di firma. Di solito, un tempo ragionevole per impostare la scadenza è di sei mesi. Sarà quindi necessario cambiare la data di scadenza o generare una nuova chiave o sottochiave alla scadenza della chiave. - Per preservare il proprio stato di fiducia è necessario firmare la nuova chiave con quella vecchia prima della sua scadenza. - - - - - - - - - - - Creare chiavi Secure Shell - Secure Shell (SSH) è un metodo con cui eseguire il login su macchine remote per eseguire dei comandi su tali macchine. Le chiavi SSH vengono utilizzate in un sistema di autenticazione basato sulle chiavi, come alternativa al sistema basato sulle password. Con tale sistema non c'è la necessità di digitare la password per l'autenticazione. - Le chiavi Secure Shell sono composte da: una chiave privata, che deve essere tenuta segreta, e una chiave pubblica che può essere caricata su qualsiasi computer sia necessario accedere. - Per creare una chiave Secure Shell: - - - Choose FileNew... - - - Selezionare Chiave Secure Shell e fare clic su Continua - - - Inserire una descrizione per l'utilizzo della chiave. È possibile utilizzare il proprio indirizzo email o qualsiasi altra informazione. È anche possibile specificare delle opzioni avanzate: consultare più sotto. - - - Fare clic su Crea per creare la nuova chiave o Crea e configura per creare la chiave e configurare un altro computer per l'autenticazione. - - - Il dialogo Passphrase per la nuova chiave Secure Shell si apre. Inserire la passphrase per la nuova chiave due volte. - - Nello scegliere una passphrase, utilizzare le stesse tecniche per scegliere una password robusta. La differenza tra una password e una passphrase è che, in una passphrase, gli spazi sono caratteri validi. - - - - - - - - Opzioni avanzate - Espandere la sezione Opzioni avanzate per specificare le seguenti opzioni per una nuova chiave: - - - - Tipo di cifratura - - Questo campo indica l'algoritmo di cifratura usato per generare la chiave. - - - RSA - - Utilizza l'algoritmo Rivest-ShamirAdleman (RSA) per creare la chiave SSH. È la scelta predefinita e la più sicura. - - - - DSA - - Utilizza l'algoritmo Digital Signature Algorithm (DSA) per creare la chiave SSH. - - - - - - - Dimensione della chiave (bit) - - Questa è la lunghezza della chiave in bit. Più lunga la chiave, più sicura sarà, a patto che venga usata una passphrase robusta. Svolgere una qualsiasi azione con una chiave molto lunga richiede più tempo. Valori validi vanno da 1024 a 4096 bit. Sono raccomandati almeno 2048 bit. - - - - - - - - - - Proprietà delle chiavi OpenPGP - Le descrizioni riportate in questa sezione si applicano a tutte le chiavi OpenPGP. - - Per visualizzare le proprietà di una chiave PGP: - - selezionare la chiave PGP dalla finestra principale, - - - fare doppio clic su di essa o scegliere Proprietà dalla barra degli strumenti, - - - selezionare la scheda Dettagli. - - - - - Proprietà - - - - Impronta - - L'impronta è una stringa di caratteri che identifica univocamente una chiave. - - - - ID chiave - - L'ID della chiave è simile all'impronta, ma contiene solamente gli ultimi otto caratteri dell'impronta. La maggior parte delle volte è possibile identificare una chiave solo con l'«ID chiave», ma può accadere che due chiavi abbiano lo stesso ID. - - - - Tipo - - Specifica l'algoritmo di cifratura utilizzato per generare una chiave. Le chiavi generate con DSA possono solo firmare, quelle generate con ElGamal sono utilizzate per cifrare. - - - - Creata - - Indica la data in cui la chiave è stata creata. - - - - Scadenza - - Indica la data in cui la chiave non può più essere usata. - - - - Dimensione - - Indica la lunghezza in bit di una chiave. Solitamente, più lunga la chiave, più sicurezza fornisce. - Una chiave sufficientemente lunga (in bit) non è abbastanza quando usata in combinazione con una passphrase debole. - - - - - - - - - Fiducia - La fiducia è un indice di quanto sicuri si è riguardo l'abilità di un'altra persona di estendere la propria rete della fiducia. Quando si incontra una chiave che non riporta la propria firma, la validità di quella chiave sarà basata sulle firme presenti su di essa e sulla fiducia riposta nelle persone che l'hanno firmata. In modo predefinito, una chiave sconosciuta necessita di tre firme con una fiducia marginale o di una firma con piena fiducia. - - Sconosciuta: non si è a conoscenza delle capacità di firmare altre chiavi di questa persona. - Nessuna: questa persona non può firmare correttamente alcuna chiave. - Marginale: questa persona controlla almeno le fotografie dei documenti di identificazione, ma non controlla a fondo il documento. - Piena: questa persona controlla approfonditamente i documenti di ogni persona prima di apporre la propria firma (firma solo le chiavi che appartengono alla persona che ne fa richiesta). - Completa: questo livello di fiducia dovrebbe essere posto solo alle proprie chiavi. - - - - - Abilitare e disabilitare le chiavi - Quando una chiave è abilitata, è possibile utilizzarla per cifrare; quando è disabilitata non è possibile né cifrare né verificare le firme poste con essa. - - - - Data di scadenza - Una chiave non può essere utilizzata per svolgere nessun tipo di operazione una volta scaduta. Spostare la data di scadenza di una chiave più avanti nel tempo la riabilita. Potrebbe essere molto utile avere una chiave principale che non scade mai e molte sottochiavi, firmate dalla chiave principale, che invece scadono. - - - - ID utente - Gli ID utente consentono di utilizzare più identificativi e indirizzi email con la stessa chiave. - Solitamente sono così costituiti: Nome (commento) <indirizzo email> - - - Aggiungere un ID utente - Aggiungere un ID utente è utile quando si desidera avere un'identità per il proprio lavoro e una per i propri conoscenti. - Per aggiungere un ID utente a una chiave: - - selezionare la chiave dalla finestra principale, - - - fare doppio clic su di essa o scegliere Proprietà dalla barra degli strumenti, - - - selezionare la scheda Nomi e firme, - - - fare clic su Aggiungi nome. - - - Dopo aver seguito le istruzioni precedenti, viene presentato un dialogo con alcuni campi da completare. I campi sono descritti più sotto. - - - Nome completo - - Inserire il proprio nome completo nella forma <nome> <cognome> Un secondo nome o l'iniziale sono opzionali. - - - È necessario inserire almeno cinque caratteri in questo campo. - - - - - - Indirizzo email - - Solitamente, l'indirizzo email è il metodo di ricerca più usato all'interno di un server di chiavi. Assicurarsi che sia corretto prima di continuare. - - - Dovrebbe essere nella forma <nomeutente>@<dominio> - - - - - - Commento chiave - - Il campo del commento può essere utilizzato per inserire qualsiasi altra informazione all'interno della nuova ID. Questa informazione può essere utilizzata per la ricerca nei server. - - - - - - - - ID fotografici - Gli ID fotografici consentono al proprietario di una chiave di inserire una o più immagini all'interno di una chiave. Queste identità possono essere firmate come dei normali ID utente. Un ID fotografico deve essere nel formato JPEG e non più grande di 240x288 pixel. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Cambiare la passphrase - Per cambiare la passphrase assegnata a una chiave: - - selezionare la chiave dalla finestra principale, - - - fare doppio clic su di essa o scegliere Proprietà dalla barra degli strumenti, - - - fare clic su Cambia passphrase. - - - Inserire la nuova passphrase e fare clic su Ok. - - - - Cancellare una chiave - Per cancellare una chiave dal proprio portachiavi: - - selezionare la chiave dalla finestra principale, - - - fare clic col tasto destro del mouse su di essa e scegliere Cancella chiave o scegliere ModificaCancella chiave. - - - - È possibile cancellare le proprie chiavi, le chiavi fidate e le chiavi collezionate. - - - - - - - - Proprietà delle sottochiavi OpenPGP - Ogni chiave OpenPGP possiede una chiave principale che viene utilizzata solo per firmare. Le sottochiavi sono usate per cifrare e anche per firmare. In questo modo, se la propria sottochiave viene compromessa, non è necessario revocare la chiave principale. - - - ID - - Questo è l'identificativo della sottochiave. - - - - Tipo - - Indica l'algoritmo di cifratura usato per generare la sottochiave. Le chiavi DSA possono solamente firmare, quelle ElGamal sono utilizzare per cifrare mentre quelle RSA sia per firmare che per cifrare. - - - - Creata - - Indica la data in cui la chiave è stata creata. - - - - Scadenza - - Indica la data in cui la chiave non può più essere usata. - - - - Stato - - Indica lo stato della chiave. - - - - Dimensione - - Indica la lunghezza in bit della chiave. Solitamente, più lunga la chiave, più sicurezza fornisce. - Una chiave sufficientemente lunga (in bit) non è abbastanza quando usata in combinazione con una passphrase debole. - - - - - - - Aggiungere una sottochiave - Per aggiungere una sottochiave a una chiave, nella sezione Sottochiavi fare clic sul pulsante Aggiungi. - Dopo aver seguito le istruzioni precedenti, viene presentato un dialogo con alcuni campi da completare. I campi sono descritti più sotto. - - - Tipo chiave - - Indica l'algoritmo di cifratura utilizzato nel generare la sottochiave. - - - DSA - - Utilizza l'algoritmo Digital Signature Algorithm (DSA) per creare la sottochiave. Questa può essere usata solo per firmare. - - - - ElGamal - - Utilizza l'algoritmo ElGamal per creare la sottochiave. Questa può essere usata solo per cifrare. - - - - RSA - - Utilizza l'algoritmo Rivest-Shamir Adleman (RSA) per creare la sottochiave. Questa può essere usata sia per firmare che per cifrare, ma è necessario creare due sottochiavi differenti. - - - - - - - Lunghezza chiave - - Indica la lunghezza in bit della sottochiave. Solitamente, più lunga la chiave, più sicurezza fornisce. - - - - Data di scadenza - - Indica la data in cui la sottochiave non può più essere usata. - - - - - - - Cambiare la data di scadenza di un sottochiave - Per cambiare la data di scadenza di una sottochiave, selezionare la sottochiave dalla sezione Sottochiavi, quindi: - - fare clic sul pulsante Scade sulla sinistra, - - - dal dialogo scegliere la nuova data di scadenza o selezionare Nessuna scadenza. - - - - - - Revocare una sottochiave - Per revocare una sottochiave, selezionare la sottochiave dalla sezione Sottochiavi, quindi: - - fare clic sul pulsante Revoca sulla destra, - - - scegliere un motivo per la revoca: - - - - Nessun motivo - - Non esiste un determinato motivo per revocare la chiave. - - - - Compromessa - - La chiave è stata compromessa. - - - - Sostituita - - La chiave è stata sostituita da un'altra. - - - - Non usata - - La chiave non è più usata. - - - - - - - inserire un descrizione per la revoca, - - - fare clic su Revoca. - - - - La revoca di una sottochiave è immediata. - - - - - Cancellare una sottochiave - Per cancellare una sottochiave, selezionare la sottochiave dalla sezione Sottochiavi, quindi: - - fare clic sul pulsante Elimina sulla sinistra. - - - - - - - - - Proprietà delle chiavi Secure Shell - Le descrizioni all'interno di questa sezione si applicano a tutte le chiavi SSH. - Per visualizzare le proprietà di una chiave SSH: - - selezionare la chiave Secure Shell dalla finestra principale, - - - fare doppio clic su di essa o scegliere Proprietà dalla barra degli strumenti, - - - selezionare la scheda Dettagli. - - - - - Proprietà - - - - Impronta - - L'impronta è una stringa di caratteri che identifica univocamente una chiave. - - - - Algoritmo - - Indica l'algoritmo di cifratura usato per generare la chiave. - - - - Posizione - - Questa è la posizione in cui la chiave privata è stata salvata. - - - - Dimensione - - Indica la lunghezza in bit di una chiave. Solitamente, più lunga la chiave, più sicurezza fornisce. - Una chiave sufficientemente lunga (in bit) non è abbastanza quando usata in combinazione con una passphrase debole. - - - - - - - - - Cancellare una chiave Secure Shell - Per cancellare una chiave Secure Shell: - - selezionare la chiave SSH dalla finestra principale, - - - fare clic col tasto destro del mouse su di essa e scegliere Cancella chiave o scegliere ModificaCancella chiave. - - - - - - - - - Importare chiavi - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - selezionare un blocco di testo con un'armatura ASCII, - - - copiarlo negli appunti, - - - scegliere ModificaIncolla chiavi. - - - - - - - - - Esportare chiavi - - To export keys, select the keys in the main window - and choose - - File - Export - . - - È anche possibile esportare le chiavi in un blocco di testo con armatura ASCII: - - selezionare le chiavi dalla finestra principale, - - - scegliere ModificaCopia chiave pubblica. - - - - - - - - - Firmare una chiave - Firmare la chiave di un'altra persona significa porre della fiducia in tale persona. Prima di firmare una chiave, è necessario controllare attentamente l'impronta della chiave per accertarsi che appartenga proprio a quella persona. - Per firmare una chiave nel proprio portachiavi: - - selezionare la chiave che si desidera firmare dalla scheda Chiavi fidate o Chiavi collezionate, - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - selezionare quanto attentamente la chiave sia stata controllata, - - - indicare se la firma deve essere locale al proprio portachiavi e se sarà possibile revocare la firma in un momento successivo, - - - fare clic su Firma. - - - - - - - - Preferenze di cifratura - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Portachiavi - - Creare portachiavi - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Cambiare la password del portachiavi - Per modificare la password di sblocco del portachiavi, selezionare il portachiavi desiderato e fare clic sul pulsante Cambia password di sblocco. Digitare nella casella di testo Vecchia password la vecchia password, digitare la nuova password nella casella di testo Password e confermarla in Conferma password. Per applicare le impostazioni, fare clic su Cambia. Se la vecchia password è corretta, viene visualizzato un messaggio indicante il successo dell'operazione, se la password non è corretta viene chiesto di controllarne la correttezza. - - - Eliminare un portachiavi - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Server di chiavi - È utile mantenere le proprie chiavi aggiornate sincronizzandole periodicamente con un server di chiavi. In questo modo, le firme presenti sulle proprie chiavi e il web della fiducia saranno sempre aggiornati. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - Server HKP - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Server di chiavi - - I server di chiavi LDAP sono meno comuni, ma utilizzano il protocollo standard LDAP. ldap://keyserver.pgp.com è un server LDAP valido. - - - - - - - Condivisione chiavi - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - Per segnalare un problema o inviare suggerimenti riguardo questa applicazione o su questo manuale, seguire le istruzioni presenti alla pagina di commenti della guida utente di GNOME. - Questo programma è distribuito sotto i termini della GNU General Public License come pubblicata dalla Free Software Foundation; o la versione 2 della licenza o (a propria scelta) una versione successiva. Una copia di questa licenza è inclusa in questa documentazione; un'altra copia può essere trovata nel file COPYING incluso con il codice sorgente di questo programma. - -
diff -Nru seahorse-3.2.2/help/ja/index.docbook seahorse-3.6.3/help/ja/index.docbook --- seahorse-3.2.2/help/ja/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ja/index.docbook 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,1252 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorseプロジェクト + + + + + 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. + + 本ドキュメントは GFDL の下で配布されているその他の GNOME マニュアル集の一部である。これらのマニュアルとは別に本ドキュメントを別個に配布する場合は、GFDL のセクション6で説明しているように、そのマニュアル集に対するライセンスの複製を添付することで実現できる。 + + 製品やサービスを区別するために企業によって利用されている名称の多くは商標です。これらの名称がGNOMEドキュメンテーションに現れた場合 で、GNOMEドキュメンテーションプロジェクトのメンバーが商標と認識し ている場合、これらの名前は大文字あるいは頭文字を大文字で記述しています。 + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorseプロジェクト + + + GNOMEドキュメンテーションプロジェクト + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + フィードバック + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + はじめに + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + 始めてみる + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + アプリケーションメニュー + + Choose + + Accessories + Password and Keys + . + + + + コマンドライン + + seahorseと入力し、Returnキーを押してください。 + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + メニューバー + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + ツールバー + + ツールバーを使うとよく使われるコマンドに素早くアクセスできます。 + + + 鍵とパスワードタブ + + キーリングの鍵とパスワードへのアクセスを提供します。 + + + 初回起動時のオプション + + 初めてのユーザーにとって便利な動作への高速なアクセスを提供します。ここから行えます: + + + ヘルプシステムの閲覧 + + + キーリングへの鍵のインポート + + + 新しい鍵の生成 + + + + + + + + + + + + OpenPGP鍵の生成 + OpenPGPは、PGPを基にした公開鍵暗号で電子メールを暗号化するための非独占的なプロトコルです。 + 公開鍵暗号は、二つの鍵の使用方法を含んだ概念です: 公開鍵は、通信したいと思う相手の誰にでも渡すことができ、秘密鍵は、プライベートなもので、秘密にしておく必要があります。 + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + パスフレーズを生成する際は、強いパスワードの生成と同様の慣行を使用しましょう。パスワードとパスフレーズでは、空白がパスフレーズにおいては有効な文字であるのが大きな違いです。 + + + + 拡張オプション + 拡張オプションを展開して、新しい鍵に関する以下のオプションを指定します: + + + Encryption Type + + この欄は、鍵を生成するのに利用する暗号化アルゴリズムを指定します。 + + + DSA ElGamal + + 必要に応じて暗号化、復号化、署名及び検証を行うことができる、お勧めの選択肢です。 + + + + DSA + + 署名のみが可能です。 + + + + RSA + + 署名のみが可能です。 + + + + + + + Key Strength (bits) + + これは、ビット単位の鍵の長さです。強いパスフレーズが使用されていれば、鍵の長さが長ければ長いほど、より安全です。しかし、長い鍵を使ったあらゆる操作は、短い鍵による操作よりも、より多くの時間を必要とします。許容できる値は、1024から4096ビットの間です。少なくとも2048ビットを推奨します。 + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + セキュア・シェルの鍵の生成 + セキュア・シェル(SSH)は、リモートコンピューターにログインし、その機械でコマンドを実行する手段です。SSH鍵は、鍵ベースの認証システムであり、デフォルトのパスワード認証システムの代用として使用されます。鍵ベースの認証では、認証するのに手動でパスワードを入力する必要はありません。 + セキュア・シェル鍵は、2つの鍵で構成されます:秘密鍵は、秘密に保たれるべきであり、公開鍵は、アクセスする必要のあるどのコンピューターにもアップロードすることができます。 + セキュア・シェル鍵を生成するには: + + + ファイル新規...を選択 + + + セキュア・シェル 鍵を選択し、続行をクリック + + + 鍵が何のために利用されるか説明を入力してください。あなたのE-メール・アドレスか、その他の思い出させるものを利用できます。鍵に関する拡張オプションを指定することもできます: 下記参照 + + + 新しい鍵を生成するための生成のみか、鍵を生成し認証のためにその鍵を利用する他のコンピューターを設定するための生成と設定をクリックしてください。 + + + 新しいセキュア・シェル鍵のためのパスフレーズダイアログが開きます。新しい鍵用にパスフレーズを2回入力してください。 + + パスフレーズを生成する際は、強いパスワードの生成と同様の慣行を使用しましょう。パスワードとパスフレーズでは、空白がパスフレーズにおいては有効な文字であるのが大きな違いです。 + + + + + + + + 拡張オプション + 拡張オプションを展開して、新しい鍵に関する以下のオプションを指定します: + + + + Encryption Type + + このフィールドは、鍵を生成するために利用する暗号化アルゴリズムを指定します。 + + + RSA + + SSH鍵を生成するためにRivest-ShamirAdleman (RSA)アルゴリズムを利用します。これは、好ましくよりセキュアな選択です。 + + + + DSA + + SSH鍵を生成するためにDigital Signature Algorithm (DSA)を利用します。 + + + + + + + Key Strength (bits) + + これは、ビット単位の鍵の長さです。強いパスフレーズが使用されていれば、鍵の長さが長ければ長いほど、より安全です。しかし、長い鍵を使ったあらゆる操作は、短い鍵による操作よりも、より多くの時間を必要とします。許容できる値は、1024から4096ビットの間です。少なくとも2048ビットを推奨します。 + + + + + + + + + + OpenPGP鍵のプロパティ + この節の記述は、すべてのOpenPGP鍵に適用されます。 + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + プロパティ + + + + Fingerprint + + 指紋は、鍵を正確に特定する一意の文字列です。 + + + + KeyID + + 鍵のIDは、指紋と似ています。しかしながら、鍵IDは指紋の最後の8文字を含んでいるのみです。ほとんどの場合、鍵のIDのみで鍵を特定することが可能ですが、時折、同じIDを持つ鍵があるかもしれません。 + + + + Type + + 鍵を生成するために利用した暗号化アルゴリズムを示します。DSA鍵は、署名のみ可能です。ElGamal鍵は、暗号化に利用されます。 + + + + Created + + 鍵が生成された日付を示します。 + + + + Expires + + 鍵がもはや使えなくなる日付を示します。 + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + 信用度 + 信用度は、信頼の網を正確に広げる個人の能力をどのくらい確信しているかを示します。あなたが署名していない鍵に直面した時、その個人の鍵の妥当性は、集められた署名とそれらの署名を作成した人々をどのくらい信用しているかいないかを基に決定されます。デフォルトでは、未知の鍵は、3のぎりぎり信用する署名か、1つの完全に信用する署名を必要とするでしょう。 + + 不明: 正確に鍵に署名する人の能力を詳しく知りません。 + 信用しない: この人は正しく鍵に署名することができません。 + ぎりぎり信用する: この人は鍵に署名する前に写真付き身分証明書を確認しますが、必ずしも綿密に調べません。 + 完全に信用する: この人は、署名する前にありとあらゆる人の写真付き身分証明書を綿密に調べます。 + 究極に信用する: この信用度は、自分自身の鍵に割り当てられるのみです。 + + + + + 鍵の有効化と無効化 + 鍵が有効である時は、その鍵を利用して暗号化の操作を実行できます。鍵が無効である時は、その鍵を利用して暗号化をしたり、署名を検証したりすることはできません。 + + + + 有効期限 + 鍵が期限切れとなった以降は、もはや鍵の操作の実行に使われることはありません。鍵の有効期限を未来の日付に変更し、再び有効にします。一般的なお勧めは、決して期限の切れることのない主鍵とその主鍵で署名された複数の副鍵を持つことでしょう。 + + + + ユーザーID + ユーザーIDは、複数の名前とE-メール・アドレスを同じ鍵で利用することを許容します。 + + They usually take the form of: + Name (comment) <email address> + + + + ユーザー ID の追加 + ユーザーIDを追加することは、仕事向けのアドレスと友達向けのアドレスを持ちたい時に便利です。 + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + 上記の手順に従った後、内容を埋めるためにダイアログが表示されます。その項目は、以下の通りです。 + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + この項目には、少なくとも5文字を入力せねばなりません。 + + + + + + Email Address + + E-メール・アドレスは、鍵サーバーや他の鍵プロバイダー上であなたの鍵を見つけるためのものです。続行する前にそれが正確である事を確認してください。 + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + 鍵の説明は、新しいIDの表示名に任意の追加情報を加えるために利用する事ができます。この情報は、鍵サーバーで検索することができます。 + + + + + + + + 画像 + 鍵に所有者の1枚以上の写真を埋め込むことができます。これらの画像には、通常のユーザーIDのように署名することができます。画像は、JPEG形式である必要があり、240x288ピクセルより大きくないことが推奨されます。 + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + パスフレーズの変更 + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + 新しいパスフレーズを入力し、OKをクリックしてください。 + + + + 鍵の削除 + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + あなたの鍵、信用する鍵及び収集した鍵を削除できます。 + + + + + + + + OpenPGP副鍵のプロパティ + 各OpenPGP鍵は、署名のみに利用される単一の主鍵を持っています。副鍵は、暗号化や署名にも利用されます。この方法では、副鍵が危険にさらされているような場合には、主鍵を失効する必要はありません。 + + + ID + + これは、副鍵の識別子です。 + + + + Type + + 副鍵の生成に利用する暗号化アルゴリズムを指定します。DSA鍵は署名のみ可能で、RSA鍵は署名か暗号化に利用できますが、ElGamal鍵は暗号化にのみ使えます。 + + + + Created + + 鍵が生成された日付を示します。 + + + + Expires + + 鍵がもはや使えなくなる日付を示します。 + + + + Status + + その鍵の状態を示します。 + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + 副鍵の追加 + 鍵に副鍵を追加するには、副鍵セクションの追加ボタンをクリックしてください。 + 上記の手順に従った後、内容を埋めるためにダイアログが表示されます。その項目は、以下の通りです。 + + + 鍵の種類 + + 副鍵を生成するのに利用する暗号化アルゴリズムを指定します。 + + + DSA + + Digital Signature Algorithm (DSA)を利用して副鍵を生成します。この副鍵は、署名のみ可能です。 + + + + ElGamal + + ElGamalアルゴリズムを利用して副鍵を生成します。この副鍵は、暗号化のみ可能です。 + + + + RSA + + Rivest-Shamir Adleman (RSA)アルゴリズムを利用して副鍵を生成します。この副鍵は、署名か暗号化に利用できますが、二つの異なる副鍵を生成する必要があります。 + + + + + + + 鍵の長さ + + 鍵の長さをビット単位で示します。一般的に、より長い鍵はより安全です。 + + + + 有効期限 + + 鍵がもはや使えなくなる日付を示します。 + + + + + + + 副鍵の有効期限の変更 + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + 副鍵の破棄 + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + 副鍵は即座に失効します。 + + + + + 副鍵の削除 + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + セキュア・シェル鍵のプロパティ + この節の説明は、すべてのSSH鍵に適用されます。 + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + プロパティ + + + + Fingerprint + + 指紋は、鍵を正確に特定する一意の文字列です。 + + + + Algorithm + + 鍵を生成するのに利用された暗号化アルゴリズムを特定します。 + + + + Location + + これは、秘密鍵が保存されている場所です。 + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + セキュア・シェル鍵の削除 + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + 鍵のインポート + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + 鍵のエキスポート + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + 鍵への署名 + 他の人の鍵へ署名するということは、その人へ信用を与えることを意味します。鍵へ署名する前に本当にその人が所有する鍵であるかを確認するため、鍵の指紋を注意深くチェックしてください。 + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + 設定 + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + パスワード用のキーリング + + キーリングの生成 + 新しいキーリングを作成するには、メニューからファイル新規を選択し、パスワード用のキーリングを選択してください。新しいキーリングの名前を入力し、Enterキーを押してください。 + + + キーリングのパスワード変更 + キーリングの解除パスワードを変更するには、まず適切なキーリングを選択してからパスワードの変更ボタンを押してください。古いパスワード入力欄への古いパスワードの入力と新しいパスワード入力欄への新しいパスワードの入力とパスワードの確認入力欄への新しいパスワードの確認を促されます。設定を適用するには、変更するを押してください。古いパスワードが正しければ、操作の成功を示す状態メッセージを得るでしょう。古いパスワードが正しくなければ、その正当性を確認するように求められます。 + + + キーリングの削除 + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + 鍵サーバー + リモート鍵サーバーと定期的に鍵を同期することによってあなたと他の人の鍵を最新に保ってください。同期は、あなたがすべての鍵について最新の署名を持っていることを確認し、信用の網を最も役立つものとするでしょう。 + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + LDAP鍵サーバーはあまり一般的ではありませんが、標準のLDAPプロトコルを利用した鍵サーバーです。ldap://keyserver.pgp.comは、よいLDAPサーバーです。 + + + + + + + 鍵の共有 + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/ja/ja.po seahorse-3.6.3/help/ja/ja.po --- seahorse-3.2.2/help/ja/ja.po 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/ja/ja.po 2012-08-21 12:23:16.000000000 +0200 @@ -1,13 +1,13 @@ # Japanese translation for seahorse. -# Copyright (C) 2010 seahorse's COPYRIGHT HOLDER +# Copyright (C) 2010-2012 seahorse's COPYRIGHT HOLDER # This file is distributed under the same license as the seahorse package. # Yasumichi Akahoshi , 2010. msgid "" msgstr "" "Project-Id-Version: seahorse master\n" -"POT-Creation-Date: 2010-09-12 13:00+0000\n" -"PO-Revision-Date: 2010-09-12 23:26+0900\n" -"Last-Translator: Yasumichi Akahoshi \n" +"POT-Creation-Date: 2011-12-30 08:21+0000\n" +"PO-Revision-Date: 2012-01-02 07:50+0900\n" +"Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +23,9 @@ "@@image: 'figures/seahorse-window.png'; md5=bcb8f7c9c5c62d4b4265ea9d6c07056e" #: C/seahorse.xml:16(title) -msgid "Passwords and Encryption Keys Manual" +#, fuzzy +#| msgid "Passwords and Encryption Keys Manual" +msgid "Passwords and Keys Manual" msgstr "パスワードと暗号鍵マニュアル" #: C/seahorse.xml:18(year) @@ -178,7 +180,9 @@ msgstr "pcutler@foresightlinux.org" #: C/seahorse.xml:70(revnumber) -msgid "Passwords and Encryption Keys Manual V2.11.0" +#, fuzzy +#| msgid "Passwords and Encryption Keys Manual V2.11.0" +msgid "Passwords and Keys Manual V2.11.0" msgstr "パスワードと暗号鍵マニュアル V2.11.0" #: C/seahorse.xml:71(date) @@ -190,7 +194,9 @@ msgstr "Paul Cutler pcutler@foresightlinux.org" #: C/seahorse.xml:80(revnumber) -msgid "Passwords and Encryption Keys Manual V0.10.1" +#, fuzzy +#| msgid "Passwords and Encryption Keys Manual V0.10.1" +msgid "Passwords and Keys Manual V0.10.1" msgstr "パスワードと暗号鍵マニュアル V0.10.1" #: C/seahorse.xml:81(date) @@ -202,7 +208,9 @@ msgstr "Adam Schreiber sadam@clemson.edu" #: C/seahorse.xml:90(revnumber) -msgid "Passwords and Encryption Keys Manual V0.9.1" +#, fuzzy +#| msgid "Passwords and Encryption Keys Manual V0.9.1" +msgid "Passwords and Keys Manual V0.9.1" msgstr "パスワードと暗号鍵マニュアル V0.9.1" #: C/seahorse.xml:91(date) @@ -214,7 +222,9 @@ msgstr "Milo Casagrande milo_casagrande@yahoo.it" #: C/seahorse.xml:100(revnumber) -msgid "Passwords and Encryption Keys Manual V0.9.0" +#, fuzzy +#| msgid "Passwords and Encryption Keys Manual V0.9.0" +msgid "Passwords and Keys Manual V0.9.0" msgstr "パスワードと暗号鍵マニュアル V0.9.0" #: C/seahorse.xml:101(date) @@ -222,7 +232,9 @@ msgstr "2005年7月" #: C/seahorse.xml:110(revnumber) -msgid "Passwords and Encryption Keys Manual V0.7.0" +#, fuzzy +#| msgid "Passwords and Encryption Keys Manual V0.7.0" +msgid "Passwords and Keys Manual V0.7.0" msgstr "パスワードと暗号鍵マニュアル V0.7.0" #: C/seahorse.xml:111(date) @@ -234,7 +246,10 @@ msgstr "Jacob Perkins" #: C/seahorse.xml:122(releaseinfo) -msgid "This manual describes version 2.28.x of Passwords and Encryption Keys" +#, fuzzy +#| msgid "" +#| "This manual describes version 2.28.x of Passwords and Encryption Keys" +msgid "This manual describes version 2.28.x of Passwords and Keys" msgstr "" "このマニュアルは、パスワードと暗号鍵のバージョン2.28.xについて説明します。" @@ -243,20 +258,30 @@ msgstr "フィードバック" #: C/seahorse.xml:125(para) +#, fuzzy +#| msgid "" +#| "To report a bug or make a suggestion regarding the Passwords " +#| "and Encryption Keys application or this manual, follow the " +#| "directions in the Gnome " +#| "Feedback Page." msgid "" "To report a bug or make a suggestion regarding the Passwords " -"and Encryption Keys application or this manual, follow the " -"directions in the Gnome " -"Feedback Page." +"and Keys application or this manual, follow the directions in " +"the Gnome Feedback Page." msgstr "" "パスワードと暗号鍵アプリケーションやマニュアルに対" "して、バグの報告や提案を行うには、Gnomeフィードバックページの指示に従ってください。" #: C/seahorse.xml:132(para) +#, fuzzy +#| msgid "" +#| "Passwords and Encryption Keys is the " +#| "application for managing encryption keys for the GNOME Desktop" msgid "" -"Passwords and Encryption Keys is the application " -"for managing encryption keys for the GNOME Desktop" +"Passwords and Keys is the application for " +"managing encryption keys for the GNOME Desktop" msgstr "" "パスワードと暗号鍵は、GNOMEデスクトップで暗号鍵を" "管理するためのアプリケーションです。" @@ -278,19 +303,30 @@ msgstr "はじめに" #: C/seahorse.xml:155(para) +#, fuzzy +#| msgid "" +#| "You can use Passwords and Encryption Keys to " +#| "create and manage PGP and SSH keys." msgid "" -"You can use Passwords and Encryption Keys to " -"create and manage PGP and SSH keys." +"You can use Passwords and Keys to create and " +"manage PGP and SSH keys." msgstr "" "PGPとSSH鍵を生成及び管理するために" "パスワードと暗号鍵を使用できます。" #: C/seahorse.xml:158(para) -msgid "" -"Passwords and Encryption Keys provides a front " -"end to many of the features of Gnu Privacy Guard (GPG) and integrates with multiple " -"components of the GNOME desktop." +#, fuzzy +#| msgid "" +#| "Passwords and Encryption Keys provides a front " +#| "end to many of the features of Gnu Privacy Guard (GPG) and integrates with multiple " +#| "components of the GNOME " +#| "desktop." +msgid "" +"Passwords and Keys provides a front end to many " +"of the features of Gnu " +"Privacy Guard (GPG) and integrates with multiple components of the " +"GNOME desktop." msgstr "" "パスワードと暗号鍵は、Gnu Privacy Guard (GPG)の多くの機能と" @@ -310,9 +346,12 @@ msgstr "あなたの鍵を他の人達と共有" #: C/seahorse.xml:163(para) +#, fuzzy +#| msgid "" +#| "With Passwords and Encryption Keys you can: " +#| "" msgid "" -"With Passwords and Encryption Keys you can: " -"" +"With Passwords and Keys you can: " msgstr "" "パスワードと暗号鍵でできること: " @@ -321,13 +360,19 @@ msgstr "始めてみる" #: C/seahorse.xml:185(title) -msgid "Starting Passwords and Encryption Keys" +#, fuzzy +#| msgid "Starting Passwords and Encryption Keys" +msgid "Starting Passwords and Keys" msgstr "パスワードと暗号鍵の起動" #: C/seahorse.xml:186(para) +#, fuzzy +#| msgid "" +#| "You can start Passwords and Encryption Keys in " +#| "the following ways:" msgid "" -"You can start Passwords and Encryption Keys in " -"the following ways:" +"You can start Passwords and Keys in the following " +"ways:" msgstr "" "以下の方法でパスワードと暗号鍵を起動することができ" "ます:" @@ -337,9 +382,13 @@ msgstr "アプリケーションメニュー" #: C/seahorse.xml:194(para) +#, fuzzy +#| msgid "" +#| "Choose AccessoriesPassword " +#| "and Encryption Keys." msgid "" "Choose AccessoriesPassword and " -"Encryption Keys." +"Keys." msgstr "" "アクセサリパスワードと暗号鍵を選択してください。" @@ -355,23 +404,34 @@ "さい。" #: C/seahorse.xml:213(title) -msgid "When You Start Passwords and Encryption Keys" +#, fuzzy +#| msgid "" +#| "When You Start Passwords and Encryption Keys" +msgid "When You Start Passwords and Keys" msgstr "パスワードと暗号鍵を起動すると" #: C/seahorse.xml:214(para) +#, fuzzy +#| msgid "" +#| "When you start Passwords and Encryption Keys, " +#| "the Password and Encryption Keys window is displayed." msgid "" -"When you start Passwords and Encryption Keys, the " -"Password and Encryption Keys window is displayed." +"When you start Passwords and Keys, the " +"Password and Keys window is displayed." msgstr "" "パスワードと暗号鍵を起動するとパスワード" "と暗号鍵ウィンドウが表示されます。" #: C/seahorse.xml:220(title) -msgid "The Passwords and Encryption Keys Window" +#, fuzzy +#| msgid "The Passwords and Encryption Keys Window" +msgid "The Passwords and Keys Window" msgstr "パスワードと暗号鍵ウィンドウ" #: C/seahorse.xml:228(application) -msgid "Passwords and Encryption Keys" +#, fuzzy +#| msgid "Passwords and Encryption Keys" +msgid "Passwords and Keys" msgstr "パスワードと暗号鍵" #: C/seahorse.xml:227(phrase) @@ -379,9 +439,13 @@ msgstr "ウィンドウの表示" #: C/seahorse.xml:235(para) +#, fuzzy +#| msgid "" +#| "The Passwords and Encryption Keys window " +#| "contains the following elements:" msgid "" -"The Passwords and Encryption Keys window contains " -"the following elements:" +"The Passwords and Keys window contains the " +"following elements:" msgstr "" "パスワードと暗号鍵ウィンドウは以下の要素を含んでい" "ます:" @@ -391,9 +455,13 @@ msgstr "メニューバー" #: C/seahorse.xml:242(para) +#, fuzzy +#| msgid "" +#| "The menus on the menubar contain all of the commands that you need to " +#| "perform tasks in Passwords and Encryption Keys." msgid "" "The menus on the menubar contain all of the commands that you need to " -"perform tasks in Passwords and Encryption Keys." +"perform tasks in Passwords and Keys." msgstr "" "メニューバー上のメニューは、パスワードと暗号鍵でタ" "スクを実行するのに必要なすべてのコマンドを含んでいます。" @@ -423,8 +491,8 @@ "Provides fast access to useful actions for first time users. From here you " "can:" msgstr "" -"初めてのユーザにとって便利な動作への高速なアクセスを提供します。ここから行え" -"ます:" +"初めてのユーザーにとって便利な動作への高速なアクセスを提供します。ここから行" +"えます:" #: C/seahorse.xml:260(para) msgid "Browse the help system," @@ -611,7 +679,7 @@ "authentication system. With key-based authentication there is no need to " "manually type a password to authenticate." msgstr "" -"セキュア・シェル(SSH)は、リモートコンピュータにログイン" +"セキュア・シェル(SSH)は、リモートコンピューターにログイン" "し、その機械でコマンドを実行する手段です。SSH鍵は、鍵ベースの認証システムであ" "り、デフォルトのパスワード認証システムの代用として使用されます。鍵ベースの認" "証では、認証するのに手動でパスワードを入力する必要はありません。" @@ -624,7 +692,7 @@ msgstr "" "セキュア・シェル鍵は、2つの鍵で構成されます:秘密鍵は、秘" "密に保たれるべきであり、公開鍵は、アクセスする必要のある" -"どのコンピュータにもアップロードすることができます。" +"どのコンピューターにもアップロードすることができます。" #: C/seahorse.xml:422(para) msgid "To create a Secure Shell key:" @@ -655,7 +723,7 @@ "another computer to use it for authentication." msgstr "" "新しい鍵を生成するための生成のみか、鍵を生成し認証のた" -"めにその鍵を利用する他のコンピュータを設定するための生成と設定生成と設定をクリックしてください。" #: C/seahorse.xml:441(para) @@ -884,14 +952,14 @@ #: C/seahorse.xml:658(title) msgid "User IDs" -msgstr "ユーザID" +msgstr "ユーザーID" #: C/seahorse.xml:659(para) msgid "" "User IDs allow multiple identities and email addresses to be used with the " "same key." msgstr "" -"ユーザIDは、複数の名前とE-メール・アドレスを同じ鍵で利用することを許容しま" +"ユーザーIDは、複数の名前とE-メール・アドレスを同じ鍵で利用することを許容しま" "す。" #: C/seahorse.xml:665(programlisting) @@ -905,15 +973,15 @@ #: C/seahorse.xml:669(title) msgid "Adding a User ID" -msgstr "ユーザ ID の追加" +msgstr "ユーザー ID の追加" #: C/seahorse.xml:670(para) msgid "" "Adding a user ID is useful when you want to have an identity for your job " "and one for your friends." msgstr "" -"ユーザIDを追加することは、仕事向けのアドレスと友達向けのアドレスを持ちたい時" -"に便利です。" +"ユーザーIDを追加することは、仕事向けのアドレスと友達向けのアドレスを持ちたい" +"時に便利です。" #: C/seahorse.xml:678(para) C/seahorse.xml:776(para) C/seahorse.xml:803(para) msgid "Select the key from the main window," @@ -937,7 +1005,7 @@ #: C/seahorse.xml:674(para) msgid "To add a user ID to a key: " -msgstr "鍵にユーザIDを追加するには: " +msgstr "鍵にユーザーIDを追加するには: " #: C/seahorse.xml:699(para) C/seahorse.xml:903(para) msgid "" @@ -977,13 +1045,13 @@ "Your email address is how most people will locate your key on a key server " "or other key provider. Make sure it is correct before continuing." msgstr "" -"E-メール・アドレスは、鍵サーバーや他の鍵プロバイダ上であなたの鍵を見つけるた" -"めのものです。続行する前にそれが正確である事を確認してください。" +"E-メール・アドレスは、鍵サーバーや他の鍵プロバイダー上であなたの鍵を見つける" +"ためのものです。続行する前にそれが正確である事を確認してください。" #: C/seahorse.xml:735(programlisting) #, no-wrap msgid "<username>@<domainname>" -msgstr "<ユーザ名>@<ドメイン名>" +msgstr "<ユーザー名>@<ドメイン名>" #: C/seahorse.xml:733(para) msgid "It should be of the form " @@ -1014,15 +1082,21 @@ "pixels." msgstr "" "鍵に所有者の1枚以上の写真を埋め込むことができます。これらの画像には、通常の" -"ユーザIDのように署名することができます。画像は、JPEG形式である必要があり、" +"ユーザーIDのように署名することができます。画像は、JPEG形式である必要があり、" "240x288ピクセルより大きくないことが推奨されます。" #: C/seahorse.xml:763(para) +#, fuzzy +#| msgid "" +#| "If the chosen image is not of the required file type or size " +#| "Passwords and Encryption Keys can resize and " +#| "convert it on the fly from any image format supported by the " +#| "GDK library." msgid "" "If the chosen image is not of the required file type or size " -"Passwords and Encryption Keys can resize and " -"convert it on the fly from any image format supported by the GDK library." +"Passwords and Keys can resize and convert it on " +"the fly from any image format supported by the GDK " +"library." msgstr "" "もし選択された画像が、必要なファイル形式や大きさでない場合、パス" "ワードと暗号鍵は、その場でサイズ変更とGDKラ" @@ -1372,9 +1446,13 @@ "menuchoice>を選択してください。" #: C/seahorse.xml:1193(para) +#, fuzzy +#| msgid "" +#| "Importing can also be performed by pasting the keys inside " +#| "Passwords and Encryption Keys: " msgid "" "Importing can also be performed by pasting the keys inside " -"Passwords and Encryption Keys: " +"Passwords and Keys: " msgstr "" "パスワードと暗号鍵内へ鍵を貼り付けることによっても" "インポートを実行することができます: " @@ -1470,11 +1548,17 @@ msgstr "設定" #: C/seahorse.xml:1306(para) +#, fuzzy +#| msgid "" +#| "This section describes the preferences settable in Passwords " +#| "and Encryption Keys by choosing EditPreferences from within " +#| "Passwords and Encryption Keys." msgid "" "This section describes the preferences settable in Passwords " -"and Encryption Keys by choosing Edit by choosing EditPreferences from within " -"Passwords and Encryption Keys." +"Passwords and Keys." msgstr "" "この節では、パスワードと暗号鍵にて" "編集設定Passwords and Encryption Keys provides support " +#| "for HKP and LDAP keyservers." msgid "" -"Passwords and Encryption Keys provides support " -"for HKP and LDAP keyservers." +"Passwords and Keys provides support for HKP and " +"LDAP keyservers." msgstr "" "パスワードと暗号鍵は、HKPとLDAP鍵サーバーのサポー" "トを提供します。" @@ -1568,11 +1656,17 @@ msgstr "HKPサーバー" #: C/seahorse.xml:1361(para) +#, fuzzy +#| msgid "" +#| "HKP keyservers are ordinary web based keyservers such as the popular " +#| "hkp://pgp.mit." +#| "edu:11371, also accessible at http://pgp.mit.edu." msgid "" "HKP keyservers are ordinary web based keyservers such as the popular hkp://pgp.mit.edu:11371, also accessible at http://pgp.mit.edu." +"url=\"hkp://pool.sks-keyservers.net\" type=\"hkp\">hkp://pool.sks-keyservers." +"net, also accessible at http://sks-keyservers.net." msgstr "" "HKP鍵サーバーは、人気のあるhkp://pgp.mit.edu:11371といった一般のwebベースの鍵サーバーであり、" @@ -1602,32 +1696,51 @@ msgstr "鍵の共有" #: C/seahorse.xml:1384(para) +#, fuzzy +#| msgid "" +#| "Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. " +#| "Enabling key sharing will add the local Passwords and " +#| "Encryption Keys users' public key rings to the remote " +#| "search dialog. Using these local \"key servers\" will most likely be " +#| "faster than accessing remote servers." msgid "" "Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. " -"Enabling key sharing will add the local Passwords and " -"Encryption Keys users' public key rings to the remote search " -"dialog. Using these local \"key servers\" will most likely be faster than " -"accessing remote servers." +"Enabling key sharing will add the local Passwords and Keys users' public key rings to the remote search dialog. Using " +"these local \"key servers\" will most likely be faster than accessing remote " +"servers." msgstr "" "鍵の共有は、BonjourやRendevousとして知られるDNS-SDによって提供されます。鍵の" -"共有の有効化は、ローカルのパスワードと暗号鍵ユーザ" -"の公開キーリングへリモート検索ダイアログを追加します。このようなローカル「鍵" -"サーバー」を利用するとリモートサーバーへの接続よりもおそらく速くなるでしょ" -"う。" +"共有の有効化は、ローカルのパスワードと暗号鍵ユー" +"ザーの公開キーリングへリモート検索ダイアログを追加します。このようなローカル" +"「鍵サーバー」を利用するとリモートサーバーへの接続よりもおそらく速くなるで" +"しょう。" #: C/seahorse.xml:1396(title) -msgid "About Passwords and Encryption Keys" +#, fuzzy +#| msgid "About Passwords and Encryption Keys" +msgid "About Passwords and Keys" msgstr "パスワードと暗号鍵マニュアルについて" #: C/seahorse.xml:1397(para) -msgid "" -"Passwords and Encryption Keys, its associated " -"plugins, the preferences applet and the panel applet are known collectively " -"as Seahorse. Seahorse was written by Jacob Perkins. The current maintainers " -"are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The " -"project's web site was designed by Jim Pharis. To find more information " -"about Seahorse, the project , please visit the Seahorse web page." +#, fuzzy +#| msgid "" +#| "Passwords and Encryption Keys, its associated " +#| "plugins, the preferences applet and the panel applet are known " +#| "collectively as Seahorse. Seahorse was written by Jacob Perkins. The " +#| "current maintainers are Stef Walter and Adam Schreiber. This manual is by " +#| "Adam Schreiber. The project's web site was designed by Jim Pharis. To " +#| "find more information about Seahorse, the project , please visit the " +#| "Seahorse web page." +msgid "" +"Passwords and Keys, its associated plugins, the " +"preferences applet and the panel applet are known collectively as Seahorse. " +"Seahorse was written by Jacob Perkins. The current maintainers are Stef " +"Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's " +"web site was designed by Jim Pharis. To find more information about " +"Seahorse, the project , please visit the Seahorse web page." msgstr "" "パスワードと暗号鍵は、関連するプラグイン、設定アプ" "レットやパネルアップレットと一括してSeahorseとして知られています。Seahorse" diff -Nru seahorse-3.2.2/help/ja/legal.xml seahorse-3.6.3/help/ja/legal.xml --- seahorse-3.2.2/help/ja/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ja/legal.xml 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + 本ドキュメントは GFDL の下で配布されているその他の GNOME マニュアル集の一部である。これらのマニュアルとは別に本ドキュメントを別個に配布する場合は、GFDL のセクション6で説明しているように、そのマニュアル集に対するライセンスの複製を添付することで実現できる。 + + 製品やサービスを区別するために企業によって利用されている名称の多くは商標です。これらの名称がGNOMEドキュメンテーションに現れた場合 で、GNOMEドキュメンテーションプロジェクトのメンバーが商標と認識し ている場合、これらの名前は大文字あるいは頭文字を大文字で記述しています。 + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/ja/seahorse.xml seahorse-3.6.3/help/ja/seahorse.xml --- seahorse-3.2.2/help/ja/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/ja/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,962 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - 2010Yasumichi Akahoshi (yasumichi@vinelinux.org) - - Seahorseプロジェクト - - - - このドキュメントをフリーソフトウェア財団発行の GNU フリー文書利用許諾契約書 (バージョン 1.1 かそれ以降から一つを選択) が定める条件の下で複製、頒布、あるいは改変することを許可する。変更不可部分、表カバーテキスト、裏カバーテキストは存在しない。この利用許諾契約書の複製物はこのリンク、またはこの文書と共に配布されている COPYING-DOCS というファイルに中に記載されている。 - 本ドキュメントは GFDL の下で配布されているその他の GNOME マニュアル集の一部である。これらのマニュアルとは別に本ドキュメントを別個に配布する場合は、GFDL のセクション6で説明しているように、そのマニュアル集に対するライセンスの複製を添付することで実現できる。 - - 製品やサービスを区別するために企業によって利用されている名称の多くは商標です。これらの名称がGNOMEドキュメンテーションに現れた場合 で、GNOMEドキュメンテーションプロジェクトのメンバーが商標と認識し ている場合、これらの名前は大文字あるいは頭文字を大文字で記述しています。 - - 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. - - - - - - - - Jacob - Perkins - - Seahorseプロジェクト - - - - - Adam - Schreiber - - Seahorseプロジェクト -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOMEドキュメンテーションプロジェクト -
- pcutler@foresightlinux.org -
- - - - - - - Seahorseプロジェクト - - - GNOMEドキュメンテーションプロジェクト - - - - Passwords and Keys Manual V2.11.0 - 2009年5月 - - Paul Cutler pcutler@foresightlinux.org - - - - Passwords and Keys Manual V0.10.1 - 2008年8月 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - 2006年11月 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - 2005年7月 - - Adam Schreiber sadam@clemson.edu - Seahorseプロジェクト - - - - Passwords and Keys Manual V0.7.0 - 2003年2月 - - Jacob Perkins - Seahorseプロジェクト - - - - This manual describes version 2.28.x of Passwords and Keys - - フィードバック - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - 暗号鍵 - - - - - - はじめに - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - PGPとSSH鍵の生成と管理 - - - PGPとSSH鍵のエキスポートとインポート - - - あなたの鍵を他の人達と共有 - - - - - - - - - 始めてみる - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - アプリケーションメニュー - - Choose - - Accessories - Password and Keys - . - - - - コマンドライン - - seahorseと入力し、Returnキーを押してください。 - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - ウィンドウPasswords and Keysの表示 - - - -
- - - The Passwords and Keys window contains the following elements: - - - - メニューバー - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - ツールバー - - ツールバーを使うとよく使われるコマンドに素早くアクセスできます。 - - - 鍵とパスワードタブ - - キーリングの鍵とパスワードへのアクセスを提供します。 - - - 初回起動時のオプション - - 初めてのユーザにとって便利な動作への高速なアクセスを提供します。ここから行えます: - - - ヘルプシステムの閲覧 - - - キーリングへの鍵のインポート - - - 新しい鍵の生成 - - - - - - - - - - - - OpenPGP鍵の生成 - OpenPGPは、PGPを基にした公開鍵暗号で電子メールを暗号化するための非独占的なプロトコルです。 - 公開鍵暗号は、二つの鍵の使用方法を含んだ概念です: 公開鍵は、通信したいと思う相手の誰にでも渡すことができ、秘密鍵は、プライベートなもので、秘密にしておく必要があります。 - OpenPGP鍵を生成するには: - - ファイル新規...を選択 - - - PGP 鍵を選択し、続行をクリック - - - フルネーム(名 - 姓)、E-メール・アドレスと追加の情報を入力します。鍵に関する拡張オプションを指定する事ができます: 下記参照 - - - 生成をクリックし、新しい鍵対を生成します。 - - - 新しい PGP 鍵のパスフレーズダイアログが開きます。新しい鍵のパスフレーズを2回入力してください。 - - - - パスフレーズを生成する際は、強いパスワードの生成と同様の慣行を使用しましょう。パスワードとパスフレーズでは、空白がパスフレーズにおいては有効な文字であるのが大きな違いです。 - - - - 拡張オプション - 拡張オプションを展開して、新しい鍵に関する以下のオプションを指定します: - - - 暗号化の種類 - - この欄は、鍵を生成するのに利用する暗号化アルゴリズムを指定します。 - - - DSA ElGamal - - 必要に応じて暗号化、復号化、署名及び検証を行うことができる、お勧めの選択肢です。 - - - - DSA - - 署名のみが可能です。 - - - - RSA - - 署名のみが可能です。 - - - - - - - 鍵の長さ (ビット) - - これは、ビット単位の鍵の長さです。強いパスフレーズが使用されていれば、鍵の長さが長ければ長いほど、より安全です。しかし、長い鍵を使ったあらゆる操作は、短い鍵による操作よりも、より多くの時間を必要とします。許容できる値は、1024から4096ビットの間です。少なくとも2048ビットを推奨します。 - - - - 有効期限 - - これは、鍵が暗号化の実行や署名操作に利用できるのを停止する日付です。妥当な期間は6ヶ月です。この期間が経過したら、有効期限を変更するか、新しい鍵か副鍵を生成する必要があるでしょう。 - あなたの信用状態を保持するために有効期限が切れる前に古い鍵で新しい鍵に署名してください。 - - - - - - - - - - - セキュア・シェルの鍵の生成 - セキュア・シェル(SSH)は、リモートコンピュータにログインし、その機械でコマンドを実行する手段です。SSH鍵は、鍵ベースの認証システムであり、デフォルトのパスワード認証システムの代用として使用されます。鍵ベースの認証では、認証するのに手動でパスワードを入力する必要はありません。 - セキュア・シェル鍵は、2つの鍵で構成されます:秘密鍵は、秘密に保たれるべきであり、公開鍵は、アクセスする必要のあるどのコンピュータにもアップロードすることができます。 - セキュア・シェル鍵を生成するには: - - - ファイル新規...を選択 - - - セキュア・シェル 鍵を選択し、続行をクリック - - - 鍵が何のために利用されるか説明を入力してください。あなたのE-メール・アドレスか、その他の思い出させるものを利用できます。鍵に関する拡張オプションを指定することもできます: 下記参照 - - - 新しい鍵を生成するための生成のみか、鍵を生成し認証のためにその鍵を利用する他のコンピュータを設定するための生成と設定をクリックしてください。 - - - 新しいセキュア・シェル鍵のためのパスフレーズダイアログが開きます。新しい鍵用にパスフレーズを2回入力してください。 - - パスフレーズを生成する際は、強いパスワードの生成と同様の慣行を使用しましょう。パスワードとパスフレーズでは、空白がパスフレーズにおいては有効な文字であるのが大きな違いです。 - - - - - - - - 拡張オプション - 拡張オプションを展開して、新しい鍵に関する以下のオプションを指定します: - - - - 暗号化の種類 - - このフィールドは、鍵を生成するために利用する暗号化アルゴリズムを指定します。 - - - RSA - - SSH鍵を生成するためにRivest-ShamirAdleman (RSA)アルゴリズムを利用します。これは、好ましくよりセキュアな選択です。 - - - - DSA - - SSH鍵を生成するためにDigital Signature Algorithm (DSA)を利用します。 - - - - - - - 鍵の長さ (ビット) - - これは、ビット単位の鍵の長さです。強いパスフレーズが使用されていれば、鍵の長さが長ければ長いほど、より安全です。しかし、長い鍵を使ったあらゆる操作は、短い鍵による操作よりも、より多くの時間を必要とします。許容できる値は、1024から4096ビットの間です。少なくとも2048ビットを推奨します。 - - - - - - - - - - OpenPGP鍵のプロパティ - この節の記述は、すべてのOpenPGP鍵に適用されます。 - - PGP鍵のプロパティを見るには: - - メインウィンドウから、PGP鍵を選択してください。 - - - その上でダブルクリックするか、ツールバーからプロパティを選択します。 - - - 詳細タブを選択してください。 - - - - - プロパティ - - - - 指紋 - - 指紋は、鍵を正確に特定する一意の文字列です。 - - - - 鍵のID - - 鍵のIDは、指紋と似ています。しかしながら、鍵IDは指紋の最後の8文字を含んでいるのみです。ほとんどの場合、鍵のIDのみで鍵を特定することが可能ですが、時折、同じIDを持つ鍵があるかもしれません。 - - - - 種類 - - 鍵を生成するために利用した暗号化アルゴリズムを示します。DSA鍵は、署名のみ可能です。ElGamal鍵は、暗号化に利用されます。 - - - - 生成 - - 鍵が生成された日付を示します。 - - - - 有効期限 - - 鍵がもはや使えなくなる日付を示します。 - - - - 強度 - - 鍵の長さをビット単位で示します。一般的に、鍵の長さが長ければ長いほどより安全です。 - 長い鍵は、弱いパスフレーズの使用を補うのに十分ではありません。 - - - - - - - - - 信用度 - 信用度は、信頼の網を正確に広げる個人の能力をどのくらい確信しているかを示します。あなたが署名していない鍵に直面した時、その個人の鍵の妥当性は、集められた署名とそれらの署名を作成した人々をどのくらい信用しているかいないかを基に決定されます。デフォルトでは、未知の鍵は、3のぎりぎり信用する署名か、1つの完全に信用する署名を必要とするでしょう。 - - 不明: 正確に鍵に署名する人の能力を詳しく知りません。 - 信用しない: この人は正しく鍵に署名することができません。 - ぎりぎり信用する: この人は鍵に署名する前に写真付き身分証明書を確認しますが、必ずしも綿密に調べません。 - 完全に信用する: この人は、署名する前にありとあらゆる人の写真付き身分証明書を綿密に調べます。 - 究極に信用する: この信用度は、自分自身の鍵に割り当てられるのみです。 - - - - - 鍵の有効化と無効化 - 鍵が有効である時は、その鍵を利用して暗号化の操作を実行できます。鍵が無効である時は、その鍵を利用して暗号化をしたり、署名を検証したりすることはできません。 - - - - 有効期限 - 鍵が期限切れとなった以降は、もはや鍵の操作の実行に使われることはありません。鍵の有効期限を未来の日付に変更し、再び有効にします。一般的なお勧めは、決して期限の切れることのない主鍵とその主鍵で署名された複数の副鍵を持つことでしょう。 - - - - ユーザID - ユーザIDは、複数の名前とE-メール・アドレスを同じ鍵で利用することを許容します。 - 通常、それらは以下の形式を取ります:名前 (鍵の説明) <E-メール・アドレス> - - - ユーザ ID の追加 - ユーザIDを追加することは、仕事向けのアドレスと友達向けのアドレスを持ちたい時に便利です。 - 鍵にユーザIDを追加するには: - - メインウィンドウから、鍵を選択してください。 - - - その上でダブルクリックするか、ツールバーからプロパティを選択します。 - - - 名前と署名タブを選択してください。 - - - 名前の追加をクリックしてください。 - - - 上記の手順に従った後、内容を埋めるためにダイアログが表示されます。その項目は、以下の通りです。 - - - 氏名 - - あなたの氏名をこの形式で入力してください <名> <姓> ミドルネームやイニシャルは、任意です。 - - - この項目には、少なくとも5文字を入力せねばなりません。 - - - - - - E-メール・アドレス - - E-メール・アドレスは、鍵サーバーや他の鍵プロバイダ上であなたの鍵を見つけるためのものです。続行する前にそれが正確である事を確認してください。 - - - この形式である必要があります <ユーザ名>@<ドメイン名> - - - - - - 鍵の説明 - - 鍵の説明は、新しいIDの表示名に任意の追加情報を加えるために利用する事ができます。この情報は、鍵サーバーで検索することができます。 - - - - - - - - 画像 - 鍵に所有者の1枚以上の写真を埋め込むことができます。これらの画像には、通常のユーザIDのように署名することができます。画像は、JPEG形式である必要があり、240x288ピクセルより大きくないことが推奨されます。 - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - パスフレーズの変更 - 鍵に割り当てられたパスフレーズを変更するには: - - メインウィンドウから、鍵を選択してください。 - - - その上でダブルクリックするか、ツールバーからプロパティを選択します。 - - - パスフレーズの変更をクリックしてください。 - - - 新しいパスフレーズを入力し、OKをクリックしてください。 - - - - 鍵の削除 - 鍵をキーリングから削除するには: - - メインウィンドウから、鍵を選択してください。 - - - 鍵を右クリックして削除を選択するか、編集削除を選択してください。 - - - - あなたの鍵、信用する鍵及び収集した鍵を削除できます。 - - - - - - - - OpenPGP副鍵のプロパティ - 各OpenPGP鍵は、署名のみに利用される単一の主鍵を持っています。副鍵は、暗号化や署名にも利用されます。この方法では、副鍵が危険にさらされているような場合には、主鍵を失効する必要はありません。 - - - ID - - これは、副鍵の識別子です。 - - - - 種類 - - 副鍵の生成に利用する暗号化アルゴリズムを指定します。DSA鍵は署名のみ可能で、RSA鍵は署名か暗号化に利用できますが、ElGamal鍵は暗号化にのみ使えます。 - - - - 生成 - - 鍵が生成された日付を示します。 - - - - 有効期限 - - 鍵がもはや使えなくなる日付を示します。 - - - - 状態 - - その鍵の状態を示します。 - - - - 強度 - - 鍵の長さをビット単位で示します。一般的に、鍵の長さが長ければ長いほどより安全です。 - 長い鍵は、弱いパスフレーズの使用を補うのに十分ではありません。 - - - - - - - 副鍵の追加 - 鍵に副鍵を追加するには、副鍵セクションの追加ボタンをクリックしてください。 - 上記の手順に従った後、内容を埋めるためにダイアログが表示されます。その項目は、以下の通りです。 - - - 鍵の種類 - - 副鍵を生成するのに利用する暗号化アルゴリズムを指定します。 - - - DSA - - Digital Signature Algorithm (DSA)を利用して副鍵を生成します。この副鍵は、署名のみ可能です。 - - - - ElGamal - - ElGamalアルゴリズムを利用して副鍵を生成します。この副鍵は、暗号化のみ可能です。 - - - - RSA - - Rivest-Shamir Adleman (RSA)アルゴリズムを利用して副鍵を生成します。この副鍵は、署名か暗号化に利用できますが、二つの異なる副鍵を生成する必要があります。 - - - - - - - 鍵の長さ - - 鍵の長さをビット単位で示します。一般的に、より長い鍵はより安全です。 - - - - 有効期限 - - 鍵がもはや使えなくなる日付を示します。 - - - - - - - 副鍵の有効期限の変更 - 副鍵の有効期限を変更するには、副鍵セクションから副鍵を選択した上: - - 左にある期限切れボタンをクリックしてください。 - - - 日付ダイアログから、新しい有効期限を選択するか、有効期限が必要ない場合、有効期限を設定しないを選択してください。 - - - - - - 副鍵の破棄 - 副鍵を失効するには、副鍵セクションから副鍵を選択した上: - - 左にある失効ボタンをクリックしてください。 - - - 副鍵を失効させる理由の選択: - - - - 理由なし - - 鍵を失効するための特に理由はありません。 - - - - 漏洩 - - 鍵が漏洩しています。 - - - - 失効 - - この鍵は、他の鍵によって取って代わられました。 - - - - 未使用 - - 鍵はもう使用されません。 - - - - - - - なぜ鍵を失効するのか説明を入力してください。 - - - 失効をクリックしてください。 - - - - 副鍵は即座に失効します。 - - - - - 副鍵の削除 - 副鍵を削除するには、副鍵セクションから副鍵を選択した上: - - 左にある削除ボタンをクリックしてください。 - - - - - - - - - セキュア・シェル鍵のプロパティ - この節の説明は、すべてのSSH鍵に適用されます。 - SSH鍵のプロパティを見るには: - - メインウィンドウから、セキュア・シェルの鍵を選択してください。 - - - その上でダブルクリックするか、ツールバーからプロパティを選択します。 - - - 詳細タブを選択してください。 - - - - - プロパティ - - - - 指紋 - - 指紋は、鍵を正確に特定する一意の文字列です。 - - - - アルゴリズム - - 鍵を生成するのに利用された暗号化アルゴリズムを特定します。 - - - - 場所 - - これは、秘密鍵が保存されている場所です。 - - - - 強度 - - 鍵の長さをビット単位で示します。一般的に、鍵の長さが長ければ長いほどより安全です。 - 長い鍵は、弱いパスフレーズの使用を補うのに十分ではありません。 - - - - - - - - - セキュア・シェル鍵の削除 - セキュア・シェルの鍵を削除するには: - - メインウィンドウからSSH鍵を選択してください。 - - - その上で右クリックして削除を選択するか、編集削除を選択してください。 - - - - - - - - - 鍵のインポート - 鍵をインポートするには、ファイルインポートを選択し、ファイル選択ダイアログから、一つ以上のASCII形式化された公開鍵を含んだファイルを選択します。 - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - テキストのASCII形式化された公開鍵ブロックを選択してください。 - - - クリップボードへコピーしてください。 - - - 編集貼り付けを選択してください。 - - - - - - - - - 鍵のエキスポート - 鍵をエキスポートするには、メインウィンドウから鍵を選択し、ファイルエキスポートを選択してください。 - ASCII形式化されたテキストブロックとしてクリップボードへ鍵をエキスポートすることもできます: - - メインウィンドウの鍵を選択してください。 - - - 編集コピーを選択してください。 - - - - - - - - - 鍵への署名 - 他の人の鍵へ署名するということは、その人へ信用を与えることを意味します。鍵へ署名する前に本当にその人が所有する鍵であるかを確認するため、鍵の指紋を注意深くチェックしてください。 - キーリングにある鍵へ署名するには: - - 信用する鍵か収集した他の鍵のタブから、署名したいと思う鍵を選択してください。 - - - ツールバーの鍵に署名するかファイル鍵に署名するを選択してください。 - - - その鍵をどのくらい入念にチェックしたかを選択してください。 - - - その鍵をあなたのキーリングに留めるべきかとあなたの署名を失効させることができるかどうかを示します。 - - - 署名をクリックします。 - - - - - - - - 設定 - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - パスワード用のキーリング - - キーリングの生成 - 新しいキーリングを作成するには、メニューからファイル新規を選択し、パスワード用のキーリングを選択してください。新しいキーリングの名前を入力し、Enterキーを押してください。 - - - キーリングのパスワード変更 - キーリングの解除パスワードを変更するには、まず適切なキーリングを選択してからパスワードの変更ボタンを押してください。古いパスワード入力欄への古いパスワードの入力と新しいパスワード入力欄への新しいパスワードの入力とパスワードの確認入力欄への新しいパスワードの確認を促されます。設定を適用するには、変更するを押してください。古いパスワードが正しければ、操作の成功を示す状態メッセージを得るでしょう。古いパスワードが正しくなければ、その正当性を確認するように求められます。 - - - キーリングの削除 - キーリングを削除するには、まず適切なキーリングを選択して、メニューから編集削除を選択してください。 - - - - - 鍵サーバー - リモート鍵サーバーと定期的に鍵を同期することによってあなたと他の人の鍵を最新に保ってください。同期は、あなたがすべての鍵について最新の署名を持っていることを確認し、信用の網を最も役立つものとするでしょう。 - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKPサーバー - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP 鍵サーバー - - LDAP鍵サーバーはあまり一般的ではありませんが、標準のLDAPプロトコルを利用した鍵サーバーです。ldap://keyserver.pgp.comは、よいLDAPサーバーです。 - - - - - - - 鍵の共有 - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - バグの報告やこのアプリケーションやこのマニュアルに対する提案を行うには、Feedback section of the GNOME User Guideに従ってください。 - このプログラムは、Free Software Foundationによって発行されたGNU General Public licenseの条件の元で配布されています; そのライセンスのバージョン2か、それ以降の(任意の)バージョンです。このドキュメントには、このライセンスのコピーが含まれています; ほかには、このプログラムのソースコードに含まれるCOPYINGというファイルを見ることができます。 - -
diff -Nru seahorse-3.2.2/help/ko/index.docbook seahorse-3.6.3/help/ko/index.docbook --- seahorse-3.2.2/help/ko/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ko/index.docbook 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,1252 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse 프로젝트 + + + + + 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. + + 본 설명서는 GFDL에 따라 배포된 그놈 설명서 컬렉션의 일부입니다. 본 설명서를 컬렉션과 별도로 배포하려는 경우에는 라이센스 조항 6에 따라 라이센스 사본을 설명서에 추가하면 됩니다. + + 기업의 제품과 서비스를 식별하기 위해 사용된 많은 이름은 상표로 간주됩니다. 그놈 문서에 사용된 이름과 그놈 문서 프로젝트의 구성원은 해당 상표로, 모두 대문자로 표시되거나 첫 글자가 대문자로 표시되어 있습니다. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse 프로젝트 + + + 그놈 문서 프로젝트 + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + 피드백 + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + 소개 + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + 시작하기 + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + 응용 프로그램 메뉴 + + Choose + + Accessories + Password and Keys + . + + + + 명령줄 + + seahorse를 입력하고 엔터 키를 누르십시오. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + 메뉴 표시줄 + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + 도구 모음 + + 도구 모음을 사용하면 자주 사용하는 명령에 빠르게 액세스할 수 있습니다. + + + 키와 비밀번호 탭 + + 키링과 키 암호에 대한 액세스를 제공합니다. + + + 처음 시작 옵션 + + 처음 사용자를 위한 유용한 작업의 빠른 액세스를 제공합니다. 여기에 있습니다 : + + + 도움말 시스템 조회, + + + 키링에 키 가져오기, + + + 새로운 키를 만듭니다. + + + + + + + + + + + + OpenPGP 키 생성 + OpenPGP는 PGP를 기반으로하는 공개키 암호로 전자 메일을 암호화하는 비독점적인 프로토콜입니다. + 공개키 암호는 두 키 사용 방법을 포함한 개념입니다 : 공개키는 통신하고 싶은 상대의 누구라도 전달할 수 있으며, 비밀키는 개인적인 것으로, 비밀로해야합니다. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + 암호를 생성할 때 강력한 암호 생성과 같은 관행을 사용합시다. 암호와 암호는 공백이 암호에서는 유효한 문자로있는 것이 큰 차이입니다. + + + + 확장 옵션 + 고급 옵션을 확장하여 새 키에 대한 다음 옵션을 지정합니다 : + + + Encryption Type + + 이 항목은 키를 생성하는 데 사용하는 암호화 알고리즘을 지정합니다. + + + DSA ElGamal + + 필요에 따라 암호화, 복호화, 서명 및 검증을 할 수있는 추천 선택입니다. + + + + DSA + + 서명만 허용합니다. + + + + RSA + + 서명만 허용합니다. + + + + + + + Key Strength (bits) + + 이것은 비트 키 길이입니다. 강한 암호를 사용하면, 키의 길이가 길수록 더 안전합니다. 그러나 긴 키를 사용하여 모든 작업은 짧은 키의 조작보다 더 많은 시간을 필요로합니다. 허용 가능한 값은 1024에서 4096 비트 사이입니다. 최소 2048 비트를 권장합니다. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + 보안 쉘 키 생성 + 보안 쉘 (SSH)은 원격 컴퓨터에 로그인하고 해당 컴퓨터에서 명령을 실행하는 방법입니다. SSH 키는 키 기반의 인증 시스템이며 기본 암호 인증 시스템의 대용으로 사용됩니다. 키 기반 인증에서는 인증하기 위해 암호를 수동으로 입력할 필요가 없습니다. + 보안 쉘 키는 2 개의 키로 구성됩니다 : 비밀키는 비밀로 유지되어야하며, 공개키는 액세스해야하는 모든 컴퓨터에 업로드될 수 있습니다. + 보안 쉘 키를 생성하려면 : + + + 파일신규 ...를 선택 + + + 보안 쉘 키를 선택하고 계속을 클릭 + + + 키가 무엇을 위해 사용되는지 설명을 입력하십시오. 이메일 주소 혹은 다른 기억 수단을 사용할 수 있습니다. 열쇠에 대한 확장 옵션을 지정할 수 있습니다 : 아래 참조 + + + 새 키를 생성하기 위해 키 생성 또는 키를 생성하고 인증을 위해 그 열쇠를 사용하는 다른 컴퓨터를 설정하기위해 생성 및 설정을 클릭하십시오. + + + 새 보안 쉘 키를위한 암호 대화 상자가 열립니다. 새 키의 암호를 두 번 입력하십시오. + + 암호를 생성할 때 강력한 암호 생성과 같은 관행을 사용합시다. 암호와 암호는 공백이 암호에서는 유효한 문자로있는 것이 큰 차이입니다. + + + + + + + + 확장 옵션 + 고급 옵션을 확장하여 새 키에 대한 다음 옵션을 지정합니다 : + + + + Encryption Type + + 이 필드는 키를 생성하는 데 사용할 암호화 알고리즘을 지정합니다. + + + RSA + + SSH 키를 생성하기 위해 Rivest - ShamirAdleman (RSA) 알고리즘을 사용합니다. 이것은 바람직하며 더 안전한 선택입니다. + + + + DSA + + SSH 키를 생성하기 위해 Digital Signature Algorithm (DSA)를 사용합니다. + + + + + + + Key Strength (bits) + + 이것은 비트 키 길이입니다. 강한 암호를 사용하면, 키의 길이가 길수록 더 안전합니다. 그러나 긴 키를 사용하여 모든 작업은 짧은 키의 조작보다 더 많은 시간을 필요로합니다. 허용 가능한 값은 1024에서 4096 비트 사이입니다. 최소 2048 비트를 권장합니다. + + + + + + + + + + OpenPGP 키 속성 + 이 절의 내용은 모든 OpenPGP 키에 적용됩니다. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + 속성 + + + + Fingerprint + + 지문은 키를 정확하게 식별하는 고유 문자열입니다. + + + + KeyID + + 키 ID는 지문과 비슷합니다. 그러나 키 ID는 지문의 마지막 8 문자만 포함합니다. 대부분의 경우 키 ID만으로 키를 확인할 수 있지만, 때때로 동일한 ID를 가진 열쇠가 있을지도 모릅니다. + + + + Type + + 키를 생성하기 위해 이용한 암호화 알고리즘을 나타냅니다. DSA 키는 서명에만 가능합니다. ElGamal 키는 암호화에 사용됩니다. + + + + Created + + 키가 생성된 날짜를 나타냅니다. + + + + Expires + + 키가 더 이상 사용할 수 없게되는 날짜를 나타냅니다. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + 신용 + 신용은 믿음의 웹을 정확하게 펼치는 개인의 능력을 얼마나 확신하는지 나타냅니다. 당신이 서명하지 않은 키에 직면했을 때, 그 개인의 열쇠의 타당성은 모아진 서명과 그들의 서명을 만든 사람을 얼마나 신뢰하는가 여부에 따라 결정됩니다. 기본적으로 미지의 열쇠는 3 직전 신용 서명 또는 하나의 전체 신용 서명을 필요로하는 것입니다. + + 알 수 없음 : 정확하게 키를 서명하는 사람의 능력을 자세히 모릅니다. + 신용하지 않음 :이 사람은 제대로 키에 서명 수 없습니다. + 최대한 믿음 :이 사람은 키 서명하기 전에 사진이 부착된 신분증을 확인합니다, 하지만 면밀히 조사하지 않습니다. + 완전히 신뢰 :이 사람은 서명하기 전에 온갖 사람의 사진이 부착된 신분증을 면밀히 검사합니다. + 궁극의 신용 :이 신용도는 자신의 키에 할당된뿐입니다. + + + + + 키 활성화 및 비활성화 + 키가 활성화될 때는, 그 열쇠를 이용하여 암호화 작업을 수행할 수 있습니다. 키가 활성화되지 않을 때는, 그 열쇠를 이용하여 암호화하거나 서명을 확인하거나 할 수 없습니다. + + + + 유효 기간 + 키가 만료 된 이후에는 더 이상 키 작업 수행에 사용되지 않습니다. 키 만료 날짜를 미래 날짜로 변경하고 다시 활성화합니다. 일반적인 권장은 결코 만료되지 않는 한 개의 마스터 키와 마스터 키로 서명된 여러 하위 키가있는 것입니다. + + + + 사용자 ID + 사용자 ID는 여러 이름과 이메일 주소를 같은 키로 이용하는 것을 허용합니다. + + They usually take the form of: + Name (comment) <email address> + + + + 사용자 ID 추가 + 사용자 ID를 추가하는 것은 일을 위한 주소와 친구를위한 주소가 필요할 때 유용합니다. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + 위의 단계를 따른 후, 내용을 채우기 위해 대화 상자가 표시됩니다. 해당 항목은 다음과 같습니다. + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + 이 항목에는 적어도 5 문자를 입력하지 않으면 안됩니다. + + + + + + Email Address + + 이메일 주소는 키 서버 및 기타 키 공급자에서 당신의 키를 찾기위한 것입니다. 계속하기 전에 그것이 정확하다는 것을 확인하십시오. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + 키 설명은 새 ID의 표시 이름에 임의의 추가 정보를 추가하기 위하여 이용할 수 있습니다. 이 정보는 키 서버에서 찾을 수 있습니다. + + + + + + + + 이미지 + 열쇠 소유자의 하나 이상의 사진을 포함할 수 있습니다. 이러한 이미지는 일반 사용자 ID와 같이 서명할 수 있습니다. 이미지는 JPEG 형식으로해야 하며, 240x288 픽셀보다 크지 않은 것을 권장합니다. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + 암호 변경 + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + 새 암호를 입력하고 OK를 클릭하십시오. + + + + 키 삭제 + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + 당신의 키, 신용하는 키 및 수집한 키를 삭제할 수 있습니다. + + + + + + + + OpenPGP 하위 키 속성 + 각 OpenPGP 키는 서명에만 사용되는 단일의 주요 키를 가지고 있습니다. 하위 키는 암호화 및 서명에 사용됩니다. 이 방법은 하위 키가 위험에 노출되는 경우에는 기본 키를 해지할 필요가 없습니다. + + + ID + + 이것은 하위 키 식별자입니다. + + + + Type + + 하위 키를 생성하는 데 사용하는 암호화 알고리즘을 지정합니다. DSA 키는 서명 가능하며, RSA 키는 서명 또는 암호화에 사용할 수 있지만, ElGamal 키는 암호화에만 사용할 수 있습니다. + + + + Created + + 키가 생성된 날짜를 나타냅니다. + + + + Expires + + 키가 더 이상 사용할 수 없게되는 날짜를 나타냅니다. + + + + Status + + 이 키의 상태를 나타냅니다. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + 하위 키 추가 + 하위 키를 추가하려면 하위 키 섹션에서 추가 버튼을 클릭하십시오. + 위의 단계를 따른 후, 내용을 채우기 위해 대화 상자가 표시됩니다. 해당 항목은 다음과 같습니다. + + + 키 유형 + + 하위 키를 생성하는 데 사용하는 암호화 알고리즘을 지정합니다. + + + DSA + + Digital Signature Algorithm (DSA)를 사용하여 하위 키를 생성합니다. 이 하위 키는 서명에만 가능합니다. + + + + ElGamal + + ElGamal 알고리즘을 사용하여 하위 키를 생성합니다. 이 하위 키는 암호 화만 가능합니다. + + + + RSA + + Rivest - Shamir Adleman (RSA) 알고리즘을 사용하여 하위 키를 생성합니다. 이 하위 키는 서명 또는 암호화에 사용할 수 있지만 두 개의 다른 하위 키를 생성해야 합니다. + + + + + + + 키 길이 + + 키 길이를 비트 단위로 나타냅니다. 일반적으로 더 긴 열쇠는보다 안전합니다. + + + + 유효 기간 + + 키가 더 이상 사용할 수 없게되는 날짜입니다. + + + + + + + 하위 키의 유효 기간 변경 + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + 하위 키 삭제 + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + 하위 키는 즉시 해지됩니다. + + + + + 하위 키 삭제 + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + 보안 쉘 키 속성 + 이 절의 내용은 모든 SSH 키에 적용됩니다. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + 속성 + + + + Fingerprint + + 지문은 키를 정확하게 식별하는 고유 문자열입니다. + + + + Algorithm + + 키를 생성하는 데 사용되는 암호화 알고리즘을 식별합니다. + + + + Location + + 이것은 비밀키가 저장된 위치입니다. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + 보안 쉘 키 삭제 + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + 키 가져오기 + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + 키 내보내기 + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + 키 서명 + 다른 사람의 키에 서명한다는 것은 그 사람에게 신용을 주는 것을 의미합니다. 키에 서명하기 전에 정말 그 사람이 소유하는 키인지 확인하기 위해 키 지문을 주의깊게 검사하십시오. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + 설정 + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + 키링의 패스워드 + + 키링 만들기 + 새로운 키링을 만들려면 메뉴에서 파일새로 만들기를 선택하고 키링의 패스워드를 선택 하십시오. 새 키링 이름을 입력하고 엔터 키를 누릅니다. + + + 키링 암호 변경 + 키링 해제 암호를 변경하려면 먼저 적절한 열쇠 고리를 선택하고 비밀 번호 변경 버튼을 누르십시오. 이전 암호 입력란에 이전 암호를 입력하고 새 암호 입력란에 새 암호를 입력하고 암호 확인 입력란에 새 암호 확인 메시지가 표시됩니다. 설정을 적용하려면 변경를 누르십시오. 이전 암호가 맞으면 작업의 성공을 나타내는 상태 메시지를 얻을 것입니다. 이전 암호가 올바르지 않으면 그 유효성을 확인하도록 요청합니다. + + + 키링 삭제 + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + 키 서버 + 원격 키 서버와 정기적으로 키를 동기화하여 당신과 다른 사람의 키를 최신 상태로 유지하십시오. 동기화는 당신이 모든 키에 대한 최신 서명이 있는지 확인하고 신용 웹을 가장 도움이 될 것입니다. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + LDAP 키 서버는 흔하지는 않지만 표준 LDAP 프로토콜을 이용한 키 서버입니다. ldap://keyserver.pgp.com은 좋은 LDAP 서버입니다. + + + + + + + 키 공유 + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/ko/legal.xml seahorse-3.6.3/help/ko/legal.xml --- seahorse-3.2.2/help/ko/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ko/legal.xml 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + 본 설명서는 GFDL에 따라 배포된 그놈 설명서 컬렉션의 일부입니다. 본 설명서를 컬렉션과 별도로 배포하려는 경우에는 라이센스 조항 6에 따라 라이센스 사본을 설명서에 추가하면 됩니다. + + 기업의 제품과 서비스를 식별하기 위해 사용된 많은 이름은 상표로 간주됩니다. 그놈 문서에 사용된 이름과 그놈 문서 프로젝트의 구성원은 해당 상표로, 모두 대문자로 표시되거나 첫 글자가 대문자로 표시되어 있습니다. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/ko/seahorse.xml seahorse-3.6.3/help/ko/seahorse.xml --- seahorse-3.2.2/help/ko/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/ko/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,962 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - Kang <freedomguard1@gmail.com>, 2011Seunghoon - - Seahorse 프로젝트 - - - - 본 설명서는 프리 소프트웨어 재단(FSF)에서 발행한 GNU 자유 문서 라이센스(GFDL) 버전 1.1 이상의 조항에 따라 변경 불가 부분, 앞 표지 텍스트 및 뒷 표지 텍스트를 제외하고 복사, 수정 및/또는 배포할 수 있습니다. GFDL의 사본은 링크 또는 본 설명서와 함께 배포된 COPYING-DOCS 파일에서 찾을 수 있습니다. - 본 설명서는 GFDL에 따라 배포된 그놈 설명서 컬렉션의 일부입니다. 본 설명서를 컬렉션과 별도로 배포하려는 경우에는 라이센스 조항 6에 따라 라이센스 사본을 설명서에 추가하면 됩니다. - - 기업의 제품과 서비스를 식별하기 위해 사용된 많은 이름은 상표로 간주됩니다. 그놈 문서에 사용된 이름과 그놈 문서 프로젝트의 구성원은 해당 상표로, 모두 대문자로 표시되거나 첫 글자가 대문자로 표시되어 있습니다. - - 문서 및 수정판은 다음 GNU 자유 문서 라이센스의 조항에 따라 제공됩니다. - - 문서는 "있는 그대로"로 제공되며 상품성, 특정 목적에의 적합성 또는 준수에 대한 보증을 비롯한 일체의 명시적 또는 암시적인 보증을 제한 없이 부인합니다. 문서 및 수정판의 품질, 정확성 및 성능에 대한 책임은 전적으로 사용자에게 있습니다. 문서 또는 수정판에 대한 오류를 입증하려면 사용자(원저작자, 저작자 또는 배포자 아님)는 필요한 서비스, 수리 및 수정 비용을 부담해야 합니다. 본 보증 부인은 라이센스의 필수 부분에 해당합니다. 본 보증 부인을 따르지 않는 모든 문서나 수정판은 사용할 수 없습니다. - - - 또한 불법 행위(부주의 포함), 계약 또는 직접, 간접, 특별, 부수적 및 파생적인 모든 손해(영업권 손실, 작업 중지, 컴퓨터 오류 및 고장 또는 본 문서나 수정판의 사용으로 인해 발생하거나 관련된 기타 모든 손실 및 이러한 손실 가능성에 대해 미리 공지한 경우에도 제한되지 않음)에 대해서는 어떠한 상황이나 법률적인 이론 하에서도 본 문서 또는 수정판의 저작자, 원저자, 모든 배포자 또는 공급자는 책임을 지지 않습니다. - - - - - - - - Jacob - Perkins - - Seahorse 프로젝트 - - - - - Adam - Schreiber - - Seahorse 프로젝트 -
- sadam@clemson.edu -
- - - - Paul - Cutler - - 그놈 문서 프로젝트 -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse 프로젝트 - - - 그놈 문서 프로젝트 - - - - Passwords and Keys Manual V2.11.0 - 2009년 5월 - - Paul Cutler pcutler@foresightlinux.org - - - - Passwords and Keys Manual V0.10.1 - 2008년 8월 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - 월2006년 11월 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - 2005년 7월 - - Adam Schreiber sadam@clemson.edu - Seahorse 프로젝트 - - - - Passwords and Keys Manual V0.7.0 - 2003년 2월 - - Jacob Perkins - Seahorse 프로젝트 - - - - This manual describes version 2.28.x of Passwords and Keys - - 피드백 - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - 암호화 키 - - - - - - 소개 - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - PGP와 SSH 키 생성 및 관리 - - - PGP와 SSH 키 내보내기 및 가져오기 - - - 다른 사람과 키 공유 - - - - - - - - - 시작하기 - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - 응용 프로그램 메뉴 - - Choose - - Accessories - Password and Keys - . - - - - 명령줄 - - seahorse를 입력하고 엔터 키를 누르십시오. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - 윈도우 Passwords and Keys보기 - - - -
- - - The Passwords and Keys window contains the following elements: - - - - 메뉴 표시줄 - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - 도구 모음 - - 도구 모음을 사용하면 자주 사용하는 명령에 빠르게 액세스할 수 있습니다. - - - 키와 비밀번호 탭 - - 키링과 키 암호에 대한 액세스를 제공합니다. - - - 처음 시작 옵션 - - 처음 사용자를 위한 유용한 작업의 빠른 액세스를 제공합니다. 여기에 있습니다 : - - - 도움말 시스템 조회, - - - 키링에 키 가져오기, - - - 새로운 키를 만듭니다. - - - - - - - - - - - - OpenPGP 키 생성 - OpenPGP는 PGP를 기반으로하는 공개키 암호로 전자 메일을 암호화하는 비독점적인 프로토콜입니다. - 공개키 암호는 두 키 사용 방법을 포함한 개념입니다 : 공개키는 통신하고 싶은 상대의 누구라도 전달할 수 있으며, 비밀키는 개인적인 것으로, 비밀로해야합니다. - OpenPGP 키를 생성하려면 : - - 파일신규 ...를 선택 - - - PGP 키를 선택하고계속을 클릭 - - - 성명 (이름 - 성), 이메일 주소와 추가 정보를 입력합니다. 키에 대한 확장 옵션을 지정 할 수 있습니다 : 아래 참조 - - - 생성을 클릭하고 새 키 쌍을 생성합니다. - - - 새로운 PGP 키 암호 대화 상자가 열립니다. 새로운 키 암호를 두 번 입력하십시오. - - - - 암호를 생성할 때 강력한 암호 생성과 같은 관행을 사용합시다. 암호와 암호는 공백이 암호에서는 유효한 문자로있는 것이 큰 차이입니다. - - - - 확장 옵션 - 고급 옵션을 확장하여 새 키에 대한 다음 옵션을 지정합니다 : - - - 암호화 유형 - - 이 항목은 키를 생성하는 데 사용하는 암호화 알고리즘을 지정합니다. - - - DSA ElGamal - - 필요에 따라 암호화, 복호화, 서명 및 검증을 할 수있는 추천 선택입니다. - - - - DSA - - 서명만 허용합니다. - - - - RSA - - 서명만 허용합니다. - - - - - - - 키의 길이 (비트) - - 이것은 비트 키 길이입니다. 강한 암호를 사용하면, 키의 길이가 길수록 더 안전합니다. 그러나 긴 키를 사용하여 모든 작업은 짧은 키의 조작보다 더 많은 시간을 필요로합니다. 허용 가능한 값은 1024에서 4096 비트 사이입니다. 최소 2048 비트를 권장합니다. - - - - 유효 기간 - - 이것은 키가 암호화 혹은 서명 작업에 사용하는 것을 중지하는 날짜입니다. 합리적인 기간은 6 개월입니다. 이 기간이 지나면 만료를 변경하거나 새 키 북한 키를 생성해야 할 것입니다. - 당신의 신용 상태를 유지하기 위해 만료 전에 이전 키로 새 키에 서명하십시오. - - - - - - - - - - - 보안 쉘 키 생성 - 보안 쉘 (SSH)은 원격 컴퓨터에 로그인하고 해당 컴퓨터에서 명령을 실행하는 방법입니다. SSH 키는 키 기반의 인증 시스템이며 기본 암호 인증 시스템의 대용으로 사용됩니다. 키 기반 인증에서는 인증하기 위해 암호를 수동으로 입력할 필요가 없습니다. - 보안 쉘 키는 2 개의 키로 구성됩니다 : 비밀키는 비밀로 유지되어야하며, 공개키는 액세스해야하는 모든 컴퓨터에 업로드될 수 있습니다. - 보안 쉘 키를 생성하려면 : - - - 파일신규 ...를 선택 - - - 보안 쉘 키를 선택하고 계속을 클릭 - - - 키가 무엇을 위해 사용되는지 설명을 입력하십시오. 이메일 주소 혹은 다른 기억 수단을 사용할 수 있습니다. 열쇠에 대한 확장 옵션을 지정할 수 있습니다 : 아래 참조 - - - 새 키를 생성하기 위해 키 생성 또는 키를 생성하고 인증을 위해 그 열쇠를 사용하는 다른 컴퓨터를 설정하기위해 생성 및 설정을 클릭하십시오. - - - 새 보안 쉘 키를위한 암호 대화 상자가 열립니다. 새 키의 암호를 두 번 입력하십시오. - - 암호를 생성할 때 강력한 암호 생성과 같은 관행을 사용합시다. 암호와 암호는 공백이 암호에서는 유효한 문자로있는 것이 큰 차이입니다. - - - - - - - - 확장 옵션 - 고급 옵션을 확장하여 새 키에 대한 다음 옵션을 지정합니다 : - - - - 암호화 유형 - - 이 필드는 키를 생성하는 데 사용할 암호화 알고리즘을 지정합니다. - - - RSA - - SSH 키를 생성하기 위해 Rivest - ShamirAdleman (RSA) 알고리즘을 사용합니다. 이것은 바람직하며 더 안전한 선택입니다. - - - - DSA - - SSH 키를 생성하기 위해 Digital Signature Algorithm (DSA)를 사용합니다. - - - - - - - 키의 길이 (비트) - - 이것은 비트 키 길이입니다. 강한 암호를 사용하면, 키의 길이가 길수록 더 안전합니다. 그러나 긴 키를 사용하여 모든 작업은 짧은 키의 조작보다 더 많은 시간을 필요로합니다. 허용 가능한 값은 1024에서 4096 비트 사이입니다. 최소 2048 비트를 권장합니다. - - - - - - - - - - OpenPGP 키 속성 - 이 절의 내용은 모든 OpenPGP 키에 적용됩니다. - - PGP 키 속성보기 방법 : - - 메인 창에서 PGP 키를 선택한 후, - - - 두 번 클릭하거나 도구 모음에서 속성를 선택하여, - - - Details탭을 선택합니다. - - - - - 속성 - - - - 지문 - - 지문은 키를 정확하게 식별하는 고유 문자열입니다. - - - - 키 ID - - 키 ID는 지문과 비슷합니다. 그러나 키 ID는 지문의 마지막 8 문자만 포함합니다. 대부분의 경우 키 ID만으로 키를 확인할 수 있지만, 때때로 동일한 ID를 가진 열쇠가 있을지도 모릅니다. - - - - 타입 - - 키를 생성하기 위해 이용한 암호화 알고리즘을 나타냅니다. DSA 키는 서명에만 가능합니다. ElGamal 키는 암호화에 사용됩니다. - - - - 생성 - - 키가 생성된 날짜를 나타냅니다. - - - - 유효 기간 - - 키가 더 이상 사용할 수 없게되는 날짜를 나타냅니다. - - - - 강도 - - 키 길이를 비트 단위로 나타냅니다. 일반적으로 키의 길이가 길수록 더 안전합니다. - 긴 열쇠는 약한 암호의 사용을 보충하기 위하여 충분하지 않습니다. - - - - - - - - - 신용 - 신용은 믿음의 웹을 정확하게 펼치는 개인의 능력을 얼마나 확신하는지 나타냅니다. 당신이 서명하지 않은 키에 직면했을 때, 그 개인의 열쇠의 타당성은 모아진 서명과 그들의 서명을 만든 사람을 얼마나 신뢰하는가 여부에 따라 결정됩니다. 기본적으로 미지의 열쇠는 3 직전 신용 서명 또는 하나의 전체 신용 서명을 필요로하는 것입니다. - - 알 수 없음 : 정확하게 키를 서명하는 사람의 능력을 자세히 모릅니다. - 신용하지 않음 :이 사람은 제대로 키에 서명 수 없습니다. - 최대한 믿음 :이 사람은 키 서명하기 전에 사진이 부착된 신분증을 확인합니다, 하지만 면밀히 조사하지 않습니다. - 완전히 신뢰 :이 사람은 서명하기 전에 온갖 사람의 사진이 부착된 신분증을 면밀히 검사합니다. - 궁극의 신용 :이 신용도는 자신의 키에 할당된뿐입니다. - - - - - 키 활성화 및 비활성화 - 키가 활성화될 때는, 그 열쇠를 이용하여 암호화 작업을 수행할 수 있습니다. 키가 활성화되지 않을 때는, 그 열쇠를 이용하여 암호화하거나 서명을 확인하거나 할 수 없습니다. - - - - 유효 기간 - 키가 만료 된 이후에는 더 이상 키 작업 수행에 사용되지 않습니다. 키 만료 날짜를 미래 날짜로 변경하고 다시 활성화합니다. 일반적인 권장은 결코 만료되지 않는 한 개의 마스터 키와 마스터 키로 서명된 여러 하위 키가있는 것입니다. - - - - 사용자 ID - 사용자 ID는 여러 이름과 이메일 주소를 같은 키로 이용하는 것을 허용합니다. - 일반적으로 그들은 다음의 형식을 취합니다 : 이름 (키 설명) <이메일 주소> - - - 사용자 ID 추가 - 사용자 ID를 추가하는 것은 일을 위한 주소와 친구를위한 주소가 필요할 때 유용합니다. - 키에 사용자 ID를 추가하려면 : - - 메인 윈도우에서 키를 선택하십시오. - - - 두 번 클릭하거나 도구 모음에서 속성를 선택합니다. - - - 이름과 서명 탭을 선택하십시오. - - - 이름 추가를 클릭하십시오. - - - 위의 단계를 따른 후, 내용을 채우기 위해 대화 상자가 표시됩니다. 해당 항목은 다음과 같습니다. - - - 이름 - - 당신의 이름을 이 형식으로 입력하십시오 <이름> <성> 중간 이름이나 이니셜은 선택 사항입니다. - - - 이 항목에는 적어도 5 문자를 입력하지 않으면 안됩니다. - - - - - - 이메일 주소 - - 이메일 주소는 키 서버 및 기타 키 공급자에서 당신의 키를 찾기위한 것입니다. 계속하기 전에 그것이 정확하다는 것을 확인하십시오. - - - 이 형식이어야합니다 <사용자 이름>@<도메인 이름> - - - - - - 키 설명 - - 키 설명은 새 ID의 표시 이름에 임의의 추가 정보를 추가하기 위하여 이용할 수 있습니다. 이 정보는 키 서버에서 찾을 수 있습니다. - - - - - - - - 이미지 - 열쇠 소유자의 하나 이상의 사진을 포함할 수 있습니다. 이러한 이미지는 일반 사용자 ID와 같이 서명할 수 있습니다. 이미지는 JPEG 형식으로해야 하며, 240x288 픽셀보다 크지 않은 것을 권장합니다. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - 암호 변경 - 키에 할당된 암호를 변경하려면 : - - 메인 윈도우에서 키를 선택하십시오. - - - 두 번 클릭하거나 도구 모음에서 속성를 선택하여, - - - 암호 변경을 클릭하십시오. - - - 새 암호를 입력하고 OK를 클릭하십시오. - - - - 키 삭제 - 키를 키링에서 제거하려면 - - 메인 윈도우에서 키를 선택하십시오. - - - 키를 마우스 오른쪽 단추로 키 삭제를 선택하거나 편집키 삭제를 선택하십시오. - - - - 당신의 키, 신용하는 키 및 수집한 키를 삭제할 수 있습니다. - - - - - - - - OpenPGP 하위 키 속성 - 각 OpenPGP 키는 서명에만 사용되는 단일의 주요 키를 가지고 있습니다. 하위 키는 암호화 및 서명에 사용됩니다. 이 방법은 하위 키가 위험에 노출되는 경우에는 기본 키를 해지할 필요가 없습니다. - - - ID - - 이것은 하위 키 식별자입니다. - - - - 타입 - - 하위 키를 생성하는 데 사용하는 암호화 알고리즘을 지정합니다. DSA 키는 서명 가능하며, RSA 키는 서명 또는 암호화에 사용할 수 있지만, ElGamal 키는 암호화에만 사용할 수 있습니다. - - - - 생성 - - 키가 생성된 날짜를 나타냅니다. - - - - 유효 기간 - - 키가 더 이상 사용할 수 없게되는 날짜를 나타냅니다. - - - - 상태 - - 이 키의 상태를 나타냅니다. - - - - 강도 - - 키 길이를 비트 단위로 나타냅니다. 일반적으로 키의 길이가 길수록 더 안전합니다. - 긴 열쇠는 약한 암호의 사용을 보충하기 위하여 충분하지 않습니다. - - - - - - - 하위 키 추가 - 하위 키를 추가하려면 하위 키 섹션에서 추가 버튼을 클릭하십시오. - 위의 단계를 따른 후, 내용을 채우기 위해 대화 상자가 표시됩니다. 해당 항목은 다음과 같습니다. - - - 키 유형 - - 하위 키를 생성하는 데 사용하는 암호화 알고리즘을 지정합니다. - - - DSA - - Digital Signature Algorithm (DSA)를 사용하여 하위 키를 생성합니다. 이 하위 키는 서명에만 가능합니다. - - - - ElGamal - - ElGamal 알고리즘을 사용하여 하위 키를 생성합니다. 이 하위 키는 암호 화만 가능합니다. - - - - RSA - - Rivest - Shamir Adleman (RSA) 알고리즘을 사용하여 하위 키를 생성합니다. 이 하위 키는 서명 또는 암호화에 사용할 수 있지만 두 개의 다른 하위 키를 생성해야 합니다. - - - - - - - 키 길이 - - 키 길이를 비트 단위로 나타냅니다. 일반적으로 더 긴 열쇠는보다 안전합니다. - - - - 유효 기간 - - 키가 더 이상 사용할 수 없게되는 날짜입니다. - - - - - - - 하위 키의 유효 기간 변경 - 하위 키의 유효 기간을 변경하려면 하위 키 섹션에서 하위 키를 선택 한 다음 : - - 왼쪽에있는 만료 버튼을 클릭하십시오. - - - 날짜 대화 상자에서 새 만료 날짜를 선택하거나 유효 기간이 필요하지 않은 경우 만료 날짜를 설정하지 않음을 선택하십시오. - - - - - - 하위 키 삭제 - 하위 키를 해지하려면 하위 키 섹션에서 하위 키를 선택 한 다음 : - - 왼쪽에있는 해지 버튼을 클릭하십시오. - - - 하위 키의 해지 이유 선택 : - - - - 이유 없음 - - 열쇠를 해지하는 특별한 이유가 없습니다. - - - - 누설됨 - - 키가 누설되었습니다. - - - - 해지됨 - - 이 키는 다른 키로 대체되었습니다. - - - - 미사용 - - 이 키는 더 이상 사용되지 않습니다. - - - - - - - 왜 키를 해지하는지 설명을 입력하십시오. - - - 해지를 클릭하십시오. - - - - 하위 키는 즉시 해지됩니다. - - - - - 하위 키 삭제 - 하위 키를 삭제하려면 하위 키 섹션에서 하위 키를 선택 한 다음 : - - 왼쪽에 있는 삭제 버튼을 클릭하십시오. - - - - - - - - - 보안 쉘 키 속성 - 이 절의 내용은 모든 SSH 키에 적용됩니다. - SSH 키 속성보기 방법 : - - 메인 창에서 보안 쉘 키를 선택하십시오. - - - 두 번 클릭하거나 도구 모음에서 속성를 선택하여, - - - Details탭을 선택합니다. - - - - - 속성 - - - - 지문 - - 지문은 키를 정확하게 식별하는 고유 문자열입니다. - - - - 알고리즘 - - 키를 생성하는 데 사용되는 암호화 알고리즘을 식별합니다. - - - - 위치 - - 이것은 비밀키가 저장된 위치입니다. - - - - 강도 - - 키 길이를 비트 단위로 나타냅니다. 일반적으로 키의 길이가 길수록 더 안전합니다. - 긴 열쇠는 약한 암호의 사용을 보충하기 위하여 충분하지 않습니다. - - - - - - - - - 보안 쉘 키 삭제 - 보안 쉘 키를 삭제하려면 - - 메인 창에서 SSH 키를 선택하십시오. - - - 그 후에 마우스 오른쪽 단추로 삭제를 선택하거나 편집삭제를 선택하십시오. - - - - - - - - - 키 가져오기 - 키를 가져오려면, 파일가져오기를 선택하고 파일 선택 대화 상자에서 하나 이상의 ASCII 형식화된 공개키를 포함한 파일을 선택합니다. - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - 텍스트 ASCII 형식화된 공개키 블록을 선택하십시오. - - - 클립 보드에 복사하십시오. - - - 편집붙여넣기를 선택하십시오. - - - - - - - - - 키 내보내기 - 키를 내보내려면 메인 윈도우에서 키를 선택하고 파일 내보내기를 선택하십시오. - ASCII 형식화된 텍스트 블록으로 클립 보드에 키를 내보내기 수 있습니다 : - - 메인 윈도우의 키를 선택하십시오. - - - 편집키 복사를 선택하십시오. - - - - - - - - - 키 서명 - 다른 사람의 키에 서명한다는 것은 그 사람에게 신용을 주는 것을 의미합니다. 키에 서명하기 전에 정말 그 사람이 소유하는 키인지 확인하기 위해 키 지문을 주의깊게 검사하십시오. - 키링에 있는 키에 서명하려면 - - 신용하는 키또는수집한 다른 키 탭에서 서명하고 싶은 키를 선택하십시오. - - - 도구 모음 서명 또는 파일서명을 선택하십시오. - - - 매우 꼼꼼하게 체크한 그 키 하나를 선택하십시오. - - - 그 키를 당신의 키링에 고정할지 당신의 서명을 해지할 수 있는지 여부를 나타냅니다. - - - 서명을 클릭합니다. - - - - - - - - 설정 - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - 키링의 패스워드 - - 키링 만들기 - 새로운 키링을 만들려면 메뉴에서 파일새로 만들기를 선택하고 키링의 패스워드를 선택 하십시오. 새 키링 이름을 입력하고 엔터 키를 누릅니다. - - - 키링 암호 변경 - 키링 해제 암호를 변경하려면 먼저 적절한 열쇠 고리를 선택하고 비밀 번호 변경 버튼을 누르십시오. 이전 암호 입력란에 이전 암호를 입력하고 새 암호 입력란에 새 암호를 입력하고 암호 확인 입력란에 새 암호 확인 메시지가 표시됩니다. 설정을 적용하려면 변경를 누르십시오. 이전 암호가 맞으면 작업의 성공을 나타내는 상태 메시지를 얻을 것입니다. 이전 암호가 올바르지 않으면 그 유효성을 확인하도록 요청합니다. - - - 키링 삭제 - 키링을 제거하려면 먼저 적절한 키링을 선택하고 메뉴에서 편집 삭제를 선택하십시오. - - - - - 키 서버 - 원격 키 서버와 정기적으로 키를 동기화하여 당신과 다른 사람의 키를 최신 상태로 유지하십시오. 동기화는 당신이 모든 키에 대한 최신 서명이 있는지 확인하고 신용 웹을 가장 도움이 될 것입니다. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKP 서버 - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP 키 서버 - - LDAP 키 서버는 흔하지는 않지만 표준 LDAP 프로토콜을 이용한 키 서버입니다. ldap://keyserver.pgp.com은 좋은 LDAP 서버입니다. - - - - - - - 키 공유 - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - 버그의 보고와 이 응용 프로그램 이나 이 설명서에 대한 제안을 하려면 Feedback section of the GNOME User Guide에 따르십시오. - 이 프로그램은 Free Software Foundation에 의해 발행된 GNU General Public license 조건 하에서 배포되고 있습니다; 라이센스 버전 2 또는 그 이후의 (모든) 버전입니다. 이 문서는 이 라이센스의 복사본이 포함되어 있습니다; 외에 이 프로그램의 소스 코드에 포함된 COPYING이라는 파일을 볼 수 있습니다. - -
diff -Nru seahorse-3.2.2/help/Makefile.am seahorse-3.6.3/help/Makefile.am --- seahorse-3.2.2/help/Makefile.am 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/help/Makefile.am 2012-09-18 13:11:21.000000000 +0200 @@ -1,10 +1,12 @@ -include $(top_srcdir)/gnome-doc-utils.make -dist-hook: doc-dist-hook +@YELP_HELP_RULES@ -DOC_MODULE = seahorse -DOC_ENTITIES = legal.xml -DOC_INCLUDES = -DOC_FIGURES = \ +HELP_ID = seahorse + +HELP_FILES = \ + index.docbook \ + legal.xml + +HELP_MEDIA = \ figures/seahorse-window.png -DOC_LINGUAS = ca cs de el en_GB es eu fr gl it ja ko oc ru sl sv vi zh_CN +HELP_LINGUAS = ca cs de el en_GB es eu fr gl it ja ko oc ru sl sv vi zh_CN diff -Nru seahorse-3.2.2/help/Makefile.in seahorse-3.6.3/help/Makefile.in --- seahorse-3.2.2/help/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/help/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -14,31 +13,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# gnome-doc-utils.make - make magic for building documentation -# Copyright (C) 2004-2005 Shaun McCance -# -# 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. -# -# 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. - -################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,29 +49,40 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make ChangeLog subdir = help +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -105,9 +108,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -122,15 +123,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -149,10 +146,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -170,7 +174,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -205,6 +208,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -240,6 +244,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -259,127 +265,19 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) -_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) -_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ - $(filter $(LINGUAS),$(DOC_LINGUAS)), \ - $(DOC_LINGUAS)) - -_DOC_ABS_SRCDIR = @abs_srcdir@ -_xml2po_mode = $(if $(DOC_ID),mallard,docbook) -@ENABLE_SK_TRUE@_ENABLE_SK = true - -################################################################################ -db2omf_args = \ - --stringparam db2omf.basename $(DOC_MODULE) \ - --stringparam db2omf.format $(3) \ - --stringparam db2omf.dtd \ - $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ - | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ - --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ - --stringparam db2omf.omf_dir "$(OMF_DIR)" \ - --stringparam db2omf.help_dir "$(HELP_DIR)" \ - --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ - $(if $(_ENABLE_SK), \ - --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ - $(_db2omf) $(2) - -_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) -_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) - -_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) - - -# FIXME -_DOC_OMF_ALL = \ - $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ - $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) - - -################################################################################ -_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_PAGES) $(_DOC_C_MODULE) - -_DOC_C_DOCS_NOENT = \ - $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ - $(_DOC_C_PAGES) - -_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ - $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) - - -# FIXME: probably have to shell escape to determine the file names -_DOC_C_HTML = $(foreach f, \ - $(shell xsltproc --xinclude \ - --stringparam db.chunk.basename "$(DOC_MODULE)" \ - $(_chunks) "C/$(DOC_MODULE).xml"), \ - C/$(f).xhtml) - - -############################################################################### -_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) - -_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) -_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)) )) - - -# FIXME: probably have to shell escape to determine the file names -_DOC_LC_HTML = \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ - $(lc)/$(notdir $(doc)) )) - -_DOC_LC_DOCS = \ - $(_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), \ - $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) - -_DOC_SRC_FIGURES = \ - $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ - $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) - -_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) - -################################################################################ -_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ - $(_DOC_C_HTML) $(_DOC_LC_HTML)) - -_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) -_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)$(DOC_ID),clean-doc-dir) -_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) -DOC_MODULE = seahorse -DOC_ENTITIES = legal.xml -DOC_INCLUDES = -DOC_FIGURES = \ +HELP_ID = seahorse +HELP_FILES = \ + index.docbook \ + legal.xml + +HELP_MEDIA = \ figures/seahorse-window.png -DOC_LINGUAS = ca cs de el en_GB es eu fr gl it ja ko oc ru sl sv vi zh_CN +HELP_LINGUAS = ca cs de el en_GB es eu fr gl it ja ko oc ru sl sv vi zh_CN all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -388,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/Makefile + $(AUTOMAKE) --foreign help/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -421,6 +319,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -452,9 +352,6 @@ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook check-am: all-am check: check-am all-am: Makefile @@ -469,10 +366,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -486,11 +388,11 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-local mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-local +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -504,7 +406,7 @@ info-am: -install-data-am: install-data-local +install-data-am: install-dvi: install-dvi-am @@ -534,13 +436,11 @@ maintainer-clean: maintainer-clean-am -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local +maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic mostlyclean-libtool \ - mostlyclean-local +mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-am @@ -550,439 +450,22 @@ ps-am: -uninstall-am: uninstall-local +uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local dist-hook distclean distclean-generic \ - distclean-libtool distclean-local distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ + distclean distclean-generic distclean-libtool 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 maintainer-clean-local mostlyclean \ - mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-local - - -DOC_H_FILE ?= - -DOC_H_DOCS ?= - -$(DOC_H_FILE): $(DOC_H_DOCS); - @rm -f $@.tmp; touch $@.tmp; - echo 'const gchar* documentation_credits[] = {' >> $@.tmp - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ - xsltproc --path "$$xmlpath" $(_credits) $$doc; \ - done | sort | uniq \ - | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ - | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp - echo ' NULL' >> $@.tmp - echo '};' >> $@.tmp - echo >> $@.tmp - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ - docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ - echo $$xmlpath; \ - ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ - for id in $$ids; do \ - echo '#define HELP_'`echo $$docid`'_'`echo $$id \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ - done; \ - echo >> $@.tmp; \ - done; - cp $@.tmp $@ && rm -f $@.tmp - -dist-check-gdu: -@HAVE_GNOME_DOC_UTILS_FALSE@ @echo "*** GNOME Doc Utils must be installed in order to make dist" -@HAVE_GNOME_DOC_UTILS_FALSE@ @false - -.PHONY: dist-doc-header -dist-doc-header: $(DOC_H_FILE) - @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ - $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; - -doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) - -.PHONY: clean-doc-header -clean-local: $(_clean_doc_header) -distclean-local: $(_clean_doc_header) -mostlyclean-local: $(_clean_doc_header) -maintainer-clean-local: $(_clean_doc_header) -clean-doc-header: - rm -f $(DOC_H_FILE) - -all: $(DOC_H_FILE) - -################################################################################ - -DOC_MODULE ?= - -DOC_ID ?= - -DOC_PAGES ?= - -DOC_ENTITIES ?= - -DOC_INCLUDES ?= - -DOC_FIGURES ?= - -DOC_FORMATS ?= docbook - -DOC_LINGUAS ?= - -################################################################################ - -_xml2po ?= `which xml2po` - -_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 ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl -@ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` -@ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` -@ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml - -$(_DOC_OMF_DB) : $(_DOC_OMF_IN) -$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml - @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ - echo "The file '$(_skcontentslist)' does not exist." >&2; \ - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } - -$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) -$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml -@ENABLE_SK_TRUE@ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ -@ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ -@ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ -@ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } - -.PHONY: omf -omf: $(_DOC_OMF_ALL) - -.PHONY: po -po: $(_DOC_POFILES) - -.PHONY: mo -mo: $(_DOC_MOFILES) - -$(_DOC_POFILES): - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - @if test ! -f $@ -a -f $(srcdir)/$@; then \ - echo "cp $(srcdir)/$@ $@"; \ - cp "$(srcdir)/$@" "$@"; \ - fi; - @docs=; \ - list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ - docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ - done; \ - if ! test -f $@; then \ - echo "(cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ - (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ - else \ - echo "(cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ - (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ - fi - -$(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< - -# FIXME: fix the dependancy -# FIXME: hook xml2po up -$(_DOC_LC_DOCS) : $(_DOC_MOFILES) -$(_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; \ - mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ - if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ - (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ - "$${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) -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,$@) - -################################################################################ - -all: \ - $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ - $(_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) -clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) -clean-doc-lc: - rm -f $(_DOC_LC_DOCS) - rm -f $(_DOC_MOFILES) - @list='$(_DOC_POFILES)'; for po in $$list; do \ - if ! test "$$po" -ef "$(srcdir)/$$po"; then \ - echo "rm -f $$po"; \ - rm -f "$$po"; \ - fi; \ - done -# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x - @for lc in C $(_DOC_REAL_LINGUAS); do \ - if test -f "$$lc/.xml2po.mo"; then \ - echo "rm -f $$lc/.xml2po.mo"; \ - rm -f "$$lc/.xml2po.mo"; \ - fi; \ - done -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 \ - echo "rmdir $$dir"; \ - rmdir "$$dir"; \ - fi; \ - done; \ - done - -clean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -distclean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -mostlyclean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -maintainer-clean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) - -################################################################################ - -.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) - -dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) - @for lc in C $(_DOC_REAL_LINGUAS); do \ - echo " $(mkinstalldirs) $(distdir)/$$lc"; \ - $(mkinstalldirs) "$(distdir)/$$lc"; \ - done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ - for doc in $$list; do \ - if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ - docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - if ! test -d "$(distdir)/$$docdir"; then \ - echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ - $(mkinstalldirs) "$(distdir)/$$docdir"; \ - fi; \ - echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ - $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ - done - -dist-doc-figs: $(_DOC_SRC_FIGURES) - @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ - for fig in $$list; do \ - if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$fig"; then \ - figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - if ! test -d "$(distdir)/$$figdir"; then \ - echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ - $(mkinstalldirs) "$(distdir)/$$figdir"; \ - fi; \ - echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ - $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ - fi; \ - done; - -dist-doc-omf: - @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ - $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" - -dist-doc-dsk: - @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ - 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) - @for lc in C $(_DOC_REAL_LINGUAS); do \ - if test -f "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ - 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)$(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) -# $(if $(_DOC_DSK_IN),install-doc-dsk) - -install-doc-docs: - @for lc in C $(_DOC_REAL_LINGUAS); do \ - 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_install_dir)/$$docdir"; \ - if ! test -d "$$docdir"; then \ - echo "$(mkinstalldirs) $$docdir"; \ - $(mkinstalldirs) "$$docdir"; \ - fi; \ - 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"; \ - else \ - figsymlink=true; \ - fi; \ - figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - 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/^.*\///'`; \ - 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 - -install-doc-html: - echo install-html + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am -install-doc-omf: - $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) - @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - 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_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)$(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) -# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) - -uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ - 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_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_install_dir)/$$omf"; \ - scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ - fi; \ - 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 +@YELP_HELP_RULES@ # 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. diff -Nru seahorse-3.2.2/help/oc/index.docbook seahorse-3.6.3/help/oc/index.docbook --- seahorse-3.2.2/help/oc/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/oc/index.docbook 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,1493 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Projècte Seahorse + + + + + 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. + + 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. + + + + 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. + + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Projècte Seahorse + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Feedback + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introduccion + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Per començar + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Menut Applications + + Choose + + Accessories + Password and Keys + . + + + + Linha de comanda + + + Type seahorse then press Return. + + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Barra de menuts + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Barra d'espleches + + Use the toolbar to quickly access commonly-used commands. + + + Keys and Passwords Tabs + + Provides access to the keys and passwords in the keyring. + + + First time options + + Provides fast access to useful actions for first time users. From here you can: + + + Explorar lo sistèma d'ajuda + + + Import keys in the keyring, + + + Crear de claus novèlas. + + + + + + + + + + + + Creating OpenPGP Keys + + OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key + cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys + and certificates for exchanging public keys. + + + Public key cryptography is a concept which involves the use of two keys: + a public key, that you can give to anyone with whom + you would like to communicate, and a private key which is + private and must be kept secret. + + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + + Use similar practices to generating a strong password when choosing a + passphrase. The main difference between a password and a passphrase is that, + in a passphrase, spaces are valid characters. + + + + + Opcions avançadas + + Expand the Advanced key options + section to specify the following options for a new key: + + + + Encryption Type + + + This field specifies the encryption algorithms used + to generate your keys. + + + + DSA ElGamal + + + This is the suggested choice as it will allow + you to encrypt, decrypt, sign and verify as needed. + + + + + DSA + + + Will allow signing only. + + + + + RSA + + + Will allow signing only. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. The longer the key, + the more secure it will be, provided a strong passphrase is + used. Conversely, performing any operation with a longer key + will require more time than it would with a shorter key. Acceptable + values are between 1024 and 4096 bits. At least 2048 bits is recommended. + + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Creating Secure Shell Keys + + Secure Shell (SSH) is a way of logging into a remote computer to execute commands + on that machine. + SSH keys are used in key-based authentication system, as an alternative to the default password + authentication system. + With key-based authentication there is no need to manually type a password to authenticate. + + + Secure Shell keys are made of two keys: a private key, that must be kept secret, + and a public key which can be uploaded to any computer you need to access. + + + To create a Secure Shell key: + + + + Choose FileNew... + + + Select Secure Shell Key and click Continue + + + Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. + + + Click Just Create Key to + create the new key, or Create and Set Up + to create the key and set up another computer to use it for authentication. + + + The Passphrase for New Secure Shell Key + dialog opens. + Enter the passphrase twice for your new key. + + + + Use similar practices to generating a + strong password when choosing a + passphrase. The main difference between a + password and a passphrase is that, in a + passphrase, spaces are valid characters. + + + + + + + + + Opcions avançadas + + Expand the Advanced key options section to specify the following options for a new key: + + + + + Encryption Type + + + This field specifies the encryption + algorithms used to generate your key. + + + + RSA + + + Use the Rivest-ShamirAdleman + (RSA) algorithm to create the SSH key. + This is the preferred and more secure choice. + + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the SSH key. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. + The longer the key, the more secure it + will be, provided a strong passphrase is + used. Conversely, performing any + operation with a longer key will require + more time than it would with a shorter + key. Acceptable values are between 1024 + and 4096 bits. At least 2048 bits is recommended. + + + + + + + + + + + OpenPGP Key Properties + + The descriptions in this section apply to all OpenPGP keys. + + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Propietats + + + + Fingerprint + + The fingerprint is a unique string of characters that exactly identifies a key. + + + + KeyID + + + The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 + characters of the fingerprint. Most of the time it is possible to identify a key with + only the KeyID, but occasionally two keys may have the same ID. + + + + + Type + + + Specifies the encryption algorithm used to generate a key. DSA keys can only sign. + ElGamal keys are used to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Trust + + Trust is an indication of how sure you are of a person's ability to correctly extend + the web of trust. When you are faced with a key you have not signed, the validity of + that person's key will be determined based on the signatures they have collected and + how well or not you trust the people who have made those signatures. By default, an + unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. + + + + Unknown: You are not familiar with the person's ability to sign keys correctly. + + + Never: This person cannot correctly sign keys. + + + Marginal: This person checks for photo ID before signing a key, but + does not necessarily scrutinize the IDs. + + + Full: This person scrutinizes each and every person's photo IDs before + signing them (e.g. they only sign keys that truely belong to the person asking for the signature). + + + Ultimate: This level of trust should only be assigned to your own keys. + + + + + + Activar e desactivar de claus + + When a key is enabled, it can be used to perform encryption operations. + When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. + + + + + Expiration Date + + A key can no longer be used to perform key operations after it has expired. Changing a + key's expiration date to a point in the future re-enables it. A good general practice + would be to have a master key that never expires and multiple subkeys that do and are + signed by the master key. + + + + + User IDs + + User IDs allow multiple identities and email addresses to + be used with the same key. + + + They usually take the form of: + Name (comment) <email address> + + + + Adding a User ID + + Adding a user ID is useful when you want to have + an identity for your job and one for your friends. + + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + + You must enter at least 5 characters in this field. + + + + + + + Email Address + + + Your email address is how most + people will locate your key on a + key server or other key provider. + Make sure it is correct before + continuing. + + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + + The comment field can be used to + place any additional information + into the displayed name of your new + ID. This information can be + searched for on key servers. + + + + + + + + + Photo IDs + + Photo IDs allow a key owner to embed one or more pictures of themselves in a key. + These identities can be signed just like normal user IDs. A photo ID must be in JPEG + format and is recommended to be no larger than 240x288 pixels. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Changing the Passphrase + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + + Enter the new passphrase and click OK. + + + + + Suprimir una clau + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + + You can delete your keys, trusted keys and collected keys. + + + + + + + + + OpenPGP Subkey Properties + + Each OpenPGP key has a single master key used + to sign only. Subkeys are used to encrypt and + to sign as well. In this way, if your sub key is + compromised, you don't need to revoke your master key. + + + + ID + + + This is the identifier of the subkey. + + + + + Type + + + Specifies the encryption algorithm used to generate a subkey. + DSA keys can only sign, ElGamal + keys are used to encrypt while RSA keys are + used to sign or to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Status + + + Indicates the status of the key. + + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Adding a Subkey + + To add a subkey to a key, from the Subkeys + section click on Add button. + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Tipe de clau + + + Specifies the encryption algorithm used to generate a subkey. + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the subkey. + This subkey can sign only. + + + + + ElGamal + + + Use the ElGamal algorithm to create the subkey. + This subkey can encrypt only. + + + + + RSA + + + Use the Rivest-Shamir Adleman (RSA) + algorithm to create the subkey. This subkey can be used to sign or encrypt, + but you have to create two different subkeys. + + + + + + + + Longor de clau + + + Indicates the length in bits of the subkey. + In general the longer the key, the more security it provides. + + + + + Expiration Date + + + Indicates the date the subkey can no longer be used. + + + + + + + + Changing a Subkey Expiration Date + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Revoking a Subkey + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + + The effect of revoking a subkey is immediate. + + + + + + Deleting a Subkey + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Secure Shell Key Properties + + The descriptions in this section apply to all SSH keys. + + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Propietats + + + + Fingerprint + + + The fingerprint is a unique string of + characters that exactly identifies a key. + + + + + Algorithm + + + Specifies the encryption algorithm used to + generate a key. + + + + + Location + + + This is the location where the + private key + has been stored. + + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Deleting a Secure Shell Key + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importacion de claus + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exporting Keys + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Signing a Key + + Signing another person's key means you are giving trust to that person. + Before signing a key, you have to carefully check the key's fingerprint + to be sure that the key really belongs to that person. + + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Preferéncias + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + + To change the unlock password of the keyring, first select the appropriate keyring and then + press Change Unlock Password button. You will then be prompted to + type the old password in the Old password text box, the new password in the + New password text box and + confirm it in the Confirm password text box. + To apply the settings, press Change. + If the old password is correct, you will get a status + message indicating the success of the operation. If the + old password is not correct you will be asked to check + its correctness. + + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Servidors de clau + + Keep your and other's keys up to date by syncing keys periodically with + remote keyservers. Syncing will make sure that you have the latest + signatures made on all of your keys so that the web of trust will be the + most useful. + + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + + LDAP keyservers are less common, but use the standard LDAP + protocol to serve keys. + ldap://keyserver.pgp.com is a good LDAP + server. + + + + + + + + Key Sharing + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/oc/legal.xml seahorse-3.6.3/help/oc/legal.xml --- seahorse-3.2.2/help/oc/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/oc/legal.xml 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,75 @@ + + + + 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. + + 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. + + + + 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. + + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/oc/seahorse.xml seahorse-3.6.3/help/oc/seahorse.xml --- seahorse-3.2.2/help/oc/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/oc/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1450 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins e Adam Schreiber - - - Projècte Seahorse - - - - - 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. - - 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. - - - - 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. - - - - 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. - - - - - - - - - - Jacob - Perkins - - Projècte Seahorse - - - - - Adam - Schreiber - - Projècte Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Projècte Seahorse - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - August 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - Novembre de 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - Julhet de 2005 - - Adam Schreiber sadam@clemson.edu - Projècte Seahorse - - - - Passwords and Keys Manual V0.7.0 - Febrièr de 2003 - - Jacob Perkins - Projècte Seahorse - - - - This manual describes version 2.28.x of Passwords and Keys - - Feedback - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Encryption Keys - - - - - - Introduccion - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Create and manage PGP and SSH keys, - - - Export and import PGP and SSH keys, - - - Partejar vòstras claus amb d'autres, - - - - - - - - - Per començar - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Menut Applications - - Choose - - Accessories - Password and Keys - . - - - - Linha de comanda - - - Type seahorse then press Return. - - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Visualizar la Passwords and Keys fenèstra. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Barra de menuts - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Barra d'espleches - - Use the toolbar to quickly access commonly-used commands. - - - Keys and Passwords Tabs - - Provides access to the keys and passwords in the keyring. - - - First time options - - Provides fast access to useful actions for first time users. From here you can: - - - Explorar lo sistèma d'ajuda - - - Import keys in the keyring, - - - Crear de claus novèlas. - - - - - - - - - - - - Creating OpenPGP Keys - - OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key - cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys - and certificates for exchanging public keys. - - - Public key cryptography is a concept which involves the use of two keys: - a public key, that you can give to anyone with whom - you would like to communicate, and a private key which is - private and must be kept secret. - - - To create OpenPGP keys: - - - - Choose FileNew... - - - - - Select PGP Key and click Continue - - - - - Enter your full name (first - last), your e-mail address and any additional information. - You can also specify advanced options for the key: see below. - - - - - Click Create to create the new key pair. - - - - - The Passphrase for New PGP Key dialog will open. - Enter the passphrase twice for your new key. - - - - - - - Use similar practices to generating a strong password when choosing a - passphrase. The main difference between a password and a passphrase is that, - in a passphrase, spaces are valid characters. - - - - - Opcions avançadas - - Expand the Advanced key options - section to specify the following options for a new key: - - - - Encryption Type - - - This field specifies the encryption algorithms used - to generate your keys. - - - - DSA ElGamal - - - This is the suggested choice as it will allow - you to encrypt, decrypt, sign and verify as needed. - - - - - DSA - - - Will allow signing only. - - - - - RSA - - - Will allow signing only. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. The longer the key, - the more secure it will be, provided a strong passphrase is - used. Conversely, performing any operation with a longer key - will require more time than it would with a shorter key. Acceptable - values are between 1024 and 4096 bits. At least 2048 bits is recommended. - - - - - Expiration Date - - - This is the date at which the key will cease to be usable for - performing encryption or signing operations. 6 months is a reasonable time - to set it to. You will have to either change the - expiration date or generate a new key or subkey after this amount - of time passes. - - - Sign your new key with your old one before it expires - to preserve your trust status. - - - - - - - - - - - - - Creating Secure Shell Keys - - Secure Shell (SSH) is a way of logging into a remote computer to execute commands - on that machine. - SSH keys are used in key-based authentication system, as an alternative to the default password - authentication system. - With key-based authentication there is no need to manually type a password to authenticate. - - - Secure Shell keys are made of two keys: a private key, that must be kept secret, - and a public key which can be uploaded to any computer you need to access. - - - To create a Secure Shell key: - - - - Choose FileNew... - - - Select Secure Shell Key and click Continue - - - Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. - - - Click Just Create Key to - create the new key, or Create and Set Up - to create the key and set up another computer to use it for authentication. - - - The Passphrase for New Secure Shell Key - dialog opens. - Enter the passphrase twice for your new key. - - - - Use similar practices to generating a - strong password when choosing a - passphrase. The main difference between a - password and a passphrase is that, in a - passphrase, spaces are valid characters. - - - - - - - - - Opcions avançadas - - Expand the Advanced key options section to specify the following options for a new key: - - - - - Encryption Type - - - This field specifies the encryption - algorithms used to generate your key. - - - - RSA - - - Use the Rivest-ShamirAdleman - (RSA) algorithm to create the SSH key. - This is the preferred and more secure choice. - - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the SSH key. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. - The longer the key, the more secure it - will be, provided a strong passphrase is - used. Conversely, performing any - operation with a longer key will require - more time than it would with a shorter - key. Acceptable values are between 1024 - and 4096 bits. At least 2048 bits is recommended. - - - - - - - - - - - OpenPGP Key Properties - - The descriptions in this section apply to all OpenPGP keys. - - - - To view properties of a PGP key: - - - Selecciatz la clau PGP dins la fenèstra principala, - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Propietats - - - - Fingerprint - - The fingerprint is a unique string of characters that exactly identifies a key. - - - - KeyID - - - The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 - characters of the fingerprint. Most of the time it is possible to identify a key with - only the KeyID, but occasionally two keys may have the same ID. - - - - - Tipe - - - Specifies the encryption algorithm used to generate a key. DSA keys can only sign. - ElGamal keys are used to encrypt. - - - - - Creat - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Strength - - - Indicates the length in bits of a key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - - - Trust - - Trust is an indication of how sure you are of a person's ability to correctly extend - the web of trust. When you are faced with a key you have not signed, the validity of - that person's key will be determined based on the signatures they have collected and - how well or not you trust the people who have made those signatures. By default, an - unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. - - - - Unknown: You are not familiar with the person's ability to sign keys correctly. - - - Never: This person cannot correctly sign keys. - - - Marginal: This person checks for photo ID before signing a key, but - does not necessarily scrutinize the IDs. - - - Full: This person scrutinizes each and every person's photo IDs before - signing them (e.g. they only sign keys that truely belong to the person asking for the signature). - - - Ultimate: This level of trust should only be assigned to your own keys. - - - - - - Activar e desactivar de claus - - When a key is enabled, it can be used to perform encryption operations. - When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. - - - - - Expiration Date - - A key can no longer be used to perform key operations after it has expired. Changing a - key's expiration date to a point in the future re-enables it. A good general practice - would be to have a master key that never expires and multiple subkeys that do and are - signed by the master key. - - - - - User IDs - - User IDs allow multiple identities and email addresses to - be used with the same key. - - - They usually take the form of: - Name (comment) <email address> - - - - Adding a User ID - - Adding a user ID is useful when you want to have - an identity for your job and one for your friends. - - - To add a user ID to a key: - - - Seleccionatz la clau dins la fenèstra principala, - - - - Double click on it or choose Properties from the toolbar, - - - - - Select the Names and Signatures tab, - - - - Clicatz sus Apondre un nom. - - - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Nom complet - - - Enter your full name in the form - <first> <last> - A middle name or initial is optional. - - - - - You must enter at least 5 characters in this field. - - - - - - - Adreça electronica - - - Your email address is how most - people will locate your key on a - key server or other key provider. - Make sure it is correct before - continuing. - - - - - It should be of the form - <username>@<domainname> - - - - - - - Comentari de clau - - - The comment field can be used to - place any additional information - into the displayed name of your new - ID. This information can be - searched for on key servers. - - - - - - - - - Photo IDs - - Photo IDs allow a key owner to embed one or more pictures of themselves in a key. - These identities can be signed just like normal user IDs. A photo ID must be in JPEG - format and is recommended to be no larger than 240x288 pixels. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Changing the Passphrase - - To change the passphrase assigned to a key: - - - Seleccionatz la clau dins la fenèstra principala, - - - - Double click on it or choose Properties from the toolbar, - - - - - Click on Change Passphrase. - - - - - - Enter the new passphrase and click OK. - - - - - Suprimir una clau - - To delete a key from your keyring: - - - Seleccionatz la clau dins la fenèstra principala, - - - - Right click on it and choose Delete Key - or choose - - Edit - Delete Key - . - - - - - - - You can delete your keys, trusted keys and collected keys. - - - - - - - - - OpenPGP Subkey Properties - - Each OpenPGP key has a single master key used - to sign only. Subkeys are used to encrypt and - to sign as well. In this way, if your sub key is - compromised, you don't need to revoke your master key. - - - - ID - - - This is the identifier of the subkey. - - - - - Tipe - - - Specifies the encryption algorithm used to generate a subkey. - DSA keys can only sign, ElGamal - keys are used to encrypt while RSA keys are - used to sign or to encrypt. - - - - - Creat - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Estatut - - - Indicates the status of the key. - - - - - Strength - - - Indicates the length in bits of the key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - Adding a Subkey - - To add a subkey to a key, from the Subkeys - section click on Add button. - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Tipe de clau - - - Specifies the encryption algorithm used to generate a subkey. - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the subkey. - This subkey can sign only. - - - - - ElGamal - - - Use the ElGamal algorithm to create the subkey. - This subkey can encrypt only. - - - - - RSA - - - Use the Rivest-Shamir Adleman (RSA) - algorithm to create the subkey. This subkey can be used to sign or encrypt, - but you have to create two different subkeys. - - - - - - - - Longor de clau - - - Indicates the length in bits of the subkey. - In general the longer the key, the more security it provides. - - - - - Expiration Date - - - Indicates the date the subkey can no longer be used. - - - - - - - - Changing a Subkey Expiration Date - - To change a subkey expiration date, select - the subkey from the Subkeys - section, then: - - - - Click on the Expire button on the left, - - - - - From the date dialog choose the new expiration date or select - Never expires for no expiration date. - - - - - - - - Revoking a Subkey - - To revoke a subkey, select the subkey from the Subkeys - section, then: - - - - Click on the Revoke button on the left, - - - - - Choose a reason why to revoke the subkey: - - - - - No Reason - - - There isn't a specific reason to revoke the key. - - - - - Compromised - - - The key has been compromised. - - - - - Superseded - - - The key has been superseded by another one. - - - - - Not Used - - - The key is not used anymore. - - - - - - - - - Enter a description of why you are revoking the key, - - - - - Click on Revoke. - - - - - - - The effect of revoking a subkey is immediate. - - - - - - Deleting a Subkey - - To delete a subkey, select the subkey from the Subkeys - section, then: - - - Clicatz sul boton Suprimir a l'esquèrra. - - - - - - - - - - Secure Shell Key Properties - - The descriptions in this section apply to all SSH keys. - - - To view properties of a SSH key: - - - - Select the Secure Shell key - from the main window, - - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Propietats - - - - Fingerprint - - - The fingerprint is a unique string of - characters that exactly identifies a key. - - - - - Algorithm - - - Specifies the encryption algorithm used to - generate a key. - - - - - Emplaçament - - - This is the location where the - private key - has been stored. - - - - - Strength - - - Indicates the length in bits of a key. - In general the longer the key, the more - security it provides. - - - A long key is not enough to make up - for the use of a weak passphrase. - - - - - - - - - - - Deleting a Secure Shell Key - - To delete a Secure Shell key: - - - Seleccionatz la clau SSH dins la fenèstra principala, - - - - Right click on it and choose Delete key or choose - - Edit - Delete Key - . - - - - - - - - - - - Importacion de claus - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - - Select an ASCII armored public block of text, - - - - - Copy it to the clipboard, - - - - Causissètz EdicionPegar las claus. - - - - - - - - - Exporting Keys - - To export keys, select the keys in the main window - and choose - - File - Export - . - - - You can also export keys to the clipboard in an - ASCII armored block of text: - - - Seleccionatz las claus dins la fenèstra principala, - - - Causissètz EditCopiar las claus. - - - - - - - - - - Signing a Key - - Signing another person's key means you are giving trust to that person. - Before signing a key, you have to carefully check the key's fingerprint - to be sure that the key really belongs to that person. - - - To sign a key in your keyring: - - - - Select the key you want to sign from the - Trusted Keys or - Other Collected Keys tabs, - - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - - Select how carefully the key has been checked, - - - - - Indicate if the signature should be local to your keyring, - and if your signature can be revoked, - - - - - Click on Sign. - - - - - - - - - - Preferéncias - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - - To change the unlock password of the keyring, first select the appropriate keyring and then - press Change Unlock Password button. You will then be prompted to - type the old password in the Old password text box, the new password in the - New password text box and - confirm it in the Confirm password text box. - To apply the settings, press Change. - If the old password is correct, you will get a status - message indicating the success of the operation. If the - old password is not correct you will be asked to check - its correctness. - - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Servidors de clau - - Keep your and other's keys up to date by syncing keys periodically with - remote keyservers. Syncing will make sure that you have the latest - signatures made on all of your keys so that the web of trust will be the - most useful. - - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - Servidors HKP - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Keyservers - - - LDAP keyservers are less common, but use the standard LDAP - protocol to serve keys. - ldap://keyserver.pgp.com is a good LDAP - server. - - - - - - - - Key Sharing - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - - To report a bug or make a suggestion regarding this application or - this manual, follow the directions in the - Feedback section of the GNOME User Guide. - - - 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 - is included with this documentation; another can be found in the file - COPYING included with the source code of this program. - - -
diff -Nru seahorse-3.2.2/help/ru/index.docbook seahorse-3.6.3/help/ru/index.docbook --- seahorse-3.2.2/help/ru/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ru/index.docbook 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,1265 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Проект Seahorse + + + + + 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. + + Это руководство — часть документации GNOME, которая распространяется на условиях лицензии GFDL. Если вы хотите распространять это руководство отдельно от остальной документации, вам следует приложить к руководству копию лицензии, как описано в разделе 6 лицензии. + + Некоторые имена и марки используются компаниями для обозначения их продуктов и услуг и являются торговыми марками. Там, где эти имена присутствуют в документации и где участники проекта документирования GNOME знают об этом, имена выделяются заглавными буквами или начальной заглавной буквой. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Проект Seahorse + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Обратная связь + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Введение + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Начало работы + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Меню Приложения + + Choose + + Accessories + Password and Keys + . + + + + Командная строка + + Введите seahorse и нажмите Enter. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Строка меню + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Панель инструментов + + С помощью панели инструментов вы можете быстро обратиться к часто используемым командам. + + + Вкладки ключей и паролей + + Обеспечивают доступ к ключам и паролям в брелоке. + + + Первые шаги + + Позволяют быстро выполнить действия, полезные для начинающих пользователей. Отсюда вы можете: + + + просмотреть справку; + + + импортировать ключи в брелок; + + + создать новые ключи. + + + + + + + + + + + + Создание ключей OpenPGP + OpenPGP — это свободный протокол для шифрования электронной почты с помощью открытых ключей. Он основан на PGP. OpenPGP определяет стандартные виды зашифрованных сообщений, подписей, закрытых ключей, а также сертификатов для обмена открытыми ключами. + Криптография с открытым ключом — это система, в которой используется два ключа: открытый ключ, который вы можете отдавать всем, с кем хотите обмениваться информацией; и закрытый ключ, который должен храниться в тайне. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Постарайтесь придумать надёжный пароль. Обратите внимание, что в этом пароле вы можете использовать пробелы. + + + + Дополнительные параметры + Разверните раздел Дополнительные параметры ключа, чтобы указать следующие параметры ключа: + + + Encryption Type + + В этом поле указываются алгоритмы шифрования, с помощью которых создаются ключи. + + + DSA ElGamal + + Это рекомендуемый вариант. Он позволит вам зашифровывать, расшифровывать, подписывать и проверять. + + + + DSA + + Позволит вам только подписывать. + + + + RSA + + Позволит вам только подписывать. + + + + + + + Key Strength (bits) + + Это длина ключа в битах. Чем длиннее ключ, тем он будет надёжнее — при условии, что выбран хороший пароль. С другой стороны, чем длиннее ключ, тем больше времени уйдёт на выполнение всевозможных действий с его помощью. Допустимые значения — от 1024 до 4096 бит. Рекомендуется использовать не меньше 2048 бит. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Создание ключей SSH + SSH — это способ войти в удалённую компьютерную систему и выполнять на ней команды. В SSH есть система идентификации на основе ключей — это альтернатива обычной системе, основанной на паролях. При идентификации с помощью ключа нет нужды вручную вводить пароль. + Ключи SSH состоят из двух частей: закрытого ключа, который должен храниться в тайне, и открытого ключа, который можно загружать на любой компьютер, к которому вы желаете иметь доступ по SSH. + Чтобы создать ключ SSH: + + + Choose FileNew... + + + Выберите Ключ SSH и нажмите Продолжить. + + + Опишите цель, для которой будет использоваться ключ. Вы можете использовать свой электронный адрес или любые другие сведения, которые помогут вам вспомнить предназначение ключа. Также вы можете указать дополнительные параметры для ключа: смотрите ниже. + + + Нажмите Просто создать ключ, чтобы создать новый ключ; или Создать и установить, чтобы создать новый ключ и установить его на другом компьютере для идентификации. + + + Появится диалог Пароль для нового ключа SSH. Введите в нём дважды пароль для вашего нового ключа. + + Постарайтесь придумать надёжный пароль. Обратите внимание, что в этом пароле вы можете использовать пробелы. + + + + + + + + Дополнительные параметры + Разверните раздел Дополнительные параметры ключа, чтобы указать следующие параметры для нового ключа: + + + + Encryption Type + + В этом поле указываются алгоритмы шифрования, с помощью которых создаётся ключ. + + + RSA + + Использовать для создания ключа SSH алгоритм Rivest-ShamirAdleman (RSA). Это предпочтительный, наиболее надёжный вариант. + + + + DSA + + Использовать для создания ключа SSH алгоритм Digital Signature Algorithm (DSA). + + + + + + + Key Strength (bits) + + Это длина ключа в битах. Чем длиннее ключ, тем он будет надёжнее — при условии, что выбран хороший пароль. С другой стороны, чем длиннее ключ, тем больше времени уйдёт на выполнение всевозможных действий с его помощью. Допустимые значения — от 1024 до 4096 бит. Рекомендуется использовать не меньше 2048 бит. + + + + + + + + + + Свойства ключа OpenPGP + Изложенное в этом разделе касается всех ключей OpenPGP. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Свойства + + + + Fingerprint + + Отпечаток — это уникальная строка символов, которая точно обозначает ключ. + + + + KeyID + + Идентификатор ключа похож на его отпечаток. Однако идентификатор содержит только последние 8 символов отпечатка. Обычно можно обозначить ключ с помощью одного только идентификатора, но иногда у двух ключей бывает один и тот же идентификатор. + + + + Type + + Указывает алгоритм шифрования, с помощью которого был создан ключ. Ключи DSA позволяют только подписывать. Ключи ElGamal позволяют также и шифровать. + + + + Created + + Указывает дату создания ключа. + + + + Expires + + Указывает дату, начиная с которой ключ более нельзя будет использовать. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Доверие + Доверие — это показатель того, насколько вы уверены в способности человека правильно расширять сеть доверия. Когда встретится ключ, который вы не подписали, его достоверность будет определяться исходя из того, какие подписи собрал владелец этого ключа, и того, насколько вы доверяете авторам этих подписей. По умолчанию неизвестный ключ требует 3 подписи, которым вы слабо доверяете, или 1 подпись, который вы полностью доверяете. + + Неизвестно: Вы ничего не знаете о способности человека правильно подписывать ключи. + Не доверяю: Этот человек не может правильно подписывать ключи. + Слабо: Этот человек проверяет фотографию, прежде чем подписать ключ, но не всегда тщательно изучает документы. + Полностью: Этот человек тщательно проверяет документы и фотографию, прежде чем подписывать ключ. Иными словами, он подписывает только те ключи, которые действительно принадлежат тому, кто просит их подписать. + Безоговорочно: Этот уровень доверия следует назначать только вашим собственным ключам. + + + + + Включение и отключение ключей + Когда ключ включён, его можно использовать для шифрования. Когда ключ отключён, его нельзя использовать ни для шифрования, ни для проверки сделанных им подписей. + + + + Срок истечения + После того, как ключ истекает, его нельзя использовать для выполнения действий. Заново включить ключ можно, сменив его срок истечения на какую-нибудь дату в будущем. Хорошая практика — иметь один главный ключ, который никогда не истекает, и много подключей, которые истекают и подписаны главным ключом. + + + + Идентификаторы пользователей + Идентификаторы пользователей дают возможность применять с одним ключом несколько имён и электронных адресов. + + They usually take the form of: + Name (comment) <email address> + + + + Добавление идентификатора пользователя + Полезно добавить идентификатор пользователя, если вы хотите по-разному представляться на работе и друзьям. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + После того, как вы это сделаете, появится диалог, который нужно заполнить. Поля этого диалога описаны ниже. + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + В этом поле надо ввести хотя бы 5 символов. + + + + + + Email Address + + Большинство людей будут искать ваш ключ на сервере ключей по вашему электронному адресу. Убедитесь, что ввели его правильно, прежде чем продолжать. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + В поле комментария можно поместить любые дополнительные сведения. Они будут включены в отображаемое имя вашего нового идентификатора. Эти сведения можно искать на серверах ключей. + + + + + + + + Фотографии + Владелец ключа может внедрить в него одну или несколько своих фотографий. Эти фотографии могут быть подписаны, как и обычные идентификаторы пользователя. Фотография должна быть в формате JPEG. Желательно делать её не крупнее 240×288 пикселов. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Изменение пароля + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Введите новый пароль и нажмите OK. + + + + Удаление ключа + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + Вы можете удалять собственные ключи, доверяемые ключи и собранные ключи. + + + + + + + + Свойства подключей OpenPGP + У каждого ключа OpenPGP есть один главный ключ, который используется только для подписывания. Подключи применяются для шифрования и также для подписывания. Таким образом, если ваш подключ будет скомпрометирован, вам не понадобится отзывать свой главный ключ. + + + ID + + Это идентификатор подключа. + + + + Type + + Указывает алгоритм шифрования, с помощью которого был создан подключ. Ключи DSA позволяют только подписывать, ключи ElGamal — только шифровать, а ключи RSA — и подписывать, и шифровать. + + + + Created + + Указывает дату создания ключа. + + + + Expires + + Указывает дату, начиная с которой ключ более нельзя будет использовать. + + + + Status + + Указывает состояние ключа. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Добавление подключа + Чтобы добавить к ключу подключ, в разделе Подключи нажмите кнопку Добавить. + После того, как вы это сделаете, появится диалог, который нужно заполнить. Поля этого диалога описаны ниже. + + + Тип ключа + + Указывает алгоритм шифрования, с помощью которого создаётся подключ. + + + DSA + + Использовать алгоритм Digital Signature Algorithm (DSA) для создания подключа. Такой подключ сможет только подписывать. + + + + ElGamal + + Использовать алгоритм ElGamal для создания подключа. Такой подключ сможет только шифровать. + + + + RSA + + Использовать алгоритм Rivest-Shamir Adleman (RSA) для создания подключа. Такой подключ может как подписывать, так и шифровать, но вам придётся создать два разных подключа. + + + + + + + Длина ключа + + Указывает длину подключа в битах. Как правило, чем длиннее ключ, тем большую степень безопасности он обеспечивает. + + + + Срок истечения + + Указывает дату, начиная с которой ключ более нельзя будет использовать. + + + + + + + Смена срока истечения ключа + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Отзыв подключа + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + Ключ отзывается немедленно. + + + + + Удаление подключа + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Свойства ключей SSH + Изложенное в этом разделе касается всех ключей SSH. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Свойства + + + + Fingerprint + + Отпечаток — это уникальная строка символов, которая точно обозначает ключ. + + + + Algorithm + + Указывает алгоритм шифрования, с помощью которого был создан ключ. + + + + Location + + Это местоположение, в котором хранится закрытый ключ. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Удаление ключа <acronym>SSH</acronym> + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Импорт ключей + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Экспорт ключей + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Подписывание ключа + Если вы подписываете ключ другого человека, это значит, что вы доверяете этому человеку. Прежде, чем подписывать ключ, вы должны тщательно проверить его отпечаток, чтобы убедиться, что ключ действительно принадлежит этому человеку. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Параметры + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + + To change the unlock password of the keyring, first select the appropriate keyring and then + press Change Unlock Password button. You will then be prompted to + type the old password in the Old password text box, the new password in the + New password text box and + confirm it in the Confirm password text box. + To apply the settings, press Change. + If the old password is correct, you will get a status + message indicating the success of the operation. If the + old password is not correct you will be asked to check + its correctness. + + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Серверы ключей + Обновляйте свои и чужие ключи, синхронизируя их с удалёнными серверами ключей. Это позволит вам постоянно иметь самые новые подписи на всех ваших ключах, так что сеть доверия будет наиболее полезной. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + Серверы ключей LDAP менее распространены, но используют для передачи ключей стандартный протокол LDAP. Хороший LDAP-сервер — ldap://keyserver.pgp.com. + + + + + + + Обмен ключами + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/ru/legal.xml seahorse-3.6.3/help/ru/legal.xml --- seahorse-3.2.2/help/ru/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/ru/legal.xml 2012-11-09 17:35:39.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + Это руководство — часть документации GNOME, которая распространяется на условиях лицензии GFDL. Если вы хотите распространять это руководство отдельно от остальной документации, вам следует приложить к руководству копию лицензии, как описано в разделе 6 лицензии. + + Некоторые имена и марки используются компаниями для обозначения их продуктов и услуг и являются торговыми марками. Там, где эти имена присутствуют в документации и где участники проекта документирования GNOME знают об этом, имена выделяются заглавными буквами или начальной заглавной буквой. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/ru/seahorse.xml seahorse-3.6.3/help/ru/seahorse.xml --- seahorse-3.2.2/help/ru/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/ru/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1000 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins и Adam Schreiber - 2008Василий Фаронов (qvvx@yandex.ru) - - Проект Seahorse - - - - Разрешается копировать, распространять и/или изменять этот документ на условиях лицензии GNU Free Documentation License (GFDL), версии 1.1 или любой более поздней версии, опубликованной Фондом свободного программного обеспечения (Free Software Foundation), без неизменяемых частей и без текстов на обложках. Вы можете найти копию лицензии GFDL по этой ссылке или в файле COPYING-DOCS, распространяемом с этим документом. - Это руководство — часть документации GNOME, которая распространяется на условиях лицензии GFDL. Если вы хотите распространять это руководство отдельно от остальной документации, вам следует приложить к руководству копию лицензии, как описано в разделе 6 лицензии. - - Некоторые имена и марки используются компаниями для обозначения их продуктов и услуг и являются торговыми марками. Там, где эти имена присутствуют в документации и где участники проекта документирования GNOME знают об этом, имена выделяются заглавными буквами или начальной заглавной буквой. - - ДОКУМЕНТ И ИЗМЕНЁННЫЕ ВЕРСИИ ДОКУМЕНТА ПРЕДОСТАВЛЯЮТСЯ ПОЛЬЗОВАТЕЛЮ НА УСЛОВИЯХ ЛИЦЕНЗИИ GNU FREE DOCUMENTATION LICENSE С УВЕДОМЛЕНИЕМ О ТОМ, ЧТО: - - ДОКУМЕНТ РАСПРОСТРАНЯЕТСЯ «КАК ЕСТЬ», БЕЗ ВСЯКИХ ГАРАНТИЙ, ЯВНЫХ ИЛИ НЕЯВНЫХ, ВКЛЮЧАЯ, БЕЗ ОГРАНИЧЕНИЙ, ГАРАНТИИ ТОГО, ЧТО ДОКУМЕНТ ИЛИ ИЗМЕНЁННАЯ ВЕРСИЯ ДОКУМЕНТА СВОБОДНА ОТ ДЕФЕКТОВ, ПРИГОДНА К ПРОДАЖЕ, ПРИГОДНА К ИСПОЛЬЗОВАНИЮ В ОПРЕДЕЛЁННЫХ ЦЕЛЯХ ИЛИ НЕ НАРУШАЕТ ЗАКОНЫ. ВЕСЬ РИСК, КАСАЮЩИЙСЯ КАЧЕСТВА, ТОЧНОСТИ ИЛИ ПРАВИЛЬНОСТИ ДОКУМЕНТА ИЛИ ИЗМЕНЁННЫХ ВЕРСИЙ ДОКУМЕНТА, ЛЕЖИТ НА ВАС. ЕСЛИ ДОКУМЕНТ ИЛИ ИЗМЕНЁННАЯ ВЕРСИЯ ДОКУМЕНТА ИМЕЕТ НЕДОСТАТКИ, ВЫ (А НЕ АВТОР ДОКУМЕНТА ИЛИ ЕГО ПОМОЩНИК) БЕРЁТЕ НА СЕБЯ СТОИМОСТЬ ЛЮБОЙ НЕОБХОДИМОЙ ДОРАБОТКИ, КОРРЕКЦИИ ИЛИ ВОССТАНОВЛЕНИЯ. ЭТОТ ОТКАЗ ОТ ГАРАНТИЙ СОСТАВЛЯЕТ ВАЖНУЮ ЧАСТЬ ЛИЦЕНЗИИ. НИКАКОЕ ИСПОЛЬЗОВАНИЕ ДОКУМЕНТА ИЛИ ИЗМЕНЁННОЙ ВЕРСИИ ДОКУМЕНТА НЕ ДОПУСКАЕТСЯ БЕЗ ДАННОГО ПРЕДУПРЕЖДЕНИЯ И - - - НИ ПРИ КАКИХ ОБСТОЯТЕЛЬСТВАХ И НИ ПРИ КАКОМ ЗАКОННОМ СПОСОБЕ, НИ ПО КАКОМУ СОГЛАШЕНИЮ ИЛИ ДРУГОЙ ПРИЧИНЕ, АВТОР, СОЗДАТЕЛЬ, ПОМОЩНИКИ ИЛИ РАСПРОСТРАНИТЕЛИ ДОКУМЕНТА НЕ НЕСУТ ОТВЕТСТВЕННОСТЬ ЗА ПРЯМОЙ, КОСВЕННЫЙ, СПЕЦИАЛЬНЫЙ, СЛУЧАЙНЫЙ ИЛИ ПРЕДНАМЕРЕННЫЙ УЩЕРБ ЛЮБОГО СВОЙСТВА, ВКЛЮЧАЯ, БЕЗ ОГРАНИЧЕНИЯ, ПОТЕРЮ ЖЕЛАНИЯ, РАБОТОСПОСОБНОСТИ, КОМПЬЮТЕРНЫЕ СБОИ ИЛИ ПОЛОМКИ, ИЛИ ЛЮБОЙ ДРУГОЙ УЩЕРБ ИЛИ ПОТЕРИ, ВОЗНИКАЮЩИЕ ВСЛЕДСТВИЕ ИЛИ СВЯЗАННЫЕ С ИСПОЛЬЗОВАНИЕМ ДОКУМЕНТА ИЛИ ИЗМЕНЁННЫХ ВЕРСИЙ ДОКУМЕНТА, ДАЖЕ ЕСЛИ СТОРОНА БЫЛА УВЕДОМЛЕНА О ВОЗМОЖНОСТИ ТАКОГО УЩЕРБА. - - - - - - - - Jacob - Perkins - - Проект Seahorse - - - - - Adam - Schreiber - - Проект Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Проект Seahorse - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - August 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - ноябрь 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - июль 2005 - - Adam Schreiber sadam@clemson.edu - Проект Seahorse - - - - Passwords and Keys Manual V0.7.0 - февраль 2003 - - Jacob Perkins - Проект Seahorse - - - - This manual describes version 2.28.x of Passwords and Keys - - Обратная связь - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Ключи шифрования - - - - - - Введение - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - создавать и управлять ключами PGP и SSH; - - - экспортировать и импортировать ключи PGP и SSH; - - - обмениваться ключами с другими; - - - - - - - - - Начало работы - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Меню Приложения - - Choose - - Accessories - Password and Keys - . - - - - Командная строка - - Введите seahorse и нажмите Enter. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Показывает окно Passwords and Keys. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Строка меню - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Панель инструментов - - С помощью панели инструментов вы можете быстро обратиться к часто используемым командам. - - - Вкладки ключей и паролей - - Обеспечивают доступ к ключам и паролям в брелоке. - - - Первые шаги - - Позволяют быстро выполнить действия, полезные для начинающих пользователей. Отсюда вы можете: - - - просмотреть справку; - - - импортировать ключи в брелок; - - - создать новые ключи. - - - - - - - - - - - - Создание ключей OpenPGP - OpenPGP — это свободный протокол для шифрования электронной почты с помощью открытых ключей. Он основан на PGP. OpenPGP определяет стандартные виды зашифрованных сообщений, подписей, закрытых ключей, а также сертификатов для обмена открытыми ключами. - Криптография с открытым ключом — это система, в которой используется два ключа: открытый ключ, который вы можете отдавать всем, с кем хотите обмениваться информацией; и закрытый ключ, который должен храниться в тайне. - Чтобы создать ключ OpenPGP: - - - Choose FileNew... - - - - Выберите Ключ PGP и нажмите Продолжить - - - Введите своё полное имя (имя и фамилию), адрес электронной почты и любые дополнительные сведения. Также вы можете указать дополнительные параметры: смотрите ниже. - - - Нажмите Создать, чтобы создать новую пару ключей. - - - Появится диалог Пароль для нового ключа PGP. Введите в нём дважды пароль для вашего нового ключа. - - - - Постарайтесь придумать надёжный пароль. Обратите внимание, что в этом пароле вы можете использовать пробелы. - - - - Дополнительные параметры - Разверните раздел Дополнительные параметры ключа, чтобы указать следующие параметры ключа: - - - Тип шифрования - - В этом поле указываются алгоритмы шифрования, с помощью которых создаются ключи. - - - DSA ElGamal - - Это рекомендуемый вариант. Он позволит вам зашифровывать, расшифровывать, подписывать и проверять. - - - - DSA - - Позволит вам только подписывать. - - - - RSA - - Позволит вам только подписывать. - - - - - - - Прочность ключа (биты) - - Это длина ключа в битах. Чем длиннее ключ, тем он будет надёжнее — при условии, что выбран хороший пароль. С другой стороны, чем длиннее ключ, тем больше времени уйдёт на выполнение всевозможных действий с его помощью. Допустимые значения — от 1024 до 4096 бит. Рекомендуется использовать не меньше 2048 бит. - - - - Срок истечения - - Это дата, начиная с которой ключ больше нельзя будет использовать для шифрования и подписывания. Разумный срок — 6 месяцев. После того, как истечёт этот срок, вам нужно будет либо изменить дату, либо создать новый ключ (или подключ). - - - - - - - - - - Создание ключей SSH - SSH — это способ войти в удалённую компьютерную систему и выполнять на ней команды. В SSH есть система идентификации на основе ключей — это альтернатива обычной системе, основанной на паролях. При идентификации с помощью ключа нет нужды вручную вводить пароль. - Ключи SSH состоят из двух частей: закрытого ключа, который должен храниться в тайне, и открытого ключа, который можно загружать на любой компьютер, к которому вы желаете иметь доступ по SSH. - Чтобы создать ключ SSH: - - - Choose FileNew... - - - Выберите Ключ SSH и нажмите Продолжить. - - - Опишите цель, для которой будет использоваться ключ. Вы можете использовать свой электронный адрес или любые другие сведения, которые помогут вам вспомнить предназначение ключа. Также вы можете указать дополнительные параметры для ключа: смотрите ниже. - - - Нажмите Просто создать ключ, чтобы создать новый ключ; или Создать и установить, чтобы создать новый ключ и установить его на другом компьютере для идентификации. - - - Появится диалог Пароль для нового ключа SSH. Введите в нём дважды пароль для вашего нового ключа. - - Постарайтесь придумать надёжный пароль. Обратите внимание, что в этом пароле вы можете использовать пробелы. - - - - - - - - Дополнительные параметры - Разверните раздел Дополнительные параметры ключа, чтобы указать следующие параметры для нового ключа: - - - - Тип шифрования - - В этом поле указываются алгоритмы шифрования, с помощью которых создаётся ключ. - - - RSA - - Использовать для создания ключа SSH алгоритм Rivest-ShamirAdleman (RSA). Это предпочтительный, наиболее надёжный вариант. - - - - DSA - - Использовать для создания ключа SSH алгоритм Digital Signature Algorithm (DSA). - - - - - - - Прочность ключа (биты) - - Это длина ключа в битах. Чем длиннее ключ, тем он будет надёжнее — при условии, что выбран хороший пароль. С другой стороны, чем длиннее ключ, тем больше времени уйдёт на выполнение всевозможных действий с его помощью. Допустимые значения — от 1024 до 4096 бит. Рекомендуется использовать не меньше 2048 бит. - - - - - - - - - - Свойства ключа OpenPGP - Изложенное в этом разделе касается всех ключей OpenPGP. - - Чтобы просмотреть свойства ключа PGP: - - выделите ключ PGP в главном окне; - - - дважды щёлкните на нём или нажмите Свойства на панели инструментов; - - - выберите вкладку Подробности. - - - - - Свойства - - - - Отпечаток - - Отпечаток — это уникальная строка символов, которая точно обозначает ключ. - - - - Идентификатор ключа - - Идентификатор ключа похож на его отпечаток. Однако идентификатор содержит только последние 8 символов отпечатка. Обычно можно обозначить ключ с помощью одного только идентификатора, но иногда у двух ключей бывает один и тот же идентификатор. - - - - Тип - - Указывает алгоритм шифрования, с помощью которого был создан ключ. Ключи DSA позволяют только подписывать. Ключи ElGamal позволяют также и шифровать. - - - - Создан - - Указывает дату создания ключа. - - - - Истекает - - Указывает дату, начиная с которой ключ более нельзя будет использовать. - - - - Прочность - - Указывает длину ключа в битах. Как правило, чем длиннее ключ, тем большую степень безопасности он обеспечивает. - Если ключ защищён плохим паролем, то он будет ненадёжен, сколь бы длинным он ни был. - - - - - - - - - Доверие - Доверие — это показатель того, насколько вы уверены в способности человека правильно расширять сеть доверия. Когда встретится ключ, который вы не подписали, его достоверность будет определяться исходя из того, какие подписи собрал владелец этого ключа, и того, насколько вы доверяете авторам этих подписей. По умолчанию неизвестный ключ требует 3 подписи, которым вы слабо доверяете, или 1 подпись, который вы полностью доверяете. - - Неизвестно: Вы ничего не знаете о способности человека правильно подписывать ключи. - Не доверяю: Этот человек не может правильно подписывать ключи. - Слабо: Этот человек проверяет фотографию, прежде чем подписать ключ, но не всегда тщательно изучает документы. - Полностью: Этот человек тщательно проверяет документы и фотографию, прежде чем подписывать ключ. Иными словами, он подписывает только те ключи, которые действительно принадлежат тому, кто просит их подписать. - Безоговорочно: Этот уровень доверия следует назначать только вашим собственным ключам. - - - - - Включение и отключение ключей - Когда ключ включён, его можно использовать для шифрования. Когда ключ отключён, его нельзя использовать ни для шифрования, ни для проверки сделанных им подписей. - - - - Срок истечения - После того, как ключ истекает, его нельзя использовать для выполнения действий. Заново включить ключ можно, сменив его срок истечения на какую-нибудь дату в будущем. Хорошая практика — иметь один главный ключ, который никогда не истекает, и много подключей, которые истекают и подписаны главным ключом. - - - - Идентификаторы пользователей - Идентификаторы пользователей дают возможность применять с одним ключом несколько имён и электронных адресов. - Обычно они имеют вид: Имя (комментарий) <адрес электронной почты> - - - Добавление идентификатора пользователя - Полезно добавить идентификатор пользователя, если вы хотите по-разному представляться на работе и друзьям. - Чтобы добавить к ключу идентификатор пользователя: - - выделите ключ в главном окне; - - - дважды щёлкните на нём или нажмите Свойства на панели инструментов; - - - выберите вкладку Имена и подписи; - - - нажмите Добавить. - - - После того, как вы это сделаете, появится диалог, который нужно заполнить. Поля этого диалога описаны ниже. - - - Полное имя - - Введите своё полное имя в виде <имя> <фамилия> При желании можно добавить отчество или инициал. - - - В этом поле надо ввести хотя бы 5 символов. - - - - - - Электронный адрес - - Большинство людей будут искать ваш ключ на сервере ключей по вашему электронному адресу. Убедитесь, что ввели его правильно, прежде чем продолжать. - - - Он должен иметь вид <пользователь>@<домен> - - - - - - Комментарий к ключу - - В поле комментария можно поместить любые дополнительные сведения. Они будут включены в отображаемое имя вашего нового идентификатора. Эти сведения можно искать на серверах ключей. - - - - - - - - Фотографии - Владелец ключа может внедрить в него одну или несколько своих фотографий. Эти фотографии могут быть подписаны, как и обычные идентификаторы пользователя. Фотография должна быть в формате JPEG. Желательно делать её не крупнее 240×288 пикселов. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Изменение пароля - Чтобы изменить пароль, назначенный ключу: - - выделите ключ в главном окне; - - - дважды щёлкните на нём или нажмите Свойства на панели инструментов; - - - Нажмите Изменить пароль. - - - Введите новый пароль и нажмите OK. - - - - Удаление ключа - Чтобы удалить ключ из вашего брелока: - - выделите ключ в главном окне; - - - Щёлкните на нём правой кнопкой мыши и выберите Удалить ключ, или выберите ПравкаУдалить ключ. - - - - Вы можете удалять собственные ключи, доверяемые ключи и собранные ключи. - - - - - - - - Свойства подключей OpenPGP - У каждого ключа OpenPGP есть один главный ключ, который используется только для подписывания. Подключи применяются для шифрования и также для подписывания. Таким образом, если ваш подключ будет скомпрометирован, вам не понадобится отзывать свой главный ключ. - - - Идентификатор - - Это идентификатор подключа. - - - - Тип - - Указывает алгоритм шифрования, с помощью которого был создан подключ. Ключи DSA позволяют только подписывать, ключи ElGamal — только шифровать, а ключи RSA — и подписывать, и шифровать. - - - - Создан - - Указывает дату создания ключа. - - - - Истекает - - Указывает дату, начиная с которой ключ более нельзя будет использовать. - - - - Состояние - - Указывает состояние ключа. - - - - Прочность - - Указывает длину ключа в битах. Как правило, чем длиннее ключ, тем большую степень безопасности он обеспечивает. - Если ключ защищён плохим паролем, то он будет ненадёжен, сколь бы длинным он ни был. - - - - - - - Добавление подключа - Чтобы добавить к ключу подключ, в разделе Подключи нажмите кнопку Добавить. - После того, как вы это сделаете, появится диалог, который нужно заполнить. Поля этого диалога описаны ниже. - - - Тип ключа - - Указывает алгоритм шифрования, с помощью которого создаётся подключ. - - - DSA - - Использовать алгоритм Digital Signature Algorithm (DSA) для создания подключа. Такой подключ сможет только подписывать. - - - - ElGamal - - Использовать алгоритм ElGamal для создания подключа. Такой подключ сможет только шифровать. - - - - RSA - - Использовать алгоритм Rivest-Shamir Adleman (RSA) для создания подключа. Такой подключ может как подписывать, так и шифровать, но вам придётся создать два разных подключа. - - - - - - - Длина ключа - - Указывает длину подключа в битах. Как правило, чем длиннее ключ, тем большую степень безопасности он обеспечивает. - - - - Срок истечения - - Указывает дату, начиная с которой ключ более нельзя будет использовать. - - - - - - - Смена срока истечения ключа - Чтобы изменить срок истечения подключа, выделите его в разделе Подключи, затем: - - нажмите кнопку Истекает слева; - - - в диалоге даты выберите новую дату истечения, или выберите Никогда не истекает. - - - - - - Отзыв подключа - Чтобы отозвать подключ, выделите его в разделе Подключи, затем: - - Нажмите кнопку Отозвать слева. - - - Выберите причину, по которой хотите отозвать ключ: - - - - Нет причины - - Нет никакой определённой причины для отзыва ключа. - - - - Скомпрометирован - - Ключ скомпрометирован. - - - - Заменён - - Ключ заменён на другой. - - - - Не используется - - Ключ больше не используется. - - - - - - - Введите описание того, почему вы отзываете ключ. - - - Нажмите Отозвать. - - - - Ключ отзывается немедленно. - - - - - Удаление подключа - Чтобы удалить подключ, выделите его в разделе Подключи, затем: - - Нажмите кнопку Удалить слева. - - - - - - - - - Свойства ключей SSH - Изложенное в этом разделе касается всех ключей SSH. - Чтобы просмотреть свойства ключа SSH: - - выделите ключ SSH в главном окне; - - - дважды щёлкните на нём или нажмите Свойства на панели инструментов; - - - выберите вкладку Подробности. - - - - - Свойства - - - - Отпечаток - - Отпечаток — это уникальная строка символов, которая точно обозначает ключ. - - - - Алгоритм - - Указывает алгоритм шифрования, с помощью которого был создан ключ. - - - - Местоположение - - Это местоположение, в котором хранится закрытый ключ. - - - - Прочность - - Указывает длину ключа в битах. Как правило, чем длиннее ключ, тем большую степень безопасности он обеспечивает. - Если ключ защищён плохим паролем, то он будет ненадёжен, сколь бы длинным он ни был. - - - - - - - - - Удаление ключа <acronym>SSH</acronym> - Чтобы удалить ключ SSH: - - выделите ключ SSH в главном окне; - - - щёлкните на нём правой кнопкой мыши и выберите Удалить ключ, или выберите ПравкаУдалить ключ. - - - - - - - - - Импорт ключей - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - выделите публичный блок текста, обёрнутый в ASCII; - - - скопируйте его в буфер обмена; - - - выберите ПравкаВставить ключи. - - - - - - - - - Экспорт ключей - - To export keys, select the keys in the main window - and choose - - File - Export - . - - Также вы можете экспортировать ключи в буфер обмена в виде текстового блока, обёрнутого в ASCII: - - выделите ключи в главном окне; - - - выберите ПравкаКопировать ключи. - - - - - - - - - Подписывание ключа - Если вы подписываете ключ другого человека, это значит, что вы доверяете этому человеку. Прежде, чем подписывать ключ, вы должны тщательно проверить его отпечаток, чтобы убедиться, что ключ действительно принадлежит этому человеку. - Чтобы подписать ключ из вашего брелока: - - выделите ключ, который хотите подписать, на вкладке Доверяемые ключи или Другие собранные ключи; - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - укажите, насколько тщательно вы проверили ключ; - - - укажите, должна ли подпись быть замкнутой в вашем брелоке, и можете ли вы её отозвать впоследствии; - - - нажмите Подписать. - - - - - - - - Параметры - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - - To change the unlock password of the keyring, first select the appropriate keyring and then - press Change Unlock Password button. You will then be prompted to - type the old password in the Old password text box, the new password in the - New password text box and - confirm it in the Confirm password text box. - To apply the settings, press Change. - If the old password is correct, you will get a status - message indicating the success of the operation. If the - old password is not correct you will be asked to check - its correctness. - - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Серверы ключей - Обновляйте свои и чужие ключи, синхронизируя их с удалёнными серверами ключей. Это позволит вам постоянно иметь самые новые подписи на всех ваших ключах, так что сеть доверия будет наиболее полезной. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - Серверы HKP - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - Серверы ключей LDAP - - Серверы ключей LDAP менее распространены, но используют для передачи ключей стандартный протокол LDAP. Хороший LDAP-сервер — ldap://keyserver.pgp.com. - - - - - - - Обмен ключами - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - Чтобы сообщить об ошибке или сделать предложение по Seahorse или этому руководству, следуйте указаниям в разделе обратной связи руководства пользователя GNOME. - Эта программа распространяется на условиях лицензии GNU General Public License, опубликованной фондом Free Software Foundation; либо версии 2 этой лицензии, либо (на ваш выбор) любой более поздней версии. Копия этой лицензии прилагается к документации; ещё одну можно найти в файле COPYING, который прилагается к исходному тексту программы. - -
diff -Nru seahorse-3.2.2/help/seahorse.omf.in seahorse-3.6.3/help/seahorse.omf.in --- seahorse-3.2.2/help/seahorse.omf.in 2011-11-14 11:53:13.000000000 +0100 +++ seahorse-3.6.3/help/seahorse.omf.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ - - - - jap1@users.sourceforge.net (Jacob Perkins) - Seahorse Manual - 2003-01-10 - - - User Manual for Seahorse. - User's Guide - - - - - - - - diff -Nru seahorse-3.2.2/help/sl/index.docbook seahorse-3.6.3/help/sl/index.docbook --- seahorse-3.2.2/help/sl/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/sl/index.docbook 2012-11-09 17:35:40.000000000 +0100 @@ -0,0 +1,1493 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse Project + + + + + 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. + + 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. + + + + 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. + + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse Project + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Feedback + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introduction + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Getting Started + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Applications menu + + Choose + + Accessories + Password and Keys + . + + + + Command Line + + + Type seahorse then press Return. + + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Menubar + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Toolbar + + Use the toolbar to quickly access commonly-used commands. + + + Keys and Passwords Tabs + + Provides access to the keys and passwords in the keyring. + + + First time options + + Provides fast access to useful actions for first time users. From here you can: + + + Browse the help system, + + + Import keys in the keyring, + + + Create new keys. + + + + + + + + + + + + Creating OpenPGP Keys + + OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key + cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys + and certificates for exchanging public keys. + + + Public key cryptography is a concept which involves the use of two keys: + a public key, that you can give to anyone with whom + you would like to communicate, and a private key which is + private and must be kept secret. + + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + + Use similar practices to generating a strong password when choosing a + passphrase. The main difference between a password and a passphrase is that, + in a passphrase, spaces are valid characters. + + + + + Advanced options + + Expand the Advanced key options + section to specify the following options for a new key: + + + + Encryption Type + + + This field specifies the encryption algorithms used + to generate your keys. + + + + DSA ElGamal + + + This is the suggested choice as it will allow + you to encrypt, decrypt, sign and verify as needed. + + + + + DSA + + + Will allow signing only. + + + + + RSA + + + Will allow signing only. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. The longer the key, + the more secure it will be, provided a strong passphrase is + used. Conversely, performing any operation with a longer key + will require more time than it would with a shorter key. Acceptable + values are between 1024 and 4096 bits. At least 2048 bits is recommended. + + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Creating Secure Shell Keys + + Secure Shell (SSH) is a way of logging into a remote computer to execute commands + on that machine. + SSH keys are used in key-based authentication system, as an alternative to the default password + authentication system. + With key-based authentication there is no need to manually type a password to authenticate. + + + Secure Shell keys are made of two keys: a private key, that must be kept secret, + and a public key which can be uploaded to any computer you need to access. + + + To create a Secure Shell key: + + + + Choose FileNew... + + + Select Secure Shell Key and click Continue + + + Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. + + + Click Just Create Key to + create the new key, or Create and Set Up + to create the key and set up another computer to use it for authentication. + + + The Passphrase for New Secure Shell Key + dialog opens. + Enter the passphrase twice for your new key. + + + + Use similar practices to generating a + strong password when choosing a + passphrase. The main difference between a + password and a passphrase is that, in a + passphrase, spaces are valid characters. + + + + + + + + + Advanced options + + Expand the Advanced key options section to specify the following options for a new key: + + + + + Encryption Type + + + This field specifies the encryption + algorithms used to generate your key. + + + + RSA + + + Use the Rivest-ShamirAdleman + (RSA) algorithm to create the SSH key. + This is the preferred and more secure choice. + + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the SSH key. + + + + + + + + Key Strength (bits) + + + This is the length of the key in bits. + The longer the key, the more secure it + will be, provided a strong passphrase is + used. Conversely, performing any + operation with a longer key will require + more time than it would with a shorter + key. Acceptable values are between 1024 + and 4096 bits. At least 2048 bits is recommended. + + + + + + + + + + + OpenPGP Key Properties + + The descriptions in this section apply to all OpenPGP keys. + + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + The fingerprint is a unique string of characters that exactly identifies a key. + + + + KeyID + + + The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 + characters of the fingerprint. Most of the time it is possible to identify a key with + only the KeyID, but occasionally two keys may have the same ID. + + + + + Type + + + Specifies the encryption algorithm used to generate a key. DSA keys can only sign. + ElGamal keys are used to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Trust + + Trust is an indication of how sure you are of a person's ability to correctly extend + the web of trust. When you are faced with a key you have not signed, the validity of + that person's key will be determined based on the signatures they have collected and + how well or not you trust the people who have made those signatures. By default, an + unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. + + + + Unknown: You are not familiar with the person's ability to sign keys correctly. + + + Never: This person cannot correctly sign keys. + + + Marginal: This person checks for photo ID before signing a key, but + does not necessarily scrutinize the IDs. + + + Full: This person scrutinizes each and every person's photo IDs before + signing them (e.g. they only sign keys that truely belong to the person asking for the signature). + + + Ultimate: This level of trust should only be assigned to your own keys. + + + + + + Enabling and Disabling Keys + + When a key is enabled, it can be used to perform encryption operations. + When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. + + + + + Expiration Date + + A key can no longer be used to perform key operations after it has expired. Changing a + key's expiration date to a point in the future re-enables it. A good general practice + would be to have a master key that never expires and multiple subkeys that do and are + signed by the master key. + + + + + User IDs + + User IDs allow multiple identities and email addresses to + be used with the same key. + + + They usually take the form of: + Name (comment) <email address> + + + + Adding a User ID + + Adding a user ID is useful when you want to have + an identity for your job and one for your friends. + + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + + You must enter at least 5 characters in this field. + + + + + + + Email Address + + + Your email address is how most + people will locate your key on a + key server or other key provider. + Make sure it is correct before + continuing. + + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + + The comment field can be used to + place any additional information + into the displayed name of your new + ID. This information can be + searched for on key servers. + + + + + + + + + Photo IDs + + Photo IDs allow a key owner to embed one or more pictures of themselves in a key. + These identities can be signed just like normal user IDs. A photo ID must be in JPEG + format and is recommended to be no larger than 240x288 pixels. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Changing the Passphrase + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + + Enter the new passphrase and click OK. + + + + + Deleting a Key + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + + You can delete your keys, trusted keys and collected keys. + + + + + + + + + OpenPGP Subkey Properties + + Each OpenPGP key has a single master key used + to sign only. Subkeys are used to encrypt and + to sign as well. In this way, if your sub key is + compromised, you don't need to revoke your master key. + + + + ID + + + This is the identifier of the subkey. + + + + + Type + + + Specifies the encryption algorithm used to generate a subkey. + DSA keys can only sign, ElGamal + keys are used to encrypt while RSA keys are + used to sign or to encrypt. + + + + + Created + + + Indicates the date the key was created. + + + + + Expires + + + Indicates the date the key can no longer be used. + + + + + Status + + + Indicates the status of the key. + + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Adding a Subkey + + To add a subkey to a key, from the Subkeys + section click on Add button. + + + After following the instructions above, you will be presented with a + dialog to fill in. The fields are detailed below. + + + + Key Type + + + Specifies the encryption algorithm used to generate a subkey. + + + + DSA + + + Use the Digital Signature Algorithm + (DSA) to create the subkey. + This subkey can sign only. + + + + + ElGamal + + + Use the ElGamal algorithm to create the subkey. + This subkey can encrypt only. + + + + + RSA + + + Use the Rivest-Shamir Adleman (RSA) + algorithm to create the subkey. This subkey can be used to sign or encrypt, + but you have to create two different subkeys. + + + + + + + + Key Length + + + Indicates the length in bits of the subkey. + In general the longer the key, the more security it provides. + + + + + Expiration Date + + + Indicates the date the subkey can no longer be used. + + + + + + + + Changing a Subkey Expiration Date + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Revoking a Subkey + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + + The effect of revoking a subkey is immediate. + + + + + + Deleting a Subkey + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Secure Shell Key Properties + + The descriptions in this section apply to all SSH keys. + + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Properties + + + + Fingerprint + + + The fingerprint is a unique string of + characters that exactly identifies a key. + + + + + Algorithm + + + Specifies the encryption algorithm used to + generate a key. + + + + + Location + + + This is the location where the + private key + has been stored. + + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Deleting a Secure Shell Key + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importing Keys + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exporting Keys + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Signing a Key + + Signing another person's key means you are giving trust to that person. + Before signing a key, you have to carefully check the key's fingerprint + to be sure that the key really belongs to that person. + + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Preferences + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + + To change the unlock password of the keyring, first select the appropriate keyring and then + press Change Unlock Password button. You will then be prompted to + type the old password in the Old password text box, the new password in the + New password text box and + confirm it in the Confirm password text box. + To apply the settings, press Change. + If the old password is correct, you will get a status + message indicating the success of the operation. If the + old password is not correct you will be asked to check + its correctness. + + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Key Servers + + Keep your and other's keys up to date by syncing keys periodically with + remote keyservers. Syncing will make sure that you have the latest + signatures made on all of your keys so that the web of trust will be the + most useful. + + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + + LDAP keyservers are less common, but use the standard LDAP + protocol to serve keys. + ldap://keyserver.pgp.com is a good LDAP + server. + + + + + + + + Key Sharing + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/sl/legal.xml seahorse-3.6.3/help/sl/legal.xml --- seahorse-3.2.2/help/sl/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/sl/legal.xml 2012-11-09 17:35:40.000000000 +0100 @@ -0,0 +1,75 @@ + + + + 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. + + 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. + + + + 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. + + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/sl/seahorse.xml seahorse-3.6.3/help/sl/seahorse.xml --- seahorse-3.2.2/help/sl/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/sl/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1491 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - - - Seahorse Project - - - - - 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. - - 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. - - - - 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. - - - - 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. - - - - - - - - - - Jacob - Perkins - - Seahorse Project - - - - - Adam - Schreiber - - Seahorse Project -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse Project - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - August 2008 - - - Adam Schreiber - sadam@clemson.edu - - - - - Passwords and Keys Manual V0.9.1 - November 2006 - - - Milo Casagrande - milo_casagrande@yahoo.it - - - - - Passwords and Keys Manual V0.9.0 - July 2005 - - Adam Schreiber - sadam@clemson.edu - - Seahorse Project - - - - Passwords and Keys Manual V0.7.0 - February 2003 - - Jacob Perkins - - - Seahorse Project - - - - This manual describes version 2.28.x of Passwords and Keys - - Feedback - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Encryption Keys - - - - - - Introduction - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Create and manage PGP and SSH keys, - - - Export and import PGP and SSH keys, - - - Share your keys with others, - - - - - - - - - Getting Started - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Applications menu - - Choose - - Accessories - Password and Keys - . - - - - Command Line - - - Type seahorse then press Return. - - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - - Show the Passwords and Keys window. - - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Menubar - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Toolbar - - Use the toolbar to quickly access commonly-used commands. - - - Keys and Passwords Tabs - - Provides access to the keys and passwords in the keyring. - - - First time options - - Provides fast access to useful actions for first time users. From here you can: - - - Browse the help system, - - - Import keys in the keyring, - - - Create new keys. - - - - - - - - - - - - Creating OpenPGP Keys - - OpenPGP is a non proprietary protocol for encrypting e-mail with the use of public key - cryptography based on PGP. It defines standard formats for encrypted messages, signatures, private keys - and certificates for exchanging public keys. - - - Public key cryptography is a concept which involves the use of two keys: - a public key, that you can give to anyone with whom - you would like to communicate, and a private key which is - private and must be kept secret. - - - To create OpenPGP keys: - - - - Choose FileNew... - - - - - Select PGP Key and click Continue - - - - - Enter your full name (first - last), your e-mail address and any additional information. - You can also specify advanced options for the key: see below. - - - - - Click Create to create the new key pair. - - - - - The Passphrase for New PGP Key dialog will open. - Enter the passphrase twice for your new key. - - - - - - - Use similar practices to generating a strong password when choosing a - passphrase. The main difference between a password and a passphrase is that, - in a passphrase, spaces are valid characters. - - - - - Advanced options - - Expand the Advanced key options - section to specify the following options for a new key: - - - - Encryption Type - - - This field specifies the encryption algorithms used - to generate your keys. - - - - DSA ElGamal - - - This is the suggested choice as it will allow - you to encrypt, decrypt, sign and verify as needed. - - - - - DSA - - - Will allow signing only. - - - - - RSA - - - Will allow signing only. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. The longer the key, - the more secure it will be, provided a strong passphrase is - used. Conversely, performing any operation with a longer key - will require more time than it would with a shorter key. Acceptable - values are between 1024 and 4096 bits. At least 2048 bits is recommended. - - - - - Expiration Date - - - This is the date at which the key will cease to be usable for - performing encryption or signing operations. 6 months is a reasonable time - to set it to. You will have to either change the - expiration date or generate a new key or subkey after this amount - of time passes. - - - Sign your new key with your old one before it expires - to preserve your trust status. - - - - - - - - - - - - - Creating Secure Shell Keys - - Secure Shell (SSH) is a way of logging into a remote computer to execute commands - on that machine. - SSH keys are used in key-based authentication system, as an alternative to the default password - authentication system. - With key-based authentication there is no need to manually type a password to authenticate. - - - Secure Shell keys are made of two keys: a private key, that must be kept secret, - and a public key which can be uploaded to any computer you need to access. - - - To create a Secure Shell key: - - - - Choose FileNew... - - - Select Secure Shell Key and click Continue - - - Enter a description of what the key is to be used for. You can use your e-mail address or any other reminder. You can also specify advanced options for the key: see below. - - - Click Just Create Key to - create the new key, or Create and Set Up - to create the key and set up another computer to use it for authentication. - - - The Passphrase for New Secure Shell Key - dialog opens. - Enter the passphrase twice for your new key. - - - - Use similar practices to generating a - strong password when choosing a - passphrase. The main difference between a - password and a passphrase is that, in a - passphrase, spaces are valid characters. - - - - - - - - - Advanced options - - Expand the Advanced key options section to specify the following options for a new key: - - - - - Encryption Type - - - This field specifies the encryption - algorithms used to generate your key. - - - - RSA - - - Use the Rivest-ShamirAdleman - (RSA) algorithm to create the SSH key. - This is the preferred and more secure choice. - - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the SSH key. - - - - - - - - Key Strength (bits) - - - This is the length of the key in bits. - The longer the key, the more secure it - will be, provided a strong passphrase is - used. Conversely, performing any - operation with a longer key will require - more time than it would with a shorter - key. Acceptable values are between 1024 - and 4096 bits. At least 2048 bits is recommended. - - - - - - - - - - - OpenPGP Key Properties - - The descriptions in this section apply to all OpenPGP keys. - - - - To view properties of a PGP key: - - - - Select the PGP key - from the main window, - - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Properties - - - - Fingerprint - - The fingerprint is a unique string of characters that exactly identifies a key. - - - - KeyID - - - The KeyID is similar to the Fingerprint. However the KeyID only contains the last 8 - characters of the fingerprint. Most of the time it is possible to identify a key with - only the KeyID, but occasionally two keys may have the same ID. - - - - - Type - - - Specifies the encryption algorithm used to generate a key. DSA keys can only sign. - ElGamal keys are used to encrypt. - - - - - Created - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Strength - - - Indicates the length in bits of a key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - - - Trust - - Trust is an indication of how sure you are of a person's ability to correctly extend - the web of trust. When you are faced with a key you have not signed, the validity of - that person's key will be determined based on the signatures they have collected and - how well or not you trust the people who have made those signatures. By default, an - unknown key will require 3 signatures with marginal trust value or 1 fully trusted signature. - - - - Unknown: You are not familiar with the person's ability to sign keys correctly. - - - Never: This person cannot correctly sign keys. - - - Marginal: This person checks for photo ID before signing a key, but - does not necessarily scrutinize the IDs. - - - Full: This person scrutinizes each and every person's photo IDs before - signing them (e.g. they only sign keys that truely belong to the person asking for the signature). - - - Ultimate: This level of trust should only be assigned to your own keys. - - - - - - Enabling and Disabling Keys - - When a key is enabled, it can be used to perform encryption operations. - When a key is disabled, it cannot be used to encrypt to or verify signatures made by it. - - - - - Expiration Date - - A key can no longer be used to perform key operations after it has expired. Changing a - key's expiration date to a point in the future re-enables it. A good general practice - would be to have a master key that never expires and multiple subkeys that do and are - signed by the master key. - - - - - User IDs - - User IDs allow multiple identities and email addresses to - be used with the same key. - - - They usually take the form of: - Name (comment) <email address> - - - - Adding a User ID - - Adding a user ID is useful when you want to have - an identity for your job and one for your friends. - - - To add a user ID to a key: - - - - Select the key from the main window, - - - - - Double click on it or choose Properties from the toolbar, - - - - - Select the Names and Signatures tab, - - - - - Click on Add Name. - - - - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Full Name - - - Enter your full name in the form - <first> <last> - A middle name or initial is optional. - - - - - You must enter at least 5 characters in this field. - - - - - - - Email Address - - - Your email address is how most - people will locate your key on a - key server or other key provider. - Make sure it is correct before - continuing. - - - - - It should be of the form - <username>@<domainname> - - - - - - - Key Comment - - - The comment field can be used to - place any additional information - into the displayed name of your new - ID. This information can be - searched for on key servers. - - - - - - - - - Photo IDs - - Photo IDs allow a key owner to embed one or more pictures of themselves in a key. - These identities can be signed just like normal user IDs. A photo ID must be in JPEG - format and is recommended to be no larger than 240x288 pixels. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Changing the Passphrase - - To change the passphrase assigned to a key: - - - - Select the key from the main window, - - - - - Double click on it or choose Properties from the toolbar, - - - - - Click on Change Passphrase. - - - - - - Enter the new passphrase and click OK. - - - - - Deleting a Key - - To delete a key from your keyring: - - - - Select the key from the main window, - - - - - Right click on it and choose Delete Key - or choose - - Edit - Delete Key - . - - - - - - - You can delete your keys, trusted keys and collected keys. - - - - - - - - - OpenPGP Subkey Properties - - Each OpenPGP key has a single master key used - to sign only. Subkeys are used to encrypt and - to sign as well. In this way, if your sub key is - compromised, you don't need to revoke your master key. - - - - ID - - - This is the identifier of the subkey. - - - - - Type - - - Specifies the encryption algorithm used to generate a subkey. - DSA keys can only sign, ElGamal - keys are used to encrypt while RSA keys are - used to sign or to encrypt. - - - - - Created - - - Indicates the date the key was created. - - - - - Expires - - - Indicates the date the key can no longer be used. - - - - - Status - - - Indicates the status of the key. - - - - - Strength - - - Indicates the length in bits of the key. In general the longer the key, the more security it - provides. - - - A long key is not enough to make up for the use of a weak passphrase. - - - - - - - - - Adding a Subkey - - To add a subkey to a key, from the Subkeys - section click on Add button. - - - After following the instructions above, you will be presented with a - dialog to fill in. The fields are detailed below. - - - - Key Type - - - Specifies the encryption algorithm used to generate a subkey. - - - - DSA - - - Use the Digital Signature Algorithm - (DSA) to create the subkey. - This subkey can sign only. - - - - - ElGamal - - - Use the ElGamal algorithm to create the subkey. - This subkey can encrypt only. - - - - - RSA - - - Use the Rivest-Shamir Adleman (RSA) - algorithm to create the subkey. This subkey can be used to sign or encrypt, - but you have to create two different subkeys. - - - - - - - - Key Length - - - Indicates the length in bits of the subkey. - In general the longer the key, the more security it provides. - - - - - Expiration Date - - - Indicates the date the subkey can no longer be used. - - - - - - - - Changing a Subkey Expiration Date - - To change a subkey expiration date, select - the subkey from the Subkeys - section, then: - - - - Click on the Expire button on the left, - - - - - From the date dialog choose the new expiration date or select - Never expires for no expiration date. - - - - - - - - Revoking a Subkey - - To revoke a subkey, select the subkey from the Subkeys - section, then: - - - - Click on the Revoke button on the left, - - - - - Choose a reason why to revoke the subkey: - - - - - No Reason - - - There isn't a specific reason to revoke the key. - - - - - Compromised - - - The key has been compromised. - - - - - Superseded - - - The key has been superseded by another one. - - - - - Not Used - - - The key is not used anymore. - - - - - - - - - Enter a description of why you are revoking the key, - - - - - Click on Revoke. - - - - - - - The effect of revoking a subkey is immediate. - - - - - - Deleting a Subkey - - To delete a subkey, select the subkey from the Subkeys - section, then: - - - - Click on the Delete button on the left. - - - - - - - - - - - Secure Shell Key Properties - - The descriptions in this section apply to all SSH keys. - - - To view properties of a SSH key: - - - - Select the Secure Shell key - from the main window, - - - - - Double click on it or choose Properties - from the toolbar, - - - - - Select the Details tab. - - - - - - - Properties - - - - Fingerprint - - - The fingerprint is a unique string of - characters that exactly identifies a key. - - - - - Algorithm - - - Specifies the encryption algorithm used to - generate a key. - - - - - Location - - - This is the location where the - private key - has been stored. - - - - - Strength - - - Indicates the length in bits of a key. - In general the longer the key, the more - security it provides. - - - A long key is not enough to make up - for the use of a weak passphrase. - - - - - - - - - - - Deleting a Secure Shell Key - - To delete a Secure Shell key: - - - - Select the SSH key from the main window, - - - - - Right click on it and choose Delete key or choose - - Edit - Delete Key - . - - - - - - - - - - - Importing Keys - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - - Select an ASCII armored public block of text, - - - - - Copy it to the clipboard, - - - - - Choose - - Edit - Paste Keys - . - - - - - - - - - - Exporting Keys - - To export keys, select the keys in the main window - and choose - - File - Export - . - - - You can also export keys to the clipboard in an - ASCII armored block of text: - - - - Select the keys in the main window, - - - - - Choose - - Edit - Copy Keys - . - - - - - - - - - - - Signing a Key - - Signing another person's key means you are giving trust to that person. - Before signing a key, you have to carefully check the key's fingerprint - to be sure that the key really belongs to that person. - - - To sign a key in your keyring: - - - - Select the key you want to sign from the - Trusted Keys or - Other Collected Keys tabs, - - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - - Select how carefully the key has been checked, - - - - - Indicate if the signature should be local to your keyring, - and if your signature can be revoked, - - - - - Click on Sign. - - - - - - - - - - Preferences - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - - To change the unlock password of the keyring, first select the appropriate keyring and then - press Change Unlock Password button. You will then be prompted to - type the old password in the Old password text box, the new password in the - New password text box and - confirm it in the Confirm password text box. - To apply the settings, press Change. - If the old password is correct, you will get a status - message indicating the success of the operation. If the - old password is not correct you will be asked to check - its correctness. - - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Key Servers - - Keep your and other's keys up to date by syncing keys periodically with - remote keyservers. Syncing will make sure that you have the latest - signatures made on all of your keys so that the web of trust will be the - most useful. - - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKP Servers - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Keyservers - - - LDAP keyservers are less common, but use the standard LDAP - protocol to serve keys. - ldap://keyserver.pgp.com is a good LDAP - server. - - - - - - - - Key Sharing - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - - To report a bug or make a suggestion regarding this application or - this manual, follow the directions in the - Feedback section of the GNOME User Guide. - - - 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 - is included with this documentation; another can be found in the file - COPYING included with the source code of this program. - - -
diff -Nru seahorse-3.2.2/help/sv/index.docbook seahorse-3.6.3/help/sv/index.docbook --- seahorse-3.2.2/help/sv/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/sv/index.docbook 2012-11-09 17:35:40.000000000 +0100 @@ -0,0 +1,1254 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse-projektet + + + + + 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. + + Denna handbok utgör en av flera GNOME-handböcker som distribueras under villkoren i GFDL. Om du vill distribuera denna handbok separat från övriga handböcker kan du göra detta genom att lägga till en kopia av licensavtalet i handboken enligt instruktionerna i avsnitt 6 i licensavtalet. + + Flera namn på produkter och tjänster är registrerade varumärken. I de fall dessa namn förekommer i GNOME-dokumentation - och medlemmarna i GNOME-dokumentationsprojektet är medvetna om dessa varumärken - är de skrivna med versaler eller med inledande versal. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse-projektet + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Återkoppling + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Introduktion + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Komma igång + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Program-menyn + + Choose + + Accessories + Password and Keys + . + + + + Kommandorad + + Skriv seahorse och tryck på Return. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Menyrad + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Verktygsrad + + Använd verktygsraden för att snabbt komma åt ofta använda kommandon. + + + Flikarna Nycklar och Lösenord + + Tillhandahåller åtkomst till nycklarna och lösenorden i nyckelringen. + + + Förstagångsalternativ + + Tillhandahåller snabb åtkomst till användbara åtgärder för förstagångsanvändare. Härifrån kan du: + + + Bläddra i hjälpsystemet. + + + Importera nycklar till nyckelringen. + + + Skapa nya nycklar. + + + + + + + + + + + + Skapa OpenPGP-nycklar + OpenPGP är ett öppet protokoll för kryptering av e-post med kryptografi baserat på publika PGP-nycklar. Den definierar standardformat för krypterade meddelanden, signaturer, privata nycklar och certifikat för utväxling av publika nycklar. + Kryptografi med publika nycklar är ett koncept vilket involverar användningen av två nycklar: en publik nyckel, som du kan ge till de personer som du vill kommunicera med, och en privat nyckel vilken är privat och måste hållas hemlig. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Använd liknande metoder för att generera ett starkt lösenord när du väljer en lösenfras. Största skillnaden mellan ett lösenord och en lösenfras är att, i lösenfraser, blanksteg är giltiga tecken. + + + + Avancerade alternativ + Fäll ut sektionen Avancerade nyckelalternativ för att ange följande alternativ för en ny nyckel: + + + Encryption Type + + Det här fältet anger krypteringsalgoritmerna som används för att generera dina nycklar. + + + DSA ElGamal + + Det här är ett föreslaget val eftersom det låter dig kryptera, dekryptera, signera och validera vid behov. + + + + DSA + + Kommer endast att tillåta signering. + + + + RSA + + Kommer endast att tillåta signering. + + + + + + + Key Strength (bits) + + Det här är längden på nyckeln i bitar. Desto längre nyckel, ju säkrare kommer den att vara, om en stark lösenfras används. Dock kommer åtgärder med en längre nyckel att kräva mer tid än med en kortare nyckel. Acceptabla värden är mellan 1024 och 4096 bitar. Minst 2048 bitar är rekommenderat. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Skapa Secure Shell-nycklar + Secure Shell (SSH) är ett sätt att logga in på ett fjärrdator för att köra kommandon på den maskinen. SSH-nycklar används i nyckelbaserade autentiseringssystem, som ett alternativ till lösenordsbaserade autentiseringssystem. Med nyckelbaserad autentisering behöver man inte manuellt ange ett lösenord för att autentisera sig. + Secure Shell-nycklar utgörs av två nycklar: en privat nyckel, som måste hållas hemlig, och en publik nyckel som kan skickas till de datorer som du behöver åtkomst till. + För att skapa en Secure Shell-nyckel: + + + Choose FileNew... + + + Välj Secure Shell-nyckel och klicka på Fortsätt + + + Ange en beskrivning av vad nyckeln är tänkt att användas för. Du kan använda din e-postadress eller något annat som påminner dig. Du kan även ange avancerade alternativ för nyckeln: se nedan. + + + Klicka på Skapa bara nyckel för att skapa den nya nyckeln, eller Skapa och konfigurera för att skapa nyckeln och konfigurera en annan dator till att använda nyckeln för autentisering. + + + Dialogrutan Lösenfras för ny Secure Shell-nyckel öppnas. Ange lösenfrasen två gånger för din nya nyckel. + + Använd liknande metoder för att generera ett starkt lösenord när du väljer en lösenfras. Största skillnaden mellan ett lösenord och en lösenfras är att, i lösenfraser, blanksteg är giltiga tecken. + + + + + + + + Avancerade alternativ + Fäll ut sektionen Avancerade nyckelalternativ för att ange följande alternativ för en ny nyckel: + + + + Encryption Type + + Det här fältet anger de krypteringsalgoritmer som används för att generera din nyckel. + + + RSA + + Använd algoritmen Rivest-ShamirAdleman (RSA) för att skapa SSH-nyckeln. Det här är det som föredras och är ett säkrare val. + + + + DSA + + Använd Digital Signature Algorithm (DSA) för att skapa SSH-nyckeln. + + + + + + + Key Strength (bits) + + Det här är längden på nyckeln i bitar. Desto längre nyckel, ju säkrare kommer den att vara, om en stark lösenfras används. Dock kommer åtgärder med en längre nyckel att kräva mer tid än med en kortare nyckel. Acceptabla värden är mellan 1024 och 4096 bitar. Minst 2048 bitar är rekommenderat. + + + + + + + + + + Egenskaper för OpenPGP-nyckel + Beskrivningarna i det här avsnittet gäller för alla OpenPGP-nycklar. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Egenskaper + + + + Fingerprint + + Fingeravtrycket är en unik teckensträng som identifierar en nyckel exakt. + + + + KeyID + + Nyckel-id liknar fingeravtryck. Dock innehåller nyckel-id endast de sista 8 tecknen av fingeravtrycket. Oftast är det möjligt att identifiera en nyckel med endast nyckel-id, men ibland händer det att två nycklar har samma id. + + + + Type + + Anger krypteringsalgoritmen som används för att generera en nyckel. DSA-nycklar kan endast signera. ElGamal-nycklar används för att kryptera. + + + + Created + + Indikerar datumet då nyckeln skapades. + + + + Expires + + Indikerar datumet då nyckeln inte längre kan användas. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Tillit + Tillit är en indikation på hur säker du är på en persons förmåga att på rätt sätt utöka "web of trust" (tillitsnätverk). När du påträffar en nyckel som du inte har signerat, kommer giltigheten på den personens nyckel att bestämmas av de signaturer som de har samlat på sig och hur väl du litar på de personer som har skapat dessa signaturer. Som standard krävs det att en okänd nyckel har 3 signaturer med marginellt tillitsvärde eller en fullständigt betrodd signatur. + + Okänd: Du känner inte till personens förmåga att signera nycklar korrekt. + Aldrig: Den här personen kan inte signera nycklar korrekt. + Marginellt: Den här personen kontrollerar fotoidentifikation innan en nyckel signeras, men undersöker inte identifikationen i detalj. + Fullständigt: Den här personen undersöker varje persons fotoidentifikation i detalj innan signering (t.ex. de signerar endast nycklar som verkligen tillhör personen som frågar efter signaturen). + Förbehållslöst: Den här tillitsnivån bör endast tilldelas dina egna nycklar. + + + + + Aktivera och inaktivera nycklar + När en nyckel aktiveras kan den användas för att genomföra krypteringsåtgärder. När en nyckel är inaktiverad kan den inte användas för att kryptera eller validera signaturer som skapats med den. + + + + Utgångsdatum + En nyckel kan inte längre användas för att genomföra nyckelåtgärder efter att den har gått ut. Ändra utgångsdatumet för en nyckel till ett framtida datum innebär att den återaktiveras. En bra allmän åtgärd är att ha en huvudnyckel som aldrig går ut och flera undernycklar som gör och är signerade av huvudnyckeln. + + + + Användaridentiteter + Användaridentiteter gör att flera identiteter och e-postadresser kan användas med samma nyckel. + + They usually take the form of: + Name (comment) <email address> + + + + Lägg till en användaridentitet + Lägga till en användaridentitet är användbart när du vill ha en identitet för ditt arbete och en för dina vänner. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + Efter att ovanstående instruktioner har följts kommer du att presenteras med en dialogruta. Fälten beskrivs nedan. + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + Du måste ange minst 5 tecken i det här fältet. + + + + + + Email Address + + Din e-postadress är det sätt som de flesta personer kan lokalisera din nyckel på en nyckelserver eller andra nyckelleverantörer. Kontrollera att den är korrekt innan du fortsätter. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + Kommentarsfältet kan användas för att lägga in ytterligare information i det namn som visas för din nya identitet. Den här informationen är sökbar på nyckelservrarna. + + + + + + + + Fotoidentiteter + Fotoidentitet gör att en nyckelägare kan infoga en eller flera bilder på sig själv i en nyckel. Dessa identiteter kan signeras precis som vanliga användaridentiteter. En fotoidentitet måste vara i JPEG-formatet och det rekommenderas att bilden inte är större än 240x288 bildpunkter. + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Ändra lösenfrasen + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Ange den nya lösenfrasen och klicka på OK. + + + + Ta bort en nyckel + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + Du an ta bort dina nycklar, betrodda nycklar och insamlade nycklar. + + + + + + + + Egenskaper för OpenPGP-undernyckel + Varje OpenPGP-nyckel har en huvudnyckel som endast används för signering. Undernycklar används också för att kryptera och för att signera. På det här sättet behöver du inte spärra din huvudnyckel om din undernyckel blir komprometterad. + + + ID + + Det här är identifieraren för undernyckeln. + + + + Type + + Anger krypteringsalgoritmen som används för att generera en undernyckel. DSA-nycklar kan endast signera, ElGamal-nycklar används för att kryptera och RSA-nycklar används för att signera och kryptera. + + + + Created + + Indikerar datumet då nyckeln skapades. + + + + Expires + + Indikerar datumet då nyckeln inte längre kan användas. + + + + Status + + Indikerar statusen för nyckeln. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Lägg till en undernyckel + För att lägga till en undernyckel till en nyckel, från sektionen Undernycklar, klicka på knappen Lägg till. + Efter att ovanstående instruktioner har följts kommer du att presenteras med en dialogruta. Fälten beskrivs nedan. + + + Nyckeltyp + + Anger krypteringsalgoritmen som används för att generera en undernyckel. + + + DSA + + Använd Digital Signature Algorithm (DSA) för att skapa undernyckeln. Den här undernyckeln kan endast signera. + + + + ElGamal + + Använd algoritmen ElGamal för att skapa undernyckeln. Den här undernyckeln kan endast kryptera. + + + + RSA + + Använd algoritmen Rivest-Shamir Adleman (RSA) för att skapa undernyckeln. Den här undernyckeln kan användas för att signera eller kryptera, men du måste skapa två olika undernycklar. + + + + + + + Nyckellängd + + Indikerar längden i bitar på undernyckeln. Desto längre nyckel, ju säkrare kommer den att vara. + + + + Utgångsdatum + + Indikerar datumet när undernyckeln inte längre kan användas. + + + + + + + Ändra utgångsdatum för en undernyckel + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Spärra en undernyckel + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + Effekten av spärrningen av en nyckel är omedelbar. + + + + + Ta bort en undernyckel + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Egenskaper för Secure Shell-nyckel + Beskrivningarna i det här avsnittet gäller för alla SSH-nycklar. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Egenskaper + + + + Fingerprint + + Fingeravtrycket är en unik teckensträng som identifierar en nyckel exakt. + + + + Algorithm + + Anger krypteringsalgoritmen som används för att generera en nyckel. + + + + Location + + Det här är platsen där den privata nyckeln har lagrats. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Ta bort en Secure Shell-nyckel + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Importera nycklar + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Exportera nycklar + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Signera en nyckel + Signering av en annan persons nyckel betyder att du ger tillit till den personen. Innan en nyckel signeras måste du noga kontrollera nyckelns fingeravtryck för att vara säker på att nyckeln verkligen tillhör den personen. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Inställningar + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Lösenordsnyckelringar + + Skapa nyckelringar + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Ändra nyckelringslösenord + För att ändra upplåsningslösenordet för nyckelringen ska du först markera den lämpliga nyckelringen och sedan trycka på knappen Ändra upplåsningslösenord. Du kommer då att bli tillfrågad om att ange det gamla lösenordet i textrutan Gammalt lösenord, det nya lösenordet i textrutan Nytt lösenord och bekräfta det i textrutan Bekräfta lösenordet. Tryck på Ändra för att verkställa ändringen. Om det gamla lösenordet är korrekt kommer du att se ett statusmeddelande som indikerar att åtgärden lyckades. Om det gamla lösenordet var felaktigt kommer du att bli informerad om det. + + + Ta bort nyckelringar + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Nyckelservrar + Håll din och andra nycklar uppdaterade genom att synkronisera nycklarna med jämna mellanrum mot fjärrnyckelservrar. Synkronisering ser till att du har de senaste signaturerna som gjorts på alla dina nycklar så att "web of trust" används på bästa sätt. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + LDAP-nyckelservrar är mindre vanliga, men använder standardiserade LDAP-protokollet för att hantera nycklar. ldap://keyserver.pgp.com är en bra LDAP-server. + + + + + + + Nyckeldelning + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/sv/legal.xml seahorse-3.6.3/help/sv/legal.xml --- seahorse-3.2.2/help/sv/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/sv/legal.xml 2012-11-09 17:35:40.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + Denna handbok utgör en av flera GNOME-handböcker som distribueras under villkoren i GFDL. Om du vill distribuera denna handbok separat från övriga handböcker kan du göra detta genom att lägga till en kopia av licensavtalet i handboken enligt instruktionerna i avsnitt 6 i licensavtalet. + + Flera namn på produkter och tjänster är registrerade varumärken. I de fall dessa namn förekommer i GNOME-dokumentation - och medlemmarna i GNOME-dokumentationsprojektet är medvetna om dessa varumärken - är de skrivna med versaler eller med inledande versal. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/sv/seahorse.xml seahorse-3.6.3/help/sv/seahorse.xml --- seahorse-3.2.2/help/sv/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/sv/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,991 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins och Adam Schreiber - 2006, 2007, 2008Daniel Nylander (po@danielnylander.se) - - Seahorse-projektet - - - - Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter. En kopia av GFDL finns att hämta på denna länk eller i filen COPYING-DOCS som medföljer denna handbok. - Denna handbok utgör en av flera GNOME-handböcker som distribueras under villkoren i GFDL. Om du vill distribuera denna handbok separat från övriga handböcker kan du göra detta genom att lägga till en kopia av licensavtalet i handboken enligt instruktionerna i avsnitt 6 i licensavtalet. - - Flera namn på produkter och tjänster är registrerade varumärken. I de fall dessa namn förekommer i GNOME-dokumentation - och medlemmarna i GNOME-dokumentationsprojektet är medvetna om dessa varumärken - är de skrivna med versaler eller med inledande versal. - - DOKUMENTET OCH MODIFIERADE VERSIONER AV DOKUMENTET TILLHANDAHÅLLS UNDER VILLKOREN I GNU FREE DOCUMENTATION LICENSE ENDAST UNDER FÖLJANDE FÖRUTSÄTTNINGAR: - - DOKUMENTET TILLHANDAHÅLLS I "BEFINTLIGT SKICK" UTAN NÅGRA SOM HELST GARANTIER, VARE SIG UTTRYCKLIGA ELLER UNDERFÖRSTÅDDA, INKLUSIVE, MEN INTE BEGRÄNSAT TILL, GARANTIER ATT DOKUMENTET ELLER EN MODIFIERAD VERSION AV DOKUMENTET INTE INNEHÅLLER NÅGRA FELAKTIGHETER, ÄR LÄMPLIGT FÖR ETT VISST ÄNDAMÅL ELLER INTE STRIDER MOT LAG. HELA RISKEN VAD GÄLLER KVALITET, EXAKTHET OCH UTFÖRANDE AV DOKUMENTET OCH MODIFIERADE VERSIONER AV DOKUMENTET LIGGER HELT OCH HÅLLET PÅ ANVÄNDAREN. OM ETT DOKUMENT ELLER EN MODIFIERAD VERSION AV ETT DOKUMENT SKULLE VISA SIG INNEHÅLLA FELAKTIGHETER I NÅGOT HÄNSEENDE ÄR DET DU (INTE DEN URSPRUNGLIGA SKRIBENTEN, FÖRFATTAREN ELLER NÅGON ANNAN MEDARBETARE) SOM FÅR STÅ FÖR ALLA EVENTUELLA KOSTNADER FÖR SERVICE, REPARATIONER ELLER KORRIGERINGAR. DENNA GARANTIFRISKRIVNING UTGÖR EN VÄSENTLIG DEL AV DETTA LICENSAVTAL. DETTA INNEBÄR ATT ALL ANVÄNDNING AV ETT DOKUMENT ELLER EN MODIFIERAD VERSION AV ETT DOKUMENT BEVILJAS ENDAST UNDER DENNA ANSVARSFRISKRIVNING; - - - UNDER INGA OMSTÄNDIGHETER ELLER INOM RAMEN FÖR NÅGON LAGSTIFTNING, OAVSETT OM DET GÄLLER KRÄNKNING (INKLUSIVE VÅRDSLÖSHET), KONTRAKT ELLER DYLIKT, SKA FÖRFATTAREN, DEN URSPRUNGLIGA SKRIBENTEN ELLER ANNAN MEDARBETARE ELLER ÅTERFÖRSÄLJARE AV DOKUMENTET ELLER AV EN MODIFIERAD VERSION AV DOKUMENTET ELLER NÅGON LEVERANTÖR TILL NÅGON AV NÄMNDA PARTER STÄLLAS ANSVARIG GENTEMOT NÅGON FÖR NÅGRA DIREKTA, INDIREKTA, SÄRSKILDA ELLER OFÖRUTSEDDA SKADOR ELLER FÖLJDSKADOR AV NÅGOT SLAG, INKLUSIVE, MEN INTE BEGRÄNSAT TILL, SKADOR BETRÄFFANDE FÖRLORAD GOODWILL, HINDER I ARBETET, DATORHAVERI ELLER NÅGRA ANDRA TÄNKBARA SKADOR ELLER FÖRLUSTER SOM KAN UPPKOMMA PÅ GRUND AV ELLER RELATERAT TILL ANVÄNDNINGEN AV DOKUMENTET ELLER MODIFIERADE VERSIONER AV DOKUMENTET, ÄVEN OM PART SKA HA BLIVIT INFORMERAD OM MÖJLIGHETEN TILL SÅDANA SKADOR. - - - - - - - - Jacob - Perkins - - Seahorse-projektet - - - - - Adam - Schreiber - - Seahorse-projektet -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse-projektet - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - Augusti 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - November 2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - Juli 2005 - - Adam Schreiber sadam@clemson.edu - Seahorse-projektet - - - - Passwords and Keys Manual V0.7.0 - Februari 2003 - - Jacob Perkins - Seahorse-projektet - - - - This manual describes version 2.28.x of Passwords and Keys - - Återkoppling - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Krypteringsnycklar - - - - - - Introduktion - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Skapa och hantera PGP- och SSH-nycklar, - - - Exportera och importera PGP- och SSH-nycklar, - - - Dela dina nycklar med andra. - - - - - - - - - Komma igång - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Program-menyn - - Choose - - Accessories - Password and Keys - . - - - - Kommandorad - - Skriv seahorse och tryck på Return. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Visa fönstret Passwords and Keys. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Menyrad - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Verktygsrad - - Använd verktygsraden för att snabbt komma åt ofta använda kommandon. - - - Flikarna Nycklar och Lösenord - - Tillhandahåller åtkomst till nycklarna och lösenorden i nyckelringen. - - - Förstagångsalternativ - - Tillhandahåller snabb åtkomst till användbara åtgärder för förstagångsanvändare. Härifrån kan du: - - - Bläddra i hjälpsystemet. - - - Importera nycklar till nyckelringen. - - - Skapa nya nycklar. - - - - - - - - - - - - Skapa OpenPGP-nycklar - OpenPGP är ett öppet protokoll för kryptering av e-post med kryptografi baserat på publika PGP-nycklar. Den definierar standardformat för krypterade meddelanden, signaturer, privata nycklar och certifikat för utväxling av publika nycklar. - Kryptografi med publika nycklar är ett koncept vilket involverar användningen av två nycklar: en publik nyckel, som du kan ge till de personer som du vill kommunicera med, och en privat nyckel vilken är privat och måste hållas hemlig. - För att skapa OpenPGP-nycklar: - - - Choose FileNew... - - - - Välj PGP-nyckel och klicka på Fortsätt - - - Ange ditt fullständiga namn (förnamn - efternamn), din e-postadress och eventuellt ytterligare information. Du kan även ange avancerade alternativ för nyckeln: se nedan. - - - Klicka på Skapa för att skapa det nya nyckelparet. - - - Dialogrutan Lösenfras för ny PGP-nyckel öppnas. Ange lösenfrasen två gånger för din nya nyckel. - - - - Använd liknande metoder för att generera ett starkt lösenord när du väljer en lösenfras. Största skillnaden mellan ett lösenord och en lösenfras är att, i lösenfraser, blanksteg är giltiga tecken. - - - - Avancerade alternativ - Fäll ut sektionen Avancerade nyckelalternativ för att ange följande alternativ för en ny nyckel: - - - Krypteringstyp - - Det här fältet anger krypteringsalgoritmerna som används för att generera dina nycklar. - - - DSA ElGamal - - Det här är ett föreslaget val eftersom det låter dig kryptera, dekryptera, signera och validera vid behov. - - - - DSA - - Kommer endast att tillåta signering. - - - - RSA - - Kommer endast att tillåta signering. - - - - - - - Nyckellängd (bitar) - - Det här är längden på nyckeln i bitar. Desto längre nyckel, ju säkrare kommer den att vara, om en stark lösenfras används. Dock kommer åtgärder med en längre nyckel att kräva mer tid än med en kortare nyckel. Acceptabla värden är mellan 1024 och 4096 bitar. Minst 2048 bitar är rekommenderat. - - - - Utgångsdatum - - Det här är datumet när nyckeln kommer att upphöra att vara användbar för att genomföra kryptering- eller signeringsåtgärder. En rimlig tid är att ställa in den till 6 månader. Du kommer att antingen behöva ändra utgångsdatumet eller generera en ny nyckel eller undernyckel efter den här tidsperioden. - Signera din nya nyckel med din gamla innan den går ut för att behålla din tillitsstatus. - - - - - - - - - - - Skapa Secure Shell-nycklar - Secure Shell (SSH) är ett sätt att logga in på ett fjärrdator för att köra kommandon på den maskinen. SSH-nycklar används i nyckelbaserade autentiseringssystem, som ett alternativ till lösenordsbaserade autentiseringssystem. Med nyckelbaserad autentisering behöver man inte manuellt ange ett lösenord för att autentisera sig. - Secure Shell-nycklar utgörs av två nycklar: en privat nyckel, som måste hållas hemlig, och en publik nyckel som kan skickas till de datorer som du behöver åtkomst till. - För att skapa en Secure Shell-nyckel: - - - Choose FileNew... - - - Välj Secure Shell-nyckel och klicka på Fortsätt - - - Ange en beskrivning av vad nyckeln är tänkt att användas för. Du kan använda din e-postadress eller något annat som påminner dig. Du kan även ange avancerade alternativ för nyckeln: se nedan. - - - Klicka på Skapa bara nyckel för att skapa den nya nyckeln, eller Skapa och konfigurera för att skapa nyckeln och konfigurera en annan dator till att använda nyckeln för autentisering. - - - Dialogrutan Lösenfras för ny Secure Shell-nyckel öppnas. Ange lösenfrasen två gånger för din nya nyckel. - - Använd liknande metoder för att generera ett starkt lösenord när du väljer en lösenfras. Största skillnaden mellan ett lösenord och en lösenfras är att, i lösenfraser, blanksteg är giltiga tecken. - - - - - - - - Avancerade alternativ - Fäll ut sektionen Avancerade nyckelalternativ för att ange följande alternativ för en ny nyckel: - - - - Krypteringstyp - - Det här fältet anger de krypteringsalgoritmer som används för att generera din nyckel. - - - RSA - - Använd algoritmen Rivest-ShamirAdleman (RSA) för att skapa SSH-nyckeln. Det här är det som föredras och är ett säkrare val. - - - - DSA - - Använd Digital Signature Algorithm (DSA) för att skapa SSH-nyckeln. - - - - - - - Nyckellängd (bitar) - - Det här är längden på nyckeln i bitar. Desto längre nyckel, ju säkrare kommer den att vara, om en stark lösenfras används. Dock kommer åtgärder med en längre nyckel att kräva mer tid än med en kortare nyckel. Acceptabla värden är mellan 1024 och 4096 bitar. Minst 2048 bitar är rekommenderat. - - - - - - - - - - Egenskaper för OpenPGP-nyckel - Beskrivningarna i det här avsnittet gäller för alla OpenPGP-nycklar. - - För att visa egenskaperna för en PGP-nyckel: - - Välj PGP-nyckeln från huvudfönstret, - - - Dubbelklicka på den eller välj Egenskaper från verktygsraden, - - - Välj fliken Detaljer. - - - - - Egenskaper - - - - Fingeravtryck - - Fingeravtrycket är en unik teckensträng som identifierar en nyckel exakt. - - - - Nyckel-id - - Nyckel-id liknar fingeravtryck. Dock innehåller nyckel-id endast de sista 8 tecknen av fingeravtrycket. Oftast är det möjligt att identifiera en nyckel med endast nyckel-id, men ibland händer det att två nycklar har samma id. - - - - Typ - - Anger krypteringsalgoritmen som används för att generera en nyckel. DSA-nycklar kan endast signera. ElGamal-nycklar används för att kryptera. - - - - Skapad - - Indikerar datumet då nyckeln skapades. - - - - Går ut - - Indikerar datumet då nyckeln inte längre kan användas. - - - - Styrka - - Indikerar längden i bitar för en nyckel. Generellt sett är en längre nyckel mer säker. - En lång nyckel är inte tillräckligt bra om en svag lösenfras används. - - - - - - - - - Tillit - Tillit är en indikation på hur säker du är på en persons förmåga att på rätt sätt utöka "web of trust" (tillitsnätverk). När du påträffar en nyckel som du inte har signerat, kommer giltigheten på den personens nyckel att bestämmas av de signaturer som de har samlat på sig och hur väl du litar på de personer som har skapat dessa signaturer. Som standard krävs det att en okänd nyckel har 3 signaturer med marginellt tillitsvärde eller en fullständigt betrodd signatur. - - Okänd: Du känner inte till personens förmåga att signera nycklar korrekt. - Aldrig: Den här personen kan inte signera nycklar korrekt. - Marginellt: Den här personen kontrollerar fotoidentifikation innan en nyckel signeras, men undersöker inte identifikationen i detalj. - Fullständigt: Den här personen undersöker varje persons fotoidentifikation i detalj innan signering (t.ex. de signerar endast nycklar som verkligen tillhör personen som frågar efter signaturen). - Förbehållslöst: Den här tillitsnivån bör endast tilldelas dina egna nycklar. - - - - - Aktivera och inaktivera nycklar - När en nyckel aktiveras kan den användas för att genomföra krypteringsåtgärder. När en nyckel är inaktiverad kan den inte användas för att kryptera eller validera signaturer som skapats med den. - - - - Utgångsdatum - En nyckel kan inte längre användas för att genomföra nyckelåtgärder efter att den har gått ut. Ändra utgångsdatumet för en nyckel till ett framtida datum innebär att den återaktiveras. En bra allmän åtgärd är att ha en huvudnyckel som aldrig går ut och flera undernycklar som gör och är signerade av huvudnyckeln. - - - - Användaridentiteter - Användaridentiteter gör att flera identiteter och e-postadresser kan användas med samma nyckel. - De är ofta i formatet: Namn (kommentar) <e-postadress> - - - Lägg till en användaridentitet - Lägga till en användaridentitet är användbart när du vill ha en identitet för ditt arbete och en för dina vänner. - För att lägga till en användaridentitet till en nyckel: - - Välj nyckeln från huvudfönstret. - - - Dubbelklicka på den eller välj Egenskaper från verktygsraden, - - - Välj fliken Namn och signaturer, - - - Klicka på Lägg till namn. - - - Efter att ovanstående instruktioner har följts kommer du att presenteras med en dialogruta. Fälten beskrivs nedan. - - - Fullständigt namn - - Ange ditt fullständiga namn i formatet <förnamn> <efternamn> Ett mellannamn eller initial är valfritt. - - - Du måste ange minst 5 tecken i det här fältet. - - - - - - E-postadress - - Din e-postadress är det sätt som de flesta personer kan lokalisera din nyckel på en nyckelserver eller andra nyckelleverantörer. Kontrollera att den är korrekt innan du fortsätter. - - - Den ska vara i formatet <användarnamn>@<domännamn> - - - - - - Nyckelkommentar - - Kommentarsfältet kan användas för att lägga in ytterligare information i det namn som visas för din nya identitet. Den här informationen är sökbar på nyckelservrarna. - - - - - - - - Fotoidentiteter - Fotoidentitet gör att en nyckelägare kan infoga en eller flera bilder på sig själv i en nyckel. Dessa identiteter kan signeras precis som vanliga användaridentiteter. En fotoidentitet måste vara i JPEG-formatet och det rekommenderas att bilden inte är större än 240x288 bildpunkter. - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Ändra lösenfrasen - För att ändra lösenfrasen som tilldelats en nyckel: - - Välj nyckeln från huvudfönstret. - - - Dubbelklicka på den eller välj Egenskaper från verktygsraden, - - - Klicka på Ändra lösenfras. - - - Ange den nya lösenfrasen och klicka på OK. - - - - Ta bort en nyckel - För att ta bort en nyckel från din nyckelring: - - Välj nyckeln från huvudfönstret. - - - Högerklicka på den och välj Ta bort nyckel eller välj RedigeraTa bort nyckel. - - - - Du an ta bort dina nycklar, betrodda nycklar och insamlade nycklar. - - - - - - - - Egenskaper för OpenPGP-undernyckel - Varje OpenPGP-nyckel har en huvudnyckel som endast används för signering. Undernycklar används också för att kryptera och för att signera. På det här sättet behöver du inte spärra din huvudnyckel om din undernyckel blir komprometterad. - - - ID - - Det här är identifieraren för undernyckeln. - - - - Typ - - Anger krypteringsalgoritmen som används för att generera en undernyckel. DSA-nycklar kan endast signera, ElGamal-nycklar används för att kryptera och RSA-nycklar används för att signera och kryptera. - - - - Skapad - - Indikerar datumet då nyckeln skapades. - - - - Går ut - - Indikerar datumet då nyckeln inte längre kan användas. - - - - Status - - Indikerar statusen för nyckeln. - - - - Styrka - - Indikerar längden i bitar på nyckeln. Desto längre nyckel, ju säkrare kommer den att vara. - En lång nyckel är inte tillräckligt bra om en svag lösenfras används. - - - - - - - Lägg till en undernyckel - För att lägga till en undernyckel till en nyckel, från sektionen Undernycklar, klicka på knappen Lägg till. - Efter att ovanstående instruktioner har följts kommer du att presenteras med en dialogruta. Fälten beskrivs nedan. - - - Nyckeltyp - - Anger krypteringsalgoritmen som används för att generera en undernyckel. - - - DSA - - Använd Digital Signature Algorithm (DSA) för att skapa undernyckeln. Den här undernyckeln kan endast signera. - - - - ElGamal - - Använd algoritmen ElGamal för att skapa undernyckeln. Den här undernyckeln kan endast kryptera. - - - - RSA - - Använd algoritmen Rivest-Shamir Adleman (RSA) för att skapa undernyckeln. Den här undernyckeln kan användas för att signera eller kryptera, men du måste skapa två olika undernycklar. - - - - - - - Nyckellängd - - Indikerar längden i bitar på undernyckeln. Desto längre nyckel, ju säkrare kommer den att vara. - - - - Utgångsdatum - - Indikerar datumet när undernyckeln inte längre kan användas. - - - - - - - Ändra utgångsdatum för en undernyckel - För att ändra utgångsdatumet för en undernyckel, markera undernyckeln från sektionen Undernycklar, och sedan: - - Klicka på knappen Utgång till vänster, - - - Välj det nya utgångsdatumet från datumdialogen eller välj Går aldrig ut för att inte ange något utgångsdatum. - - - - - - Spärra en undernyckel - För att spärra en undernyckel, välj undernyckeln från sektionen Undernycklar, och sedan: - - Klicka på knappen Spärra till vänster, - - - Välj en anledning till varför undernyckeln spärras: - - - - Ingen anledning - - Det finns ingen specifik anledning till att spärra nyckeln. - - - - Komprometterad - - Nyckeln har komprometterats. - - - - Ersatt - - Nyckeln har ersatts av en annan. - - - - Används inte - - Nyckeln används inte längre. - - - - - - - Ange en beskrivning för varför du spärrar nyckeln, - - - Klicka på Spärra. - - - - Effekten av spärrningen av en nyckel är omedelbar. - - - - - Ta bort en undernyckel - För att ta bort en undernyckel, välj undernyckeln från sektionen Undernycklar, och sedan: - - Klicka på knappen Ta bort till vänster. - - - - - - - - - Egenskaper för Secure Shell-nyckel - Beskrivningarna i det här avsnittet gäller för alla SSH-nycklar. - För att visa egenskaper för en SSH-nyckel: - - Välj Secure Shell-nyckeln från huvudfönstret. - - - Dubbelklicka på den eller välj Egenskaper från verktygsraden, - - - Välj fliken Detaljer. - - - - - Egenskaper - - - - Fingeravtryck - - Fingeravtrycket är en unik teckensträng som identifierar en nyckel exakt. - - - - Algoritm - - Anger krypteringsalgoritmen som används för att generera en nyckel. - - - - Plats - - Det här är platsen där den privata nyckeln har lagrats. - - - - Styrka - - Indikerar längden i bitar för en nyckel. Generellt sett är en längre nyckel mer säker. - En lång nyckel är inte tillräckligt bra om en svag lösenfras används. - - - - - - - - - Ta bort en Secure Shell-nyckel - För att ta bort en Secure Shell-nyckel: - - Välj SSH-nyckeln från huvudfönstret, - - - Högerklicka på den och välj Ta bort nyckel eller välj RedigeraTa bort nyckel. - - - - - - - - - Importera nycklar - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - Välj ett publikt ASCII-textblock, - - - Kopiera det till urklipp, - - - Välj RedigeraKlistra in nycklar. - - - - - - - - - Exportera nycklar - - To export keys, select the keys in the main window - and choose - - File - Export - . - - Du kan även exportera nycklar till urklipp i ett ASCII-textblock: - - Välj nycklarna i huvudfönstret, - - - Välj RedigeraKopiera nycklar. - - - - - - - - - Signera en nyckel - Signering av en annan persons nyckel betyder att du ger tillit till den personen. Innan en nyckel signeras måste du noga kontrollera nyckelns fingeravtryck för att vara säker på att nyckeln verkligen tillhör den personen. - För att signera en nyckel i din nyckelring: - - Välj nyckeln som du vill signera från flikarna Betrodda nycklar eller Övriga insamlade nycklar, - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - Välj hur noggrant som nyckeln har kontrollerats, - - - Indikera om signeraturen ska vara lokal för din nyckelring, och om signaturen kan spärras, - - - Klicka på Signera. - - - - - - - - Inställningar - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Lösenordsnyckelringar - - Skapa nyckelringar - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Ändra nyckelringslösenord - För att ändra upplåsningslösenordet för nyckelringen ska du först markera den lämpliga nyckelringen och sedan trycka på knappen Ändra upplåsningslösenord. Du kommer då att bli tillfrågad om att ange det gamla lösenordet i textrutan Gammalt lösenord, det nya lösenordet i textrutan Nytt lösenord och bekräfta det i textrutan Bekräfta lösenordet. Tryck på Ändra för att verkställa ändringen. Om det gamla lösenordet är korrekt kommer du att se ett statusmeddelande som indikerar att åtgärden lyckades. Om det gamla lösenordet var felaktigt kommer du att bli informerad om det. - - - Ta bort nyckelringar - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Nyckelservrar - Håll din och andra nycklar uppdaterade genom att synkronisera nycklarna med jämna mellanrum mot fjärrnyckelservrar. Synkronisering ser till att du har de senaste signaturerna som gjorts på alla dina nycklar så att "web of trust" används på bästa sätt. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKP-servrar - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP Nyckelservrar - - LDAP-nyckelservrar är mindre vanliga, men använder standardiserade LDAP-protokollet för att hantera nycklar. ldap://keyserver.pgp.com är en bra LDAP-server. - - - - - - - Nyckeldelning - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - För att rapportera ett fel eller föreslå någonting angående det här programmet eller den här handboken, följ anvisningarna i återkopplingsavsnittet i Användarguide för skrivbordet. - 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 (du väljer själv) någon senare version. En kopia av den här licensen finns inkluderad med den här dokumentationen; en annan kan hittas i filen COPYING som inkluderats med källkoden för det här programmet. - -
diff -Nru seahorse-3.2.2/help/vi/index.docbook seahorse-3.6.3/help/vi/index.docbook --- seahorse-3.2.2/help/vi/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/vi/index.docbook 2012-11-09 17:35:40.000000000 +0100 @@ -0,0 +1,1265 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Dự án Seahorse + + + + + 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. + + Sổ tay này thuộc về một bộ sưu tập các sổ tay GNOME được phân phối với GFDL. Bạn muốn phân phối sổ tay này một cách riêng với bộ sưu tập thì chỉ cần phải thêm vào sổ tay một bản sao của giấy phép như được diễn tả trong phần 6 của giấy phép. + + Công ty tuyên bố nhãn hiệu cho tên sản phẩm nên tài liệu GNOME ghi tên như vậy bằng chữ hoa, hay chữ hoa đầu từ, miễn là Dự án Tài liệu GNOME biết được nó là nhãn hiệu. + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Dự án Seahorse + + + GNOME Documentation Project + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + Phản hồi + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + Giới thiệu + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + Bắt đầu dùng + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + Trình đơn Ứng dụng + + Choose + + Accessories + Password and Keys + . + + + + Dòng lệnh + + Gõ tên seahorse, rồi bấm phím Return. + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + Thanh trình đơn + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + Thanh công cụ + + Hãy sử dụng thanh công cụ để truy cập nhanh các lệnh thường dùng. + + + Thẻ Khoá và Mật khẩu + + Cung cấp truy cập đến các khoá và mật khẩu nằm trong vòng khoá. + + + Tùy chọn lần đầu tiên + + Cung cấp truy cập nhanh đến các hành động có ích cho người dùng ứng dụng lần đầu tiên. Từ đó, bạn có thể: + + + Duyệt qua hệ thống trợ giúp. + + + Nhập khẩu khoá vào vòng khoá. + + + Tạo khoá mới. + + + + + + + + + + + + Tạo khoá OpenPGP + OpenPGP là một giao thức không phải sở hữu để mã hoá thư điện tử bằng cách sử dụng kỹ thuật mã hóa khóa công cộng dựa vào PGP. Nó xác định các định dạng tiêu chuẩn cho thư điện tử đã mã hoá, chữ ký, khoá riêng và chứng nhận để trao đổi khoá công. + Mã hoá khoá công cộng là một quan niệm đòi hỏi phải sử dụng hai khoá: một khoá công mà bạn có thể cho mỗi người với họ bạn muốn liên lạc, và một khoá riêng mà phải được giữ bí mật. + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + Chọn cụm từ mật khẩu thì giống như cách chọn mật khẩu mạnh. Sự khác nhau chính giữa mật khẩu và cụm từ mật khẩu là dấu cách là ký tự hợp lệ trong cụm từ mật khẩu. + + + + Tùy chọn cấp cao + Dãn ra phần Tùy chọn khoá cấp cao để ghi rõ những tùy chọn theo đây đối với một khoá mới: + + + Encryption Type + + Trường này xác định các thuật toán mật mã được dùng để tạo ra khoá cho bạn. + + + DSA ElGamal + + Đây là sự chọn khuyến khích, vì nó sẽ cho bạn có khả năng mã hoá, giải mã, ký tên và hợp lệ hoá khi nào cần thiết. + + + + DSA + + Chỉ cho phép ký tên. + + + + RSA + + Chỉ cho phép ký tên. + + + + + + + Key Strength (bits) + + Đây là chiều dài của khoá, theo bit. Khoá càng dài càng bảo mật, miễn là bạn sử dụng cụm từ mật khẩu mạnh. Tuy nhiên, thao tác với khoá dài sẽ chạy chậm hơn thao tác với khoá ngắn. Giá trị hợp lệ nằm trong phạm vi 1024 đến 4096 bit: khuyên bạn chọn ít nhất 2048 bit. + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + Tạo khoá SSH + Trình bao bảo mật (SSH) là một phương pháp đăng nhập vào máy tính từ xa để thực hiện lệnh trên máy đó. Khoá SSH được dùng trong hệ thống xác thực dựa vào khoá thì cung cấp cách khác với hệ thống xác thực mật khẩu mặc định. Hệ thống xác thực dựa vào khoá không yêu cầu người dùng gõ mật khẩu để xác thực. + Mỗi khoá SSH chứa hai khoá khác nhau : một khoá riêng phải được giữ bí mật, và một khoá công có thể được tải lên bất cứ máy tính nào bạn muốn truy cập. + Để tạo một khoá SSH: + + + Choose FileNew... + + + Chọn mục trình đơn Khoá SSH, rồi bấm nút Tiếp tục + + + Gõ mô tả về mục đích của khoá. Bạn có thể sử dụng địa chỉ thư điện tử, hay bất cứ lời nhắc nhở khác nhau. Cũng có thể ghi rõ tùy chọn cấp cao cho khoá: xem dưới. + + + Bấm nút Chỉ tạo khoá để tạo khoá mới, hayTạo và Thiết lập để tạo khoá và thiết lập máy tính khác để xác thực bằng nó. + + + Hộp thoại Cụm từ mật khẩu cho khoá SSH mới sẽ mở. Gõ hai lần cụm từ mật khẩu cho khoá mới. + + Chọn cụm từ mật khẩu thì giống như cách chọn mật khẩu mạnh. Sự khác nhau chính giữa mật khẩu và cụm từ mật khẩu là dấu cách là ký tự hợp lệ trong cụm từ mật khẩu. + + + + + + + + Tùy chọn cấp cao + Dãn ra phần Tùy chọn khoá cấp cao để ghi rõ những tùy chọn theo đây cho khoá mới: + + + + Encryption Type + + Trường này xác định những thuật toán mật mã được dùng để tạo ra khoá cho bạn. + + + RSA + + Dùng thuật toán Rivest-ShamirAdleman (RSA) để tạo khoá SSH. Đây là sự chọn bảo mật hơn thì khuyến khích. + + + + DSA + + Dùng thuật toán Digital Signature Algorithm (DSA) để tạo khoá SSH. + + + + + + + Key Strength (bits) + + Đây là chiều dài của khoá, theo bit. Khoá càng dài càng bảo mật, miễn là bạn sử dụng cụm từ mật khẩu mạnh. Tuy nhiên, thao tác với khoá dài sẽ chạy chậm hơn thao tác với khoá ngắn. Giá trị hợp lệ nằm trong phạm vi 1024 đến 4096 bit: khuyên bạn chọn ít nhất 2048 bit. + + + + + + + + + + Thuộc tính khoá OpenPGP + Phần này thích hợp với mọi khoá OpenPGP. + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Thuộc tính + + + + Fingerprint + + Dấu tay là một chuỗi ký tự duy nhất nhận diện chính xác mỗi khoá. + + + + KeyID + + ID khoá tương tự với Dấu tay. Tuy nhiên, ID khoá chỉ chứa 8 ký tự cuối cùng của chuỗi Dấu tay. Thường có thể nhận diện khoá bằng chỉ ID khoá, nhưng thỉnh thoảng hai khoá có cùng ID. + + + + Type + + Xác định thuật toán mã hoá được dùng để tạo ra khoá. Khoá kiểu DSA chỉ có khả năng ký tên. Khoá ElGamal có khả năng mã hoá. + + + + Created + + Khoá được tạo vào ngày tháng này. + + + + Expires + + Đến ngày tháng này thì khoá không còn có khả năng sử dụng lại. + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + Tin cậy + Tình trạng tin cậy trình bày ý kiến của bạn về khả năng của người ấy để mở rộng đúng mạng tin cậy (web of trust). Thấy khoá bạn chưa ký thì độ hợp lệ của khoá đó sẽ được xác định dựa trên số chữ ký họ đã giành được và độ tin cậy của mỗi người cung cấp chữ ký. Mặc định là mỗi khoá lạ cần thiết 3 chữ ký có giá trị độ tin cậy sát giới hạn hay 1 chữ ký đáng tin đầy đủ. + + Không rõ : bạn chưa biết nếu người này có khả năng ký nhận khoá cho đúng không. + Không bao giờ : Người này không thể ký nhận khoá cho đúng. + Sát giới hạn: Người này kiểm tra có thẻ căn cước có ảnh chụp trước khi ký nhận khoá, nhưng không nhất thiết kiểm tra rất cẩn thận. + Đầy: Người này kiểm tra rất cẩn thận thẻ căn cước của mỗi người trước khi ký nhận (tức là họ chỉ ký nhận khoá thật thuộc về người xin chữ ký). + Cuối cùng: Chỉ nên gán mức tin cậy này cho khoá của bạn. + + + + + Bật và Tắt khoá + Bật khoá thì có khả năng sử dụng nó trong thao tác mã hoá. Tắt thì không: không thể sử dụng nó để mã hoá, hay để hợp lệ hoá chữ ký thuộc về nó. + + + + Ngày hết hạn + Hết hạn dùng thì khoá không còn có khả năng sử dụng lại để làm công việc khoá. Việc thay đổi ngày hết hạn của khoá thành ngày tháng trong tương lai sẽ hiệu lực nó lần nữa. Thường có ích để tạo một khoá chủ không bao giờ hết hạn, với nhiều khoá phụ có phải hết hạn mà được ký bằng khoá chủ. + + + + UID + ID người dùng (UID) thì cho phép dùng nhiều chứng minh và địa chỉ thư điện tử đều trong cùng khoá. + + They usually take the form of: + Name (comment) <email address> + + + + Thêm UID + Có ích để thêm ID người dùng, chẳng hạn, khi bạn muốn tạo một chứng minh cho việc làm, và chứng minh khác cho bạn bè. + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + Sau khi theo những hướng dẫn bên trên, bạn sẽ thấy một hộp thoại vào đó cần điền đầy những trường này: + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + Phải gõ ít nhất 5 ký tự vào trường này. + + + + + + Email Address + + Địa chỉ thư điện tử là thông tin theo đó phần lớn người sẽ tìm khoá của bạn trên máy phục vụ khoá. Hãy kiểm tra địa chỉ thư là đúng trước khi tiếp tục. + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + Trường ghi chú cho phép bạn nhập thông tin thêm vào tên trình bày của ID mới. Trên máy phục vụ khoá, cũng có thể tìm kiếm theo thông tin này. + + + + + + + + ID ảnh chụp + ID ảnh chụp thì cho phép người sở hữu khoá cũng chèn vào khoá một hay nhiều ảnh chụp của họ. Chứng minh như vậy có thể được ký nhận, đúng như UID chuẩn. ID ảnh chụp phải theo định dạng JPEG, với kích cỡ tối đa 240×288 điểm ảnh (khuyến khích). + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + Thay đổi cụm từ mật khẩu + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + Gõ cụm từ mật khẩu mới, rồi bấm nút OK. + + + + Xoá khoá + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + Bạn có khả năng xoá khoá của mình, khoá đáng tin và khoá đã thu góp. + + + + + + + + Thuộc tính Khoá phụ OpenPGP + Mỗi khoá OpenPGP có một khoá chủ riêng lẻ được dùng chỉ để ký tên. Khoá phụ được dùng để ký tên, cũng để mã hoá. Bằng cách này, nếu khoá phụ bị hại thậm, bạn vẫn còn không cần hủy bỏ khoá chủ. + + + ID + + Đây là bộ nhận diện khoá phụ. + + + + Type + + Xác định thuật toán mật mã được dùng để tạo ra khoá phụ. Khoá kiểu DSA chỉ có khả năng ký tên, khoá kiểu ElGamal được dùng để mật mã, còn khoá kiểuRSA có khả năng làm cả hai (ký tên và mật mã). + + + + Created + + Khoá được tạo vào ngày tháng này. + + + + Expires + + Đến ngày tháng này thì khoá không còn có khả năng sử dụng lại. + + + + Status + + Ngụ ý trạng thái của khoá. + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + Thêm khoá phụ + Để thêm khoá phụ vào khoá, trong phần Khoá phụ nhấn vào nút Thêm. + Sau khi theo những hướng dẫn bên trên, bạn sẽ thấy một hộp thoại vào đó cần điền đầy những trường này: + + + Kiểu khoá + + Xác định thuật toán mật mã được dùng để tạo ra khoá phụ. + + + DSA + + Dùng Thuật toán chữ ký điện số (DSA) để tạo khoá phụ. Khoá phụ thì chỉ có khả năng ký tên. + + + + ElGamal + + Dùng thuật toán ElGamal để tạo khoá phụ. Khoá phụ thì chỉ có khả năng mật mã. + + + + RSA + + Dùng thuật toán Rivest-Shamir Adleman (RSA) để tạo khoá phụ. Khoá phụ thì có khả năng ký tên hay mật mã, miễn là bạn tạo hai khoá phụ khác nhau. + + + + + + + Dài khoá + + Ngụ ý chiều dài của khoá phụ, theo bit. Nói chung, khoá dài hơn cung cấp mức bảo mật cao hơn. + + + + Ngày hết hạn + + Ngụ ý ngày tháng vào đó khoá phụ không còn có khả năng sử dụng lại. + + + + + + + Thay đổi ngày tháng hết hạn dùng khoá phụ + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + Hủy bỏ khoá phụ + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + Hủy bỏ khoá phụ thì có tác động ngay tức khắc. + + + + + Xoá khoá phụ + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + Thuộc tính khoá SSH + Phần này thích hợp với mọi khoá SSH. + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + Thuộc tính + + + + Fingerprint + + Dấu tay là một chuỗi ký tự duy nhất nhận diện chính xác mỗi khoá. + + + + Algorithm + + Xác định thuật toán mã hoá được dùng để tạo ra khoá. + + + + Location + + Đây là vị trí ở đó khoá riêng được cất giữ. + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + Xoá khoá SSH + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + Nhập khoá + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + Xuất khoá + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + Ký nhận khoá + Việc ký nhận khoá của người khác có nghĩa là bạn đáng tin người ấy, bảo đảm chứng minh của họ cho các người khác. Trước khi ký nhận khoá, bạn cần phải kiểm tra cẩn thận dấu tay của khoá để đảm bảo khoá đó thực sự thuộc về người ấy. + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + Tùy thích + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + Password Keyrings + + Creating Keyrings + + To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. + + + + Changing Keyring Passwords + + To change the unlock password of the keyring, first select the appropriate keyring and then + press Change Unlock Password button. You will then be prompted to + type the old password in the Old password text box, the new password in the + New password text box and + confirm it in the Confirm password text box. + To apply the settings, press Change. + If the old password is correct, you will get a status + message indicating the success of the operation. If the + old password is not correct you will be asked to check + its correctness. + + + + Removing Keyrings + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + Máy phục vụ khoá + Bảo tồn các khoá hiện thời (khoá của bạn và khoá của người khác) bằng cách đồng bộ hoá các khoá với máy phục vụ khoá một cách theo định kỳ. Đồng bộ hoá thì đảm bảo bạn có các chữ ký mới nhất được tạo trên mọi khoá, để mạng tin cậy hữu ích nhất. + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + Máy phục vụ LDAP ít thường dùng hơn, nhưng dùng giao thức LDAP chuẩn để phục vụ khoá. ldap://keyserver.pgp.com là một máy phục vụ khoá LDAP hữu ích. + + + + + + + Chia sẻ khoá + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/vi/legal.xml seahorse-3.6.3/help/vi/legal.xml --- seahorse-3.2.2/help/vi/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/vi/legal.xml 2012-11-09 17:35:40.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + Sổ tay này thuộc về một bộ sưu tập các sổ tay GNOME được phân phối với GFDL. Bạn muốn phân phối sổ tay này một cách riêng với bộ sưu tập thì chỉ cần phải thêm vào sổ tay một bản sao của giấy phép như được diễn tả trong phần 6 của giấy phép. + + Công ty tuyên bố nhãn hiệu cho tên sản phẩm nên tài liệu GNOME ghi tên như vậy bằng chữ hoa, hay chữ hoa đầu từ, miễn là Dự án Tài liệu GNOME biết được nó là nhãn hiệu. + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/vi/seahorse.xml seahorse-3.6.3/help/vi/seahorse.xml --- seahorse-3.2.2/help/vi/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/vi/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,1000 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - - - Dự án Seahorse - - - - Bạn có quyền sao chép, phân phối và/hay sửa đổi tài liệu này với điều kiện của Giấy phép Tài Liệu Tự do GNU (GFDL), Phiên bản 1.1 hay bất kỳ phiên bản sau nào được xuất bản bởi Tổ chức Phần mềm Tự do (FSF) mà không có Tiết đoạn Bất Biến, không có Đoạn Bìa Trước và không có Đoạn Bìa Sau. Bạn có thể tìm bản sao của GFDL ở liên kết này hay trong tập tin COPYING-DOCS có sẵn với sổ tay này. - Sổ tay này thuộc về một bộ sưu tập các sổ tay GNOME được phân phối với GFDL. Bạn muốn phân phối sổ tay này một cách riêng với bộ sưu tập thì chỉ cần phải thêm vào sổ tay một bản sao của giấy phép như được diễn tả trong phần 6 của giấy phép. - - Công ty tuyên bố nhãn hiệu cho tên sản phẩm nên tài liệu GNOME ghi tên như vậy bằng chữ hoa, hay chữ hoa đầu từ, miễn là Dự án Tài liệu GNOME biết được nó là nhãn hiệu. - - Tài liệu và phiên bản đã sửa đổi nào của tài liệu được cung cấp với điều kiện của Giấy phép Tài liệu Tự do GNU với điều kiện thêm là: - - Chúng tôi cung cấp tài liệu này - - - H - - - - - - - - Jacob - Perkins - - Dự án Seahorse - - - - - Adam - Schreiber - - Dự án Seahorse -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME Documentation Project -
- pcutler@foresightlinux.org -
- - - - - - - Dự án Seahorse - - - GNOME Documentation Project - - - - Passwords and Keys Manual V2.11.0 - May 2009 - - - Paul Cutler - pcutler@foresightlinux.org - - - - - Passwords and Keys Manual V0.10.1 - August 2008 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - 11/2006 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - 7/2005 - - Adam Schreiber sadam@clemson.edu - Dự án Seahorse - - - - Passwords and Keys Manual V0.7.0 - 2/2003 - - Jacob Perkins - Dự án Seahorse - - - - This manual describes version 2.28.x of Passwords and Keys - - Phản hồi - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - Khoá Mật mã - - - - - - Giới thiệu - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - Tạo và quản lý các khoá PGP và SSH. - - - Nhập/xuất khẩu các khoá PGP và SSH. - - - Chia các khoá với người khác. - - - - - - - - - Bắt đầu dùng - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - Trình đơn Ứng dụng - - Choose - - Accessories - Password and Keys - . - - - - Dòng lệnh - - Gõ tên seahorse, rồi bấm phím Return. - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - Hiển thị cửa sổ Passwords and Keys. - - - -
- - - The Passwords and Keys window contains the following elements: - - - - Thanh trình đơn - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - Thanh công cụ - - Hãy sử dụng thanh công cụ để truy cập nhanh các lệnh thường dùng. - - - Thẻ Khoá và Mật khẩu - - Cung cấp truy cập đến các khoá và mật khẩu nằm trong vòng khoá. - - - Tùy chọn lần đầu tiên - - Cung cấp truy cập nhanh đến các hành động có ích cho người dùng ứng dụng lần đầu tiên. Từ đó, bạn có thể: - - - Duyệt qua hệ thống trợ giúp. - - - Nhập khẩu khoá vào vòng khoá. - - - Tạo khoá mới. - - - - - - - - - - - - Tạo khoá OpenPGP - OpenPGP là một giao thức không phải sở hữu để mã hoá thư điện tử bằng cách sử dụng kỹ thuật mã hóa khóa công cộng dựa vào PGP. Nó xác định các định dạng tiêu chuẩn cho thư điện tử đã mã hoá, chữ ký, khoá riêng và chứng nhận để trao đổi khoá công. - Mã hoá khoá công cộng là một quan niệm đòi hỏi phải sử dụng hai khoá: một khoá công mà bạn có thể cho mỗi người với họ bạn muốn liên lạc, và một khoá riêng mà phải được giữ bí mật. - Để tạo khoá OpenPGP: - - - Choose FileNew... - - - - Chọn mục Khoá PGP, rồi bấm cái nút Tiếp tục - - - Gõ tên họ và địa chỉ thư điện tử của bạn, và thông tin thêm nào. Cũng có thể ghi rõ tùy chọn cấp cao cho khoá: xem dưới. - - - Nhấn vào nút Tạo để tạo cặp khoá mới. - - - Hộp thoại Cụm từ mật khẩu cho khoá PGP mới sẽ mở. Gõ hai lần cụm từ mật khẩu cho khoá mới. - - - - Chọn cụm từ mật khẩu thì giống như cách chọn mật khẩu mạnh. Sự khác nhau chính giữa mật khẩu và cụm từ mật khẩu là dấu cách là ký tự hợp lệ trong cụm từ mật khẩu. - - - - Tùy chọn cấp cao - Dãn ra phần Tùy chọn khoá cấp cao để ghi rõ những tùy chọn theo đây đối với một khoá mới: - - - Kiểu mật mã - - Trường này xác định các thuật toán mật mã được dùng để tạo ra khoá cho bạn. - - - DSA ElGamal - - Đây là sự chọn khuyến khích, vì nó sẽ cho bạn có khả năng mã hoá, giải mã, ký tên và hợp lệ hoá khi nào cần thiết. - - - - DSA - - Chỉ cho phép ký tên. - - - - RSA - - Chỉ cho phép ký tên. - - - - - - - Độ mạnh khoá (theo bit) - - Đây là chiều dài của khoá, theo bit. Khoá càng dài càng bảo mật, miễn là bạn sử dụng cụm từ mật khẩu mạnh. Tuy nhiên, thao tác với khoá dài sẽ chạy chậm hơn thao tác với khoá ngắn. Giá trị hợp lệ nằm trong phạm vi 1024 đến 4096 bit: khuyên bạn chọn ít nhất 2048 bit. - - - - Ngày hết hạn - - Đây là ngày tháng vào đó khoá này sẽ không còn có khả năng sử dụng lại cho thao tác mật mã hay ký tên. 6 tháng là một khoảng thời gian hữu ích. Sau đó, bạn sẽ cần phải điều chỉnh ngày tháng hết hạn, hoặc tạo ra một khoá hay khoá phụ mới. - - - - - - - - - - Tạo khoá SSH - Trình bao bảo mật (SSH) là một phương pháp đăng nhập vào máy tính từ xa để thực hiện lệnh trên máy đó. Khoá SSH được dùng trong hệ thống xác thực dựa vào khoá thì cung cấp cách khác với hệ thống xác thực mật khẩu mặc định. Hệ thống xác thực dựa vào khoá không yêu cầu người dùng gõ mật khẩu để xác thực. - Mỗi khoá SSH chứa hai khoá khác nhau : một khoá riêng phải được giữ bí mật, và một khoá công có thể được tải lên bất cứ máy tính nào bạn muốn truy cập. - Để tạo một khoá SSH: - - - Choose FileNew... - - - Chọn mục trình đơn Khoá SSH, rồi bấm nút Tiếp tục - - - Gõ mô tả về mục đích của khoá. Bạn có thể sử dụng địa chỉ thư điện tử, hay bất cứ lời nhắc nhở khác nhau. Cũng có thể ghi rõ tùy chọn cấp cao cho khoá: xem dưới. - - - Bấm nút Chỉ tạo khoá để tạo khoá mới, hayTạo và Thiết lập để tạo khoá và thiết lập máy tính khác để xác thực bằng nó. - - - Hộp thoại Cụm từ mật khẩu cho khoá SSH mới sẽ mở. Gõ hai lần cụm từ mật khẩu cho khoá mới. - - Chọn cụm từ mật khẩu thì giống như cách chọn mật khẩu mạnh. Sự khác nhau chính giữa mật khẩu và cụm từ mật khẩu là dấu cách là ký tự hợp lệ trong cụm từ mật khẩu. - - - - - - - - Tùy chọn cấp cao - Dãn ra phần Tùy chọn khoá cấp cao để ghi rõ những tùy chọn theo đây cho khoá mới: - - - - Kiểu mật mã - - Trường này xác định những thuật toán mật mã được dùng để tạo ra khoá cho bạn. - - - RSA - - Dùng thuật toán Rivest-ShamirAdleman (RSA) để tạo khoá SSH. Đây là sự chọn bảo mật hơn thì khuyến khích. - - - - DSA - - Dùng thuật toán Digital Signature Algorithm (DSA) để tạo khoá SSH. - - - - - - - Độ mạnh khoá (theo bit) - - Đây là chiều dài của khoá, theo bit. Khoá càng dài càng bảo mật, miễn là bạn sử dụng cụm từ mật khẩu mạnh. Tuy nhiên, thao tác với khoá dài sẽ chạy chậm hơn thao tác với khoá ngắn. Giá trị hợp lệ nằm trong phạm vi 1024 đến 4096 bit: khuyên bạn chọn ít nhất 2048 bit. - - - - - - - - - - Thuộc tính khoá OpenPGP - Phần này thích hợp với mọi khoá OpenPGP. - - Để xem các thuộc tính của khoá PGP: - - Trong cửa sổ chính, chọn khoá PGP. - - - Nhấn đôi vào nó, hoặc chọn mục Thuộc tính trên thanh công cụ. - - - Chọn thẻ Chi tiết. - - - - - Thuộc tính - - - - Dấu tay - - Dấu tay là một chuỗi ký tự duy nhất nhận diện chính xác mỗi khoá. - - - - ID khoá - - ID khoá tương tự với Dấu tay. Tuy nhiên, ID khoá chỉ chứa 8 ký tự cuối cùng của chuỗi Dấu tay. Thường có thể nhận diện khoá bằng chỉ ID khoá, nhưng thỉnh thoảng hai khoá có cùng ID. - - - - Kiểu - - Xác định thuật toán mã hoá được dùng để tạo ra khoá. Khoá kiểu DSA chỉ có khả năng ký tên. Khoá ElGamal có khả năng mã hoá. - - - - Tạo - - Khoá được tạo vào ngày tháng này. - - - - Hết hạn - - Đến ngày tháng này thì khoá không còn có khả năng sử dụng lại. - - - - Mạnh - - Ngụ ý chiều dài của khoá, theo bit. Nói chung, khoá dài hơn cung cấp mức bảo mật cao hơn. - Khoá dài không đủ để bù về cụm từ mật khẩu yếu. - - - - - - - - - Tin cậy - Tình trạng tin cậy trình bày ý kiến của bạn về khả năng của người ấy để mở rộng đúng mạng tin cậy (web of trust). Thấy khoá bạn chưa ký thì độ hợp lệ của khoá đó sẽ được xác định dựa trên số chữ ký họ đã giành được và độ tin cậy của mỗi người cung cấp chữ ký. Mặc định là mỗi khoá lạ cần thiết 3 chữ ký có giá trị độ tin cậy sát giới hạn hay 1 chữ ký đáng tin đầy đủ. - - Không rõ : bạn chưa biết nếu người này có khả năng ký nhận khoá cho đúng không. - Không bao giờ : Người này không thể ký nhận khoá cho đúng. - Sát giới hạn: Người này kiểm tra có thẻ căn cước có ảnh chụp trước khi ký nhận khoá, nhưng không nhất thiết kiểm tra rất cẩn thận. - Đầy: Người này kiểm tra rất cẩn thận thẻ căn cước của mỗi người trước khi ký nhận (tức là họ chỉ ký nhận khoá thật thuộc về người xin chữ ký). - Cuối cùng: Chỉ nên gán mức tin cậy này cho khoá của bạn. - - - - - Bật và Tắt khoá - Bật khoá thì có khả năng sử dụng nó trong thao tác mã hoá. Tắt thì không: không thể sử dụng nó để mã hoá, hay để hợp lệ hoá chữ ký thuộc về nó. - - - - Ngày hết hạn - Hết hạn dùng thì khoá không còn có khả năng sử dụng lại để làm công việc khoá. Việc thay đổi ngày hết hạn của khoá thành ngày tháng trong tương lai sẽ hiệu lực nó lần nữa. Thường có ích để tạo một khoá chủ không bao giờ hết hạn, với nhiều khoá phụ có phải hết hạn mà được ký bằng khoá chủ. - - - - UID - ID người dùng (UID) thì cho phép dùng nhiều chứng minh và địa chỉ thư điện tử đều trong cùng khoá. - Thường có dạng: Tên (chú thích) <địa chỉ thư> - - - Thêm UID - Có ích để thêm ID người dùng, chẳng hạn, khi bạn muốn tạo một chứng minh cho việc làm, và chứng minh khác cho bạn bè. - Để thêm UID vào khoá: - - Chọn khoá trong cửa sổ chính. - - - Nhấn-đôi vào nó, hoặc chọn mục Thuộc tính trên thanh công cụ. - - - Chọn thẻ Tên và Chữ ký. - - - Nhấn vào nút Thêm tên. - - - Sau khi theo những hướng dẫn bên trên, bạn sẽ thấy một hộp thoại vào đó cần điền đầy những trường này: - - - Tên đầy đủ - - Gõ tên đầy đủ theo dạng <tên> <họ>. Cũng có thể gõ tên đệm hay tên viết tắt. - - - Phải gõ ít nhất 5 ký tự vào trường này. - - - - - - Địa chỉ thư - - Địa chỉ thư điện tử là thông tin theo đó phần lớn người sẽ tìm khoá của bạn trên máy phục vụ khoá. Hãy kiểm tra địa chỉ thư là đúng trước khi tiếp tục. - - - Nó nên có dạng <tên_người_dùng>@<miền> - - - - - - Ghi chú khoá - - Trường ghi chú cho phép bạn nhập thông tin thêm vào tên trình bày của ID mới. Trên máy phục vụ khoá, cũng có thể tìm kiếm theo thông tin này. - - - - - - - - ID ảnh chụp - ID ảnh chụp thì cho phép người sở hữu khoá cũng chèn vào khoá một hay nhiều ảnh chụp của họ. Chứng minh như vậy có thể được ký nhận, đúng như UID chuẩn. ID ảnh chụp phải theo định dạng JPEG, với kích cỡ tối đa 240×288 điểm ảnh (khuyến khích). - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - Thay đổi cụm từ mật khẩu - Để thay đổi cụm từ mật khẩu được gán cho khoá: - - Chọn khoá trong cửa sổ chính. - - - Nhấn đôi vào nó, hoặc chọn mục Thuộc tính trên thanh công cụ. - - - Nhấn vào nút Đổi cụm từ mật khẩu. - - - Gõ cụm từ mật khẩu mới, rồi bấm nút OK. - - - - Xoá khoá - Để xoá khoá khỏi vòng khoá: - - Chọn khoá trong cửa sổ chính. - - - Nhấn-phải vào nó, rồi chọn lệnh Xoá khoá trong trình đơn phụ, hoặc chọn mục trình đơn chính SửaXoá khoá. - - - - Bạn có khả năng xoá khoá của mình, khoá đáng tin và khoá đã thu góp. - - - - - - - - Thuộc tính Khoá phụ OpenPGP - Mỗi khoá OpenPGP có một khoá chủ riêng lẻ được dùng chỉ để ký tên. Khoá phụ được dùng để ký tên, cũng để mã hoá. Bằng cách này, nếu khoá phụ bị hại thậm, bạn vẫn còn không cần hủy bỏ khoá chủ. - - - ID - - Đây là bộ nhận diện khoá phụ. - - - - Kiểu - - Xác định thuật toán mật mã được dùng để tạo ra khoá phụ. Khoá kiểu DSA chỉ có khả năng ký tên, khoá kiểu ElGamal được dùng để mật mã, còn khoá kiểuRSA có khả năng làm cả hai (ký tên và mật mã). - - - - Tạo - - Khoá được tạo vào ngày tháng này. - - - - Hết hạn - - Đến ngày tháng này thì khoá không còn có khả năng sử dụng lại. - - - - Trạng thái - - Ngụ ý trạng thái của khoá. - - - - Mạnh - - Ngụ ý chiều dài của khoá, theo bit. Nói chung, khoá dài hơn cung cấp mức bảo mật cao hơn. - Khoá dài không đủ để bù về cụm từ mật khẩu yếu. - - - - - - - Thêm khoá phụ - Để thêm khoá phụ vào khoá, trong phần Khoá phụ nhấn vào nút Thêm. - Sau khi theo những hướng dẫn bên trên, bạn sẽ thấy một hộp thoại vào đó cần điền đầy những trường này: - - - Kiểu khoá - - Xác định thuật toán mật mã được dùng để tạo ra khoá phụ. - - - DSA - - Dùng Thuật toán chữ ký điện số (DSA) để tạo khoá phụ. Khoá phụ thì chỉ có khả năng ký tên. - - - - ElGamal - - Dùng thuật toán ElGamal để tạo khoá phụ. Khoá phụ thì chỉ có khả năng mật mã. - - - - RSA - - Dùng thuật toán Rivest-Shamir Adleman (RSA) để tạo khoá phụ. Khoá phụ thì có khả năng ký tên hay mật mã, miễn là bạn tạo hai khoá phụ khác nhau. - - - - - - - Dài khoá - - Ngụ ý chiều dài của khoá phụ, theo bit. Nói chung, khoá dài hơn cung cấp mức bảo mật cao hơn. - - - - Ngày hết hạn - - Ngụ ý ngày tháng vào đó khoá phụ không còn có khả năng sử dụng lại. - - - - - - - Thay đổi ngày tháng hết hạn dùng khoá phụ - Để thay đổi ngày tháng hết hạn dùng khoá phụ, chọn khoá phụ trong phầnKhoá phụ, rồi: - - Nhấn vào nút Hết hạn bên trái. - - - Trong hộp thoại ngày tháng, chọn ngày tháng hết hạn mới, hoặc chọn mụcVô hạn cho khoá sẽ không bao giờ hết hạn dùng. - - - - - - Hủy bỏ khoá phụ - Để hủy bỏ khoá phụ, chọn khoá phụ trong phần Khoá phụ, rồi: - - Nhấn vào nút Hủy bỏ bên trái. - - - Chọn lý do tại sao hủy bỏ khoá phụ : - - - - Không lý do - - Không có lý do riêng để hủy bỏ khoá này. - - - - Bị hại thậm - - Khoá đã bị hại thậm. - - - - Bị thay thế - - Khoá bị thay thế bằng khoá khác, vì quá cũ. - - - - Không dùng - - Khoá không còn được dùng lại. - - - - - - - Gõ mô tả về lý do bạn muốn hủy bỏ khoá. - - - Nhấn vào nút Hủy bỏ. - - - - Hủy bỏ khoá phụ thì có tác động ngay tức khắc. - - - - - Xoá khoá phụ - Để xoá khoá phụ, chọn khoá phụ trong phần Khoá phụ, rồi: - - Nhấn vào nút Xoá bên trái. - - - - - - - - - Thuộc tính khoá SSH - Phần này thích hợp với mọi khoá SSH. - Để xem các thuộc tính của khoá SSH: - - Trong cửa sổ chính, chọn khoá SSH. - - - Nhấn đôi vào nó, hoặc chọn mục Thuộc tính trên thanh công cụ. - - - Chọn thẻ Chi tiết. - - - - - Thuộc tính - - - - Dấu tay - - Dấu tay là một chuỗi ký tự duy nhất nhận diện chính xác mỗi khoá. - - - - Thuật toán - - Xác định thuật toán mã hoá được dùng để tạo ra khoá. - - - - Vị trí - - Đây là vị trí ở đó khoá riêng được cất giữ. - - - - Mạnh - - Ngụ ý chiều dài của khoá, theo bit. Nói chung, khoá dài hơn cung cấp mức bảo mật cao hơn. - Khoá dài không đủ để bù về cụm từ mật khẩu yếu. - - - - - - - - - Xoá khoá SSH - Để xoá khoá SSH: - - Trong cửa sổ chính, chọn khoá SSH. - - - Nhấn-phải vào nó và chọn lệnh Xoá khoá trong trình đơn phụ, hoặc chọn mục trình đơn chính SửaXoá khoá. - - - - - - - - - Nhập khoá - - To import keys choose - - File - Import - and select, from the file chooser, a file containing at least one ASCII armored public key. - - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - Chọn một khối văn bản được mã hoá bọc sắt ASCII. - - - Sao chép nó vào bảng nháp. - - - Chọn mục trình đơn SửaDán khoá. - - - - - - - - - Xuất khoá - - To export keys, select the keys in the main window - and choose - - File - Export - . - - Cũng có thể xuất khẩu các khoá vào bảng nháp, trong một khối văn bản được mã hoá bọt sắt ASCII: - - Trong cửa sổ chính, chọn các khoá - - - Chọn mục trình đơn SửaChép khoá. - - - - - - - - - Ký nhận khoá - Việc ký nhận khoá của người khác có nghĩa là bạn đáng tin người ấy, bảo đảm chứng minh của họ cho các người khác. Trước khi ký nhận khoá, bạn cần phải kiểm tra cẩn thận dấu tay của khoá để đảm bảo khoá đó thực sự thuộc về người ấy. - Để ký nhận khoá trong vòng khoá: - - Chọn khoá cần ký nhận trên thẻ Khoá đáng tin hay Các khoá đã tập hợp khác. - - - - Choose Sign from the toolbar - or - File - Sign - , - - - - Chọn mức cẩn thận theo đó bạn đã kiểm tra khoá này. - - - Ngụ ý nếu chữ ký nên nằm trên cùng máy với vòng khoá của bạn, và nếu chữ ký của bạn có thể bị hủy bỏ không. - - - Nhấn vào nút Ký. - - - - - - - - Tùy thích - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - Password Keyrings - - Creating Keyrings - - To create a new keyring, from the menu choose FileNew and choose Password Keyring. Enter a name for the new keyring, and press enter. - - - - Changing Keyring Passwords - - To change the unlock password of the keyring, first select the appropriate keyring and then - press Change Unlock Password button. You will then be prompted to - type the old password in the Old password text box, the new password in the - New password text box and - confirm it in the Confirm password text box. - To apply the settings, press Change. - If the old password is correct, you will get a status - message indicating the success of the operation. If the - old password is not correct you will be asked to check - its correctness. - - - - Removing Keyrings - - To remove a keyring, first select the appropriate keyring and then - from the menu choose Edit Delete. - - - - - - Máy phục vụ khoá - Bảo tồn các khoá hiện thời (khoá của bạn và khoá của người khác) bằng cách đồng bộ hoá các khoá với máy phục vụ khoá một cách theo định kỳ. Đồng bộ hoá thì đảm bảo bạn có các chữ ký mới nhất được tạo trên mọi khoá, để mạng tin cậy hữu ích nhất. - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - Máy phục vụ HKP - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - Máy phục vụ khoá LDAP - - Máy phục vụ LDAP ít thường dùng hơn, nhưng dùng giao thức LDAP chuẩn để phục vụ khoá. ldap://keyserver.pgp.com là một máy phục vụ khoá LDAP hữu ích. - - - - - - - Chia sẻ khoá - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - Để thông báo lỗi hay góp ý về ứng dụng hay sổ tay này, hãy theo những hướng dẫn trên Phần Phản hồi của Sổ tay Người dùng GNOME. - Chương trình này được phân phối với điều kiện của Giấy Phép Công Cộng GNU như được xuất bản bởi Tổ Chức Phần Mềm Tự Do; hoặc phiên bản 2 của Giấy Phép này, hoặc (tùy chọn) bất kỳ phiên bản sau nào. Có một bản sao của giấy phép này cùng với tài liệu này, hoặc trong tập tin COPYING có sẵn với mã nguồn của chương trình này. - -
diff -Nru seahorse-3.2.2/help/zh_CN/index.docbook seahorse-3.6.3/help/zh_CN/index.docbook --- seahorse-3.2.2/help/zh_CN/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/zh_CN/index.docbook 2012-11-09 17:35:41.000000000 +0100 @@ -0,0 +1,1252 @@ + + + + + + +seahorse-daemon"> + +key"> + +]> +
+ + Passwords and Keys Manual + + 2005, 2006, 2007, 2008, 2009 + Jacob Perkins and Adam Schreiber + + + Seahorse 项目 + + + + + 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. + + 本手册是在 GFDL 许可之下分发的 GNOME 手册集合的一部分。如果想要单独分发此手册，可以在手册中添加该许可证的一份副本然后分发，如该许可证的第 6 部分所述。 + + 各个公司使用的许多用于区别它们产品和服务的名称都声明为商标。在所有的 GNOME 文档以及 GNOME 文档项目的成员中，这些名称都是以全大写字母或首字母大写显示，从而表明它们是商标。 + + + 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. + + + + + + + + + + Jacob + Perkins + + Seahorse Project + + + + + Adam + Schreiber + + Seahorse Project +
+ sadam@clemson.edu +
+ + + + Paul + Cutler + + GNOME Documentation Project +
+ pcutler@foresightlinux.org +
+ + + + + + + Seahorse 项目 + + + GNOME 文档项目 + + + + Passwords and Keys Manual V2.11.0 + May 2009 + + + Paul Cutler + pcutler@foresightlinux.org + + + + + Passwords and Keys Manual V0.10.1 + August 2008 + + + Adam Schreiber + sadam@clemson.edu + + + + + Passwords and Keys Manual V0.9.1 + November 2006 + + + Milo Casagrande + milo_casagrande@yahoo.it + + + + + Passwords and Keys Manual V0.9.0 + July 2005 + + Adam Schreiber + sadam@clemson.edu + + Seahorse Project + + + + Passwords and Keys Manual V0.7.0 + February 2003 + + Jacob Perkins + + + Seahorse Project + + + + This manual describes version 2.28.x of Passwords and Keys + + 反馈 + To report a bug or make a suggestion regarding the + Passwords and Keys application or this manual, follow the directions in the + Gnome Feedback Page. + + + + + + Passwords and Keys is the application for managing encryption keys for the GNOME Desktop + + + + + + + Seahorse + + + + seahorse + + + + Encryption Keys + + + + + + 介绍 + + You can use Passwords and Keys to create and manage PGP and SSH keys. + + + Passwords and Keys provides a front end to many of the features of + Gnu Privacy Guard (GPG) and + integrates with multiple components of the GNOME desktop. + + + With Passwords and Keys you can: + + + + Create and manage PGP and SSH keys, + + + Export and import PGP and SSH keys, + + + Share your keys with others, + + + + + + + + + 快速入门 + + Starting <application>Passwords and Keys</application> + + You can start Passwords and Keys + in the following ways: + + + + 点 应用程序 菜单 + + Choose + + Accessories + Password and Keys + . + + + + 命令行 + + 输入 seahorse 然后按 回车键。 + + + + + + + When You Start <application>Passwords and Keys</application> + + When you start Passwords and Keys, the Password and Keys + window is displayed. + + +
+ The <application>Passwords and Keys</application> Window + + + + + + + + Show the Passwords and Keys window. + + + + +
+ + + The Passwords and Keys window contains the following elements: + + + + 菜单栏 + + The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. + + + 工具栏 + + 在工具栏中可以快速访问常用的命令。 + + + 密钥和密码标签 + + 提供在密钥环中访问密钥和密码。 + + + 第一次进入的选项 + + 为首次进入的用户提供快速有用的访问操作，通过它您可以： + + + 浏览帮助， + + + 导入密钥到密钥环， + + + 创建新的密钥。 + + + + + + + + + + + + 创建 OpenPGP 密钥 + OpenPGP 是基于 PGP 公钥算法的非私有协议，用于加密电子邮件。它定义了加密信息、签名、私钥的标准格式，和交换公钥的证书。 + 公钥密码算法是包括两个密钥：一个是 公钥，您可以把它给任何交换信息的人，另一个是 私钥，必须要安全保管好。 + + To create OpenPGP keys: + + + + Choose FileNew... + + + + + Select PGP Key and click Continue + + + + + Enter your full name (first - last), your e-mail address and any additional information. + You can also specify advanced options for the key: see below. + + + + + Click Create to create the new key pair. + + + + + The Passphrase for New PGP Key dialog will open. + Enter the passphrase twice for your new key. + + + + + + 当选择一个密码短语时，用几个简单的习惯语来生成一个强密码。密码和密码短语的主要区别在于，密码短语里可以使用空格。 + + + + 高级选项 + 展开 高级密钥选项，可以为密钥指定下面的选项： + + + Encryption Type + + 这一项指定生成密钥的加密算法。 + + + DSA 算法 + + 这是推荐的选项，可以根据需要进行加密、解密、签名和验证。 + + + + DSA + + 只允许签名。 + + + + RSA + + 只允许签名。 + + + + + + + Key Strength (bits) + + 这是密钥的位数，位数越长将会越安全，使用一个强的密码短语。当然，用一个长的密钥将会使操作花费更多的时间，合适的值在 1024 - 4096 之间，推荐至少2048位。 + + + + Expiration Date + + + This is the date at which the key will cease to be usable for + performing encryption or signing operations. 6 months is a reasonable time + to set it to. You will have to either change the + expiration date or generate a new key or subkey after this amount + of time passes. + + + Sign your new key with your old one before it expires + to preserve your trust status. + + + + + + + + + + + + + 创建 SSH 密钥 + 安全 Shell(SSH)，是登录远程计算机并执行命令的一种方法。SSH 密钥用于基于密钥验证系统中，作为默认密码验证系统的替代。对于基于密钥验证，不需要手动输入密码来验证。 + SSH 密钥制作两个密钥：一个是 私钥，必须要安全保管，另一个是 公钥，可以上传到你要访问的任何一台计算机。 + 创建 SSH 密钥： + + + 点菜单 文件新建... + + + 选择 SSH 密钥，然后点 继续 + + + 输入密钥的用途描述，您可以使用电子邮件地址或其他提示语，您也可以为此密钥设定以下高级选项： + + + 点 仅创建密钥 按钮，创建新密钥，点 创建并设置 按钮，创建并设置其他计算机用它来验证。 + + + 出来一个 新的 SSH 密钥的密码 对话框，输入密码两遍。 + + 当选择一个密码短语时，用几个简单的习惯语来生成一个强密码。密码和密码短语的主要区别在于，密码短语里可以使用空格。 + + + + + + + + 高级选项 + 展开 密钥高级选项，可以为密钥指定以下选项： + + + + Encryption Type + + 这一项指定生成密钥的加密算法。 + + + RSA + + 使用 Rivest-ShamirAdleman (RSA) 算法创建 SSH 密钥，这是首选的并且非常可靠的选择。 + + + + DSA + + 使用 数字签名算法 (DSA) 算法创建 SSH 密钥。 + + + + + + + Key Strength (bits) + + 这是密钥的位数，位数越长将会越安全，使用一个强的密码短语。当然，用一个长的密钥将会使操作花费更多的时间，合适的值在 1024 - 4096 之间，推荐至少2048位。 + + + + + + + + + + OpenPGP 密钥属性 + 本节的内容适用于各种 OpenPGP 密钥。 + + + To view properties of a PGP key: + + + + Select the PGP key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + 属性 + + + + Fingerprint + + 指纹是标记一个密钥的唯一的特征字符串。 + + + + KeyID + + 密钥 ID 跟指纹类似，但是密钥 ID 只包含指纹的最后8个字符。绝大多数情况，用密钥 ID 就可以标识一个密钥，但是有时候也可能出现两个相同的 ID。 + + + + Type + + 指定生成一个密钥的加密算法，DSA 密钥用于签名，ElGamal 密钥用于加密。 + + + + Created + + 密钥的创建日期。 + + + + Expires + + 标识密钥不能再使用的日期。 + + + + Strength + + + Indicates the length in bits of a key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + + + 信任 + “信任”标识您如何确保您通过个人的能力，正确把信任扩展到网络中。当您面对一个还没有签署的密钥时，这个密钥的有效性取决于你是否信任其他签署它的人。 + + 未知：您跟签署人不熟悉，不能确定密钥的有效性。 + 从不：这个人不能正确签署密钥。 + 有限的：这个人在签署密钥时检查过照片 ID，但没有仔细审查这个 ID。 + 完全：在签署它们之前，这个人详细审查每一项包括个人照片 ID（例如，他们仅签署的密钥确实属于这个人，要求了个人签名）。 + 彻底：这一级别应该仅限于您自己的密钥。 + + + + + 启用和禁用密钥 + 当启用一个密钥，它可以用来进行加密操作。当禁用了一个密钥，它就不能用来加密或者验证签名。 + + + + 有效期 + 当一个密钥过期了，它也不能再用来执行密钥操作，延长密钥的期限可以重新启用它，一个好的方法是拥有一个不过期的主密钥和多个子密钥，由主密钥来操作和签署。 + + + + 用户 IDs + 用户 IDs 允许多个身份标识和邮箱地址用于同一个密钥。 + + They usually take the form of: + Name (comment) <email address> + + + + 添加用户 ID + 添加用户 ID 是很有用处的，当您想把一个 ID 用于工作，另一个用于好朋友时。 + + To add a user ID to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Select the Names and Signatures tab, + + + + + Click on Add Name. + + + + + 按照上面的介绍操作，您会看到一个对话框，各个文本框的介绍如下： + + + Full Name + + + Enter your full name in the form + <first> <last> + A middle name or initial is optional. + + + + 您必须在这个文本框中至少输入5个字符。 + + + + + + Email Address + + 您的邮箱地址是大多数人用来在密钥服务器上查找您的密钥，在继续前请确保其正确性。 + + + + It should be of the form + <username>@<domainname> + + + + + + + Key Comment + + 注释可以用来存放您的新 ID 名称的一些额外信息，这些信息可用于在密钥服务器上的搜索。 + + + + + + + + 照片 ID + 照片 ID 允许密钥所有者在密钥中添加一幅或几幅图片，这些标识可以像普通用户 ID 那样作为签名，照片 ID 必须用 JPEG 格式，推荐不大于 240x288 像素。 + + If the chosen image is not of the required file type or size Passwords and Keys + can resize and convert it on the fly from + any image format supported by the GDK library. + + + + + 更改密码 + + To change the passphrase assigned to a key: + + + + Select the key from the main window, + + + + + Double click on it or choose Properties from the toolbar, + + + + + Click on Change Passphrase. + + + + + 输入新密码然后点 确定 按钮。 + + + + 删除密钥 + + To delete a key from your keyring: + + + + Select the key from the main window, + + + + + Right click on it and choose Delete Key + or choose + + Edit + Delete Key + . + + + + + + 您可以删除个人密钥、信任的密钥和收集来的密钥。 + + + + + + + + OpenPGP 子密钥属性 + 每个 OpenPGP 密钥有一个主密钥仅用于签名，子密钥用于加密和签名。这样一来，如果您的子密钥有问题时，您不必撤消您的主密钥。 + + + ID + + 这是子密钥的标识。 + + + + Type + + 指定用于生成子密钥的加密算法，DSA 密钥仅用于签名，ElGamal 密钥用于加密，在 RSA 密钥用于签名或加密时。 + + + + Created + + 密钥的创建日期。 + + + + Expires + + 标识密钥不能再使用的日期。 + + + + Status + + 指示密钥的状态。 + + + + Strength + + + Indicates the length in bits of the key. In general the longer the key, the more security it + provides. + + + A long key is not enough to make up for the use of a weak passphrase. + + + + + + + + + 添加子密钥 + 要添加一个子密钥，在 子密钥 面板里点击 添加 按钮。 + 按照上面的介绍操作，您会看到一个对话框，各个文本框的介绍如下： + + + 密钥类型 + + 指定生成子密钥的加密算法。 + + + DSA + + 使用 数字签名算法 (DSA) 来创建子密钥，它仅用于签名。 + + + + ElGamal + + 使用 ElGamal 算法来创建子密钥，它仅用于加密。 + + + + RSA + + 使用 Rivest-Shamir Adleman (RSA) 算法创建子密钥，这个子密钥可以用于签名或加密，但您得创建两个不同的子密钥。 + + + + + + + 密钥长度 + + 标明子密钥的长度位数，通常越长的密钥越安全。 + + + + 有效期 + + 标明子密钥不能再使用的日期。 + + + + + + + 更改子密钥的有效期 + + To change a subkey expiration date, select + the subkey from the Subkeys + section, then: + + + + Click on the Expire button on the left, + + + + + From the date dialog choose the new expiration date or select + Never expires for no expiration date. + + + + + + + + 撤消一个子密钥 + + To revoke a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Revoke button on the left, + + + + + Choose a reason why to revoke the subkey: + + + + + No Reason + + + There isn't a specific reason to revoke the key. + + + + + Compromised + + + The key has been compromised. + + + + + Superseded + + + The key has been superseded by another one. + + + + + Not Used + + + The key is not used anymore. + + + + + + + + + Enter a description of why you are revoking the key, + + + + + Click on Revoke. + + + + + + 撤消密钥将立即生效。 + + + + + 删除子密钥 + + To delete a subkey, select the subkey from the Subkeys + section, then: + + + + Click on the Delete button on the left. + + + + + + + + + + + SSH 密钥属性 + 这一节的讲述适用于所有 SSH 密钥。 + + To view properties of a SSH key: + + + + Select the Secure Shell key + from the main window, + + + + + Double click on it or choose Properties + from the toolbar, + + + + + Select the Details tab. + + + + + + + 属性 + + + + Fingerprint + + 指纹是标记一个密钥的唯一的特征字符串。 + + + + Algorithm + + 指出生成密钥的加密算法。 + + + + Location + + 私钥 存储的位置。 + + + + Strength + + + Indicates the length in bits of a key. + In general the longer the key, the more + security it provides. + + + A long key is not enough to make up + for the use of a weak passphrase. + + + + + + + + + + + 删除一个 SSH 密钥 + + To delete a Secure Shell key: + + + + Select the SSH key from the main window, + + + + + Right click on it and choose Delete key or choose + + Edit + Delete Key + . + + + + + + + + + + + 导入密钥 + + To import keys choose + + File + Import + and select, from the file chooser, a file containing at least one ASCII armored public key. + + + Importing can also be performed by pasting the keys inside Passwords and Keys: + + + + Select an ASCII armored public block of text, + + + + + Copy it to the clipboard, + + + + + Choose + + Edit + Paste Keys + . + + + + + + + + + + 导出密钥 + + To export keys, select the keys in the main window + and choose + + File + Export + . + + + You can also export keys to the clipboard in an + ASCII armored block of text: + + + + Select the keys in the main window, + + + + + Choose + + Edit + Copy Keys + . + + + + + + + + + + + 签署密钥 + 签署别人的密钥意味着您信任那个人，在签署之前，您应该仔细检查密钥的指纹确定密钥确实属于那个人。 + + To sign a key in your keyring: + + + + Select the key you want to sign from the + Trusted Keys or + Other Collected Keys tabs, + + + + + Choose Sign from the toolbar + or + File + Sign + , + + + + + Select how carefully the key has been checked, + + + + + Indicate if the signature should be local to your keyring, + and if your signature can be revoked, + + + + + Click on Sign. + + + + + + + + + + 首选项 + + This section describes the preferences settable in Passwords and Keys by choosing + + Edit + Preferences + from within Passwords and Keys. + + + + 密码密钥环 + + 创建密钥环 + 要创建一个新的密钥环，点菜单 文件新建，然后选 密码密钥环，输入一个名称，然后按回车键。 + + + 更改密钥环密码 + 要更改密钥环的解锁密码，首先选中它，然后点 更改解锁密码。出来一个对话框，提示在 旧密码 框中输入原先的密码，在 新密码 框中输入新的密码，再在 确认密码 框中再输入一遍新密码，然后点 更改 应用。如果旧密码正确，您会看到一个操作成功的提示，如果旧密码不正确，将会提示重新输入。 + + + 删除密钥环 + + To remove a keyring, first select the appropriate keyring and then + from the menu choose Edit Delete. + + + + + + 密钥服务器 + 在远程服务器上通过定期同步，来保持您的和其他人的密钥最新。同步将确保你有最近的所有密钥的签名，以使信任的网络保持最有用。 + + Passwords and Keys provides support for HKP and LDAP keyservers. + + + + HKP Servers + + + HKP keyservers are ordinary web based keyservers such as the + popular hkp://pool.sks-keyservers.net, also accessible at + http://sks-keyservers.net. + + + + + LDAP Keyservers + + LDAP 密钥服务器很少见，但它使用标准的 LDAP 协议来管理密钥。ldap://keyserver.pgp.com 是一个好的 LDAP 服务器。 + + + + + + + 分享密钥 + + Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. + Enabling key sharing will add the local Passwords and Keys users' public key rings + to the remote search dialog. Using these local "key servers" will most + likely be faster than accessing remote servers. + + + + + + + + About Passwords and Keys + + Passwords and Keys, its associated plugins, the preferences applet and the panel + applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current + maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web + site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit + the Seahorse web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions in the + Feedback section of the GNOME User Guide. + + + 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 + is included with this documentation; another can be found in the file + COPYING included with the source code of this program. + + +
diff -Nru seahorse-3.2.2/help/zh_CN/legal.xml seahorse-3.6.3/help/zh_CN/legal.xml --- seahorse-3.2.2/help/zh_CN/legal.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/help/zh_CN/legal.xml 2012-11-09 17:35:41.000000000 +0100 @@ -0,0 +1,63 @@ + + + + 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. + + 本手册是在 GFDL 许可之下分发的 GNOME 手册集合的一部分。如果想要单独分发此手册，可以在手册中添加该许可证的一份副本然后分发，如该许可证的第 6 部分所述。 + + 各个公司使用的许多用于区别它们产品和服务的名称都声明为商标。在所有的 GNOME 文档以及 GNOME 文档项目的成员中，这些名称都是以全大写字母或首字母大写显示，从而表明它们是商标。 + + + 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. + + + + + diff -Nru seahorse-3.2.2/help/zh_CN/seahorse.xml seahorse-3.6.3/help/zh_CN/seahorse.xml --- seahorse-3.2.2/help/zh_CN/seahorse.xml 2011-11-14 11:53:12.000000000 +0100 +++ seahorse-3.6.3/help/zh_CN/seahorse.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,962 +0,0 @@ - - - - - - -seahorse-daemon"> - -key"> - -]> -
- - Passwords and Keys Manual - - 2005, 2006, 2007, 2008, 2009 - Jacob Perkins and Adam Schreiber - 2010TeliuTe (teliute@163.com) - - Seahorse 项目 - - - - 对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本， 该许可证没有固定的部分、没有封面和背页文本。您可以在此链接上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副本。 - 本手册是在 GFDL 许可之下分发的 GNOME 手册集合的一部分。如果想要单独分发此手册，可以在手册中添加该许可证的一份副本然后分发，如该许可证的第 6 部分所述。 - - 各个公司使用的许多用于区别它们产品和服务的名称都声明为商标。在所有的 GNOME 文档以及 GNOME 文档项目的成员中，这些名称都是以全大写字母或首字母大写显示，从而表明它们是商标。 - - 本文档以及文档的修改版本都是在遵循 GNU 自由文档许可证的条款下提供，这表示具有以下含义： - - 文档按“原样”提供，不提供任何明示或暗示的保证，包括但不限于：文档或文档的修改版本没有适销性方面的缺陷、适合特定目的的适用性，以及没有侵权行为。您将自行承担本文档以及文档修改版本的质量、准确性以及性能方面的风险。如果任何文档或文档修改版本存在缺陷，您(而不是最初的编写者、作者或撰写人)将承担所有必需的服务、维修或更正的费用。此免责声明是本许可证的重要组成部分。如果不接受此免责声明，那么您就没有权利使用任何文档或文档的修改版本；并且 - - - 无论在任何情况以及在任何法律理论下，本文档或文档修改版本的作者、最初的编写者、任何撰写人或任何分发者，或者任意这些方的任何提供者都不对任何人由于使用本文档或文档修改版本引起或带来的任何直接的、间接的、特殊的、偶然的或继发的损失承担任何民事(包括疏忽)、合同或其它方面的责任，这些损失包括但不限于信誉损失、工作停止、计算机失败或故障，或任何以及所有其它损失或由此引发的或与之相关的损失，即使这些方已被告知存在出现此类损失的可能性时也是如此。 - - - - - - - - Jacob - Perkins - - Seahorse 项目 - - - - - Adam - Schreiber - - Seahorse 项目 -
- sadam@clemson.edu -
- - - - Paul - Cutler - - GNOME 文档项目 -
- pcutler@foresightlinux.org -
- - - - - - - Seahorse 项目 - - - GNOME 文档项目 - - - - Passwords and Keys Manual V2.11.0 - 2009年5月 - - Paul Cutler pcutler@foresightlinux.org - - - - Passwords and Keys Manual V0.10.1 - 2008年8月 - - Adam Schreiber sadam@clemson.edu - - - - Passwords and Keys Manual V0.9.1 - 2006年11月 - - Milo Casagrande milo_casagrande@yahoo.it - - - - Passwords and Keys Manual V0.9.0 - 2005年7月 - - Adam Schreiber sadam@clemson.edu - Seahorse 项目 - - - - Passwords and Keys Manual V0.7.0 - 2003年2月 - - Jacob Perkins - Seahorse 项目 - - - - This manual describes version 2.28.x of Passwords and Keys - - 反馈 - To report a bug or make a suggestion regarding the - Passwords and Keys application or this manual, follow the directions in the - Gnome Feedback Page. - - - - - - Passwords and Keys is the application for managing encryption keys for the GNOME Desktop - - - - - - - Seahorse - - - - seahorse - - - - 加密密钥 - - - - - - 介绍 - - You can use Passwords and Keys to create and manage PGP and SSH keys. - - - Passwords and Keys provides a front end to many of the features of - Gnu Privacy Guard (GPG) and - integrates with multiple components of the GNOME desktop. - - - With Passwords and Keys you can: - - - - 创建和管理 PGP 和 SSH 密钥， - - - 导入和导出 PGP、SSH 密钥， - - - 与别人分享你的密钥， - - - - - - - - - 快速入门 - - Starting <application>Passwords and Keys</application> - - You can start Passwords and Keys - in the following ways: - - - - 点 应用程序 菜单 - - Choose - - Accessories - Password and Keys - . - - - - 命令行 - - 输入 seahorse 然后按 回车键。 - - - - - - - When You Start <application>Passwords and Keys</application> - - When you start Passwords and Keys, the Password and Keys - window is displayed. - - -
- The <application>Passwords and Keys</application> Window - - - - - - - 显示 Passwords and Keys 窗口。 - - - -
- - - The Passwords and Keys window contains the following elements: - - - - 菜单栏 - - The menus on the menubar contain all of the commands that you need to perform tasks in Passwords and Keys. - - - 工具栏 - - 在工具栏中可以快速访问常用的命令。 - - - 密钥和密码标签 - - 提供在密钥环中访问密钥和密码。 - - - 第一次进入的选项 - - 为首次进入的用户提供快速有用的访问操作，通过它您可以： - - - 浏览帮助， - - - 导入密钥到密钥环， - - - 创建新的密钥。 - - - - - - - - - - - - 创建 OpenPGP 密钥 - OpenPGP 是基于 PGP 公钥算法的非私有协议，用于加密电子邮件。它定义了加密信息、签名、私钥的标准格式，和交换公钥的证书。 - 公钥密码算法是包括两个密钥：一个是 公钥，您可以把它给任何交换信息的人，另一个是 私钥，必须要安全保管好。 - 创建 OpenPGP 密钥： - - 点菜单 文件新建... - - - 选择 PGP 密钥，然后点 继续 - - - 输入您的姓名（名－姓），您的电子邮箱和其他信息，您还可以指定下面的一些高级选项： - - - 点 创建 按钮，创建新的密钥对。 - - - 接下来出现 新 PGP 密钥的密码 对话框，输入两遍新密钥的密码。 - - - - 当选择一个密码短语时，用几个简单的习惯语来生成一个强密码。密码和密码短语的主要区别在于，密码短语里可以使用空格。 - - - - 高级选项 - 展开 高级密钥选项，可以为密钥指定下面的选项： - - - 加密类型 - - 这一项指定生成密钥的加密算法。 - - - DSA 算法 - - 这是推荐的选项，可以根据需要进行加密、解密、签名和验证。 - - - - DSA - - 只允许签名。 - - - - RSA - - 只允许签名。 - - - - - - - 密钥强度（位） - - 这是密钥的位数，位数越长将会越安全，使用一个强的密码短语。当然，用一个长的密钥将会使操作花费更多的时间，合适的值在 1024 - 4096 之间，推荐至少2048位。 - - - - 有效期 - - 在这个期限内，密钥可以进行加密和签名操作。默认是6个月时间，到期后你可以延长有效期或者生成一个新密钥。 - 密钥被信任的日期，过期将签署一个新密钥。 - - - - - - - - - - - 创建 SSH 密钥 - 安全 Shell(SSH)，是登录远程计算机并执行命令的一种方法。SSH 密钥用于基于密钥验证系统中，作为默认密码验证系统的替代。对于基于密钥验证，不需要手动输入密码来验证。 - SSH 密钥制作两个密钥：一个是 私钥，必须要安全保管，另一个是 公钥，可以上传到你要访问的任何一台计算机。 - 创建 SSH 密钥： - - - 点菜单 文件新建... - - - 选择 SSH 密钥，然后点 继续 - - - 输入密钥的用途描述，您可以使用电子邮件地址或其他提示语，您也可以为此密钥设定以下高级选项： - - - 点 仅创建密钥 按钮，创建新密钥，点 创建并设置 按钮，创建并设置其他计算机用它来验证。 - - - 出来一个 新的 SSH 密钥的密码 对话框，输入密码两遍。 - - 当选择一个密码短语时，用几个简单的习惯语来生成一个强密码。密码和密码短语的主要区别在于，密码短语里可以使用空格。 - - - - - - - - 高级选项 - 展开 密钥高级选项，可以为密钥指定以下选项： - - - - 加密类型 - - 这一项指定生成密钥的加密算法。 - - - RSA - - 使用 Rivest-ShamirAdleman (RSA) 算法创建 SSH 密钥，这是首选的并且非常可靠的选择。 - - - - DSA - - 使用 数字签名算法 (DSA) 算法创建 SSH 密钥。 - - - - - - - 密钥强度（位） - - 这是密钥的位数，位数越长将会越安全，使用一个强的密码短语。当然，用一个长的密钥将会使操作花费更多的时间，合适的值在 1024 - 4096 之间，推荐至少2048位。 - - - - - - - - - - OpenPGP 密钥属性 - 本节的内容适用于各种 OpenPGP 密钥。 - - 查看一个 PGP 密钥的属性： - - 从主窗口选择 PGP 密钥， - - - 双击它，或者在工具栏上点 属性 按钮， - - - 点 细节 标签。 - - - - - 属性 - - - - 指纹 - - 指纹是标记一个密钥的唯一的特征字符串。 - - - - 密钥 ID - - 密钥 ID 跟指纹类似，但是密钥 ID 只包含指纹的最后8个字符。绝大多数情况，用密钥 ID 就可以标识一个密钥，但是有时候也可能出现两个相同的 ID。 - - - - 类型 - - 指定生成一个密钥的加密算法，DSA 密钥用于签名，ElGamal 密钥用于加密。 - - - - 创建 - - 密钥的创建日期。 - - - - 过期 - - 标识密钥不能再使用的日期。 - - - - 保密强度 - - 标识密钥的长度位数，通常越长的密钥，安全性也越高。 - 长的密钥位数不足以弥补弱的密码口令。 - - - - - - - - - 信任 - “信任”标识您如何确保您通过个人的能力，正确把信任扩展到网络中。当您面对一个还没有签署的密钥时，这个密钥的有效性取决于你是否信任其他签署它的人。 - - 未知：您跟签署人不熟悉，不能确定密钥的有效性。 - 从不：这个人不能正确签署密钥。 - 有限的：这个人在签署密钥时检查过照片 ID，但没有仔细审查这个 ID。 - 完全：在签署它们之前，这个人详细审查每一项包括个人照片 ID（例如，他们仅签署的密钥确实属于这个人，要求了个人签名）。 - 彻底：这一级别应该仅限于您自己的密钥。 - - - - - 启用和禁用密钥 - 当启用一个密钥，它可以用来进行加密操作。当禁用了一个密钥，它就不能用来加密或者验证签名。 - - - - 有效期 - 当一个密钥过期了，它也不能再用来执行密钥操作，延长密钥的期限可以重新启用它，一个好的方法是拥有一个不过期的主密钥和多个子密钥，由主密钥来操作和签署。 - - - - 用户 IDs - 用户 IDs 允许多个身份标识和邮箱地址用于同一个密钥。 - 他们通常使用下表：姓名(备注) <邮箱地址> - - - 添加用户 ID - 添加用户 ID 是很有用处的，当您想把一个 ID 用于工作，另一个用于好朋友时。 - 向密钥中添加一个用户 ID： - - 从主窗口中选择密钥， - - - 双击它或者在工具栏上点 属性 按钮， - - - 选择 名称和签名 标签， - - - 点 添加名称 按钮。 - - - 按照上面的介绍操作，您会看到一个对话框，各个文本框的介绍如下： - - - 完整姓名 - - 输入您的完整姓名，如图 <名> <姓>，可选择一个中间名或首字母。 - - - 您必须在这个文本框中至少输入5个字符。 - - - - - - 邮箱地址 - - 您的邮箱地址是大多数人用来在密钥服务器上查找您的密钥，在继续前请确保其正确性。 - - - 它应该如下所示 <username>@<domainname> - - - - - - 密钥注释 - - 注释可以用来存放您的新 ID 名称的一些额外信息，这些信息可用于在密钥服务器上的搜索。 - - - - - - - - 照片 ID - 照片 ID 允许密钥所有者在密钥中添加一幅或几幅图片，这些标识可以像普通用户 ID 那样作为签名，照片 ID 必须用 JPEG 格式，推荐不大于 240x288 像素。 - - If the chosen image is not of the required file type or size Passwords and Keys - can resize and convert it on the fly from - any image format supported by the GDK library. - - - - - 更改密码 - 要更改密码，请按以下步骤操作： - - 从主窗口中选择密钥， - - - 双击它，或者在工具栏上点 属性 按钮， - - - 点击 更改密码 按钮。 - - - 输入新密码然后点 确定 按钮。 - - - - 删除密钥 - 从密钥环中删除密钥： - - 从主窗口中选择密钥， - - - 在密钥上点右键，然后选 删除，或者点菜单 编辑删除。 - - - - 您可以删除个人密钥、信任的密钥和收集来的密钥。 - - - - - - - - OpenPGP 子密钥属性 - 每个 OpenPGP 密钥有一个主密钥仅用于签名，子密钥用于加密和签名。这样一来，如果您的子密钥有问题时，您不必撤消您的主密钥。 - - - ID - - 这是子密钥的标识。 - - - - 类型 - - 指定用于生成子密钥的加密算法，DSA 密钥仅用于签名，ElGamal 密钥用于加密，在 RSA 密钥用于签名或加密时。 - - - - 创建 - - 密钥的创建日期。 - - - - 过期 - - 标识密钥不能再使用的日期。 - - - - 状态 - - 指示密钥的状态。 - - - - 保密强度 - - 标明密钥的长度位数，通常越长的密钥越安全。 - 长的密钥位数不足以弥补弱的密码口令。 - - - - - - - 添加子密钥 - 要添加一个子密钥，在 子密钥 面板里点击 添加 按钮。 - 按照上面的介绍操作，您会看到一个对话框，各个文本框的介绍如下： - - - 密钥类型 - - 指定生成子密钥的加密算法。 - - - DSA - - 使用 数字签名算法 (DSA) 来创建子密钥，它仅用于签名。 - - - - ElGamal - - 使用 ElGamal 算法来创建子密钥，它仅用于加密。 - - - - RSA - - 使用 Rivest-Shamir Adleman (RSA) 算法创建子密钥，这个子密钥可以用于签名或加密，但您得创建两个不同的子密钥。 - - - - - - - 密钥长度 - - 标明子密钥的长度位数，通常越长的密钥越安全。 - - - - 有效期 - - 标明子密钥不能再使用的日期。 - - - - - - - 更改子密钥的有效期 - 要更改子密钥的有效期，在 子密钥 面板选中一个子密钥，然后如下操作： - - 点击旁边的 过期 按钮， - - - 在日期对话框里选择一个新的有效期，或者选中 永不过期 则一直可用。 - - - - - - 撤消一个子密钥 - 要撤消一个子密钥，在 子密钥 面板选中它，然后： - - 点左边的 撤回 按钮， - - - 选择一个撤回的原因： - - - - 无原因 - - 不指定撤回的原因。 - - - - 泄露 - - 密钥已泄露。 - - - - 被取代 - - 密钥被另一个所取代。 - - - - 不使用 - - 该密钥不再使用。 - - - - - - - 描述为什么撤回密钥， - - - 点击 撤回 按钮。 - - - - 撤消密钥将立即生效。 - - - - - 删除子密钥 - 要删除一个子密钥，在 子密钥 面板选中它，然后： - - 点击左边的 删除 按钮。 - - - - - - - - - SSH 密钥属性 - 这一节的讲述适用于所有 SSH 密钥。 - 查看 SSH 密钥的属性： - - 在主窗口中选中一个 SSH 密钥， - - - 双击它，或者在工具栏上点 属性 按钮， - - - 点 细节 标签。 - - - - - 属性 - - - - 指纹 - - 指纹是标记一个密钥的唯一的特征字符串。 - - - - 算法 - - 指出生成密钥的加密算法。 - - - - 位置 - - 私钥 存储的位置。 - - - - 保密强度 - - 标识密钥的长度位数，通常越长的密钥，安全性也越高。 - 长的密钥位数不足以弥补弱的密码口令。 - - - - - - - - - 删除一个 SSH 密钥 - 删除 SSH 密钥： - - 在主窗口中选中一个 SSH 密钥， - - - 在密钥上点右键，然后选 删除，或者点菜单 编辑删除。 - - - - - - - - - 导入密钥 - 要导入一个密钥，点菜单 文件导入，然后在文件选择框里打开一个文件，这个文件至少要包含一个绑定的公钥。 - - Importing can also be performed by pasting the keys inside Passwords and Keys: - - - 选择一个 asc 文本格式文件， - - - 复制到剪贴板， - - - 点菜单 编辑粘贴。 - - - - - - - - - 导出密钥 - 要导出一个密钥，在主窗口中选中它，然后点菜单 文件导出。 - 您可以用 asc 文本格式将密钥导出到剪贴板： - - 在主窗口选中一个密钥， - - - 点菜单 编辑复制。 - - - - - - - - - 签署密钥 - 签署别人的密钥意味着您信任那个人，在签署之前，您应该仔细检查密钥的指纹确定密钥确实属于那个人。 - 签署密钥到您的密钥环： - - 从 信任密钥 或 其他密钥 标签里，选择要签署的密钥， - - - 点工具栏中的 签署 按钮，或者点菜单 文件签署密钥， - - - 选择对这个密钥进行了怎样的检查， - - - 标明这个签名是否存放到本地您的密钥环，以及签署是否可以撤消， - - - 点击 签署 按钮。 - - - - - - - - 首选项 - - This section describes the preferences settable in Passwords and Keys by choosing - - Edit - Preferences - from within Passwords and Keys. - - - - 密码密钥环 - - 创建密钥环 - 要创建一个新的密钥环，点菜单 文件新建，然后选 密码密钥环，输入一个名称，然后按回车键。 - - - 更改密钥环密码 - 要更改密钥环的解锁密码，首先选中它，然后点 更改解锁密码。出来一个对话框，提示在 旧密码 框中输入原先的密码，在 新密码 框中输入新的密码，再在 确认密码 框中再输入一遍新密码，然后点 更改 应用。如果旧密码正确，您会看到一个操作成功的提示，如果旧密码不正确，将会提示重新输入。 - - - 删除密钥环 - 要删除一个密钥环，首先选中它，然后点菜单 编辑删除。 - - - - - 密钥服务器 - 在远程服务器上通过定期同步，来保持您的和其他人的密钥最新。同步将确保你有最近的所有密钥的签名，以使信任的网络保持最有用。 - - Passwords and Keys provides support for HKP and LDAP keyservers. - - - - HKP 服务器 - - - HKP keyservers are ordinary web based keyservers such as the - popular hkp://pool.sks-keyservers.net, also accessible at - http://sks-keyservers.net. - - - - - LDAP 密钥服务器 - - LDAP 密钥服务器很少见，但它使用标准的 LDAP 协议来管理密钥。ldap://keyserver.pgp.com 是一个好的 LDAP 服务器。 - - - - - - - 分享密钥 - - Key Sharing is provided by DNS-SD, also known as Bonjour or Rendevous. - Enabling key sharing will add the local Passwords and Keys users' public key rings - to the remote search dialog. Using these local "key servers" will most - likely be faster than accessing remote servers. - - - - - - - - About Passwords and Keys - - Passwords and Keys, its associated plugins, the preferences applet and the panel - applet are known collectively as Seahorse. Seahorse was written by Jacob Perkins. The current - maintainers are Stef Walter and Adam Schreiber. This manual is by Adam Schreiber. The project's web - site was designed by Jim Pharis. To find more information about Seahorse, the project , please visit - the Seahorse web page. - - 要报告关于此程序或使用手册中的缺陷，或者提出建议，请参照 GNOME 用户指南反馈页。 - 对于本程序的分发遵循自由软件基金会(Free Software Foundation)发布的 GNU 通用公共许可证(GPL)版本第二版或（如果您愿意的话）更高版本。您可以在此 链接，或在随本程序源代码一起分发的 COPYING 文件中找到 GPL 协议的副本。 - -
diff -Nru seahorse-3.2.2/install-sh seahorse-3.6.3/install-sh --- seahorse-3.2.2/install-sh 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/install-sh 2012-10-13 13:58:51.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru seahorse-3.2.2/libegg/Makefile.in seahorse-3.6.3/libegg/Makefile.in --- seahorse-3.2.2/libegg/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/libegg/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,13 +51,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = libegg -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -53,9 +70,10 @@ libeggdatetime_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libeggdatetime_la_OBJECTS = libeggdatetime_la-egg-datetime.lo libeggdatetime_la_OBJECTS = $(am_libeggdatetime_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libeggdatetime_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libeggdatetime_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ @@ -68,6 +86,18 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -78,26 +108,27 @@ $(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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libeggdatetime_la_SOURCES) \ $(libeggtreemultidnd_la_SOURCES) DIST_SOURCES = $(libeggdatetime_la_SOURCES) \ $(libeggtreemultidnd_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -125,9 +156,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -142,15 +171,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -169,10 +194,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -190,7 +222,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -225,6 +256,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -260,6 +292,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -312,9 +346,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libegg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libegg/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu libegg/Makefile + $(AUTOMAKE) --foreign libegg/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -336,15 +370,17 @@ 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 -libeggdatetime.la: $(libeggdatetime_la_OBJECTS) $(libeggdatetime_la_DEPENDENCIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libeggdatetime.la: $(libeggdatetime_la_OBJECTS) $(libeggdatetime_la_DEPENDENCIES) $(EXTRA_libeggdatetime_la_DEPENDENCIES) $(AM_V_CCLD)$(libeggdatetime_la_LINK) $(libeggdatetime_la_OBJECTS) $(libeggdatetime_la_LIBADD) $(LIBS) -libeggtreemultidnd.la: $(libeggtreemultidnd_la_OBJECTS) $(libeggtreemultidnd_la_DEPENDENCIES) +libeggtreemultidnd.la: $(libeggtreemultidnd_la_OBJECTS) $(libeggtreemultidnd_la_DEPENDENCIES) $(EXTRA_libeggtreemultidnd_la_DEPENDENCIES) $(AM_V_CCLD)$(libeggtreemultidnd_la_LINK) $(libeggtreemultidnd_la_OBJECTS) $(libeggtreemultidnd_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -359,42 +395,37 @@ .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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libeggdatetime_la-egg-datetime.lo: egg-datetime.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggdatetime_la_CFLAGS) $(CFLAGS) -MT libeggdatetime_la-egg-datetime.lo -MD -MP -MF $(DEPDIR)/libeggdatetime_la-egg-datetime.Tpo -c -o libeggdatetime_la-egg-datetime.lo `test -f 'egg-datetime.c' || echo '$(srcdir)/'`egg-datetime.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggdatetime_la-egg-datetime.Tpo $(DEPDIR)/libeggdatetime_la-egg-datetime.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='egg-datetime.c' object='libeggdatetime_la-egg-datetime.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='egg-datetime.c' object='libeggdatetime_la-egg-datetime.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggdatetime_la_CFLAGS) $(CFLAGS) -c -o libeggdatetime_la-egg-datetime.lo `test -f 'egg-datetime.c' || echo '$(srcdir)/'`egg-datetime.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggdatetime_la_CFLAGS) $(CFLAGS) -c -o libeggdatetime_la-egg-datetime.lo `test -f 'egg-datetime.c' || echo '$(srcdir)/'`egg-datetime.c libeggtreemultidnd_la-eggtreemultidnd.lo: eggtreemultidnd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) -MT libeggtreemultidnd_la-eggtreemultidnd.lo -MD -MP -MF $(DEPDIR)/libeggtreemultidnd_la-eggtreemultidnd.Tpo -c -o libeggtreemultidnd_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggtreemultidnd_la-eggtreemultidnd.Tpo $(DEPDIR)/libeggtreemultidnd_la-eggtreemultidnd.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggtreemultidnd.c' object='libeggtreemultidnd_la-eggtreemultidnd.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eggtreemultidnd.c' object='libeggtreemultidnd_la-eggtreemultidnd.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) -c -o libeggtreemultidnd_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) -c -o libeggtreemultidnd_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c mostlyclean-libtool: -rm -f *.lo @@ -451,6 +482,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -498,10 +543,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -587,17 +637,18 @@ .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 + clean-libtool clean-noinstLTLIBRARIES cscopelist 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. diff -Nru seahorse-3.2.2/libseahorse/Makefile.am seahorse-3.6.3/libseahorse/Makefile.am --- seahorse-3.2.2/libseahorse/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/Makefile.am 2012-11-09 11:08:13.000000000 +0100 @@ -1,16 +1,16 @@ uidir = $(datadir)/seahorse/ui/ localedir = $(datadir)/locale -pixmapsdir = $(datadir)/pixmaps/seahorse/ seahorselibexecbindir = $(libdir)/seahorse/ INCLUDES = -I$(top_builddir) \ -I$(top_srcdir) \ + -I$(top_srcdir)/libegg \ $(SEAHORSE_CFLAGS) \ + -DPKGDATADIR=\""$(pkgdatadir)/"\" \ -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DPIXMAPSDIR=\""$(pixmapsdir)"\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" MARSHAL_SRCS = \ @@ -28,36 +28,41 @@ endif libseahorse_la_SOURCES = \ + seahorse-action.c seahorse-action.h \ + seahorse-actions.c seahorse-actions.h \ + seahorse-application.c seahorse-application.h \ + seahorse-backend.c seahorse-backend.h \ seahorse-bind.c seahorse-bind.h \ + seahorse-catalog.c seahorse-catalog.h \ seahorse-cleanup.c seahorse-cleanup.h \ - seahorse-combo-keys.c seahorse-combo-keys.h \ - seahorse-commands.c seahorse-commands.h \ - seahorse-context.c seahorse-context.h \ + seahorse-collection.c seahorse-collection.h \ seahorse-debug.c seahorse-debug.h \ - seahorse-dns-sd.c seahorse-dns-sd.h \ - seahorse-gtkstock.c seahorse-gtkstock.h \ + seahorse-delete-dialog.c seahorse-delete-dialog.h \ + seahorse-deletable.c seahorse-deletable.h \ + seahorse-deleter.c seahorse-deleter.h \ + seahorse-exportable.c seahorse-exportable.h \ + seahorse-exporter.c seahorse-exporter.h \ + seahorse-icons.c seahorse-icons.h \ + seahorse-interaction.c seahorse-interaction.h \ + seahorse-key-manager-store.c seahorse-key-manager-store.h \ + seahorse-lockable.c seahorse-lockable.h \ seahorse-object.c seahorse-object.h \ seahorse-object-list.c seahorse-object-list.h \ seahorse-object-model.c seahorse-object-model.h \ seahorse-object-widget.c seahorse-object-widget.h \ seahorse-passphrase.c seahorse-passphrase.h \ + seahorse-place.c seahorse-place.h \ + seahorse-predicate.c seahorse-predicate.h \ seahorse-prefs.c seahorse-prefs.h \ + seahorse-preferences.c seahorse-preferences.h \ seahorse-progress.c seahorse-progress.h \ seahorse-registry.c seahorse-registry.h \ - seahorse-secure-memory.c seahorse-secure-memory.h \ - seahorse-secure-buffer.c seahorse-secure-buffer.h \ seahorse-servers.c seahorse-servers.h \ - seahorse-set.c seahorse-set.h \ - seahorse-set-model.c seahorse-set-model.h \ - seahorse-source.c seahorse-source.h \ - seahorse-transfer.c seahorse-transfer.h \ seahorse-types.c seahorse-types.h \ - seahorse-unknown.c seahorse-unknown.h \ - seahorse-unknown-source.c seahorse-unknown-source.h \ seahorse-util.c seahorse-util.h \ seahorse-validity.c seahorse-validity.h \ - seahorse-view.c seahorse-view.h \ - seahorse-widget.c seahorse-widget.h \ + seahorse-viewable.c seahorse-viewable.h \ + seahorse-widget.c seahorse-widget.h \ $(MARSHAL_SRCS) \ $(KEYSERVER_SRCS) @@ -71,7 +76,8 @@ ui_DATA = \ seahorse-prefs.xml \ seahorse-add-keyserver.xml \ - seahorse-progress.xml + seahorse-progress.xml \ + seahorse.css EXTRA_DIST = $(ui_DATA) \ seahorse-marshal.list diff -Nru seahorse-3.2.2/libseahorse/Makefile.in seahorse-3.6.3/libseahorse/Makefile.in --- seahorse-3.2.2/libseahorse/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/libseahorse/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,13 +52,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = libseahorse -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -51,50 +68,68 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libseahorse_la_LIBADD = -am__libseahorse_la_SOURCES_DIST = seahorse-bind.c seahorse-bind.h \ - seahorse-cleanup.c seahorse-cleanup.h seahorse-combo-keys.c \ - seahorse-combo-keys.h seahorse-commands.c seahorse-commands.h \ - seahorse-context.c seahorse-context.h seahorse-debug.c \ - seahorse-debug.h seahorse-dns-sd.c seahorse-dns-sd.h \ - seahorse-gtkstock.c seahorse-gtkstock.h seahorse-object.c \ +am__libseahorse_la_SOURCES_DIST = seahorse-action.c seahorse-action.h \ + seahorse-actions.c seahorse-actions.h seahorse-application.c \ + seahorse-application.h seahorse-backend.c seahorse-backend.h \ + seahorse-bind.c seahorse-bind.h seahorse-catalog.c \ + seahorse-catalog.h seahorse-cleanup.c seahorse-cleanup.h \ + seahorse-collection.c seahorse-collection.h seahorse-debug.c \ + seahorse-debug.h seahorse-delete-dialog.c \ + seahorse-delete-dialog.h seahorse-deletable.c \ + seahorse-deletable.h seahorse-deleter.c seahorse-deleter.h \ + seahorse-exportable.c seahorse-exportable.h \ + seahorse-exporter.c seahorse-exporter.h seahorse-icons.c \ + seahorse-icons.h seahorse-interaction.c seahorse-interaction.h \ + seahorse-key-manager-store.c seahorse-key-manager-store.h \ + seahorse-lockable.c seahorse-lockable.h seahorse-object.c \ seahorse-object.h seahorse-object-list.c \ seahorse-object-list.h seahorse-object-model.c \ seahorse-object-model.h seahorse-object-widget.c \ seahorse-object-widget.h seahorse-passphrase.c \ - seahorse-passphrase.h seahorse-prefs.c seahorse-prefs.h \ + seahorse-passphrase.h seahorse-place.c seahorse-place.h \ + seahorse-predicate.c seahorse-predicate.h seahorse-prefs.c \ + seahorse-prefs.h seahorse-preferences.c seahorse-preferences.h \ seahorse-progress.c seahorse-progress.h seahorse-registry.c \ - seahorse-registry.h seahorse-secure-memory.c \ - seahorse-secure-memory.h seahorse-secure-buffer.c \ - seahorse-secure-buffer.h seahorse-servers.c seahorse-servers.h \ - seahorse-set.c seahorse-set.h seahorse-set-model.c \ - seahorse-set-model.h seahorse-source.c seahorse-source.h \ - seahorse-transfer.c seahorse-transfer.h seahorse-types.c \ - seahorse-types.h seahorse-unknown.c seahorse-unknown.h \ - seahorse-unknown-source.c seahorse-unknown-source.h \ - seahorse-util.c seahorse-util.h seahorse-validity.c \ - seahorse-validity.h seahorse-view.c seahorse-view.h \ - seahorse-widget.c seahorse-widget.h seahorse-marshal.c \ - seahorse-marshal.h seahorse-keyserver-control.c \ - seahorse-keyserver-control.h + seahorse-registry.h seahorse-servers.c seahorse-servers.h \ + seahorse-types.c seahorse-types.h seahorse-util.c \ + seahorse-util.h seahorse-validity.c seahorse-validity.h \ + seahorse-viewable.c seahorse-viewable.h seahorse-widget.c \ + seahorse-widget.h seahorse-marshal.c seahorse-marshal.h \ + seahorse-keyserver-control.c seahorse-keyserver-control.h am__objects_1 = seahorse-marshal.lo @WITH_KEYSERVER_TRUE@am__objects_2 = seahorse-keyserver-control.lo -am_libseahorse_la_OBJECTS = seahorse-bind.lo seahorse-cleanup.lo \ - seahorse-combo-keys.lo seahorse-commands.lo \ - seahorse-context.lo seahorse-debug.lo seahorse-dns-sd.lo \ - seahorse-gtkstock.lo seahorse-object.lo \ +am_libseahorse_la_OBJECTS = seahorse-action.lo seahorse-actions.lo \ + seahorse-application.lo seahorse-backend.lo seahorse-bind.lo \ + seahorse-catalog.lo seahorse-cleanup.lo seahorse-collection.lo \ + seahorse-debug.lo seahorse-delete-dialog.lo \ + seahorse-deletable.lo seahorse-deleter.lo \ + seahorse-exportable.lo seahorse-exporter.lo seahorse-icons.lo \ + seahorse-interaction.lo seahorse-key-manager-store.lo \ + seahorse-lockable.lo seahorse-object.lo \ seahorse-object-list.lo seahorse-object-model.lo \ seahorse-object-widget.lo seahorse-passphrase.lo \ - seahorse-prefs.lo seahorse-progress.lo seahorse-registry.lo \ - seahorse-secure-memory.lo seahorse-secure-buffer.lo \ - seahorse-servers.lo seahorse-set.lo seahorse-set-model.lo \ - seahorse-source.lo seahorse-transfer.lo seahorse-types.lo \ - seahorse-unknown.lo seahorse-unknown-source.lo \ - seahorse-util.lo seahorse-validity.lo seahorse-view.lo \ + seahorse-place.lo seahorse-predicate.lo seahorse-prefs.lo \ + seahorse-preferences.lo seahorse-progress.lo \ + seahorse-registry.lo seahorse-servers.lo seahorse-types.lo \ + seahorse-util.lo seahorse-validity.lo seahorse-viewable.lo \ seahorse-widget.lo $(am__objects_1) $(am__objects_2) libseahorse_la_OBJECTS = $(am_libseahorse_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -105,24 +140,25 @@ $(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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libseahorse_la_SOURCES) DIST_SOURCES = $(am__libseahorse_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -144,6 +180,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) ETAGS = etags @@ -173,9 +215,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -190,15 +230,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -217,10 +253,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -238,7 +281,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -273,6 +315,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -308,6 +351,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale @@ -328,15 +373,15 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ uidir = $(datadir)/seahorse/ui/ -pixmapsdir = $(datadir)/pixmaps/seahorse/ seahorselibexecbindir = $(libdir)/seahorse/ INCLUDES = -I$(top_builddir) \ -I$(top_srcdir) \ + -I$(top_srcdir)/libegg \ $(SEAHORSE_CFLAGS) \ + -DPKGDATADIR=\""$(pkgdatadir)/"\" \ -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DPIXMAPSDIR=\""$(pixmapsdir)"\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" MARSHAL_SRCS = \ @@ -349,35 +394,40 @@ @WITH_KEYSERVER_FALSE@KEYSERVER_SRCS = @WITH_KEYSERVER_TRUE@KEYSERVER_SRCS = seahorse-keyserver-control.c seahorse-keyserver-control.h libseahorse_la_SOURCES = \ + seahorse-action.c seahorse-action.h \ + seahorse-actions.c seahorse-actions.h \ + seahorse-application.c seahorse-application.h \ + seahorse-backend.c seahorse-backend.h \ seahorse-bind.c seahorse-bind.h \ + seahorse-catalog.c seahorse-catalog.h \ seahorse-cleanup.c seahorse-cleanup.h \ - seahorse-combo-keys.c seahorse-combo-keys.h \ - seahorse-commands.c seahorse-commands.h \ - seahorse-context.c seahorse-context.h \ + seahorse-collection.c seahorse-collection.h \ seahorse-debug.c seahorse-debug.h \ - seahorse-dns-sd.c seahorse-dns-sd.h \ - seahorse-gtkstock.c seahorse-gtkstock.h \ + seahorse-delete-dialog.c seahorse-delete-dialog.h \ + seahorse-deletable.c seahorse-deletable.h \ + seahorse-deleter.c seahorse-deleter.h \ + seahorse-exportable.c seahorse-exportable.h \ + seahorse-exporter.c seahorse-exporter.h \ + seahorse-icons.c seahorse-icons.h \ + seahorse-interaction.c seahorse-interaction.h \ + seahorse-key-manager-store.c seahorse-key-manager-store.h \ + seahorse-lockable.c seahorse-lockable.h \ seahorse-object.c seahorse-object.h \ seahorse-object-list.c seahorse-object-list.h \ seahorse-object-model.c seahorse-object-model.h \ seahorse-object-widget.c seahorse-object-widget.h \ seahorse-passphrase.c seahorse-passphrase.h \ + seahorse-place.c seahorse-place.h \ + seahorse-predicate.c seahorse-predicate.h \ seahorse-prefs.c seahorse-prefs.h \ + seahorse-preferences.c seahorse-preferences.h \ seahorse-progress.c seahorse-progress.h \ seahorse-registry.c seahorse-registry.h \ - seahorse-secure-memory.c seahorse-secure-memory.h \ - seahorse-secure-buffer.c seahorse-secure-buffer.h \ seahorse-servers.c seahorse-servers.h \ - seahorse-set.c seahorse-set.h \ - seahorse-set-model.c seahorse-set-model.h \ - seahorse-source.c seahorse-source.h \ - seahorse-transfer.c seahorse-transfer.h \ seahorse-types.c seahorse-types.h \ - seahorse-unknown.c seahorse-unknown.h \ - seahorse-unknown-source.c seahorse-unknown-source.h \ seahorse-util.c seahorse-util.h \ seahorse-validity.c seahorse-validity.h \ - seahorse-view.c seahorse-view.h \ + seahorse-viewable.c seahorse-viewable.h \ seahorse-widget.c seahorse-widget.h \ $(MARSHAL_SRCS) \ $(KEYSERVER_SRCS) @@ -385,7 +435,8 @@ ui_DATA = \ seahorse-prefs.xml \ seahorse-add-keyserver.xml \ - seahorse-progress.xml + seahorse-progress.xml \ + seahorse.css EXTRA_DIST = $(ui_DATA) \ seahorse-marshal.list @@ -404,9 +455,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libseahorse/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libseahorse/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu libseahorse/Makefile + $(AUTOMAKE) --foreign libseahorse/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -428,13 +479,15 @@ 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 -libseahorse.la: $(libseahorse_la_OBJECTS) $(libseahorse_la_DEPENDENCIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libseahorse.la: $(libseahorse_la_OBJECTS) $(libseahorse_la_DEPENDENCIES) $(EXTRA_libseahorse_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libseahorse_la_OBJECTS) $(libseahorse_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -443,62 +496,64 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-actions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-application.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-backend.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-bind.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-catalog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-cleanup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-combo-keys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-commands.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-context.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-collection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-debug.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-dns-sd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gtkstock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-deletable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-delete-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-deleter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-exportable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-exporter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-icons.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-interaction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-key-manager-store.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-keyserver-control.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-lockable.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-object-list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-object-model.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-object-widget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-passphrase.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-place.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-predicate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-preferences.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-prefs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-progress.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-registry.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-secure-buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-secure-memory.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-servers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-set-model.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-set.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-transfer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-unknown-source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-unknown.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-validity.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-view.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-viewable.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-widget.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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -507,8 +562,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -522,9 +580,7 @@ @$(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 + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -575,6 +631,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -627,10 +697,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -717,18 +792,18 @@ .MAKE: all check install 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 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-uiDATA + clean-libtool clean-noinstLTLIBRARIES cscopelist 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 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-uiDATA seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL) diff -Nru seahorse-3.2.2/libseahorse/seahorse-action.c seahorse-3.6.3/libseahorse/seahorse-action.c --- seahorse-3.2.2/libseahorse/seahorse-action.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-action.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,106 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-action.h" +#include "seahorse-actions.h" + +#include + +static GQuark seahorse_action_window_quark (void) G_GNUC_CONST; + +static GQuark seahorse_action_catalog_quark (void) G_GNUC_CONST; + +static GQuark +seahorse_action_window_quark (void) +{ + static GQuark quark = 0; + if (quark == 0) + quark = g_quark_from_static_string ("seahorse-action-window"); + return quark; +} + +static GQuark +seahorse_action_catalog_quark (void) +{ + static GQuark quark = 0; + if (quark == 0) + quark = g_quark_from_static_string ("seahorse-action-catalog"); + return quark; +} + +void +seahorse_action_pre_activate (GtkAction *action, + SeahorseCatalog *catalog, + GtkWindow *window) +{ + g_return_if_fail (GTK_IS_ACTION (action)); + g_return_if_fail (catalog == NULL || SEAHORSE_IS_CATALOG (catalog)); + g_return_if_fail (window == NULL || GTK_IS_WINDOW (window)); + + g_object_set_qdata_full (G_OBJECT (action), seahorse_action_window_quark (), + window ? g_object_ref (window) : NULL, g_object_unref); + g_object_set_qdata_full (G_OBJECT (action), seahorse_action_catalog_quark (), + catalog ? g_object_ref (catalog) : NULL, g_object_unref); +} + +void +seahorse_action_activate_with_window (GtkAction *action, + SeahorseCatalog *catalog, + GtkWindow *window) +{ + g_return_if_fail (GTK_IS_ACTION (action)); + g_return_if_fail (window != NULL || GTK_IS_WINDOW (window)); + + g_object_ref (action); + + seahorse_action_pre_activate (action, catalog, window); + gtk_action_activate (action); + seahorse_action_post_activate (action); + + g_object_unref (action); +} + +void +seahorse_action_post_activate (GtkAction *action) +{ + g_return_if_fail (GTK_IS_ACTION (action)); + + g_object_set_qdata (G_OBJECT (action), seahorse_action_window_quark (), NULL); + g_object_set_qdata (G_OBJECT (action), seahorse_action_catalog_quark (), NULL); +} + + +GtkWindow * +seahorse_action_get_window (GtkAction *action) +{ + g_return_val_if_fail (GTK_IS_ACTION (action), NULL); + return g_object_get_qdata (G_OBJECT (action), seahorse_action_window_quark ()); +} + +SeahorseCatalog * +seahorse_action_get_catalog (GtkAction *action) +{ + g_return_val_if_fail (GTK_IS_ACTION (action), NULL); + return g_object_get_qdata (G_OBJECT (action), seahorse_action_catalog_quark ()); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-action.h seahorse-3.6.3/libseahorse/seahorse-action.h --- seahorse-3.2.2/libseahorse/seahorse-action.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-action.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,44 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_ACTION_H__ +#define __SEAHORSE_ACTION_H__ + +#include "seahorse-catalog.h" + +#include + +void seahorse_action_pre_activate (GtkAction *action, + SeahorseCatalog *catalog, + GtkWindow *window); + +void seahorse_action_activate_with_window (GtkAction *action, + SeahorseCatalog *catalog, + GtkWindow *window); + +void seahorse_action_post_activate (GtkAction *action); + +GtkWindow * seahorse_action_get_window (GtkAction *action); + +SeahorseCatalog * seahorse_action_get_catalog (GtkAction *action); + +#endif diff -Nru seahorse-3.2.2/libseahorse/seahorse-actions.c seahorse-3.6.3/libseahorse/seahorse-actions.c --- seahorse-3.2.2/libseahorse/seahorse-actions.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-actions.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,160 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-actions.h" + +struct _SeahorseActionsPrivate { + const gchar *definition; + SeahorseCatalog *catalog; + guint catalog_sig; +}; + +G_DEFINE_TYPE (SeahorseActions, seahorse_actions, GTK_TYPE_ACTION_GROUP); + +static void +seahorse_actions_real_update (SeahorseActions *self, + SeahorseCatalog *catalog) +{ + /* Nothing to do */ +} + +static void +seahorse_actions_init (SeahorseActions *self) +{ + self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_ACTIONS, + SeahorseActionsPrivate)); +} + +static void +seahorse_actions_finalize (GObject *obj) +{ + SeahorseActions *actions = SEAHORSE_ACTIONS (obj); + + seahorse_actions_set_catalog (actions, NULL); + + G_OBJECT_CLASS (seahorse_actions_parent_class)->finalize (obj); +} + +static void +seahorse_actions_class_init (SeahorseActionsClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = seahorse_actions_finalize; + + klass->update = seahorse_actions_real_update; + + g_type_class_add_private (klass, sizeof (SeahorseActionsPrivate)); +} + +GtkActionGroup * +seahorse_actions_new (const gchar *name) +{ + g_return_val_if_fail (name != NULL, NULL); + return g_object_new (SEAHORSE_TYPE_ACTIONS, + "name", name, + NULL); +} + +SeahorseCatalog * +seahorse_actions_get_catalog (SeahorseActions *self) +{ + g_return_val_if_fail (SEAHORSE_IS_ACTIONS (self), NULL); + return self->pv->catalog; +} + +static void +on_catalog_gone (gpointer data, + GObject *where_the_object_was) +{ + SeahorseActions *self = SEAHORSE_ACTIONS (data); + + self->pv->catalog = NULL; + self->pv->catalog_sig = 0; +} + +static void +on_catalog_selection (SeahorseCatalog *catalog, + gpointer user_data) +{ + SeahorseActions *self = SEAHORSE_ACTIONS (user_data); + seahorse_actions_update (GTK_ACTION_GROUP (self), catalog); +} + +void +seahorse_actions_set_catalog (SeahorseActions *self, + SeahorseCatalog *catalog) +{ + g_return_if_fail (SEAHORSE_IS_ACTIONS (self)); + g_return_if_fail (catalog == NULL || SEAHORSE_IS_CATALOG (catalog)); + + if (self->pv->catalog) { + g_signal_handler_disconnect (self->pv->catalog, + self->pv->catalog_sig); + g_object_weak_unref (G_OBJECT (self->pv->catalog), + on_catalog_gone, self); + } + + self->pv->catalog = catalog; + if (self->pv->catalog) { + self->pv->catalog_sig = g_signal_connect (self->pv->catalog, + "selection-changed", + G_CALLBACK (on_catalog_selection), + self); + g_object_weak_ref (G_OBJECT (self->pv->catalog), + on_catalog_gone, self); + } +} + +const gchar * +seahorse_actions_get_definition (SeahorseActions* self) +{ + g_return_val_if_fail (SEAHORSE_IS_ACTIONS (self), NULL); + return self->pv->definition; +} + +void +seahorse_actions_register_definition (SeahorseActions *self, + const gchar *definition) +{ + g_return_if_fail (SEAHORSE_IS_ACTIONS (self)); + g_return_if_fail (self->pv->definition == NULL); + self->pv->definition = definition; +} + +void +seahorse_actions_update (GtkActionGroup *actions, + SeahorseCatalog *catalog) +{ + SeahorseActionsClass *klass; + + g_return_if_fail (GTK_IS_ACTION_GROUP (actions)); + + if (!SEAHORSE_IS_ACTIONS (actions)) + return; + + klass = SEAHORSE_ACTIONS_GET_CLASS (actions); + g_assert (klass->update != NULL); + (klass->update) (SEAHORSE_ACTIONS (actions), catalog); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-actions.h seahorse-3.6.3/libseahorse/seahorse-actions.h --- seahorse-3.2.2/libseahorse/seahorse-actions.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-actions.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,71 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_ACTIONS_H__ +#define __SEAHORSE_ACTIONS_H__ + +#include + +#include "seahorse-object.h" +#include "seahorse-catalog.h" + +#define SEAHORSE_TYPE_ACTIONS (seahorse_actions_get_type ()) +#define SEAHORSE_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_ACTIONS, SeahorseActions)) +#define SEAHORSE_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_ACTIONS, SeahorseActionsClass)) +#define SEAHORSE_IS_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_ACTIONS)) +#define SEAHORSE_IS_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_ACTIONS)) +#define SEAHORSE_ACTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_ACTIONS, SeahorseActionsClass)) + +typedef struct _SeahorseActions SeahorseActions; +typedef struct _SeahorseActionsClass SeahorseActionsClass; +typedef struct _SeahorseActionsPrivate SeahorseActionsPrivate; + +struct _SeahorseActions { + GtkActionGroup parent_instance; + SeahorseActionsPrivate *pv; +}; + +struct _SeahorseActionsClass { + GtkActionGroupClass parent_class; + + void (* update) (SeahorseActions *actions, + SeahorseCatalog *catalog); +}; + +GType seahorse_actions_get_type (void); + +GtkActionGroup * seahorse_actions_new (const gchar *name); + +SeahorseCatalog * seahorse_actions_get_catalog (SeahorseActions *self); + +void seahorse_actions_set_catalog (SeahorseActions *self, + SeahorseCatalog *catalog); + +const gchar * seahorse_actions_get_definition (SeahorseActions *self); + +void seahorse_actions_register_definition (SeahorseActions *self, + const gchar *definition); + +void seahorse_actions_update (GtkActionGroup *actions, + SeahorseCatalog *catalog); + +#endif diff -Nru seahorse-3.2.2/libseahorse/seahorse-application.c seahorse-3.6.3/libseahorse/seahorse-application.c --- seahorse-3.2.2/libseahorse/seahorse-application.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-application.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,203 @@ +/* + * Seahorse + * + * Copyright (C) 2003 Jacob Perkins + * Copyright (C) 2005, 2006 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * Copyright (C) 2012 Stefan Walter + * + * 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 "config.h" + +#include "seahorse-application.h" +#include "seahorse-icons.h" + +#include "gkr/seahorse-gkr.h" +#include "pgp/seahorse-pgp.h" +#include "ssh/seahorse-ssh.h" +#include "pkcs11/seahorse-pkcs11.h" + +#include + +#include + +struct _SeahorseApplication { + GtkApplication parent; + GSettings *seahorse_settings; + GSettings *crypto_pgp_settings; +}; + +struct _SeahorseApplicationClass { + GtkApplicationClass parent_class; +}; + +G_DEFINE_TYPE (SeahorseApplication, seahorse_application, GTK_TYPE_APPLICATION); + +static SeahorseApplication *the_application = NULL; + +static void +seahorse_application_constructed (GObject *obj) +{ + SeahorseApplication *self = SEAHORSE_APPLICATION (obj); + + g_return_if_fail (the_application == NULL); + + G_OBJECT_CLASS (seahorse_application_parent_class)->constructed (obj); + + the_application = self; + + self->seahorse_settings = g_settings_new ("org.gnome.seahorse"); + +#ifdef WITH_PGP + /* This is installed by gnome-keyring */ + self->crypto_pgp_settings = g_settings_new ("org.gnome.crypto.pgp"); +#endif +} + +static void +seahorse_application_finalize (GObject *gobject) +{ + SeahorseApplication *self = SEAHORSE_APPLICATION (gobject); + the_application = NULL; + +#ifdef WITH_PGP + g_clear_object (&self->crypto_pgp_settings); +#endif + g_clear_object (&self->seahorse_settings); + + G_OBJECT_CLASS (seahorse_application_parent_class)->finalize (gobject); +} + +static void +seahorse_application_startup (GApplication *application) +{ + /* Insert Icons into Stock */ + seahorse_icons_init (); + + /* Initialize the various components */ +#ifdef WITH_PGP + seahorse_pgp_backend_initialize (); +#endif +#ifdef WITH_SSH + seahorse_ssh_backend_initialize (); +#endif +#ifdef WITH_PKCS11 + seahorse_pkcs11_backend_initialize (); +#endif + seahorse_gkr_backend_initialize (); + + G_APPLICATION_CLASS (seahorse_application_parent_class)->startup (application); +} + +static gboolean +seahorse_application_local_command_line (GApplication *application, + gchar ***arguments, + gint *exit_status) +{ + gboolean show_version = FALSE; + GOptionContext *context; + GError *error = NULL; + int argc; + + GOptionEntry options[] = { + { "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL }, + { NULL, 0, 0, 0, NULL, NULL, NULL } + }; + + argc = g_strv_length (*arguments); + + context = g_option_context_new (N_("- System Settings")); + g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); + g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_set_help_enabled (context, FALSE); + g_option_context_set_ignore_unknown_options (context, TRUE); + + if (g_option_context_parse (context, &argc, arguments, &error) == FALSE) { + g_printerr ("seahorse: %s\n", error->message); + g_option_context_free (context); + g_error_free (error); + *exit_status = 1; + return TRUE; + } + + g_option_context_free (context); + + if (show_version) { + g_print ("%s\n", PACKAGE_STRING); +#ifdef WITH_PGP + g_print ("GNUPG: %s (%d.%d.%d)\n", GNUPG, GPG_MAJOR, GPG_MINOR, GPG_MICRO); +#endif + *exit_status = 0; + return TRUE; + } + + return G_APPLICATION_CLASS (seahorse_application_parent_class)->local_command_line (application, arguments, exit_status); +} + +static void +seahorse_application_class_init (SeahorseApplicationClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GApplicationClass *application_class = G_APPLICATION_CLASS (klass); + + gobject_class->constructed = seahorse_application_constructed; + gobject_class->finalize = seahorse_application_finalize; + + application_class->startup = seahorse_application_startup; + application_class->local_command_line = seahorse_application_local_command_line; +} + +static void +seahorse_application_init (SeahorseApplication *self) +{ + +} + +GtkApplication * +seahorse_application_new (void) +{ + return g_object_new (SEAHORSE_TYPE_APPLICATION, + "application-id", "org.gnome.seahorse", + NULL); +} + +GtkApplication * +seahorse_application_get (void) +{ + g_return_val_if_fail (the_application != NULL, NULL); + return GTK_APPLICATION (the_application); +} + +GSettings * +seahorse_application_settings (SeahorseApplication *self) +{ + if (self == NULL) + self = the_application; + g_return_val_if_fail (SEAHORSE_IS_APPLICATION (self), NULL); + return self->seahorse_settings; +} + +GSettings * +seahorse_application_pgp_settings (SeahorseApplication *self) +{ + if (self == NULL) + self = the_application; + g_return_val_if_fail (SEAHORSE_IS_APPLICATION (self), NULL); + return self->crypto_pgp_settings; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-application.h seahorse-3.6.3/libseahorse/seahorse-application.h --- seahorse-3.2.2/libseahorse/seahorse-application.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-application.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,51 @@ +/* + * Seahorse + * + * Copyright (C) 2003 Jacob Perkins + * Copyright (C) 2004-2005 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * Copyright (C) 2012 Stefan Walter + * + * 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 __SEAHORSE_APPLICATION_H__ +#define __SEAHORSE_APPLICATION_H__ + +#include +#include + +#define SEAHORSE_TYPE_APPLICATION (seahorse_application_get_type ()) +#define SEAHORSE_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_APPLICATION, SeahorseApplication)) +#define SEAHORSE_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_APPLICATION, SeahorseApplicationClass)) +#define SEAHORSE_IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_APPLICATION)) +#define SEAHORSE_IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_APPLICATION)) +#define SEAHORSE_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_APPLICATION, SeahorseApplicationClass)) + +typedef struct _SeahorseApplication SeahorseApplication; +typedef struct _SeahorseApplicationClass SeahorseApplicationClass; + +GType seahorse_application_get_type (void); + +GtkApplication * seahorse_application_new (void); + +GtkApplication * seahorse_application_get (void); + +GSettings * seahorse_application_settings (SeahorseApplication *self); + +GSettings * seahorse_application_pgp_settings (SeahorseApplication *self); + +#endif /* __SEAHORSE_APPLICATION_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-backend.c seahorse-3.6.3/libseahorse/seahorse-backend.c --- seahorse-3.2.2/libseahorse/seahorse-backend.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-backend.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,88 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-backend.h" +#include "seahorse-registry.h" + +#include + +typedef SeahorseBackendIface SeahorseBackendInterface; + +G_DEFINE_INTERFACE (SeahorseBackend, seahorse_backend, GCR_TYPE_COLLECTION); + +static void +seahorse_backend_default_init (SeahorseBackendIface *iface) +{ + static gboolean initialized = FALSE; + if (!initialized) { + g_object_interface_install_property (iface, + g_param_spec_string ("name", "Name", "Name for the backend", + "", G_PARAM_READABLE)); + + g_object_interface_install_property (iface, + g_param_spec_string ("label", "Label", "Label for the backend", + "", G_PARAM_READABLE)); + + g_object_interface_install_property (iface, + g_param_spec_string ("description", "Description", "Description for the backend", + "", G_PARAM_READABLE)); + + g_object_interface_install_property (iface, + g_param_spec_object ("actions", "Actions", "Backend actions", + GTK_TYPE_ACTION_GROUP, G_PARAM_READABLE)); + + initialized = TRUE; + } +} + +SeahorsePlace * +seahorse_backend_lookup_place (SeahorseBackend *backend, + const gchar *uri) +{ + SeahorseBackendIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_BACKEND (backend), NULL); + + iface = SEAHORSE_BACKEND_GET_INTERFACE (backend); + g_return_val_if_fail (iface->lookup_place != NULL, NULL); + + return (iface->lookup_place) (backend, uri); +} + +void +seahorse_backend_register (SeahorseBackend *backend) +{ + gchar *name = NULL; + + g_return_if_fail (SEAHORSE_IS_BACKEND (backend)); + + g_object_get (backend, "name", &name, NULL); + seahorse_registry_register_object (NULL, G_OBJECT (backend), "backend", name, NULL); + g_free (name); +} + +GList * +seahorse_backend_get_registered (void) +{ + return seahorse_registry_object_instances (NULL, "backend", NULL); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-backend.h seahorse-3.6.3/libseahorse/seahorse-backend.h --- seahorse-3.2.2/libseahorse/seahorse-backend.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-backend.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,53 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __SEAHORSE_BACKEND_H__ +#define __SEAHORSE_BACKEND_H__ + +#include "seahorse-place.h" + +#include + +#define SEAHORSE_TYPE_BACKEND (seahorse_backend_get_type ()) +#define SEAHORSE_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_BACKEND, SeahorseBackend)) +#define SEAHORSE_IS_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_BACKEND)) +#define SEAHORSE_BACKEND_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_BACKEND, SeahorseBackendIface)) + +typedef struct _SeahorseBackend SeahorseBackend; +typedef struct _SeahorseBackendIface SeahorseBackendIface; + +struct _SeahorseBackendIface { + GTypeInterface parent; + + SeahorsePlace * (* lookup_place) (SeahorseBackend *backend, + const gchar *uri); +}; + +GType seahorse_backend_get_type (void) G_GNUC_CONST; + +SeahorsePlace * seahorse_backend_lookup_place (SeahorseBackend *backend, + const gchar *uri); + +void seahorse_backend_register (SeahorseBackend *backend); + +GList * seahorse_backend_get_registered (void); + +#endif /* __SEAHORSE_BACKEND_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-bind.c seahorse-3.6.3/libseahorse/seahorse-bind.c --- seahorse-3.2.2/libseahorse/seahorse-bind.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-bind.c 2012-08-21 12:23:16.000000000 +0200 @@ -44,14 +44,6 @@ else retval = FALSE; break; - case G_TYPE_CHAR: - if (g_value_get_char (a) < g_value_get_char (b)) - retval = FALSE; - else if (g_value_get_char (a) == g_value_get_char (b)) - retval = TRUE; - else - retval = FALSE; - break; case G_TYPE_UCHAR: if (g_value_get_uchar (a) < g_value_get_uchar (b)) retval = FALSE; diff -Nru seahorse-3.2.2/libseahorse/seahorse-catalog.c seahorse-3.6.3/libseahorse/seahorse-catalog.c --- seahorse-3.2.2/libseahorse/seahorse-catalog.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-catalog.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,622 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-action.h" +#include "seahorse-actions.h" +#include "seahorse-backend.h" +#include "seahorse-catalog.h" +#include "seahorse-deletable.h" +#include "seahorse-exportable.h" +#include "seahorse-object.h" +#include "seahorse-preferences.h" +#include "seahorse-progress.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" +#include "seahorse-viewable.h" + +#include + +#include +#include + +void on_app_preferences (GtkAction* action, + gpointer user_data); + +enum { + PROP_0, + PROP_WINDOW +}; + +struct _SeahorseCatalogPrivate { + GtkUIManager *ui_manager; + GHashTable *actions; + GtkAction *edit_delete; + GtkAction *properties_object; + GtkAction *file_export; + GtkAction *edit_copy; + GList *selection_actions; +}; + +G_DEFINE_TYPE (SeahorseCatalog, seahorse_catalog, SEAHORSE_TYPE_WIDGET); + +/* ----------------------------------------------------------------------------- + * INTERNAL + */ + + +G_MODULE_EXPORT void +on_app_preferences (GtkAction* action, + gpointer user_data) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (user_data); + seahorse_preferences_show (seahorse_catalog_get_window (self), NULL); +} + +static void +on_app_about (GtkAction* action, SeahorseCatalog *self) +{ + GtkAboutDialog *about; + + const gchar *authors[] = { + "Jacob Perkins ", + "Jose Carlos Garcia Sogo ", + "Jean Schurger ", + "Stef Walter ", + "Adam Schreiber ", + "", + N_("Contributions:"), + "Albrecht Dreß ", + "Jim Pharis ", + NULL + }; + + const gchar *documenters[] = { + "Jacob Perkins ", + "Adam Schreiber ", + "Milo Casagrande ", + NULL + }; + + const gchar *artists[] = { + "Jacob Perkins ", + "Stef Walter ", + NULL + }; + + about = GTK_ABOUT_DIALOG (gtk_about_dialog_new ()); + gtk_about_dialog_set_artists (about, artists); + gtk_about_dialog_set_authors (about, authors); + gtk_about_dialog_set_documenters (about, documenters); + gtk_about_dialog_set_version (about, VERSION); + gtk_about_dialog_set_comments (about, _("Passwords and Keys")); + gtk_about_dialog_set_copyright (about, "Copyright \xc2\xa9 2002 - 2010 Seahorse Project"); + gtk_about_dialog_set_translator_credits (about, _("translator-credits")); + gtk_about_dialog_set_logo_icon_name (about, "seahorse"); + gtk_about_dialog_set_website (about, "http://www.gnome.org/projects/seahorse"); + gtk_about_dialog_set_website_label (about, _("Seahorse Project Homepage")); + + g_signal_connect (about, "response", G_CALLBACK (gtk_widget_hide), NULL); + gtk_window_set_transient_for (GTK_WINDOW (about), seahorse_catalog_get_window (self)); + + gtk_dialog_run (GTK_DIALOG (about)); + gtk_widget_destroy (GTK_WIDGET (about)); +} + +static void +on_help_show (GtkAction *action, + SeahorseCatalog *self) +{ + g_return_if_fail (SEAHORSE_IS_CATALOG (self)); + g_return_if_fail (GTK_IS_ACTION (action)); + seahorse_widget_show_help (SEAHORSE_WIDGET (self)); +} + +static GList * +lookup_actions_for_objects (SeahorseCatalog *self, + GList *objects) +{ + GtkActionGroup *actions; + GHashTableIter iter; + GList *results; + GHashTable *table; + GQueue *queue; + GList *l; + + table = g_hash_table_new_full (g_direct_hash, + g_direct_equal, + g_object_unref, + (GDestroyNotify)g_queue_free); + + for (l = objects; l != NULL; l = g_list_next (l)) { + g_object_get (l->data, "actions", &actions, NULL); + if (actions == NULL) + continue; + if (g_hash_table_lookup (self->pv->actions, actions) == NULL) + seahorse_catalog_include_actions (self, actions); + queue = g_hash_table_lookup (table, actions); + if (queue == NULL) { + queue = g_queue_new (); + g_hash_table_insert (table, g_object_ref (actions), queue); + } + g_queue_push_tail (queue, l->data); + g_object_unref (actions); + } + + results = NULL; + g_hash_table_iter_init (&iter, table); + while (g_hash_table_iter_next (&iter, (gpointer *)&actions, (gpointer *)&queue)) { + seahorse_actions_update (actions, self); + results = g_list_prepend (results, g_object_ref (actions)); + } + + g_hash_table_destroy (table); + return results; +} + +static void +on_object_delete (GtkAction *action, + gpointer user_data) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (user_data); + GError *error = NULL; + GtkWindow *window; + GList *objects; + + window = seahorse_catalog_get_window (self); + objects = seahorse_catalog_get_selected_objects (self); + seahorse_deletable_delete_with_prompt_wait (objects, window, &error); + + if (error != NULL) + seahorse_util_handle_error (&error, window, _("Cannot delete")); + + g_list_free (objects); +} + +static void +on_properties_object (GtkAction *action, + gpointer user_data) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (user_data); + GList *objects; + + objects = seahorse_catalog_get_selected_objects (self); + if (objects != NULL) + seahorse_catalog_show_properties (self, objects->data); + g_list_free (objects); +} + +static void +on_properties_place (GtkAction *action, + gpointer user_data) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (user_data); + SeahorsePlace *place; + + place = seahorse_catalog_get_focused_place (self); + if (place != NULL) + seahorse_catalog_show_properties (self, G_OBJECT (place)); +} + +static void +on_key_export_file (GtkAction* action, SeahorseCatalog *self) +{ + GError *error = NULL; + GtkWindow *window; + GList *objects; + + g_return_if_fail (SEAHORSE_IS_CATALOG (self)); + g_return_if_fail (GTK_IS_ACTION (action)); + + window = seahorse_catalog_get_window (self); + objects = seahorse_catalog_get_selected_objects (self); + seahorse_exportable_export_to_prompt_wait (objects, window, &error); + g_list_free (objects); + + /* TODO: message if only partially exported */ + + if (error != NULL) + seahorse_util_handle_error (&error, window, _("Couldn't export keys")); +} + +static void +on_key_export_clipboard (GtkAction* action, + SeahorseCatalog *self) +{ + GList* objects; + gpointer output; + gsize size; + GError *error = NULL; + GdkAtom atom; + GtkClipboard* board; + + g_return_if_fail (SEAHORSE_IS_CATALOG (self)); + g_return_if_fail (GTK_IS_ACTION (action)); + + objects = seahorse_catalog_get_selected_objects (self); + seahorse_exportable_export_to_text_wait (objects, &output, &size, &error); + g_list_free (objects); + + /* TODO: Print message if only partially exported */ + + if (error == NULL) { + atom = gdk_atom_intern ("CLIPBOARD", FALSE); + board = gtk_clipboard_get (atom); + gtk_clipboard_set_text (board, output, (gint)size); + } else { + seahorse_util_handle_error (&error, seahorse_catalog_get_window (self), + _("Couldn't export data")); + } + + g_free (output); +} + +static const GtkActionEntry UI_ENTRIES[] = { + + /* Top menu items */ + { "file-menu", NULL, N_("_File") }, + { "file-export", GTK_STOCK_SAVE_AS, N_("E_xport..."), NULL, + N_("Export to a file"), G_CALLBACK (on_key_export_file) }, + { "edit-menu", NULL, N_("_Edit") }, + /*Translators: This text refers to deleting an item from its type's backing store*/ + { "edit-export-clipboard", GTK_STOCK_COPY, NULL, "C", + N_("Copy to the clipboard"), G_CALLBACK (on_key_export_clipboard) }, + { "edit-delete", GTK_STOCK_DELETE, N_("_Delete"), NULL, + N_("Delete selected items"), G_CALLBACK (on_object_delete) }, + { "properties-object", GTK_STOCK_PROPERTIES, NULL, NULL, + N_("Show the properties of this item"), G_CALLBACK (on_properties_object) }, + { "properties-keyring", GTK_STOCK_PROPERTIES, NULL, NULL, + N_("Show the properties of this keyring"), G_CALLBACK (on_properties_place) }, + { "app-preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL, + N_("Change preferences for this program"), G_CALLBACK (on_app_preferences) }, + { "view-menu", NULL, N_("_View") }, + { "help-menu", NULL, N_("_Help") }, + { "app-about", GTK_STOCK_ABOUT, NULL, NULL, + N_("About this program"), G_CALLBACK (on_app_about) }, + { "help-show", GTK_STOCK_HELP, N_("_Contents"), "F1", + N_("Show Seahorse help"), G_CALLBACK (on_help_show) } +}; + +static void +on_ui_manager_pre_activate (GtkUIManager *ui_manager, + GtkAction *action, + gpointer user_data) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (user_data); + seahorse_action_pre_activate (action, self, seahorse_catalog_get_window (self)); +} + +static void +on_ui_manager_post_activate (GtkUIManager *ui_manager, + GtkAction *action, + gpointer user_data) +{ + seahorse_action_post_activate (action); +} + +static void +seahorse_catalog_real_selection_changed (SeahorseCatalog *self) +{ + GList *groups; + GList *objects; + GList *previous; + gboolean can_properties; + gboolean can_delete; + gboolean can_export; + GList *l; + + can_properties = FALSE; + can_delete = FALSE; + can_export = FALSE; + + objects = seahorse_catalog_get_selected_objects (self); + for (l = objects; l != NULL; l = g_list_next (l)) { + if (seahorse_exportable_can_export (l->data)) + can_export = TRUE; + if (seahorse_deletable_can_delete (l->data)) + can_delete = TRUE; + if (seahorse_viewable_can_view (l->data)) + can_properties = TRUE; + if (can_export && can_delete && can_properties) + break; + } + + groups = lookup_actions_for_objects (self, objects); + g_list_free (objects); + + gtk_action_set_sensitive (self->pv->properties_object, can_properties); + gtk_action_set_sensitive (self->pv->edit_delete, can_delete); + gtk_action_set_sensitive (self->pv->edit_copy, can_export); + gtk_action_set_sensitive (self->pv->file_export, can_export); + + previous = self->pv->selection_actions; + self->pv->selection_actions = groups; + + for (l = previous; l != NULL; l = g_list_next (l)) + gtk_action_group_set_visible (l->data, FALSE); + for (l = self->pv->selection_actions; l != NULL; l = g_list_next (l)) + gtk_action_group_set_visible (l->data, TRUE); + g_list_free_full (previous, g_object_unref); +} + +static void +on_ui_manager_add_widget (GtkUIManager *ui_manager, + GtkWidget *widget, + gpointer user_data) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (user_data); + const char* name = NULL; + GtkWidget* holder; + + if (GTK_IS_MENU_BAR (widget)) + name = "menu-placeholder"; + else if (GTK_IS_TOOLBAR (widget)) + name = "toolbar-placeholder"; + else + name = NULL; + + holder = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), name); + if (holder != NULL) { + gtk_container_add ((GTK_CONTAINER (holder)), widget); + gtk_widget_show (widget); + } else { + g_warning ("no place holder found for: %s", name); + } +} + +static void +seahorse_catalog_constructed (GObject *obj) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (obj); + GError *error = NULL; + GtkWidget *win; + const gchar *name; + gchar *path; + GtkActionGroup *actions; + + G_OBJECT_CLASS (seahorse_catalog_parent_class)->constructed (obj); + + /* The widgts get added in an idle loop later */ + name = seahorse_widget_get_name (SEAHORSE_WIDGET (self)); + path = g_strdup_printf ("%sseahorse-%s.ui", SEAHORSE_UIDIR, name); + if (!gtk_ui_manager_add_ui_from_file (self->pv->ui_manager, path, &error)) { + g_warning ("couldn't load ui description for '%s': %s", name, error->message); + g_clear_error (&error); + } + + g_free (path); + + win = seahorse_widget_get_toplevel (SEAHORSE_WIDGET (self)); + if (G_TYPE_FROM_INSTANCE (G_OBJECT (win)) == GTK_TYPE_WINDOW) + gtk_window_add_accel_group (GTK_WINDOW (win), + gtk_ui_manager_get_accel_group (self->pv->ui_manager)); + + actions = gtk_action_group_new ("main"); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, UI_ENTRIES, G_N_ELEMENTS (UI_ENTRIES), self); + self->pv->edit_delete = gtk_action_group_get_action (actions, "edit-delete"); + g_object_ref (self->pv->edit_delete); + self->pv->properties_object = gtk_action_group_get_action (actions, "properties-object"); + g_object_ref (self->pv->properties_object); + self->pv->edit_copy = gtk_action_group_get_action (actions, "edit-export-clipboard"); + g_object_ref (self->pv->edit_copy); + self->pv->file_export = gtk_action_group_get_action (actions, "file-export"); + g_object_ref (self->pv->file_export); + gtk_ui_manager_insert_action_group (self->pv->ui_manager, actions, 0); + g_object_unref (actions); +} + +static void +seahorse_catalog_init (SeahorseCatalog *self) +{ + self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_CATALOG, + SeahorseCatalogPrivate); + self->pv->actions = g_hash_table_new_full (g_direct_hash, g_direct_equal, + g_object_unref, NULL); + + self->pv->ui_manager = gtk_ui_manager_new (); + g_signal_connect (self->pv->ui_manager, "add-widget", + G_CALLBACK (on_ui_manager_add_widget), self); + g_signal_connect (self->pv->ui_manager, "pre-activate", + G_CALLBACK (on_ui_manager_pre_activate), self); + g_signal_connect (self->pv->ui_manager, "post-activate", + G_CALLBACK (on_ui_manager_post_activate), self); +} + +static void +seahorse_catalog_dispose (GObject *obj) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (obj); + GList *l; + + g_clear_object (&self->pv->edit_copy); + g_clear_object (&self->pv->edit_delete); + g_clear_object (&self->pv->file_export); + g_clear_object (&self->pv->properties_object); + + for (l = self->pv->selection_actions; l != NULL; l = g_list_next (l)) + gtk_ui_manager_remove_action_group (self->pv->ui_manager, l->data); + g_list_free_full (self->pv->selection_actions, g_object_unref); + + g_signal_handlers_disconnect_by_func (self->pv->ui_manager, on_ui_manager_add_widget, self); + g_signal_handlers_disconnect_by_func (self->pv->ui_manager, on_ui_manager_pre_activate, self); + g_signal_handlers_disconnect_by_func (self->pv->ui_manager, on_ui_manager_post_activate, self); + g_clear_object (&self->pv->ui_manager); + + g_hash_table_remove_all (self->pv->actions); + + G_OBJECT_CLASS (seahorse_catalog_parent_class)->dispose (obj); +} + +static void +seahorse_catalog_finalize (GObject *obj) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (obj); + + g_assert (self->pv->ui_manager == NULL); + g_assert (g_hash_table_size (self->pv->actions) == 0); + g_hash_table_destroy (self->pv->actions); + + G_OBJECT_CLASS (seahorse_catalog_parent_class)->finalize (obj); +} + +static void +seahorse_catalog_get_property (GObject *obj, guint prop_id, GValue *value, + GParamSpec *pspec) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (obj); + + switch (prop_id) { + case PROP_WINDOW: + g_value_set_object (value, seahorse_catalog_get_window (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_catalog_class_init (SeahorseCatalogClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (SeahorseCatalogPrivate)); + + gobject_class->constructed = seahorse_catalog_constructed; + gobject_class->dispose = seahorse_catalog_dispose; + gobject_class->finalize = seahorse_catalog_finalize; + gobject_class->get_property = seahorse_catalog_get_property; + + klass->selection_changed = seahorse_catalog_real_selection_changed; + + g_object_class_install_property (gobject_class, PROP_WINDOW, + g_param_spec_object ("window", "Window", "Window of View", + GTK_TYPE_WIDGET, G_PARAM_READABLE)); + + g_signal_new ("selection-changed", SEAHORSE_TYPE_CATALOG, + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SeahorseCatalogClass, selection_changed), + NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +} + +void +seahorse_catalog_ensure_updated (SeahorseCatalog *self) +{ + g_return_if_fail (SEAHORSE_IS_CATALOG (self)); + gtk_ui_manager_ensure_update (self->pv->ui_manager); +} + +void +seahorse_catalog_include_actions (SeahorseCatalog *self, + GtkActionGroup* actions) +{ + const gchar *definition; + GError *error = NULL; + + g_return_if_fail (SEAHORSE_IS_CATALOG (self)); + g_return_if_fail (GTK_IS_ACTION_GROUP (actions)); + + gtk_ui_manager_insert_action_group (self->pv->ui_manager, actions, 10); + + if (SEAHORSE_IS_ACTIONS (actions)) { + seahorse_actions_set_catalog (SEAHORSE_ACTIONS (actions), self); + definition = seahorse_actions_get_definition (SEAHORSE_ACTIONS (actions)); + if (definition != NULL) { + gtk_ui_manager_add_ui_from_string (self->pv->ui_manager, definition, -1, &error); + if (error != NULL) { + g_warning ("couldn't add ui defintion for action group: %s: %s", + gtk_action_group_get_name (actions), definition); + g_clear_error (&error); + } + } + } + + g_hash_table_insert (self->pv->actions, g_object_ref (actions), actions); +} + +void +seahorse_catalog_show_context_menu (SeahorseCatalog *self, + const gchar *name, + guint button, + guint time) +{ + GtkWidget *menu; + gchar *path; + + g_return_if_fail (SEAHORSE_IS_CATALOG (self)); + g_return_if_fail (name != NULL); + + path = g_strdup_printf ("/%s", name); + menu = gtk_ui_manager_get_widget (self->pv->ui_manager, path); + g_free (path); + + if (menu == NULL) + return; + if (!GTK_IS_MENU (menu)) { + g_warning ("the object /%s isn't a menu", name); + return; + } + + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, time); + gtk_widget_show (menu); +} + +void +seahorse_catalog_show_properties (SeahorseCatalog *self, + GObject* obj) +{ + if (seahorse_viewable_can_view (obj)) + seahorse_viewable_show_viewer (SEAHORSE_VIEWABLE (obj), + seahorse_catalog_get_window (self)); +} + +GtkWindow * +seahorse_catalog_get_window (SeahorseCatalog *self) +{ + g_return_val_if_fail (SEAHORSE_IS_CATALOG (self), NULL); + return GTK_WINDOW (seahorse_widget_get_toplevel (SEAHORSE_WIDGET (self))); +} + +GList * +seahorse_catalog_get_selected_objects (SeahorseCatalog *self) +{ + g_return_val_if_fail (SEAHORSE_IS_CATALOG (self), NULL); + g_return_val_if_fail (SEAHORSE_CATALOG_GET_CLASS (self)->get_selected_objects, NULL); + return SEAHORSE_CATALOG_GET_CLASS (self)->get_selected_objects (self); +} + +SeahorsePlace * +seahorse_catalog_get_focused_place (SeahorseCatalog *self) +{ + g_return_val_if_fail (SEAHORSE_IS_CATALOG (self), NULL); + g_return_val_if_fail (SEAHORSE_CATALOG_GET_CLASS (self)->get_focused_place, NULL); + return SEAHORSE_CATALOG_GET_CLASS (self)->get_focused_place (self); +} + +GList * +seahorse_catalog_get_backends (SeahorseCatalog *self) +{ + g_return_val_if_fail (SEAHORSE_IS_CATALOG (self), NULL); + g_return_val_if_fail (SEAHORSE_CATALOG_GET_CLASS (self)->get_backends, NULL); + return SEAHORSE_CATALOG_GET_CLASS (self)->get_backends (self); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-catalog.h seahorse-3.6.3/libseahorse/seahorse-catalog.h --- seahorse-3.2.2/libseahorse/seahorse-catalog.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-catalog.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,83 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_CATALOG_H__ +#define __SEAHORSE_CATALOG_H__ + +#include + +#include "seahorse-place.h" +#include "seahorse-widget.h" + +#define SEAHORSE_CATALOG_MENU_OBJECT "ObjectPopup" + +#define SEAHORSE_TYPE_CATALOG (seahorse_catalog_get_type ()) +#define SEAHORSE_CATALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_CATALOG, SeahorseCatalog)) +#define SEAHORSE_CATALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_CATALOG, SeahorseCatalogClass)) +#define SEAHORSE_IS_CATALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_CATALOG)) +#define SEAHORSE_IS_CATALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_CATALOG)) +#define SEAHORSE_CATALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_CATALOG, SeahorseCatalogClass)) + +typedef struct _SeahorseCatalog SeahorseCatalog; +typedef struct _SeahorseCatalogClass SeahorseCatalogClass; +typedef struct _SeahorseCatalogPrivate SeahorseCatalogPrivate; + +struct _SeahorseCatalog { + SeahorseWidget parent; + SeahorseCatalogPrivate *pv; +}; + +struct _SeahorseCatalogClass { + SeahorseWidgetClass parent; + + GList * (*get_backends) (SeahorseCatalog *self); + + SeahorsePlace * (*get_focused_place) (SeahorseCatalog *self); + + GList * (*get_selected_objects) (SeahorseCatalog *self); + + void (*selection_changed) (SeahorseCatalog *catalog); +}; + +GType seahorse_catalog_get_type (void); + +void seahorse_catalog_ensure_updated (SeahorseCatalog* self); + +void seahorse_catalog_include_actions (SeahorseCatalog* self, + GtkActionGroup* actions); + +GList * seahorse_catalog_get_selected_objects (SeahorseCatalog* self); + +SeahorsePlace * seahorse_catalog_get_focused_place (SeahorseCatalog* self); + +GList * seahorse_catalog_get_backends (SeahorseCatalog* self); + +void seahorse_catalog_show_context_menu (SeahorseCatalog* self, + const gchar *which, + guint button, + guint time); + +void seahorse_catalog_show_properties (SeahorseCatalog* self, + GObject* obj); + +GtkWindow * seahorse_catalog_get_window (SeahorseCatalog *self); + +#endif /* __SEAHORSE_CATALOG_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-collection.c seahorse-3.6.3/libseahorse/seahorse-collection.c --- seahorse-3.2.2/libseahorse/seahorse-collection.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-collection.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,359 @@ +/* + * Seahorse + * + * Copyright (C) 2005 Stefan Walter + * + * 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 "config.h" + +#include "seahorse-collection.h" +#include "seahorse-marshal.h" + +enum { + PROP_0, + PROP_BASE, + PROP_PREDICATE +}; + +struct _SeahorseCollectionPrivate { + GcrCollection *base; + GHashTable *objects; + SeahorsePredicate *pred; + GDestroyNotify destroy_func; +}; + +static void seahorse_collection_iface_init (GcrCollectionIface *iface); + +static gboolean maybe_add_object (SeahorseCollection *self, + GObject *obj); + +static gboolean maybe_remove_object (SeahorseCollection *self, + GObject *obj); + +G_DEFINE_TYPE_WITH_CODE (SeahorseCollection, seahorse_collection, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_collection_iface_init); +); + +static void +on_object_changed (GObject *obj, + GParamSpec *spec, + gpointer user_data) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (user_data); + if (g_hash_table_lookup (self->pv->objects, obj)) + maybe_remove_object (self, obj); + else + maybe_add_object (self, obj); +} + +static void +remove_object (SeahorseCollection *self, + GObject *object) +{ + g_hash_table_remove (self->pv->objects, object); + gcr_collection_emit_removed (GCR_COLLECTION (self), object); +} + +static gboolean +maybe_add_object (SeahorseCollection *self, + GObject *obj) +{ + if (g_hash_table_lookup (self->pv->objects, obj)) + return FALSE; + + if (!self->pv->pred || !seahorse_predicate_match (self->pv->pred, obj)) + return FALSE; + + g_hash_table_replace (self->pv->objects, obj, GINT_TO_POINTER (TRUE)); + gcr_collection_emit_added (GCR_COLLECTION (self), obj); + return TRUE; +} + +static gboolean +maybe_remove_object (SeahorseCollection *self, + GObject *obj) +{ + if (!g_hash_table_lookup (self->pv->objects, obj)) + return FALSE; + + if (self->pv->pred && seahorse_predicate_match (self->pv->pred, obj)) + return FALSE; + + remove_object (self, obj); + return TRUE; +} + +static void +on_base_added (GcrCollection *base, + GObject *obj, + gpointer user_data) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (user_data); + + g_signal_connect (obj, "notify", G_CALLBACK (on_object_changed), self); + maybe_add_object (self, obj); +} + +static void +on_base_removed (GcrCollection *base, + GObject *object, + gpointer user_data) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (user_data); + + g_signal_handlers_disconnect_by_func (object, on_object_changed, self); + + if (g_hash_table_lookup (self->pv->objects, object)) + remove_object (self, object); +} + +static void +objects_to_list (GObject *obj, gpointer *c, GList **l) +{ + *l = g_list_append (*l, obj); +} + +static void +objects_to_hash (GObject *obj, gpointer *c, GHashTable *ht) +{ + g_hash_table_replace (ht, obj, NULL); +} + +static void +seahorse_collection_init (SeahorseCollection *self) +{ + self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_COLLECTION, + SeahorseCollectionPrivate); + self->pv->objects = g_hash_table_new (g_direct_hash, g_direct_equal); +} + +static void +seahorse_collection_constructed (GObject *obj) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (obj); + + g_return_if_fail (self->pv->base); + + G_OBJECT_CLASS (seahorse_collection_parent_class)->constructed (obj); + + g_signal_connect (self->pv->base, "added", G_CALLBACK (on_base_added), self); + g_signal_connect (self->pv->base, "removed", G_CALLBACK (on_base_removed), self); +} + +static void +seahorse_collection_dispose (GObject *obj) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (obj); + GHashTableIter iter; + GObject *object; + + g_signal_handlers_disconnect_by_func (self->pv->base, on_base_added, self); + g_signal_handlers_disconnect_by_func (self->pv->base, on_base_removed, self); + + g_hash_table_iter_init (&iter, self->pv->objects); + while (g_hash_table_iter_next (&iter, (gpointer *)&object, NULL)) { + g_signal_handlers_disconnect_by_func (object, on_object_changed, self); + gcr_collection_emit_removed (GCR_COLLECTION (self), object); + } + + g_hash_table_remove_all (self->pv->objects); + + G_OBJECT_CLASS (seahorse_collection_parent_class)->dispose (obj); +} + +static void +seahorse_collection_finalize (GObject *obj) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (obj); + + g_clear_object (&self->pv->base); + g_hash_table_destroy (self->pv->objects); + + if (self->pv->destroy_func) + (self->pv->destroy_func) (self->pv->pred); + + G_OBJECT_CLASS (seahorse_collection_parent_class)->finalize (obj); +} + +static void +seahorse_collection_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (obj); + + switch (prop_id) { + case PROP_BASE: + g_return_if_fail (self->pv->base == NULL); + self->pv->base = g_value_dup_object (value); + g_return_if_fail (self->pv->base != NULL); + if (self->pv->pred) + seahorse_collection_refresh (self); + break; + case PROP_PREDICATE: + g_return_if_fail (self->pv->pred == NULL); + self->pv->pred = g_value_get_pointer (value); + g_return_if_fail (self->pv->pred != NULL); + if (self->pv->base) + seahorse_collection_refresh (self); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_collection_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (obj); + + switch (prop_id) { + case PROP_BASE: + g_value_set_object (value, self->pv->base); + break; + case PROP_PREDICATE: + g_value_set_pointer (value, self->pv->pred); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_collection_class_init (SeahorseCollectionClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->constructed = seahorse_collection_constructed; + gobject_class->dispose = seahorse_collection_dispose; + gobject_class->finalize = seahorse_collection_finalize; + gobject_class->set_property = seahorse_collection_set_property; + gobject_class->get_property = seahorse_collection_get_property; + + g_object_class_install_property (gobject_class, PROP_BASE, + g_param_spec_object ("base", "Base", "Base collection", + GCR_TYPE_COLLECTION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + + g_object_class_install_property (gobject_class, PROP_PREDICATE, + g_param_spec_pointer ("predicate", "Predicate", "Predicate for matching objects into this set.", + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + g_type_class_add_private (klass, sizeof (SeahorseCollectionPrivate)); +} + +static guint +seahorse_collection_get_length (GcrCollection *collection) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (collection); + return g_hash_table_size (self->pv->objects); +} + +static GList * +seahorse_collection_get_objects (GcrCollection *collection) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (collection); + GList *objs = NULL; + + g_hash_table_foreach (self->pv->objects, (GHFunc)objects_to_list, &objs); + + return objs; +} + +static gboolean +seahorse_collection_contains (GcrCollection *collection, + GObject *object) +{ + SeahorseCollection *self = SEAHORSE_COLLECTION (collection); + return g_hash_table_lookup (self->pv->objects, object) ? TRUE : FALSE; +} + +static void +seahorse_collection_iface_init (GcrCollectionIface *iface) +{ + iface->get_length = seahorse_collection_get_length; + iface->get_objects = seahorse_collection_get_objects; + iface->contains = seahorse_collection_contains; +} + +SeahorseCollection * +seahorse_collection_new_for_predicate (GcrCollection *base, + SeahorsePredicate *pred, + GDestroyNotify destroy_func) +{ + SeahorseCollection *collection; + + g_return_val_if_fail (GCR_IS_COLLECTION (base), NULL); + + collection = g_object_new (SEAHORSE_TYPE_COLLECTION, + "base", base, + "predicate", pred, + NULL); + + collection->pv->destroy_func = destroy_func; + return collection; +} + +void +seahorse_collection_refresh (SeahorseCollection *self) +{ + GHashTable *check = g_hash_table_new (g_direct_hash, g_direct_equal); + GList *l, *objects = NULL; + GHashTableIter iter; + GObject *obj; + + g_return_if_fail (SEAHORSE_IS_COLLECTION (self)); + + /* Make note of all the objects we had prior to refresh */ + g_hash_table_foreach (self->pv->objects, (GHFunc)objects_to_hash, check); + + objects = gcr_collection_get_objects (self->pv->base); + for (l = objects; l != NULL; l = g_list_next (l)) { + + /* Make note that we've seen this object */ + g_hash_table_remove (check, l->data); + + /* This will add to set */ + if (!maybe_remove_object (self, l->data)) { + if (maybe_add_object (self, l->data)) + g_signal_connect (l->data, "notify", G_CALLBACK (on_object_changed), self); + } + } + g_list_free (objects); + + g_hash_table_iter_init (&iter, check); + while (g_hash_table_iter_next (&iter, (gpointer *)&obj, NULL)) { + g_signal_handlers_disconnect_by_func (obj, on_object_changed, self); + remove_object (self, obj); + } + + g_hash_table_destroy (check); +} + +SeahorsePredicate * +seahorse_collection_get_predicate (SeahorseCollection *self) +{ + g_return_val_if_fail (SEAHORSE_IS_COLLECTION (self), NULL); + return self->pv->pred; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-collection.h seahorse-3.6.3/libseahorse/seahorse-collection.h --- seahorse-3.2.2/libseahorse/seahorse-collection.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-collection.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,62 @@ +/* + * Seahorse + * + * Copyright (C) 2005-2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __SEAHORSE_COLLECTION_H__ +#define __SEAHORSE_COLLECTION_H__ + +#include + +#include "seahorse-predicate.h" + +#define SEAHORSE_TYPE_COLLECTION (seahorse_collection_get_type ()) +#define SEAHORSE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_COLLECTION, SeahorseCollection)) +#define SEAHORSE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_COLLECTION, SeahorseCollectionClass)) +#define SEAHORSE_IS_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_COLLECTION)) +#define SEAHORSE_IS_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_COLLECTION)) +#define SEAHORSE_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_COLLECTION, SeahorseCollectionClass)) + +typedef struct _SeahorseCollection SeahorseCollection; +typedef struct _SeahorseCollectionClass SeahorseCollectionClass; +typedef struct _SeahorseCollectionPrivate SeahorseCollectionPrivate; + +struct _SeahorseCollection { + GObject parent; + + /* */ + SeahorseCollectionPrivate *pv; +}; + +struct _SeahorseCollectionClass { + GObjectClass parent_class; +}; + +GType seahorse_collection_get_type (void); + +SeahorseCollection * seahorse_collection_new_for_predicate (GcrCollection *base, + SeahorsePredicate *predicate, + GDestroyNotify destroy_func); + +SeahorsePredicate * seahorse_collection_get_predicate (SeahorseCollection *self); + +void seahorse_collection_refresh (SeahorseCollection *self); + +#endif /* __SEAHORSE_COLLECTION_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-combo-keys.c seahorse-3.6.3/libseahorse/seahorse-combo-keys.c --- seahorse-3.2.2/libseahorse/seahorse-combo-keys.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-combo-keys.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,267 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2004-2006 Stefan Walter - * - * 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 "config.h" - -#include "seahorse-combo-keys.h" - -#include "seahorse-object.h" - -enum { - COMBO_STRING, - COMBO_POINTER, - N_COLUMNS -}; - -/* ----------------------------------------------------------------------------- - * HELPERS - */ - -static void -object_added (SeahorseSet *skset, SeahorseObject *object, GtkComboBox *combo) -{ - GtkListStore *model; - GtkTreeIter iter; - const gchar *userid; - - g_return_if_fail (SEAHORSE_IS_OBJECT (object)); - g_return_if_fail (combo != NULL); - - model = GTK_LIST_STORE (gtk_combo_box_get_model (combo)); - - userid = seahorse_object_get_label (object); - - gtk_list_store_append (model, &iter); - gtk_list_store_set (model, &iter, - COMBO_STRING, userid, - COMBO_POINTER, object, - -1); -} - -static void -object_changed (SeahorseSet *skset, SeahorseObject *object, GtkComboBox *combo) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gboolean valid; - const gchar *userid; - gpointer pntr; - SeahorseObject *frommodel; - - g_return_if_fail (SEAHORSE_IS_OBJECT (object)); - - model = gtk_combo_box_get_model (combo); - valid = gtk_tree_model_get_iter_first (model, &iter); - - while (valid) { - gtk_tree_model_get (model, &iter, - COMBO_POINTER, &pntr, - -1); - - frommodel = SEAHORSE_OBJECT (pntr); - - if (frommodel == object) { - userid = seahorse_object_get_label (object); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COMBO_STRING, userid, - -1); - - break; - } - - valid = gtk_tree_model_iter_next (model, &iter); - } -} - -static void -object_removed (SeahorseSet *skset, SeahorseObject *object, GtkComboBox *combo) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gpointer pntr; - gboolean valid; - SeahorseObject *frommodel; - - g_return_if_fail (SEAHORSE_IS_OBJECT (object)); - g_return_if_fail (combo != NULL); - - model = gtk_combo_box_get_model (combo); - valid = gtk_tree_model_get_iter_first (model, &iter); - - while (valid) { - gtk_tree_model_get (model, &iter, - COMBO_POINTER, &pntr, - -1); - - frommodel = SEAHORSE_OBJECT (pntr); - - if (frommodel == object) { - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); - - break; - } - - valid = gtk_tree_model_iter_next (model, &iter); - } -} - -static void -combo_destroyed (GtkComboBox *combo, SeahorseSet *skset) -{ - g_signal_handlers_disconnect_by_func (skset, object_added, combo); - g_signal_handlers_disconnect_by_func (skset, object_changed, combo); - g_signal_handlers_disconnect_by_func (skset, object_removed, combo); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC CALLS - */ - -void -seahorse_combo_keys_attach (GtkComboBox *combo, SeahorseSet *skset, - const gchar *none_option) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GtkCellRenderer *renderer; - SeahorseObject *object; - GList *l, *objects; - - /* Setup the None Option */ - model = gtk_combo_box_get_model (combo); - if (!model) { - model = GTK_TREE_MODEL (gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER)); - gtk_combo_box_set_model (combo, model); - - gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo)); - renderer = gtk_cell_renderer_text_new (); - - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, - "text", COMBO_STRING); - } - - /* Setup the object list */ - objects = seahorse_set_get_objects (skset); - for (l = objects; l != NULL; l = g_list_next (l)) { - object = SEAHORSE_OBJECT (l->data); - object_added (skset, object, combo); - } - g_list_free (objects); - - g_signal_connect_after (skset, "added", G_CALLBACK (object_added), combo); - g_signal_connect_after (skset, "changed", G_CALLBACK (object_changed), combo); - g_signal_connect_after (skset, "removed", G_CALLBACK (object_removed), combo); - - if (none_option) { - gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - COMBO_STRING, none_option, - COMBO_POINTER, NULL, - -1); - } - - gtk_tree_model_get_iter_first (model, &iter); - - gtk_combo_box_set_active_iter (combo, &iter); - - /* Cleanup */ - g_object_ref (skset); - g_object_set_data_full (G_OBJECT (combo), "skset", skset, g_object_unref); - g_signal_connect (combo, "destroy", G_CALLBACK (combo_destroyed), skset); -} - -void -seahorse_combo_keys_set_active_id (GtkComboBox *combo, GQuark id) -{ - SeahorseObject *object; - GtkTreeModel *model; - GtkTreeIter iter; - gboolean valid; - gpointer pointer; - guint i; - - g_return_if_fail (GTK_IS_COMBO_BOX (combo)); - - model = gtk_combo_box_get_model (combo); - g_return_if_fail (model != NULL); - - valid = gtk_tree_model_get_iter_first (model, &iter); - i = 0; - - while (valid) { - gtk_tree_model_get (model, &iter, - COMBO_POINTER, &pointer, - -1); - - object = SEAHORSE_OBJECT (pointer); - - if (!id) { - if (!object) { - gtk_combo_box_set_active_iter (combo, &iter); - break; - } - } else if (object != NULL) { - if (id == seahorse_object_get_id (object)) { - gtk_combo_box_set_active_iter (combo, &iter); - break; - } - } - - valid = gtk_tree_model_iter_next (model, &iter); - i++; - } -} - -void -seahorse_combo_keys_set_active (GtkComboBox *combo, SeahorseObject *object) -{ - seahorse_combo_keys_set_active_id (combo, - object == NULL ? 0 : seahorse_object_get_id (object)); -} - -SeahorseObject* -seahorse_combo_keys_get_active (GtkComboBox *combo) -{ - GtkTreeModel *model; - GtkTreeIter iter; - gpointer pointer; - - g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL); - - model = gtk_combo_box_get_model (combo); - g_return_val_if_fail (model != NULL, NULL); - - gtk_combo_box_get_active_iter(combo, &iter); - - gtk_tree_model_get (model, &iter, - COMBO_POINTER, &pointer, - -1); - - return SEAHORSE_OBJECT (pointer); -} - -GQuark -seahorse_combo_keys_get_active_id (GtkComboBox *combo) -{ - SeahorseObject *object = seahorse_combo_keys_get_active (combo); - return object == NULL ? 0 : seahorse_object_get_id (object); -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-combo-keys.h seahorse-3.6.3/libseahorse/seahorse-combo-keys.h --- seahorse-3.2.2/libseahorse/seahorse-combo-keys.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-combo-keys.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2004-2006 Stefan Walter - * - * 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. - */ - -/** - * seahorse_combo_keys_*: Shows a list of keys in a dropdown for selection. - * - * - Attaches to a GtkComboBox - * - Gets its list of keys from a SeahorseSet. - */ - -#ifndef __SEAHORSE_COMBO_KEYS_H__ -#define __SEAHORSE_COMBO_KEYS_H__ - -#include "seahorse-object.h" -#include "seahorse-set.h" - -#include - -void seahorse_combo_keys_attach (GtkComboBox *combo, - SeahorseSet *skset, - const gchar *none_option); - -void seahorse_combo_keys_set_active_id (GtkComboBox *combo, - GQuark keyid); - -void seahorse_combo_keys_set_active (GtkComboBox *combo, - SeahorseObject *object); - -SeahorseObject* seahorse_combo_keys_get_active (GtkComboBox *combo); - -GQuark seahorse_combo_keys_get_active_id (GtkComboBox *combo); - -#endif /* __SEAHORSE_COMBO_KEYS_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-commands.c seahorse-3.6.3/libseahorse/seahorse-commands.c --- seahorse-3.2.2/libseahorse/seahorse-commands.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-commands.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,214 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-commands.h" - -enum { - PROP_0, - PROP_VIEW, - PROP_KTYPE, - PROP_COMMAND_ACTIONS, - PROP_UI_DEFINITION -}; - -struct _SeahorseCommandsPrivate { - SeahorseView* view; -}; - -G_DEFINE_TYPE (SeahorseCommands, seahorse_commands, G_TYPE_OBJECT); - -#define SEAHORSE_COMMANDS_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEAHORSE_TYPE_COMMANDS, SeahorseCommandsPrivate)) - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_commands_real_show_properties (SeahorseCommands* self, SeahorseObject* obj) -{ - g_critical ("Type `%s' does not implement abstract method `seahorse_commands_show_properties'", - g_type_name (G_TYPE_FROM_INSTANCE (self))); - return; -} - -static gboolean -seahorse_commands_real_delete_objects (SeahorseCommands* self, GList* obj) -{ - g_critical ("Type `%s' does not implement abstract method `seahorse_commands_delete_objects'", - g_type_name (G_TYPE_FROM_INSTANCE (self))); - return FALSE; -} - -static void -seahorse_commands_init (SeahorseCommands *self) -{ - self->pv = SEAHORSE_COMMANDS_GET_PRIVATE (self); -} - -static void -seahorse_commands_dispose (GObject *obj) -{ - SeahorseCommands *self = SEAHORSE_COMMANDS (obj); - - if (self->pv->view) - g_object_remove_weak_pointer (G_OBJECT (self->pv->view), (gpointer*)&self->pv->view); - self->pv->view = NULL; - - G_OBJECT_CLASS (seahorse_commands_parent_class)->dispose (obj); -} - -static void -seahorse_commands_finalize (GObject *obj) -{ - SeahorseCommands *self = SEAHORSE_COMMANDS (obj); - - g_assert (!self->pv->view); - - G_OBJECT_CLASS (seahorse_commands_parent_class)->finalize (obj); -} - -static void -seahorse_commands_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorseCommands *self = SEAHORSE_COMMANDS (obj); - - switch (prop_id) { - case PROP_VIEW: - g_return_if_fail (!self->pv->view); - self->pv->view = g_value_get_object (value); - g_return_if_fail (self->pv->view); - g_object_add_weak_pointer (G_OBJECT (self->pv->view), (gpointer*)&self->pv->view); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_commands_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorseCommands *self = SEAHORSE_COMMANDS (obj); - - switch (prop_id) { - case PROP_VIEW: - g_value_set_object (value, seahorse_commands_get_view (self)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_commands_class_init (SeahorseCommandsClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_commands_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorseCommandsPrivate)); - - gobject_class->dispose = seahorse_commands_dispose; - gobject_class->finalize = seahorse_commands_finalize; - gobject_class->set_property = seahorse_commands_set_property; - gobject_class->get_property = seahorse_commands_get_property; - - SEAHORSE_COMMANDS_CLASS (klass)->show_properties = seahorse_commands_real_show_properties; - SEAHORSE_COMMANDS_CLASS (klass)->delete_objects = seahorse_commands_real_delete_objects; - - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_VIEW, - g_param_spec_object ("view", "view", "view", SEAHORSE_TYPE_VIEW, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_KTYPE, - g_param_spec_uint ("ktype", "ktype", "ktype", - 0, G_MAXUINT, 0U, G_PARAM_READABLE)); - - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_COMMAND_ACTIONS, - g_param_spec_object ("command-actions", "command-actions", "command-actions", - GTK_TYPE_ACTION_GROUP, G_PARAM_READABLE)); - - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_UI_DEFINITION, - g_param_spec_pointer ("ui-definition", "ui-definition", "ui-definition", - G_PARAM_READABLE)); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -void -seahorse_commands_show_properties (SeahorseCommands* self, SeahorseObject* obj) -{ - g_return_if_fail (SEAHORSE_IS_COMMANDS (self)); - SEAHORSE_COMMANDS_GET_CLASS (self)->show_properties (self, obj); -} - -gboolean -seahorse_commands_delete_objects (SeahorseCommands *self, - GList *objects) -{ - g_return_val_if_fail (SEAHORSE_IS_COMMANDS (self), FALSE); - g_return_val_if_fail (SEAHORSE_COMMANDS_GET_CLASS (self)->delete_objects, FALSE); - return SEAHORSE_COMMANDS_GET_CLASS (self)->delete_objects (self, objects); -} - -SeahorseView* -seahorse_commands_get_view (SeahorseCommands* self) -{ - g_return_val_if_fail (SEAHORSE_IS_COMMANDS (self), NULL); - return self->pv->view; -} - -GtkActionGroup* -seahorse_commands_get_command_actions (SeahorseCommands* self) -{ - GtkActionGroup *actions; - g_return_val_if_fail (SEAHORSE_IS_COMMANDS (self), NULL); - g_object_get (self, "command-actions", &actions, NULL); - if (actions) - g_object_unref (actions); - return actions; -} - - -const gchar* -seahorse_commands_get_ui_definition (SeahorseCommands* self) -{ - const gchar* ui_definition; - g_return_val_if_fail (SEAHORSE_IS_COMMANDS (self), NULL); - g_object_get (self, "ui-definition", &ui_definition, NULL); - return ui_definition; -} - -GtkWindow* -seahorse_commands_get_window (SeahorseCommands* self) -{ - SeahorseView *view = seahorse_commands_get_view (self); - g_return_val_if_fail (view, NULL); - return seahorse_view_get_window (view); -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-commands.h seahorse-3.6.3/libseahorse/seahorse-commands.h --- seahorse-3.2.2/libseahorse/seahorse-commands.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-commands.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_COMMANDS_H__ -#define __SEAHORSE_COMMANDS_H__ - -#include -#include - -#include "seahorse-object.h" -#include "seahorse-view.h" - -#define SEAHORSE_TYPE_COMMANDS (seahorse_commands_get_type ()) -#define SEAHORSE_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_COMMANDS, SeahorseCommands)) -#define SEAHORSE_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_COMMANDS, SeahorseCommandsClass)) -#define SEAHORSE_IS_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_COMMANDS)) -#define SEAHORSE_IS_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_COMMANDS)) -#define SEAHORSE_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_COMMANDS, SeahorseCommandsClass)) - -typedef struct _SeahorseCommandsClass SeahorseCommandsClass; -typedef struct _SeahorseCommandsPrivate SeahorseCommandsPrivate; - -struct _SeahorseCommands { - GObject parent_instance; - SeahorseCommandsPrivate *pv; -}; - -struct _SeahorseCommandsClass { - GObjectClass parent_class; - - /* Virtual methods */ - - void (*show_properties) (SeahorseCommands *self, - SeahorseObject *obj); - - gboolean (*delete_objects) (SeahorseCommands *self, - GList *obj); -}; - -GType seahorse_commands_get_type (void); - -void seahorse_commands_show_properties (SeahorseCommands *self, SeahorseObject *obj); - -gboolean seahorse_commands_delete_objects (SeahorseCommands *self, - GList *obj); - -SeahorseView * seahorse_commands_get_view (SeahorseCommands *self); - -GtkWindow * seahorse_commands_get_window (SeahorseCommands *self); - -GtkActionGroup * seahorse_commands_get_command_actions (SeahorseCommands *self); - -const char * seahorse_commands_get_ui_definition (SeahorseCommands *self); - -#endif diff -Nru seahorse-3.2.2/libseahorse/seahorse-context.c seahorse-3.6.3/libseahorse/seahorse-context.c --- seahorse-3.2.2/libseahorse/seahorse-context.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-context.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1651 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2003 Jacob Perkins - * Copyright (C) 2005, 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include -#include - -#include "seahorse-bind.h" -#include "seahorse-context.h" -#include "seahorse-dns-sd.h" -#include "seahorse-marshal.h" -#include "seahorse-progress.h" -#include "seahorse-registry.h" -#include "seahorse-servers.h" -#include "seahorse-transfer.h" -#include "seahorse-unknown.h" -#include "seahorse-unknown-source.h" -#include "seahorse-util.h" - -#ifdef WITH_PGP -#include "pgp/seahorse-server-source.h" -#endif - -/** - * SECTION:seahorse-context - * @short_description: This is where all the action in a Seahorse process comes together. - * @include:libseahorse/seahorse-context.h - * - **/ - -/* The application main context */ -SeahorseContext* app_context = NULL; - -enum { - ADDED, - REMOVED, - CHANGED, - DESTROY, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -G_DEFINE_TYPE (SeahorseContext, seahorse_context, G_TYPE_OBJECT); - -/* - * Two hashtables are used to keep track of the objects: - * - * objects_by_source: This contains a reference to the object and allows us to - * lookup objects by their source. Each object/source combination should be - * unique. Hashkeys are made with hashkey_by_source() - * objects_by_type: Each value contains a GList of objects with the same id - * (ie: same object from different sources). The objects are - * orderred in by preferred usage. - */ - -struct _SeahorseContextPrivate { - GList *sources; /* Sources which add keys to this context */ - GHashTable *auto_sources; /* Automatically added sources (keyservers) */ - GHashTable *objects_by_source; /* See explanation above */ - GHashTable *objects_by_type; /* See explanation above */ - SeahorseServiceDiscovery *discovery; /* Adds sources from DNS-SD */ - gboolean in_destruction; /* In destroy signal */ - GSettings *seahorse_settings; - GSettings *crypto_pgp_settings; -}; - -static void seahorse_context_dispose (GObject *gobject); -static void seahorse_context_finalize (GObject *gobject); - -#ifdef WITH_KEYSERVER - -static void -on_settings_keyservers_changed (GSettings *settings, gchar *key, gpointer user_data) -{ -#ifdef WITH_PGP - SeahorseContext *self = SEAHORSE_CONTEXT (user_data); - SeahorseServerSource *source; - gchar **keyservers; - GHashTable *check; - const gchar *uri; - GHashTableIter iter; - guint i; - - if (!self->pv->auto_sources) - return; - - /* Make a light copy of the auto_source table */ - check = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_iter_init (&iter, self->pv->auto_sources); - while (g_hash_table_iter_next (&iter, (gpointer*)&uri, (gpointer*)&source)) - g_hash_table_replace (check, (gpointer)uri, source); - - /* Load and strip names from keyserver list */ - keyservers = seahorse_servers_get_uris (); - - for (i = 0; keyservers[i] != NULL; i++) { - uri = keyservers[i]; - - /* If we don't have a keysource then add it */ - if (!g_hash_table_lookup (self->pv->auto_sources, uri)) { - source = seahorse_server_source_new (uri); - if (source != NULL) { - seahorse_context_take_source (self, SEAHORSE_SOURCE (source)); - g_hash_table_replace (self->pv->auto_sources, g_strdup (uri), source); - } - } - - /* Mark this one as present */ - g_hash_table_remove (check, uri); - } - - /* Now remove any extras */ - g_hash_table_iter_init (&iter, check); - while (g_hash_table_iter_next (&iter, (gpointer*)&uri, (gpointer*)&source)) { - g_hash_table_remove (self->pv->auto_sources, uri); - seahorse_context_remove_source (self, SEAHORSE_SOURCE (source)); - } - - g_hash_table_destroy (check); - g_strfreev (keyservers); -#endif /* WITH_PGP */ -} - -#endif /* WITH_KEYSERVER */ - -static void -seahorse_context_constructed (GObject *obj) -{ - SeahorseContext *self = SEAHORSE_CONTEXT (obj); - - g_return_if_fail (app_context == NULL); - - G_OBJECT_CLASS(seahorse_context_parent_class)->constructed (obj); - - app_context = self; - - /* DNS-SD discovery */ - self->pv->discovery = seahorse_service_discovery_new (); - - /* Automatically added remote key sources */ - self->pv->auto_sources = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); - - self->pv->seahorse_settings = g_settings_new ("org.gnome.seahorse"); - -#ifdef WITH_PGP - /* This is installed by gnome-keyring */ - self->pv->crypto_pgp_settings = g_settings_new ("org.gnome.crypto.pgp"); - -#ifdef WITH_KEYSERVER - g_signal_connect (self->pv->crypto_pgp_settings, "changed::keyservers", - G_CALLBACK (on_settings_keyservers_changed), self); - - /* Initial loading */ - on_settings_keyservers_changed (self->pv->crypto_pgp_settings, "keyservers", self); -#endif - -#endif -} -/** -* klass: The class to initialise -* -* Inits the #SeahorseContextClass. Adds the signals "added", "removed", "changed" -**/ -static void -seahorse_context_class_init (SeahorseContextClass *klass) -{ - GObjectClass *gobject_class; - - seahorse_context_parent_class = g_type_class_peek_parent (klass); - gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->constructed = seahorse_context_constructed; - gobject_class->dispose = seahorse_context_dispose; - gobject_class->finalize = seahorse_context_finalize; - - signals[ADDED] = g_signal_new ("added", SEAHORSE_TYPE_CONTEXT, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseContextClass, added), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SEAHORSE_TYPE_OBJECT); - signals[REMOVED] = g_signal_new ("removed", SEAHORSE_TYPE_CONTEXT, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseContextClass, removed), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SEAHORSE_TYPE_OBJECT); - signals[CHANGED] = g_signal_new ("changed", SEAHORSE_TYPE_CONTEXT, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseContextClass, changed), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SEAHORSE_TYPE_OBJECT); - signals[DESTROY] = g_signal_new ("destroy", SEAHORSE_TYPE_CONTEXT, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseContextClass, destroy), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -} - -/* init context, private vars, set prefs, connect signals */ -/** -* sctx: The context to initialise -* -* Initialises the Sahorse Context @sctx -* -**/ -static void -seahorse_context_init (SeahorseContext *sctx) -{ - /* init private vars */ - sctx->pv = g_new0 (SeahorseContextPrivate, 1); - - /* A list of sources */ - sctx->pv->sources = NULL; - - /* A table of objects */ - sctx->pv->objects_by_source = g_hash_table_new_full (g_direct_hash, g_direct_equal, - NULL, g_object_unref); - - sctx->pv->objects_by_type = g_hash_table_new_full (g_direct_hash, g_direct_equal, - NULL, NULL); -} - -/** -* object: ignored -* value: the value to prepend -* user_data: GList ** to prepend to -* -* Prepends #value to #user_data -* -**/ -static void -hash_to_ref_list (gpointer object, gpointer value, gpointer user_data) -{ - *((GList**)user_data) = g_list_prepend (*((GList**)user_data), g_object_ref (value)); -} - - -/** -* gobject: the object to dispose (#SeahorseContext) -* -* release all references -* -**/ -static void -seahorse_context_dispose (GObject *gobject) -{ - SeahorseContext *sctx; - GList *objects, *l; - - sctx = SEAHORSE_CONTEXT (gobject); - - /* Release all the objects */ - objects = NULL; - g_hash_table_foreach (sctx->pv->objects_by_source, hash_to_ref_list, &objects); - for (l = objects; l; l = g_list_next (l)) { - seahorse_context_remove_object (sctx, l->data); - g_object_unref (G_OBJECT (l->data)); - } - g_list_free (objects); - -#ifdef WITH_KEYSERVER - if (sctx->pv->crypto_pgp_settings) { - g_signal_handlers_disconnect_by_func (sctx->pv->crypto_pgp_settings, - on_settings_keyservers_changed, sctx); - g_clear_object (&sctx->pv->crypto_pgp_settings); - } -#endif - g_clear_object (&sctx->pv->seahorse_settings); - - /* Auto sources */ - if (sctx->pv->auto_sources) - g_hash_table_destroy (sctx->pv->auto_sources); - sctx->pv->auto_sources = NULL; - - /* DNS-SD */ - if (sctx->pv->discovery) - g_object_unref (sctx->pv->discovery); - sctx->pv->discovery = NULL; - - /* Release all the sources */ - for (l = sctx->pv->sources; l; l = g_list_next (l)) - g_object_unref (SEAHORSE_SOURCE (l->data)); - g_list_free (sctx->pv->sources); - sctx->pv->sources = NULL; - - if (!sctx->pv->in_destruction) { - sctx->pv->in_destruction = TRUE; - g_signal_emit (sctx, signals[DESTROY], 0); - sctx->pv->in_destruction = FALSE; - } - - G_OBJECT_CLASS (seahorse_context_parent_class)->dispose (gobject); -} - - -/** -* gobject: The #SeahorseContext to finalize -* -* destroy all objects, free private vars -* -**/ -static void -seahorse_context_finalize (GObject *gobject) -{ - SeahorseContext *sctx = SEAHORSE_CONTEXT (gobject); - - /* Destroy the hash table */ - if (sctx->pv->objects_by_source) - g_hash_table_destroy (sctx->pv->objects_by_source); - if (sctx->pv->objects_by_type) - g_hash_table_destroy (sctx->pv->objects_by_type); - - /* Other stuff already done in dispose */ - g_assert (sctx->pv->sources == NULL); - g_assert (sctx->pv->auto_sources == NULL); - g_assert (sctx->pv->discovery == NULL); - g_free (sctx->pv); - - G_OBJECT_CLASS (seahorse_context_parent_class)->finalize (gobject); -} - -/** -* seahorse_context_instance: -* -* Returns: the application main context as #SeahorseContext -*/ -SeahorseContext* -seahorse_context_instance (void) -{ - g_return_val_if_fail (app_context != NULL, NULL); - return app_context; -} - -/** - * seahorse_context_instance: - * - * Gets the main seahorse context or returns a new one if none already exist. - * - * Returns: The context instance - */ -void -seahorse_context_create (void) -{ - g_return_if_fail (app_context == NULL); - g_object_new (SEAHORSE_TYPE_CONTEXT, NULL); - g_return_if_fail (app_context != NULL); -} - -/** - * seahorse_context_destroy: - * @sctx: #SeahorseContext to destroy - * - * Emits the destroy signal for @sctx. - **/ -void -seahorse_context_destroy (SeahorseContext *sctx) -{ - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - g_return_if_fail (sctx == app_context); - g_object_run_dispose (G_OBJECT (sctx)); - g_object_unref (sctx); - app_context = NULL; -} - -/** -* sctx: #SeahorseContext to add the source to -* sksrc: #SeahorseSource to add -* -* Adds the source to the context -* -* Returns TRUE if the source was added, FALSE if it was already there -**/ -static gboolean -take_source (SeahorseContext *sctx, SeahorseSource *sksrc) -{ - g_return_val_if_fail (SEAHORSE_IS_SOURCE (sksrc), FALSE); - if (!g_list_find (sctx->pv->sources, sksrc)) { - sctx->pv->sources = g_list_append (sctx->pv->sources, sksrc); - return TRUE; - } - - return FALSE; -} - -/** - * seahorse_context_take_source: - * @sctx: A context to add a source to, can be NULL - * @sksrc: The source to add - * - * Adds @sksrc to the @sctx. If @sctx is NULL it will use the application context. - * - */ -void -seahorse_context_take_source (SeahorseContext *sctx, SeahorseSource *sksrc) -{ - g_return_if_fail (SEAHORSE_IS_SOURCE (sksrc)); - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - - take_source (sctx, sksrc); -} - -/** - * seahorse_context_add_source: - * @sctx: A context to add a source to, can be NULL - * @sksrc: The source to add - * - * Adds @sksrc to the @sctx. If @sctx is NULL it will use the application context. - * It also adds a reference to the new added source. - */ -void -seahorse_context_add_source (SeahorseContext *sctx, SeahorseSource *sksrc) -{ - g_return_if_fail (SEAHORSE_IS_SOURCE (sksrc)); - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - - if (take_source (sctx, sksrc)) - g_object_ref (sksrc); -} - -/** - * seahorse_context_remove_source: - * @sctx: Context to remove objects from - * @sksrc: The source to remove - * - * Remove all objects from source @sksrc from the #SeahorseContext @sctx - * - */ -void -seahorse_context_remove_source (SeahorseContext *sctx, SeahorseSource *sksrc) -{ - GList *l, *objects; - - g_return_if_fail (SEAHORSE_IS_SOURCE (sksrc)); - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - - if (!g_list_find (sctx->pv->sources, sksrc)) - return; - - /* Remove all objects from this source */ - objects = seahorse_context_get_objects (sctx, sksrc); - for (l = objects; l; l = g_list_next (l)) - seahorse_context_remove_object (sctx, SEAHORSE_OBJECT (l->data)); - - /* Remove the source itself */ - sctx->pv->sources = g_list_remove (sctx->pv->sources, sksrc); - g_object_unref (sksrc); -} - -/** - * seahorse_context_find_source: - * @sctx: A #SeahorseContext - * @ktype: A seahorse tag (SEAHORSE_TAG_INVALID is wildcard) - * @location: A location (SEAHORSE_LOCATION_INVALID is wildcard) - * - * Finds a context where @ktype and @location match - * - * Returns: The context - */ -SeahorseSource* -seahorse_context_find_source (SeahorseContext *sctx, GQuark ktype, - SeahorseLocation location) -{ - SeahorseSource *ks; - GList *l; - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), NULL); - - for (l = sctx->pv->sources; l; l = g_list_next (l)) { - ks = SEAHORSE_SOURCE (l->data); - - if (ktype != SEAHORSE_TAG_INVALID && - seahorse_source_get_tag (ks) != ktype) - continue; - - if (location != SEAHORSE_LOCATION_INVALID && - seahorse_source_get_location (ks) != location) - continue; - - return ks; - } - - /* If we don't have an unknown source for this type, create it */ - if (location == SEAHORSE_LOCATION_MISSING && location != SEAHORSE_TAG_INVALID) { - ks = SEAHORSE_SOURCE (seahorse_unknown_source_new (ktype)); - seahorse_context_add_source (sctx, ks); - return ks; - } - - return NULL; -} - - -/** -* seahorse_context_find_sources: -* @sctx: the context to work with -* @ktype: the type of the key to match. Or SEAHORSE_TAG_INVALID -* @location: the location to match. Or SEAHORSE_LOCATION_INVALID -* -* Returns: A list of seahorse sources matching @ktype and @location as #GList. Must -* be freed with #g_list_free -*/ -GList* -seahorse_context_find_sources (SeahorseContext *sctx, GQuark ktype, - SeahorseLocation location) -{ - SeahorseSource *ks; - GList *sources = NULL; - GList *l; - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), NULL); - - for (l = sctx->pv->sources; l; l = g_list_next (l)) { - ks = SEAHORSE_SOURCE (l->data); - - if (ktype != SEAHORSE_TAG_INVALID && - seahorse_source_get_tag (ks) != ktype) - continue; - - if (location != SEAHORSE_LOCATION_INVALID && - seahorse_source_get_location (ks) != location) - continue; - - sources = g_list_append (sources, ks); - } - - return sources; -} - -/** - * seahorse_context_remote_source: - * @sctx: the context to add the source to (can be NULL) - * @uri: An URI to add as remote source - * - * Add a remote source to the Context @sctx. If it already exists, the source - * object will be returned. - * - * Returns: The #SeahorseSource with this URI - */ -SeahorseSource* -seahorse_context_remote_source (SeahorseContext *sctx, const gchar *uri) -{ - SeahorseSource *ks = NULL; - gboolean found = FALSE; - gchar *ks_uri; - GList *l; - - g_return_val_if_fail (uri && *uri, NULL); - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), NULL); - - for (l = sctx->pv->sources; l; l = g_list_next (l)) { - ks = SEAHORSE_SOURCE (l->data); - - if (seahorse_source_get_location (ks) != SEAHORSE_LOCATION_REMOTE) - continue; - - g_object_get (ks, "uri", &ks_uri, NULL); - if (ks_uri && g_str_equal (ks_uri, uri)) - found = TRUE; - g_free (ks_uri); - - if (found) - return ks; - } - - /* TODO: We need to decouple this properly */ -#ifdef WITH_KEYSERVER -#ifdef WITH_PGP - /* Auto generate one if possible */ - if (sctx->pv->auto_sources) { - ks = SEAHORSE_SOURCE (seahorse_server_source_new (uri)); - if (ks != NULL) { - seahorse_context_take_source (sctx, ks); - g_hash_table_replace (sctx->pv->auto_sources, g_strdup (uri), ks); - } - } -#endif /* WITH_PGP */ -#endif /* WITH_KEYSERVER */ - - return ks; -} - - -/** -* sobj: SeahorseObject, sending the signal -* spec: ignored -* sctx: The instance to emit the signal on (#SeahorseContext) -* -* Emits a changed signal. -* -**/ -static void -object_notify (SeahorseObject *sobj, GParamSpec *spec, SeahorseContext *sctx) -{ - g_signal_emit (sctx, signals[CHANGED], 0, sobj); -} - -/** -* sksrc: a #SeahorseSource, part of the hash -* id: an id, part of the hash -* -* Creates a hash out of @sksrc and @id -* -* Returns an int stored in a pointer, representing the hash -**/ -static gpointer -hashkey_by_source (SeahorseSource *sksrc, GQuark id) - -{ - return GINT_TO_POINTER (g_direct_hash (sksrc) ^ - g_str_hash (g_quark_to_string (id))); -} - -/** -* a: the first #SeahorseObject -* b: the second #SeahorseObject -* -* Compares the locations of the two objects -* -* Returns 0 if a==b, -1 or 1 on difference -**/ -static gint -sort_by_location (gconstpointer a, gconstpointer b) -{ - guint aloc, bloc; - - g_assert (SEAHORSE_IS_OBJECT (a)); - g_assert (SEAHORSE_IS_OBJECT (b)); - - aloc = seahorse_object_get_location (SEAHORSE_OBJECT (a)); - bloc = seahorse_object_get_location (SEAHORSE_OBJECT (b)); - - if (aloc == bloc) - return 0; - return aloc > bloc ? -1 : 1; -} - -/** -* sctx: The seahorse context to manipulate -* sobj: The object to add/remove -* add: TRUE if the object should be added -* -* Either adds or removes an object from sctx->pv->objects_by_type. -* The new list will be sorted by location. -* -**/ -static void -setup_objects_by_type (SeahorseContext *sctx, SeahorseObject *sobj, gboolean add) -{ - GList *l, *objects = NULL; - SeahorseObject *aobj, *next; - gpointer kt = GUINT_TO_POINTER (seahorse_object_get_id (sobj)); - gboolean first; - - /* Get current set of objects in this tag/id */ - if (add) - objects = g_list_prepend (objects, sobj); - - for (aobj = g_hash_table_lookup (sctx->pv->objects_by_type, kt); - aobj; aobj = seahorse_object_get_preferred (aobj)) - { - if (aobj != sobj) - objects = g_list_prepend (objects, aobj); - } - - /* No objects just remove */ - if (!objects) { - g_hash_table_remove (sctx->pv->objects_by_type, kt); - return; - } - - /* Sort and add back */ - objects = g_list_sort (objects, sort_by_location); - for (l = objects, first = TRUE; l; l = g_list_next (l), first = FALSE) { - - aobj = SEAHORSE_OBJECT (l->data); - - /* Set first as start of list */ - if (first) - g_hash_table_replace (sctx->pv->objects_by_type, kt, aobj); - - /* Set next one as preferred */ - else { - next = g_list_next (l) ? SEAHORSE_OBJECT (g_list_next (l)->data) : NULL; - seahorse_object_set_preferred (aobj, next); - } - } - - g_list_free (objects); -} - -/** - * seahorse_context_add_object: - * @sctx: The context to add the object to - * @sobj: The object to add - * - * Adds @sobj to @sctx. References @sobj - * - */ -void -seahorse_context_add_object (SeahorseContext *sctx, SeahorseObject *sobj) -{ - if (!sctx) - sctx = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - - g_object_ref (sobj); - seahorse_context_take_object (sctx, sobj); -} - -/** - * seahorse_context_take_object: - * @sctx: The #SeahorseContext context to add an object to - * @sobj: The #SeahorseObject object to add - * - * Adds @sobj to @sctx. If a similar object exists, it will be overwritten. - * Emits the "added" signal. - */ -void -seahorse_context_take_object (SeahorseContext *sctx, SeahorseObject *sobj) -{ - gpointer ks; - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - g_return_if_fail (SEAHORSE_IS_OBJECT (sobj)); - g_return_if_fail (seahorse_object_get_id (sobj) != 0); - - ks = hashkey_by_source (seahorse_object_get_source (sobj), - seahorse_object_get_id (sobj)); - - g_return_if_fail (!g_hash_table_lookup (sctx->pv->objects_by_source, ks)); - - g_object_ref (sobj); - - g_object_set (sobj, "context", sctx, NULL); - g_hash_table_replace (sctx->pv->objects_by_source, ks, sobj); - setup_objects_by_type (sctx, sobj, TRUE); - g_signal_emit (sctx, signals[ADDED], 0, sobj); - g_object_unref (sobj); - - g_signal_connect (sobj, "notify", G_CALLBACK (object_notify), sctx); -} - -/** - * seahorse_context_get_count: - * @sctx: The context. If NULL is passed it will take the application context - * - * - * - * Returns: The number of objects in this context - */ -guint -seahorse_context_get_count (SeahorseContext *sctx) -{ - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), 0); - return g_hash_table_size (sctx->pv->objects_by_source); -} - -/** - * seahorse_context_get_object: - * @sctx: The #SeahorseContext to look in - * @sksrc: The source to match - * @id: the id to match - * - * Finds the object with the source @sksrc and @id in the context and returns it - * - * Returns: The matching object - */ -SeahorseObject* -seahorse_context_get_object (SeahorseContext *sctx, SeahorseSource *sksrc, - GQuark id) -{ - gconstpointer k; - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), NULL); - g_return_val_if_fail (SEAHORSE_IS_SOURCE (sksrc), NULL); - - k = hashkey_by_source (sksrc, id); - return SEAHORSE_OBJECT (g_hash_table_lookup (sctx->pv->objects_by_source, k)); -} - -/** - * ObjectMatcher: - * @kp: A #SeahorseObjectPredicate to compare an object to - * @many: TRUE if there can be several matches - * @func: A function to call for every match - * @user_data: user data to pass to the function - * - * - **/ -typedef struct _ObjectMatcher { - SeahorseObjectPredicate *kp; - gboolean many; - SeahorseObjectFunc func; - gpointer user_data; -} ObjectMatcher; - -/** - * find_matching_objects: - * @key: ignored - * @sobj: the object to match - * @km: an #ObjectMatcher - * - * Calls km->func for every matched object - * - * Returns: TRUE if the search terminates, FALSE if there could be another - * match or nothing was found - */ -static gboolean -find_matching_objects (gpointer key, SeahorseObject *sobj, ObjectMatcher *km) -{ - gboolean matched; - - if (km->kp && seahorse_object_predicate_match (km->kp, SEAHORSE_OBJECT (sobj))) { - matched = TRUE; - (km->func) (sobj, km->user_data); - } - - /* Terminate search */ - if (!km->many && matched) - return TRUE; - - /* Keep going */ - return FALSE; -} - -/** -* object: A #SeahorseObject to add to the list -* user_data: a #GList to add the object to -* -* Does not return anything.... -* -**/ -static void -add_object_to_list (SeahorseObject *object, gpointer user_data) -{ - GList** list = (GList**)user_data; - *list = g_list_prepend (*list, object); -} - -/** - * seahorse_context_find_objects_full: - * @self: The #SeahorseContext to match objects in - * @pred: #SeahorseObjectPredicate containing some data to match - * - * Finds matching objects and adds them to the list - * - * Returns: a #GList list containing the matching objects - */ -GList* -seahorse_context_find_objects_full (SeahorseContext *self, SeahorseObjectPredicate *pred) -{ - GList *list = NULL; - ObjectMatcher km; - - if (!self) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), NULL); - g_return_val_if_fail (pred, NULL); - - memset (&km, 0, sizeof (km)); - km.kp = pred; - km.many = TRUE; - km.func = add_object_to_list; - km.user_data = &list; - - g_hash_table_find (self->pv->objects_by_source, (GHRFunc)find_matching_objects, &km); - return list; -} - -/** - * seahorse_context_for_objects_full: - * @self: #SeahorseContext to work with - * @pred: #SeahorseObjectPredicate to match - * @func: Function to call for matching objects - * @user_data: Data to pass to this function - * - * Calls @func for every object in @self matching the criteria in @pred. @user_data - * is passed to this function - */ -void -seahorse_context_for_objects_full (SeahorseContext *self, SeahorseObjectPredicate *pred, - SeahorseObjectFunc func, gpointer user_data) -{ - ObjectMatcher km; - - if (!self) - self = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (self)); - g_return_if_fail (pred); - g_return_if_fail (func); - - memset (&km, 0, sizeof (km)); - km.kp = pred; - km.many = TRUE; - km.func = func; - km.user_data = user_data; - - g_hash_table_find (self->pv->objects_by_source, (GHRFunc)find_matching_objects, &km); -} - -/** - * seahorse_context_get_objects: - * @self: A #SeahorseContext to find objects in - * @source: A #SeahorseSource that must match - * - * - * - * Returns: A #GList of objects from @self that match the source @source - */ -GList* -seahorse_context_get_objects (SeahorseContext *self, SeahorseSource *source) -{ - SeahorseObjectPredicate pred; - - if (!self) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), NULL); - g_return_val_if_fail (source == NULL || SEAHORSE_IS_SOURCE (source), NULL); - - seahorse_object_predicate_clear (&pred); - pred.source = source; - - return seahorse_context_find_objects_full (self, &pred); -} - -/** - * seahorse_context_find_object: - * @sctx: The #SeahorseContext to work with (can be NULL) - * @id: The id to look for - * @location: The location to look for (at least) - * - * Finds the object with the id @id at location @location or better. - * Local is better than remote... - * - * Returns: the matching #SeahorseObject or NULL if none is found - */ -SeahorseObject* -seahorse_context_find_object (SeahorseContext *sctx, GQuark id, SeahorseLocation location) -{ - SeahorseObject *sobj; - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), NULL); - - sobj = (SeahorseObject*)g_hash_table_lookup (sctx->pv->objects_by_type, GUINT_TO_POINTER (id)); - while (sobj) { - - /* If at the end and no more objects in list, return */ - if (location == SEAHORSE_LOCATION_INVALID && !seahorse_object_get_preferred (sobj)) - return sobj; - - if (location >= seahorse_object_get_location (sobj)) - return sobj; - - /* Look down the list for this location */ - sobj = seahorse_object_get_preferred (sobj); - } - - return NULL; -} - - -/** - * seahorse_context_find_objects: - * @sctx: A #SeahorseContext to look in (can be NULL) - * @ktype: The tag to look for - * @usage: the usage (#SeahorseUsage) - * @location: the location to look for - * - * - * - * Returns: A list of matching objects - */ -GList* -seahorse_context_find_objects (SeahorseContext *sctx, GQuark ktype, - SeahorseUsage usage, SeahorseLocation location) -{ - SeahorseObjectPredicate pred; - memset (&pred, 0, sizeof (pred)); - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), NULL); - - pred.tag = ktype; - pred.usage = usage; - pred.location = location; - - return seahorse_context_find_objects_full (sctx, &pred); -} - -/** - * seahorse_context_remove_object: - * @sctx: The #SeahorseContext (can be NULL) - * @sobj: The #SeahorseObject to remove - * - * Removes the object from the context - * - */ -void -seahorse_context_remove_object (SeahorseContext *sctx, SeahorseObject *sobj) -{ - gconstpointer k; - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - g_return_if_fail (SEAHORSE_IS_OBJECT (sobj)); - g_return_if_fail (seahorse_object_get_id (sobj) != 0); - - k = hashkey_by_source (seahorse_object_get_source (sobj), - seahorse_object_get_id (sobj)); - - if (g_hash_table_lookup (sctx->pv->objects_by_source, k)) { - g_return_if_fail (seahorse_object_get_context (sobj) == sctx); - - g_object_ref (sobj); - g_signal_handlers_disconnect_by_func (sobj, object_notify, sctx); - g_object_set (sobj, "context", NULL, NULL); - g_hash_table_remove (sctx->pv->objects_by_source, k); - setup_objects_by_type (sctx, sobj, FALSE); - g_signal_emit (sctx, signals[REMOVED], 0, sobj); - g_object_unref (sobj); - } -} - - -/* ----------------------------------------------------------------------------- - * DEPRECATED - */ - -/** - * seahorse_context_get_default_key: - * @sctx: Current #SeahorseContext - * - * Returns: the PGP secret key that's the default key - * - * Deprecated: No replacement - */ -SeahorseObject* -seahorse_context_get_default_key (SeahorseContext *self) -{ - SeahorseObject *key = NULL; - gchar *keyid; - - if (self == NULL) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), NULL); - - if (self->pv->crypto_pgp_settings) { - keyid = g_settings_get_string (self->pv->crypto_pgp_settings, "default-key"); - if (keyid != NULL && keyid[0]) { - key = seahorse_context_find_object (self, g_quark_from_string (keyid), - SEAHORSE_LOCATION_LOCAL); - } - g_free (keyid); - } - - return key; -} - -/** - * seahorse_context_get_discovery: - * @sctx: #SeahorseContext object - * - * Gets the Service Discovery object for this context. - * - * Returns: The Service Discovery object. - * - * Deprecated: No replacement - */ -SeahorseServiceDiscovery* -seahorse_context_get_discovery (SeahorseContext *sctx) -{ - if (!sctx) - sctx = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (sctx), NULL); - g_return_val_if_fail (sctx->pv->discovery != NULL, NULL); - - return sctx->pv->discovery; -} - -static void -on_source_refresh_load_ready (GObject *object, GAsyncResult *result, gpointer user_data) -{ - GError *error = NULL; - - if (!seahorse_source_load_finish (SEAHORSE_SOURCE (object), result, &error)) { - g_message ("failed to refresh: %s", error->message); - g_clear_error (&error); - } -} - -/** - * seahorse_context_refresh_auto: - * @sctx: A #SeahorseContext (can be NULL) - * - * Starts a new refresh operation - * - */ -void -seahorse_context_refresh_auto (SeahorseContext *sctx) -{ - SeahorseSource *ks; - GList *l; - - if (!sctx) - sctx = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (sctx)); - - for (l = sctx->pv->sources; l; l = g_list_next (l)) { - ks = SEAHORSE_SOURCE (l->data); - if (seahorse_source_get_location (ks) == SEAHORSE_LOCATION_LOCAL) - seahorse_source_load_async (ks, NULL, - on_source_refresh_load_ready, NULL); - } -} - -typedef struct { - GCancellable *cancellable; - gint num_searches; - GList *objects; -} seahorse_context_search_remote_closure; - -static void -seahorse_context_search_remote_free (gpointer user_data) -{ - seahorse_context_search_remote_closure *closure = user_data; - g_clear_object (&closure->cancellable); - g_list_free (closure->objects); - g_free (closure); -} - -static void -on_source_search_ready (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - seahorse_context_search_remote_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - GList *objects; - - g_return_if_fail (closure->num_searches > 0); - - objects = seahorse_source_search_finish (SEAHORSE_SOURCE (source), result, &error); - closure->objects = g_list_concat (closure->objects, objects); - - if (error != NULL) - g_simple_async_result_take_error (res, error); - - closure->num_searches--; - seahorse_progress_end (closure->cancellable, GINT_TO_POINTER (closure->num_searches)); - - if (closure->num_searches == 0) - g_simple_async_result_complete (res); - - g_object_unref (user_data); -} - -void -seahorse_context_search_remote_async (SeahorseContext *self, - const gchar *search, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - seahorse_context_search_remote_closure *closure; - GSimpleAsyncResult *res; - SeahorseSource *source; - GHashTable *servers = NULL; - gchar **names; - gchar *uri; - GList *l; - guint i; - - if (self == NULL) - self = seahorse_context_instance (); - - g_return_if_fail (SEAHORSE_IS_CONTEXT (self)); - - /* Get a list of all selected key servers */ - names = g_settings_get_strv (self->pv->seahorse_settings, "last-search-servers"); - if (names != NULL && names[0] != NULL) { - servers = g_hash_table_new (g_str_hash, g_str_equal); - for (i = 0; names[i] != NULL; i++) - g_hash_table_insert (servers, names[i], GINT_TO_POINTER (TRUE)); - g_strfreev (names); - } - - res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_context_search_remote_async); - closure = g_new0 (seahorse_context_search_remote_closure, 1); - g_simple_async_result_set_op_res_gpointer (res, closure, - seahorse_context_search_remote_free); - if (cancellable) - closure->cancellable = g_object_ref (cancellable); - - for (l = self->pv->sources; l; l = g_list_next (l)) { - source = SEAHORSE_SOURCE (l->data); - - if (seahorse_source_get_location (source) != SEAHORSE_LOCATION_REMOTE) - continue; - - if (servers) { - g_object_get (source, "uri", &uri, NULL); - if (!g_hash_table_lookup (servers, uri)) { - g_free (uri); - continue; - } - g_free (uri); - } - - seahorse_progress_prep_and_begin (closure->cancellable, GINT_TO_POINTER (closure->num_searches), NULL); - seahorse_source_search_async (source, search, closure->cancellable, - on_source_search_ready, g_object_ref (res)); - closure->num_searches++; - } - - if (closure->num_searches == 0) - g_simple_async_result_complete_in_idle (res); - - g_object_unref (res); -} - -GList * -seahorse_context_search_remote_finish (SeahorseContext *self, - GAsyncResult *result, - GError **error) -{ - seahorse_context_search_remote_closure *closure; - GSimpleAsyncResult *res; - GList *results; - - if (self == NULL) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), NULL); - - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), - seahorse_context_search_remote_async), NULL); - - res = G_SIMPLE_ASYNC_RESULT (result); - - if (g_simple_async_result_propagate_error (res, error)) - return NULL; - - closure = g_simple_async_result_get_op_res_gpointer (res); - results = closure->objects; - closure->objects = NULL; - - return results; -} - -typedef struct { - GCancellable *cancellable; - gint num_transfers; -} seahorse_context_transfer_closure; - -static void -seahorse_context_transfer_free (gpointer user_data) -{ - seahorse_context_search_remote_closure *closure = user_data; - g_clear_object (&closure->cancellable); - g_free (closure); -} - -static void -on_source_transfer_ready (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - seahorse_context_transfer_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - g_return_if_fail (closure->num_transfers > 0); - - seahorse_transfer_finish (result, &error); - if (error != NULL) - g_simple_async_result_take_error (res, error); - - closure->num_transfers--; - seahorse_progress_end (closure->cancellable, GINT_TO_POINTER (closure->num_transfers)); - - if (closure->num_transfers == 0) { - g_simple_async_result_complete (res); - } - - g_object_unref (user_data); -} - - -void -seahorse_context_transfer_objects_async (SeahorseContext *self, - GList *objects, - SeahorseSource *to, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - seahorse_context_transfer_closure *closure; - SeahorseObject *object; - GSimpleAsyncResult *res; - SeahorseSource *from; - GQuark ktype; - GList *next, *l; - GList *ids = NULL; - - if (self == NULL) - self = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (self)); - - res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_context_transfer_objects_async); - closure = g_new0 (seahorse_context_transfer_closure, 1); - g_simple_async_result_set_op_res_gpointer (res, closure, - seahorse_context_transfer_free); - if (cancellable) - closure->cancellable = g_object_ref (cancellable); - - objects = g_list_copy (objects); - - /* Sort by key source */ - objects = seahorse_util_objects_sort (objects); - - while (objects) { - - /* break off one set (same keysource) */ - next = seahorse_util_objects_splice (objects); - - g_assert (SEAHORSE_IS_OBJECT (objects->data)); - object = SEAHORSE_OBJECT (objects->data); - - /* Export from this key source */ - from = seahorse_object_get_source (object); - g_return_if_fail (from != NULL); - ktype = seahorse_source_get_tag (from); - - /* Find a local keysource to import to */ - if (!to) { - to = seahorse_context_find_source (self, ktype, SEAHORSE_LOCATION_LOCAL); - if (!to) { - /* TODO: How can we warn caller about this. Do we need to? */ - g_warning ("couldn't find a local source for: %s", - g_quark_to_string (ktype)); - } - } - - /* Make sure it's the same type */ - if (ktype != seahorse_source_get_tag (to)) { - /* TODO: How can we warn caller about this. Do we need to? */ - g_warning ("destination is not of type: %s", - g_quark_to_string (ktype)); - } - - if (to != NULL && from != to) { - - /* Build id list */ - for (l = objects; l; l = g_list_next (l)) - ids = g_list_prepend (ids, GUINT_TO_POINTER (seahorse_object_get_id (l->data))); - ids = g_list_reverse (ids); - - /* Start a new transfer operation between the two sources */ - seahorse_progress_prep_and_begin (cancellable, GINT_TO_POINTER (closure->num_transfers), NULL); - seahorse_transfer_async (from, to, ids, cancellable, - on_source_transfer_ready, g_object_ref (res)); - closure->num_transfers++; - - g_list_free (ids); - ids = NULL; - } - - g_list_free (objects); - objects = next; - } - - if (closure->num_transfers == 0) - g_simple_async_result_complete_in_idle (res); - - g_object_unref (res); -} - -gboolean -seahorse_context_transfer_objects_finish (SeahorseContext *self, - GAsyncResult *result, - GError **error) -{ - GSimpleAsyncResult *res; - - if (self == NULL) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), FALSE); - - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), - seahorse_context_transfer_objects_async), FALSE); - - res = G_SIMPLE_ASYNC_RESULT (result); - - if (g_simple_async_result_propagate_error (res, error)) - return FALSE; - - return TRUE; -} - -void -seahorse_context_retrieve_objects_async (SeahorseContext *self, - GQuark ktype, - GList *ids, - SeahorseSource *to, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - seahorse_context_transfer_closure *closure; - GSimpleAsyncResult *res; - SeahorseSource *source; - GList *sources, *l; - - if (self == NULL) - self = seahorse_context_instance (); - g_return_if_fail (SEAHORSE_IS_CONTEXT (self)); - - res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_context_retrieve_objects_async); - closure = g_new0 (seahorse_context_transfer_closure, 1); - g_simple_async_result_set_op_res_gpointer (res, closure, - seahorse_context_transfer_free); - if (cancellable) - closure->cancellable = g_object_ref (cancellable); - - if (to == NULL) { - to = seahorse_context_find_source (self, ktype, SEAHORSE_LOCATION_LOCAL); - if (to == NULL) { - /* TODO: How can we warn caller about this. Do we need to? */ - g_warning ("couldn't find a local source for: %s", - g_quark_to_string (ktype)); - } - } - - sources = seahorse_context_find_sources (self, ktype, SEAHORSE_LOCATION_REMOTE); - for (l = sources; to != NULL && l != NULL; l = g_list_next (l)) { - source = SEAHORSE_SOURCE (l->data); - - /* Start a new transfer operation between the two key sources */ - seahorse_progress_prep_and_begin (cancellable, GINT_TO_POINTER (closure->num_transfers), NULL); - seahorse_transfer_async (source, to, ids, cancellable, - on_source_transfer_ready, g_object_ref (res)); - closure->num_transfers++; - } - - if (closure->num_transfers == 0) - g_simple_async_result_complete_in_idle (res); - - g_object_unref (res); -} - - -gboolean -seahorse_context_retrieve_objects_finish (SeahorseContext *self, - GAsyncResult *result, - GError **error) -{ - GSimpleAsyncResult *res; - - if (self == NULL) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), FALSE); - - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), - seahorse_context_retrieve_objects_async), FALSE); - - res = G_SIMPLE_ASYNC_RESULT (result); - - if (g_simple_async_result_propagate_error (res, error)) - return FALSE; - - return TRUE; -} - -GList* -seahorse_context_discover_objects (SeahorseContext *self, - GQuark ktype, - GList *rawids, - GCancellable *cancellable) -{ - GList *robjects = NULL; - GQuark id = 0; - GList *todiscover = NULL; - GList *toimport = NULL; - SeahorseSource *source; - SeahorseObject* object; - SeahorseLocation loc; - GList *l; - - if (self == NULL) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), NULL); - - /* Check all the ids */ - for (l = rawids; l != NULL; l = g_list_next (l)) { - - id = seahorse_context_canonize_id (ktype, (gchar*)l->data); - if (!id) { - /* TODO: Try and match this partial id */ - g_warning ("invalid id: %s", (gchar*)l->data); - continue; - } - - /* Do we know about this object? */ - object = seahorse_context_find_object (self, id, SEAHORSE_LOCATION_INVALID); - - /* No such object anywhere, discover it */ - if (object == NULL) { - todiscover = g_list_prepend (todiscover, GUINT_TO_POINTER (id)); - id = 0; - continue; - } - - /* Our return value */ - robjects = g_list_prepend (robjects, object); - - /* We know about this object, check where it is */ - loc = seahorse_object_get_location (object); - g_assert (loc != SEAHORSE_LOCATION_INVALID); - - /* Do nothing for local objects */ - if (loc >= SEAHORSE_LOCATION_LOCAL) - continue; - - /* Remote objects get imported */ - else if (loc >= SEAHORSE_LOCATION_REMOTE) - toimport = g_list_prepend (toimport, object); - - /* Searching objects are ignored */ - else if (loc >= SEAHORSE_LOCATION_SEARCHING) - continue; - - /* TODO: Should we try SEAHORSE_LOCATION_MISSING objects again? */ - } - - /* Start an import process on all toimport */ - if (toimport) { - seahorse_context_transfer_objects_async (self, toimport, NULL, - cancellable, NULL, NULL); - - g_list_free (toimport); - } - - /* Start a discover process on all todiscover */ - if (todiscover != NULL && - g_settings_get_boolean (self->pv->seahorse_settings, "server-auto-retrieve")) { - seahorse_context_retrieve_objects_async (self, ktype, todiscover, NULL, - cancellable, NULL, NULL); - } - - /* Add unknown objects for all these */ - source = seahorse_context_find_source (self, ktype, SEAHORSE_LOCATION_MISSING); - for (l = todiscover; l != NULL; l = g_list_next (l)) { - if (source) { - object = seahorse_unknown_source_add_object (SEAHORSE_UNKNOWN_SOURCE (source), - GPOINTER_TO_UINT (l->data), - cancellable); - robjects = g_list_prepend (robjects, object); - } - } - - g_list_free (todiscover); - - return robjects; -} - -/** - * seahorse_context_canonize_id: - * @ktype: a keytype defining the canonization function - * @id: The id to canonize - * - * - * - * Returns: A canonized GQuark - */ -GQuark -seahorse_context_canonize_id (GQuark ktype, const gchar *id) -{ - SeahorseCanonizeFunc canonize; - - g_return_val_if_fail (id != NULL, 0); - - canonize = seahorse_registry_lookup_function (NULL, "canonize", g_quark_to_string (ktype), NULL); - if (!canonize) - return 0; - - return (canonize) (id); -} - -GSettings * -seahorse_context_settings (SeahorseContext *self) -{ - if (self == NULL) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), NULL); - - return self->pv->seahorse_settings; -} - -GSettings * -seahorse_context_pgp_settings (SeahorseContext *self) -{ - if (self == NULL) - self = seahorse_context_instance (); - g_return_val_if_fail (SEAHORSE_IS_CONTEXT (self), NULL); - - return self->pv->crypto_pgp_settings; -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-context.h seahorse-3.6.3/libseahorse/seahorse-context.h --- seahorse-3.2.2/libseahorse/seahorse-context.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-context.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,224 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2003 Jacob Perkins - * Copyright (C) 2004-2005 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __SEAHORSE_CONTEXT_H__ -#define __SEAHORSE_CONTEXT_H__ - -#include - -#include "seahorse-source.h" -#include "seahorse-dns-sd.h" - -#define SEAHORSE_TYPE_CONTEXT (seahorse_context_get_type ()) -#define SEAHORSE_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_CONTEXT, SeahorseContext)) -#define SEAHORSE_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_CONTEXT, SeahorseContextClass)) -#define SEAHORSE_IS_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_CONTEXT)) -#define SEAHORSE_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_CONTEXT)) -#define SEAHORSE_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_CONTEXT, SeahorseContextClass)) - -struct _SeahorseKey; -struct _SeahorseObject; -struct _SeahorseObjectPredicate; - -typedef struct _SeahorseContext SeahorseContext; -typedef struct _SeahorseContextClass SeahorseContextClass; -typedef struct _SeahorseContextPrivate SeahorseContextPrivate; - -/** - * SeahorseContext: - * @parent: The parent #GObject - * @is_daemon: a #gboolean indicating whether the context is being used in a - * program that is daemonized - * - * This is where all the action in a Seahorse process comes together. - * - * - Usually there's only one #SeahorseContext per process created by passing - * %SEAHORSE_CONTEXT_APP to seahorse_context_new(), and accessed via - * the %SCTX_APP macro. - * - Retains the list of all valid struct _SeahorseObject objects. - * - Has a collection of #SeahorseSource objects which add objects to the - * #SeahorseContext. - * - * Signals: - * added: A object was added to the context. - * removed: A object was removed from the context. - * changed: A object changed. - * destroy: The context was destroyed. - */ - -struct _SeahorseContext { - GObject parent; - - /*< public >*/ - gboolean is_daemon; - - /*< private >*/ - SeahorseContextPrivate *pv; -}; - -struct _SeahorseContextClass { - GObjectClass parent_class; - - /* signals --------------------------------------------------------- */ - - /* A object was added to this source */ - void (*added) (SeahorseContext *self, - struct _SeahorseObject *sobj); - - /* Removed a object from this source */ - void (*removed) (SeahorseContext *self, - struct _SeahorseObject *sobj); - - /* This object has changed */ - void (*changed) (SeahorseContext *self, - struct _SeahorseObject *sobj); - - void (*destroy) (SeahorseContext *self); -}; - -typedef void (*SeahorseObjectFunc) (struct _SeahorseObject *obj, - gpointer user_data); - -#define SCTX_APP() (seahorse_context_instance ()) - -GType seahorse_context_get_type (void); - -SeahorseContext* seahorse_context_instance (void); - -void seahorse_context_create (void); - -void seahorse_context_destroy (SeahorseContext *self); - -#define seahorse_context_is_daemon(ctx) ((ctx)->is_daemon) - -void seahorse_context_add_source (SeahorseContext *self, - SeahorseSource *sksrc); - -void seahorse_context_take_source (SeahorseContext *self, - SeahorseSource *sksrc); - -void seahorse_context_remove_source (SeahorseContext *self, - SeahorseSource *sksrc); - -SeahorseSource* seahorse_context_find_source (SeahorseContext *self, - GQuark ktype, - SeahorseLocation location); - -GList* seahorse_context_find_sources (SeahorseContext *sctx, - GQuark ktype, - SeahorseLocation location); - -SeahorseSource* seahorse_context_remote_source (SeahorseContext *self, - const gchar *uri); - -void seahorse_context_add_object (SeahorseContext *self, - struct _SeahorseObject *sobj); - -void seahorse_context_take_object (SeahorseContext *self, - struct _SeahorseObject *sobj); - -guint seahorse_context_get_count (SeahorseContext *self); - -struct _SeahorseObject* seahorse_context_get_object (SeahorseContext *self, - SeahorseSource *sksrc, - GQuark id); - -GList* seahorse_context_get_objects (SeahorseContext *self, - SeahorseSource *sksrc); - -struct _SeahorseObject* seahorse_context_find_object (SeahorseContext *self, - GQuark id, - SeahorseLocation location); - -GList* seahorse_context_find_objects (SeahorseContext *self, - GQuark ktype, - SeahorseUsage usage, - SeahorseLocation location); - -GList* seahorse_context_find_objects_full (SeahorseContext *self, - struct _SeahorseObjectPredicate *skpred); - -void seahorse_context_for_objects_full (SeahorseContext *self, - struct _SeahorseObjectPredicate *skpred, - SeahorseObjectFunc func, - gpointer user_data); - -void seahorse_context_remove_object (SeahorseContext *self, - struct _SeahorseObject *sobj); - -SeahorseServiceDiscovery* - seahorse_context_get_discovery (SeahorseContext *self); - -struct _SeahorseObject* - seahorse_context_get_default_key (SeahorseContext *self); - -void seahorse_context_refresh_auto (SeahorseContext *self); - -void seahorse_context_search_remote_async (SeahorseContext *self, - const gchar *search, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GList * seahorse_context_search_remote_finish (SeahorseContext *self, - GAsyncResult *result, - GError **error); - -void seahorse_context_transfer_objects_async (SeahorseContext *self, - GList *objects, - SeahorseSource *to, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_context_transfer_objects_finish (SeahorseContext *self, - GAsyncResult *result, - GError **error); - -void seahorse_context_retrieve_objects_async (SeahorseContext *self, - GQuark ktype, - GList *ids, - SeahorseSource *to, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_context_retrieve_objects_finish (SeahorseContext *self, - GAsyncResult *result, - GError **error); - -GList* seahorse_context_discover_objects (SeahorseContext *self, - GQuark ktype, - GList *rawids, - GCancellable *cancellable); - -typedef GQuark (*SeahorseCanonizeFunc) (const gchar *id); - -GQuark seahorse_context_canonize_id (GQuark ktype, - const gchar *id); - -GSettings * seahorse_context_settings (SeahorseContext *self); - -GSettings * seahorse_context_pgp_settings (SeahorseContext *self); - -#endif /* __SEAHORSE_CONTEXT_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse.css seahorse-3.6.3/libseahorse/seahorse.css --- seahorse-3.2.2/libseahorse/seahorse.css 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse.css 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,12 @@ +.sidebar { + border-width: 1px 0 0 0; + border-style: solid; + border-color: shade (@theme_bg_color, 0.66); + border-radius: 0; +} + +.pane-separator { + border-width: 1px 1px 0 0; + border-style: solid; + border-color: shade (@theme_bg_color, 0.66); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-deletable.c seahorse-3.6.3/libseahorse/seahorse-deletable.c --- seahorse-3.2.2/libseahorse/seahorse-deletable.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-deletable.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,185 @@ +/* + * Seahorse + * + * Copyright (C) 2004,2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-deletable.h" +#include "seahorse-deleter.h" + +#include + +#include + +typedef SeahorseDeletableIface SeahorseDeletableInterface; + +G_DEFINE_INTERFACE (SeahorseDeletable, seahorse_deletable, G_TYPE_OBJECT); + +SeahorseDeleter * +seahorse_deletable_create_deleter (SeahorseDeletable *deletable) +{ + SeahorseDeletableIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_DELETABLE (deletable), NULL); + + iface = SEAHORSE_DELETABLE_GET_INTERFACE (deletable); + g_return_val_if_fail (iface->create_deleter, NULL); + + return iface->create_deleter (deletable); +} + +gboolean +seahorse_deletable_can_delete (gpointer object) +{ + gboolean can = FALSE; + + if (!SEAHORSE_IS_DELETABLE (object)) + return FALSE; + + g_object_get (object, "deletable", &can, NULL); + return can; +} + +static void +seahorse_deletable_default_init (SeahorseDeletableIface *iface) +{ + static gboolean initialized = FALSE; + if (!initialized) { + initialized = TRUE; + g_object_interface_install_property (iface, + g_param_spec_boolean ("deletable", "Deletable", "Is actually deletable", + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + } +} + +typedef struct { + GMainLoop *loop; + GAsyncResult *result; +} WaitClosure; + +static WaitClosure * +wait_closure_new (void) +{ + WaitClosure *closure; + + closure = g_slice_new0 (WaitClosure); + closure->loop = g_main_loop_new (NULL, FALSE); + + return closure; +} + +static void +wait_closure_free (WaitClosure *closure) +{ + g_clear_object (&closure->result); + g_main_loop_unref (closure->loop); + g_slice_free (WaitClosure, closure); +} + +static void +on_wait_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + WaitClosure *closure = user_data; + g_assert (closure->result == NULL); + closure->result = g_object_ref (result); + g_main_loop_quit (closure->loop); +} + +guint +seahorse_deletable_delete_with_prompt_wait (GList *objects, + GtkWindow *parent, + GError **error) +{ + SeahorseDeleter *deleter; + WaitClosure *closure; + GHashTable *pending; + guint count = 0; + gboolean ret; + GList *l, *x; + GList *deleted; + + g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), 0); + g_return_val_if_fail (error == NULL || *error == NULL, 0); + + /* A table for monitoring which objects are still pending */ + pending = g_hash_table_new (g_direct_hash, g_direct_equal); + for (l = objects; l != NULL; l = g_list_next (l)) + g_hash_table_replace (pending, l->data, l->data); + + closure = wait_closure_new (); + + for (l = objects; l != NULL; l = g_list_next (l)) { + if (!g_hash_table_lookup (pending, l->data)) + continue; + + if (!seahorse_deletable_can_delete (l->data)) { + g_hash_table_remove (pending, l->data); + continue; + } + + deleter = seahorse_deletable_create_deleter (SEAHORSE_DELETABLE (l->data)); + if (!deleter) + continue; + + /* Now go and add all pending to each exporter */ + for (x = objects; x != NULL; x = g_list_next (x)) { + if (x->data == l->data) + continue; + if (g_hash_table_lookup (pending, x->data)) + seahorse_deleter_add_object (deleter, x->data); + } + + /* Now show a prompt choosing between the exporters */ + ret = seahorse_deleter_prompt (deleter, parent); + + if (!ret) { + g_object_unref (deleter); + break; + } + + seahorse_deleter_delete_async (deleter, NULL, on_wait_complete, closure); + + g_main_loop_run (closure->loop); + + ret = seahorse_deleter_delete_finish (deleter, closure->result, error); + g_object_unref (closure->result); + closure->result = NULL; + + if (ret) { + deleted = seahorse_deleter_get_objects (deleter); + for (x = deleted; x != NULL; x = g_list_next (x)) { + g_hash_table_remove (pending, x->data); + count++; + } + } + + g_object_unref (deleter); + + if (!ret) + break; + } + + wait_closure_free (closure); + g_hash_table_destroy (pending); + return count; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-deletable.h seahorse-3.6.3/libseahorse/seahorse-deletable.h --- seahorse-3.2.2/libseahorse/seahorse-deletable.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-deletable.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,53 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Deletable, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_DELETABLE_H__ +#define __SEAHORSE_DELETABLE_H__ + +#include "seahorse-deleter.h" + +#define SEAHORSE_TYPE_DELETABLE (seahorse_deletable_get_type ()) +#define SEAHORSE_DELETABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_DELETABLE, SeahorseDeletable)) +#define SEAHORSE_IS_DELETABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_DELETABLE)) +#define SEAHORSE_DELETABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_DELETABLE, SeahorseDeletableIface)) + +typedef struct _SeahorseDeletable SeahorseDeletable; +typedef struct _SeahorseDeletableIface SeahorseDeletableIface; + +struct _SeahorseDeletableIface { + GTypeInterface parent; + + SeahorseDeleter * (* create_deleter) (SeahorseDeletable *deletable); +}; + +GType seahorse_deletable_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_deletable_create_deleter (SeahorseDeletable *deletable); + +gboolean seahorse_deletable_can_delete (gpointer object); + +guint seahorse_deletable_delete_with_prompt_wait (GList *objects, + GtkWindow *parent, + GError **error); + +#endif /* __SEAHORSE_DELETABLE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-delete-dialog.c seahorse-3.6.3/libseahorse/seahorse-delete-dialog.c --- seahorse-3.2.2/libseahorse/seahorse-delete-dialog.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-delete-dialog.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,279 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-delete-dialog.h" + +#include +#include + +#define SEAHORSE_DELETE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_DELETE_DIALOG, SeahorseDeleteDialogClass)) +#define SEAHORSE_IS_DELETE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_DELETE_DIALOG)) +#define SEAHORSE_DELETE_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_DELETE_DIALOG, SeahorseDeleteDialogClass)) + +typedef struct _SeahorseDeleteDialogClass SeahorseDeleteDialogClass; + +struct _SeahorseDeleteDialog { + GtkMessageDialog dialog; + GtkWidget *check; + gboolean check_require; +}; + +struct _SeahorseDeleteDialogClass { + GtkMessageDialogClass dialog; +}; + +enum { + PROP_0, + PROP_CHECK_LABEL, + PROP_CHECK_VALUE, + PROP_CHECK_REQUIRE +}; + +G_DEFINE_TYPE (SeahorseDeleteDialog, seahorse_delete_dialog, GTK_TYPE_MESSAGE_DIALOG); + +static void +seahorse_delete_dialog_init (SeahorseDeleteDialog *self) +{ + +} + +static void +update_response_buttons (SeahorseDeleteDialog *self) +{ + gboolean active; + + active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->check)); + gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, + !self->check_require || active); +} + +static void +on_check_toggled (GtkToggleButton *toggle, + gpointer user_data) +{ + update_response_buttons (user_data); +} + +static void +seahorse_delete_dialog_constructed (GObject *obj) +{ + SeahorseDeleteDialog *self = SEAHORSE_DELETE_DIALOG (obj); + GtkWidget *content; + GtkWidget *button; + + G_OBJECT_CLASS (seahorse_delete_dialog_parent_class)->constructed (obj); + + gtk_window_set_modal (GTK_WINDOW (self), TRUE); + gtk_window_set_destroy_with_parent (GTK_WINDOW (self), TRUE); + + self->check = gtk_check_button_new (); + content = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (self)); + gtk_container_add (GTK_CONTAINER (content), self->check); + g_signal_connect (self->check, "toggled", G_CALLBACK (on_check_toggled), self); + + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + gtk_dialog_add_action_widget (GTK_DIALOG (self), button, GTK_RESPONSE_CANCEL); + gtk_widget_show (button); + + button = gtk_button_new_from_stock (GTK_STOCK_DELETE); + gtk_dialog_add_action_widget (GTK_DIALOG (self), button, GTK_RESPONSE_OK); + gtk_widget_show (button); +} + +static void +seahorse_delete_dialog_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseDeleteDialog *self = SEAHORSE_DELETE_DIALOG (obj); + + switch (prop_id) { + case PROP_CHECK_LABEL: + g_value_set_string (value, seahorse_delete_dialog_get_check_label (self)); + break; + case PROP_CHECK_VALUE: + g_value_set_boolean (value, seahorse_delete_dialog_get_check_value (self)); + break; + case PROP_CHECK_REQUIRE: + g_value_set_boolean (value, seahorse_delete_dialog_get_check_require (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_delete_dialog_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseDeleteDialog *self = SEAHORSE_DELETE_DIALOG (obj); + + switch (prop_id) { + case PROP_CHECK_LABEL: + seahorse_delete_dialog_set_check_label (self, g_value_get_string (value)); + break; + case PROP_CHECK_VALUE: + seahorse_delete_dialog_set_check_value (self, g_value_get_boolean (value)); + break; + case PROP_CHECK_REQUIRE: + seahorse_delete_dialog_set_check_require (self, g_value_get_boolean (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_delete_dialog_class_init (SeahorseDeleteDialogClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->constructed = seahorse_delete_dialog_constructed; + gobject_class->get_property = seahorse_delete_dialog_get_property; + gobject_class->set_property = seahorse_delete_dialog_set_property; + + g_object_class_install_property (gobject_class, PROP_CHECK_LABEL, + g_param_spec_string ("check-label", "Check label", "Check label", + NULL, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_CHECK_VALUE, + g_param_spec_boolean ("check-value", "Check value", "Check value", + FALSE, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_CHECK_REQUIRE, + g_param_spec_boolean ("check-require", "Check require", "Check require", + FALSE, G_PARAM_READWRITE)); +} + +GtkDialog * +seahorse_delete_dialog_new (GtkWindow *parent, + const gchar *format, + ...) +{ + GtkDialog *dialog; + gchar *message; + va_list va; + + g_return_val_if_fail (format != NULL, NULL); + + va_start (va, format); + message = g_strdup_vprintf (format, va); + va_end (va); + + dialog = g_object_new (SEAHORSE_TYPE_DELETE_DIALOG, + "message-type", GTK_MESSAGE_QUESTION, + "transient-for", parent, + "text", message, + NULL); + + g_free (message); + return dialog; +} + +const gchar * +seahorse_delete_dialog_get_check_label (SeahorseDeleteDialog *self) +{ + g_return_val_if_fail (SEAHORSE_IS_DELETE_DIALOG (self), NULL); + + if (gtk_widget_get_visible (self->check)) + return gtk_button_get_label (GTK_BUTTON (self->check)); + return NULL; +} + +void +seahorse_delete_dialog_set_check_label (SeahorseDeleteDialog *self, + const gchar *label) +{ + g_return_if_fail (SEAHORSE_IS_DELETE_DIALOG (self)); + + if (label == NULL) { + gtk_widget_hide (self->check); + label = ""; + } else { + gtk_widget_show (self->check); + } + + gtk_button_set_label (GTK_BUTTON (self->check), label); + g_object_notify (G_OBJECT (self), "check-label"); +} + +gboolean +seahorse_delete_dialog_get_check_value (SeahorseDeleteDialog *self) +{ + g_return_val_if_fail (SEAHORSE_IS_DELETE_DIALOG (self), FALSE); + + if (gtk_widget_get_visible (self->check)) + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->check)); + return FALSE; +} + +void +seahorse_delete_dialog_set_check_value (SeahorseDeleteDialog *self, + gboolean value) +{ + g_return_if_fail (SEAHORSE_IS_DELETE_DIALOG (self)); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->check), value); + g_object_notify (G_OBJECT (self), "check-value"); +} + +gboolean +seahorse_delete_dialog_get_check_require (SeahorseDeleteDialog *self) +{ + g_return_val_if_fail (SEAHORSE_IS_DELETE_DIALOG (self), FALSE); + return self->check_require; +} + +void +seahorse_delete_dialog_set_check_require (SeahorseDeleteDialog *self, + gboolean value) +{ + g_return_if_fail (SEAHORSE_IS_DELETE_DIALOG (self)); + self->check_require = value; + update_response_buttons (self); + g_object_notify (G_OBJECT (self), "check-require"); +} + +gboolean +seahorse_delete_dialog_prompt (GtkWindow *parent, + const gchar *text) +{ + GtkDialog *dialog; + gint response; + + g_return_val_if_fail (text != NULL, FALSE); + + dialog = seahorse_delete_dialog_new (parent, "%s", text); + + response = gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); + + return (response == GTK_RESPONSE_OK); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-delete-dialog.h seahorse-3.6.3/libseahorse/seahorse-delete-dialog.h --- seahorse-3.2.2/libseahorse/seahorse-delete-dialog.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-delete-dialog.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,63 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_DELETE_DIALOG_H__ +#define __SEAHORSE_DELETE_DIALOG_H__ + +#include + +#include "seahorse-widget.h" + +#define SEAHORSE_DELETE_DIALOG_MENU_OBJECT "ObjectPopup" + +#define SEAHORSE_TYPE_DELETE_DIALOG (seahorse_delete_dialog_get_type ()) +#define SEAHORSE_DELETE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_DELETE_DIALOG, SeahorseDeleteDialog)) +#define SEAHORSE_IS_DELETE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_DELETE_DIALOG)) + +typedef struct _SeahorseDeleteDialog SeahorseDeleteDialog; + +GType seahorse_delete_dialog_get_type (void) G_GNUC_CONST; + +GtkDialog * seahorse_delete_dialog_new (GtkWindow *parent, + const gchar *format, + ...) G_GNUC_PRINTF (2, 3); + +const gchar * seahorse_delete_dialog_get_check_label (SeahorseDeleteDialog *self); + +void seahorse_delete_dialog_set_check_label (SeahorseDeleteDialog *self, + const gchar *label); + +gboolean seahorse_delete_dialog_get_check_value (SeahorseDeleteDialog *self); + +void seahorse_delete_dialog_set_check_value (SeahorseDeleteDialog *self, + gboolean value); + +gboolean seahorse_delete_dialog_get_check_require (SeahorseDeleteDialog *self); + +void seahorse_delete_dialog_set_check_require (SeahorseDeleteDialog *self, + gboolean value); + +gboolean seahorse_delete_dialog_prompt (GtkWindow *parent, + const gchar *text); + +#endif /* __SEAHORSE_DELETE_DIALOG_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-deleter.c seahorse-3.6.3/libseahorse/seahorse-deleter.c --- seahorse-3.2.2/libseahorse/seahorse-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-deleter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,135 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-deleter.h" + +G_DEFINE_TYPE (SeahorseDeleter, seahorse_deleter, G_TYPE_OBJECT); + +static void +seahorse_deleter_init (SeahorseDeleter *deleter) +{ + +} + +static void +seahorse_deleter_class_init (SeahorseDeleterClass *klass) +{ + +} + +GtkDialog * +seahorse_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorseDeleterClass *class; + + g_return_val_if_fail (SEAHORSE_IS_DELETER (deleter), NULL); + + class = SEAHORSE_DELETER_GET_CLASS (deleter); + g_return_val_if_fail (class->create_confirm != NULL, NULL); + + return (class->create_confirm) (deleter, parent); +} + +GList * +seahorse_deleter_get_objects (SeahorseDeleter *deleter) +{ + SeahorseDeleterClass *class; + + g_return_val_if_fail (SEAHORSE_IS_DELETER (deleter), NULL); + + class = SEAHORSE_DELETER_GET_CLASS (deleter); + g_return_val_if_fail (class->get_objects != NULL, NULL); + + return (class->get_objects) (deleter); +} + +gboolean +seahorse_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorseDeleterClass *class; + + g_return_val_if_fail (SEAHORSE_IS_DELETER (deleter), FALSE); + g_return_val_if_fail (G_IS_OBJECT (object), FALSE); + + class = SEAHORSE_DELETER_GET_CLASS (deleter); + g_return_val_if_fail (class->add_object != NULL, FALSE); + + return (class->add_object) (deleter, object); +} + +void +seahorse_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseDeleterClass *class; + + g_return_if_fail (SEAHORSE_IS_DELETER (deleter)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + + class = SEAHORSE_DELETER_GET_CLASS (deleter); + g_return_if_fail (class->delete_async != NULL); + + (class->delete_async) (deleter, cancellable, callback, user_data); +} + +gboolean +seahorse_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error) +{ + SeahorseDeleterClass *class; + + g_return_val_if_fail (SEAHORSE_IS_DELETER (deleter), FALSE); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + class = SEAHORSE_DELETER_GET_CLASS (deleter); + g_return_val_if_fail (class->delete_finish != NULL, FALSE); + + return (class->delete_finish) (deleter, result, error); +} + +gboolean +seahorse_deleter_prompt (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + GtkDialog *prompt; + gint res; + + g_return_val_if_fail (SEAHORSE_IS_DELETER (deleter), FALSE); + g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), FALSE); + + prompt = seahorse_deleter_create_confirm (deleter, parent); + g_return_val_if_fail (prompt != NULL, FALSE); + + res = gtk_dialog_run (prompt); + gtk_widget_destroy (GTK_WIDGET (prompt)); + + return res == GTK_RESPONSE_OK || res == GTK_RESPONSE_ACCEPT; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-deleter.h seahorse-3.6.3/libseahorse/seahorse-deleter.h --- seahorse-3.2.2/libseahorse/seahorse-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,92 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Deleter, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_DELETER_H__ +#define __SEAHORSE_DELETER_H__ + +#include "seahorse-types.h" + +#include + +#include + +#define SEAHORSE_TYPE_DELETER (seahorse_deleter_get_type ()) +#define SEAHORSE_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_DELETER, SeahorseDeleter)) +#define SEAHORSE_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_DELETER, SeahorseDeleterClass)) +#define SEAHORSE_IS_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_DELETER)) +#define SEAHORSE_IS_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_DELETER)) +#define SEAHORSE_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_DELETER, SeahorseDeleterClass)) + +typedef struct _SeahorseDeleter SeahorseDeleter; +typedef struct _SeahorseDeleterClass SeahorseDeleterClass; + +struct _SeahorseDeleter { + GObject parent; +}; + +struct _SeahorseDeleterClass { + GObjectClass parent; + + /* virtual methods ------------------------------------------------- */ + + GtkDialog * (* create_confirm) (SeahorseDeleter *deleter, + GtkWindow *parent); + + GList * (* get_objects) (SeahorseDeleter *deleter); + + gboolean (* add_object) (SeahorseDeleter *deleter, + GObject *object); + + void (* delete_async) (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + gboolean (* delete_finish) (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error); +}; + +GType seahorse_deleter_get_type (void) G_GNUC_CONST; + +GtkDialog * seahorse_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent); + +GList * seahorse_deleter_get_objects (SeahorseDeleter *deleter); + +gboolean seahorse_deleter_add_object (SeahorseDeleter *deleter, + GObject *object); + +void seahorse_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error); + +gboolean seahorse_deleter_prompt (SeahorseDeleter *deleter, + GtkWindow *parent); + +#endif /* __SEAHORSE_DELETER_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-dns-sd.c seahorse-3.6.3/libseahorse/seahorse-dns-sd.c --- seahorse-3.2.2/libseahorse/seahorse-dns-sd.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-dns-sd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,460 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2005 Stefan Walter - * - * 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 "config.h" - -#ifdef WITH_SHARING -#include -#include -#include -#endif /* WITH_SHARING */ - -#include "seahorse-util.h" -#include "seahorse-dns-sd.h" -#include "seahorse-context.h" - -#ifdef WITH_PGP -#include "pgp/seahorse-server-source.h" -#endif - -#define DEBUG_FLAG SEAHORSE_DEBUG_DNSSD -#include "seahorse-debug.h" - -#define HKP_SERVICE_TYPE "_pgpkey-hkp._tcp" - -/* - * DEBUG: Define if we want to show discoveries from this - * host. Normally these are suppressed - */ -/* #define DISCOVER_THIS_HOST 1 */ - - -/** - * SECTION:seahorse-dns-sd - * @short_description: Seahorse Service Discovery handles (finds, removes,...) Avahi services - * @include:libseahorse/seahorse-dns-sd.h - * - **/ - - -struct _SeahorseServiceDiscoveryPriv { -#ifdef WITH_SHARING - AvahiClient *client; - AvahiServiceBrowser *browser; -#else - char no_use; -#endif -}; - -enum { - ADDED, - REMOVED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -G_DEFINE_TYPE (SeahorseServiceDiscovery, seahorse_service_discovery, G_TYPE_OBJECT); - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -#ifdef WITH_SHARING - -/** -* ssd: A SeahorseServiceDiscovery object -* -* Disconnects avahi -* -**/ -static void -disconnect (SeahorseServiceDiscovery *ssd) -{ - if (ssd->priv->browser && ssd->priv->client) - avahi_service_browser_free (ssd->priv->browser); - ssd->priv->browser = NULL; - - if (ssd->priv->client) - avahi_client_free (ssd->priv->client); - ssd->priv->client = NULL; -} - -/** -* resolver: The avahi resolver -* iface: The avahi interface -* proto: The avahi protocol -* event: the avahi event -* name: name of the service -* type: must be HKP_SERVICE_TYPE -* domain: ignored -* host_name: ignored -* address: address of the service -* port: port of the service -* txt: ignored -* flags: -* data: userdata -* -* Resolves the avahi callback (AvahiServiceResolverCallback) -* -**/ -static void -resolve_callback (AvahiServiceResolver *resolver, AvahiIfIndex iface, AvahiProtocol proto, - AvahiResolverEvent event, const char *name, const char *type, const char *domain, - const char *host_name, const AvahiAddress *address, uint16_t port, - AvahiStringList *txt, AvahiLookupResultFlags flags, void *data) -{ - SeahorseServiceDiscovery *ssd = SEAHORSE_SERVICE_DISCOVERY (data); - gchar *service_name; - gchar *service_uri; - gchar *ipname; - - g_assert (SEAHORSE_IS_SERVICE_DISCOVERY (ssd)); - - - switch(event) { - case AVAHI_RESOLVER_FAILURE: - g_warning ("couldn't resolve service '%s': %s", name, - avahi_strerror (avahi_client_errno (ssd->priv->client))); - break; - - - case AVAHI_RESOLVER_FOUND: - - /* Make sure it's our type ... */ - /* XXX Is the service always guaranteed to be ascii? */ - if (g_ascii_strcasecmp (HKP_SERVICE_TYPE, type) != 0) - break; - -#ifndef DISCOVER_THIS_HOST - /* And that it's local */ - if (flags & AVAHI_LOOKUP_RESULT_LOCAL) - break; -#endif - - ipname = g_new0(gchar, AVAHI_ADDRESS_STR_MAX); - avahi_address_snprint (ipname, AVAHI_ADDRESS_STR_MAX, address); - - service_uri = g_strdup_printf ("hkp://%s:%d", ipname, (int)port); - service_name = g_strdup (name); - - g_hash_table_replace (ssd->services, service_name, service_uri); - g_signal_emit (ssd, signals[ADDED], 0, service_name); - - /* Add it to the context */ - if (!seahorse_context_remote_source (SCTX_APP (), service_uri)) { - SeahorseServerSource *ssrc = seahorse_server_source_new (service_uri); - g_return_if_fail (ssrc != NULL); - seahorse_context_add_source (SCTX_APP (), SEAHORSE_SOURCE (ssrc)); - } - - seahorse_debug ("added: %s %s\n", service_name, service_uri); - break; - - default: - break; - }; - - /* One result is enough for us */ - avahi_service_resolver_free (resolver); -} - -/** -* browser: The avahi browser -* iface: the interface -* proto: the protocol -* event: the event that happened while browsing (failure, new, remove) -* name: name of the service -* type: HKP_SERVICE_TYPE is expected -* domain: domain of the service -* flags: ignored -* data: userdata, type SeahorseServiceDiscovery -* -* Called when a service is discovered while browsing. -* It is a AvahiServiceBrowserCallback -* -**/ -static void -browse_callback(AvahiServiceBrowser *browser, AvahiIfIndex iface, AvahiProtocol proto, - AvahiBrowserEvent event, const char *name, const char *type, - const char *domain, AvahiLookupResultFlags flags, void* data) -{ - SeahorseServiceDiscovery *ssd = SEAHORSE_SERVICE_DISCOVERY (data); - const gchar *uri; - - g_assert (SEAHORSE_IS_SERVICE_DISCOVERY (ssd)); - g_assert (browser == ssd->priv->browser); - - /* XXX Is the service always guaranteed to be ascii? */ - if (g_ascii_strcasecmp (HKP_SERVICE_TYPE, type) != 0) - return; - - switch (event) { - case AVAHI_BROWSER_FAILURE: - g_warning ("failure browsing for services: %s", - avahi_strerror (avahi_client_errno (ssd->priv->client))); - disconnect (ssd); - break; - - - case AVAHI_BROWSER_NEW: - if (!avahi_service_resolver_new (ssd->priv->client, iface, proto, name, type, - domain, AVAHI_PROTO_UNSPEC, 0, resolve_callback, ssd)) - g_warning ("couldn't start resolver for service '%s': %s\n", name, - avahi_strerror (avahi_client_errno (ssd->priv->client))); - break; - - - case AVAHI_BROWSER_REMOVE: - uri = g_hash_table_lookup (ssd->services, name); - if (uri != NULL) { - /* Remove it from the main context */ - SeahorseSource *sksrc = seahorse_context_remote_source (SCTX_APP(), uri); - seahorse_context_remove_source (SCTX_APP(), sksrc); - } - - /* And remove it from our tables */ - g_hash_table_remove (ssd->services, name); - g_signal_emit (ssd, signals[REMOVED], 0, name); - seahorse_debug ("removed: %s\n", name); - break; - - - default: - break; - } -} - -/** -* client: Will be part of a potential error message -* state: the state of the avahi connection -* data: A SeahorseServiceDiscovery object -* -* Handles AVAHI_CLIENT_FAILURE errors in state -* -**/ -static void -client_callback (AvahiClient *client, AvahiClientState state, void *data) -{ - SeahorseServiceDiscovery *ssd = SEAHORSE_SERVICE_DISCOVERY (data); - - g_assert (SEAHORSE_IS_SERVICE_DISCOVERY (ssd)); - - /* Disconnect when failed */ - if (state == AVAHI_CLIENT_FAILURE) { - g_return_if_fail (client == ssd->priv->client); - g_warning ("failure communicating with to avahi: %s", - avahi_strerror (avahi_client_errno (client))); - disconnect (ssd); - } -} - -#endif /* WITH_SHARING */ - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - - -/** -* ssd: The SeahorseServiceDiscovery to init -* -* When compiled WITH_SHARING avahi will also be initialised and it will browse -* for avahi services. -**/ -static void -seahorse_service_discovery_init (SeahorseServiceDiscovery *ssd) -{ - ssd->priv = g_new0 (SeahorseServiceDiscoveryPriv, 1); - ssd->services = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - -#ifdef WITH_SHARING - { - int aerr; - ssd->priv->client = avahi_client_new (seahorse_util_dns_sd_get_poll (), - 0, client_callback, ssd, &aerr); - if (!ssd->priv->client) { - g_message ("DNS-SD initialization failed: %s", avahi_strerror (aerr)); - return; - } - - ssd->priv->browser = avahi_service_browser_new (ssd->priv->client, AVAHI_IF_UNSPEC, - AVAHI_PROTO_UNSPEC, HKP_SERVICE_TYPE, NULL, 0, - browse_callback, ssd); - if (!ssd->priv->browser) { - g_message ("Browsing for DNS-SD services failed: %s", - avahi_strerror (avahi_client_errno (ssd->priv->client))); - return; - } - } -#endif /* WITH_SHARING */ -} - -/** -* gobject: A SeahorseServiceDiscovery object -* -* Disposes the object -* -**/ -static void -seahorse_service_discovery_dispose (GObject *gobject) -{ -#ifdef WITH_SHARING - SeahorseServiceDiscovery *ssd = SEAHORSE_SERVICE_DISCOVERY (gobject); - disconnect (ssd); -#endif - - G_OBJECT_CLASS (seahorse_service_discovery_parent_class)->dispose (gobject); -} - - -/** -* gobject: A SeahorseServiceDiscovery object -* -* free private vars -* -**/ -static void -seahorse_service_discovery_finalize (GObject *gobject) -{ - SeahorseServiceDiscovery *ssd = SEAHORSE_SERVICE_DISCOVERY (gobject); - -#ifdef WITH_SHARING - g_assert (ssd->priv->browser == NULL); - g_assert (ssd->priv->client == NULL); -#endif - - if (ssd->services) - g_hash_table_destroy (ssd->services); - ssd->services = NULL; - - g_free (ssd->priv); - ssd->priv = NULL; - - G_OBJECT_CLASS (seahorse_service_discovery_parent_class)->finalize (gobject); -} - -/** -* klass: The SeahorseServiceDiscoveryClass to initialise -* -* The class will use the signals "added" and "removed" -* -**/ -static void -seahorse_service_discovery_class_init (SeahorseServiceDiscoveryClass *klass) -{ - GObjectClass *gclass; - - seahorse_service_discovery_parent_class = g_type_class_peek_parent (klass); - gclass = G_OBJECT_CLASS (klass); - - gclass->dispose = seahorse_service_discovery_dispose; - gclass->finalize = seahorse_service_discovery_finalize; - - signals[ADDED] = g_signal_new ("added", SEAHORSE_TYPE_SERVICE_DISCOVERY, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseServiceDiscoveryClass, added), - NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - signals[REMOVED] = g_signal_new ("removed", SEAHORSE_TYPE_SERVICE_DISCOVERY, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseServiceDiscoveryClass, removed), - NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -/** - * seahorse_service_discovery_new: - * - * - * - * Returns: A new #SeahorseServiceDiscovery object - */ -SeahorseServiceDiscovery* -seahorse_service_discovery_new (void) -{ - return g_object_new (SEAHORSE_TYPE_SERVICE_DISCOVERY, NULL); -} - -/** - * seahorse_service_discovery_list: - * @ssd: A #SeahorseServiceDiscovery. It's services will be added to the list - * - * - * - * Returns: the services in @ssd - */ -gchar ** -seahorse_service_discovery_list (SeahorseServiceDiscovery *ssd) -{ - GHashTableIter iter; - GPtrArray *result = g_ptr_array_new (); - gpointer key; - - g_return_val_if_fail (SEAHORSE_IS_SERVICE_DISCOVERY (ssd), NULL); - g_hash_table_iter_init (&iter, ssd->services); - while (g_hash_table_iter_next (&iter, &key, NULL)) - g_ptr_array_add (result, g_strdup (key)); - - g_ptr_array_add (result, NULL); - return (gchar **)g_ptr_array_free (result, FALSE); -} - -/** - * seahorse_service_discovery_get_uri: - * @ssd: Service discovery object - * @service: The service to get the uri for - * - * - * - * Returns: The URI of the service @service in @ssd - */ -const gchar* -seahorse_service_discovery_get_uri (SeahorseServiceDiscovery *ssd, const gchar *service) -{ - g_return_val_if_fail (SEAHORSE_IS_SERVICE_DISCOVERY (ssd), NULL); - return (const gchar*)g_hash_table_lookup (ssd->services, service); -} - -/** - * seahorse_service_discovery_get_uris: - * @ssd: The service discovery object - * @services: A list of services - * - * The returned uris in the list are copied and must be freed with g_free. - * - * Returns: uris for the services - */ -gchar ** -seahorse_service_discovery_get_uris (SeahorseServiceDiscovery *ssd, const gchar **services) -{ - GPtrArray *result = g_ptr_array_new (); - const gchar *uri; - guint i; - - for (i = 0; services && services[i] != NULL; i++) { - uri = g_hash_table_lookup (ssd->services, services[i]); - g_ptr_array_add (result, g_strdup (uri)); - } - - g_ptr_array_add (result, NULL); - return (gchar **)g_ptr_array_free (result, FALSE); -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-dns-sd.h seahorse-3.6.3/libseahorse/seahorse-dns-sd.h --- seahorse-3.2.2/libseahorse/seahorse-dns-sd.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-dns-sd.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2005 Stefan Walter - * - * 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 __SEAHORSE_DNS_SD_H__ -#define __SEAHORSE_DNS_SD_H__ - -#include - -#define SEAHORSE_TYPE_SERVICE_DISCOVERY (seahorse_service_discovery_get_type ()) -#define SEAHORSE_SERVICE_DISCOVERY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscovery)) -#define SEAHORSE_SERVICE_DISCOVERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscoveryClass)) -#define SEAHORSE_IS_SERVICE_DISCOVERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY)) -#define SEAHORSE_IS_SERVICE_DISCOVERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SERVICE_DISCOVERY)) -#define SEAHORSE_SERVICE_DISCOVERY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscoveryClass)) - -typedef struct _SeahorseServiceDiscovery SeahorseServiceDiscovery; -typedef struct _SeahorseServiceDiscoveryClass SeahorseServiceDiscoveryClass; -typedef struct _SeahorseServiceDiscoveryPriv SeahorseServiceDiscoveryPriv; - -/** - * SeahorseServiceDiscovery: - * @parent: The parent #GObject - * @services: A #GHashTable of known services - * - * Listens for DNS-SD shared keys on the network and - * adds SeahorseKeySoruce objects to the SeahorseContext as necessary. - * - * Signals: - * added: A new shared key source was found. - * removed: A shared key source went away. - */ - -struct _SeahorseServiceDiscovery { - GObject parent; - - /*< public >*/ - GHashTable *services; - - /*< private >*/ - SeahorseServiceDiscoveryPriv *priv; -}; - -struct _SeahorseServiceDiscoveryClass { - GObjectClass parent_class; - - /* A relevant service appeared on the network */ - void (*added) (SeahorseServiceDiscovery *ssd, const gchar* service); - - /* A service disappeared */ - void (*removed) (SeahorseServiceDiscovery *ssd, const gchar* service); -}; - -GType seahorse_service_discovery_get_type (void); - -SeahorseServiceDiscovery* seahorse_service_discovery_new (void); - -gchar ** seahorse_service_discovery_list (SeahorseServiceDiscovery *ssd); - -const gchar* seahorse_service_discovery_get_uri (SeahorseServiceDiscovery *ssd, - const gchar *service); - -gchar ** seahorse_service_discovery_get_uris (SeahorseServiceDiscovery *ssd, - const gchar **services); - -#endif /* __SEAHORSE_DNS_SD_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-exportable.c seahorse-3.6.3/libseahorse/seahorse-exportable.c --- seahorse-3.2.2/libseahorse/seahorse-exportable.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-exportable.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,446 @@ +/* + * Seahorse + * + * Copyright (C) 2004,2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-exportable.h" +#include "seahorse-exporter.h" + +#include + +#include + +typedef SeahorseExportableIface SeahorseExportableInterface; + +G_DEFINE_INTERFACE (SeahorseExportable, seahorse_exportable, G_TYPE_OBJECT); + +GList * +seahorse_exportable_create_exporters (SeahorseExportable *exportable, + SeahorseExporterType type) +{ + SeahorseExportableIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_EXPORTABLE (exportable), NULL); + + iface = SEAHORSE_EXPORTABLE_GET_INTERFACE (exportable); + g_return_val_if_fail (iface->create_exporters, NULL); + + return iface->create_exporters (exportable, type); +} + + +gboolean +seahorse_exportable_can_export (gpointer object) +{ + gboolean can = FALSE; + + if (!SEAHORSE_IS_EXPORTABLE (object)) + return FALSE; + + g_object_get (object, "exportable", &can, NULL); + return can; +} + +typedef struct { + GMainLoop *loop; + GAsyncResult *result; +} WaitClosure; + +static WaitClosure * +wait_closure_new (void) +{ + WaitClosure *closure; + + closure = g_slice_new0 (WaitClosure); + closure->loop = g_main_loop_new (NULL, FALSE); + + return closure; +} + +static void +wait_closure_free (WaitClosure *closure) +{ + g_clear_object (&closure->result); + g_main_loop_unref (closure->loop); + g_slice_free (WaitClosure, closure); +} + +static void +on_wait_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + WaitClosure *closure = user_data; + g_assert (closure->result == NULL); + closure->result = g_object_ref (result); + g_main_loop_quit (closure->loop); +} + +static void +seahorse_exportable_default_init (SeahorseExportableIface *iface) +{ + static gboolean initialized = FALSE; + if (!initialized) { + initialized = TRUE; + g_object_interface_install_property (iface, + g_param_spec_boolean ("exportable", "Exportable", "Is actually exportable", + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + } +} + +guint +seahorse_exportable_export_to_directory_wait (GList *objects, + const gchar *directory, + GError **error) +{ + SeahorseExporter *exporter; + WaitClosure *closure; + GList *exporters; + guint count = 0; + gboolean ret; + gchar *filename; + gchar *name; + GFile *file; + GList *l; + + g_return_val_if_fail (directory != NULL, 0); + g_return_val_if_fail (error == NULL || *error == NULL, 0); + + closure = wait_closure_new (); + + for (l = objects; l != NULL; l = g_list_next (l)) { + if (!seahorse_exportable_can_export (l->data)) + continue; + + exporters = seahorse_exportable_create_exporters (SEAHORSE_EXPORTABLE (l->data), + SEAHORSE_EXPORTER_ANY); + if (!exporters) + continue; + + exporter = g_object_ref (exporters->data); + g_list_free_full (exporters, g_object_unref); + + name = seahorse_exporter_get_filename (exporter); + filename = g_build_filename (directory, name, NULL); + g_free (name); + + file = g_file_new_for_uri (filename); + seahorse_exporter_export_to_file_async (exporter, file, FALSE, + NULL, on_wait_complete, closure); + g_object_unref (file); + + g_main_loop_run (closure->loop); + + ret = seahorse_exporter_export_to_file_finish (exporter, closure->result, error); + g_object_unref (closure->result); + closure->result = NULL; + + g_object_unref (exporter); + g_free (filename); + + if (ret) + count++; + else + break; + } + + wait_closure_free (closure); + return count; +} + +guint +seahorse_exportable_export_to_text_wait (GList *objects, + gpointer *data, + gsize *size, + GError **error) +{ + SeahorseExporter *exporter = NULL; + WaitClosure *closure; + GList *exporters = NULL; + guint count, total; + GList *l, *e; + + g_return_val_if_fail (error == NULL || *error == NULL, 0); + g_return_val_if_fail (data != NULL, 0); + g_return_val_if_fail (size != NULL, 0); + + *data = NULL; + *size = 0; + + for (l = objects; l != NULL; l = g_list_next (l)) { + if (!seahorse_exportable_can_export (l->data)) + continue; + + /* If we've already found exporters, then add to those */ + if (exporters) { + for (e = exporters; e != NULL; e = g_list_next (e)) + seahorse_exporter_add_object (e->data, l->data); + + /* Otherwise try and create new exporters for this object */ + } else { + exporters = seahorse_exportable_create_exporters (SEAHORSE_EXPORTABLE (l->data), + SEAHORSE_EXPORTER_TEXTUAL); + } + } + + /* Find the exporter than has the most objects */ + for (e = exporters, total = 0, exporter = NULL; + e != NULL; e = g_list_next (e)) { + count = g_list_length (seahorse_exporter_get_objects (e->data)); + if (count > total) { + total = count; + g_clear_object (&exporter); + exporter = g_object_ref (e->data); + } + } + + g_list_free_full (exporters, g_object_unref); + + if (exporter) { + closure = wait_closure_new (); + + seahorse_exporter_export_async (exporter, NULL, on_wait_complete, closure); + + g_main_loop_run (closure->loop); + + *data = seahorse_exporter_export_finish (exporter, closure->result, size, error); + if (*data == NULL) + total = 0; + + wait_closure_free (closure); + g_object_unref (exporter); + } + + return total; +} + +guint +seahorse_exportable_export_to_prompt_wait (GList *objects, + GtkWindow *parent, + GError **error) +{ + SeahorseExporter *exporter; + gchar *directory = NULL; + WaitClosure *closure; + GHashTable *pending; + GList *exporters; + guint count = 0; + gboolean ret; + GList *l, *e, *x; + GList *exported; + GFile *file; + + g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), 0); + g_return_val_if_fail (error == NULL || *error == NULL, 0); + + /* A table for monitoring which objects are still pending */ + pending = g_hash_table_new (g_direct_hash, g_direct_equal); + for (l = objects; l != NULL; l = g_list_next (l)) + g_hash_table_replace (pending, l->data, l->data); + + closure = wait_closure_new (); + + for (l = objects; l != NULL; l = g_list_next (l)) { + if (!g_hash_table_lookup (pending, l->data)) + continue; + + if (!seahorse_exportable_can_export (l->data)) { + g_hash_table_remove (pending, l->data); + continue; + } + + exporters = seahorse_exportable_create_exporters (SEAHORSE_EXPORTABLE (l->data), + SEAHORSE_EXPORTER_ANY); + if (!exporters) + continue; + + /* Now go and add all pending to each exporter */ + for (x = objects; x != NULL; x = g_list_next (x)) { + if (x->data == l->data) + continue; + if (g_hash_table_lookup (pending, x->data)) { + for (e = exporters; e != NULL; e = g_list_next (e)) + seahorse_exporter_add_object (e->data, x->data); + } + } + + /* Now show a prompt choosing between the exporters */ + ret = seahorse_exportable_prompt (exporters, parent, + &directory, &file, &exporter); + + g_list_free_full (exporters, g_object_unref); + + if (!ret) + break; + + seahorse_exporter_export_to_file_async (exporter, file, TRUE, + NULL, on_wait_complete, closure); + + g_main_loop_run (closure->loop); + + ret = seahorse_exporter_export_to_file_finish (exporter, closure->result, error); + g_object_unref (closure->result); + closure->result = NULL; + + if (ret) { + exported = seahorse_exporter_get_objects (exporter); + for (e = exported; e != NULL; e = g_list_next (e)) { + g_hash_table_remove (pending, e->data); + count++; + } + } + + g_object_unref (file); + g_object_unref (exporter); + + if (!ret) + break; + } + + g_free (directory); + wait_closure_free (closure); + g_hash_table_destroy (pending); + return count; + +} + +static gchar * +calculate_basename (GFile *file, + const gchar *extension) +{ + gchar *basename = g_file_get_basename (file); + gchar *name; + gchar *cut; + + cut = strrchr (basename, '.'); + if (cut != NULL) + cut[0] = '\0'; + + name = g_strdup_printf ("%s%s", basename, extension); + g_free (basename); + + return name; +} + +static void +on_filter_changed (GObject *obj, + GParamSpec *pspec, + gpointer user_data) +{ + GHashTable *filters = user_data; + GtkFileChooser *chooser = GTK_FILE_CHOOSER (obj); + SeahorseExporter *exporter; + GtkFileFilter *filter; + const gchar *extension; + gchar *basename; + gchar *name; + GFile *file; + + filter = gtk_file_chooser_get_filter (chooser); + g_return_if_fail (filter != NULL); + + exporter = g_hash_table_lookup (filters, filter); + g_return_if_fail (exporter != NULL); + + name = seahorse_exporter_get_filename (exporter); + g_return_if_fail (name != NULL); + + extension = strrchr (name, '.'); + if (extension) { + file = gtk_file_chooser_get_file (chooser); + if (file) { + basename = calculate_basename (file, extension); + g_object_unref (file); + if (basename) + gtk_file_chooser_set_current_name (chooser, basename); + g_free (basename); + } else { + gtk_file_chooser_set_current_name (chooser, name); + } + } + + g_free (name); +} + +gboolean +seahorse_exportable_prompt (GList *exporters, + GtkWindow *parent, + gchar **directory, + GFile **file, + SeahorseExporter **exporter) +{ + GtkWidget *widget; + GtkDialog *dialog; + GtkFileChooser *chooser; + GHashTable *filters; + GtkFileFilter *first = NULL; + GtkFileFilter *filter; + gboolean result = FALSE; + GList *e; + + g_return_val_if_fail (exporters != NULL, FALSE); + g_return_val_if_fail (parent == NULL || GTK_WINDOW (parent), FALSE); + g_return_val_if_fail (file != NULL, FALSE); + g_return_val_if_fail (exporter != NULL, FALSE); + + widget = gtk_file_chooser_dialog_new (NULL, parent, GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Export"), GTK_RESPONSE_ACCEPT, + NULL); + + dialog = GTK_DIALOG (widget); + chooser = GTK_FILE_CHOOSER (widget); + + gtk_dialog_set_default_response (dialog, GTK_RESPONSE_ACCEPT); + gtk_file_chooser_set_local_only (chooser, FALSE); + gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE); + + if (directory && *directory != NULL) + gtk_file_chooser_set_current_folder (chooser, *directory); + + filters = g_hash_table_new (g_direct_hash, g_direct_equal); + for (e = exporters; e != NULL; e = g_list_next (e)) { + filter = seahorse_exporter_get_file_filter (e->data); + g_hash_table_replace (filters, filter, e->data); + gtk_file_chooser_add_filter (chooser, filter); + if (first == NULL) + first = filter; + } + + g_signal_connect (chooser, "notify::filter", G_CALLBACK (on_filter_changed), filters); + gtk_file_chooser_set_filter (chooser, first); + + if (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) { + *file = gtk_file_chooser_get_file (chooser); + filter = gtk_file_chooser_get_filter (chooser); + *exporter = g_object_ref (g_hash_table_lookup (filters, filter)); + if (directory) { + g_free (*directory); + *directory = g_strdup (gtk_file_chooser_get_current_folder (chooser)); + } + result = TRUE; + } + + g_hash_table_destroy (filters); + gtk_widget_destroy (widget); + return result; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-exportable.h seahorse-3.6.3/libseahorse/seahorse-exportable.h --- seahorse-3.2.2/libseahorse/seahorse-exportable.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-exportable.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,74 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Exportable, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_EXPORTABLE_H__ +#define __SEAHORSE_EXPORTABLE_H__ + +#include "seahorse-exporter.h" + +#include + +#include + +#define SEAHORSE_TYPE_EXPORTABLE (seahorse_exportable_get_type ()) +#define SEAHORSE_EXPORTABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_EXPORTABLE, SeahorseExportable)) +#define SEAHORSE_IS_EXPORTABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_EXPORTABLE)) +#define SEAHORSE_EXPORTABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_EXPORTABLE, SeahorseExportableIface)) + +typedef struct _SeahorseExportable SeahorseExportable; +typedef struct _SeahorseExportableIface SeahorseExportableIface; + +struct _SeahorseExportableIface { + GTypeInterface parent; + + GList * (* create_exporters) (SeahorseExportable *exportable, + SeahorseExporterType type); +}; + +GType seahorse_exportable_get_type (void) G_GNUC_CONST; + +GList * seahorse_exportable_create_exporters (SeahorseExportable *exportable, + SeahorseExporterType type); + +gboolean seahorse_exportable_can_export (gpointer object); + +guint seahorse_exportable_export_to_directory_wait (GList *objects, + const gchar *directory, + GError **error); + +guint seahorse_exportable_export_to_text_wait (GList *objects, + gpointer *data, + gsize *size, + GError **error); + +guint seahorse_exportable_export_to_prompt_wait (GList *objects, + GtkWindow *parent, + GError **error); + +gboolean seahorse_exportable_prompt (GList *exporters, + GtkWindow *parent, + gchar **directory, + GFile **file, + SeahorseExporter **exporter); + +#endif /* __SEAHORSE_EXPORTABLE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-exporter.c seahorse-3.6.3/libseahorse/seahorse-exporter.c --- seahorse-3.2.2/libseahorse/seahorse-exporter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-exporter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,273 @@ +/* + * Seahorse + * + * Copyright (C) 2004,2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-exporter.h" +#include "seahorse-util.h" + +typedef SeahorseExporterIface SeahorseExporterInterface; + +G_DEFINE_INTERFACE (SeahorseExporter, seahorse_exporter, G_TYPE_OBJECT); + +static void +seahorse_exporter_default_init (SeahorseExporterIface *iface) +{ + static gboolean initialized = FALSE; + if (!initialized) { + g_object_interface_install_property (iface, + g_param_spec_string ("filename", "File name", "File name", + NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_interface_install_property (iface, + g_param_spec_string ("content-type", "Content type", "Content type", + NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_interface_install_property (iface, + g_param_spec_object ("file-filter", "File filter", "File chooser filter", + GTK_TYPE_FILE_FILTER, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + initialized = TRUE; + } +} + +gchar * +seahorse_exporter_get_filename (SeahorseExporter *exporter) +{ + gchar *filename = NULL; + + g_return_val_if_fail (SEAHORSE_IS_EXPORTER (exporter), NULL); + + g_object_get (exporter, "filename", &filename, NULL); + return filename; +} + +gchar * +seahorse_exporter_get_content_type (SeahorseExporter *exporter) +{ + gchar *content_type = NULL; + + g_return_val_if_fail (SEAHORSE_IS_EXPORTER (exporter), NULL); + + g_object_get (exporter, "content-type", &content_type, NULL); + return content_type; +} + +GtkFileFilter * +seahorse_exporter_get_file_filter (SeahorseExporter *exporter) +{ + GtkFileFilter *filter = NULL; + + g_return_val_if_fail (SEAHORSE_IS_EXPORTER (exporter), NULL); + + g_object_get (exporter, "file-filter", &filter, NULL); + return filter; +} + +GList * +seahorse_exporter_get_objects (SeahorseExporter *exporter) +{ + SeahorseExporterIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_EXPORTER (exporter), NULL); + + iface = SEAHORSE_EXPORTER_GET_INTERFACE (exporter); + g_return_val_if_fail (iface->get_objects != NULL, NULL); + + return (iface->get_objects) (exporter); +} + +gboolean +seahorse_exporter_add_object (SeahorseExporter *exporter, + GObject *object) +{ + SeahorseExporterIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_EXPORTER (exporter), FALSE); + g_return_val_if_fail (G_IS_OBJECT (object), FALSE); + + iface = SEAHORSE_EXPORTER_GET_INTERFACE (exporter); + g_return_val_if_fail (iface->add_object != NULL, FALSE); + + return (iface->add_object) (exporter, object); +} + +void +seahorse_exporter_export_async (SeahorseExporter *exporter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseExporterIface *iface; + + g_return_if_fail (SEAHORSE_IS_EXPORTER (exporter)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + + iface = SEAHORSE_EXPORTER_GET_INTERFACE (exporter); + g_return_if_fail (iface->export_async != NULL); + + (iface->export_async) (exporter, cancellable, callback, user_data); +} + +gpointer +seahorse_exporter_export_finish (SeahorseExporter *exporter, + GAsyncResult *result, + gsize *size, + GError **error) +{ + SeahorseExporterIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_EXPORTER (exporter), NULL); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + g_return_val_if_fail (size != NULL, NULL); + + iface = SEAHORSE_EXPORTER_GET_INTERFACE (exporter); + g_return_val_if_fail (iface->export_finish != NULL, NULL); + + return (iface->export_finish) (exporter, result, size, error); +} + +typedef struct { + GCancellable *cancellable; + gboolean overwrite; + guint unique; + gpointer data; + gsize size; + GFile *file; +} FileClosure; + +static void +file_closure_free (gpointer data) +{ + FileClosure *closure = data; + g_clear_object (&closure->cancellable); + g_object_unref (closure->file); + g_free (closure->data); + g_free (closure); +} + +static void +on_export_replace (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + FileClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + GFile *file; + + if (g_file_replace_contents_finish (closure->file, result, NULL, &error)) { + g_simple_async_result_complete (res); + + /* Not overwriting, and the file existed, try another file name */ + } else if (!closure->overwrite && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WRONG_ETAG)) { + file = seahorse_util_file_increment_unique (closure->file, &closure->unique); + + g_file_replace_contents_async (file, closure->data, closure->size, "invalid-etag", + FALSE, G_FILE_CREATE_PRIVATE, closure->cancellable, + on_export_replace, g_object_ref (res)); + + g_clear_error (&error); + g_object_unref (file); + + } else { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + } + + g_object_unref (res); +} + +static void +on_export_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + FileClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + + closure->data = seahorse_exporter_export_finish (SEAHORSE_EXPORTER (source), + result, &closure->size, &error); + if (error == NULL) { + /* + * When not trying to overwrite we pass an invalid etag. This way + * if the file exists, it will not match the etag, and we'll be + * able to detect it and try another file name. + */ + g_file_replace_contents_async (closure->file, closure->data, + closure->size, closure->overwrite ? NULL : "invalid-etag", + FALSE, G_FILE_CREATE_PRIVATE, closure->cancellable, + on_export_replace, g_object_ref (res)); + } else { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + } + + g_object_unref (res); +} + +void +seahorse_exporter_export_to_file_async (SeahorseExporter *exporter, + GFile *file, + gboolean overwrite, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + FileClosure *closure; + + g_return_if_fail (SEAHORSE_IS_EXPORTER (exporter)); + g_return_if_fail (G_IS_FILE (file)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + + res = g_simple_async_result_new (G_OBJECT (exporter), callback, user_data, + seahorse_exporter_export_to_file_async); + closure = g_new0 (FileClosure, 1); + closure->file = g_object_ref (file); + closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + closure->overwrite = overwrite; + g_simple_async_result_set_op_res_gpointer (res, closure, file_closure_free); + + seahorse_exporter_export_async (exporter, cancellable, on_export_complete, + g_object_ref (res)); + + g_object_unref (res); +} + +gboolean +seahorse_exporter_export_to_file_finish (SeahorseExporter *exporter, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (SEAHORSE_IS_EXPORTER (exporter), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (exporter), + seahorse_exporter_export_to_file_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-exporter.h seahorse-3.6.3/libseahorse/seahorse-exporter.h --- seahorse-3.2.2/libseahorse/seahorse-exporter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-exporter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,101 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Exporter, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_EXPORTER_H__ +#define __SEAHORSE_EXPORTER_H__ + +#include "seahorse-types.h" + +#include + +#include + +typedef enum { + SEAHORSE_EXPORTER_ANY, + SEAHORSE_EXPORTER_TEXTUAL +} SeahorseExporterType; + +#define SEAHORSE_TYPE_EXPORTER (seahorse_exporter_get_type ()) +#define SEAHORSE_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_EXPORTER, SeahorseExporter)) +#define SEAHORSE_IS_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_EXPORTER)) +#define SEAHORSE_EXPORTER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_EXPORTER, SeahorseExporterIface)) + +typedef struct _SeahorseExporter SeahorseExporter; +typedef struct _SeahorseExporterIface SeahorseExporterIface; + +struct _SeahorseExporterIface { + GTypeInterface parent; + + /* virtual methods ------------------------------------------------- */ + + GList * (* get_objects) (SeahorseExporter *exporter); + + gboolean (* add_object) (SeahorseExporter *exporter, + GObject *object); + + void (* export_async) (SeahorseExporter *exporter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + gpointer (* export_finish) (SeahorseExporter *exporter, + GAsyncResult *result, + gsize *size, + GError **error); +}; + +GType seahorse_exporter_get_type (void) G_GNUC_CONST; + +gchar * seahorse_exporter_get_filename (SeahorseExporter *exporter); + +gchar * seahorse_exporter_get_content_type (SeahorseExporter *exporter); + +GtkFileFilter * seahorse_exporter_get_file_filter (SeahorseExporter *exporter); + +GList * seahorse_exporter_get_objects (SeahorseExporter *exporter); + +gboolean seahorse_exporter_add_object (SeahorseExporter *exporter, + GObject *object); + +void seahorse_exporter_export_async (SeahorseExporter *exporter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gpointer seahorse_exporter_export_finish (SeahorseExporter *exporter, + GAsyncResult *result, + gsize *size, + GError **error); + +void seahorse_exporter_export_to_file_async (SeahorseExporter *exporter, + GFile *file, + gboolean overwrite, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_exporter_export_to_file_finish (SeahorseExporter *exporter, + GAsyncResult *result, + GError **error); + +#endif /* __SEAHORSE_EXPORTER_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-gtkstock.c seahorse-3.6.3/libseahorse/seahorse-gtkstock.c --- seahorse-3.2.2/libseahorse/seahorse-gtkstock.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-gtkstock.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,229 +0,0 @@ -/** - * @file seahorse-gtkstock.c GTK+ Stock resources - * - * Seahorse - * - * Gaim is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with the gaim - * source distribution. - * - * Also (c) 2005 Adam Schreiber - * - * 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 "seahorse-gtkstock.h" - -static const gchar *seahorse_icons[] = { - SEAHORSE_STOCK_KEY, - SEAHORSE_STOCK_SECRET, - SEAHORSE_STOCK_KEY_SSH, - SEAHORSE_STOCK_PERSON, - SEAHORSE_STOCK_SIGN, - SEAHORSE_STOCK_SIGN_OK, - SEAHORSE_STOCK_SIGN_BAD, - SEAHORSE_STOCK_SIGN_UNKNOWN, - NULL -}; - -static const gchar *themed_icons[] = { - SEAHORSE_THEMED_WEBBROWSER, - SEAHORSE_THEMED_FOLDER, - "emblem-readonly", - NULL -}; - -/** - * make_theme_source: - * @icon: The full icon file name - * @size: The size. If this is -1, gtk_icon_source_set_size_wildcarded will be set - * - * Creates a new GtkIconSource, containing the file icon - * - * Returns: The GtkIconSource - */ -static GtkIconSource* -make_theme_source (const gchar *icon, GtkIconSize size) -{ - GtkIconSource *source; - - source = gtk_icon_source_new (); - gtk_icon_source_set_icon_name (source, icon); - gtk_icon_source_set_direction_wildcarded (source, TRUE); - gtk_icon_source_set_state_wildcarded (source, TRUE); - - if (size == -1) { - gtk_icon_source_set_size_wildcarded (source, TRUE); - } else { - gtk_icon_source_set_size_wildcarded (source, FALSE); - gtk_icon_source_set_size (source, size); - } - - return source; -} - -/** - * make_icon_source: - * @icon: The icon name - * @base: Base path - * @ext: File extension of the icon - * @size: The size. If this is -1, gtk_icon_source_set_size_wildcarded will be set - * - * Creates a new GtkIconSource, containing the file PIXMAPSDIR/base/icon.ext - * - * Returns: The GtkIconSource - */ -static GtkIconSource* -make_icon_source (const gchar *icon, const gchar *base, const gchar *ext, - GtkIconSize size) -{ - GtkIconSource *source; - gchar *filename; - - filename = g_strdup_printf ("%s/%s/%s.%s", PIXMAPSDIR, base, icon, ext); - - source = gtk_icon_source_new (); - gtk_icon_source_set_filename (source, filename); - gtk_icon_source_set_direction_wildcarded (source, TRUE); - gtk_icon_source_set_state_wildcarded (source, TRUE); - - if (size == -1) { - gtk_icon_source_set_size_wildcarded (source, TRUE); - } else { - gtk_icon_source_set_size_wildcarded (source, FALSE); - gtk_icon_source_set_size (source, size); - } - - g_free(filename); - - return source; -} - - -/** - * add_icons: - * @icons: Icons to add - * @themed: Themed icons to add - * - * Adds different sized icons to the icon factory. - */ -static void -add_icons (const gchar **icons, const gchar **themed) -{ - GtkIconFactory *factory; - GtkIconSource *source; - GtkIconSet *iconset; - GtkWidget *win; - - /* Setup the icon factory. */ - factory = gtk_icon_factory_new (); - gtk_icon_factory_add_default (factory); - - /* Er, yeah, a hack, but it works. :) */ - win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_widget_realize(win); - - for ( ; *icons; icons++) { - - iconset = gtk_icon_set_new (); - - source = make_icon_source (*icons, "22x22", "png", GTK_ICON_SIZE_BUTTON); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_icon_source (*icons, "22x22", "png", GTK_ICON_SIZE_MENU); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_icon_source (*icons, "22x22", "png", GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_icon_source (*icons, "22x22", "png", GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_icon_source (*icons, "48x48", "png", GTK_ICON_SIZE_DIALOG); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_icon_source (*icons, "scalable", "svg", -1); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - - gtk_icon_factory_add (factory, *icons, iconset); - gtk_icon_set_unref (iconset); - } - - for ( ; themed && *themed; themed++) { - - iconset = gtk_icon_set_new (); - - source = make_theme_source (*themed, GTK_ICON_SIZE_BUTTON); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_theme_source (*themed, GTK_ICON_SIZE_MENU); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_theme_source (*themed, GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_theme_source (*themed, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_theme_source (*themed, GTK_ICON_SIZE_DIALOG); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - source = make_theme_source (*themed, -1); - gtk_icon_set_add_source (iconset, source); - gtk_icon_source_free (source); - - gtk_icon_factory_add (factory, *themed, iconset); - gtk_icon_set_unref (iconset); - } - - gtk_widget_destroy (win); - g_object_unref (factory); -} - -/** - * seahorse_gtkstock_init: - * - * Adds the default icons to the icon factory - * - */ -void -seahorse_gtkstock_init(void) -{ - static gboolean stock_initted = FALSE; - - if (stock_initted) - return; - stock_initted = TRUE; - - gtk_window_set_default_icon_name ("seahorse"); - - add_icons (seahorse_icons, themed_icons); -} - -/** - * seahorse_gtkstock_add_icons: - * @icons: The icons to add to the default factory - * - * Adds icons to the factory - */ -void -seahorse_gtkstock_add_icons (const gchar **icons) -{ - add_icons (icons, NULL); -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-gtkstock.h seahorse-3.6.3/libseahorse/seahorse-gtkstock.h --- seahorse-3.2.2/libseahorse/seahorse-gtkstock.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-gtkstock.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -/** - * @file gtkstock.h GTK+ Stock resources - * - * seahorse - * - * Gaim is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with the gaim - * source distribution. - * - * Also (c) 2005 Adam Schreiber - * - * 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 _SEAHORSE_GTKSTOCK_H_ -#define _SEAHORSE_GTKSTOCK_H_ - -#include - -/* The default stock icons */ -#define SEAHORSE_STOCK_KEY "seahorse-key" -#define SEAHORSE_STOCK_SECRET "seahorse-key-personal" -#define SEAHORSE_STOCK_KEY_SSH "seahorse-key-ssh" -#define SEAHORSE_STOCK_PERSON "seahorse-person" -#define SEAHORSE_STOCK_SIGN "seahorse-sign" -#define SEAHORSE_STOCK_SIGN_OK "seahorse-sign-ok" -#define SEAHORSE_STOCK_SIGN_BAD "seahorse-sign-bad" -#define SEAHORSE_STOCK_SIGN_UNKNOWN "seahorse-sign-unknown" - -#define SEAHORSE_THEMED_WEBBROWSER "web-browser" -#define SEAHORSE_THEMED_FOLDER "folder" - -void seahorse_gtkstock_init (void); - -void seahorse_gtkstock_add_icons (const gchar **icons); - -#endif /* _SEAHORSE_GTKSTOCK_H_ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-icons.c seahorse-3.6.3/libseahorse/seahorse-icons.c --- seahorse-3.2.2/libseahorse/seahorse-icons.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-icons.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,48 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include + +#include "seahorse-icons.h" + +/** + * seahorse_icons_init: + * + * Adds the icons to the icon theme + * + */ +void +seahorse_icons_init (void) +{ + static gboolean icons_initted = FALSE; + + if (icons_initted) + return; + icons_initted = TRUE; + + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), + PKGDATADIR G_DIR_SEPARATOR_S "icons"); + gtk_window_set_default_icon_name ("seahorse"); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-icons.h seahorse-3.6.3/libseahorse/seahorse-icons.h --- seahorse-3.2.2/libseahorse/seahorse-icons.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-icons.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,47 @@ +/** + * @file gtkstock.h GTK+ Stock resources + * + * seahorse + * + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with the gaim + * source distribution. + * + * Also (c) 2005 Adam Schreiber + * + * 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 _SEAHORSE_ICONS_H_ +#define _SEAHORSE_ICONS_H_ + +#include + +/* The seahorse icons */ +#define SEAHORSE_ICON_KEY "seahorse-key" +#define SEAHORSE_ICON_SECRET "seahorse-key-personal" +#define SEAHORSE_ICON_KEY_SSH "seahorse-key-ssh" +#define SEAHORSE_ICON_PERSON "seahorse-person" +#define SEAHORSE_ICON_SIGN "seahorse-sign" +#define SEAHORSE_ICON_SIGN_OK "seahorse-sign-ok" +#define SEAHORSE_ICON_SIGN_BAD "seahorse-sign-bad" +#define SEAHORSE_ICON_SIGN_UNKNOWN "seahorse-sign-unknown" + +#define SEAHORSE_ICON_WEBBROWSER "web-browser" +#define SEAHORSE_ICON_FOLDER "folder" + +void seahorse_icons_init (void); + +#endif /* _SEAHORSE_ICONS_H_ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-interaction.c seahorse-3.6.3/libseahorse/seahorse-interaction.c --- seahorse-3.2.2/libseahorse/seahorse-interaction.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-interaction.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,193 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-interaction.h" +#include "seahorse-passphrase.h" + +#include +#include + +enum { + PROP_0, + PROP_PARENT +}; + +struct _SeahorseInteractionPrivate { + GtkWindow *parent; +}; + +G_DEFINE_TYPE (SeahorseInteraction, seahorse_interaction, G_TYPE_TLS_INTERACTION); + +static void +seahorse_interaction_init (SeahorseInteraction *self) +{ + self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_INTERACTION, + SeahorseInteractionPrivate)); +} + +static void +seahorse_interaction_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseInteraction *self = SEAHORSE_INTERACTION (obj); + + switch (prop_id) { + case PROP_PARENT: + seahorse_interaction_set_parent (self, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_interaction_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseInteraction *self = SEAHORSE_INTERACTION (obj); + + switch (prop_id) { + case PROP_PARENT: + g_value_set_object (value, seahorse_interaction_get_parent (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_interaction_dispose (GObject *obj) +{ + SeahorseInteraction *self = SEAHORSE_INTERACTION (obj); + + seahorse_interaction_set_parent (self, NULL); + + G_OBJECT_CLASS (seahorse_interaction_parent_class)->dispose (obj); +} + +static gchar * +calc_description (GTlsPassword *password) +{ + const gchar *description = g_tls_password_get_description (password); + return g_strdup_printf (_("Enter PIN or password for: %s"), description); +} + +static GTlsInteractionResult +seahorse_interaction_ask_password (GTlsInteraction *interaction, + GTlsPassword *password, + GCancellable *cancellable, + GError **error) +{ + SeahorseInteraction *self = SEAHORSE_INTERACTION (interaction); + GTlsInteractionResult res; + GtkDialog *dialog; + gchar *description; + const gchar *pass; + gsize length; + + description = calc_description (password); + + dialog = seahorse_passphrase_prompt_show (NULL, description, NULL, NULL, FALSE); + + g_free (description); + + if (self->pv->parent) + gtk_window_set_transient_for (GTK_WINDOW (dialog), self->pv->parent); + + switch (gtk_dialog_run (dialog)) { + case GTK_RESPONSE_ACCEPT: + pass = seahorse_passphrase_prompt_get (dialog); + length = strlen (pass); + g_tls_password_set_value_full (password, + (guchar *)gcr_secure_memory_strdup (pass), + length, gcr_secure_memory_free); + res = G_TLS_INTERACTION_HANDLED; + break; + default: + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CANCELLED, + "The password request was cancelled by the user"); + res = G_TLS_INTERACTION_FAILED; + break; + }; + + gtk_widget_destroy (GTK_WIDGET (dialog)); + return res; +} + +static void +seahorse_interaction_class_init (SeahorseInteractionClass *klass) +{ + GTlsInteractionClass *interaction_class = G_TLS_INTERACTION_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->get_property = seahorse_interaction_get_property; + object_class->set_property = seahorse_interaction_set_property; + object_class->dispose = seahorse_interaction_dispose; + + interaction_class->ask_password = seahorse_interaction_ask_password; + + g_object_class_install_property (object_class, PROP_PARENT, + g_param_spec_object ("parent", "Parent", "Parent window", + GTK_TYPE_WINDOW, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_type_class_add_private (klass, sizeof (SeahorseInteractionPrivate)); +} + +GTlsInteraction * +seahorse_interaction_new (GtkWindow *parent) +{ + return g_object_new (SEAHORSE_TYPE_INTERACTION, + "parent", parent, + NULL); +} + +GtkWindow * +seahorse_interaction_get_parent (SeahorseInteraction *self) +{ + g_return_val_if_fail (SEAHORSE_IS_INTERACTION (self), NULL); + return self->pv->parent; +} + +void +seahorse_interaction_set_parent (SeahorseInteraction *self, + GtkWindow *parent) +{ + g_return_if_fail (SEAHORSE_IS_INTERACTION (self)); + g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent)); + + if (self->pv->parent) + g_object_remove_weak_pointer (G_OBJECT (self->pv->parent), + (gpointer *)&self->pv->parent); + self->pv->parent = parent; + if (self->pv->parent) + g_object_add_weak_pointer (G_OBJECT (self->pv->parent), + (gpointer *)&self->pv->parent); + g_object_notify (G_OBJECT (self), "parent"); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-interaction.h seahorse-3.6.3/libseahorse/seahorse-interaction.h --- seahorse-3.2.2/libseahorse/seahorse-interaction.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-interaction.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,58 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_INTERACTION_H__ +#define __SEAHORSE_INTERACTION_H__ + +#include + +#include "seahorse-object.h" + +#define SEAHORSE_TYPE_INTERACTION (seahorse_interaction_get_type ()) +#define SEAHORSE_INTERACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_INTERACTION, SeahorseInteraction)) +#define SEAHORSE_INTERACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_INTERACTION, SeahorseInteractionClass)) +#define SEAHORSE_IS_INTERACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_INTERACTION)) +#define SEAHORSE_IS_INTERACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_INTERACTION)) +#define SEAHORSE_INTERACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_INTERACTION, SeahorseInteractionClass)) + +typedef struct _SeahorseInteraction SeahorseInteraction; +typedef struct _SeahorseInteractionClass SeahorseInteractionClass; +typedef struct _SeahorseInteractionPrivate SeahorseInteractionPrivate; + +struct _SeahorseInteraction { + GTlsInteraction parent_instance; + SeahorseInteractionPrivate *pv; +}; + +struct _SeahorseInteractionClass { + GTlsInteractionClass parent_class; +}; + +GType seahorse_interaction_get_type (void); + +GTlsInteraction * seahorse_interaction_new (GtkWindow *parent); + +GtkWindow * seahorse_interaction_get_parent (SeahorseInteraction *self); + +void seahorse_interaction_set_parent (SeahorseInteraction *self, + GtkWindow *parent); + +#endif diff -Nru seahorse-3.2.2/libseahorse/seahorse-key-manager-store.c seahorse-3.6.3/libseahorse/seahorse-key-manager-store.c --- seahorse-3.2.2/libseahorse/seahorse-key-manager-store.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-key-manager-store.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,822 @@ +/* + * Seahorse + * + * Copyright (C) 2003 Jacob Perkins + * Copyright (C) 2004, 2005, 2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-exportable.h" +#include "seahorse-place.h" +#include "seahorse-util.h" + +#include "seahorse-key-manager-store.h" +#include "seahorse-preferences.h" +#include "seahorse-validity.h" + +#include +#include + +#include +#include + +#define DEBUG_FLAG SEAHORSE_DEBUG_DRAG +#include "seahorse-debug.h" + +#include "eggtreemultidnd.h" + +#define KEY_MANAGER_SORT_KEY "/apps/seahorse/listing/sort_by" + +enum { + PROP_0, + PROP_MODE, + PROP_FILTER, + PROP_SETTINGS +}; + +enum { + COL_ICON, + COL_MARKUP, + COL_LABEL, + COL_DESCRIPTION, + N_COLS +}; + +static GcrColumn columns[] = { + { "icon", /* later */ 0, /* later */ 0, NULL, + 0, NULL, NULL }, + { "markup", G_TYPE_STRING, G_TYPE_STRING, NULL, + 0, NULL, NULL }, + { "label", G_TYPE_STRING, G_TYPE_STRING, NULL, + GCR_COLUMN_SORTABLE, NULL, NULL }, + { "description", G_TYPE_STRING, G_TYPE_STRING, NULL, + 0, NULL, NULL }, + { NULL } +}; + +enum { + DRAG_INFO_TEXT, + DRAG_INFO_XDS, +}; + +#define XDS_FILENAME "xds.txt" +#define MAX_XDS_ATOM_VAL_LEN 4096 +#define XDS_ATOM gdk_atom_intern ("XdndDirectSave0", FALSE) +#define TEXT_ATOM gdk_atom_intern ("text/plain", FALSE) + +static GtkTargetEntry store_targets[] = { + { "text/plain", 0, DRAG_INFO_TEXT }, + { "XdndDirectSave0", 0, DRAG_INFO_XDS } +}; + +struct _SeahorseKeyManagerStorePriv { + GSettings *settings; + + SeahorseKeyManagerStoreMode filter_mode; + gchar* filter_text; + guint filter_stag; + + gchar *drag_destination; + GError *drag_error; + GList *drag_objects; +}; + +G_DEFINE_TYPE (SeahorseKeyManagerStore, seahorse_key_manager_store, GCR_TYPE_COLLECTION_MODEL); + +/* Search through row for text */ +static gboolean +object_contains_filtered_text (GObject *object, + const gchar* text) +{ + gchar* name = NULL; + gchar* description = NULL; + gchar* lower; + gboolean ret = FALSE; + + /* Empty search text results in a match */ + if (!text || !text[0]) + return TRUE; + + g_object_get (object, "label", &name, NULL); + if (name != NULL) { + lower = g_utf8_strdown (name, -1); + if (strstr (lower, text)) + ret = TRUE; + g_free (lower); + g_free (name); + } + + if (!ret && g_object_class_find_property (G_OBJECT_GET_CLASS (object), "description")) { + g_object_get (object, "description", &description, NULL); + if (description != NULL) { + lower = g_utf8_strdown (description, -1); + if (strstr (lower, text)) + ret = TRUE; + g_free (lower); + g_free (description); + } + } + + return ret; +} + +/* Called to filter each row */ +static gboolean +on_filter_visible (GObject *obj, + gpointer user_data) +{ + SeahorseKeyManagerStore* self = SEAHORSE_KEY_MANAGER_STORE (user_data); + GList *children, *l; + gboolean ret = FALSE; + + /* Check the row requested */ + switch (self->priv->filter_mode) { + case KEY_STORE_MODE_FILTERED: + ret = object_contains_filtered_text (obj, self->priv->filter_text); + break; + + case KEY_STORE_MODE_ALL: + ret = TRUE; + break; + + default: + g_assert_not_reached (); + break; + }; + + /* If current is not being shown, double check with children */ + if (!ret && GCR_IS_COLLECTION (obj)) { + children = gcr_collection_get_objects (GCR_COLLECTION (obj)); + for (l = children; !ret && l != NULL; l = g_list_next (l)) + ret = on_filter_visible (l->data, user_data); + } + + return ret; +} + +void +seahorse_key_manager_store_refilter (SeahorseKeyManagerStore* self) +{ + GcrCollection *collection = gcr_collection_model_get_collection (GCR_COLLECTION_MODEL (self)); + seahorse_collection_refresh (SEAHORSE_COLLECTION (collection)); +} + +/* Refilter the tree */ +static gboolean +refilter_now (gpointer user_data) +{ + SeahorseKeyManagerStore* self = SEAHORSE_KEY_MANAGER_STORE (user_data); + self->priv->filter_stag = 0; + seahorse_key_manager_store_refilter (self); + return FALSE; +} + +/* Refilter the tree after a timeout has passed */ +static void +refilter_later (SeahorseKeyManagerStore* skstore) +{ + if (skstore->priv->filter_stag != 0) + g_source_remove (skstore->priv->filter_stag); + skstore->priv->filter_stag = g_timeout_add (200, (GSourceFunc)refilter_now, skstore); +} + +/* Update the sort order for a column */ +static void +set_sort_to (SeahorseKeyManagerStore *skstore, const gchar *name) +{ + gint i, id = -1; + GtkSortType ord = GTK_SORT_ASCENDING; + const gchar* n; + + g_return_if_fail (name != NULL); + + /* Prefix with a minus means descending */ + if (name[0] == '-') { + ord = GTK_SORT_DESCENDING; + name++; + } + + /* Prefix with a plus means ascending */ + else if (name[0] == '+') { + ord = GTK_SORT_ASCENDING; + name++; + } + + /* Find the column sort id */ + for (i = N_COLS - 1; i >= 0 ; i--) { + n = columns[i].user_data; + if (n && g_ascii_strcasecmp (name, n) == 0) { + id = i; + break; + } + } + + if (id != -1) + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (skstore), id, ord); +} + +/* Called when the column sort is changed */ +static void +on_sort_column_changed (GtkTreeSortable *sort, + gpointer user_data) +{ + SeahorseKeyManagerStore *self = SEAHORSE_KEY_MANAGER_STORE (user_data); + GtkSortType ord; + gchar* value; + gint column_id; + + if (!self->priv->settings) + return; + + /* We have a sort so save it */ + if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (self), &column_id, &ord)) { + if (column_id >= 0 && column_id < N_COLS) { + if (columns[column_id].user_data != NULL) { + value = g_strconcat (ord == GTK_SORT_DESCENDING ? "-" : "", + columns[column_id].user_data, NULL); + g_settings_set_string (self->priv->settings, "sort-by", value); + g_free (value); + } + } + + /* No sort so save blank */ + } else if (self->priv->settings) { + g_settings_set_string (self->priv->settings, "sort-by", ""); + } +} + +/* The following three functions taken from bugzilla + * (http://bugzilla.gnome.org/attachment.cgi?id=49362&action=view) + * Author: Christian Neumair + * Copyright: 2005 Free Software Foundation, Inc + * License: GPL */ +static char * +xds_get_atom_value (GdkDragContext *context) +{ + GdkWindow *source_window; + char *ret; + + g_return_val_if_fail (context != NULL, NULL); + + source_window = gdk_drag_context_get_source_window (context); + g_return_val_if_fail (source_window != NULL, NULL); + + if (gdk_property_get (source_window, + XDS_ATOM, TEXT_ATOM, + 0, MAX_XDS_ATOM_VAL_LEN, + FALSE, NULL, NULL, NULL, + (unsigned char **) &ret)) + return ret; + + return NULL; +} + +static gboolean +xds_context_offers_target (GdkDragContext *context, GdkAtom target) +{ + GList *targets = gdk_drag_context_list_targets (context); + return (g_list_find (targets, target) != NULL); +} + +static gboolean +xds_is_dnd_valid_context (GdkDragContext *context) +{ + char *tmp; + gboolean ret; + + g_return_val_if_fail (context != NULL, FALSE); + + tmp = NULL; + if (xds_context_offers_target (context, XDS_ATOM)) { + tmp = xds_get_atom_value (context); + } + + ret = (tmp != NULL); + g_free (tmp); + + return ret; +} + +static gboolean +drag_begin (GtkWidget *widget, GdkDragContext *context, SeahorseKeyManagerStore *skstore) +{ + GtkTreeView *view = GTK_TREE_VIEW (widget); + GdkWindow *source_window; + + seahorse_debug ("drag_begin -->"); + + g_free (skstore->priv->drag_destination); + skstore->priv->drag_destination = NULL; + + g_clear_error (&skstore->priv->drag_error); + + g_list_free (skstore->priv->drag_objects); + skstore->priv->drag_objects = seahorse_key_manager_store_get_selected_objects (view); + + if (skstore->priv->drag_objects) { + source_window = gdk_drag_context_get_source_window (context); + gdk_property_change (source_window, XDS_ATOM, TEXT_ATOM, + 8, GDK_PROP_MODE_REPLACE, (guchar*)XDS_FILENAME, + strlen (XDS_FILENAME)); + } + + seahorse_debug ("drag_begin <--"); + return skstore->priv->drag_objects ? TRUE : FALSE; +} + +typedef struct { + SeahorseKeyManagerStore *skstore; + + gint exports; + gboolean failures; +} export_keys_to_output_closure; + +static gboolean +export_to_text (SeahorseKeyManagerStore *self, + GtkSelectionData *selection_data) +{ + gpointer output; + gsize size; + gboolean ret; + guint count; + + g_return_val_if_fail (self->priv->drag_objects, FALSE); + seahorse_debug ("exporting to text"); + + count = seahorse_exportable_export_to_text_wait (self->priv->drag_objects, + &output, &size, &self->priv->drag_error); + + /* TODO: Need to print status if only partially exported */ + + if (count > 0) { + seahorse_debug ("setting selection text"); + gtk_selection_data_set_text (selection_data, output, size); + ret = TRUE; + } else if (self->priv->drag_error) { + g_message ("error occurred on export: %s", self->priv->drag_error->message); + ret = FALSE; + } else { + g_message ("no objects exported"); + ret = FALSE; + } + + g_free (output); + return ret; +} + +static gboolean +export_to_directory (SeahorseKeyManagerStore *self, + const gchar *directory) +{ + seahorse_debug ("exporting to %s", directory); + + return seahorse_exportable_export_to_directory_wait (self->priv->drag_objects, + directory, + &self->priv->drag_error); +} + +static gboolean +drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, + guint info, guint time, SeahorseKeyManagerStore *skstore) +{ + gchar *destination; + gboolean ret; + + seahorse_debug ("drag_data_get %d -->", info); + + g_return_val_if_fail (skstore->priv->drag_objects, FALSE); + + /* The caller wants plain text */ + if (info == DRAG_INFO_TEXT) { + seahorse_debug ("returning object text"); + export_to_text (skstore, selection_data); + + /* The caller wants XDS */ + } else if (info == DRAG_INFO_XDS) { + + if (xds_is_dnd_valid_context (context)) { + destination = xds_get_atom_value (context); + g_return_val_if_fail (destination, FALSE); + skstore->priv->drag_destination = g_path_get_dirname (destination); + g_free (destination); + + gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), 8, (guchar*)"S", 1); + ret = TRUE; + } + + /* Unrecognized format */ + } else { + seahorse_debug ("Unrecognized format: %d", info); + } + + seahorse_debug ("drag_data_get <--"); + return ret; +} + +static void +drag_end (GtkWidget *widget, GdkDragContext *context, SeahorseKeyManagerStore *skstore) +{ + seahorse_debug ("drag_end -->"); + + if (skstore->priv->drag_destination && !skstore->priv->drag_error) + export_to_directory (skstore, skstore->priv->drag_destination); + + if (skstore->priv->drag_error) { + g_dbus_error_strip_remote_error (skstore->priv->drag_error); + seahorse_util_show_error (widget, _("Couldn't export keys"), + skstore->priv->drag_error->message); + } + + g_clear_error (&skstore->priv->drag_error); + g_list_free (skstore->priv->drag_objects); + skstore->priv->drag_objects = NULL; + g_free (skstore->priv->drag_destination); + skstore->priv->drag_destination = NULL; + + seahorse_debug ("drag_end <--"); +} + +static gint +compare_pointers (gconstpointer a, gconstpointer b) +{ + if (a == b) + return 0; + return a > b ? 1 : -1; +} + +/* ----------------------------------------------------------------------------- + * OBJECT + */ + +static void +seahorse_key_manager_store_init (SeahorseKeyManagerStore *skstore) +{ + /* init private vars */ + skstore->priv = g_new0 (SeahorseKeyManagerStorePriv, 1); +} + +static void +seahorse_key_manager_store_get_property (GObject *gobject, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + SeahorseKeyManagerStore *skstore = SEAHORSE_KEY_MANAGER_STORE (gobject); + + switch (prop_id) { + + /* The filtering mode */ + case PROP_MODE: + g_value_set_uint (value, skstore->priv->filter_mode); + break; + + case PROP_SETTINGS: + g_value_set_object (value, skstore->priv->settings); + break; + + /* The filter text. Note that we act as if we don't have any + * filter text when not in filtering mode */ + case PROP_FILTER: + g_value_set_string (value, + skstore->priv->filter_mode == KEY_STORE_MODE_FILTERED ? skstore->priv->filter_text : ""); + break; + + default: + break; + } +} + +static void +seahorse_key_manager_store_set_property (GObject *gobject, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + SeahorseKeyManagerStore *skstore = SEAHORSE_KEY_MANAGER_STORE (gobject); + const gchar* t; + + switch (prop_id) { + + /* The filtering mode */ + case PROP_MODE: + if (skstore->priv->filter_mode != g_value_get_uint (value)) { + skstore->priv->filter_mode = g_value_get_uint (value); + refilter_later (skstore); + } + break; + + case PROP_SETTINGS: + skstore->priv->settings = g_value_dup_object (value); + break; + + /* The filter text */ + case PROP_FILTER: + t = g_value_get_string (value); + + /* + * If we're not in filtered mode and there is text OR + * we're in filtered mode (regardless of text or not) + * then update the filter + */ + if ((skstore->priv->filter_mode != KEY_STORE_MODE_FILTERED && t && t[0]) || + (skstore->priv->filter_mode == KEY_STORE_MODE_FILTERED)) { + skstore->priv->filter_mode = KEY_STORE_MODE_FILTERED; + g_free (skstore->priv->filter_text); + + /* We always use lower case text (see filter_callback) */ + skstore->priv->filter_text = g_utf8_strdown (t, -1); + refilter_later (skstore); + } + break; + + default: + break; + } +} + +static void +seahorse_key_manager_store_finalize (GObject *gobject) +{ + SeahorseKeyManagerStore *skstore = SEAHORSE_KEY_MANAGER_STORE (gobject); + + g_signal_handlers_disconnect_by_func (skstore, on_sort_column_changed, skstore); + + /* Allocated in property setter */ + g_free (skstore->priv->filter_text); + + G_OBJECT_CLASS (seahorse_key_manager_store_parent_class)->finalize (gobject); +} + +static void +seahorse_key_manager_store_class_init (SeahorseKeyManagerStoreClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + columns[COL_ICON].column_type = G_TYPE_ICON; + columns[COL_ICON].property_type = G_TYPE_ICON; + + gobject_class->finalize = seahorse_key_manager_store_finalize; + gobject_class->set_property = seahorse_key_manager_store_set_property; + gobject_class->get_property = seahorse_key_manager_store_get_property; + + g_object_class_install_property (gobject_class, PROP_MODE, + g_param_spec_uint ("mode", "Key Store Mode", "Key store mode controls which keys to display", + 0, KEY_STORE_MODE_FILTERED, KEY_STORE_MODE_ALL, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_FILTER, + g_param_spec_string ("filter", "Key Store Filter", "Key store filter for when in filtered mode", + "", G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_SETTINGS, + g_param_spec_object ("settings", "Settings", "Manager Settings", + G_TYPE_SETTINGS, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + /* Couldn't initialize this earlier */ + g_assert (N_COLS + 1 == G_N_ELEMENTS (columns)); + columns[0].property_type = G_TYPE_ICON; + columns[0].column_type = G_TYPE_ICON; +} + +/* ----------------------------------------------------------------------------- + * PUBLIC + */ + +SeahorseKeyManagerStore* +seahorse_key_manager_store_new (GcrCollection *collection, + GtkTreeView *view, + SeahorsePredicate *pred, + GSettings *settings) +{ + SeahorseKeyManagerStore *self; + GtkTreeViewColumn *col; + SeahorseCollection *filtered; + GtkCellRenderer *renderer; + gchar *sort_by; + guint last; + + filtered = seahorse_collection_new_for_predicate (collection, pred, NULL); + pred->custom = on_filter_visible; + + self = g_object_new (SEAHORSE_TYPE_KEY_MANAGER_STORE, + "collection", filtered, + "settings", settings, + "mode", GCR_COLLECTION_MODEL_LIST, + NULL); + pred->custom_target = self; + g_object_unref (filtered); + + last = gcr_collection_model_set_columns (GCR_COLLECTION_MODEL (self), columns); + g_return_val_if_fail (last == N_COLS, NULL); + + /* The sorted model is the top level model */ + gtk_tree_view_set_model (view, GTK_TREE_MODEL (self)); + + /* add the icon column */ + renderer = gtk_cell_renderer_pixbuf_new (); + g_object_set (renderer, "stock-size", GTK_ICON_SIZE_DND, NULL); + g_object_set (renderer, "ypad", 6, NULL); + g_object_set (renderer, "yalign", 0.0, NULL); + col = gtk_tree_view_column_new_with_attributes ("", renderer, "gicon", COL_ICON, NULL); + gtk_tree_view_column_set_resizable (col, FALSE); + gtk_tree_view_append_column (view, col); + + /* Name column */ + col = gtk_tree_view_column_new (); + renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, + "ypad", 6, + "yalign", 0.0, + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); + gtk_tree_view_column_pack_start (col, renderer, TRUE); + gtk_tree_view_column_set_attributes (col, renderer, + "markup", COL_MARKUP, + NULL); + renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, + "ypad", 6, + "xpad", 3, + "yalign", 0.0, + "xalign", 1.0, + "scale", PANGO_SCALE_SMALL, + "alignment", PANGO_ALIGN_RIGHT, + NULL); + gtk_tree_view_column_pack_start (col, renderer, FALSE); + gtk_tree_view_column_set_attributes (col, renderer, + "markup", COL_DESCRIPTION, + NULL); + gtk_tree_view_column_set_resizable (col, TRUE); + gtk_tree_view_column_set_expand (col, TRUE); + gtk_tree_view_append_column (view, col); + gtk_tree_view_column_set_sort_column_id (col, COL_LABEL); + + /* Use predicate to figure out which columns to add */ + if (SEAHORSE_IS_COLLECTION (collection)) + pred = seahorse_collection_get_predicate (SEAHORSE_COLLECTION (collection)); + else + pred = NULL; + + /* Also watch for sort-changed on the store */ + g_signal_connect (self, "sort-column-changed", G_CALLBACK (on_sort_column_changed), self); + + /* Update sort order in case the sorted column was added */ + if ((sort_by = g_settings_get_string (settings, "sort-by")) != NULL) { + set_sort_to (self, sort_by); + g_free (sort_by); + } + + gtk_tree_view_set_enable_search (view, FALSE); + gtk_tree_view_set_show_expanders (view, FALSE); + gtk_tree_view_set_rules_hint (view, TRUE); + gtk_tree_view_set_headers_visible (view, FALSE); + + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self), COL_LABEL, + GTK_SORT_ASCENDING); + + /* Tree drag */ + egg_tree_multi_drag_add_drag_support (view); + + g_signal_connect (G_OBJECT (view), "drag_data_get", G_CALLBACK (drag_data_get), self); + g_signal_connect (G_OBJECT (view), "drag_begin", G_CALLBACK (drag_begin), self); + g_signal_connect (G_OBJECT (view), "drag_end", G_CALLBACK (drag_end), self); + + gtk_drag_source_set (GTK_WIDGET (view), GDK_BUTTON1_MASK, + store_targets, G_N_ELEMENTS (store_targets), GDK_ACTION_COPY); + + return self; +} + +GObject * +seahorse_key_manager_store_get_object_from_path (GtkTreeView *view, GtkTreePath *path) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); + g_return_val_if_fail (path != NULL, NULL); + + model = gtk_tree_view_get_model (view); + g_return_val_if_fail (gtk_tree_model_get_iter (model, &iter, path), NULL); + return gcr_collection_model_object_for_iter (GCR_COLLECTION_MODEL (model), &iter); +} + +GList* +seahorse_key_manager_store_get_all_objects (GtkTreeView *view) +{ + SeahorseKeyManagerStore* skstore; + + g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); + skstore = SEAHORSE_KEY_MANAGER_STORE (gtk_tree_view_get_model (view)); + g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore), NULL); + return gcr_collection_get_objects (gcr_collection_model_get_collection (GCR_COLLECTION_MODEL (skstore))); +} + +GList* +seahorse_key_manager_store_get_selected_objects (GtkTreeView *view) +{ + GObject *obj; + GList *l, *objects = NULL; + SeahorseKeyManagerStore* skstore; + GList *list, *paths = NULL; + GtkTreeSelection *selection; + + g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); + skstore = SEAHORSE_KEY_MANAGER_STORE (gtk_tree_view_get_model (view)); + g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore), NULL); + + selection = gtk_tree_view_get_selection (view); + paths = gtk_tree_selection_get_selected_rows (selection, NULL); + + /* make object list */ + for (list = paths; list != NULL; list = g_list_next (list)) { + obj = seahorse_key_manager_store_get_object_from_path (view, list->data); + if (obj != NULL) + objects = g_list_append (objects, obj); + } + + /* free selected paths */ + g_list_foreach (paths, (GFunc)gtk_tree_path_free, NULL); + g_list_free (paths); + + /* Remove duplicates */ + objects = g_list_sort (objects, compare_pointers); + for (l = objects; l; l = g_list_next (l)) { + while (l->next && l->data == l->next->data) + objects = g_list_delete_link (objects, l->next); + } + + return objects; +} + +void +seahorse_key_manager_store_set_selected_objects (GtkTreeView *view, GList* objects) +{ + SeahorseKeyManagerStore* skstore; + GtkTreeSelection* selection; + gboolean first = TRUE; + GtkTreePath *path; + GList *l; + GtkTreeIter iter; + + g_return_if_fail (GTK_IS_TREE_VIEW (view)); + selection = gtk_tree_view_get_selection (view); + gtk_tree_selection_unselect_all (selection); + + skstore = SEAHORSE_KEY_MANAGER_STORE (gtk_tree_view_get_model (view)); + g_return_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore)); + + for (l = objects; l; l = g_list_next (l)) { + if (gcr_collection_model_iter_for_object (GCR_COLLECTION_MODEL (skstore), + l->data, &iter)) { + gtk_tree_selection_select_iter (selection, &iter); + + /* Scroll the first row selected into view */ + if (first) { + path = gtk_tree_model_get_path (gtk_tree_view_get_model (view), &iter); + gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0.0, 0.0); + gtk_tree_path_free (path); + first = FALSE; + } + } + } +} + +GObject * +seahorse_key_manager_store_get_selected_object (GtkTreeView *view) +{ + SeahorseKeyManagerStore* skstore; + GObject *obj = NULL; + GList *paths = NULL; + GtkTreeSelection *selection; + + g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); + skstore = SEAHORSE_KEY_MANAGER_STORE (gtk_tree_view_get_model (view)); + g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore), NULL); + + selection = gtk_tree_view_get_selection (view); + paths = gtk_tree_selection_get_selected_rows (selection, NULL); + + /* choose first object */ + if (paths != NULL) { + obj = seahorse_key_manager_store_get_object_from_path (view, paths->data); + + /* free selected paths */ + g_list_foreach (paths, (GFunc)gtk_tree_path_free, NULL); + g_list_free (paths); + } + + return obj; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-key-manager-store.h seahorse-3.6.3/libseahorse/seahorse-key-manager-store.h --- seahorse-3.2.2/libseahorse/seahorse-key-manager-store.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-key-manager-store.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,80 @@ +/* + * Seahorse + * + * Copyright (C) 2003 Jacob Perkins + * Copyright (C) 2006 Stefan Walter + * + * 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 __SEAHORSE_KEY_MANAGER_STORE_H__ +#define __SEAHORSE_KEY_MANAGER_STORE_H__ + +#include "seahorse-collection.h" +#include "seahorse-object.h" + +#include +#include + +#define SEAHORSE_TYPE_KEY_MANAGER_STORE (seahorse_key_manager_store_get_type ()) +#define SEAHORSE_KEY_MANAGER_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStore)) +#define SEAHORSE_KEY_MANAGER_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass)) +#define SEAHORSE_IS_KEY_MANAGER_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE)) +#define SEAHORSE_IS_KEY_MANAGER_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE)) +#define SEAHORSE_KEY_MANAGER_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass)) + +typedef struct _SeahorseKeyManagerStore SeahorseKeyManagerStore; +typedef struct _SeahorseKeyManagerStorePriv SeahorseKeyManagerStorePriv; +typedef struct _SeahorseKeyManagerStoreClass SeahorseKeyManagerStoreClass; + +typedef enum _SeahorseKeyManagerStoreMode { + KEY_STORE_MODE_ALL, + KEY_STORE_MODE_FILTERED +} SeahorseKeyManagerStoreMode; + +struct _SeahorseKeyManagerStore { + GcrCollectionModel parent; + + /*< private >*/ + SeahorseKeyManagerStorePriv *priv; +}; + +struct _SeahorseKeyManagerStoreClass { + GcrCollectionModelClass parent_class; +}; + +GType seahorse_key_manager_store_get_type (void) G_GNUC_CONST; + +SeahorseKeyManagerStore* seahorse_key_manager_store_new (GcrCollection *collection, + GtkTreeView *view, + SeahorsePredicate *pred, + GSettings *settings); + +GObject * seahorse_key_manager_store_get_object_from_path (GtkTreeView *view, + GtkTreePath *path); + +GList* seahorse_key_manager_store_get_all_objects (GtkTreeView *view); + +void seahorse_key_manager_store_set_selected_objects (GtkTreeView *view, + GList* objects); + +GList* seahorse_key_manager_store_get_selected_objects (GtkTreeView *view); + +GObject * seahorse_key_manager_store_get_selected_object (GtkTreeView *view); + +void seahorse_key_manager_store_refilter (SeahorseKeyManagerStore* self); + +#endif /* __SEAHORSE_KEY_MANAGER_STORE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-keyserver-control.c seahorse-3.6.3/libseahorse/seahorse-keyserver-control.c --- seahorse-3.2.2/libseahorse/seahorse-keyserver-control.c 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-keyserver-control.c 2012-08-21 12:23:16.000000000 +0200 @@ -21,7 +21,7 @@ #include -#include "seahorse-context.h" +#include "seahorse-application.h" #include "seahorse-keyserver-control.h" #include "seahorse-servers.h" #include "seahorse-util.h" @@ -68,7 +68,7 @@ if (self->settings_key) { text = seahorse_keyserver_control_selected (self); - g_settings_set_string (seahorse_context_settings (NULL), + g_settings_set_string (seahorse_application_settings (NULL), self->settings_key, text ? text : ""); g_free (text); } @@ -98,11 +98,11 @@ populate_combo (self, TRUE); g_signal_connect_object (self, "changed", G_CALLBACK (on_keyserver_changed), self, 0); - g_signal_connect_object (seahorse_context_pgp_settings (NULL), "changed::keyserver", + g_signal_connect_object (seahorse_application_pgp_settings (NULL), "changed::keyserver", G_CALLBACK (on_settings_keyserver_changed), self, 0); if (self->settings_key) { detailed = g_strdup_printf ("changed::%s", self->settings_key); - g_signal_connect_object (seahorse_context_settings (NULL), detailed, + g_signal_connect_object (seahorse_application_settings (NULL), detailed, G_CALLBACK (on_settings_key_changed), self, 0); g_free (detailed); } @@ -242,7 +242,7 @@ /* Get the appropriate selection */ if (with_key && skc->settings_key) - chosen = g_settings_get_string (seahorse_context_settings (NULL), skc->settings_key); + chosen = g_settings_get_string (seahorse_application_settings (NULL), skc->settings_key); else { if (gtk_combo_box_get_active_iter (combo, &iter)) { gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter, diff -Nru seahorse-3.2.2/libseahorse/seahorse-lockable.c seahorse-3.6.3/libseahorse/seahorse-lockable.c --- seahorse-3.2.2/libseahorse/seahorse-lockable.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-lockable.c 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,143 @@ +/* + * Seahorse + * + * Copyright (C) 2004,2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-lockable.h" + +typedef SeahorseLockableIface SeahorseLockableInterface; + +G_DEFINE_INTERFACE (SeahorseLockable, seahorse_lockable, G_TYPE_OBJECT); + +static void +seahorse_lockable_default_init (SeahorseLockableIface *iface) +{ + static gboolean initialized = FALSE; + if (!initialized) { + initialized = TRUE; + + g_object_interface_install_property (iface, + g_param_spec_boolean ("lockable", "Lockable", "Is actually lockable", + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_interface_install_property (iface, + g_param_spec_boolean ("unlockable", "Unlockable", "Is actually unlockable", + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + } +} + +void +seahorse_lockable_lock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseLockableIface *iface; + + g_return_if_fail (SEAHORSE_IS_LOCKABLE (lockable)); + g_return_if_fail (interaction == NULL || G_IS_TLS_INTERACTION (interaction)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + + iface = SEAHORSE_LOCKABLE_GET_INTERFACE (lockable); + g_return_if_fail (iface->lock_async != NULL); + + (iface->lock_async) (lockable, interaction, cancellable, callback, user_data); +} + +gboolean +seahorse_lockable_lock_finish (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error) +{ + SeahorseLockableIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_LOCKABLE (lockable), FALSE); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + iface = SEAHORSE_LOCKABLE_GET_INTERFACE (lockable); + g_return_val_if_fail (iface->lock_finish != NULL, FALSE); + + return (iface->lock_finish) (lockable, result, error); +} + + +void +seahorse_lockable_unlock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseLockableIface *iface; + + g_return_if_fail (SEAHORSE_IS_LOCKABLE (lockable)); + g_return_if_fail (interaction == NULL || G_IS_TLS_INTERACTION (interaction)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + + iface = SEAHORSE_LOCKABLE_GET_INTERFACE (lockable); + g_return_if_fail (iface->unlock_async != NULL); + + (iface->unlock_async) (lockable, interaction, cancellable, callback, user_data); +} + +gboolean +seahorse_lockable_unlock_finish (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error) +{ + SeahorseLockableIface *iface; + + g_return_val_if_fail (SEAHORSE_IS_LOCKABLE (lockable), FALSE); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + iface = SEAHORSE_LOCKABLE_GET_INTERFACE (lockable); + g_return_val_if_fail (iface->unlock_finish != NULL, FALSE); + + return (iface->unlock_finish) (lockable, result, error); +} + +gboolean +seahorse_lockable_can_unlock (gpointer object) +{ + gboolean unlockable; + + if (!SEAHORSE_IS_LOCKABLE (object)) + return FALSE; + + g_object_get (object, "unlockable", &unlockable, NULL); + return unlockable; +} + +gboolean +seahorse_lockable_can_lock (gpointer object) +{ + gboolean lockable; + + if (!SEAHORSE_IS_LOCKABLE (object)) + return FALSE; + + g_object_get (object, "lockable", &lockable, NULL); + return lockable; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-lockable.h seahorse-3.6.3/libseahorse/seahorse-lockable.h --- seahorse-3.2.2/libseahorse/seahorse-lockable.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-lockable.h 2012-08-21 12:23:16.000000000 +0200 @@ -0,0 +1,89 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_LOCKABLE_H__ +#define __SEAHORSE_LOCKABLE_H__ + +#include + +#include + +#define SEAHORSE_TYPE_LOCKABLE (seahorse_lockable_get_type ()) +#define SEAHORSE_LOCKABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_LOCKABLE, SeahorseLockable)) +#define SEAHORSE_IS_LOCKABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_LOCKABLE)) +#define SEAHORSE_LOCKABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_LOCKABLE, SeahorseLockableIface)) + +typedef struct _SeahorseLockable SeahorseLockable; +typedef struct _SeahorseLockableIface SeahorseLockableIface; + +struct _SeahorseLockableIface { + GTypeInterface parent; + + void (* lock_async) (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + gboolean (* lock_finish) (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error); + + void (* unlock_async) (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + gboolean (* unlock_finish) (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error); +}; + +GType seahorse_lockable_get_type (void) G_GNUC_CONST; + +void seahorse_lockable_lock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_lockable_lock_finish (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error); + +void seahorse_lockable_unlock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_lockable_unlock_finish (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error); + +gboolean seahorse_lockable_can_lock (gpointer object); + +gboolean seahorse_lockable_can_unlock (gpointer object); + +#endif /* __SEAHORSE_LOCKABLE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-object.c seahorse-3.6.3/libseahorse/seahorse-object.c --- seahorse-3.2.2/libseahorse/seahorse-object.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object.c 2012-10-20 23:22:35.000000000 +0200 @@ -23,66 +23,36 @@ #include "config.h" #include "seahorse-object.h" - -#include "seahorse-context.h" -#include "seahorse-source.h" +#include "seahorse-place.h" +#include "seahorse-predicate.h" #include "string.h" #include -/** - * _SeahorseObjectProps: - * @PROP_0: - * @PROP_CONTEXT: - * @PROP_SOURCE: - * @PROP_PREFERRED: - * @PROP_PARENT: - * @PROP_ID: - * @PROP_TAG: - * @PROP_LABEL: - * @PROP_MARKUP: - * @PROP_NICKNAME: - * @PROP_ICON: - * @PROP_IDENTIFIER: - * @PROP_LOCATION: - * @PROP_USAGE: - * @PROP_FLAGS: - */ -enum _SeahorseObjectProps { +enum { PROP_0, - PROP_CONTEXT, - PROP_SOURCE, - PROP_PREFERRED, - PROP_PARENT, - PROP_ID, - PROP_TAG, + PROP_PLACE, + PROP_ACTIONS, PROP_LABEL, PROP_MARKUP, PROP_NICKNAME, PROP_ICON, PROP_IDENTIFIER, - PROP_LOCATION, PROP_USAGE, - PROP_FLAGS + PROP_FLAGS, + PROP_DELETABLE, + PROP_EXPORTABLE }; /** - * _SeahorseObjectPrivate: - * @id: the id of the object - * @tag: DBUS: "ktype" - * @tag_explicit: If TRUE the tag will not be set automatically - * @source: Where did the object come from ? - * @context: - * @preferred: Points to the object to prefer over this one - * @parent: the object's parent - * @children: a list of children the object has + * @place: Where did the object come from ? * @label: DBUS: "display-name" * @markup: Markup text * @markup_explicit: If TRUE the markup will not be set automatically * @nickname: DBUS: "simple-name" * @nickname_explicit: If TRUE the nickname will not be set automatically - * @icon: DBUS: "stock-id" + * @icon: GIcon * @identifier: DBUS: "key-id", "display-id", "raw-id" * @identifier_explicit: * @location: describes the loaction of the object (local, remte, invalid...) @@ -90,26 +60,18 @@ * @flags: */ struct _SeahorseObjectPrivate { - GQuark id; - GQuark tag; - gboolean tag_explicit; - - SeahorseSource *source; - SeahorseContext *context; - SeahorseObject *preferred; - SeahorseObject *parent; - GList *children; - + SeahorsePlace *place; + GtkActionGroup *actions; + gchar *label; gchar *markup; gboolean markup_explicit; gchar *nickname; gboolean nickname_explicit; - gchar *icon; + GIcon *icon; gchar *identifier; gboolean identifier_explicit; - SeahorseLocation location; SeahorseUsage usage; guint flags; }; @@ -121,46 +83,6 @@ */ /** - * register_child: - * @self: The parent - * @child: The new child - * - * - * Sets @child as a child of @self - */ -static void -register_child (SeahorseObject* self, SeahorseObject* child) -{ - g_assert (SEAHORSE_IS_OBJECT (self)); - g_assert (SEAHORSE_IS_OBJECT (child)); - g_assert (self != child); - g_assert (child->pv->parent == NULL); - - child->pv->parent = self; - self->pv->children = g_list_append (self->pv->children, child); -} - -/** - * unregister_child: - * @self: The parent - * @child: child to remove - * - * - * removes @child from the children list in @self - */ -static void -unregister_child (SeahorseObject* self, SeahorseObject* child) -{ - g_assert (SEAHORSE_IS_OBJECT (self)); - g_assert (SEAHORSE_IS_OBJECT (child)); - g_assert (self != child); - g_assert (child->pv->parent == self); - - child->pv->parent = NULL; - self->pv->children = g_list_remove (self->pv->children, child); -} - -/** * set_string_storage: * @value: The value to store * @storage: The datastore to write the value to @@ -214,58 +136,6 @@ } /** - * recalculate_id: - * @self: object to calculate for - * - * recalculates tag and identifier from id - * - */ -static void -recalculate_id (SeahorseObject *self) -{ - const gchar *str; - const gchar *at; - GQuark tag; - gchar *result; - gsize len; - - /* No id, clear any tag and auto generated identifer */ - if (!self->pv->id) { - if (!self->pv->tag_explicit) { - self->pv->tag = 0; - g_object_notify (G_OBJECT (self), "tag"); - } - - if (!self->pv->identifier_explicit) { - if (set_string_storage ("", &self->pv->identifier)) - g_object_notify (G_OBJECT (self), "identifier"); - } - - /* Have hande, configure tag and auto generated identifer */ - } else { - str = g_quark_to_string (self->pv->id); - len = strlen (str); - at = strchr (str, ':'); - - if (!self->pv->tag_explicit) { - result = g_strndup (str, at ? at - str : len); - tag = g_quark_from_string (result); - g_free (result); - - if (tag != self->pv->tag) { - self->pv->tag = tag; - g_object_notify (G_OBJECT (self), "tag"); - } - } - - if (!self->pv->identifier_explicit) { - if (set_string_storage (at ? at + 1 : "", &self->pv->identifier)) - g_object_notify (G_OBJECT (self), "identifier"); - } - } -} - -/** * recalculate_label: * @self: object to recalculate label for * @@ -305,9 +175,8 @@ SeahorseObjectPrivate); self->pv->label = g_strdup (""); self->pv->markup = g_strdup (""); - self->pv->icon = g_strdup ("gtk-missing-image"); + self->pv->icon = g_themed_icon_new ("gtk-missing-image"); self->pv->identifier = g_strdup (""); - self->pv->location = SEAHORSE_LOCATION_INVALID; self->pv->usage = SEAHORSE_USAGE_NONE; } @@ -316,56 +185,19 @@ * seahorse_object_dispose: * @obj: A #SeahorseObject to dispose * - * Before this object is disposed, all it's children get new parents * */ static void seahorse_object_dispose (GObject *obj) { SeahorseObject *self = SEAHORSE_OBJECT (obj); - SeahorseObject *parent; - GList *l, *children; - - if (self->pv->context != NULL) { - seahorse_context_remove_object (self->pv->context, self); - g_assert (self->pv->context == NULL); - } - - if (self->pv->source != NULL) { - g_object_remove_weak_pointer (G_OBJECT (self->pv->source), (gpointer*)&self->pv->source); - self->pv->source = NULL; - } - - if (self->pv->preferred != NULL) { - g_object_remove_weak_pointer (G_OBJECT (self->pv->source), (gpointer*)&self->pv->preferred); - self->pv->preferred = NULL; - } - /* - * When an object is destroyed, we reparent all - * children to this objects parent. If no parent - * of this object, all children become root objects. - */ - - parent = self->pv->parent; - if (parent) - g_object_ref (parent); - - children = g_list_copy (self->pv->children); - for (l = children; l; l = g_list_next (l)) { - g_return_if_fail (SEAHORSE_IS_OBJECT (l->data)); - seahorse_object_set_parent (l->data, parent); + if (self->pv->place != NULL) { + g_object_remove_weak_pointer (G_OBJECT (self->pv->place), + (gpointer*)&self->pv->place); + self->pv->place = NULL; } - g_list_free (children); - if (parent) - g_object_unref (parent); - - g_assert (self->pv->children == NULL); - - /* Now remove this object from its parent */ - seahorse_object_set_parent (self, NULL); - G_OBJECT_CLASS (seahorse_object_parent_class)->dispose (obj); } @@ -378,13 +210,10 @@ seahorse_object_finalize (GObject *obj) { SeahorseObject *self = SEAHORSE_OBJECT (obj); - - g_assert (self->pv->source == NULL); - g_assert (self->pv->preferred == NULL); - g_assert (self->pv->parent == NULL); - g_assert (self->pv->context == NULL); - g_assert (self->pv->children == NULL); - + + g_assert (self->pv->place == NULL); + g_clear_object (&self->pv->actions); + g_free (self->pv->label); self->pv->label = NULL; @@ -394,9 +223,8 @@ g_free (self->pv->nickname); self->pv->nickname = NULL; - g_free (self->pv->icon); - self->pv->icon = NULL; - + g_clear_object (&self->pv->icon); + g_free (self->pv->identifier); self->pv->identifier = NULL; @@ -419,25 +247,13 @@ GParamSpec *pspec) { SeahorseObject *self = SEAHORSE_OBJECT (obj); - + switch (prop_id) { - case PROP_CONTEXT: - g_value_set_object (value, seahorse_object_get_context (self)); - break; - case PROP_SOURCE: - g_value_set_object (value, seahorse_object_get_source (self)); - break; - case PROP_PREFERRED: - g_value_set_object (value, seahorse_object_get_preferred (self)); + case PROP_PLACE: + g_value_set_object (value, seahorse_object_get_place (self)); break; - case PROP_PARENT: - g_value_set_object (value, seahorse_object_get_parent (self)); - break; - case PROP_ID: - g_value_set_uint (value, seahorse_object_get_id (self)); - break; - case PROP_TAG: - g_value_set_uint (value, seahorse_object_get_tag (self)); + case PROP_ACTIONS: + g_value_set_object (value, self->pv->actions); break; case PROP_LABEL: g_value_set_string (value, seahorse_object_get_label (self)); @@ -449,20 +265,23 @@ g_value_set_string (value, seahorse_object_get_markup (self)); break; case PROP_ICON: - g_value_set_string (value, seahorse_object_get_icon (self)); + g_value_set_object (value, self->pv->icon); break; case PROP_IDENTIFIER: g_value_set_string (value, seahorse_object_get_identifier (self)); break; - case PROP_LOCATION: - g_value_set_enum (value, seahorse_object_get_location (self)); - break; case PROP_USAGE: g_value_set_enum (value, seahorse_object_get_usage (self)); break; case PROP_FLAGS: g_value_set_uint (value, seahorse_object_get_flags (self)); break; + case PROP_DELETABLE: + g_value_set_boolean (value, seahorse_object_get_flags (self) & SEAHORSE_FLAG_DELETABLE ? TRUE : FALSE); + break; + case PROP_EXPORTABLE: + g_value_set_boolean (value, seahorse_object_get_flags (self) & SEAHORSE_FLAG_EXPORTABLE ? TRUE : FALSE); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); break; @@ -484,46 +303,16 @@ GParamSpec *pspec) { SeahorseObject *self = SEAHORSE_OBJECT (obj); - SeahorseLocation loc; SeahorseUsage usage; guint flags; - GQuark quark; - + switch (prop_id) { - case PROP_CONTEXT: - if (self->pv->context) - g_object_remove_weak_pointer (G_OBJECT (self->pv->context), (gpointer*)&self->pv->context); - self->pv->context = SEAHORSE_CONTEXT (g_value_get_object (value)); - if (self->pv->context != NULL) - g_object_add_weak_pointer (G_OBJECT (self->pv->context), (gpointer*)&self->pv->context); - g_object_notify (G_OBJECT (self), "context"); - break; - case PROP_SOURCE: - seahorse_object_set_source (self, SEAHORSE_SOURCE (g_value_get_object (value))); - break; - case PROP_PREFERRED: - seahorse_object_set_preferred (self, SEAHORSE_OBJECT (g_value_get_object (value))); - break; - case PROP_PARENT: - seahorse_object_set_parent (self, SEAHORSE_OBJECT (g_value_get_object (value))); - break; - case PROP_ID: - quark = g_value_get_uint (value); - if (quark != self->pv->id) { - self->pv->id = quark; - g_object_freeze_notify (obj); - g_object_notify (obj, "id"); - recalculate_id (self); - g_object_thaw_notify (obj); - } + case PROP_PLACE: + seahorse_object_set_place (self, g_value_get_object (value)); break; - case PROP_TAG: - quark = g_value_get_uint (value); - if (quark != self->pv->tag) { - self->pv->tag = quark; - self->pv->tag_explicit = TRUE; - g_object_notify (obj, "tag"); - } + case PROP_ACTIONS: + g_clear_object (&self->pv->actions); + self->pv->actions = g_value_dup_object (value); break; case PROP_LABEL: if (set_string_storage (g_value_get_string (value), &self->pv->label)) { @@ -546,8 +335,9 @@ } break; case PROP_ICON: - if (set_string_storage (g_value_get_string (value), &self->pv->icon)) - g_object_notify (obj, "icon"); + g_clear_object (&self->pv->icon); + self->pv->icon = g_value_dup_object (value); + g_object_notify (obj, "icon"); break; case PROP_IDENTIFIER: if (set_string_storage (g_value_get_string (value), &self->pv->identifier)) { @@ -555,13 +345,6 @@ g_object_notify (obj, "identifier"); } break; - case PROP_LOCATION: - loc = g_value_get_enum (value); - if (loc != self->pv->location) { - self->pv->location = loc; - g_object_notify (obj, "location"); - } - break; case PROP_USAGE: usage = g_value_get_enum (value); if (usage != self->pv->usage) { @@ -575,7 +358,7 @@ flags = g_value_get_uint (value); if (flags != self->pv->flags) { self->pv->flags = flags; - g_object_notify (obj, "flags"); + g_object_notify (obj, "object-flags"); } break; default: @@ -604,30 +387,14 @@ gobject_class->set_property = seahorse_object_set_property; gobject_class->get_property = seahorse_object_get_property; - g_object_class_install_property (gobject_class, PROP_SOURCE, - g_param_spec_object ("source", "Object Source", "Source the Object came from", - SEAHORSE_TYPE_SOURCE, G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_CONTEXT, - g_param_spec_object ("context", "Context for object", "Object that this context belongs to", - SEAHORSE_TYPE_CONTEXT, G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_PREFERRED, - g_param_spec_object ("preferred", "Preferred Object", "An object to prefer over this one", - SEAHORSE_TYPE_OBJECT, G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_PREFERRED, - g_param_spec_object ("parent", "Parent Object", "This object's parent in the tree.", - SEAHORSE_TYPE_OBJECT, G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_ID, - g_param_spec_uint ("id", "Object ID", "This object's ID.", - 0, G_MAXUINT, 0, G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_TAG, - g_param_spec_uint ("tag", "Object Type Tag", "This object's type tag.", - 0, G_MAXUINT, 0, G_PARAM_READWRITE)); - + g_object_class_install_property (gobject_class, PROP_PLACE, + g_param_spec_object ("place", "Object Place", "Place the Object came from", + SEAHORSE_TYPE_PLACE, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_ACTIONS, + g_param_spec_object ("actions", "Actions", "Actions for the object", + GTK_TYPE_ACTION_GROUP, G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_LABEL, g_param_spec_string ("label", "Object Display Label", "This object's displayable label.", "", G_PARAM_READWRITE)); @@ -637,8 +404,8 @@ "", G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_ICON, - g_param_spec_string ("icon", "Object Icon", "Stock ID for object.", - "", G_PARAM_READWRITE)); + g_param_spec_object ("icon", "Object Icon", "Stock ID for object.", + G_TYPE_ICON, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_MARKUP, g_param_spec_string ("markup", "Object Display Markup", "This object's displayable markup.", @@ -647,18 +414,22 @@ g_object_class_install_property (gobject_class, PROP_IDENTIFIER, g_param_spec_string ("identifier", "Object Identifier", "Displayable ID for the object.", "", G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_LOCATION, - g_param_spec_enum ("location", "Object Location", "Where the object is located.", - SEAHORSE_TYPE_LOCATION, SEAHORSE_LOCATION_INVALID, G_PARAM_READWRITE)); - + g_object_class_install_property (gobject_class, PROP_USAGE, g_param_spec_enum ("usage", "Object Usage", "How this object is used.", SEAHORSE_TYPE_USAGE, SEAHORSE_USAGE_NONE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_FLAGS, - g_param_spec_uint ("flags", "Object Flags", "This object's flags.", + g_param_spec_uint ("object-flags", "Object Flags", "This object's flags.", 0, G_MAXUINT, 0, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_DELETABLE, + g_param_spec_boolean ("deletable", "Deletable", "Object is deletable.", + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_EXPORTABLE, + g_param_spec_boolean ("exportable", "Exportable", "Object is exportable.", + FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } /* ----------------------------------------------------------------------------- @@ -666,42 +437,16 @@ */ /** - * seahorse_object_get_id: - * @self: Object - * - * Returns: the id of the object @self - */ -GQuark -seahorse_object_get_id (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), 0); - return self->pv->id; -} - -/** - * seahorse_object_get_tag: - * @self: Object - * - * Returns: the tag of the object @self - */ -GQuark -seahorse_object_get_tag (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), 0); - return self->pv->tag; -} - -/** * seahorse_object_get_source: * @self: Object * * Returns: the source of the object @self */ -SeahorseSource* -seahorse_object_get_source (SeahorseObject *self) +SeahorsePlace * +seahorse_object_get_place (SeahorseObject *self) { g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), NULL); - return self->pv->source; + return self->pv->place; } @@ -713,141 +458,24 @@ * sets the source for the object */ void -seahorse_object_set_source (SeahorseObject *self, SeahorseSource *value) -{ - g_return_if_fail (SEAHORSE_IS_OBJECT (self)); - - if (value == self->pv->source) - return; - - if (self->pv->source) - g_object_remove_weak_pointer (G_OBJECT (self->pv->source), (gpointer*)&self->pv->source); - - self->pv->source = value; - if (self->pv->source != NULL) - g_object_add_weak_pointer (G_OBJECT (self->pv->source), (gpointer*)&self->pv->source); - - g_object_notify (G_OBJECT (self), "source"); -} - -/** - * seahorse_object_get_context: - * @self: Object - * - * Returns: the context of the object @self - */ -SeahorseContext* -seahorse_object_get_context (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), NULL); - return self->pv->context; -} - -/** - * seahorse_object_get_preferred: - * @self: Object - * - * Returns: the preferred of the object @self - */ -SeahorseObject* -seahorse_object_get_preferred (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), NULL); - return self->pv->preferred; -} - -/** - * seahorse_object_set_preferred: - * @self: the object to set the preferred object for - * @value: the preferred object - * - * - */ -void -seahorse_object_set_preferred (SeahorseObject *self, SeahorseObject *value) +seahorse_object_set_place (SeahorseObject *self, + SeahorsePlace *value) { g_return_if_fail (SEAHORSE_IS_OBJECT (self)); - - if (self->pv->preferred == value) - return; - - if (self->pv->preferred) - g_object_remove_weak_pointer (G_OBJECT (self->pv->preferred), (gpointer*)&self->pv->preferred); - - self->pv->preferred = value; - if (self->pv->preferred != NULL) - g_object_add_weak_pointer (G_OBJECT (self->pv->preferred), (gpointer*)&self->pv->preferred); - - g_object_notify (G_OBJECT (self), "preferred"); -} - -/** - * seahorse_object_get_parent: - * @self: Object - * - * Returns: the parent of the object @self - */ -SeahorseObject* -seahorse_object_get_parent (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), NULL); - return self->pv->parent; -} -/** - * seahorse_object_set_parent: - * @self: the child - * @value: the parent - * - * register @value as the parent of @self: - */ -void -seahorse_object_set_parent (SeahorseObject *self, SeahorseObject *value) -{ - g_return_if_fail (SEAHORSE_IS_OBJECT (self)); - g_return_if_fail (self->pv->parent != self); - g_return_if_fail (value != self); - - if (value == self->pv->parent) + if (value == self->pv->place) return; - - /* Set the new parent/child relationship */ - if (self->pv->parent != NULL) - unregister_child (self->pv->parent, self); - - if (value != NULL) - register_child (value, self); - - g_assert (self->pv->parent == value); - g_object_notify (G_OBJECT (self), "parent"); -} + if (self->pv->place) + g_object_remove_weak_pointer (G_OBJECT (self->pv->place), + (gpointer*)&self->pv->place); + + self->pv->place = value; + if (self->pv->place != NULL) + g_object_add_weak_pointer (G_OBJECT (self->pv->place), + (gpointer*)&self->pv->place); -/** - * seahorse_object_get_children: - * @self: Object - * - * Returns: the children of the object @self - */ -GList* -seahorse_object_get_children (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), NULL); - return g_list_copy (self->pv->children); -} - -/** - * seahorse_object_get_nth_child: - * @self: Object - * @index: the number of the child to return - * - * Returns: the child number @index - */ -SeahorseObject* -seahorse_object_get_nth_child (SeahorseObject *self, guint index) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), NULL); - return SEAHORSE_OBJECT (g_list_nth_data (self->pv->children, index)); + g_object_notify (G_OBJECT (self), "place"); } /** @@ -890,19 +518,6 @@ } /** - * seahorse_object_get_icon: - * @self: Object - * - * Returns: the icon of the object @self - */ -const gchar* -seahorse_object_get_icon (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), NULL); - return self->pv->icon; -} - -/** * seahorse_object_get_identifier: * @self: Object * @@ -916,19 +531,6 @@ } /** - * seahorse_object_get_location: - * @self: Object - * - * Returns: the location of the object @self - */ -SeahorseLocation -seahorse_object_get_location (SeahorseObject *self) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), SEAHORSE_LOCATION_INVALID); - return self->pv->location; -} - -/** * seahorse_object_get_usage: * @self: Object * @@ -953,57 +555,3 @@ g_return_val_if_fail (SEAHORSE_IS_OBJECT (self), 0); return self->pv->flags; } - -/** - * seahorse_object_predicate_match: - * @self: the object to test - * @obj: The predicate to match - * - * matches a seahorse object and a predicate - * - * Returns: FALSE if predicate does not match the #SeahorseObject, TRUE else - */ -gboolean -seahorse_object_predicate_match (SeahorseObjectPredicate *self, SeahorseObject* obj) -{ - SeahorseObjectPrivate *pv; - - g_return_val_if_fail (SEAHORSE_IS_OBJECT (obj), FALSE); - pv = obj->pv; - - /* Check all the fields */ - if (self->tag != 0 && self->tag != pv->tag) - return FALSE; - if (self->id != 0 && self->id != pv->id) - return FALSE; - if (self->type != 0 && self->type != G_OBJECT_TYPE (obj)) - return FALSE; - if (self->location != 0 && self->location != pv->location) - return FALSE; - if (self->usage != 0 && self->usage != pv->usage) - return FALSE; - if (self->flags != 0 && (self->flags & pv->flags) == 0) - return FALSE; - if (self->nflags != 0 && (self->nflags & pv->flags) != 0) - return FALSE; - if (self->source != NULL && self->source != pv->source) - return FALSE; - - /* And any custom stuff */ - if (self->custom != NULL && !self->custom (obj, self->custom_target)) - return FALSE; - - return TRUE; -} - -/** - * seahorse_object_predicate_clear: - * @self: The predicate to clean - * - * Clears a seahorse predicate (#SeahorseObjectPredicate) - */ -void -seahorse_object_predicate_clear (SeahorseObjectPredicate *self) -{ - memset (self, 0, sizeof (*self)); -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-object.h seahorse-3.6.3/libseahorse/seahorse-object.h --- seahorse-3.2.2/libseahorse/seahorse-object.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object.h 2012-08-21 12:23:17.000000000 +0200 @@ -26,10 +26,8 @@ /* * Derived classes must set the following properties: * - * id: GQuark: Unique identifier for this object. - * tag: GQuark: The module (openpgp, pkcs11, etc...) that handles this object. * label: string: The displayable string label of this object. - * icon: string: The stock ID of an icon to show for this object. + * icon: A GIcon. * usage: SeahorseUsage: The usage of this object. * * The following will be calculated automatically if not set: @@ -43,8 +41,6 @@ * flags: guint: Flags from the SEAHORSE_FLAG_ set. */ -#include "seahorse-context.h" -#include "seahorse-source.h" #include "seahorse-types.h" #include @@ -56,6 +52,7 @@ #define SEAHORSE_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_OBJECT)) #define SEAHORSE_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_OBJECT, SeahorseObjectClass)) +typedef struct _SeahorsePlace SeahorsePlace; typedef struct _SeahorseObject SeahorseObject; typedef struct _SeahorseObjectClass SeahorseObjectClass; typedef struct _SeahorseObjectPrivate SeahorseObjectPrivate; @@ -71,33 +68,10 @@ GType seahorse_object_get_type (void); -SeahorseObject* seahorse_object_new (void); +SeahorsePlace * seahorse_object_get_place (SeahorseObject *self); -GQuark seahorse_object_get_id (SeahorseObject *self); - -GQuark seahorse_object_get_tag (SeahorseObject *self); - -SeahorseSource* seahorse_object_get_source (SeahorseObject *self); - -void seahorse_object_set_source (SeahorseObject *self, - SeahorseSource *value); - -SeahorseContext* seahorse_object_get_context (SeahorseObject *self); - -SeahorseObject* seahorse_object_get_preferred (SeahorseObject *self); - -void seahorse_object_set_preferred (SeahorseObject *self, - SeahorseObject *value); - -SeahorseObject* seahorse_object_get_parent (SeahorseObject *self); - -void seahorse_object_set_parent (SeahorseObject *self, - SeahorseObject *value); - -GList* seahorse_object_get_children (SeahorseObject *self); - -SeahorseObject* seahorse_object_get_nth_child (SeahorseObject *self, - guint index); +void seahorse_object_set_place (SeahorseObject *self, + SeahorsePlace *value); const gchar* seahorse_object_get_label (SeahorseObject *self); @@ -107,35 +81,8 @@ const gchar* seahorse_object_get_nickname (SeahorseObject *self); -const gchar* seahorse_object_get_icon (SeahorseObject *self); - - -SeahorseLocation seahorse_object_get_location (SeahorseObject *self); - SeahorseUsage seahorse_object_get_usage (SeahorseObject *self); guint seahorse_object_get_flags (SeahorseObject *self); -typedef gboolean (*SeahorseObjectPredicateFunc) (SeahorseObject *obj, void *user_data); - -typedef struct _SeahorseObjectPredicate SeahorseObjectPredicate; - -struct _SeahorseObjectPredicate { - GQuark tag; - GQuark id; - GType type; - SeahorseLocation location; - SeahorseUsage usage; - guint flags; - guint nflags; - SeahorseSource *source; - SeahorseObjectPredicateFunc custom; - gpointer custom_target; -}; - -void seahorse_object_predicate_clear (SeahorseObjectPredicate *self); - -gboolean seahorse_object_predicate_match (SeahorseObjectPredicate *self, - SeahorseObject *obj); - #endif /* __SEAHORSE_OBJECT_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-object-list.c seahorse-3.6.3/libseahorse/seahorse-object-list.c --- seahorse-3.2.2/libseahorse/seahorse-object-list.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object-list.c 2012-08-21 12:23:16.000000000 +0200 @@ -64,12 +64,13 @@ } void -seahorse_object_list_free (GList *list) +seahorse_object_list_free (gpointer list) { GList *l; - + for (l = list; l; l = g_list_next (l)) g_object_unref (l->data); + g_list_free (list); } GType diff -Nru seahorse-3.2.2/libseahorse/seahorse-object-list.h seahorse-3.6.3/libseahorse/seahorse-object-list.h --- seahorse-3.2.2/libseahorse/seahorse-object-list.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object-list.h 2012-08-21 12:23:16.000000000 +0200 @@ -37,6 +37,6 @@ GList* seahorse_object_list_copy (GList *original); -void seahorse_object_list_free (GList *list); +void seahorse_object_list_free (gpointer list); #endif /* SEAHORSEOBJECTLIST_H_ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-object-model.c seahorse-3.6.3/libseahorse/seahorse-object-model.c --- seahorse-3.2.2/libseahorse/seahorse-object-model.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object-model.c 2012-08-21 12:23:16.000000000 +0200 @@ -55,7 +55,7 @@ typedef struct { SeahorseObjectModel *self; GPtrArray *refs; /* GtkTreeRowReference pointers */ - SeahorseObject *object; /* The key we're dealing with */ + GObject *object; /* The key we're dealing with */ gpointer binding; } SeahorseObjectRow; @@ -64,7 +64,8 @@ */ static void -key_notify (SeahorseObject *object, SeahorseObjectModel *self) +key_notify (GObject *object, + SeahorseObjectModel *self) { SeahorseObjectModelPrivate *pv = SEAHORSE_OBJECT_MODEL_GET_PRIVATE (self); SeahorseObjectRow *skrow; @@ -101,19 +102,22 @@ static gboolean -remove_each (SeahorseObject *object, gchar *path, SeahorseObjectModel *self) +remove_each (GObject *object, + gchar *path, + SeahorseObjectModel *self) { return TRUE; } -static SeahorseObjectRow* -key_row_new (SeahorseObjectModel *self, SeahorseObject *object) +static SeahorseObjectRow * +key_row_new (SeahorseObjectModel *self, + GObject *object) { SeahorseObjectRow *skrow; g_assert (SEAHORSE_IS_OBJECT_MODEL (self)); - g_assert (SEAHORSE_IS_OBJECT (object)); - + g_assert (G_IS_OBJECT (object)); + skrow = g_new0 (SeahorseObjectRow, 1); skrow->refs = g_ptr_array_new (); skrow->self = self; @@ -299,8 +303,9 @@ } void -seahorse_object_model_set_row_object (SeahorseObjectModel *self, GtkTreeIter *iter, - SeahorseObject *object) +seahorse_object_model_set_row_object (SeahorseObjectModel *self, + GtkTreeIter *iter, + GObject *object) { SeahorseObjectModelPrivate *pv = SEAHORSE_OBJECT_MODEL_GET_PRIVATE (self); SeahorseObjectRow *skrow; @@ -309,7 +314,7 @@ int i; g_return_if_fail (SEAHORSE_IS_OBJECT_MODEL (self)); - g_return_if_fail (SEAHORSE_IS_OBJECT (object) || object == NULL); + g_return_if_fail (G_IS_OBJECT (object) || object == NULL); g_return_if_fail (pv->data_column >= 0); /* Add the row/key association */ @@ -365,7 +370,7 @@ key_notify (object, self); } -SeahorseObject* +GObject * seahorse_object_model_get_row_key (SeahorseObjectModel *self, GtkTreeIter *iter) { SeahorseObjectModelPrivate *pv = SEAHORSE_OBJECT_MODEL_GET_PRIVATE (self); @@ -377,12 +382,13 @@ gtk_tree_model_get (GTK_TREE_MODEL (self), iter, pv->data_column, &skrow, -1); if (!skrow) return NULL; - g_assert (SEAHORSE_IS_OBJECT (skrow->object)); + g_assert (G_IS_OBJECT (skrow->object)); return skrow->object; } void -seahorse_object_model_remove_rows_for_object (SeahorseObjectModel *self, SeahorseObject *object) +seahorse_object_model_remove_rows_for_object (SeahorseObjectModel *self, + GObject *object) { SeahorseObjectModelPrivate *pv = SEAHORSE_OBJECT_MODEL_GET_PRIVATE (self); SeahorseObjectRow *skrow; @@ -391,7 +397,7 @@ int i; g_return_if_fail (SEAHORSE_IS_OBJECT_MODEL (self)); - g_return_if_fail (SEAHORSE_IS_OBJECT (object)); + g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (pv->data_column >= 0); skrow = (SeahorseObjectRow*)g_hash_table_lookup (pv->rows, object); @@ -413,7 +419,8 @@ } GList* -seahorse_object_model_get_rows_for_object (SeahorseObjectModel *self, SeahorseObject *object) +seahorse_object_model_get_rows_for_object (SeahorseObjectModel *self, + GObject *object) { SeahorseObjectModelPrivate *pv = SEAHORSE_OBJECT_MODEL_GET_PRIVATE (self); GList *rows = NULL; @@ -423,8 +430,8 @@ int i; g_return_val_if_fail (SEAHORSE_IS_OBJECT_MODEL (self), NULL); - g_return_val_if_fail (SEAHORSE_IS_OBJECT (object), NULL); - + g_return_val_if_fail (G_IS_OBJECT (object), NULL); + skrow = (SeahorseObjectRow*)g_hash_table_lookup (pv->rows, object); if (!skrow) return NULL; diff -Nru seahorse-3.2.2/libseahorse/seahorse-object-model.h seahorse-3.6.3/libseahorse/seahorse-object-model.h --- seahorse-3.2.2/libseahorse/seahorse-object-model.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object-model.h 2012-08-21 12:23:17.000000000 +0200 @@ -52,12 +52,12 @@ }; struct _SeahorseObjectModelClass { - GtkTreeStoreClass parent_class; - - /* signals --------------------------------------------------------- */ - - /* A key was added to this view */ - void (*update_row) (SeahorseObjectModel *self, SeahorseObject *object, GtkTreeIter *iter); + GtkTreeStoreClass parent_class; + + /* A key was added to this view */ + void (*update_row) (SeahorseObjectModel *self, + GObject *object, + GtkTreeIter *iter); }; GType seahorse_object_model_get_type (void); @@ -71,16 +71,16 @@ void seahorse_object_model_set_row_object (SeahorseObjectModel *self, GtkTreeIter *iter, - SeahorseObject *object); + GObject *object); -SeahorseObject* seahorse_object_model_get_row_key (SeahorseObjectModel *self, +GObject* seahorse_object_model_get_row_key (SeahorseObjectModel *self, GtkTreeIter *iter); -GList* seahorse_object_model_get_rows_for_object (SeahorseObjectModel *self, - SeahorseObject *object); +GList* seahorse_object_model_get_rows_for_object (SeahorseObjectModel *self, + GObject *object); void seahorse_object_model_remove_rows_for_object (SeahorseObjectModel *self, - SeahorseObject *object); + GObject *object); void seahorse_object_model_free_rows (GList *rows); diff -Nru seahorse-3.2.2/libseahorse/seahorse-object-widget.c seahorse-3.6.3/libseahorse/seahorse-object-widget.c --- seahorse-3.2.2/libseahorse/seahorse-object-widget.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object-widget.c 2012-08-21 12:23:17.000000000 +0200 @@ -23,8 +23,6 @@ #include "seahorse-object-widget.h" -#define PROPERTIES "object-properties" - enum { PROP_0, PROP_OBJECT @@ -90,7 +88,7 @@ g_object_class_install_property (gobject_class, PROP_OBJECT, g_param_spec_object ("object", "Seahorse Object", "Seahorse Object of this widget", - SEAHORSE_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); } static void @@ -99,23 +97,21 @@ SeahorseWidget *swidget; SeahorseObjectWidget *self; GHashTable *widgets = NULL; - GQuark id; GtkWidget *widget; self = SEAHORSE_OBJECT_WIDGET (gobject); swidget = SEAHORSE_WIDGET (self); - - g_return_if_fail (SEAHORSE_IS_OBJECT (self->object)); - id = seahorse_object_get_id (self->object); - + + g_return_if_fail (G_IS_OBJECT (self->object)); + /* get widgets hash from types */ - widgets = g_hash_table_lookup (types, GUINT_TO_POINTER (id)); + widgets = g_hash_table_lookup (types, self->object); /* if have a widgets hash, remove the widget */ if (widgets != NULL) { g_hash_table_remove (widgets, swidget->name); /* if there are no more widgets, remove the hash */ if (g_hash_table_size (widgets) == 0) { - g_hash_table_remove (types, GUINT_TO_POINTER (id)); + g_hash_table_remove (types, self->object); /* if there are no more objects, destroy types */ if (g_hash_table_size (types) == 0) { g_hash_table_destroy (types); @@ -188,17 +184,16 @@ * Makes use of hash sets to control which widgets can be created and how * the focus is grabbed. */ -static SeahorseWidget* -seahorse_object_widget_create (gchar *name, GtkWindow *parent, SeahorseObject *object) +static SeahorseWidget * +seahorse_object_widget_create (gchar *name, + GtkWindow *parent, + GObject *object) { SeahorseWidget *swidget = NULL; // widget to lookup or create GHashTable *widgets = NULL; // hash of widgets from types - GQuark id; // hash key GtkWindowGroup *group = NULL; // window group from groups GtkWidget *widget; // main window widget of swidget - - id = seahorse_object_get_id (object); - + /* if don't have a types hash, create one */ if (types == NULL) types = g_hash_table_new_full (g_direct_hash, g_direct_equal, @@ -206,12 +201,12 @@ /* otherwise lookup the widgets hash for the object */ else - widgets = g_hash_table_lookup (types, GUINT_TO_POINTER (id)); + widgets = g_hash_table_lookup (types, object); /* if don't have a widgets hash for a object, create one and insert it */ if (widgets == NULL) { widgets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - g_hash_table_insert (types, GUINT_TO_POINTER (id), widgets); + g_hash_table_insert (types, object, widgets); /* otherwise lookup the widget */ } else { @@ -236,12 +231,12 @@ /* otherwise lookup the group for that object */ else - group = g_hash_table_lookup (groups, GUINT_TO_POINTER (id)); + group = g_hash_table_lookup (groups, object); /* if don't have a group for the object, create one and insert it */ if (group == NULL) { group = gtk_window_group_new (); - g_hash_table_insert (groups, GUINT_TO_POINTER (id), group); + g_hash_table_insert (groups, object, group); } /* get window, add it to the group, return it */ @@ -254,8 +249,10 @@ return swidget; } -SeahorseWidget* -seahorse_object_widget_new (gchar *name, GtkWindow *parent, SeahorseObject *object) +SeahorseWidget * +seahorse_object_widget_new (gchar *name, + GtkWindow *parent, + GObject *object) { return seahorse_object_widget_create (name, parent, object); } diff -Nru seahorse-3.2.2/libseahorse/seahorse-object-widget.h seahorse-3.6.3/libseahorse/seahorse-object-widget.h --- seahorse-3.2.2/libseahorse/seahorse-object-widget.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-object-widget.h 2012-08-21 12:23:17.000000000 +0200 @@ -36,20 +36,20 @@ typedef struct _SeahorseObjectWidget SeahorseObjectWidget; typedef struct _SeahorseObjectWidgetClass SeahorseObjectWidgetClass; - + struct _SeahorseObjectWidget { - SeahorseWidget parent; - SeahorseObject *object; + SeahorseWidget parent; + GObject *object; }; struct _SeahorseObjectWidgetClass { SeahorseWidgetClass parent_class; }; -GType seahorse_object_widget_get_type (void); +GType seahorse_object_widget_get_type (void); -SeahorseWidget* seahorse_object_widget_new (gchar *name, - GtkWindow *parent, - SeahorseObject *object); +SeahorseWidget * seahorse_object_widget_new (gchar *name, + GtkWindow *parent, + GObject *object); #endif /* __SEAHORSE_OBJECT_WIDGET_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-passphrase.c seahorse-3.6.3/libseahorse/seahorse-passphrase.c --- seahorse-3.2.2/libseahorse/seahorse-passphrase.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-passphrase.c 2012-08-21 12:23:17.000000000 +0200 @@ -46,8 +46,9 @@ #include #include +#include + #include "seahorse-passphrase.h" -#include "seahorse-secure-buffer.h" #include "seahorse-util.h" #include "seahorse-widget.h" @@ -162,136 +163,134 @@ } GtkDialog* -seahorse_passphrase_prompt_show (const gchar *title, const gchar *description, - const gchar *prompt, const gchar *check, +seahorse_passphrase_prompt_show (const gchar *title, + const gchar *description, + const gchar *prompt, + const gchar *check, gboolean confirm) { - GtkEntryBuffer *buffer; - GtkEntry *entry; - GtkDialog *dialog; - GtkWidget *w; - GtkWidget *box; - GtkTable *table; - GtkWidget *wvbox; - GtkWidget *chbox; - gchar *msg; - - if (!title) - title = _("Passphrase"); - - if (!prompt) - prompt = _("Password:"); - - w = gtk_dialog_new_with_buttons (title, NULL, 0, NULL); - gtk_window_set_icon_name (GTK_WINDOW (w), GTK_STOCK_DIALOG_AUTHENTICATION); - - dialog = GTK_DIALOG (w); - - g_signal_connect (G_OBJECT (dialog), "map-event", G_CALLBACK (grab_keyboard), NULL); - g_signal_connect (G_OBJECT (dialog), "unmap-event", G_CALLBACK (ungrab_keyboard), NULL); - g_signal_connect (G_OBJECT (dialog), "window-state-event", G_CALLBACK (window_state_changed), NULL); - - wvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_LARGE * 2); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (dialog)), wvbox); - gtk_container_set_border_width (GTK_CONTAINER (wvbox), HIG_LARGE); - - chbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, HIG_LARGE); - gtk_box_pack_start (GTK_BOX (wvbox), chbox, FALSE, FALSE, 0); - - /* The image */ - w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); - gtk_box_pack_start (GTK_BOX (chbox), w, FALSE, FALSE, 0); - - box = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_SMALL); - gtk_box_pack_start (GTK_BOX (chbox), box, TRUE, TRUE, 0); - - /* The description text */ - if (description) { - msg = utf8_validate (description); - w = gtk_label_new (msg); - g_free (msg); - - gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5); - gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_box_pack_start (GTK_BOX (box), w, TRUE, FALSE, 0); - } - - /* Two entries (usually on is hidden) in a vbox */ - table = GTK_TABLE (gtk_table_new (3, 2, FALSE)); - gtk_table_set_row_spacings (table, HIG_SMALL); - gtk_table_set_col_spacings (table, HIG_LARGE); - gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (table), FALSE, FALSE, 0); - - /* The first entry if we have one */ - if (confirm) { - msg = utf8_validate (prompt); - w = gtk_label_new (msg); - g_free (msg); - gtk_table_attach (table, w, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - - buffer = seahorse_secure_buffer_new (); - entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer)); - g_object_unref (buffer); - gtk_entry_set_visibility (entry, FALSE); - gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1); - g_object_set_data (G_OBJECT (dialog), "confirm-entry", entry); - g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (confirm_callback), dialog); - g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog); - gtk_table_attach_defaults (table, GTK_WIDGET (entry), 1, 2, 0, 1); - gtk_widget_grab_focus (GTK_WIDGET (entry)); - } + GtkEntryBuffer *buffer; + GtkEntry *entry; + GtkDialog *dialog; + GtkWidget *widget; + GtkWidget *box; + GtkGrid *grid; + GtkWidget *wvbox; + GtkWidget *chbox; + gchar *msg; + + if (!prompt) + prompt = _("Password:"); + + widget = gtk_dialog_new_with_buttons (title, NULL, GTK_DIALOG_MODAL, NULL, NULL); + gtk_window_set_icon_name (GTK_WINDOW (widget), GTK_STOCK_DIALOG_AUTHENTICATION); + dialog = GTK_DIALOG (widget); + + g_signal_connect (G_OBJECT (dialog), "map-event", G_CALLBACK (grab_keyboard), NULL); + g_signal_connect (G_OBJECT (dialog), "unmap-event", G_CALLBACK (ungrab_keyboard), NULL); + g_signal_connect (G_OBJECT (dialog), "window-state-event", G_CALLBACK (window_state_changed), NULL); + + wvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_LARGE * 2); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (dialog)), wvbox); + gtk_container_set_border_width (GTK_CONTAINER (wvbox), HIG_LARGE); + + chbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, HIG_LARGE); + gtk_box_pack_start (GTK_BOX (wvbox), chbox, FALSE, FALSE, 0); + + /* The image */ + widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0); + gtk_box_pack_start (GTK_BOX (chbox), widget, FALSE, FALSE, 0); + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_SMALL); + gtk_box_pack_start (GTK_BOX (chbox), box, TRUE, TRUE, 0); + + /* The description text */ + if (description) { + msg = utf8_validate (description); + widget = gtk_label_new (msg); + g_free (msg); + + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); + gtk_box_pack_start (GTK_BOX (box), widget, TRUE, FALSE, 0); + } + + grid = GTK_GRID (gtk_grid_new ()); + gtk_grid_set_row_spacing (grid, HIG_SMALL); + gtk_grid_set_column_spacing (grid, HIG_LARGE); + gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (grid), FALSE, FALSE, 0); + + /* The first entry if we have one */ + if (confirm) { + msg = utf8_validate (prompt); + widget = gtk_label_new (msg); + g_free (msg); + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); + gtk_grid_attach (grid, widget, 0, 0, 1, 1); + + buffer = gcr_secure_entry_buffer_new (); + entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer)); + g_object_unref (buffer); + gtk_entry_set_visibility (entry, FALSE); + gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1); + g_object_set_data (G_OBJECT (dialog), "confirm-entry", entry); + g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (confirm_callback), dialog); + g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog); + gtk_grid_attach (grid, GTK_WIDGET (entry), 1, 0, 1, 1); + gtk_widget_grab_focus (GTK_WIDGET (entry)); + } + + /* The second and main entry */ + msg = utf8_validate (confirm ? _("Confirm:") : prompt); + widget = gtk_label_new (msg); + g_free (msg); + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); + gtk_grid_attach (grid, widget, 0, 1, 1, 1); + + buffer = gcr_secure_entry_buffer_new (); + entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer)); + g_object_unref (buffer); + gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1); + gtk_entry_set_visibility (entry, FALSE); + g_object_set_data (G_OBJECT (dialog), "secure-entry", entry); + g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (enter_callback), dialog); + gtk_grid_attach (grid, GTK_WIDGET (entry), 1, 1, 1, 1); + if (!confirm) + gtk_widget_grab_focus (GTK_WIDGET (entry)); + else + g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog); - /* The second and main entry */ - msg = utf8_validate (confirm ? _("Confirm:") : prompt); - w = gtk_label_new (msg); - g_free (msg); - gtk_table_attach (table, w, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); - - buffer = seahorse_secure_buffer_new (); - entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer)); - g_object_unref (buffer); - gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1); - gtk_entry_set_visibility (entry, FALSE); - g_object_set_data (G_OBJECT (dialog), "secure-entry", entry); - g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (enter_callback), dialog); - gtk_table_attach_defaults (table, GTK_WIDGET (entry), 1, 2, 1, 2); - if (!confirm) - gtk_widget_grab_focus (GTK_WIDGET (entry)); - else - g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog); - - /* The checkbox */ - if (check) { - w = gtk_check_button_new_with_mnemonic (check); - gtk_table_attach_defaults (table, w, 1, 2, 2, 3); - g_object_set_data (G_OBJECT (dialog), "check-option", w); - } + /* The checkbox */ + if (check) { + widget = gtk_check_button_new_with_mnemonic (check); + gtk_grid_attach (grid, widget, 1, 2, 1, 1); + g_object_set_data (G_OBJECT (dialog), "check-option", widget); + } + + gtk_widget_show_all (GTK_WIDGET (grid)); + + widget = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + gtk_dialog_add_action_widget (dialog, widget, GTK_RESPONSE_REJECT); + gtk_widget_set_can_default (widget, TRUE); + + widget = gtk_button_new_from_stock (GTK_STOCK_OK); + gtk_dialog_add_action_widget (dialog, widget, GTK_RESPONSE_ACCEPT); + gtk_widget_set_can_default (widget, TRUE); + gtk_widget_grab_default (widget); + + g_signal_connect (dialog, "key_press_event", G_CALLBACK (key_press), NULL); + + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE); + gtk_widget_show_all (GTK_WIDGET (dialog)); + gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (dialog)), GDK_CURRENT_TIME); - gtk_widget_show_all (GTK_WIDGET (table)); - - w = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - gtk_dialog_add_action_widget (dialog, w, GTK_RESPONSE_REJECT); - gtk_widget_set_can_default (w, TRUE); - - w = gtk_button_new_from_stock (GTK_STOCK_OK); - gtk_dialog_add_action_widget (dialog, w, GTK_RESPONSE_ACCEPT); - gtk_widget_set_can_default (w, TRUE); - gtk_widget_grab_default (w); - - g_signal_connect (dialog, "key_press_event", G_CALLBACK (key_press), NULL); - - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_NORMAL); - gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE); - gtk_widget_show_all (GTK_WIDGET (dialog)); - gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (dialog)), GDK_CURRENT_TIME); + if (confirm) + entry_changed (NULL, dialog); - if (confirm) - entry_changed (NULL, dialog); - - return dialog; + return dialog; } const gchar* diff -Nru seahorse-3.2.2/libseahorse/seahorse-passphrase.h seahorse-3.6.3/libseahorse/seahorse-passphrase.h --- seahorse-3.2.2/libseahorse/seahorse-passphrase.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-passphrase.h 2012-08-21 12:23:17.000000000 +0200 @@ -32,7 +32,7 @@ const gchar *prompt, const gchar *check, gboolean confirm); - + const gchar* seahorse_passphrase_prompt_get (GtkDialog *dialog); gboolean seahorse_passphrase_prompt_checked (GtkDialog *dialog); diff -Nru seahorse-3.2.2/libseahorse/seahorse-place.c seahorse-3.6.3/libseahorse/seahorse-place.c --- seahorse-3.2.2/libseahorse/seahorse-place.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-place.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,104 @@ +/* + * Seahorse + * + * Copyright (C) 2004,2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-marshal.h" +#include "seahorse-object.h" +#include "seahorse-registry.h" +#include "seahorse-place.h" +#include "seahorse-util.h" + +#include + +/** + * SECTION:seahorse-place + * @short_description: This class stores and handles key places + * @include:seahorse-place.h + * + **/ + +typedef SeahorsePlaceIface SeahorsePlaceInterface; + +G_DEFINE_INTERFACE (SeahorsePlace, seahorse_place, GCR_TYPE_COLLECTION); + +/* --------------------------------------------------------------------------------- + * INTERFACE + */ + +/** +* gobject_class: The object class to init +* +**/ +static void +seahorse_place_default_init (SeahorsePlaceIface *iface) +{ + static gboolean initialized = FALSE; + if (!initialized) { + g_object_interface_install_property (iface, + g_param_spec_string ("label", "Label", "Label for the place", + "", G_PARAM_READABLE)); + + g_object_interface_install_property (iface, + g_param_spec_string ("description", "Description", "Description for the place", + "", G_PARAM_READABLE)); + + g_object_interface_install_property (iface, + g_param_spec_string ("uri", "URI", "URI for the place", + "", G_PARAM_READABLE)); + + g_object_interface_install_property (iface, + g_param_spec_object ("icon", "Icon", "Icon for this place", + G_TYPE_ICON, G_PARAM_READABLE)); + + g_object_interface_install_property (iface, + g_param_spec_object ("actions", "Actions", "Actions for place", + GTK_TYPE_ACTION_GROUP, G_PARAM_READABLE)); + + initialized = TRUE; + } +} + +void +seahorse_place_load_async (SeahorsePlace *place, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_return_if_fail (SEAHORSE_IS_PLACE (place)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + g_return_if_fail (SEAHORSE_PLACE_GET_INTERFACE (place)->load_async); + SEAHORSE_PLACE_GET_INTERFACE (place)->load_async (place, cancellable, + callback, user_data); +} + +gboolean +seahorse_place_load_finish (SeahorsePlace *place, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (SEAHORSE_IS_PLACE (place), FALSE); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (SEAHORSE_PLACE_GET_INTERFACE (place)->load_finish, FALSE); + return SEAHORSE_PLACE_GET_INTERFACE (place)->load_finish (place, result, error); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-place.h seahorse-3.6.3/libseahorse/seahorse-place.h --- seahorse-3.2.2/libseahorse/seahorse-place.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-place.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,75 @@ +/* + * Seahorse + * + * Copyright (C) 2004,2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/** + * - A generic interface for accessing places. + * - Eventually more functionality will be merged from seahorse-op.* into + * this class and derived classes. + */ + + +#ifndef __SEAHORSE_PLACE_H__ +#define __SEAHORSE_PLACE_H__ + +#include "seahorse-object.h" +#include "seahorse-types.h" + +#include + +#include + +#define SEAHORSE_TYPE_PLACE (seahorse_place_get_type ()) +#define SEAHORSE_PLACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PLACE, SeahorsePlace)) +#define SEAHORSE_IS_PLACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PLACE)) +#define SEAHORSE_PLACE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_PLACE, SeahorsePlaceIface)) + +typedef struct _SeahorsePlaceIface SeahorsePlaceIface; + +struct _SeahorsePlaceIface { + GTypeInterface parent; + + /* virtual methods ------------------------------------------------- */ + + void (* load_async) (SeahorsePlace *place, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + gboolean (* load_finish) (SeahorsePlace *place, + GAsyncResult *result, + GError **error); +}; + +GType seahorse_place_get_type (void) G_GNUC_CONST; + +GtkActionGroup * seahorse_place_get_actions (SeahorsePlace *self); + +void seahorse_place_load_async (SeahorsePlace *place, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_place_load_finish (SeahorsePlace *place, + GAsyncResult *result, + GError **error); + +#endif /* __SEAHORSE_PLACE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-predicate.c seahorse-3.6.3/libseahorse/seahorse-predicate.c --- seahorse-3.2.2/libseahorse/seahorse-predicate.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-predicate.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,74 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-object.h" +#include "seahorse-place.h" +#include "seahorse-predicate.h" + +#include "string.h" + +#include + +/** + * seahorse_predicate_match: + * @self: the object to test + * @obj: The predicate to match + * + * matches a seahorse object and a predicate + * + * Returns: FALSE if predicate does not match the #SeahorseObject, TRUE else + */ +gboolean +seahorse_predicate_match (SeahorsePredicate *pred, + GObject* obj) +{ + + g_return_val_if_fail (G_IS_OBJECT (obj), FALSE); + + /* Check all the fields */ + if (pred->type != 0 && !G_TYPE_CHECK_INSTANCE_TYPE (obj, pred->type)) + return FALSE; + + if (pred->usage != 0) { + SeahorseUsage usage = 0; + g_object_get (obj, "usage", &usage, NULL); + if (pred->usage != usage) + return FALSE; + } + + if (pred->flags != 0 || pred->nflags != 0) { + SeahorseFlags flags = 0; + g_object_get (obj, "object-flags", &flags, NULL); + if (pred->flags != 0 && (pred->flags & flags) == 0) + return FALSE; + if (pred->nflags != 0 && (pred->nflags & flags) != 0) + return FALSE; + } + + /* And any custom stuff */ + if (pred->custom != NULL && !pred->custom (obj, pred->custom_target)) + return FALSE; + + return TRUE; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-predicate.h seahorse-3.6.3/libseahorse/seahorse-predicate.h --- seahorse-3.2.2/libseahorse/seahorse-predicate.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-predicate.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,48 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PREDICATE_H__ +#define __SEAHORSE_PREDICATE_H__ + +#include "seahorse-object.h" +#include "seahorse-types.h" + +#include + +typedef gboolean (*SeahorsePredicateFunc) (GObject *obj, + void *user_data); + +typedef struct _SeahorsePredicate SeahorsePredicate; + +struct _SeahorsePredicate { + GType type; + SeahorseUsage usage; + SeahorseFlags flags; + SeahorseFlags nflags; + SeahorsePredicateFunc custom; + gpointer custom_target; +}; + +gboolean seahorse_predicate_match (SeahorsePredicate *pred, + GObject *obj); + +#endif /* __SEAHORSE_PREDICATE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-preferences.c seahorse-3.6.3/libseahorse/seahorse-preferences.c --- seahorse-3.2.2/libseahorse/seahorse-preferences.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-preferences.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,44 @@ +/* + * Seahorse + * + * Copyright (C) 2003 Jacob Perkins + * Copyright (C) 2005 Jacob Perkins + * + * 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 "seahorse-prefs.h" +#include "seahorse-preferences.h" +#include "seahorse-widget.h" + +/** + * seahorse_preferences_show: + * @tabid: The id of the tab to show + * + * Creates a new or shows the current preferences dialog. + **/ +void +seahorse_preferences_show (GtkWindow *parent, const gchar *tabid) +{ + SeahorseWidget *swidget = seahorse_prefs_new (parent); + GtkWidget *tab; + + if (tabid) { + tab = seahorse_widget_get_widget (swidget, tabid); + g_return_if_fail (tab); + seahorse_prefs_select_tab (swidget, tab); + } +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-preferences.h seahorse-3.6.3/libseahorse/seahorse-preferences.h --- seahorse-3.2.2/libseahorse/seahorse-preferences.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-preferences.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,36 @@ +/* + * Seahorse + * + * Copyright (C) 2003 Jacob Perkins + * + * 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 __SEAHORSE_PREFERENCES_H__ +#define __SEAHORSE_PREFERENCES_H__ + +#include + +#define LISTING_SCHEMAS SEAHORSE_SCHEMAS "/listing" +#define SHOW_VALIDITY_KEY LISTING_SCHEMAS "/show_validity" +#define SHOW_EXPIRES_KEY LISTING_SCHEMAS "/show_expires" +#define SHOW_TRUST_KEY LISTING_SCHEMAS "/show_trust" +#define SHOW_LENGTH_KEY LISTING_SCHEMAS "/show_length" +#define SHOW_TYPE_KEY LISTING_SCHEMAS "/show_type" + +void seahorse_preferences_show (GtkWindow *parent, const gchar *tabid); + +#endif /* __SEAHORSE_PREFERENCES_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-prefs.c seahorse-3.6.3/libseahorse/seahorse-prefs.c --- seahorse-3.2.2/libseahorse/seahorse-prefs.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-prefs.c 2012-08-21 12:23:17.000000000 +0200 @@ -22,8 +22,8 @@ #include -#include "seahorse-combo-keys.h" -#include "seahorse-gtkstock.h" +#include "seahorse-application.h" +#include "seahorse-icons.h" #include "seahorse-keyserver-control.h" #include "seahorse-prefs.h" #include "seahorse-registry.h" @@ -62,16 +62,14 @@ GtkTreeModel *model) { GtkTreeIter iter; - gboolean ret; - + if (!seahorse_servers_is_valid_uri (text)) { seahorse_util_show_error (NULL, _("Not a valid Key Server address."), _("For help contact your system adminstrator or the administrator of the key server." )); return; } - - ret = gtk_tree_model_get_iter_from_string (model, &iter, path); - g_assert (ret); + + g_warn_if_fail (gtk_tree_model_get_iter_from_string (model, &iter, path)); gtk_tree_store_set (GTK_TREE_STORE (model), &iter, KEYSERVER_COLUMN, text, -1); } @@ -122,7 +120,7 @@ } g_ptr_array_add (values, NULL); - g_settings_set_strv (seahorse_context_pgp_settings (NULL), "keyservers", + g_settings_set_strv (seahorse_application_pgp_settings (NULL), "keyservers", (const gchar* const*)values->pdata); g_ptr_array_free (values, TRUE); } @@ -397,7 +395,7 @@ g_signal_connect (selection, "changed", G_CALLBACK (keyserver_sel_changed), swidget); gtk_builder_connect_signals (swidget->gtkbuilder, swidget); - g_signal_connect_object (seahorse_context_pgp_settings (NULL), "changed::keyserver", + g_signal_connect_object (seahorse_application_pgp_settings (NULL), "changed::keyserver", G_CALLBACK (on_settings_keyserver_changed), swidget, 0); widget = seahorse_widget_get_widget (swidget, "keyserver-publish"); @@ -412,12 +410,12 @@ widget = seahorse_widget_get_widget (swidget, "auto_retrieve"); g_return_if_fail (widget != NULL); - g_settings_bind (seahorse_context_settings (NULL), "server-auto-retrieve", + g_settings_bind (seahorse_application_settings (NULL), "server-auto-retrieve", widget, "active", G_SETTINGS_BIND_DEFAULT); widget = seahorse_widget_get_widget (swidget, "auto_sync"); g_return_if_fail (widget != NULL); - g_settings_bind (seahorse_context_settings (NULL), "server-auto-publish", + g_settings_bind (seahorse_application_settings (NULL), "server-auto-publish", widget, "active", G_SETTINGS_BIND_DEFAULT); } @@ -438,7 +436,7 @@ { SeahorseWidget *swidget; -#if !(WITH_KEYSERVER && WITH_SHARING) +#ifndef WITH_KEYSERVER GtkWidget *widget = NULL; #endif diff -Nru seahorse-3.2.2/libseahorse/seahorse-prefs.h seahorse-3.6.3/libseahorse/seahorse-prefs.h --- seahorse-3.2.2/libseahorse/seahorse-prefs.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-prefs.h 2012-08-21 12:23:17.000000000 +0200 @@ -26,7 +26,6 @@ #ifndef __SEAHORSE_PREFS_H__ #define __SEAHORSE_PREFS_H__ -#include "seahorse-context.h" #include "seahorse-widget.h" SeahorseWidget * seahorse_prefs_new (GtkWindow *parent); diff -Nru seahorse-3.2.2/libseahorse/seahorse-progress.c seahorse-3.6.3/libseahorse/seahorse-progress.c --- seahorse-3.2.2/libseahorse/seahorse-progress.c 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-progress.c 2012-08-21 12:23:17.000000000 +0200 @@ -47,6 +47,7 @@ SeahorseWidget *swidget; gchar *title; + gchar *notice; gboolean showing; GQueue *parts; @@ -110,10 +111,8 @@ on_cancellable_cancelled (GCancellable *cancellable, gpointer user_data) { - TrackedTask *task = user_data; - g_assert (tracked_tasks); - g_assert (task->cancellable == cancellable); + g_assert (((TrackedTask *)user_data)->cancellable == cancellable); if (!g_hash_table_remove (tracked_tasks, cancellable)) g_assert_not_reached (); } @@ -135,6 +134,7 @@ g_queue_foreach (task->parts, (GFunc)tracked_part_free, NULL); g_queue_free (task->parts); g_free (task->title); + g_free (task->notice); if (task->swidget) g_object_unref (task->swidget); g_free (task); @@ -549,6 +549,13 @@ g_free (text); } + /* Setup the notice */ + if (task->notice) { + widget = seahorse_widget_get_widget (swidget, "progress-notice"); + gtk_label_set_label (GTK_LABEL (widget), task->notice); + gtk_widget_show (widget); + } + /* Setup the cancel button */ widget = seahorse_widget_get_widget (swidget, "progress-cancel"); g_signal_connect (widget, "clicked", G_CALLBACK (on_cancel_button_clicked), @@ -568,6 +575,15 @@ const gchar *title, gboolean delayed) { + seahorse_progress_show_with_notice (cancellable, title, NULL, delayed); +} + +void +seahorse_progress_show_with_notice (GCancellable *cancellable, + const gchar *title, + const gchar *notice, + gboolean delayed) +{ TrackedTask *task; g_return_if_fail (title != NULL && title[0] != '\0'); @@ -590,6 +606,7 @@ g_free (task->title); task->title = g_strdup (title); + task->notice = g_strdup (notice); task->showing = TRUE; if (delayed) diff -Nru seahorse-3.2.2/libseahorse/seahorse-progress.h seahorse-3.6.3/libseahorse/seahorse-progress.h --- seahorse-3.2.2/libseahorse/seahorse-progress.h 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-progress.h 2012-08-21 12:23:17.000000000 +0200 @@ -54,6 +54,11 @@ const gchar *title, gboolean delayed); +void seahorse_progress_show_with_notice (GCancellable *cancellable, + const gchar *title, + const gchar *notice, + gboolean delayed); + void seahorse_progress_attach (GCancellable *cancellable, SeahorseWidget *swidget); diff -Nru seahorse-3.2.2/libseahorse/seahorse-progress.xml seahorse-3.6.3/libseahorse/seahorse-progress.xml --- seahorse-3.2.2/libseahorse/seahorse-progress.xml 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-progress.xml 2012-08-21 12:23:17.000000000 +0200 @@ -60,6 +60,7 @@ False gtk-dialog-authentication 6 + 0.0 False @@ -89,7 +90,7 @@ True False 0 - Progress Status + False @@ -98,7 +99,16 @@ - + + False + False + False + + + False + True + 2 + @@ -118,7 +128,7 @@ True False - 0.10000000149 + 0.1 False diff -Nru seahorse-3.2.2/libseahorse/seahorse-registry.c seahorse-3.6.3/libseahorse/seahorse-registry.c --- seahorse-3.2.2/libseahorse/seahorse-registry.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-registry.c 2012-08-21 12:23:17.000000000 +0200 @@ -27,7 +27,6 @@ struct _SeahorseRegistryPrivate { GHashTable *types; GHashTable *objects; - GHashTable *functions; }; #define SEAHORSE_REGISTRY_GET_PRIVATE(o) \ @@ -159,8 +158,6 @@ NULL, (GDestroyNotify)g_hash_table_destroy); pv->objects = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)g_hash_table_destroy); - pv->functions = g_hash_table_new_full (g_direct_hash, g_direct_equal, - NULL, (GDestroyNotify)g_hash_table_destroy); } static void @@ -168,6 +165,7 @@ { SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (obj); g_hash_table_remove_all (pv->types); + g_hash_table_remove_all (pv->objects); G_OBJECT_CLASS (seahorse_registry_parent_class)->dispose (obj); } @@ -176,6 +174,7 @@ { SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (obj); g_hash_table_destroy (pv->types); + g_hash_table_destroy (pv->objects); G_OBJECT_CLASS (seahorse_registry_parent_class)->finalize (obj); } @@ -261,33 +260,6 @@ va_end (cats); } -void -seahorse_registry_register_function (SeahorseRegistry *registry, gpointer func, - const gchar *category, ...) -{ - SeahorseRegistryPrivate *pv; - va_list cats; - - if (!registry) - registry = seahorse_registry_get (); - - g_return_if_fail (SEAHORSE_IS_REGISTRY (registry)); - g_return_if_fail (func); - g_return_if_fail (category); - - pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry); - register_value_for_category (pv->functions, g_quark_from_string (category), func, NULL); - - va_start (cats, category); - for (;;) { - category = va_arg (cats, const gchar*); - if (!category) - break; - register_value_for_category (pv->functions, g_quark_from_string (category), func, NULL); - } - va_end (cats); -} - GType seahorse_registry_object_type (SeahorseRegistry *registry, const gchar *category, ...) { @@ -387,23 +359,3 @@ g_list_free (types); return objects; } - -gpointer -seahorse_registry_lookup_function (SeahorseRegistry *registry, const gchar *category, ...) -{ - SeahorseRegistryPrivate *pv; - va_list cats; - gpointer func; - - if (!registry) - registry = seahorse_registry_get (); - - g_return_val_if_fail (SEAHORSE_IS_REGISTRY (registry), 0); - pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry); - - va_start (cats, category); - func = lookup_category_value (pv->functions, category, cats); - va_end (cats); - - return func; -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-registry.h seahorse-3.6.3/libseahorse/seahorse-registry.h --- seahorse-3.2.2/libseahorse/seahorse-registry.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-registry.h 2012-08-21 12:23:17.000000000 +0200 @@ -57,10 +57,6 @@ GObject *object, const gchar *category, ...) G_GNUC_NULL_TERMINATED; -void seahorse_registry_register_function (SeahorseRegistry *registry, - gpointer func, const gchar *category, - ...) G_GNUC_NULL_TERMINATED; - GType seahorse_registry_object_type (SeahorseRegistry *registry, const gchar *category, ...) G_GNUC_NULL_TERMINATED; @@ -77,10 +73,6 @@ const gchar *category, ...) G_GNUC_NULL_TERMINATED; -gpointer seahorse_registry_lookup_function (SeahorseRegistry *registry, - const gchar *category, - ...) G_GNUC_NULL_TERMINATED; - G_END_DECLS #endif /*SEAHORSEREGISTRY_H_*/ diff -Nru seahorse-3.2.2/libseahorse/seahorse-secure-buffer.c seahorse-3.6.3/libseahorse/seahorse-secure-buffer.c --- seahorse-3.2.2/libseahorse/seahorse-secure-buffer.c 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-secure-buffer.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,196 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2010 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-secure-buffer.h" -#include - -#include - -/* Initial size of buffer, in bytes */ -#define MIN_SIZE 16 - -struct _SeahorseSecureBufferPrivate -{ - gchar *text; - gsize text_size; - gsize text_bytes; - guint text_chars; -}; - -G_DEFINE_TYPE (SeahorseSecureBuffer, seahorse_secure_buffer, GTK_TYPE_ENTRY_BUFFER); - -/* -------------------------------------------------------------------------------- - * SECURE IMPLEMENTATIONS OF TEXT BUFFER - */ - -static const gchar* -seahorse_secure_buffer_real_get_text (GtkEntryBuffer *buffer, gsize *n_bytes) -{ - SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer); - if (n_bytes) - *n_bytes = self->priv->text_bytes; - if (!self->priv->text) - return ""; - return self->priv->text; -} - -static guint -seahorse_secure_buffer_real_get_length (GtkEntryBuffer *buffer) -{ - SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer); - return self->priv->text_chars; -} - -static guint -seahorse_secure_buffer_real_insert_text (GtkEntryBuffer *buffer, guint position, - const gchar *chars, guint n_chars) -{ - SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer); - SeahorseSecureBufferPrivate *pv = self->priv; - gsize n_bytes; - gsize at; - - n_bytes = g_utf8_offset_to_pointer (chars, n_chars) - chars; - - /* Need more memory */ - if (n_bytes + pv->text_bytes + 1 > pv->text_size) { - - /* Calculate our new buffer size */ - while (n_bytes + pv->text_bytes + 1 > pv->text_size) { - if (pv->text_size == 0) { - pv->text_size = MIN_SIZE; - } else { - if (2 * pv->text_size < GTK_ENTRY_BUFFER_MAX_SIZE) { - pv->text_size *= 2; - } else { - pv->text_size = GTK_ENTRY_BUFFER_MAX_SIZE; - if (n_bytes > pv->text_size - pv->text_bytes - 1) { - n_bytes = pv->text_size - pv->text_bytes - 1; - n_bytes = g_utf8_find_prev_char (chars, chars + n_bytes + 1) - chars; - n_chars = g_utf8_strlen (chars, n_bytes); - } - break; - } - } - } - - pv->text = gnome_keyring_memory_realloc (pv->text, pv->text_size); - } - - /* Actual text insertion */ - at = g_utf8_offset_to_pointer (pv->text, position) - pv->text; - g_memmove (pv->text + at + n_bytes, pv->text + at, pv->text_bytes - at); - memcpy (pv->text + at, chars, n_bytes); - - /* Book keeping */ - pv->text_bytes += n_bytes; - pv->text_chars += n_chars; - pv->text[pv->text_bytes] = '\0'; - - gtk_entry_buffer_emit_inserted_text (buffer, position, chars, n_chars); - return n_chars; -} - -static guint -seahorse_secure_buffer_real_delete_text (GtkEntryBuffer *buffer, guint position, guint n_chars) -{ - SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer); - SeahorseSecureBufferPrivate *pv = self->priv; - gsize start, end; - - if (position > pv->text_chars) - position = pv->text_chars; - if (position + n_chars > pv->text_chars) - n_chars = pv->text_chars - position; - - if (n_chars > 0) { - start = g_utf8_offset_to_pointer (pv->text, position) - pv->text; - end = g_utf8_offset_to_pointer (pv->text, position + n_chars) - pv->text; - - g_memmove (pv->text + start, pv->text + end, pv->text_bytes + 1 - end); - pv->text_chars -= n_chars; - pv->text_bytes -= (end - start); - - gtk_entry_buffer_emit_deleted_text (buffer, position, n_chars); - } - - return n_chars; -} - -/* -------------------------------------------------------------------------------- - * - */ - -static void -seahorse_secure_buffer_init (SeahorseSecureBuffer *self) -{ - SeahorseSecureBufferPrivate *pv; - pv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBufferPrivate); - - pv->text = NULL; - pv->text_chars = 0; - pv->text_bytes = 0; - pv->text_size = 0; -} - -static void -seahorse_secure_buffer_finalize (GObject *obj) -{ - SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (obj); - SeahorseSecureBufferPrivate *pv = self->priv; - - if (pv->text) { - gnome_keyring_memory_free (pv->text); - pv->text = NULL; - pv->text_bytes = pv->text_size = 0; - pv->text_chars = 0; - } - - G_OBJECT_CLASS (seahorse_secure_buffer_parent_class)->finalize (obj); -} - -static void -seahorse_secure_buffer_class_init (SeahorseSecureBufferClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkEntryBufferClass *buffer_class = GTK_ENTRY_BUFFER_CLASS (klass); - - gobject_class->finalize = seahorse_secure_buffer_finalize; - - buffer_class->get_text = seahorse_secure_buffer_real_get_text; - buffer_class->get_length = seahorse_secure_buffer_real_get_length; - buffer_class->insert_text = seahorse_secure_buffer_real_insert_text; - buffer_class->delete_text = seahorse_secure_buffer_real_delete_text; - - g_type_class_add_private (gobject_class, sizeof (SeahorseSecureBufferPrivate)); -} - -/* -------------------------------------------------------------------------------- - * - */ - -GtkEntryBuffer* -seahorse_secure_buffer_new (void) -{ - return g_object_new (SEAHORSE_TYPE_SECURE_BUFFER, NULL); -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-secure-buffer.h seahorse-3.6.3/libseahorse/seahorse-secure-buffer.h --- seahorse-3.2.2/libseahorse/seahorse-secure-buffer.h 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-secure-buffer.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2010 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_SECURE_BUFFER_H__ -#define __SEAHORSE_SECURE_BUFFER_H__ - -#include - -G_BEGIN_DECLS - -#define SEAHORSE_TYPE_SECURE_BUFFER (seahorse_secure_buffer_get_type ()) -#define SEAHORSE_SECURE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBuffer)) -#define SEAHORSE_SECURE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBufferClass)) -#define SEAHORSE_IS_SECURE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SECURE_BUFFER)) -#define SEAHORSE_IS_SECURE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SECURE_BUFFER)) -#define SEAHORSE_SECURE_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBufferClass)) - -typedef struct _SeahorseSecureBuffer SeahorseSecureBuffer; -typedef struct _SeahorseSecureBufferClass SeahorseSecureBufferClass; -typedef struct _SeahorseSecureBufferPrivate SeahorseSecureBufferPrivate; - -struct _SeahorseSecureBuffer -{ - GtkEntryBuffer parent; - SeahorseSecureBufferPrivate *priv; -}; - -struct _SeahorseSecureBufferClass -{ - GtkEntryBufferClass parent_class; -}; - -GType seahorse_secure_buffer_get_type (void) G_GNUC_CONST; - -GtkEntryBuffer* seahorse_secure_buffer_new (void); - -G_END_DECLS - -#endif /* __SEAHORSE_SECURE_BUFFER_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-secure-memory.c seahorse-3.6.3/libseahorse/seahorse-secure-memory.c --- seahorse-3.2.2/libseahorse/seahorse-secure-memory.c 2011-09-14 17:04:58.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-secure-memory.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,179 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2007 Stef Walter - * - * 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 "config.h" - -#include -#include - -#include - -#include - -#include "seahorse-secure-memory.h" - - /* extern declared in seahorse-secure-memory.h */ - gboolean seahorse_use_secure_mem = FALSE; - -/** - * switch_malloc: - * @size: The size of the new memory buffer - * - * Transparent alternative. Depending on the setting for secure memory, the - * function calls the default-C version or the GTK version for non-pageable memory - * - * Returns: The pointer to the new buffer - */ -static gpointer -switch_malloc (gsize size) -{ - gpointer p; - - if (size == 0) - return NULL; - if (seahorse_use_secure_mem) - p = gnome_keyring_memory_try_alloc (size); - else - p = malloc (size); - return p; -} - -/** - * switch_calloc: - * @num: Number of blocks to allocate - * @size: Size of a block - * - * Transparent alternative. Depending on the setting for secure memory, the - * function calls the default-C version or the GTK version for non-pageable memory - * - * Returns: The pointer to a buffer sized num*size - */ -static gpointer -switch_calloc (gsize num, gsize size) -{ - gpointer p; - - if (size == 0 || num == 0) - return NULL; - if (seahorse_use_secure_mem) - p = gnome_keyring_memory_try_alloc (size * num); - else - p = calloc (num, size); - return p; -} - -/** - * switch_realloc: - * @mem: The old memory to resize - * @size: The new size - * - * Transparent alternative. Depending on the setting for secure memory, the - * function calls the default-C version or the GTK version for non-pageable memory - * - * Returns: The pointer to the resized memory - */ -static gpointer -switch_realloc (gpointer mem, gsize size) -{ - gpointer p; - - if (size == 0) { - free (mem); - return NULL; - } - - if (!mem) { - if (seahorse_use_secure_mem) - p = gnome_keyring_memory_alloc (size); - else - p = malloc (size); - } else if (gnome_keyring_memory_is_secure (mem)) - p = gnome_keyring_memory_try_realloc (mem, size); - else - p = realloc (mem, size); - return p; -} - -/** - * switch_free: - * @mem: The memory to free - * - * Transparent alternative. Depending on the setting for secure memory, the - * function calls the default-C version or the GTK version for non-pageable memory - */ -static void -switch_free (gpointer mem) -{ - if (mem) { - if (gnome_keyring_memory_is_secure (mem)) - gnome_keyring_memory_free (mem); - else - free (mem); - } -} - -/** - * seahorse_try_gk_secure_memory: - * - * - * Returns: TRUE if non-pageable memory is available - */ -static gboolean -seahorse_try_gk_secure_memory () -{ - gpointer p; - - p = gnome_keyring_memory_try_alloc (10); - if (p != NULL) { - gnome_keyring_memory_free (p); - return TRUE; - } - - return FALSE; -} - -/** - * seahorse_secure_memory_init: - * - * Configures non-pageable (secure) memory. Must be called before the first - * memory allocation. - * - * This function sets the #GMemVTable to use the switch* function implemented in - * this files - * - */ -void -seahorse_secure_memory_init () -{ - if (seahorse_try_gk_secure_memory() == TRUE) { - GMemVTable vtable; - - memset (&vtable, 0, sizeof (vtable)); - vtable.malloc = switch_malloc; - vtable.realloc = switch_realloc; - vtable.free = switch_free; - vtable.calloc = switch_calloc; - g_mem_set_vtable (&vtable); - } else { - g_warning ("Unable to allocate secure memory from gnome-keyring.\n"); - g_warning ("Proceeding using insecure memory for password fields.\n"); - } -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-secure-memory.h seahorse-3.6.3/libseahorse/seahorse-secure-memory.h --- seahorse-3.2.2/libseahorse/seahorse-secure-memory.h 2009-04-18 05:22:13.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-secure-memory.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -/* - * Quintuple Agent secure memory allocation - * Copyright (C) 1998,1999 Free Software Foundation, Inc. - * Copyright (C) 1999,2000 Robert Bihlmeyer - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef _SEAHORSE_SECURE_MEMORY_H_ -#define _SEAHORSE_SECURE_MEMORY_H_ - -#include - -extern gboolean seahorse_use_secure_mem; - -#define WITH_SECURE_MEM(EXP) \ - do { \ - gboolean _tmp = seahorse_use_secure_mem; \ - seahorse_use_secure_mem = TRUE; \ - EXP; \ - seahorse_use_secure_mem = _tmp; \ - } while (0) - -/* This must be called before any glib/gtk/gnome functions */ -void seahorse_secure_memory_init (void); - -#endif /* _SEAHORSE_SECURE_MEMORY_H_ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-servers.c seahorse-3.6.3/libseahorse/seahorse-servers.c --- seahorse-3.2.2/libseahorse/seahorse-servers.c 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-servers.c 2012-08-21 12:23:17.000000000 +0200 @@ -19,8 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "seahorse-application.h" #include "seahorse-cleanup.h" -#include "seahorse-context.h" #include "seahorse-servers.h" #include @@ -103,7 +103,7 @@ gchar *name; guint i; - servers = g_settings_get_strv (seahorse_context_pgp_settings (NULL), "keyservers"); + servers = g_settings_get_strv (seahorse_application_pgp_settings (NULL), "keyservers"); /* The values are 'uri name', remove the name part */ for (i = 0; servers[i] != NULL; i++) { @@ -123,7 +123,7 @@ gchar *name; guint i; - servers = g_settings_get_strv (seahorse_context_pgp_settings (NULL), + servers = g_settings_get_strv (seahorse_application_pgp_settings (NULL), "keyservers"); /* The values are 'uri name', remove the value part */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-set.c seahorse-3.6.3/libseahorse/seahorse-set.c --- seahorse-3.2.2/libseahorse/seahorse-set.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-set.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,336 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2005 Stefan Walter - * - * 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 "seahorse-set.h" -#include "seahorse-marshal.h" - -enum { - PROP_0, - PROP_PREDICATE -}; - -enum { - ADDED, - REMOVED, - CHANGED, - SET_CHANGED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -struct _SeahorseSetPrivate { - GHashTable *objects; - SeahorseObjectPredicate *pred; -}; - -G_DEFINE_TYPE (SeahorseSet, seahorse_set, G_TYPE_OBJECT); - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static gboolean -remove_update (SeahorseObject *sobj, gpointer unused, SeahorseSet *skset) -{ - g_signal_emit (skset, signals[REMOVED], 0, sobj); - g_signal_emit (skset, signals[SET_CHANGED], 0); - return TRUE; -} - -static void -remove_object (SeahorseObject *sobj, SeahorseSet *skset) -{ - g_hash_table_remove (skset->pv->objects, sobj); - remove_update (sobj, NULL, skset); -} - -static gboolean -maybe_add_object (SeahorseSet *skset, SeahorseObject *sobj) -{ - if (seahorse_object_get_context (sobj) != SCTX_APP ()) - return FALSE; - - if (g_hash_table_lookup (skset->pv->objects, sobj)) - return FALSE; - - if (!skset->pv->pred || !seahorse_object_predicate_match (skset->pv->pred, sobj)) - return FALSE; - - g_hash_table_replace (skset->pv->objects, sobj, GINT_TO_POINTER (TRUE)); - g_signal_emit (skset, signals[ADDED], 0, sobj); - g_signal_emit (skset, signals[SET_CHANGED], 0); - return TRUE; -} - -static gboolean -maybe_remove_object (SeahorseSet *skset, SeahorseObject *sobj) -{ - if (!g_hash_table_lookup (skset->pv->objects, sobj)) - return FALSE; - - if (skset->pv->pred && seahorse_object_predicate_match (skset->pv->pred, sobj)) - return FALSE; - - remove_object (sobj, skset); - return TRUE; -} - -static void -object_added (SeahorseContext *sctx, SeahorseObject *sobj, SeahorseSet *skset) -{ - g_assert (SEAHORSE_IS_OBJECT (sobj)); - g_assert (SEAHORSE_IS_SET (skset)); - - maybe_add_object (skset, sobj); -} - -static void -object_removed (SeahorseContext *sctx, SeahorseObject *sobj, SeahorseSet *skset) -{ - g_assert (SEAHORSE_IS_OBJECT (sobj)); - g_assert (SEAHORSE_IS_SET (skset)); - - if (g_hash_table_lookup (skset->pv->objects, sobj)) - remove_object (sobj, skset); -} - -static void -object_changed (SeahorseContext *sctx, SeahorseObject *sobj, SeahorseSet *skset) -{ - g_assert (SEAHORSE_IS_OBJECT (sobj)); - g_assert (SEAHORSE_IS_SET (skset)); - - if (g_hash_table_lookup (skset->pv->objects, sobj)) { - - /* See if needs to be removed, otherwise emit signal */ - if (!maybe_remove_object (skset, sobj)) - g_signal_emit (skset, signals[CHANGED], 0, sobj); - - /* Not in our set yet */ - } else - maybe_add_object (skset, sobj); -} - -static void -objects_to_list (SeahorseObject *sobj, gpointer *c, GList **l) -{ - *l = g_list_append (*l, sobj); -} - -static void -objects_to_hash (SeahorseObject *sobj, gpointer *c, GHashTable *ht) -{ - g_hash_table_replace (ht, sobj, NULL); -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_set_dispose (GObject *gobject) -{ - SeahorseSet *skset = SEAHORSE_SET (gobject); - - g_signal_handlers_disconnect_by_func (SCTX_APP (), object_added, skset); - g_signal_handlers_disconnect_by_func (SCTX_APP (), object_removed, skset); - g_signal_handlers_disconnect_by_func (SCTX_APP (), object_changed, skset); - - g_hash_table_remove_all (skset->pv->objects); - skset->pv->pred = NULL; - - G_OBJECT_CLASS (seahorse_set_parent_class)->dispose (gobject); -} - -static void -seahorse_set_finalize (GObject *gobject) -{ - SeahorseSet *skset = SEAHORSE_SET (gobject); - - g_hash_table_destroy (skset->pv->objects); - g_assert (skset->pv->pred == NULL); - g_free (skset->pv); - - G_OBJECT_CLASS (seahorse_set_parent_class)->finalize (gobject); -} - -static void -seahorse_set_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorseSet *skset = SEAHORSE_SET (object); - - switch (prop_id) { - case PROP_PREDICATE: - skset->pv->pred = (SeahorseObjectPredicate*)g_value_get_pointer (value); - seahorse_set_refresh (skset); - break; - } -} - -static void -seahorse_set_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorseSet *skset = SEAHORSE_SET (object); - - switch (prop_id) { - case PROP_PREDICATE: - g_value_set_pointer (value, skset->pv->pred); - break; - } -} - -static void -seahorse_set_init (SeahorseSet *skset) -{ - /* init private vars */ - skset->pv = g_new0 (SeahorseSetPrivate, 1); - - skset->pv->objects = g_hash_table_new (g_direct_hash, g_direct_equal); - - g_signal_connect (SCTX_APP (), "added", G_CALLBACK (object_added), skset); - g_signal_connect (SCTX_APP (), "removed", G_CALLBACK (object_removed), skset); - g_signal_connect (SCTX_APP (), "changed", G_CALLBACK (object_changed), skset); -} - -static void -seahorse_set_class_init (SeahorseSetClass *klass) -{ - GObjectClass *gobject_class; - - seahorse_set_parent_class = g_type_class_peek_parent (klass); - gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->dispose = seahorse_set_dispose; - gobject_class->finalize = seahorse_set_finalize; - gobject_class->set_property = seahorse_set_set_property; - gobject_class->get_property = seahorse_set_get_property; - - g_object_class_install_property (gobject_class, PROP_PREDICATE, - g_param_spec_pointer ("predicate", "Predicate", "Predicate for matching objects into this set.", - G_PARAM_READWRITE)); - - signals[ADDED] = g_signal_new ("added", SEAHORSE_TYPE_SET, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseSetClass, added), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SEAHORSE_TYPE_OBJECT); - - signals[REMOVED] = g_signal_new ("removed", SEAHORSE_TYPE_SET, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseSetClass, removed), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SEAHORSE_TYPE_OBJECT); - - signals[CHANGED] = g_signal_new ("changed", SEAHORSE_TYPE_SET, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseSetClass, changed), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SEAHORSE_TYPE_OBJECT); - - signals[SET_CHANGED] = g_signal_new ("set-changed", SEAHORSE_TYPE_SET, - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseSetClass, set_changed), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorseSet* -seahorse_set_new (GQuark ktype, SeahorseUsage usage, SeahorseLocation location, - guint flags, guint nflags) -{ - SeahorseSet *skset; - SeahorseObjectPredicate *pred = g_new0(SeahorseObjectPredicate, 1); - - pred->location = location; - pred->id = ktype; - pred->usage = usage; - pred->flags = flags; - pred->nflags = nflags; - - skset = seahorse_set_new_full (pred); - g_object_set_data_full (G_OBJECT (skset), "quick-predicate", pred, g_free); - - return skset; -} - -SeahorseSet* -seahorse_set_new_full (SeahorseObjectPredicate *pred) -{ - return g_object_new (SEAHORSE_TYPE_SET, "predicate", pred, NULL); -} - -gboolean -seahorse_set_has_object (SeahorseSet *skset, SeahorseObject *sobj) -{ - if (g_hash_table_lookup (skset->pv->objects, sobj)) - return TRUE; - - /* - * This happens when the object has changed state, but we have - * not yet received the signal. - */ - if (maybe_add_object (skset, sobj)) - return TRUE; - - return FALSE; -} - -GList* -seahorse_set_get_objects (SeahorseSet *skset) -{ - GList *objs = NULL; - g_hash_table_foreach (skset->pv->objects, (GHFunc)objects_to_list, &objs); - return objs; -} - -guint -seahorse_set_get_count (SeahorseSet *skset) -{ - return g_hash_table_size (skset->pv->objects); -} - -void -seahorse_set_refresh (SeahorseSet *skset) -{ - GHashTable *check = g_hash_table_new (g_direct_hash, g_direct_equal); - GList *l, *objects = NULL; - SeahorseObject *sobj; - - /* Make note of all the objects we had prior to refresh */ - g_hash_table_foreach (skset->pv->objects, (GHFunc)objects_to_hash, check); - - if (skset->pv->pred) - objects = seahorse_context_find_objects_full (SCTX_APP (), skset->pv->pred); - - for (l = objects; l; l = g_list_next (l)) { - sobj = SEAHORSE_OBJECT (l->data); - - /* Make note that we've seen this object */ - g_hash_table_remove (check, sobj); - - /* This will add to set */ - maybe_add_object (skset, sobj); - } - - g_list_free (objects); - - g_hash_table_foreach (check, (GHFunc)remove_object, skset); - g_hash_table_destroy (check); -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-set.h seahorse-3.6.3/libseahorse/seahorse-set.h --- seahorse-3.2.2/libseahorse/seahorse-set.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-set.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2005-2006 Stefan Walter - * - * 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 __SEAHORSE_SET_H__ -#define __SEAHORSE_SET_H__ - -#include "seahorse-context.h" -#include "seahorse-object.h" -#include "seahorse-source.h" - -#define SEAHORSE_TYPE_SET (seahorse_set_get_type ()) -#define SEAHORSE_SET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SET, SeahorseSet)) -#define SEAHORSE_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SET, SeahorseSetClass)) -#define SEAHORSE_IS_SET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SET)) -#define SEAHORSE_IS_SET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SET)) -#define SEAHORSE_SET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SET, SeahorseSetClass)) - -typedef struct _SeahorseSet SeahorseSet; -typedef struct _SeahorseSetClass SeahorseSetClass; -typedef struct _SeahorseSetPrivate SeahorseSetPrivate; - -/** - * SeahorseSet: - * @parent: The parent #GObject - * - * A subset list of the keys in the SeahorseContext. - * - * - Used all over by various views to narrow in on the keys that they're - * interested in. - * - Originally was going to be called SeahorseView (database parlance) but - * that's far too confusing with overloaded terminology. - * - Uses a SeahorseObjectPredicate to match keys. - * - Sends out events when keys get added and removed from it's view. Or a - * key in the view changes etc... - * - * Signals: - * added: A key was added to this keyset. - * removed: A key disappeared from this keyset. - * changed: A key in the keyset changed. - * set-changed: The number of keys in the keyset changed - * - * Properties: - * count: The number of keys - * predicate: (SeahorseObjectPredicate) The predicate used for matching. - */ - -struct _SeahorseSet { - GObject parent; - - /**/ - SeahorseSetPrivate *pv; -}; - -struct _SeahorseSetClass { - GObjectClass parent_class; - - /* signals --------------------------------------------------------- */ - - /* A key was added to this view */ - void (*added) (SeahorseSet *skset, SeahorseObject *sobj); - - /* Removed a key from this view */ - void (*removed) (SeahorseSet *skset, SeahorseObject *sobj); - - /* One of the key's attributes has changed */ - void (*changed) (SeahorseSet *skset, SeahorseObject *sobj); - - /* The set of keys changed */ - void (*set_changed) (SeahorseSet *skset); -}; - -GType seahorse_set_get_type (void); - -SeahorseSet* seahorse_set_new (GQuark ktype, - SeahorseUsage usage, - SeahorseLocation location, - guint flags, - guint nflags); - -SeahorseSet* seahorse_set_new_full (SeahorseObjectPredicate *pred); - -gboolean seahorse_set_has_object (SeahorseSet *skset, - SeahorseObject *sobj); - -GList* seahorse_set_get_objects (SeahorseSet *skset); - -guint seahorse_set_get_count (SeahorseSet *skset); - -void seahorse_set_refresh (SeahorseSet *skset); - -#endif /* __SEAHORSE_SET_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-set-model.c seahorse-3.6.3/libseahorse/seahorse-set-model.c --- seahorse-3.2.2/libseahorse/seahorse-set-model.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-set-model.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,840 +0,0 @@ -/* - * Seahorse - * Copyright (C) 2006 Stefan Walter - * 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 "config.h" - -#include "seahorse-set-model.h" - -#include - -enum { - PROP_0, - PROP_SET -}; - -typedef struct _SeahorseSetModelPrivate { - GHashTable *object_to_node; - gint last_stamp; - GNode *root_node; - gchar **column_names; - guint n_columns; - GType *column_types; -} SeahorseSetModelPrivate; - -static void remove_object (SeahorseSetModel *smodel, gpointer was_sobj); -static GNode* add_object (SeahorseSetModel *smodel, SeahorseObject *sobj); -static void seahorse_set_model_implement_tree_model (GtkTreeModelIface *iface); - -G_DEFINE_TYPE_EXTENDED (SeahorseSetModel, seahorse_set_model, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, seahorse_set_model_implement_tree_model)); - -#define SEAHORSE_SET_MODEL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SEAHORSE_TYPE_SET_MODEL, SeahorseSetModelPrivate)) - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ -static GNode* -node_for_iter (SeahorseSetModelPrivate *pv, const GtkTreeIter *iter) -{ - GNode *node; - - g_return_val_if_fail (iter, NULL); - g_return_val_if_fail (iter->stamp == pv->last_stamp, NULL); - g_assert (SEAHORSE_IS_OBJECT (iter->user_data)); - - node = iter->user_data2; - g_assert (g_hash_table_lookup (pv->object_to_node, iter->user_data) == node); - return node; -} - -static void -iter_for_node (SeahorseSetModelPrivate *pv, GNode *node, GtkTreeIter *iter) -{ - g_assert (node); - g_assert (SEAHORSE_IS_OBJECT (node->data)); - g_assert (g_hash_table_lookup (pv->object_to_node, node->data) == node); - - memset (iter, 0, sizeof (*iter)); - iter->stamp = pv->last_stamp; - iter->user_data = node->data; - iter->user_data2 = node; -} - -static GtkTreePath* -path_for_node (GNode *node) -{ - GtkTreePath *path; - gint index; - - g_assert (node); - - path = gtk_tree_path_new (); - for (;;) { - if (!node->parent) - break; - index = g_node_child_position (node->parent, node); - g_assert (index >= 0); - gtk_tree_path_prepend_index (path, index); - node = node->parent; - } - - return path; -} - -static void -key_hierarchy (SeahorseObject *sobj, GParamSpec *spec, SeahorseSetModel *smodel) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - - g_return_if_fail (SEAHORSE_SET_MODEL (smodel)); - g_return_if_fail (SEAHORSE_IS_OBJECT (sobj)); - g_return_if_fail (g_hash_table_lookup (pv->object_to_node, sobj) != NULL); - - remove_object (smodel, sobj); - add_object (smodel, sobj); -} - -static void -gone_object (SeahorseSetModel *smodel, gpointer was_sobj) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - GNode *node; - - node = g_hash_table_lookup (pv->object_to_node, was_sobj); - g_assert (node); - - /* Mark this object as gone */ - node->data = NULL; - - remove_object (smodel, was_sobj); -} - -static GNode* -add_object (SeahorseSetModel *smodel, SeahorseObject *sobj) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - SeahorseObject *parent_obj; - GNode *parent_node, *node; - GtkTreeIter iter; - GtkTreePath *path; - GList *children, *l; - gboolean had; - - g_assert (g_hash_table_lookup (pv->object_to_node, sobj) == NULL); - - /* Find the parent of this object */ - parent_obj = seahorse_object_get_parent (sobj); - g_return_val_if_fail (parent_obj != sobj, NULL); - - /* A root node */ - if (parent_obj == NULL) { - parent_node = pv->root_node; - } else { - /* Do we have the parent of this node? */ - parent_node = g_hash_table_lookup (pv->object_to_node, parent_obj); - - /* If not, we add it */ - if (!parent_node) - parent_node = add_object (smodel, parent_obj); - } - - /* Now that we have a parent, add this node */ - g_return_val_if_fail (parent_node, NULL); - had = parent_node->children ? TRUE : FALSE; - node = g_node_append_data (parent_node, sobj); - g_object_weak_ref (G_OBJECT (sobj), (GWeakNotify)gone_object, smodel); - g_hash_table_insert (pv->object_to_node, sobj, node); - g_signal_connect (sobj, "notify::parent", G_CALLBACK (key_hierarchy), smodel); - - pv->last_stamp++; - - /* Fire signal for this added row */ - iter_for_node (pv, node, &iter); - path = gtk_tree_model_get_path (GTK_TREE_MODEL (smodel), &iter); - g_return_val_if_fail (path, NULL); - gtk_tree_model_row_inserted (GTK_TREE_MODEL (smodel), path, &iter); - pv->last_stamp++; - gtk_tree_path_free (path); - - /* The first row was added, fire signal on parent */ - if (!had && parent_node != pv->root_node) { - iter_for_node (pv, parent_node, &iter); - path = gtk_tree_model_get_path (GTK_TREE_MODEL (smodel), &iter); - g_return_val_if_fail (path, NULL); - gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (smodel), path, &iter); - pv->last_stamp++; - gtk_tree_path_free (path); - } - - /* Now if this object is in the set, and has children, add each child */ - if (seahorse_set_has_object (smodel->set, sobj)) { - children = seahorse_object_get_children (sobj); - for (l = children; l; l = g_list_next (l)) { - if (!g_hash_table_lookup (pv->object_to_node, l->data)) - add_object (smodel, l->data); - } - } - - return node; -} - -static gboolean -remove_each_object (GNode *node, SeahorseSetModel *smodel) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - GNode *parent_node; - GtkTreeIter iter; - GtkTreePath *path; - - /* This happens during dispose */ - if (node == pv->root_node) - return FALSE; - - /* This can be NULL of the object was finalized */ - if (node->data != NULL) { - g_assert (SEAHORSE_IS_OBJECT (node->data)); - g_assert (g_hash_table_lookup (pv->object_to_node, node->data) == node); - } - - /* Create the path for firing the event */ - path = path_for_node (node); - g_return_val_if_fail (path, TRUE); - - /* Remove the actual node */ - parent_node = node->parent; - if(node->data) { - g_hash_table_remove (pv->object_to_node, node->data); - g_signal_handlers_disconnect_by_func (node->data, key_hierarchy, smodel); - g_object_weak_unref (G_OBJECT (node->data), (GWeakNotify)gone_object, smodel); - } - g_node_destroy (node); - - /* Fire signal for this removed row */ - gtk_tree_model_row_deleted (GTK_TREE_MODEL (smodel), path); - pv->last_stamp++; - gtk_tree_path_free (path); - - /* If this is the last child, then fire toggled */ - if (!parent_node->children && parent_node != pv->root_node) { - iter_for_node (pv, parent_node, &iter); - path = gtk_tree_model_get_path (GTK_TREE_MODEL (smodel), &iter); - g_return_val_if_fail (path, TRUE); - gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (smodel), path, &iter); - pv->last_stamp++; - gtk_tree_path_free (path); - } - - return FALSE; -} - -static void -remove_object (SeahorseSetModel *smodel, gpointer was_sobj) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - GNode *node; - GNode *parent; - SeahorseObject *parent_obj; - - node = g_hash_table_lookup (pv->object_to_node, was_sobj); - g_assert (node); - g_assert (node != pv->root_node); - - /* - * If the object has already dissappeared, then this will be - * set to null by gone_object(). - */ - g_assert (node->data == was_sobj || node->data == NULL); - - parent = node->parent; - g_assert (parent); - - /* Remove this object and any children */ - g_node_traverse (node, G_POST_ORDER, G_TRAVERSE_ALL, -1, - (GNodeTraverseFunc)remove_each_object, smodel); - - /* This is needed for objects that went away */ - g_hash_table_remove (pv->object_to_node, was_sobj); - - /* - * Now check if the parent of this object is actually in the set, or was - * just added for the sake of holding the child (see add_object above) - */ - if (parent != pv->root_node && g_node_n_children (parent) == 0) { - parent_obj = SEAHORSE_OBJECT (parent->data); - g_return_if_fail (parent_obj); - if (!seahorse_set_has_object (smodel->set, parent_obj)) - remove_object (smodel, parent_obj); - } -} - -static void -set_added (SeahorseSet *set, SeahorseObject *sobj, SeahorseSetModel *smodel) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - - g_return_if_fail (SEAHORSE_SET_MODEL (smodel)); - g_return_if_fail (SEAHORSE_IS_OBJECT (sobj)); - - /* We may have added this as a parent */ - if (g_hash_table_lookup (pv->object_to_node, sobj)) - return; - /* Add a node to the table, plus all parents */ - add_object (smodel, sobj); -} - -typedef struct { - SeahorseSet *set; - gboolean found; -} find_node_in_set_args; - -static gboolean -find_node_in_set (GNode *node, gpointer user_data) -{ - find_node_in_set_args *args = user_data; - if (seahorse_set_has_object (args->set, node->data)) { - args->found = TRUE; - return TRUE; - } - - /* Continue traversal */ - return FALSE; -} - -static void -set_removed (SeahorseSet *set, SeahorseObject *sobj, SeahorseSetModel *smodel) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - find_node_in_set_args args = { set, FALSE }; - GNode *node; - - g_return_if_fail (SEAHORSE_SET_MODEL (smodel)); - g_return_if_fail (SEAHORSE_IS_OBJECT (sobj)); - - /* This should always already be added */ - node = g_hash_table_lookup (pv->object_to_node, sobj); - g_return_if_fail (node != NULL); - - /* See if a child is still in the set? */ - g_node_traverse (node, G_IN_ORDER, G_TRAVERSE_ALL, -1, find_node_in_set, &args); - - /* It has a child in the set, don't remove it */ - if (args.found != FALSE) - return; - - remove_object (smodel, sobj); -} - -static void -set_changed (SeahorseSet *set, SeahorseObject *sobj, SeahorseSetModel *smodel) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - GtkTreeIter iter; - GtkTreePath *path; - GNode *node; - - g_return_if_fail (SEAHORSE_SET_MODEL (smodel)); - - node = g_hash_table_lookup (pv->object_to_node, sobj); - g_return_if_fail (node != NULL); - - memset (&iter, 0, sizeof (iter)); - iter_for_node (pv, node, &iter); - path = gtk_tree_model_get_path (GTK_TREE_MODEL (smodel), &iter); - g_return_if_fail (path); - gtk_tree_model_row_changed (GTK_TREE_MODEL (smodel), path, &iter); - pv->last_stamp++; - gtk_tree_path_free (path); -} - -static void -populate_model (SeahorseSetModel *smodel) -{ - GList *objects, *l; - objects = seahorse_set_get_objects (smodel->set); - for (l = objects; l; l = g_list_next (l)) - set_added (smodel->set, SEAHORSE_OBJECT (l->data), smodel); -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static GtkTreeModelFlags -seahorse_set_model_get_flags (GtkTreeModel *tree_model) -{ - /* TODO: Maybe we can eventually GTK_TREE_MODEL_ITERS_PERSIST */ - return 0; -} - -static gint -seahorse_set_model_get_n_columns (GtkTreeModel *tree_model) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), 0); - return pv->n_columns; -} - -static GType -seahorse_set_model_get_column_type (GtkTreeModel *tree_model, gint index) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), 0); - g_return_val_if_fail (index >= 0 && index < pv->n_columns, 0); - return pv->column_types[index]; -} - -static gboolean -seahorse_set_model_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - gint i, count; - gint *indices; - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), FALSE); - - node = pv->root_node; - g_assert (node); - - count = gtk_tree_path_get_depth (path); - g_return_val_if_fail (count > 0, FALSE); - indices = gtk_tree_path_get_indices (path); - - for (i = 0; i < count; ++i) { - node = g_node_nth_child (node, indices[i]); - if (!node) - return FALSE; - } - - iter_for_node (pv, node, iter); - return TRUE; -} - -static GtkTreePath* -seahorse_set_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), NULL); - node = node_for_iter (pv, iter); - g_return_val_if_fail (node != NULL, NULL); - return path_for_node (node); -} - -static void -seahorse_set_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, - gint column, GValue *value) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - SeahorseObject *sobj; - const gchar *property; - GParamSpec *spec; - GValue original; - GType type; - - g_return_if_fail (SEAHORSE_SET_MODEL (tree_model)); - sobj = seahorse_set_model_object_for_iter (SEAHORSE_SET_MODEL (tree_model), iter); - g_return_if_fail (SEAHORSE_IS_OBJECT (sobj)); - g_return_if_fail (column >= 0 && column < pv->n_columns); - - /* Figure out which property */ - type = pv->column_types[column]; - property = pv->column_names[column]; - g_assert (property); - g_value_init (value, type); - - /* Lookup the property on the object */ - spec = g_object_class_find_property (G_OBJECT_GET_CLASS (sobj), property); - if (spec) { - - /* Simple, no transformation necessary */ - if (spec->value_type == type) { - g_object_get_property (G_OBJECT (sobj), property, value); - - /* Not the same type, try to transform */ - } else { - - memset (&original, 0, sizeof (original)); - g_value_init (&original, spec->value_type); - - g_object_get_property (G_OBJECT (sobj), property, &original); - if (!g_value_transform (&original, value)) { - g_warning ("%s property of %s class was of type %s instead of type %s" - " and cannot be converted", property, G_OBJECT_TYPE_NAME (sobj), - g_type_name (spec->value_type), g_type_name (type)); - spec = NULL; - } - } - - - } - - /* No property present */ - if (spec == NULL) { - - /* All the number types have sane defaults */ - if (type == G_TYPE_STRING) - g_value_set_string (value, ""); - } -} - -static gboolean -seahorse_set_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), FALSE); - - node = node_for_iter (pv, iter); - g_return_val_if_fail (node != NULL, FALSE); - node = g_node_next_sibling (node); - if (node == NULL) - return FALSE; - - iter_for_node (pv, node, iter); - return TRUE; -} - -static gboolean -seahorse_set_model_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), FALSE); - if (parent == NULL) - node = pv->root_node; - else - node = node_for_iter (pv, parent); - g_return_val_if_fail (node != NULL, FALSE); - node = node->children; - if (node == NULL) - return FALSE; - - iter_for_node (pv, node, iter); - return TRUE; -} - -static gboolean -seahorse_set_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), FALSE); - node = node_for_iter (pv, iter); - g_return_val_if_fail (node != NULL, FALSE); - return node->children != NULL ? TRUE : FALSE; -} - -static gint -seahorse_set_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), FALSE); - if (iter == NULL) - node = pv->root_node; - else - node = node_for_iter (pv, iter); - g_return_val_if_fail (node != NULL, FALSE); - return g_node_n_children (node); -} - -static gboolean -seahorse_set_model_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *iter, - GtkTreeIter *parent, gint n) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), FALSE); - node = parent ? node_for_iter (pv, parent) : pv->root_node; - g_return_val_if_fail (node != NULL, FALSE); - node = g_node_nth_child (node, n); - if (node == NULL) - return FALSE; - - iter_for_node (pv, node, iter); - return TRUE; -} - -static gboolean -seahorse_set_model_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *child) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (tree_model); - GNode *node; - - g_return_val_if_fail (SEAHORSE_SET_MODEL (tree_model), FALSE); - - node = node_for_iter (pv, child); - g_return_val_if_fail (node != NULL, FALSE); - node = node->parent; - if (!node || G_NODE_IS_ROOT (node)) - return FALSE; - - iter_for_node (pv, node, iter); - return TRUE; -} - -static void -seahorse_set_model_ref_node (GtkTreeModel *tree_model, GtkTreeIter *iter) -{ - /* Nothing to do */ -} - -static void -seahorse_set_model_unref_node (GtkTreeModel *tree_model, GtkTreeIter *iter) -{ - /* Nothing to do */ -} - -static void -seahorse_set_model_implement_tree_model (GtkTreeModelIface *iface) -{ - iface->get_flags = seahorse_set_model_get_flags; - iface->get_n_columns = seahorse_set_model_get_n_columns; - iface->get_column_type = seahorse_set_model_get_column_type; - iface->get_iter = seahorse_set_model_get_iter; - iface->get_path = seahorse_set_model_get_path; - iface->get_value = seahorse_set_model_get_value; - iface->iter_next = seahorse_set_model_iter_next; - iface->iter_children = seahorse_set_model_iter_children; - iface->iter_has_child = seahorse_set_model_iter_has_child; - iface->iter_n_children = seahorse_set_model_iter_n_children; - iface->iter_nth_child = seahorse_set_model_iter_nth_child; - iface->iter_parent = seahorse_set_model_iter_parent; - iface->ref_node = seahorse_set_model_ref_node; - iface->unref_node = seahorse_set_model_unref_node; -} - -static void -seahorse_set_model_init (SeahorseSetModel *smodel) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - pv->object_to_node = g_hash_table_new (g_direct_hash, g_direct_equal); - pv->root_node = g_node_new (NULL); - pv->column_names = NULL; - pv->n_columns = 0; - pv->column_types = NULL; - pv->last_stamp = 0x1000; -} - -static void -seahorse_set_model_set_property (GObject *gobject, guint prop_id, - const GValue *value, GParamSpec *pspec) -{ - SeahorseSetModel *smodel = SEAHORSE_SET_MODEL (gobject); - - switch (prop_id) { - case PROP_SET: - g_return_if_fail (smodel->set == NULL); - smodel->set = g_value_dup_object (value); - if (smodel->set) { - g_signal_connect_after (smodel->set, "added", G_CALLBACK (set_added), smodel); - g_signal_connect_after (smodel->set, "removed", G_CALLBACK (set_removed), smodel); - g_signal_connect_after (smodel->set, "changed", G_CALLBACK (set_changed), smodel); - populate_model (smodel); - } - break; - } -} - -static void -seahorse_set_model_get_property (GObject *gobject, guint prop_id, - GValue *value, GParamSpec *pspec) -{ - SeahorseSetModel *smodel = SEAHORSE_SET_MODEL (gobject); - - switch (prop_id) { - case PROP_SET: - g_value_set_object (value, smodel->set); - break; - } -} - -static void -seahorse_set_model_dispose (GObject *gobject) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (gobject); - SeahorseSetModel *smodel = SEAHORSE_SET_MODEL (gobject); - - /* Remove all rows */ - if (pv->root_node) { - g_node_traverse (pv->root_node, G_POST_ORDER, G_TRAVERSE_ALL, -1, - (GNodeTraverseFunc)remove_each_object, smodel); - g_assert (g_hash_table_size (pv->object_to_node) == 0); - } - - /* Disconnect from the set */ - if (smodel->set) { - g_signal_handlers_disconnect_by_func (smodel->set, set_added, smodel); - g_signal_handlers_disconnect_by_func (smodel->set, set_removed, smodel); - g_signal_handlers_disconnect_by_func (smodel->set, set_changed, smodel); - g_object_unref (smodel->set); - smodel->set = NULL; - } - - G_OBJECT_CLASS (seahorse_set_model_parent_class)->dispose (gobject); -} - -static void -seahorse_set_model_finalize (GObject *gobject) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (gobject); - SeahorseSetModel *smodel = SEAHORSE_SET_MODEL (gobject); - g_assert (!smodel->set); - - if (pv->object_to_node) { - g_assert (g_hash_table_size (pv->object_to_node) == 0); - g_hash_table_unref (pv->object_to_node); - pv->object_to_node = NULL; - } - - if (pv->root_node) { - g_assert (!g_node_first_child (pv->root_node)); - g_node_destroy (pv->root_node); - pv->root_node = NULL; - } - - if (pv->column_names) { - g_strfreev (pv->column_names); - pv->column_names = NULL; - pv->n_columns = 0; - } - - if (pv->column_types) { - g_free (pv->column_types); - pv->column_types = NULL; - } - - G_OBJECT_CLASS (seahorse_set_model_parent_class)->finalize (gobject); -} - -static void -seahorse_set_model_class_init (SeahorseSetModelClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - seahorse_set_model_parent_class = g_type_class_peek_parent (klass); - gobject_class->dispose = seahorse_set_model_dispose; - gobject_class->finalize = seahorse_set_model_finalize; - gobject_class->set_property = seahorse_set_model_set_property; - gobject_class->get_property = seahorse_set_model_get_property; - - g_object_class_install_property (gobject_class, PROP_SET, - g_param_spec_object ("set", "Object Set", "Set to get objects from", - SEAHORSE_TYPE_SET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_type_class_add_private (klass, sizeof (SeahorseSetModelPrivate)); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorseSetModel* -seahorse_set_model_new (SeahorseSet *set, ...) -{ - GArray *array = g_array_new (TRUE, TRUE, sizeof (SeahorseSetModelColumn)); - SeahorseSetModelColumn column; - SeahorseSetModel *smodel; - const gchar *arg; - va_list va; - - va_start (va, set); - while ((arg = va_arg (va, const gchar*)) != NULL) { - column.property = arg; - column.type = va_arg (va, GType); - column.data = NULL; - g_array_append_val (array, column); - } - va_end (va); - - smodel = seahorse_set_model_new_full (set, (SeahorseSetModelColumn*)array->data, array->len); - g_array_free (array, TRUE); - return smodel; -} - -SeahorseSetModel* -seahorse_set_model_new_full (SeahorseSet *set, const SeahorseSetModelColumn *columns, guint n_columns) -{ - SeahorseSetModel *smodel = g_object_new (SEAHORSE_TYPE_SET, NULL); - seahorse_set_model_set_columns (smodel, columns, n_columns); - return smodel; -} - -gint -seahorse_set_model_set_columns (SeahorseSetModel *smodel, const SeahorseSetModelColumn *columns, - guint n_columns) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - guint i; - - g_return_val_if_fail (SEAHORSE_IS_SET_MODEL (smodel), -1); - g_return_val_if_fail (pv->n_columns == 0, -1); - - pv->column_names = g_new0 (gchar*, n_columns + 1); - pv->column_types = g_new0 (GType, n_columns + 1); - pv->n_columns = n_columns; - - for (i = 0; i < n_columns; ++i) { - pv->column_names[i] = g_strdup (columns[i].property); - pv->column_types[i] = columns[i].type; - } - - return n_columns - 1; -} - -SeahorseObject* -seahorse_set_model_object_for_iter (SeahorseSetModel *smodel, const GtkTreeIter *iter) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - SeahorseObject *sobj; - - g_return_val_if_fail (SEAHORSE_IS_SET_MODEL (smodel), NULL); - g_return_val_if_fail (iter, NULL); - g_return_val_if_fail (iter->stamp == pv->last_stamp, NULL); - g_return_val_if_fail (SEAHORSE_IS_OBJECT (iter->user_data), NULL); - - sobj = SEAHORSE_OBJECT (iter->user_data); - g_return_val_if_fail (g_hash_table_lookup (pv->object_to_node, sobj) == iter->user_data2, NULL); - return sobj; -} - -gboolean -seahorse_set_model_iter_for_object (SeahorseSetModel *smodel, SeahorseObject *sobj, - GtkTreeIter *iter) -{ - SeahorseSetModelPrivate *pv = SEAHORSE_SET_MODEL_GET_PRIVATE (smodel); - GNode *node; - - g_return_val_if_fail (SEAHORSE_IS_SET_MODEL (smodel), FALSE); - g_return_val_if_fail (SEAHORSE_IS_OBJECT (sobj), FALSE); - g_return_val_if_fail (iter, FALSE); - - node = g_hash_table_lookup (pv->object_to_node, sobj); - if (node == NULL) - return FALSE; - - iter_for_node (pv, node, iter); - return TRUE; -} - diff -Nru seahorse-3.2.2/libseahorse/seahorse-set-model.h seahorse-3.6.3/libseahorse/seahorse-set-model.h --- seahorse-3.2.2/libseahorse/seahorse-set-model.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-set-model.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * - * 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 __SEAHORSE_SET_MODEL_H__ -#define __SEAHORSE_SET_MODEL_H__ - -#include -#include "seahorse-object.h" -#include "seahorse-set.h" - -typedef struct _SeahorseSetModelColumn { - const gchar *property; - GType type; - gpointer data; -} SeahorseSetModelColumn; - -#define SEAHORSE_TYPE_SET_MODEL (seahorse_set_model_get_type ()) -#define SEAHORSE_SET_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SET_MODEL, SeahorseSetModel)) -#define SEAHORSE_SET_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SET_MODEL, SeahorseSetModelClass)) -#define SEAHORSE_IS_SET_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SET_MODEL)) -#define SEAHORSE_IS_SET_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SET_MODEL)) -#define SEAHORSE_SET_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SET_MODEL, SeahorseSetModelClass)) - -typedef struct _SeahorseSetModel SeahorseSetModel; -typedef struct _SeahorseSetModelClass SeahorseSetModelClass; - -/** - * SeahorseSetModel: - * @parent: #GObject #SeahorseSetModel inherits from - * @set: #SeahorseSet that belongs to the model - * - * A GtkTreeModel which represents all objects in a SeahorseSet - */ - -struct _SeahorseSetModel { - GObject parent; - SeahorseSet *set; -}; - -struct _SeahorseSetModelClass { - GObjectClass parent_class; -}; - -GType seahorse_set_model_get_type (void); - -SeahorseSetModel* seahorse_set_model_new (SeahorseSet *set, - ...) G_GNUC_NULL_TERMINATED; - -SeahorseSetModel* seahorse_set_model_new_full (SeahorseSet *set, - const SeahorseSetModelColumn *columns, - guint n_columns); - -gint seahorse_set_model_set_columns (SeahorseSetModel *smodel, - const SeahorseSetModelColumn *columns, - guint n_columns); - -SeahorseObject* seahorse_set_model_object_for_iter (SeahorseSetModel *smodel, - const GtkTreeIter *iter); - -gboolean seahorse_set_model_iter_for_object (SeahorseSetModel *smodel, - SeahorseObject *object, - GtkTreeIter *iter); - -#endif /* __SEAHORSE_SET_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-source.c seahorse-3.6.3/libseahorse/seahorse-source.c --- seahorse-3.2.2/libseahorse/seahorse-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-source.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,459 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2004,2005 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include "seahorse-context.h" -#include "seahorse-marshal.h" -#include "seahorse-object.h" -#include "seahorse-registry.h" -#include "seahorse-source.h" -#include "seahorse-util.h" - -/** - * SECTION:seahorse-source - * @short_description: This class stores and handles key sources - * @include:seahorse-source.h - * - **/ - - -/* --------------------------------------------------------------------------------- - * INTERFACE - */ - -/** -* gobject_class: The object class to init -* -* Adds the interfaces "source-tag" and "source-location" -* -**/ -static void -seahorse_source_base_init (gpointer gobject_class) -{ - static gboolean initialized = FALSE; - if (!initialized) { - - /* Add properties and signals to the interface */ - g_object_interface_install_property (gobject_class, - g_param_spec_uint ("source-tag", "Source Tag", "Tag of objects that come from this source.", - 0, G_MAXUINT, SEAHORSE_TAG_INVALID, G_PARAM_READABLE)); - - g_object_interface_install_property (gobject_class, - g_param_spec_enum ("source-location", "Source Location", "Objects in this source are at this location. See SeahorseLocation", - SEAHORSE_TYPE_LOCATION, SEAHORSE_LOCATION_LOCAL, G_PARAM_READABLE)); - - initialized = TRUE; - } -} - -/** - * seahorse_source_get_type: - * - * Registers the type of G_TYPE_INTERFACE - * - * Returns: the type id - */ -GType -seahorse_source_get_type (void) -{ - static GType type = 0; - if (!type) { - static const GTypeInfo info = { - sizeof (SeahorseSourceIface), - seahorse_source_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, "SeahorseSourceIface", &info, 0); - g_type_interface_add_prerequisite (type, G_TYPE_OBJECT); - } - - return type; -} - -/* --------------------------------------------------------------------------------- - * PUBLIC - */ - -void -seahorse_source_load_async (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_return_if_fail (SEAHORSE_IS_SOURCE (source)); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (SEAHORSE_SOURCE_GET_INTERFACE (source)->load_async); - SEAHORSE_SOURCE_GET_INTERFACE (source)->load_async (source, cancellable, - callback, user_data); -} - -gboolean -seahorse_source_load_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (SEAHORSE_IS_SOURCE (source), FALSE); - g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - g_return_val_if_fail (SEAHORSE_SOURCE_GET_INTERFACE (source)->load_finish, FALSE); - return SEAHORSE_SOURCE_GET_INTERFACE (source)->load_finish (source, result, error); -} - -void -seahorse_source_search_async (SeahorseSource *source, - const gchar *match, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_return_if_fail (SEAHORSE_IS_SOURCE (source)); - g_return_if_fail (match != NULL); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (SEAHORSE_SOURCE_GET_INTERFACE (source)->search_async); - SEAHORSE_SOURCE_GET_INTERFACE (source)->search_async (source, match, cancellable, - callback, user_data); -} - -GList * -seahorse_source_search_finish (SeahorseSource *source, GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (SEAHORSE_IS_SOURCE (source), NULL); - g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - g_return_val_if_fail (SEAHORSE_SOURCE_GET_INTERFACE (source)->search_finish, NULL); - return SEAHORSE_SOURCE_GET_INTERFACE (source)->search_finish (source, result, error); -} - -void -seahorse_source_import_async (SeahorseSource *source, - GInputStream *input, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_return_if_fail (SEAHORSE_IS_SOURCE (source)); - g_return_if_fail (G_IS_INPUT_STREAM (input)); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (SEAHORSE_SOURCE_GET_INTERFACE (source)->import_async); - SEAHORSE_SOURCE_GET_INTERFACE (source)->import_async (source, input, cancellable, - callback, user_data); -} - -GList * -seahorse_source_import_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (SEAHORSE_IS_SOURCE (source), NULL); - g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - g_return_val_if_fail (SEAHORSE_SOURCE_GET_INTERFACE (source)->import_finish, NULL); - return SEAHORSE_SOURCE_GET_INTERFACE (source)->import_finish (source, result, error); -} - -void -seahorse_source_export_async (SeahorseSource *source, - GList *objects, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SeahorseSourceIface *iface; - GList *l; - GList *ids; - - g_return_if_fail (SEAHORSE_IS_SOURCE (source)); - g_return_if_fail (G_IS_OUTPUT_STREAM (output)); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - - iface = SEAHORSE_SOURCE_GET_INTERFACE (source); - g_return_if_fail (iface->export_async != NULL || iface->export_raw_async != NULL); - - if (iface->export_async) { - iface->export_async (source, objects, output, - cancellable, callback, user_data); - return; - } - - for (l = objects; l != NULL; l = g_list_next (l)) - ids = g_list_prepend (ids, GUINT_TO_POINTER (seahorse_object_get_id (l->data))); - - ids = g_list_reverse (ids); - (iface->export_raw_async) (source, ids, output, cancellable, callback, user_data); - g_list_free (ids); -} - -GOutputStream * -seahorse_source_export_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - SeahorseSourceIface *iface; - - g_return_val_if_fail (SEAHORSE_IS_SOURCE (source), NULL); - g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - iface = SEAHORSE_SOURCE_GET_INTERFACE (source); - g_return_val_if_fail (iface->export_async != NULL || iface->export_raw_async != NULL, NULL); - - if (iface->export_async) { - g_return_val_if_fail (iface->export_finish, NULL); - return (iface->export_finish) (source, result, error); - } else { - g_return_val_if_fail (iface->export_raw_finish, NULL); - return (iface->export_raw_finish) (source, result, error); - } -} - -typedef struct { - GOutputStream *output; - guint exports; -} export_auto_closure; - -static void -export_auto_free (gpointer data) -{ - export_auto_closure *closure = data; - g_object_unref (closure->output); - g_free (closure); -} - -static void -on_export_auto_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - export_auto_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - if (!seahorse_source_export_finish (SEAHORSE_SOURCE (source), result, &error)) - g_simple_async_result_take_error (res, error); - - g_assert (closure->exports > 0); - closure->exports--; - - if (closure->exports == 0) - g_simple_async_result_complete (res); - - g_object_unref (res); -} - -void -seahorse_source_export_auto_async (GList *objects, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - export_auto_closure *closure; - SeahorseSource *source; - SeahorseObject *object; - GList *next; - - res = g_simple_async_result_new (NULL, callback, user_data, - seahorse_source_export_auto_async); - closure = g_new0 (export_auto_closure, 1); - closure->output = g_object_ref (output); - g_simple_async_result_set_op_res_gpointer (res, closure, export_auto_free); - - /* Sort by object source */ - objects = g_list_copy (objects); - objects = seahorse_util_objects_sort (objects); - - while (objects) { - - /* Break off one set (same source) */ - next = seahorse_util_objects_splice (objects); - - g_assert (SEAHORSE_IS_OBJECT (objects->data)); - object = SEAHORSE_OBJECT (objects->data); - - /* Export from this object source */ - source = seahorse_object_get_source (object); - g_return_if_fail (source != NULL); - - /* We pass our own data object, to which data is appended */ - seahorse_source_export_async (source, objects, output, cancellable, - on_export_auto_complete, g_object_ref (res)); - closure->exports++; - - g_list_free (objects); - objects = next; - } - - if (closure->exports == 0) - g_simple_async_result_complete_in_idle (res); - - g_object_unref (res); -} - -GOutputStream * -seahorse_source_export_auto_finish (GAsyncResult *result, - GError **error) -{ - export_auto_closure *closure; - - g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, - seahorse_source_export_auto_async), NULL); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; - - closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); - return closure->output; - -} - -static void -on_export_auto_wait_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GAsyncResult **ret = user_data; - *ret = g_object_ref (result); -} - -gboolean -seahorse_source_export_auto_wait (GList *objects, - GOutputStream *output, - GError **error) -{ - GAsyncResult *result = NULL; - gboolean ret; - - seahorse_source_export_auto_async (objects, output, NULL, - on_export_auto_wait_complete, - &result); - - seahorse_util_wait_until (result != NULL); - - ret = seahorse_source_export_auto_finish (result, error) != NULL; - g_object_unref (result); - return ret; -} - -void -seahorse_source_export_raw_async (SeahorseSource *source, - GList *ids, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SeahorseSourceIface *iface; - SeahorseObject *object; - GList *objects = NULL; - GList *l; - - g_return_if_fail (SEAHORSE_IS_SOURCE (source)); - g_return_if_fail (output == NULL || G_IS_OUTPUT_STREAM (output)); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - - iface = SEAHORSE_SOURCE_GET_INTERFACE (source); - - /* Either export or export_raw must be implemented */ - if (iface->export_raw_async) { - (iface->export_raw_async) (source, ids, output, cancellable, callback, user_data); - return; - } - - g_return_if_fail (iface->export_async != NULL); - - for (l = ids; l != NULL; l = g_list_next (l)) { - object = seahorse_context_get_object (seahorse_context_instance (), - source, GPOINTER_TO_UINT (l->data)); - - /* TODO: A proper error message here 'not found' */ - if (object != NULL) - objects = g_list_prepend (objects, object); - } - - objects = g_list_reverse (objects); - (iface->export_async) (source, objects, output, cancellable, callback, user_data); - g_list_free (objects); -} - -GOutputStream * -seahorse_source_export_raw_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - SeahorseSourceIface *iface; - - g_return_val_if_fail (SEAHORSE_IS_SOURCE (source), NULL); - g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - iface = SEAHORSE_SOURCE_GET_INTERFACE (source); - g_return_val_if_fail (iface->export_async != NULL || iface->export_raw_async != NULL, NULL); - - if (iface->export_raw_async) { - g_return_val_if_fail (iface->export_raw_finish, NULL); - return (iface->export_raw_finish) (source, result, error); - } else { - g_return_val_if_fail (iface->export_finish, NULL); - return (iface->export_finish) (source, result, error); - } -} - -/** -* seahorse_source_get_tag: -* @sksrc: The seahorse source object -* -* -* Returns: The source-tag property of the object. As #GQuark -*/ -GQuark -seahorse_source_get_tag (SeahorseSource *sksrc) -{ - GQuark ktype; - g_object_get (sksrc, "source-tag", &ktype, NULL); - return ktype; -} - -/** - * seahorse_source_get_location: - * @sksrc: The seahorse source object - * - * - * - * Returns: The location (#SeahorseLocation) of this object - */ -SeahorseLocation -seahorse_source_get_location (SeahorseSource *sksrc) -{ - SeahorseLocation loc; - g_object_get (sksrc, "source-location", &loc, NULL); - return loc; -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-source.h seahorse-3.6.3/libseahorse/seahorse-source.h --- seahorse-3.2.2/libseahorse/seahorse-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-source.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,189 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2004,2005 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/** - * SeahorseSource: Base class for other sources. - * - * - A generic interface for accessing sources. - * - Eventually more functionality will be merged from seahorse-op.* into - * this class and derived classes. - * - Each SeahorseObject has a weak pointer to the SeahorseSource that - * created it. - * - * Properties base classes must implement: - * ktype: (GQuark) The ktype (ie: SEAHORSE_PGP) of objects originating from this - * object source. - * location: (SeahorseLocation) The location of objects that come from this - * source. (ie: SEAHORSE_LOCATION_LOCAL, SEAHORSE_LOCATION_REMOTE) - * uri: (gchar*) Only for remote object sources. The full URI of the keyserver - * being used. - */ - - -#ifndef __SEAHORSE_SOURCE_H__ -#define __SEAHORSE_SOURCE_H__ - -#include "seahorse-types.h" - -#include -#include - -#define SEAHORSE_TYPE_SOURCE (seahorse_source_get_type ()) -#define SEAHORSE_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SOURCE, SeahorseSource)) -#define SEAHORSE_IS_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SOURCE)) -#define SEAHORSE_SOURCE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_SOURCE, SeahorseSourceIface)) - -struct _SeahorseObject; - -typedef struct _SeahorseSource SeahorseSource; -typedef struct _SeahorseSourceIface SeahorseSourceIface; - -struct _SeahorseSourceIface { - GTypeInterface parent; - - /* virtual methods ------------------------------------------------- */ - - void (*load_async) (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - - gboolean (*load_finish) (SeahorseSource *source, - GAsyncResult *result, - GError **error); - - void (*search_async) (SeahorseSource *source, - const gchar *match, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - - GList * (*search_finish) (SeahorseSource *source, - GAsyncResult *result, - GError **error); - - void (*import_async) (SeahorseSource *source, - GInputStream *input, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - - GList * (*import_finish) (SeahorseSource *source, - GAsyncResult *result, - GError **error); - - void (*export_async) (SeahorseSource *source, - GList *objects, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - - GOutputStream * (*export_finish) (SeahorseSource *source, - GAsyncResult *result, - GError **error); - - void (*export_raw_async) (SeahorseSource *source, - GList *ids, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - - GOutputStream * (*export_raw_finish) (SeahorseSource *source, - GAsyncResult *result, - GError **error); -}; - -GType seahorse_source_get_type (void) G_GNUC_CONST; - -/* Method helper functions ------------------------------------------- */ - -void seahorse_source_load_async (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_source_load_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error); - -void seahorse_source_search_async (SeahorseSource *source, - const gchar *match, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GList * seahorse_source_search_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error); - -void seahorse_source_import_async (SeahorseSource *source, - GInputStream *input, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GList * seahorse_source_import_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error); - -void seahorse_source_export_async (SeahorseSource *source, - GList *objects, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GOutputStream * seahorse_source_export_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error); - -void seahorse_source_export_auto_async (GList *objects, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GOutputStream * seahorse_source_export_auto_finish (GAsyncResult *result, - GError **error); - -gboolean seahorse_source_export_auto_wait (GList *objects, - GOutputStream *output, - GError **error); - -void seahorse_source_export_raw_async (SeahorseSource *source, - GList *ids, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GOutputStream * seahorse_source_export_raw_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error); - -GQuark seahorse_source_get_tag (SeahorseSource *source); - -SeahorseLocation seahorse_source_get_location (SeahorseSource *source); - -#endif /* __SEAHORSE_SOURCE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-transfer.c seahorse-3.6.3/libseahorse/seahorse-transfer.c --- seahorse-3.2.2/libseahorse/seahorse-transfer.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-transfer.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,205 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include - -#include "seahorse-transfer.h" -#include "seahorse-progress.h" -#include "seahorse-util.h" - -#define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION -#include "seahorse-debug.h" - -typedef struct { - GCancellable *cancellable; - SeahorseSource *from; - SeahorseSource *to; - GOutputStream *output; - GList *keyids; -} transfer_closure; - -static void -transfer_closure_free (gpointer user_data) -{ - transfer_closure *closure = user_data; - - g_clear_object (&closure->from); - g_clear_object (&closure->to); - g_clear_object (&closure->output); - g_clear_object (&closure->cancellable); - g_list_free (closure->keyids); - g_free (closure); -} - -static void -on_source_import_ready (GObject *object, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - transfer_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - seahorse_debug ("[transfer] import done"); - seahorse_progress_end (closure->cancellable, &closure->to); - - if (seahorse_source_import_finish (closure->to, result, &error)) - g_cancellable_set_error_if_cancelled (closure->cancellable, &error); - - if (error != NULL) - g_simple_async_result_take_error (res, error); - - g_simple_async_result_complete (res); - g_object_unref (user_data); -} - -static void -on_source_export_ready (GObject *object, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - transfer_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - gpointer stream_data; - gsize stream_size; - GInputStream *input; - - seahorse_debug ("[transfer] export done"); - seahorse_progress_end (closure->cancellable, &closure->from); - - if (seahorse_source_export_raw_finish (closure->from, result, &error)) - g_cancellable_set_error_if_cancelled (closure->cancellable, &error); - - if (error == NULL) { - seahorse_progress_begin (closure->cancellable, &closure->to); - - stream_data = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (closure->output)); - stream_size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (closure->output)); - - if (!stream_size) { - seahorse_debug ("[transfer] nothing to import"); - seahorse_progress_end (closure->cancellable, &closure->to); - g_simple_async_result_complete (res); - - } else { - input = g_memory_input_stream_new_from_data (g_memdup (stream_data, stream_size), - stream_size, g_free); - - seahorse_debug ("[transfer] starting import"); - seahorse_source_import_async (closure->to, input, closure->cancellable, - on_source_import_ready, g_object_ref (res)); - g_object_unref (input); - } - - } else { - seahorse_debug ("[transfer] stopped after export"); - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - } - - g_object_unref (user_data); -} - -static gboolean -on_timeout_start_transfer (gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - transfer_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - - g_assert (SEAHORSE_IS_SOURCE (closure->from)); - g_assert (closure->keyids); - - seahorse_progress_begin (closure->cancellable, &closure->from); - seahorse_source_export_raw_async (closure->from, closure->keyids, closure->output, - closure->cancellable, on_source_export_ready, - g_object_ref (res)); - - return FALSE; /* Don't run again */ -} - -void -seahorse_transfer_async (SeahorseSource *from, - SeahorseSource *to, - GList *keyids, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - transfer_closure *closure = NULL; - SeahorseLocation location; - - g_return_if_fail (SEAHORSE_SOURCE (from)); - g_return_if_fail (SEAHORSE_SOURCE (to)); - - res = g_simple_async_result_new (NULL, callback, user_data, - seahorse_transfer_async); - - if (!keyids) { - g_simple_async_result_complete_in_idle (res); - g_object_unref (res); - return; - } - - closure = g_new0 (transfer_closure, 1); - closure->cancellable = cancellable ? g_object_ref (cancellable) : cancellable; - closure->from = g_object_ref (from); - closure->to = g_object_ref (to); - closure->keyids = g_list_copy (keyids); - closure->output = g_memory_output_stream_new (NULL, 0, g_realloc, g_free); - g_simple_async_result_set_op_res_gpointer (res, closure, transfer_closure_free); - - location = seahorse_source_get_location (from); - seahorse_progress_prep (cancellable, &closure->from, - (location == SEAHORSE_LOCATION_REMOTE) ? - _("Retrieving data") : _("Exporting data")); - location = seahorse_source_get_location (to); - seahorse_progress_prep (cancellable, &closure->to, - (location == SEAHORSE_LOCATION_REMOTE) ? - _("Importing data") : _("Sending data")); - - seahorse_debug ("starting export"); - - /* We delay and continue from a callback */ - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 0, - on_timeout_start_transfer, - g_object_ref (res), g_object_unref); - - g_object_unref (res); -} - -gboolean -seahorse_transfer_finish (GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, - seahorse_transfer_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-transfer.h seahorse-3.6.3/libseahorse/seahorse-transfer.h --- seahorse-3.2.2/libseahorse/seahorse-transfer.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-transfer.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __SEAHORSE_TRANSFER_H__ -#define __SEAHORSE_TRANSFER_H__ - -#include "seahorse-source.h" - -void seahorse_transfer_async (SeahorseSource *from, - SeahorseSource *to, - GList *keyids, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_transfer_finish (GAsyncResult *result, - GError **error); - -#endif /* __SEAHORSE_TRANSFER_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-types.c seahorse-3.6.3/libseahorse/seahorse-types.c --- seahorse-3.2.2/libseahorse/seahorse-types.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-types.c 2012-08-21 12:23:17.000000000 +0200 @@ -23,26 +23,8 @@ #include "seahorse-types.h" -GType seahorse_location_get_type (void) -{ - static GType seahorse_location_type_id = 0; - if (!seahorse_location_type_id) { - static const GEnumValue values[] = { - { SEAHORSE_LOCATION_INVALID, "SEAHORSE_LOCATION_INVALID", "invalid" }, - { SEAHORSE_LOCATION_MISSING, "SEAHORSE_LOCATION_MISSING", "missing" }, - { SEAHORSE_LOCATION_SEARCHING, "SEAHORSE_LOCATION_SEARCHING", "searching" }, - { SEAHORSE_LOCATION_REMOTE, "SEAHORSE_LOCATION_REMOTE", "remote" }, - { SEAHORSE_LOCATION_LOCAL, "SEAHORSE_LOCATION_LOCAL", "local" }, - { 0, NULL, NULL } - }; - seahorse_location_type_id = g_enum_register_static ("SeahorseLocation", values); - } - return seahorse_location_type_id; -} - - - -GType seahorse_usage_get_type (void) +GType +seahorse_usage_get_type (void) { static GType seahorse_usage_type_id = 0; if (!seahorse_usage_type_id) { @@ -60,3 +42,27 @@ } return seahorse_usage_type_id; } + +GType +seahorse_flags_get_type (void) +{ + static GType etype = 0; + if (G_UNLIKELY(etype == 0)) { + static const GFlagsValue values[] = { + { SEAHORSE_FLAG_NONE, "SEAHORSE_FLAG_NONE", "none" }, + { SEAHORSE_FLAG_IS_VALID, "SEAHORSE_FLAG_IS_VALID", "is-valid" }, + { SEAHORSE_FLAG_CAN_ENCRYPT, "SEAHORSE_FLAG_CAN_ENCRYPT", "can-encrypt" }, + { SEAHORSE_FLAG_CAN_SIGN, "SEAHORSE_FLAG_CAN_SIGN", "can-sign" }, + { SEAHORSE_FLAG_EXPIRED, "SEAHORSE_FLAG_EXPIRED", "expired" }, + { SEAHORSE_FLAG_REVOKED, "SEAHORSE_FLAG_REVOKED", "revoked" }, + { SEAHORSE_FLAG_DISABLED, "SEAHORSE_FLAG_DISABLED", "disabled" }, + { SEAHORSE_FLAG_TRUSTED, "SEAHORSE_FLAG_TRUSTED", "trusted" }, + { SEAHORSE_FLAG_PERSONAL, "SEAHORSE_FLAG_PERSONAL", "personal" }, + { SEAHORSE_FLAG_EXPORTABLE, "SEAHORSE_FLAG_EXPORTABLE", "exportable" }, + { SEAHORSE_FLAG_DELETABLE, "SEAHORSE_FLAG_DELETABLE", "deletable" }, + { 0, NULL, NULL } + }; + etype = g_flags_register_static (g_intern_static_string ("SeahorseFlags"), values); + } + return etype; +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-types.h seahorse-3.6.3/libseahorse/seahorse-types.h --- seahorse-3.2.2/libseahorse/seahorse-types.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-types.h 2012-08-21 12:23:17.000000000 +0200 @@ -28,24 +28,8 @@ G_BEGIN_DECLS -#define SEAHORSE_TYPE_LOCATION (seahorse_location_get_type ()) - #define SEAHORSE_TYPE_USAGE (seahorse_usage_get_type ()) -/* - * These types should never change. These values are exported. In the - * case of a key being in multiple locations, the highest location always 'wins'. - */ -typedef enum { - SEAHORSE_LOCATION_INVALID = 0, - SEAHORSE_LOCATION_MISSING = 10, - SEAHORSE_LOCATION_SEARCHING = 20, - SEAHORSE_LOCATION_REMOTE = 50, - SEAHORSE_LOCATION_LOCAL = 100 -} SeahorseLocation; - -GType seahorse_location_get_type (void); - /* Again, never change these values */ typedef enum { SEAHORSE_USAGE_NONE = 0, @@ -57,9 +41,12 @@ SEAHORSE_USAGE_OTHER = 10 } SeahorseUsage; -GType seahorse_usage_get_type (void); +GType seahorse_usage_get_type (void) G_GNUC_CONST; + +#define SEAHORSE_TYPE_FLAGS (seahorse_flags_get_type ()) typedef enum { + SEAHORSE_FLAG_NONE = 0, SEAHORSE_FLAG_IS_VALID = 0x00000001, SEAHORSE_FLAG_CAN_ENCRYPT = 0x00000002, SEAHORSE_FLAG_CAN_SIGN = 0x00000004, @@ -67,11 +54,12 @@ SEAHORSE_FLAG_REVOKED = 0x00000200, SEAHORSE_FLAG_DISABLED = 0x00000400, SEAHORSE_FLAG_TRUSTED = 0x00001000, + SEAHORSE_FLAG_PERSONAL = 0x00002000, SEAHORSE_FLAG_EXPORTABLE = 0x00100000, SEAHORSE_FLAG_DELETABLE = 0x10000000 -} SeahorseKeyFlags; +} SeahorseFlags; -#define SEAHORSE_TAG_INVALID 0 +GType seahorse_flags_get_type (void) G_GNUC_CONST; G_END_DECLS diff -Nru seahorse-3.2.2/libseahorse/seahorse-unknown.c seahorse-3.6.3/libseahorse/seahorse-unknown.c --- seahorse-3.2.2/libseahorse/seahorse-unknown.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-unknown.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * - * 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 "config.h" - -#include "seahorse-unknown.h" - -#include "seahorse-unknown-source.h" - -#include - -G_DEFINE_TYPE (SeahorseUnknown, seahorse_unknown, SEAHORSE_TYPE_OBJECT); - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - - -static void -seahorse_unknown_init (SeahorseUnknown *self) -{ - -} - -static void -seahorse_unknown_class_init (SeahorseUnknownClass *klass) -{ - -} - -/* ----------------------------------------------------------------------------- - * PUBLIC METHODS - */ - -SeahorseUnknown* -seahorse_unknown_new (SeahorseUnknownSource *source, GQuark id, const gchar *display) -{ - SeahorseUnknown *self; - - if (!display) - display = _("Unavailable"); - - self = g_object_new (SEAHORSE_TYPE_UNKNOWN, "source", source, - "label", display, "id", id, NULL); - return self; -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-unknown.h seahorse-3.6.3/libseahorse/seahorse-unknown.h --- seahorse-3.2.2/libseahorse/seahorse-unknown.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-unknown.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * - * 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 __SEAHORSE_UNKNOWN_H__ -#define __SEAHORSE_UNKNOWN_H__ - -#include - -#include "seahorse-object.h" -#include "seahorse-unknown-source.h" - -#define SEAHORSE_TYPE_UNKNOWN (seahorse_unknown_get_type ()) -#define SEAHORSE_UNKNOWN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_UNKNOWN, SeahorseUnknown)) -#define SEAHORSE_UNKNOWN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_UNKNOWN, SeahorseUnknownClass)) -#define SEAHORSE_IS_UNKNOWN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_UNKNOWN)) -#define SEAHORSE_IS_UNKNOWN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_UNKNOWN)) -#define SEAHORSE_UNKNOWN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_UNKNOWN, SeahorseUnknownClass)) - -typedef struct _SeahorseUnknown SeahorseUnknown; -typedef struct _SeahorseUnknownClass SeahorseUnknownClass; - -struct _SeahorseUnknown { - SeahorseObject parent; - - /*< public >*/ - gchar *display; -}; - -struct _SeahorseUnknownClass { - SeahorseObjectClass parent_class; -}; - -GType seahorse_unknown_get_type (void); - -SeahorseUnknown* seahorse_unknown_new (SeahorseUnknownSource *usrc, - GQuark id, - const gchar *display); - -#endif /* __SEAHORSE_UNKNOWN_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-unknown-source.c seahorse-3.6.3/libseahorse/seahorse-unknown-source.c --- seahorse-3.2.2/libseahorse/seahorse-unknown-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-unknown-source.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,191 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include - -#include "seahorse-unknown-source.h" - -#include "seahorse-context.h" -#include "seahorse-registry.h" -#include "seahorse-unknown.h" - -enum { - PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION, - PROP_CONSTRUCT_TAG, -}; - -static void seahorse_source_iface (SeahorseSourceIface *iface); - -G_DEFINE_TYPE_EXTENDED (SeahorseUnknownSource, seahorse_unknown_source, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_unknown_source_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorseUnknownSource *usrc = SEAHORSE_UNKNOWN_SOURCE (object); - - switch (prop_id) { - case PROP_CONSTRUCT_TAG: - usrc->ktype = g_value_get_uint (value); - break; - } -} - -static void -seahorse_unknown_source_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorseUnknownSource *usrc = SEAHORSE_UNKNOWN_SOURCE (object); - - switch (prop_id) { - case PROP_SOURCE_TAG: - g_value_set_uint (value, usrc->ktype); - break; - case PROP_CONSTRUCT_TAG: - g_value_set_uint (value, usrc->ktype); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_MISSING); - break; - } -} - -static void -seahorse_unknown_source_init (SeahorseUnknownSource *ssrc) -{ - -} - -static void -seahorse_unknown_source_class_init (SeahorseUnknownSourceClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_unknown_source_parent_class = g_type_class_peek_parent (klass); - - gobject_class->set_property = seahorse_unknown_source_set_property; - gobject_class->get_property = seahorse_unknown_source_get_property; - - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - - /* - * This is a writable construct only property that lets us construct this - * class with different 'source-tag' property. The 'source-tag' property - * is read-only, and so we can't use it directly. - */ - g_object_class_install_property (gobject_class, PROP_CONSTRUCT_TAG, - g_param_spec_uint ("construct-tag", "Construct Tag", "Set source-tag during construction of object", - 0, G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - seahorse_registry_register_type (NULL, SEAHORSE_TYPE_UNKNOWN_SOURCE, "source", NULL); -} - - -static void -seahorse_unknown_source_load_async (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, - seahorse_unknown_source_load_async); - - g_simple_async_result_complete_in_idle (res); - g_object_unref (res); -} - -static gboolean -seahorse_unknown_source_load_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_unknown_source_load_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} - -static void -seahorse_source_iface (SeahorseSourceIface *iface) -{ - iface->load_async = seahorse_unknown_source_load_async; - iface->load_finish = seahorse_unknown_source_load_finish; -} - -SeahorseUnknownSource* -seahorse_unknown_source_new (GQuark ktype) -{ - return g_object_new (SEAHORSE_TYPE_UNKNOWN_SOURCE, - "construct-tag", ktype, - NULL); -} - -static void -on_cancellable_gone (gpointer user_data, - GObject *where_the_object_was) -{ - SeahorseObject *object = SEAHORSE_OBJECT (user_data); - g_object_set (object, "location", SEAHORSE_LOCATION_MISSING, NULL); -} - -SeahorseObject * -seahorse_unknown_source_add_object (SeahorseUnknownSource *self, - GQuark id, - GCancellable *cancellable) -{ - SeahorseObject *object; - SeahorseContext *context; - - g_return_val_if_fail (id != 0, NULL); - g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), NULL); - - context = seahorse_context_instance (); - object = seahorse_context_get_object (context, SEAHORSE_SOURCE (self), id); - if (!object) { - object = SEAHORSE_OBJECT (seahorse_unknown_new (self, id, NULL)); - seahorse_context_add_object (context, object); - } - - if (cancellable) { - g_object_set (object, "location", SEAHORSE_LOCATION_SEARCHING, NULL); - g_object_weak_ref (G_OBJECT (cancellable), on_cancellable_gone, object); - } else { - g_object_set (object, "location", SEAHORSE_LOCATION_MISSING, NULL); - } - - return object; -} diff -Nru seahorse-3.2.2/libseahorse/seahorse-unknown-source.h seahorse-3.6.3/libseahorse/seahorse-unknown-source.h --- seahorse-3.2.2/libseahorse/seahorse-unknown-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-unknown-source.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __SEAHORSE_UNKNOWN_SOURCE_H__ -#define __SEAHORSE_UNKNOWN_SOURCE_H__ - -#include "seahorse-object.h" -#include "seahorse-source.h" - -#define SEAHORSE_TYPE_UNKNOWN_SOURCE (seahorse_unknown_source_get_type ()) -#define SEAHORSE_UNKNOWN_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_UNKNOWN_SOURCE, SeahorseUnknownSource)) -#define SEAHORSE_UNKNOWN_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_UNKNOWN_SOURCE, SeahorseUnknownSourceClass)) -#define SEAHORSE_IS_UNKNOWN_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_UNKNOWN_SOURCE)) -#define SEAHORSE_IS_UNKNOWN_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_UNKNOWN_SOURCE)) -#define SEAHORSE_UNKNOWN_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_UNKNOWN_SOURCE, SeahorseUnknownSourceClass)) - -typedef struct _SeahorseUnknownSource SeahorseUnknownSource; -typedef struct _SeahorseUnknownSourceClass SeahorseUnknownSourceClass; -typedef struct _SeahorseUnknownSourcePrivate SeahorseUnknownSourcePrivate; - -/** - * SeahorseUnknownSource: - * @parent: The parent #GObject - * @ktype: The #GQuark key type for the source - * - * A source for unknown objects - * - * - Derived from SeahorseSource - * - Is used for objects that haven't been found on a key server. - * - * Properties: - * ktype: (GQuark) The ktype (ie: SKEY_UNKNOWN) of keys originating from this - key source. - * location: (SeahorseLocation) The location of objects that come from this - * source. (ie: SEAHORSE_LOCATION_MISSING) - */ - -struct _SeahorseUnknownSource { - GObject parent; - GQuark ktype; -}; - -struct _SeahorseUnknownSourceClass { - GObjectClass parent_class; -}; - -GType seahorse_unknown_source_get_type (void); - -SeahorseUnknownSource* seahorse_unknown_source_new (GQuark ktype); - -SeahorseObject* seahorse_unknown_source_add_object (SeahorseUnknownSource *self, - GQuark id, - GCancellable *cancellable); - -#endif /* __SEAHORSE_UNKNOWN_SOURCE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-util.c seahorse-3.6.3/libseahorse/seahorse-util.c --- seahorse-3.2.2/libseahorse/seahorse-util.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-util.c 2012-11-09 11:08:13.000000000 +0100 @@ -27,18 +27,13 @@ #include "seahorse-util.h" #include "seahorse-widget.h" -#include "pgp/seahorse-pgp-module.h" +#include "pgp/seahorse-pgp.h" -#include "ssh/seahorse-ssh-module.h" +#include "ssh/seahorse-ssh.h" #include #include -#ifdef WITH_SHARING -#include -#include -#endif - #include #include #include @@ -52,8 +47,6 @@ #include -static const gchar *bad_filename_chars = "/\\<>|"; - /** * seahorse_util_show_error: * @parent: The parent widget. Can be NULL @@ -66,7 +59,9 @@ * */ void -seahorse_util_show_error (GtkWidget *parent, const gchar *heading, const gchar *message) +seahorse_util_show_error (gpointer parent, + const gchar *heading, + const gchar *message) { GtkWidget *dialog; @@ -145,6 +140,7 @@ else g_warning ("unsupported 'parent' argument passed to seahorse_util_handle_error() "); + g_dbus_error_strip_remote_error (*error); seahorse_util_show_error (widget, text, (*error)->message ? (*error)->message : ""); g_free (text); @@ -152,51 +148,6 @@ } /** - * seahorse_util_prompt_delete: - * @text: The text to display in the delete-dialog - * @parent: The widget to display the dialog for. Can be NULL - * - * Displays a modal dialog with "cancel" and "delete" - * - * Returns: TRUE if the user pressed "delete", FALSE else - */ -gboolean -seahorse_util_prompt_delete (const gchar *text, GtkWidget *parent) -{ - GtkWidget *warning, *button; - gint response; - - if (parent) { - if (!GTK_IS_WIDGET (parent)) { - g_warn_if_reached (); - parent = NULL; - } else { - if (!GTK_IS_WINDOW (parent)) - parent = gtk_widget_get_toplevel (parent); - if (!GTK_IS_WINDOW (parent) && gtk_widget_is_toplevel (parent)) - parent = NULL; - } - } - - warning = gtk_message_dialog_new (GTK_WINDOW (parent), GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, - "%s", text); - - button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); - gtk_dialog_add_action_widget (GTK_DIALOG (warning), GTK_WIDGET (button), GTK_RESPONSE_REJECT); - gtk_widget_show (button); - - button = gtk_button_new_from_stock(GTK_STOCK_DELETE); - gtk_dialog_add_action_widget (GTK_DIALOG (warning), GTK_WIDGET (button), GTK_RESPONSE_ACCEPT); - gtk_widget_show (button); - - response = gtk_dialog_run (GTK_DIALOG (warning)); - gtk_widget_destroy (warning); - - return (response == GTK_RESPONSE_ACCEPT); -} - -/** * seahorse_util_error_domain: * * Returns: The GError domain for generic seahorse errors @@ -415,238 +366,48 @@ return ret; } -/** - * seahorse_util_filename_for_objects: - * @objects: A list of objects - * - * If the single object has a nickname, this will be returned (with .asc attached) - * If there are multiple objects, "Multiple Keys.asc" will be returned. - * Single objects default to "Key Data.asc". - * Results are internationalized - * - * Returns: NULL on error, the filename else. The returned string should be - * freed with #g_free when no longer needed. - */ -gchar* -seahorse_util_filename_for_objects (GList *objects) -{ - SeahorseObject *object; - const gchar *name; - gchar *filename; - - g_return_val_if_fail (g_list_length (objects) > 0, NULL); - - if (g_list_length (objects) == 1) { - g_return_val_if_fail (SEAHORSE_IS_OBJECT (objects->data), NULL); - object = SEAHORSE_OBJECT (objects->data); - name = seahorse_object_get_nickname (object); - if (name == NULL) - name = _("Key Data"); +GFile * +seahorse_util_file_increment_unique (GFile *file, + guint *state) +{ + GFile *result; + gchar *suffix; + gchar *prefix; + gchar *uri_try; + gchar *x; + guint len; + + g_return_val_if_fail (G_IS_FILE (file), NULL); + g_return_val_if_fail (state != NULL, NULL); + + prefix = g_file_get_uri (file); + len = strlen (prefix); + + g_return_val_if_fail (len > 0, NULL); + + /* Always take off a slash at end */ + if (prefix[len - 1] == '/') + prefix[len - 1] = 0; + + /* Split into prefix and suffix */ + suffix = strrchr (prefix, '.'); + x = strrchr (prefix, '/'); + if (suffix == NULL || (x != NULL && suffix < x)) { + suffix = g_strdup (""); } else { - name = _("Multiple Keys"); + x = suffix; + suffix = g_strdup (suffix); + *x = 0; } - - filename = g_strconcat (name, SEAHORSE_EXT_ASC, NULL); - g_strstrip (filename); - g_strdelimit (filename, bad_filename_chars, '_'); - return filename; -} - -/** - * seahorse_util_uri_get_last: - * @uri: The uri to parse - * - * Finds the last portion of @uri. Note that this does - * not modify @uri. If the uri is invalid or has no - * directories then the entire thing is returned. - * - * Returns: Last portion of @uri - **/ -const gchar* -seahorse_util_uri_get_last (const gchar* uri) -{ - const gchar* t; - - g_return_val_if_fail (uri, NULL); - - t = uri + strlen (uri); - - if (*(t - 1) == '/' && t != uri) - t--; - - while (*(t - 1) != '/' && t != uri) - t--; - - return t; -} - -/** - * seahorse_util_uri_exists: - * @uri: The uri to check - * - * Verify whether a given uri exists or not. - * - * Returns: FALSE if it does not exist, TRUE else - **/ -gboolean -seahorse_util_uri_exists (const gchar* uri) -{ - GFile *file; - gboolean exists; - file = g_file_new_for_uri (uri); - g_return_val_if_fail (file, FALSE); - - exists = g_file_query_exists (file, NULL); - g_object_unref (file); - - return exists; -} - -/** - * seahorse_util_uri_unique: - * @uri: The uri to guarantee is unique - * - * Creates a URI based on @uri that does not exist. - * A simple numbering scheme is used to create new - * URIs. Not meant for temp file creation. - * - * Returns: Newly allocated unique URI. - **/ -gchar* -seahorse_util_uri_unique (const gchar* uri) -{ - gchar* suffix; - gchar* prefix; - gchar* uri_try; - gchar* x; - guint len; - int i; - - /* Simple when doesn't exist */ - if (!seahorse_util_uri_exists (uri)) - return g_strdup (uri); - - prefix = g_strdup (uri); - len = strlen (prefix); - - /* Always take off a slash at end */ - g_return_val_if_fail (len > 1, g_strdup (uri)); - if (prefix[len - 1] == '/') - prefix[len - 1] = 0; - - /* Split into prefix and suffix */ - suffix = strrchr (prefix, '.'); - x = strrchr(uri, '/'); - if (suffix == NULL || (x != NULL && suffix < x)) { - suffix = g_strdup (""); - } else { - x = suffix; - suffix = g_strdup (suffix); - *x = 0; - } - - for (i = 1; i < 1000; i++) { - - uri_try = g_strdup_printf ("%s-%d%s", prefix, i, suffix); - - if (!seahorse_util_uri_exists (uri_try)) - break; - - g_free (uri_try); - uri_try = NULL; - } - - g_free (suffix); - g_free (prefix); - return uri_try ? uri_try : g_strdup (uri); -} - -/** - * seahorse_util_detect_mime_type: - * @mime: The mime string - * - * Return the mime type depending on the mime string - * - * Returns: SEAHORSE_PGP, SEAHORSE_SSH or 0 - */ -GQuark -seahorse_util_detect_mime_type (const gchar *mime) -{ - if (!mime || g_ascii_strcasecmp (mime, "application/octet-stream") == 0) { - g_warning ("couldn't get mime type for data"); - return 0; - } - - if (g_ascii_strcasecmp (mime, "application/pgp-encrypted") == 0 || - g_ascii_strcasecmp (mime, "application/pgp-keys") == 0) - return SEAHORSE_PGP; - -#ifdef WITH_SSH - /* TODO: For now all PEM keys are treated as SSH keys */ - else if (g_ascii_strcasecmp (mime, "application/x-ssh-key") == 0 || - g_ascii_strcasecmp (mime, "application/x-pem-key") == 0) - return SEAHORSE_SSH; -#endif - - g_message ("unsupported type of key data: %s", mime); - return 0; -} - -/** - * seahorse_util_detect_data_type: - * @data: The buffer to test for content type - * @length: The length of this buffer - * - * Returns: SEAHORSE_PGP, SEAHORSE_SSH or 0 - */ -GQuark -seahorse_util_detect_data_type (const gchar *data, guint length) -{ - gboolean uncertain; - gchar *mime; - GQuark type; - - mime = g_content_type_guess (NULL, (const guchar*)data, length, &uncertain); - g_return_val_if_fail (mime, 0); - - type = seahorse_util_detect_mime_type (mime); - g_free (mime); - - return type; -} - -/** - * seahorse_util_detect_file_type: - * @uri: The file uri to test for content type - * - * Returns: SEAHORSE_PGP, SEAHORSE_SSH or 0 - */ -GQuark -seahorse_util_detect_file_type (const gchar *uri) -{ - const gchar *mime = NULL; - GQuark type; - GFile *file; - GFileInfo *info; - - file = g_file_new_for_uri (uri); - info = g_file_query_info (file, - G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - 0, - NULL, - NULL); - - g_return_val_if_fail (info, 0); - - mime = g_file_info_get_content_type (info); - - g_return_val_if_fail (mime, 0); - - type = seahorse_util_detect_mime_type (mime); - g_object_unref (info); - - return type; + ++(*state); + uri_try = g_strdup_printf ("%s-%u%s", prefix, *state, suffix); + g_free (suffix); + g_free (prefix); + + result = g_file_new_for_uri (uri_try); + g_free (uri_try); + return result; } /** @@ -667,236 +428,6 @@ } /** - * seahorse_util_chooser_save_new: - * @title: The title of the dialog - * @parent: The parent of the dialog - * - * Creates a file chooser dialog to save files. - * - * Returns: The new save dialog - */ -GtkDialog* -seahorse_util_chooser_save_new (const gchar *title, GtkWindow *parent) -{ - GtkDialog *dialog; - - dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (title, - parent, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL)); - - gtk_dialog_set_default_response (dialog, GTK_RESPONSE_ACCEPT); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); - return dialog; -} - -/** - * seahorse_util_chooser_open_new: - * @title: The title of the dialog - * @parent: The parent of the dialog - * - * Creates a file chooser dialog to open files. - * - * Returns: The new open dialog - */ -GtkDialog* -seahorse_util_chooser_open_new (const gchar *title, GtkWindow *parent) -{ - GtkDialog *dialog; - - dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (title, - parent, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL)); - - gtk_dialog_set_default_response (dialog, GTK_RESPONSE_ACCEPT); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); - return dialog; -} - -/** - * seahorse_util_chooser_show_key_files: - * @dialog: the dialog to add the filter for - * - * Adds a key file filter and a "All files" filter. The key filter - * is used. - * - */ -void -seahorse_util_chooser_show_key_files (GtkDialog *dialog) -{ - GtkFileFilter* filter = gtk_file_filter_new (); - - /* Filter for PGP keys. We also include *.asc, as in many - cases that extension is associated with text/plain */ - gtk_file_filter_set_name (filter, _("All key files")); - gtk_file_filter_add_mime_type (filter, "application/pgp-keys"); -#ifdef WITH_SSH - gtk_file_filter_add_mime_type (filter, "application/x-ssh-key"); - gtk_file_filter_add_mime_type (filter, "application/x-pem-key"); -#endif - gtk_file_filter_add_pattern (filter, "*.asc"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); - gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter); - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("All files")); - gtk_file_filter_add_pattern (filter, "*"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); -} - -/** - * seahorse_util_chooser_show_archive_files: - * @dialog: the dialog to add the filter for - * - * Adds a archive file filter and a "All files" filter. The archive filter - * is used. - * - */ -void -seahorse_util_chooser_show_archive_files (GtkDialog *dialog) -{ - GtkFileFilter* filter; - int i; - - static const char *archive_mime_type[] = { - "application/x-ar", - "application/x-arj", - "application/x-bzip", - "application/x-bzip-compressed-tar", - "application/x-cd-image", - "application/x-compress", - "application/x-compressed-tar", - "application/x-gzip", - "application/x-java-archive", - "application/x-jar", - "application/x-lha", - "application/x-lzop", - "application/x-rar", - "application/x-rar-compressed", - "application/x-tar", - "application/x-zoo", - "application/zip", - "application/x-7zip" - }; - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("Archive files")); - for (i = 0; i < G_N_ELEMENTS (archive_mime_type); i++) - gtk_file_filter_add_mime_type (filter, archive_mime_type[i]); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); - gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter); - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("All files")); - gtk_file_filter_add_pattern (filter, "*"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); -} - -/** - * seahorse_util_chooser_set_filename_full: - * @dialog: The dialog to pre set the name - * @objects: generate the file name from this object - * - * - */ -void -seahorse_util_chooser_set_filename_full (GtkDialog *dialog, GList *objects) -{ - gchar *t = NULL; - - if (g_list_length (objects) > 0) { - t = seahorse_util_filename_for_objects (objects); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), t); - g_free (t); - } -} - -/** - * seahorse_util_chooser_set_filename: - * @dialog: set the dialog for this - * @object: The object to use for the filename. #SeahorseObject - * - */ -void -seahorse_util_chooser_set_filename (GtkDialog *dialog, SeahorseObject *object) -{ - GList *objects = g_list_append (NULL, object); - seahorse_util_chooser_set_filename_full (dialog, objects); - g_list_free (objects); -} - -/** - * seahorse_util_chooser_save_prompt: - * @dialog: save dialog to show - * - * If the selected file already exists, a confirmation dialog will be displayed - * - * Returns: the uri of the chosen file or NULL - */ -gchar* -seahorse_util_chooser_save_prompt (GtkDialog *dialog) -{ - GtkWidget* edlg; - gchar *uri = NULL; - - while (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) { - - uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER (dialog)); - - if (uri == NULL) - continue; - - if (seahorse_util_uri_exists (uri)) { - - edlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (dialog), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, _("A file already exists with this name.\n\nDo you want to replace it with a new file?")); - gtk_dialog_add_buttons (GTK_DIALOG (edlg), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - _("_Replace"), GTK_RESPONSE_ACCEPT, NULL); - - gtk_dialog_set_default_response (GTK_DIALOG (edlg), GTK_RESPONSE_CANCEL); - - if (gtk_dialog_run (GTK_DIALOG (edlg)) != GTK_RESPONSE_ACCEPT) { - g_free (uri); - uri = NULL; - } - - gtk_widget_destroy (edlg); - } - - if (uri != NULL) - break; - } - - gtk_widget_destroy (GTK_WIDGET (dialog)); - return uri; -} - -/** - * seahorse_util_chooser_open_prompt: - * @dialog: open dialog to display - * - * Display an open dialog - * - * Returns: The uri of the file to open or NULL - */ -gchar* -seahorse_util_chooser_open_prompt (GtkDialog *dialog) -{ - gchar *uri = NULL; - - if(gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) - uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - - gtk_widget_destroy (GTK_WIDGET (dialog)); - return uri; -} - -/** * sort_objects_by_source: * @k1: the first seahorse object * @k2: The second seahorse object @@ -906,77 +437,77 @@ * Returns: if source of k1k2. If the sources are equal it returns 0 */ -static gint -sort_objects_by_source (SeahorseObject *k1, SeahorseObject *k2) +static gint +sort_objects_by_place (GObject *k1, + GObject *k2) { - SeahorseSource *sk1, *sk2; - - g_assert (SEAHORSE_IS_OBJECT (k1)); - g_assert (SEAHORSE_IS_OBJECT (k2)); - - sk1 = seahorse_object_get_source (k1); - sk2 = seahorse_object_get_source (k2); - - if (sk1 == sk2) - return 0; - - return sk1 < sk2 ? -1 : 1; -} + SeahorsePlace *sk1 = NULL; + SeahorsePlace *sk2 = NULL; + g_assert (G_IS_OBJECT (k1)); + g_assert (G_IS_OBJECT (k2)); + + g_object_get (k1, "place", &sk1, NULL); + g_object_get (k2, "place", &sk2, NULL); + + if (sk1 == sk2) + return 0; + return sk1 < sk2 ? -1 : 1; +} /** * seahorse_util_objects_sort: - * @objects: #SeahorseObject #GList to sort + * @objects: #GObject #GList to sort * * The objects are sorted by their source * * Returns: The sorted list */ -GList* -seahorse_util_objects_sort (GList *objects) +GList * +seahorse_util_objects_sort_by_place (GList *objects) { - return g_list_sort (objects, (GCompareFunc)sort_objects_by_source); + return g_list_sort (objects, (GCompareFunc)sort_objects_by_place); } /** * seahorse_util_objects_splice: - * @objects: A #GList of #SeahorseObject. Must be sorted + * @objects: A #GList of #GObject. Must be sorted * * Splices the list at the source disconuity * * Returns: The second part of the list. */ -GList* -seahorse_util_objects_splice (GList *objects) +GList * +seahorse_util_objects_splice_by_place (GList *objects) { - SeahorseSource *psk = NULL; - SeahorseSource *sk; - GList *prev = NULL; - - /* Note that the objects must be sorted */ - - for ( ; objects; objects = g_list_next (objects)) { - - g_return_val_if_fail (SEAHORSE_IS_OBJECT (objects->data), NULL); - sk = seahorse_object_get_source (SEAHORSE_OBJECT (objects->data)); - - /* Found a disconuity */ - if (psk && sk != psk) { - g_assert (prev != NULL); - - /* Break the list */ - prev->next = NULL; - - /* And return the new list */ - return objects; - } - - psk = sk; - prev = objects; - } - - return NULL; + SeahorsePlace *psk = NULL; + SeahorsePlace *sk; + GList *prev = NULL; + + /* Note that the objects must be sorted */ + for ( ; objects; objects = g_list_next (objects)) { + g_return_val_if_fail (G_IS_OBJECT (objects->data), NULL); + sk = NULL; + g_object_get (objects->data, "place", &sk, NULL); + g_return_val_if_fail (sk != NULL, NULL); + + /* Found a disconuity */ + if (psk && sk != psk) { + g_assert (prev != NULL); + + /* Break the list */ + prev->next = NULL; + + /* And return the new list */ + return objects; + } + + psk = sk; + prev = objects; + } + + return NULL; } /** @@ -1162,49 +693,3 @@ g_strfreev(tokens); return ret; } - -/* ----------------------------------------------------------------------------- - * DNS-SD Stuff - */ - -#ifdef WITH_SHARING - -/* - * We have this stuff here because it needs to: - * - Be usable from libseahorse and anything within libseahorse - * - Be initialized properly only once per process. - */ - -#include -#include - -static AvahiGLibPoll *avahi_poll = NULL; - -static void -free_avahi () -{ - if (avahi_poll) - avahi_glib_poll_free (avahi_poll); - avahi_poll = NULL; -} - -const AvahiPoll* -seahorse_util_dns_sd_get_poll (void) -{ - if (!avahi_poll) { - - avahi_set_allocator (avahi_glib_allocator ()); - - avahi_poll = avahi_glib_poll_new (NULL, G_PRIORITY_DEFAULT); - if (!avahi_poll) { - g_warning ("couldn't initialize avahi glib poll integration"); - return NULL; - } - - g_atexit (free_avahi); - } - - return avahi_glib_poll_get (avahi_poll); -} - -#endif diff -Nru seahorse-3.2.2/libseahorse/seahorse-util.h seahorse-3.6.3/libseahorse/seahorse-util.h --- seahorse-3.2.2/libseahorse/seahorse-util.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-util.h 2012-11-09 11:08:13.000000000 +0100 @@ -31,19 +31,9 @@ #include #include -#include "seahorse-context.h" - -#ifdef WITH_SHARING -#include -const AvahiPoll* seahorse_util_dns_sd_get_poll (void); -#endif - -struct _SeahorseObject; - typedef guint64 SeahorseVersion; -#define SEAHORSE_EXT_ASC ".asc" -#define SEAHORSE_EXT_GPG ".gpg" +#define SEAHORSE_BAD_FILENAME_CHARS "/\\<>|:?;" gchar* seahorse_util_get_date_string (const time_t time); gchar* seahorse_util_get_display_date_string (const time_t time); @@ -53,18 +43,15 @@ GQuark seahorse_util_error_domain (void); -void seahorse_util_show_error (GtkWidget *parent, - const gchar *heading, - const gchar *message); +void seahorse_util_show_error (gpointer parent, + const gchar *heading, + const gchar *message); void seahorse_util_handle_error (GError **error, gpointer parent, const gchar* description, ...); -gboolean seahorse_util_prompt_delete (const gchar *text, - GtkWidget *parent); - guchar* seahorse_util_read_to_memory (GInputStream * input, guint *len); @@ -78,49 +65,17 @@ gboolean seahorse_util_printf_fd (int fd, const char* data, ...); - -gchar* seahorse_util_filename_for_objects (GList *objects); - -gboolean seahorse_util_uri_exists (const gchar* uri); - -gchar* seahorse_util_uri_unique (const gchar* uri); - -const gchar* seahorse_util_uri_get_last (const gchar* uri); - -GQuark seahorse_util_detect_mime_type (const gchar *mime); - -GQuark seahorse_util_detect_data_type (const gchar *data, - guint length); -GQuark seahorse_util_detect_file_type (const gchar *uri); +GFile * seahorse_util_file_increment_unique (GFile *file, + guint *state); gboolean seahorse_util_write_file_private (const gchar* filename, const gchar* contents, GError **err); -GtkDialog* seahorse_util_chooser_open_new (const gchar *title, - GtkWindow *parent); - -GtkDialog* seahorse_util_chooser_save_new (const gchar *title, - GtkWindow *parent); - -void seahorse_util_chooser_show_key_files (GtkDialog *dialog); - -void seahorse_util_chooser_show_archive_files (GtkDialog *dialog); - -void seahorse_util_chooser_set_filename_full (GtkDialog *dialog, - GList *objects); - -void seahorse_util_chooser_set_filename (GtkDialog *dialog, - struct _SeahorseObject *object); - -gchar* seahorse_util_chooser_open_prompt (GtkDialog *dialog); - -gchar* seahorse_util_chooser_save_prompt (GtkDialog *dialog); - -GList* seahorse_util_objects_sort (GList *objects); +GList * seahorse_util_objects_sort_by_place (GList *objects); -GList* seahorse_util_objects_splice (GList *objects); +GList * seahorse_util_objects_splice_by_place (GList *objects); gboolean seahorse_util_string_equals (const gchar *s1, const gchar *s2); diff -Nru seahorse-3.2.2/libseahorse/seahorse-viewable.c seahorse-3.6.3/libseahorse/seahorse-viewable.c --- seahorse-3.2.2/libseahorse/seahorse-viewable.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-viewable.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,59 @@ +/* + * Seahorse + * + * Copyright (C) 2004,2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-viewable.h" + +typedef SeahorseViewableIface SeahorseViewableInterface; + +G_DEFINE_INTERFACE (SeahorseViewable, seahorse_viewable, G_TYPE_OBJECT); + +void +seahorse_viewable_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent) +{ + SeahorseViewableIface *iface; + + g_return_if_fail (SEAHORSE_IS_VIEWABLE (viewable)); + g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent)); + + iface = SEAHORSE_VIEWABLE_GET_INTERFACE (viewable); + g_return_if_fail (iface->show_viewer != NULL); + + return iface->show_viewer (viewable, parent); +} + +static void +seahorse_viewable_default_init (SeahorseViewableIface *iface) +{ + static gboolean initialized = FALSE; + if (!initialized) { + initialized = TRUE; + } +} + +gboolean +seahorse_viewable_can_view (gpointer object) +{ + return SEAHORSE_IS_VIEWABLE (object); +} diff -Nru seahorse-3.2.2/libseahorse/seahorse-viewable.h seahorse-3.6.3/libseahorse/seahorse-viewable.h --- seahorse-3.2.2/libseahorse/seahorse-viewable.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-viewable.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,55 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_VIEWABLE_H__ +#define __SEAHORSE_VIEWABLE_H__ + +#include "seahorse-exporter.h" + +#include + +#include + +#define SEAHORSE_TYPE_VIEWABLE (seahorse_viewable_get_type ()) +#define SEAHORSE_VIEWABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_VIEWABLE, SeahorseViewable)) +#define SEAHORSE_IS_VIEWABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_VIEWABLE)) +#define SEAHORSE_VIEWABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_VIEWABLE, SeahorseViewableIface)) + +typedef struct _SeahorseViewable SeahorseViewable; +typedef struct _SeahorseViewableIface SeahorseViewableIface; + +struct _SeahorseViewableIface { + GTypeInterface parent; + + void (* show_viewer) (SeahorseViewable *viewable, + GtkWindow *parent); +}; + +GType seahorse_viewable_get_type (void) G_GNUC_CONST; + +void seahorse_viewable_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent); + +gboolean seahorse_viewable_can_view (gpointer object); + +#endif /* __SEAHORSE_VIEWABLE_H__ */ diff -Nru seahorse-3.2.2/libseahorse/seahorse-view.c seahorse-3.6.3/libseahorse/seahorse-view.c --- seahorse-3.2.2/libseahorse/seahorse-view.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-view.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,122 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "seahorse-view.h" - -GList* -seahorse_view_get_selected_objects (SeahorseView* self) -{ - g_return_val_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->get_selected_objects, NULL); - return SEAHORSE_VIEW_GET_INTERFACE (self)->get_selected_objects (self); -} - - -void -seahorse_view_set_selected_objects (SeahorseView* self, GList* objects) -{ - g_return_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->set_selected_objects); - SEAHORSE_VIEW_GET_INTERFACE (self)->set_selected_objects (self, objects); -} - - -GList* -seahorse_view_get_selected_matching (SeahorseView *self, SeahorseObjectPredicate *pred) -{ - g_return_val_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->get_selected_matching, NULL); - return SEAHORSE_VIEW_GET_INTERFACE (self)->get_selected_matching (self, pred); -} - -SeahorseObject* -seahorse_view_get_selected (SeahorseView* self) -{ - g_return_val_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->get_selected, NULL); - return SEAHORSE_VIEW_GET_INTERFACE (self)->get_selected (self); -} - - -void -seahorse_view_set_selected (SeahorseView* self, SeahorseObject* value) -{ - g_return_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->set_selected); - SEAHORSE_VIEW_GET_INTERFACE (self)->set_selected (self, value); -} - -GtkWindow* -seahorse_view_get_window (SeahorseView* self) -{ - g_return_val_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->get_window, NULL); - return SEAHORSE_VIEW_GET_INTERFACE (self)->get_window (self); -} - -void -seahorse_view_register_commands (SeahorseView *self, SeahorseObjectPredicate *pred, - SeahorseCommands *commands) -{ - g_return_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->register_commands); - SEAHORSE_VIEW_GET_INTERFACE (self)->register_commands (self, pred, commands); -} - -void -seahorse_view_register_ui (SeahorseView *self, SeahorseObjectPredicate *pred, - const gchar *ui_definition, GtkActionGroup *actions) -{ - g_return_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->register_ui); - SEAHORSE_VIEW_GET_INTERFACE (self)->register_ui (self, pred, ui_definition, actions); -} - -static void -seahorse_view_base_init (SeahorseViewIface * iface) -{ - static gboolean initialized = FALSE; - if (!initialized) { - initialized = TRUE; - g_object_interface_install_property (iface, - g_param_spec_object ("selected", "selected", "selected", - SEAHORSE_TYPE_OBJECT, G_PARAM_READWRITE)); - - g_object_interface_install_property (iface, - g_param_spec_object ("window", "window", "window", - GTK_TYPE_WINDOW, G_PARAM_READABLE)); - - g_signal_new ("selection_changed", SEAHORSE_TYPE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - } -} - -GType -seahorse_view_get_type (void) -{ - static GType seahorse_view_type_id = 0; - - if (seahorse_view_type_id == 0) { - static const GTypeInfo type_info = { - sizeof (SeahorseViewIface), (GBaseInitFunc) seahorse_view_base_init, - (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL - }; - - seahorse_view_type_id = g_type_register_static (G_TYPE_INTERFACE, "SeahorseView", &type_info, 0); - g_type_interface_add_prerequisite (seahorse_view_type_id, G_TYPE_OBJECT); - } - - return seahorse_view_type_id; -} - diff -Nru seahorse-3.2.2/libseahorse/seahorse-view.h seahorse-3.6.3/libseahorse/seahorse-view.h --- seahorse-3.2.2/libseahorse/seahorse-view.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-view.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_VIEW_H__ -#define __SEAHORSE_VIEW_H__ - -#include -#include - -#include "seahorse-set.h" -#include "seahorse-object.h" - -typedef struct _SeahorseCommands SeahorseCommands; - -#define SEAHORSE_TYPE_VIEW (seahorse_view_get_type ()) -#define SEAHORSE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_VIEW, SeahorseView)) -#define SEAHORSE_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_VIEW)) -#define SEAHORSE_VIEW_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SEAHORSE_TYPE_VIEW, SeahorseViewIface)) - -typedef struct _SeahorseView SeahorseView; -typedef struct _SeahorseViewIface SeahorseViewIface; - -struct _SeahorseViewIface { - GTypeInterface parent_iface; - - /* virtual metdods */ - GList* (*get_selected_objects) (SeahorseView *self); - - void (*set_selected_objects) (SeahorseView *self, - GList *objects); - - GList* (*get_selected_matching) (SeahorseView *self, - SeahorseObjectPredicate *pred); - - SeahorseObject* (*get_selected) (SeahorseView *self); - - void (*set_selected) (SeahorseView *self, - SeahorseObject *value); - - GtkWindow* (*get_window) (SeahorseView *self); - - void (*register_commands) (SeahorseView *self, - SeahorseObjectPredicate *pred, - SeahorseCommands *commands); - - void (*register_ui) (SeahorseView *self, - SeahorseObjectPredicate *pred, - const gchar *ui_definition, - GtkActionGroup *actions); -}; - - -GType seahorse_view_get_type (void); - -GList* seahorse_view_get_selected_objects (SeahorseView *self); - -void seahorse_view_set_selected_objects (SeahorseView *self, - GList *objects); - -GList* seahorse_view_get_selected_matching (SeahorseView *self, - SeahorseObjectPredicate *pred); - -SeahorseObject* seahorse_view_get_selected (SeahorseView *self); - -void seahorse_view_set_selected (SeahorseView *self, - SeahorseObject *value); - -GtkWindow* seahorse_view_get_window (SeahorseView *self); - -void seahorse_view_register_ui (SeahorseView *self, - SeahorseObjectPredicate *pred, - const gchar *ui_definition, - GtkActionGroup *actions); - -void seahorse_view_register_commands (SeahorseView *self, - SeahorseObjectPredicate *pred, - SeahorseCommands *commands); - -#endif diff -Nru seahorse-3.2.2/libseahorse/seahorse-widget.c seahorse-3.6.3/libseahorse/seahorse-widget.c --- seahorse-3.2.2/libseahorse/seahorse-widget.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/libseahorse/seahorse-widget.c 2012-09-18 13:11:26.000000000 +0200 @@ -26,8 +26,8 @@ #include +#include "seahorse-icons.h" #include "seahorse-widget.h" -#include "seahorse-gtkstock.h" /** * SECTION:seahorse-widget @@ -77,9 +77,6 @@ GdkEvent *event, SeahorseWidget *swidget); -static void context_destroyed (SeahorseContext *sctx, - SeahorseWidget *swidget); - static GObjectClass *parent_class = NULL; /* Hash of widgets with name as key */ @@ -134,6 +131,13 @@ if (width > 0 && height > 0) gtk_window_resize (window, width, height); } + + if(!widgets) + widgets = g_hash_table_new ((GHashFunc)g_str_hash, (GCompareFunc)g_str_equal); + g_hash_table_insert (widgets, g_strdup (self->name), self); + + gtk_application_add_window (seahorse_application_get (), + GTK_WINDOW (seahorse_widget_get_widget (self, self->name))); } /** @@ -145,10 +149,11 @@ static void class_init (SeahorseWidgetClass *klass) { - GObjectClass *gobject_class; - + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GtkCssProvider *css_provider; + GError *error = NULL; + parent_class = g_type_class_peek_parent (klass); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->constructed = seahorse_widget_constructed; gobject_class->dispose = object_dispose; @@ -163,19 +168,17 @@ signals[DESTROY] = g_signal_new ("destroy", SEAHORSE_TYPE_WIDGET, G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseWidgetClass, destroy), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -} -/** -* sctx: ignored -* swidget: The swidget being destroyed -* -* Destroy widget when context is destroyed -* -**/ -static void -context_destroyed (SeahorseContext *sctx, SeahorseWidget *swidget) -{ - seahorse_widget_destroy (swidget); + css_provider = gtk_css_provider_new (); + if (gtk_css_provider_load_from_path (css_provider, SEAHORSE_UIDIR "seahorse.css", &error)) { + gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), + GTK_STYLE_PROVIDER (css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + } else { + g_warning ("couldn't load %s file: %s", SEAHORSE_UIDIR "seahorse.css", error->message); + g_error_free (error); + } + g_object_unref (css_provider); } /** @@ -187,8 +190,7 @@ static void object_init (SeahorseWidget *swidget) { - g_signal_connect_after (SCTX_APP(), "destroy", - G_CALLBACK (context_destroyed), swidget); + } static void @@ -228,7 +230,8 @@ } } - g_signal_handlers_disconnect_by_func (SCTX_APP (), context_destroyed, swidget); + gtk_application_remove_window (seahorse_application_get (), + GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name))); if (seahorse_widget_get_widget (swidget, swidget->name)) gtk_widget_destroy (GTK_WIDGET (seahorse_widget_get_widget (swidget, swidget->name))); @@ -238,7 +241,7 @@ g_clear_object (&swidget->settings); g_free (swidget->name); - + G_OBJECT_CLASS (parent_class)->finalize (gobject); } @@ -381,10 +384,6 @@ /* If widget doesn't already exist, create & insert into hash */ swidget = g_object_new (SEAHORSE_TYPE_WIDGET, "name", name, NULL); - if(!widgets) - widgets = g_hash_table_new ((GHashFunc)g_str_hash, (GCompareFunc)g_str_equal); - g_hash_table_insert (widgets, g_strdup (name), swidget); - if (parent != NULL) { window = GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)); gtk_window_set_transient_for (window, parent); @@ -450,9 +449,9 @@ if (g_str_equal (swidget->name, "key-manager") || g_str_equal (swidget->name, "keyserver-results")) { - document = g_strdup ("ghelp:" PACKAGE "?introduction"); + document = g_strdup ("help:" PACKAGE "/introduction"); } else { - document = g_strdup_printf ("ghelp:" PACKAGE "?%s", swidget->name); + document = g_strdup_printf ("help:" PACKAGE "/%s", swidget->name); } if (!g_app_info_launch_default_for_uri (document, NULL, &error)) { diff -Nru seahorse-3.2.2/libseahorse/seahorse-widget.h seahorse-3.6.3/libseahorse/seahorse-widget.h --- seahorse-3.2.2/libseahorse/seahorse-widget.h 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/libseahorse/seahorse-widget.h 2012-08-21 12:23:17.000000000 +0200 @@ -26,7 +26,7 @@ #include #include -#include "seahorse-context.h" +#include "seahorse-application.h" #define SEAHORSE_TYPE_WIDGET (seahorse_widget_get_type ()) #define SEAHORSE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidget)) diff -Nru seahorse-3.2.2/ltmain.sh seahorse-3.6.3/ltmain.sh --- seahorse-3.2.2/ltmain.sh 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/ltmain.sh 2012-11-09 17:33:38.000000000 +0100 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 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. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru seahorse-3.2.2/m4/gnome-doc-utils.m4 seahorse-3.6.3/m4/gnome-doc-utils.m4 --- seahorse-3.2.2/m4/gnome-doc-utils.m4 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/m4/gnome-doc-utils.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], -[ -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_WITH([omf-dir], - AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, - [with_omf_dir='${datadir}/omf']) -OMF_DIR="$with_omf_dir" -AC_SUBST(OMF_DIR) - -AC_ARG_WITH([help-formats], - AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, - [with_help_formats='']) -DOC_USER_FORMATS="$with_help_formats" -AC_SUBST(DOC_USER_FORMATS) - -AC_ARG_ENABLE([scrollkeeper], - [AC_HELP_STRING([--disable-scrollkeeper], - [do not make updates to the scrollkeeper database])],, - enable_scrollkeeper=yes) -AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) - -dnl disable scrollkeeper automatically for distcheck -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -]) - -# 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 - -GNOME_DOC_DEFINES -]) diff -Nru seahorse-3.2.2/m4/intltool.m4 seahorse-3.6.3/m4/intltool.m4 --- seahorse-3.2.2/m4/intltool.m4 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/m4/intltool.m4 2012-11-09 17:33:38.000000000 +0100 @@ -23,7 +23,7 @@ ## the same distribution terms that you use for the rest of that program. dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -36,13 +36,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | 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; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | 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; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -55,25 +53,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) 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 $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.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_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.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 $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.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 $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.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_UI_RULE='%.ui: %.ui.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 $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.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 $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.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 $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.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_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.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_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 $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -119,7 +140,7 @@ 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\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then diff -Nru seahorse-3.2.2/m4/libtool.m4 seahorse-3.6.3/m4/libtool.m4 --- seahorse-3.2.2/m4/libtool.m4 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/m4/libtool.m4 2012-11-09 17:33:38.000000000 +0100 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2513,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2648,7 +2707,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2717,7 +2776,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2742,7 +2801,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2766,7 +2825,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2797,7 +2856,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2807,7 +2866,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3229,7 +3288,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3649,6 +3708,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4233,7 +4293,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4325,18 +4387,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4496,7 +4573,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4521,7 +4600,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4772,8 +4850,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5068,6 +5145,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5114,10 +5192,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5130,7 +5204,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5169,7 +5243,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5611,9 +5684,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5771,7 +5841,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6141,7 +6210,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6902,12 +6971,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7104,7 +7179,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7237,7 +7311,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7424,6 +7497,77 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7493,6 +7637,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff -Nru seahorse-3.2.2/m4/ltoptions.m4 seahorse-3.6.3/m4/ltoptions.m4 --- seahorse-3.2.2/m4/ltoptions.m4 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/m4/ltoptions.m4 2012-11-09 17:33:38.000000000 +0100 @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -Nru seahorse-3.2.2/m4/ltversion.m4 seahorse-3.6.3/m4/ltversion.m4 --- seahorse-3.2.2/m4/ltversion.m4 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/m4/ltversion.m4 2012-11-09 17:33:38.000000000 +0100 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru seahorse-3.2.2/Makefile.am seahorse-3.6.3/Makefile.am --- seahorse-3.2.2/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/Makefile.am 2012-11-09 11:08:13.000000000 +0100 @@ -23,14 +23,13 @@ SUBDIRS = libegg \ libseahorse \ gkr \ - $(PKCS11_DIR) \ $(PGP_DIR) \ + $(PKCS11_DIR) \ $(SSH_DIR) \ src \ po \ data \ - help \ - pixmaps + help EXTRA_DIST = \ AUTHORS \ @@ -49,12 +48,9 @@ TODO \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in \ - gnome-doc-utils.make \ - omf.make + intltool-update.in DISTCLEANFILES = \ - gnome-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update @@ -62,7 +58,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --disable-scrollkeeper \ --disable-update-mime-database \ - --disable-debug + --disable-debug \ + --disable-strict CHANGELOG_START = \ d2f8367dc600080b6cf3edbe4e2fc204f929471e diff -Nru seahorse-3.2.2/Makefile.decl seahorse-3.6.3/Makefile.decl --- seahorse-3.2.2/Makefile.decl 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/Makefile.decl 2012-08-21 12:23:15.000000000 +0200 @@ -0,0 +1,37 @@ +NULL = + +V_ASN1 = $(V_ASN1_$(V)) +V_ASN1_ = $(V_ASN1_$(AM_DEFAULT_VERBOSITY)) +V_ASN1_0 = @echo " ASN1 " $@; + +.asn.asn.h: + $(V_ASN1) $(ASN1PARSER) -o $@ $< && sed -i 's|#include.*|/* \0 */|' $@ + +V_SED = $(V_SED_$(V)) +V_SED_ = $(V_SED_$(AM_DEFAULT_VERBOSITY)) +V_SED_0 = @echo " SED " $@; + +SED_SUBST = sed \ + -e 's,[@]datadir[@],$(datadir),g' \ + -e 's,[@]libexecdir[@],$(libexecdir),g' \ + -e 's,[@]libdir[@],$(libdir),g' \ + -e 's,[@]includedir[@],$(includedir),g' \ + -e 's,[@]datarootdir[@],$(datarootdir),g' \ + -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ + -e 's,[@]bindir[@],$(bindir),g' \ + -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ + -e 's,[@]prefix[@],$(prefix),g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]VALGRIND_RUN[@],$(VALGRIND_RUN),g' \ + $(NULL) + +.desktop.in.in.desktop.in: + $(V_SED) $(SED_SUBST) $< > $@ + +@INTLTOOL_DESKTOP_RULE@ + +.service.in.service: + $(V_SED) $(SED_SUBST) $< > $@ + +SUFFIXES = .asn .asn.h .desktop.in .desktop.in.in .service .service.in \ Kein Zeilenumbruch am Dateiende. diff -Nru seahorse-3.2.2/Makefile.in seahorse-3.6.3/Makefile.in --- seahorse-3.2.2/Makefile.in 2011-11-14 11:51:43.000000000 +0100 +++ seahorse-3.6.3/Makefile.in 2012-11-12 08:49:46.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,11 +56,11 @@ THANKS TODO compile config.guess config.sub depcomp install-sh \ ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -53,12 +69,18 @@ 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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -68,22 +90,30 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac 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 + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = libegg libseahorse gkr pkcs11 pgp ssh src po data help \ - pixmaps +CSCOPE = cscope +DIST_SUBDIRS = libegg libseahorse gkr pgp pkcs11 ssh src po data help DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 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)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -111,7 +141,10 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -137,13 +170,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = \ - --disable-scrollkeeper \ - --disable-update-mime-database \ - --disable-debug - DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -158,15 +185,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -185,10 +208,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -206,7 +236,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -241,6 +270,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -276,6 +306,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -305,14 +337,13 @@ SUBDIRS = libegg \ libseahorse \ gkr \ - $(PKCS11_DIR) \ $(PGP_DIR) \ + $(PKCS11_DIR) \ $(SSH_DIR) \ src \ po \ data \ - help \ - pixmaps + help EXTRA_DIST = \ AUTHORS \ @@ -331,16 +362,19 @@ TODO \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in \ - gnome-doc-utils.make \ - omf.make + intltool-update.in DISTCLEANFILES = \ - gnome-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update +DISTCHECK_CONFIGURE_FLAGS = \ + --disable-scrollkeeper \ + --disable-update-mime-database \ + --disable-debug \ + --disable-strict + CHANGELOG_START = \ d2f8367dc600080b6cf3edbe4e2fc204f929471e @@ -348,21 +382,21 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -384,10 +418,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -410,12 +442,12 @@ -rm -f libtool config.lt # 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): +# 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) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -425,7 +457,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -439,37 +475,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= 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); \ @@ -478,6 +483,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -541,8 +550,32 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -578,13 +611,10 @@ 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 \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -616,36 +646,36 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -656,8 +686,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -667,7 +697,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -677,6 +707,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -700,7 +731,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_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' @@ -728,10 +759,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -815,23 +851,26 @@ uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + cscopelist-recursive 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-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 \ - 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 + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic clean-libtool cscope cscopelist \ + cscopelist-recursive ctags ctags-recursive dist dist-all \ + dist-bzip2 dist-gzip dist-hook dist-lzip 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 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 dist-hook: diff -Nru seahorse-3.2.2/missing seahorse-3.6.3/missing --- seahorse-3.2.2/missing 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/missing 2012-10-13 13:58:51.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - 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 @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru seahorse-3.2.2/mkinstalldirs seahorse-3.6.3/mkinstalldirs --- seahorse-3.2.2/mkinstalldirs 2011-11-14 11:51:43.000000000 +0100 +++ seahorse-3.6.3/mkinstalldirs 2012-11-09 17:33:38.000000000 +0100 @@ -81,9 +81,9 @@ echo "mkdir -p -- $*" exec mkdir -p -- "$@" else - # On NextStep and OpenStep, the `mkdir' command does not + # On NextStep and OpenStep, the 'mkdir' command does not # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already + # directories to create, and then abort because '.' already # exists. test -d ./-p && rmdir ./-p test -d ./--version && rmdir ./--version diff -Nru seahorse-3.2.2/NEWS seahorse-3.6.3/NEWS --- seahorse-3.2.2/NEWS 2011-11-14 11:46:30.000000000 +0100 +++ seahorse-3.6.3/NEWS 2012-11-12 08:49:30.000000000 +0100 @@ -1,3 +1,150 @@ +seahorse 3.6.3 +-------------- + + * Display item labels even if they don't match formatters + * Fix crashers + * Updated translations + +seahorse 3.6.2 +-------------- + + * Fix problem where keyring items overwrite one another + +seahorse 3.6.1 +-------------- + + * Strip DBus errors before displaying them + * Fix regression for changing a keyring master password + * Updated translations + +seahorse 3.6.0 +-------------- + + * Updated translations + +seahorse 3.5.92 +--------------- + + * Port to new documentation infrastructure + * Updated translations + +seahorse 3.5.91 +--------------- + + * Updated translations + +seahorse 3.5.90 +--------------- + + * Updated translations + +seahorse 3.5.4 +-------------- + + * No keyring UI bits if failed to connect to Secret Service + * When Ctrl-F pressed in the main window, focus the filter box + * Add suggestion to generate entropy while generating a key + * Use libsecret instead of libgnome-keyring + * Use GcrSecureEntryBuffer and remove duplicate code. + * Align keyids with name/signatures in key properties. + * Unavailable entries were displayed incorrectly for signatures + * Fix icon sizes + * Remove unused code + * Migrate to GtkApplication + * Other bug fixes + * Updated translations + * Build fixes + +seahorse 3.4.1 +-------------- + + * Fix crash during failed HKP exports + * Fix memory errors when searching for keys + * Updated translations + * Build fixes + +seahorse 3.4.0 +-------------- + + * Updated translations + +seahorse 3.3.92 +--------------- + + * Fix warning cancelling the signing dialog + * If multiple keys with some label in signer list, add hex keyid + * Updated translations, and fixes + * Build fixes + +seahorse 3.3.91 +--------------- + * Fix regression of configure ssh keys + * Fix line on top of the sidebar + * Updated translations + +seahorse 3.3.5 +-------------- + + * Maximum and minimum sidebar pane position + * Fix icons for filter entry + * Fix uninitialized memory usage + * Clearer wording for various keyrings + * Updated translations + * Build fixes + +seahorse 3.3.4 +-------------- + + * Remove limitation of max keyring item description characters + * Updated translations + * Build fixes + +seahorse 3.3.3 +-------------- + + * Support for PKCS#11 key generation + * Support for creating certificate requests + * Certificate actions happen from certificate window. + * Reimplement export functionality + * Refactor deletion, unlocking, refreshing, and showing properties + * Add way to lookup places, and refresh appropriate place after import + * Fixes for glib 2.31.x deprecations + * Fix bugs, build issues, translations + +seahorse 3.3.2 +-------------- + + * Refactoring of how actions work + * Add ability to lock and unlock places from the sidebar + * Implement login to smart cards and PKCS#11 tokens + * Remove experimental check selection on sidebar + * Listing of private keys on smart cards and PKCS#11 tokens + * Showing matching keys and certificates together, in listing and properties + * Translation, build fixes + * Don't crash if gpg or gpg2 don't run correctly. + * Fix problems editing PGP key servers + * Don't load key signatures unless showing key properties + * Updated translations + +seahorse 3.3.1.1 +---------------- + + * Fix build issues when pgp, ssh, or pkcs11 backends are disabled + * Updated translations + +seahorse 3.3.1 +-------------- + + * Major refactoring of look and behavior of seahorse + * Passwords, keys, certs are displayed together in the main window + * Places sidebar, which can be shown, to access where various objects come from + * Asynchronously initialize PKCS#11 modules + * Use the new importer infrastructure in libgcr + * Blacklist certain PKCS#11 tokens from showing up in seahorse + * Code cleanup and refactoring + * Build, translation fixes + * Updated translations + seahorse 3.2.2 -------------- diff -Nru seahorse-3.2.2/omf.make seahorse-3.6.3/omf.make --- seahorse-3.2.2/omf.make 2009-04-18 05:22:13.000000000 +0200 +++ seahorse-3.6.3/omf.make 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -# -# No modifications of this Makefile should be necessary. -# -# This file contains the build instructions for installing OMF files. It is -# generally called from the makefiles for particular formats of documentation. -# -# Note that you must configure your package with --localstatedir=/var/lib -# so that the scrollkeeper-update command below will update the database -# in the standard scrollkeeper directory. -# -# If it is impossible to configure with --localstatedir=/var/lib, then -# modify the definition of scrollkeeper_localstate_dir so that -# it points to the correct location. Note that you must still use -# $(localstatedir) in this or when people build RPMs it will update -# the real database on their system instead of the one under RPM_BUILD_ROOT. -# -# Note: This make file is not incorporated into xmldocs.make because, in -# general, there will be other documents install besides XML documents -# and the makefiles for these formats should also include this file. -# -# About this file: -# This file was taken from scrollkeeper_example2, a package illustrating -# how to install documentation and OMF files for use with ScrollKeeper -# 0.3.x and 0.4.x. For more information, see: -# http://scrollkeeper.sourceforge.net/ -# Version: 0.1.2 (last updated: March 20, 2002) -# - -omf_dest_dir=$(datadir)/omf/@PACKAGE@ -scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper - -omf: omf_timestamp - -omf_timestamp: $(omffile) - -for file in $(omffile); do \ - scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ - done - touch omf_timestamp - -install-data-hook-omf: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - for file in $(omffile); do \ - $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ - done - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) - -uninstall-local-omf: - -for file in $(srcdir)/*.omf; do \ - basefile=`basename $$file`; \ - rm -f $(omf_dest_dir)/$$basefile; \ - done - -rmdir $(omf_dest_dir) - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) diff -Nru seahorse-3.2.2/pgp/Makefile.am seahorse-3.6.3/pgp/Makefile.am --- seahorse-3.2.2/pgp/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/Makefile.am 2012-11-09 11:08:13.000000000 +0100 @@ -8,7 +8,6 @@ -I$(top_srcdir)/libegg \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ @@ -31,40 +30,51 @@ if WITH_KEYSERVER KEYSERVER_SRCS = seahorse-server-source.c seahorse-server-source.h +KEYSERVER_SRCS += seahorse-keyserver-search.c seahorse-keyserver-search.h +KEYSERVER_SRCS += seahorse-keyserver-sync.c seahorse-keyserver-sync.h +KEYSERVER_SRCS += seahorse-keyserver-results.c seahorse-keyserver-results.h else KEYSERVER_SRCS = endif libseahorse_pgp_la_SOURCES = \ + seahorse-combo-keys.c seahorse-combo-keys.h \ + seahorse-discovery.c seahorse-discovery.h \ seahorse-gpgme.c seahorse-gpgme.h \ seahorse-gpgme-add-subkey.c \ seahorse-gpgme-add-uid.c \ seahorse-gpgme-dialogs.h \ seahorse-gpgme-data.c seahorse-gpgme-data.h \ seahorse-gpgme-expires.c \ + seahorse-gpgme-exporter.c seahorse-gpgme-exporter.h \ seahorse-gpgme-generate.c \ seahorse-gpgme-key.c seahorse-gpgme-key.h \ + seahorse-gpgme-key-deleter.c seahorse-gpgme-key-deleter.h \ seahorse-gpgme-key-op.c seahorse-gpgme-key-op.h \ + seahorse-gpgme-keyring.c seahorse-gpgme-keyring.h \ seahorse-gpgme-photo.c seahorse-gpgme-photo.h \ seahorse-gpgme-photos.c \ seahorse-gpgme-revoke.c \ + seahorse-gpgme-secret-deleter.c seahorse-gpgme-secret-deleter.h \ seahorse-gpgme-sign.c \ - seahorse-gpgme-source.c seahorse-gpgme-source.h \ seahorse-gpgme-subkey.c seahorse-gpgme-subkey.h \ seahorse-gpgme-uid.c seahorse-gpgme-uid.h \ seahorse-gpg-op.h seahorse-gpg-op.c \ seahorse-gpg-options.c seahorse-gpg-options.h \ seahorse-pgp.c seahorse-pgp.h \ - seahorse-pgp-commands.c seahorse-pgp-commands.h \ + seahorse-pgp-actions.c seahorse-pgp-actions.h \ + seahorse-pgp-backend.c seahorse-pgp-backend.h \ seahorse-pgp-key.c seahorse-pgp-key.h \ seahorse-pgp-key-properties.c \ seahorse-pgp-keysets.c seahorse-pgp-keysets.h \ seahorse-pgp-photo.c seahorse-pgp-photo.h \ - seahorse-pgp-module.c seahorse-pgp-module.h \ seahorse-pgp-signature.c seahorse-pgp-signature.h \ seahorse-pgp-subkey.c seahorse-pgp-subkey.h \ seahorse-pgp-uid.c seahorse-pgp-uid.h \ seahorse-signer.c seahorse-pgp-dialogs.h \ + seahorse-transfer.c seahorse-transfer.h \ + seahorse-unknown.c seahorse-unknown.h \ + seahorse-unknown-source.c seahorse-unknown-source.h \ $(VALA_CFILES) $(VALA_HFILES) \ $(KEYSERVER_SRCS) \ $(LDAP_SRCS) \ @@ -81,6 +91,10 @@ seahorse-add-subkey.xml \ seahorse-add-uid.xml \ seahorse-expires.xml \ + seahorse-keyserver-search.xml \ + seahorse-keyserver-results.ui \ + seahorse-keyserver-results.xml \ + seahorse-keyserver-sync.xml \ seahorse-pgp-public-key-properties.xml \ seahorse-pgp-private-key-properties.xml \ seahorse-pgp-generate.xml \ diff -Nru seahorse-3.2.2/pgp/Makefile.in seahorse-3.6.3/pgp/Makefile.in --- seahorse-3.2.2/pgp/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/pgp/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -18,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,13 +54,14 @@ host_triplet = @host@ seahorselibexecbin_PROGRAMS = xloadimage$(EXEEXT) subdir = pgp -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -54,60 +71,90 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libseahorse_pgp_la_DEPENDENCIES = \ $(top_builddir)/libseahorse/libseahorse.la -am__libseahorse_pgp_la_SOURCES_DIST = seahorse-gpgme.c \ - seahorse-gpgme.h seahorse-gpgme-add-subkey.c \ - seahorse-gpgme-add-uid.c seahorse-gpgme-dialogs.h \ - seahorse-gpgme-data.c seahorse-gpgme-data.h \ - seahorse-gpgme-expires.c seahorse-gpgme-generate.c \ - seahorse-gpgme-key.c seahorse-gpgme-key.h \ - seahorse-gpgme-key-op.c seahorse-gpgme-key-op.h \ - seahorse-gpgme-photo.c seahorse-gpgme-photo.h \ - seahorse-gpgme-photos.c seahorse-gpgme-revoke.c \ - seahorse-gpgme-sign.c seahorse-gpgme-source.c \ - seahorse-gpgme-source.h seahorse-gpgme-subkey.c \ - seahorse-gpgme-subkey.h seahorse-gpgme-uid.c \ - seahorse-gpgme-uid.h seahorse-gpg-op.h seahorse-gpg-op.c \ - seahorse-gpg-options.c seahorse-gpg-options.h seahorse-pgp.c \ - seahorse-pgp.h seahorse-pgp-commands.c seahorse-pgp-commands.h \ +am__libseahorse_pgp_la_SOURCES_DIST = seahorse-combo-keys.c \ + seahorse-combo-keys.h seahorse-discovery.c \ + seahorse-discovery.h seahorse-gpgme.c seahorse-gpgme.h \ + seahorse-gpgme-add-subkey.c seahorse-gpgme-add-uid.c \ + seahorse-gpgme-dialogs.h seahorse-gpgme-data.c \ + seahorse-gpgme-data.h seahorse-gpgme-expires.c \ + seahorse-gpgme-exporter.c seahorse-gpgme-exporter.h \ + seahorse-gpgme-generate.c seahorse-gpgme-key.c \ + seahorse-gpgme-key.h seahorse-gpgme-key-deleter.c \ + seahorse-gpgme-key-deleter.h seahorse-gpgme-key-op.c \ + seahorse-gpgme-key-op.h seahorse-gpgme-keyring.c \ + seahorse-gpgme-keyring.h seahorse-gpgme-photo.c \ + seahorse-gpgme-photo.h seahorse-gpgme-photos.c \ + seahorse-gpgme-revoke.c seahorse-gpgme-secret-deleter.c \ + seahorse-gpgme-secret-deleter.h seahorse-gpgme-sign.c \ + seahorse-gpgme-subkey.c seahorse-gpgme-subkey.h \ + seahorse-gpgme-uid.c seahorse-gpgme-uid.h seahorse-gpg-op.h \ + seahorse-gpg-op.c seahorse-gpg-options.c \ + seahorse-gpg-options.h seahorse-pgp.c seahorse-pgp.h \ + seahorse-pgp-actions.c seahorse-pgp-actions.h \ + seahorse-pgp-backend.c seahorse-pgp-backend.h \ seahorse-pgp-key.c seahorse-pgp-key.h \ seahorse-pgp-key-properties.c seahorse-pgp-keysets.c \ seahorse-pgp-keysets.h seahorse-pgp-photo.c \ - seahorse-pgp-photo.h seahorse-pgp-module.c \ - seahorse-pgp-module.h seahorse-pgp-signature.c \ + seahorse-pgp-photo.h seahorse-pgp-signature.c \ seahorse-pgp-signature.h seahorse-pgp-subkey.c \ seahorse-pgp-subkey.h seahorse-pgp-uid.c seahorse-pgp-uid.h \ - seahorse-signer.c seahorse-pgp-dialogs.h \ + seahorse-signer.c seahorse-pgp-dialogs.h seahorse-transfer.c \ + seahorse-transfer.h seahorse-unknown.c seahorse-unknown.h \ + seahorse-unknown-source.c seahorse-unknown-source.h \ seahorse-server-source.c seahorse-server-source.h \ + seahorse-keyserver-search.c seahorse-keyserver-search.h \ + seahorse-keyserver-sync.c seahorse-keyserver-sync.h \ + seahorse-keyserver-results.c seahorse-keyserver-results.h \ seahorse-ldap-source.c seahorse-ldap-source.h \ seahorse-hkp-source.c seahorse-hkp-source.h -@WITH_KEYSERVER_TRUE@am__objects_1 = seahorse-server-source.lo +@WITH_KEYSERVER_TRUE@am__objects_1 = seahorse-server-source.lo \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-search.lo \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-sync.lo \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-results.lo @WITH_LDAP_TRUE@am__objects_2 = seahorse-ldap-source.lo @WITH_HKP_TRUE@am__objects_3 = seahorse-hkp-source.lo -am_libseahorse_pgp_la_OBJECTS = seahorse-gpgme.lo \ +am_libseahorse_pgp_la_OBJECTS = seahorse-combo-keys.lo \ + seahorse-discovery.lo seahorse-gpgme.lo \ seahorse-gpgme-add-subkey.lo seahorse-gpgme-add-uid.lo \ seahorse-gpgme-data.lo seahorse-gpgme-expires.lo \ - seahorse-gpgme-generate.lo seahorse-gpgme-key.lo \ - seahorse-gpgme-key-op.lo seahorse-gpgme-photo.lo \ - seahorse-gpgme-photos.lo seahorse-gpgme-revoke.lo \ - seahorse-gpgme-sign.lo seahorse-gpgme-source.lo \ - seahorse-gpgme-subkey.lo seahorse-gpgme-uid.lo \ - seahorse-gpg-op.lo seahorse-gpg-options.lo seahorse-pgp.lo \ - seahorse-pgp-commands.lo seahorse-pgp-key.lo \ - seahorse-pgp-key-properties.lo seahorse-pgp-keysets.lo \ - seahorse-pgp-photo.lo seahorse-pgp-module.lo \ + seahorse-gpgme-exporter.lo seahorse-gpgme-generate.lo \ + seahorse-gpgme-key.lo seahorse-gpgme-key-deleter.lo \ + seahorse-gpgme-key-op.lo seahorse-gpgme-keyring.lo \ + seahorse-gpgme-photo.lo seahorse-gpgme-photos.lo \ + seahorse-gpgme-revoke.lo seahorse-gpgme-secret-deleter.lo \ + seahorse-gpgme-sign.lo seahorse-gpgme-subkey.lo \ + seahorse-gpgme-uid.lo seahorse-gpg-op.lo \ + seahorse-gpg-options.lo seahorse-pgp.lo \ + seahorse-pgp-actions.lo seahorse-pgp-backend.lo \ + seahorse-pgp-key.lo seahorse-pgp-key-properties.lo \ + seahorse-pgp-keysets.lo seahorse-pgp-photo.lo \ seahorse-pgp-signature.lo seahorse-pgp-subkey.lo \ - seahorse-pgp-uid.lo seahorse-signer.lo $(am__objects_1) \ - $(am__objects_2) $(am__objects_3) + seahorse-pgp-uid.lo seahorse-signer.lo seahorse-transfer.lo \ + seahorse-unknown.lo seahorse-unknown-source.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) libseahorse_pgp_la_OBJECTS = $(am_libseahorse_pgp_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am__installdirs = "$(DESTDIR)$(seahorselibexecbindir)" \ "$(DESTDIR)$(uidir)" PROGRAMS = $(seahorselibexecbin_PROGRAMS) am_xloadimage_OBJECTS = seahorse-xloadimage.$(OBJEXT) xloadimage_OBJECTS = $(am_xloadimage_OBJECTS) xloadimage_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -118,25 +165,26 @@ $(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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libseahorse_pgp_la_SOURCES) $(xloadimage_SOURCES) DIST_SOURCES = $(am__libseahorse_pgp_la_SOURCES_DIST) \ $(xloadimage_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -158,6 +206,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(ui_DATA) ETAGS = etags CTAGS = ctags @@ -186,9 +240,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -203,15 +255,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -230,10 +278,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -251,7 +306,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -286,6 +340,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -321,6 +376,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale @@ -347,7 +404,6 @@ -I$(top_srcdir)/libegg \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ @@ -360,37 +416,52 @@ @WITH_HKP_FALSE@HKP_SRCS = @WITH_HKP_TRUE@HKP_SRCS = seahorse-hkp-source.c seahorse-hkp-source.h @WITH_KEYSERVER_FALSE@KEYSERVER_SRCS = -@WITH_KEYSERVER_TRUE@KEYSERVER_SRCS = seahorse-server-source.c seahorse-server-source.h +@WITH_KEYSERVER_TRUE@KEYSERVER_SRCS = seahorse-server-source.c \ +@WITH_KEYSERVER_TRUE@ seahorse-server-source.h \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-search.c \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-search.h \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-sync.c \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-sync.h \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-results.c \ +@WITH_KEYSERVER_TRUE@ seahorse-keyserver-results.h libseahorse_pgp_la_SOURCES = \ + seahorse-combo-keys.c seahorse-combo-keys.h \ + seahorse-discovery.c seahorse-discovery.h \ seahorse-gpgme.c seahorse-gpgme.h \ seahorse-gpgme-add-subkey.c \ seahorse-gpgme-add-uid.c \ seahorse-gpgme-dialogs.h \ seahorse-gpgme-data.c seahorse-gpgme-data.h \ seahorse-gpgme-expires.c \ + seahorse-gpgme-exporter.c seahorse-gpgme-exporter.h \ seahorse-gpgme-generate.c \ seahorse-gpgme-key.c seahorse-gpgme-key.h \ + seahorse-gpgme-key-deleter.c seahorse-gpgme-key-deleter.h \ seahorse-gpgme-key-op.c seahorse-gpgme-key-op.h \ + seahorse-gpgme-keyring.c seahorse-gpgme-keyring.h \ seahorse-gpgme-photo.c seahorse-gpgme-photo.h \ seahorse-gpgme-photos.c \ seahorse-gpgme-revoke.c \ + seahorse-gpgme-secret-deleter.c seahorse-gpgme-secret-deleter.h \ seahorse-gpgme-sign.c \ - seahorse-gpgme-source.c seahorse-gpgme-source.h \ seahorse-gpgme-subkey.c seahorse-gpgme-subkey.h \ seahorse-gpgme-uid.c seahorse-gpgme-uid.h \ seahorse-gpg-op.h seahorse-gpg-op.c \ seahorse-gpg-options.c seahorse-gpg-options.h \ seahorse-pgp.c seahorse-pgp.h \ - seahorse-pgp-commands.c seahorse-pgp-commands.h \ + seahorse-pgp-actions.c seahorse-pgp-actions.h \ + seahorse-pgp-backend.c seahorse-pgp-backend.h \ seahorse-pgp-key.c seahorse-pgp-key.h \ seahorse-pgp-key-properties.c \ seahorse-pgp-keysets.c seahorse-pgp-keysets.h \ seahorse-pgp-photo.c seahorse-pgp-photo.h \ - seahorse-pgp-module.c seahorse-pgp-module.h \ seahorse-pgp-signature.c seahorse-pgp-signature.h \ seahorse-pgp-subkey.c seahorse-pgp-subkey.h \ seahorse-pgp-uid.c seahorse-pgp-uid.h \ seahorse-signer.c seahorse-pgp-dialogs.h \ + seahorse-transfer.c seahorse-transfer.h \ + seahorse-unknown.c seahorse-unknown.h \ + seahorse-unknown-source.c seahorse-unknown-source.h \ $(VALA_CFILES) $(VALA_HFILES) \ $(KEYSERVER_SRCS) \ $(LDAP_SRCS) \ @@ -404,6 +475,10 @@ seahorse-add-subkey.xml \ seahorse-add-uid.xml \ seahorse-expires.xml \ + seahorse-keyserver-search.xml \ + seahorse-keyserver-results.ui \ + seahorse-keyserver-results.xml \ + seahorse-keyserver-sync.xml \ seahorse-pgp-public-key-properties.xml \ seahorse-pgp-private-key-properties.xml \ seahorse-pgp-generate.xml \ @@ -427,9 +502,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pgp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pgp/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pgp/Makefile + $(AUTOMAKE) --foreign pgp/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -451,18 +526,23 @@ 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 -libseahorse-pgp.la: $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_DEPENDENCIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libseahorse-pgp.la: $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_DEPENDENCIES) $(EXTRA_libseahorse_pgp_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_LIBADD) $(LIBS) install-seahorselibexecbinPROGRAMS: $(seahorselibexecbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(seahorselibexecbindir)" || $(MKDIR_P) "$(DESTDIR)$(seahorselibexecbindir)" @list='$(seahorselibexecbin_PROGRAMS)'; test -n "$(seahorselibexecbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(seahorselibexecbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(seahorselibexecbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -502,7 +582,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -xloadimage$(EXEEXT): $(xloadimage_OBJECTS) $(xloadimage_DEPENDENCIES) +xloadimage$(EXEEXT): $(xloadimage_OBJECTS) $(xloadimage_DEPENDENCIES) $(EXTRA_xloadimage_DEPENDENCIES) @rm -f xloadimage$(EXEEXT) $(AM_V_CCLD)$(LINK) $(xloadimage_OBJECTS) $(xloadimage_LDADD) $(LIBS) @@ -512,30 +592,38 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-combo-keys.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-discovery.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpg-op.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpg-options.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-add-subkey.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-add-uid.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-data.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-expires.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-exporter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-generate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-key-deleter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-key-op.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-key.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-keyring.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-photo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-photos.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-revoke.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-secret-deleter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-sign.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-source.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-subkey.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme-uid.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-gpgme.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-hkp-source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-keyserver-results.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-keyserver-search.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-keyserver-sync.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ldap-source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-commands.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-actions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-backend.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-key-properties.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-key.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-keysets.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-module.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-photo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-signature.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp-subkey.Plo@am__quote@ @@ -543,31 +631,31 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pgp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-server-source.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-signer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-transfer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-unknown-source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-unknown.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-xloadimage.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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -576,8 +664,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -591,9 +682,7 @@ @$(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 + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -644,6 +733,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -694,10 +797,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -784,7 +892,7 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES \ - clean-seahorselibexecbinPROGRAMS ctags distclean \ + clean-seahorselibexecbinPROGRAMS cscopelist 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 \ diff -Nru seahorse-3.2.2/pgp/seahorse-add-uid.xml seahorse-3.6.3/pgp/seahorse-add-uid.xml --- seahorse-3.2.2/pgp/seahorse-add-uid.xml 2011-09-14 17:14:56.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-add-uid.xml 2012-08-21 12:23:17.000000000 +0200 @@ -70,7 +70,7 @@ True 0 - Full _Name: + Full _Name: True name diff -Nru seahorse-3.2.2/pgp/seahorse-combo-keys.c seahorse-3.6.3/pgp/seahorse-combo-keys.c --- seahorse-3.2.2/pgp/seahorse-combo-keys.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-combo-keys.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,364 @@ +/* + * Seahorse + * + * Copyright (C) 2004-2006 Stefan Walter + * + * 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 "config.h" + +#include "seahorse-combo-keys.h" + +#include "seahorse-object.h" + +enum { + COMBO_LABEL, + COMBO_MARKUP, + COMBO_POINTER, + N_COLUMNS +}; + +typedef struct { + GHashTable *labels; + gboolean collision; +} ComboClosure; + +static void +combo_closure_free (gpointer data) +{ + ComboClosure *closure = data; + g_hash_table_destroy (closure->labels); + g_slice_free (ComboClosure, closure); +} + +static ComboClosure * +combo_closure_new (void) +{ + ComboClosure *closure = g_slice_new0 (ComboClosure); + closure->labels = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + return closure; +} + +static void +refresh_all_markup_in_combo (GtkComboBox *combo) +{ + GtkTreeModel *model; + gpointer object; + GtkTreeIter iter; + gboolean valid; + + model = gtk_combo_box_get_model (combo); + valid = gtk_tree_model_get_iter_first (model, &iter); + + while (valid) { + gtk_tree_model_get (model, &iter, COMBO_POINTER, &object, -1); + g_object_notify (object, "label"); + valid = gtk_tree_model_iter_next (model, &iter); + } +} + +static gchar * +calculate_markup_for_object (GtkComboBox *combo, + const gchar *label, + SeahorseObject *object) +{ + ComboClosure *closure; + const gchar *keyid; + gchar *ident; + gchar *markup; + + closure = g_object_get_data (G_OBJECT (combo), "combo-keys-closure"); + + if (!closure->collision) { + if (g_hash_table_lookup (closure->labels, label)) { + closure->collision = TRUE; + refresh_all_markup_in_combo (combo); + } else { + g_hash_table_insert (closure->labels, g_strdup (label), "X"); + } + } + + if (closure->collision && SEAHORSE_IS_PGP_KEY (object)) { + keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (object)); + ident = seahorse_pgp_key_calc_identifier (keyid); + markup = g_markup_printf_escaped ("%s [%s]", label, ident); + g_free (ident); + } else { + markup = g_markup_escape_text (label, -1); + } + + return markup; +} + +static void +on_label_changed (GObject *obj, + GParamSpec *param, + gpointer user_data) +{ + SeahorseObject *object = SEAHORSE_OBJECT (obj); + GtkComboBox *combo = GTK_COMBO_BOX (user_data); + ComboClosure *closure; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean valid; + gchar *previous; + gchar *markup; + gpointer pntr; + const gchar *label; + + closure = g_object_get_data (G_OBJECT (combo), "combo-keys-closure"); + model = gtk_combo_box_get_model (combo); + valid = gtk_tree_model_get_iter_first (model, &iter); + + while (valid) { + gtk_tree_model_get (model, &iter, COMBO_POINTER, &pntr, COMBO_LABEL, &previous, -1); + if (SEAHORSE_OBJECT (pntr) == object) { + + /* Remove this from label collision checks */ + g_hash_table_remove (closure->labels, previous); + + /* Calculate markup taking into account label collisions */ + label = seahorse_object_get_label (object); + markup = calculate_markup_for_object (combo, label, object); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COMBO_LABEL, label, + COMBO_MARKUP, markup, + -1); + g_free (markup); + break; + } + + g_free (previous); + valid = gtk_tree_model_iter_next (model, &iter); + } +} + +static void +on_collection_added (GcrCollection *collection, + GObject *obj, + gpointer user_data) +{ + SeahorseObject *object = SEAHORSE_OBJECT (obj); + GtkComboBox *combo = GTK_COMBO_BOX (user_data); + GtkListStore *model; + GtkTreeIter iter; + const gchar *label; + gchar *markup; + + model = GTK_LIST_STORE (gtk_combo_box_get_model (combo)); + + label = seahorse_object_get_label (object); + markup = calculate_markup_for_object (combo, label, object); + + gtk_list_store_append (model, &iter); + gtk_list_store_set (model, &iter, + COMBO_LABEL, label, + COMBO_MARKUP, markup, + COMBO_POINTER, object, + -1); + + g_free (markup); + + g_signal_connect (object, "notify::label", G_CALLBACK (on_label_changed), combo); +} + +static void +on_collection_removed (GcrCollection *collection, + GObject *obj, + gpointer user_data) +{ + ComboClosure *closure = g_object_get_data (user_data, "combo-keys-closure"); + SeahorseObject *object = SEAHORSE_OBJECT (obj); + GtkComboBox *combo = GTK_COMBO_BOX (user_data); + GtkTreeModel *model; + GtkTreeIter iter; + gchar *previous; + gpointer pntr; + gboolean valid; + + model = gtk_combo_box_get_model (combo); + valid = gtk_tree_model_get_iter_first (model, &iter); + + while (valid) { + gtk_tree_model_get (model, &iter, + COMBO_LABEL, &previous, + COMBO_POINTER, &pntr, + -1); + + if (SEAHORSE_OBJECT (pntr) == object) { + g_hash_table_remove (closure->labels, previous); + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + break; + } + + g_free (previous); + valid = gtk_tree_model_iter_next (model, &iter); + } + + g_signal_handlers_disconnect_by_func (object, on_label_changed, combo); +} + +static void +on_combo_destroy (GtkComboBox *combo, + gpointer user_data) +{ + GcrCollection *collection = GCR_COLLECTION (user_data); + GList *objects, *l; + + objects = gcr_collection_get_objects (collection); + for (l = objects; l != NULL; l = g_list_next (l)) + g_signal_handlers_disconnect_by_func (l->data, on_label_changed, combo); + g_list_free (objects); + g_signal_handlers_disconnect_by_func (collection, on_collection_added, combo); + g_signal_handlers_disconnect_by_func (collection, on_collection_removed, combo); +} + +/* ----------------------------------------------------------------------------- + * PUBLIC CALLS + */ + +void +seahorse_combo_keys_attach (GtkComboBox *combo, + GcrCollection *collection, + const gchar *none_option) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GtkCellRenderer *renderer; + GList *l, *objects; + + g_object_set_data_full (G_OBJECT (combo), "combo-keys-closure", + combo_closure_new (), combo_closure_free); + + /* Setup the None Option */ + model = gtk_combo_box_get_model (combo); + if (!model) { + model = GTK_TREE_MODEL (gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_POINTER)); + gtk_combo_box_set_model (combo, model); + + gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo)); + renderer = gtk_cell_renderer_text_new (); + + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, + "markup", COMBO_MARKUP); + } + + /* Setup the object list */ + objects = gcr_collection_get_objects (collection); + for (l = objects; l != NULL; l = g_list_next (l)) + on_collection_added (collection, l->data, combo); + g_list_free (objects); + + g_signal_connect_after (collection, "added", G_CALLBACK (on_collection_added), combo); + g_signal_connect_after (collection, "removed", G_CALLBACK (on_collection_removed), combo); + + if (none_option) { + gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + COMBO_LABEL, NULL, + COMBO_MARKUP, none_option, + COMBO_POINTER, NULL, + -1); + } + + gtk_tree_model_get_iter_first (model, &iter); + gtk_combo_box_set_active_iter (combo, &iter); + + g_signal_connect_data (combo, "destroy", G_CALLBACK (on_combo_destroy), + g_object_ref (collection), (GClosureNotify)g_object_unref, 0); +} + +void +seahorse_combo_keys_set_active_id (GtkComboBox *combo, + const gchar *keyid) +{ + SeahorsePgpKey *key; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean valid; + gpointer pointer; + guint i; + + g_return_if_fail (GTK_IS_COMBO_BOX (combo)); + + model = gtk_combo_box_get_model (combo); + g_return_if_fail (model != NULL); + + valid = gtk_tree_model_get_iter_first (model, &iter); + i = 0; + + while (valid) { + gtk_tree_model_get (model, &iter, + COMBO_POINTER, &pointer, + -1); + + key = SEAHORSE_PGP_KEY (pointer); + + if (!keyid) { + if (!key) { + gtk_combo_box_set_active_iter (combo, &iter); + break; + } + } else if (key != NULL) { + if (g_strcmp0 (seahorse_pgp_key_get_keyid (key), keyid) == 0) { + gtk_combo_box_set_active_iter (combo, &iter); + break; + } + } + + valid = gtk_tree_model_iter_next (model, &iter); + i++; + } +} + +void +seahorse_combo_keys_set_active (GtkComboBox *combo, + SeahorsePgpKey *key) +{ + seahorse_combo_keys_set_active_id (combo, + key == NULL ? NULL : seahorse_pgp_key_get_keyid (key)); +} + +SeahorsePgpKey * +seahorse_combo_keys_get_active (GtkComboBox *combo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gpointer pointer; + + g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL); + + model = gtk_combo_box_get_model (combo); + g_return_val_if_fail (model != NULL, NULL); + + gtk_combo_box_get_active_iter(combo, &iter); + + gtk_tree_model_get (model, &iter, + COMBO_POINTER, &pointer, + -1); + + return SEAHORSE_PGP_KEY (pointer); +} + +const gchar * +seahorse_combo_keys_get_active_id (GtkComboBox *combo) +{ + SeahorsePgpKey *key = seahorse_combo_keys_get_active (combo); + return key == NULL ? 0 : seahorse_pgp_key_get_keyid (key); +} diff -Nru seahorse-3.2.2/pgp/seahorse-combo-keys.h seahorse-3.6.3/pgp/seahorse-combo-keys.h --- seahorse-3.2.2/pgp/seahorse-combo-keys.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-combo-keys.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,51 @@ +/* + * Seahorse + * + * Copyright (C) 2004-2006 Stefan Walter + * + * 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. + */ + +/** + * seahorse_combo_keys_*: Shows a list of keys in a dropdown for selection. + * + * - Attaches to a GtkComboBox + * - Gets its list of keys from a SeahorseSet. + */ + +#ifndef __SEAHORSE_COMBO_KEYS_H__ +#define __SEAHORSE_COMBO_KEYS_H__ + +#include "seahorse-pgp-key.h" + +#include +#include + +void seahorse_combo_keys_attach (GtkComboBox *combo, + GcrCollection *collection, + const gchar *none_option); + +void seahorse_combo_keys_set_active_id (GtkComboBox *combo, + const gchar *keyid); + +void seahorse_combo_keys_set_active (GtkComboBox *combo, + SeahorsePgpKey *key); + +SeahorsePgpKey * seahorse_combo_keys_get_active (GtkComboBox *combo); + +const gchar * seahorse_combo_keys_get_active_id (GtkComboBox *combo); + +#endif /* __SEAHORSE_COMBO_KEYS_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-discovery.c seahorse-3.6.3/pgp/seahorse-discovery.c --- seahorse-3.2.2/pgp/seahorse-discovery.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-discovery.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,468 @@ +/* + * Seahorse + * + * Copyright (C) 2005 Stefan Walter + * + * 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 "config.h" + +#include "seahorse-discovery.h" +#include "seahorse-pgp-backend.h" +#include "seahorse-server-source.h" + +#ifdef WITH_SHARING +#include +#include +#include +#include +#include +#endif /* WITH_SHARING */ + +#include "seahorse-util.h" + +#define DEBUG_FLAG SEAHORSE_DEBUG_DNSSD +#include "seahorse-debug.h" + +#define HKP_SERVICE_TYPE "_pgpkey-hkp._tcp." + +/* + * DEBUG: Define if we want to show discoveries from this + * host. Normally these are suppressed + */ +/* #define DISCOVER_THIS_HOST 1 */ + + +/** + * SECTION:seahorse-dns-sd + * @short_description: Seahorse Service Discovery handles (finds, removes,...) Avahi services + * @include:libseahorse/seahorse-dns-sd.h + * + **/ + + +struct _SeahorseDiscoveryPriv { +#ifdef WITH_SHARING + AvahiClient *client; + AvahiServiceBrowser *browser; + AvahiGLibPoll *poll; +#else + char no_use; +#endif +}; + +enum { + ADDED, + REMOVED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +G_DEFINE_TYPE (SeahorseDiscovery, seahorse_discovery, G_TYPE_OBJECT); + +/* ----------------------------------------------------------------------------- + * INTERNAL + */ + +#ifdef WITH_SHARING + +/** +* self: A SeahorseDiscovery object +* +* Disconnects avahi +* +**/ +static void +disconnect (SeahorseDiscovery *self) +{ + if (self->priv->browser && self->priv->client) + avahi_service_browser_free (self->priv->browser); + self->priv->browser = NULL; + + if (self->priv->client) + avahi_client_free (self->priv->client); + self->priv->client = NULL; + + if (self->priv->poll) + avahi_glib_poll_free (self->priv->poll); + self->priv->poll = NULL; +} + +/** +* resolver: The avahi resolver +* iface: The avahi interface +* proto: The avahi protocol +* event: the avahi event +* name: name of the service +* type: must be HKP_SERVICE_TYPE +* domain: ignored +* host_name: ignored +* address: address of the service +* port: port of the service +* txt: ignored +* flags: +* data: userdata +* +* Resolves the avahi callback (AvahiServiceResolverCallback) +* +**/ +static void +resolve_callback (AvahiServiceResolver *resolver, AvahiIfIndex iface, AvahiProtocol proto, + AvahiResolverEvent event, const char *name, const char *type, const char *domain, + const char *host_name, const AvahiAddress *address, uint16_t port, + AvahiStringList *txt, AvahiLookupResultFlags flags, void *data) +{ + SeahorseDiscovery *self = SEAHORSE_DISCOVERY (data); + gchar *service_name; + gchar *service_uri; + gchar *ipname; + + g_assert (SEAHORSE_IS_DISCOVERY (self)); + + switch(event) { + case AVAHI_RESOLVER_FAILURE: + g_warning ("couldn't resolve service '%s': %s", name, + avahi_strerror (avahi_client_errno (self->priv->client))); + break; + + case AVAHI_RESOLVER_FOUND: + /* Make sure it's our type ... */ + /* XXX Is the service always guaranteed to be ascii? */ + if (g_ascii_strcasecmp (HKP_SERVICE_TYPE, type) != 0) + break; + +#ifndef DISCOVER_THIS_HOST + /* And that it's local */ + if (flags & AVAHI_LOOKUP_RESULT_LOCAL) + break; +#endif + + ipname = g_new0(gchar, AVAHI_ADDRESS_STR_MAX); + avahi_address_snprint (ipname, AVAHI_ADDRESS_STR_MAX, address); + + service_uri = g_strdup_printf ("hkp://%s:%d", ipname, (int)port); + service_name = g_strdup (name); + + g_hash_table_replace (self->services, service_name, service_uri); + g_signal_emit (self, signals[ADDED], 0, service_name); + + /* Add it to the context */ + if (!seahorse_pgp_backend_lookup_remote (NULL, service_uri)) { + SeahorseServerSource *ssrc = seahorse_server_source_new (service_uri); + g_return_if_fail (ssrc != NULL); + seahorse_pgp_backend_add_remote (NULL, service_uri, ssrc); + g_object_unref (ssrc); + } + + seahorse_debug ("added: %s %s\n", service_name, service_uri); + break; + + default: + break; + }; + + /* One result is enough for us */ + avahi_service_resolver_free (resolver); +} + +/** +* browser: The avahi browser +* iface: the interface +* proto: the protocol +* event: the event that happened while browsing (failure, new, remove) +* name: name of the service +* type: HKP_SERVICE_TYPE is expected +* domain: domain of the service +* flags: ignored +* data: userdata, type SeahorseDiscovery +* +* Called when a service is discovered while browsing. +* It is a AvahiServiceBrowserCallback +* +**/ +static void +browse_callback(AvahiServiceBrowser *browser, AvahiIfIndex iface, AvahiProtocol proto, + AvahiBrowserEvent event, const char *name, const char *type, + const char *domain, AvahiLookupResultFlags flags, void* data) +{ + SeahorseDiscovery *self = SEAHORSE_DISCOVERY (data); + const gchar *uri; + + g_assert (SEAHORSE_IS_DISCOVERY (self)); + g_assert (browser == self->priv->browser); + + /* XXX Is the service always guaranteed to be ascii? */ + if (g_ascii_strcasecmp (HKP_SERVICE_TYPE, type) != 0) + return; + + switch (event) { + case AVAHI_BROWSER_FAILURE: + g_warning ("failure browsing for services: %s", + avahi_strerror (avahi_client_errno (self->priv->client))); + disconnect (self); + break; + + case AVAHI_BROWSER_NEW: + if (!avahi_service_resolver_new (self->priv->client, iface, proto, name, type, + domain, AVAHI_PROTO_UNSPEC, 0, resolve_callback, self)) + g_warning ("couldn't start resolver for service '%s': %s\n", name, + avahi_strerror (avahi_client_errno (self->priv->client))); + break; + + case AVAHI_BROWSER_REMOVE: + uri = g_hash_table_lookup (self->services, name); + if (uri != NULL) { + /* Remove it from the main context */ + seahorse_pgp_backend_remove_remote (NULL, uri); + } + + /* And remove it from our tables */ + g_hash_table_remove (self->services, name); + g_signal_emit (self, signals[REMOVED], 0, name); + seahorse_debug ("removed: %s\n", name); + break; + + default: + break; + } +} + +/** +* client: Will be part of a potential error message +* state: the state of the avahi connection +* data: A SeahorseDiscovery object +* +* Handles AVAHI_CLIENT_FAILURE errors in state +* +**/ +static void +client_callback (AvahiClient *client, AvahiClientState state, void *data) +{ + SeahorseDiscovery *self = SEAHORSE_DISCOVERY (data); + + g_assert (SEAHORSE_IS_DISCOVERY (self)); + + /* Disconnect when failed */ + if (state == AVAHI_CLIENT_FAILURE) { + g_return_if_fail (client == self->priv->client); + g_warning ("failure communicating with to avahi: %s", + avahi_strerror (avahi_client_errno (client))); + disconnect (self); + } +} + +#endif /* WITH_SHARING */ + +/* ----------------------------------------------------------------------------- + * OBJECT + */ + + +/** +* self: The SeahorseDiscovery to init +* +* When compiled WITH_SHARING avahi will also be initialised and it will browse +* for avahi services. +**/ +static void +seahorse_discovery_init (SeahorseDiscovery *self) +{ + self->priv = g_new0 (SeahorseDiscoveryPriv, 1); + self->services = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + +#ifdef WITH_SHARING + { + int aerr; + avahi_set_allocator (avahi_glib_allocator ()); + + self->priv->poll = avahi_glib_poll_new (NULL, G_PRIORITY_DEFAULT); + if (!self->priv->poll) { + g_warning ("couldn't initialize avahi glib poll integration"); + return; + } + + self->priv->client = avahi_client_new (avahi_glib_poll_get (self->priv->poll), + 0, client_callback, self, &aerr); + if (!self->priv->client) { + g_message ("DNS-SD initialization failed: %s", avahi_strerror (aerr)); + return; + } + + self->priv->browser = avahi_service_browser_new (self->priv->client, AVAHI_IF_UNSPEC, + AVAHI_PROTO_UNSPEC, HKP_SERVICE_TYPE, NULL, 0, + browse_callback, self); + if (!self->priv->browser) { + g_message ("Browsing for DNS-SD services failed: %s", + avahi_strerror (avahi_client_errno (self->priv->client))); + return; + } + } +#endif /* WITH_SHARING */ +} + +/** +* gobject: A SeahorseDiscovery object +* +* Disposes the object +* +**/ +static void +seahorse_discovery_dispose (GObject *gobject) +{ +#ifdef WITH_SHARING + SeahorseDiscovery *self = SEAHORSE_DISCOVERY (gobject); + disconnect (self); +#endif + + G_OBJECT_CLASS (seahorse_discovery_parent_class)->dispose (gobject); +} + + +/** +* gobject: A SeahorseDiscovery object +* +* free private vars +* +**/ +static void +seahorse_discovery_finalize (GObject *gobject) +{ + SeahorseDiscovery *self = SEAHORSE_DISCOVERY (gobject); + +#ifdef WITH_SHARING + g_assert (self->priv->browser == NULL); + g_assert (self->priv->client == NULL); +#endif + + if (self->services) + g_hash_table_destroy (self->services); + self->services = NULL; + + g_free (self->priv); + self->priv = NULL; + + G_OBJECT_CLASS (seahorse_discovery_parent_class)->finalize (gobject); +} + +/** +* klass: The SeahorseDiscoveryClass to initialise +* +* The class will use the signals "added" and "removed" +* +**/ +static void +seahorse_discovery_class_init (SeahorseDiscoveryClass *klass) +{ + GObjectClass *gclass; + + seahorse_discovery_parent_class = g_type_class_peek_parent (klass); + gclass = G_OBJECT_CLASS (klass); + + gclass->dispose = seahorse_discovery_dispose; + gclass->finalize = seahorse_discovery_finalize; + + signals[ADDED] = g_signal_new ("added", SEAHORSE_TYPE_DISCOVERY, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseDiscoveryClass, added), + NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + signals[REMOVED] = g_signal_new ("removed", SEAHORSE_TYPE_DISCOVERY, + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (SeahorseDiscoveryClass, removed), + NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); +} + +/* ----------------------------------------------------------------------------- + * PUBLIC + */ + +/** + * seahorse_discovery_new: + * + * + * + * Returns: A new #SeahorseDiscovery object + */ +SeahorseDiscovery* +seahorse_discovery_new (void) +{ + return g_object_new (SEAHORSE_TYPE_DISCOVERY, NULL); +} + +/** + * seahorse_discovery_list: + * @self: A #SeahorseDiscovery. It's services will be added to the list + * + * + * + * Returns: the services in @self + */ +gchar ** +seahorse_discovery_list (SeahorseDiscovery *self) +{ + GHashTableIter iter; + GPtrArray *result = g_ptr_array_new (); + gpointer key; + + g_return_val_if_fail (SEAHORSE_IS_DISCOVERY (self), NULL); + g_hash_table_iter_init (&iter, self->services); + while (g_hash_table_iter_next (&iter, &key, NULL)) + g_ptr_array_add (result, g_strdup (key)); + + return (gchar **)g_ptr_array_free (result, FALSE); +} + +/** + * seahorse_discovery_get_uri: + * @self: Service discovery object + * @service: The service to get the uri for + * + * + * + * Returns: The URI of the service @service in @self + */ +const gchar* +seahorse_discovery_get_uri (SeahorseDiscovery *self, + const gchar *service) +{ + g_return_val_if_fail (SEAHORSE_IS_DISCOVERY (self), NULL); + return (const gchar*)g_hash_table_lookup (self->services, service); +} + +/** + * seahorse_discovery_get_uris: + * @self: The service discovery object + * @services: A list of services + * + * The returned uris in the list are copied and must be freed with g_free. + * + * Returns: uris for the services + */ +gchar ** +seahorse_discovery_get_uris (SeahorseDiscovery *self, + const gchar **services) +{ + GPtrArray *result = g_ptr_array_new (); + const gchar *uri; + guint i; + + for (i = 0; services && services[i] != NULL; i++) { + uri = g_hash_table_lookup (self->services, services[i]); + g_ptr_array_add (result, g_strdup (uri)); + } + + g_ptr_array_add (result, NULL); + return (gchar **)g_ptr_array_free (result, FALSE); +} diff -Nru seahorse-3.2.2/pgp/seahorse-discovery.h seahorse-3.6.3/pgp/seahorse-discovery.h --- seahorse-3.2.2/pgp/seahorse-discovery.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-discovery.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,83 @@ +/* + * Seahorse + * + * Copyright (C) 2005 Stefan Walter + * + * 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 __SEAHORSE_DNS_SD_H__ +#define __SEAHORSE_DNS_SD_H__ + +#include +#include + +#define SEAHORSE_TYPE_DISCOVERY (seahorse_discovery_get_type ()) +#define SEAHORSE_DISCOVERY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_DISCOVERY, SeahorseDiscovery)) +#define SEAHORSE_DISCOVERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_DISCOVERY, SeahorseDiscoveryClass)) +#define SEAHORSE_IS_DISCOVERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_DISCOVERY)) +#define SEAHORSE_IS_DISCOVERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_DISCOVERY)) +#define SEAHORSE_DISCOVERY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_DISCOVERY, SeahorseDiscoveryClass)) + +typedef struct _SeahorseDiscovery SeahorseDiscovery; +typedef struct _SeahorseDiscoveryClass SeahorseDiscoveryClass; +typedef struct _SeahorseDiscoveryPriv SeahorseDiscoveryPriv; + +/** + * SeahorseDiscovery: + * @parent: The parent #GObject + * @services: A #GHashTable of known services + * + * Listens for DNS-SD shared keys on the network and + * adds SeahorseKeySoruce objects to the SeahorseContext as necessary. + * + * Signals: + * added: A new shared key source was found. + * removed: A shared key source went away. + */ + +struct _SeahorseDiscovery { + GObject parent; + + GHashTable *services; + SeahorseDiscoveryPriv *priv; +}; + +struct _SeahorseDiscoveryClass { + GObjectClass parent_class; + + /* A relevant service appeared on the network */ + void (*added) (SeahorseDiscovery *ssd, + const gchar* service); + + /* A service disappeared */ + void (*removed) (SeahorseDiscovery *ssd, + const gchar* service); +}; + +GType seahorse_discovery_get_type (void); + +SeahorseDiscovery* seahorse_discovery_new (void); + +gchar ** seahorse_discovery_list (SeahorseDiscovery *ssd); + +const gchar* seahorse_discovery_get_uri (SeahorseDiscovery *ssd, + const gchar *service); + +gchar ** seahorse_discovery_get_uris (SeahorseDiscovery *ssd, + const gchar **services); + +#endif /* __SEAHORSE_DISCOVERY_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-add-subkey.c seahorse-3.6.3/pgp/seahorse-gpgme-add-subkey.c --- seahorse-3.2.2/pgp/seahorse-gpgme-add-subkey.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-add-subkey.c 2012-08-21 12:23:17.000000000 +0200 @@ -173,8 +173,8 @@ GtkTreeIter iter; GtkCellRenderer *renderer; GtkWidget *widget, *datetime; - - swidget = seahorse_object_widget_new ("add-subkey", parent, SEAHORSE_OBJECT (pkey)); + + swidget = seahorse_object_widget_new ("add-subkey", parent, G_OBJECT (pkey)); g_return_if_fail (swidget != NULL); gtk_window_set_title (GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)), diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-add-uid.c seahorse-3.6.3/pgp/seahorse-gpgme-add-uid.c --- seahorse-3.2.2/pgp/seahorse-gpgme-add-uid.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-add-uid.c 2012-08-21 12:23:17.000000000 +0200 @@ -81,10 +81,10 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object; + GObject *object; const gchar *name, *email, *comment; gpgme_error_t err; - + object = SEAHORSE_OBJECT_WIDGET (swidget)->object; name = gtk_entry_get_text (GTK_ENTRY ( @@ -113,8 +113,8 @@ { SeahorseWidget *swidget; const gchar *userid; - - swidget = seahorse_object_widget_new ("add-uid", parent, SEAHORSE_OBJECT (pkey)); + + swidget = seahorse_object_widget_new ("add-uid", parent, G_OBJECT (pkey)); g_return_if_fail (swidget != NULL); userid = seahorse_object_get_label (SEAHORSE_OBJECT (pkey)); diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-data.c seahorse-3.6.3/pgp/seahorse-gpgme-data.c --- seahorse-3.2.2/pgp/seahorse-gpgme-data.c 2011-09-14 17:04:58.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-gpgme-data.c 2012-08-21 12:23:17.000000000 +0200 @@ -170,7 +170,7 @@ output_seek (void *handle, off_t offset, int whence) { GSeekable *seek; - GSeekType from; + GSeekType from = 0; GError *err = NULL; GOutputStream* output = handle; @@ -264,7 +264,7 @@ input_seek (void *handle, off_t offset, int whence) { GSeekable *seek; - GSeekType from; + GSeekType from = 0; GError *err = NULL; GInputStream* input = handle; diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-dialogs.h seahorse-3.6.3/pgp/seahorse-gpgme-dialogs.h --- seahorse-3.2.2/pgp/seahorse-gpgme-dialogs.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-dialogs.h 2012-08-21 12:23:17.000000000 +0200 @@ -32,7 +32,7 @@ #include "pgp/seahorse-gpgme-key.h" #include "pgp/seahorse-gpgme-photo.h" #include "pgp/seahorse-gpgme-subkey.h" -#include "pgp/seahorse-gpgme-source.h" +#include "pgp/seahorse-gpgme-keyring.h" #include "pgp/seahorse-gpgme-uid.h" #include "libseahorse/seahorse-widget.h" @@ -44,13 +44,13 @@ void seahorse_gpgme_generate_register (void); -void seahorse_gpgme_generate_show (SeahorseGpgmeSource *sksrc, +void seahorse_gpgme_generate_show (SeahorseGpgmeKeyring *keyring, GtkWindow *parent, const char * name, const char *email, const gchar *comment); -void seahorse_gpgme_generate_key (SeahorseGpgmeSource *sksrc, +void seahorse_gpgme_generate_key (SeahorseGpgmeKeyring *keyring, const gchar *name, const gchar *email, const gchar *comment, diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-exporter.c seahorse-3.6.3/pgp/seahorse-gpgme-exporter.c --- seahorse-3.2.2/pgp/seahorse-gpgme-exporter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-exporter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,445 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-gpgme.h" +#include "seahorse-gpgme-data.h" +#include "seahorse-gpgme-exporter.h" +#include "seahorse-gpgme-key.h" +#include "seahorse-gpgme-keyring.h" +#include "seahorse-gpg-op.h" +#include "seahorse-progress.h" + +#include "seahorse-exporter.h" +#include "seahorse-object.h" +#include "seahorse-util.h" + +#include + +#include + +#define SEAHORSE_GPGME_EXPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GPGME_EXPORTER, SeahorseGpgmeExporterClass)) +#define SEAHORSE_IS_GPGME_EXPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GPGME_EXPORTER)) +#define SEAHORSE_GPGME_EXPORTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GPGME_EXPORTER, SeahorseGpgmeExporterClass)) + +typedef struct _SeahorseGpgmeExporterClass SeahorseGpgmeExporterClass; + +struct _SeahorseGpgmeExporter { + GObject parent; + GList *objects; + gboolean armor; + gboolean secret; +}; + +struct _SeahorseGpgmeExporterClass { + GObjectClass parent_class; +}; + +enum { + PROP_0, + PROP_FILENAME, + PROP_CONTENT_TYPE, + PROP_FILE_FILTER, + PROP_ARMOR, + PROP_SECRET +}; + +static void seahorse_gpgme_exporter_iface_init (SeahorseExporterIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseGpgmeExporter, seahorse_gpgme_exporter, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTER, seahorse_gpgme_exporter_iface_init); +); + +static gchar * +calc_filename (SeahorseGpgmeExporter *self) +{ + const gchar *basename = NULL; + gchar *filename; + + g_return_val_if_fail (self->objects, NULL); + + /* Multiple objects */ + if (self->objects->next) + basename = _("Multiple Keys"); + else if (self->objects->data) + basename = seahorse_object_get_nickname (self->objects->data); + if (basename == NULL) + basename = _("Key Data"); + + if (self->armor) + filename = g_strconcat (basename, ".asc", NULL); + else + filename = g_strconcat (basename, ".pgp", NULL); + g_strstrip (filename); + g_strdelimit (filename, SEAHORSE_BAD_FILENAME_CHARS, '_'); + return filename; +} + +static const gchar * +calc_content_type (SeahorseGpgmeExporter *self) +{ + if (self->armor) + return "application/pgp-keys"; + else + return "application/pgp-keys+armor"; +} + +static GtkFileFilter * +calc_file_filter (SeahorseGpgmeExporter *self) +{ + GtkFileFilter *filter = gtk_file_filter_new (); + + if (self->armor) { + gtk_file_filter_set_name (filter, _("Armored PGP keys")); + gtk_file_filter_add_mime_type (filter, "application/pgp-keys+armor"); + gtk_file_filter_add_pattern (filter, "*.asc"); + } else { + gtk_file_filter_set_name (filter, _("PGP keys")); + gtk_file_filter_add_mime_type (filter, "application/pgp-keys"); + gtk_file_filter_add_pattern (filter, "*.pgp"); + gtk_file_filter_add_pattern (filter, "*.gpg"); + } + + return filter; +} + +static void +seahorse_gpgme_exporter_init (SeahorseGpgmeExporter *self) +{ + +} + +static void +seahorse_gpgme_exporter_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseGpgmeExporter *self = SEAHORSE_GPGME_EXPORTER (object); + + switch (prop_id) { + case PROP_FILENAME: + g_value_take_string (value, calc_filename (self)); + break; + case PROP_CONTENT_TYPE: + g_value_set_string (value, calc_content_type (self)); + break; + case PROP_FILE_FILTER: + g_value_take_object (value, calc_file_filter (self)); + break; + case PROP_ARMOR: + g_value_set_boolean (value, self->armor); + break; + case PROP_SECRET: + g_value_set_boolean (value, self->secret); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +seahorse_gpgme_exporter_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseGpgmeExporter *self = SEAHORSE_GPGME_EXPORTER (object); + + switch (prop_id) { + case PROP_ARMOR: + self->armor = g_value_get_boolean (value); + break; + case PROP_SECRET: + self->secret = g_value_get_boolean (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +seahorse_gpgme_exporter_finalize (GObject *obj) +{ + SeahorseGpgmeExporter *self = SEAHORSE_GPGME_EXPORTER (obj); + + g_list_free_full (self->objects, g_object_unref); + + G_OBJECT_CLASS (seahorse_gpgme_exporter_parent_class)->finalize (obj); +} + +static void +seahorse_gpgme_exporter_class_init (SeahorseGpgmeExporterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->finalize = seahorse_gpgme_exporter_finalize; + gobject_class->set_property = seahorse_gpgme_exporter_set_property; + gobject_class->get_property = seahorse_gpgme_exporter_get_property; + + g_object_class_override_property (gobject_class, PROP_FILENAME, "filename"); + g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type"); + g_object_class_override_property (gobject_class, PROP_FILE_FILTER, "file-filter"); + + g_object_class_install_property (gobject_class, PROP_ARMOR, + g_param_spec_boolean ("armor", "Armor", "Armor encoding", + FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, PROP_SECRET, + g_param_spec_boolean ("secret", "Secret", "Secret key export", + FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); +} + +static GList * +seahorse_gpgme_exporter_get_objects (SeahorseExporter *exporter) +{ + SeahorseGpgmeExporter *self = SEAHORSE_GPGME_EXPORTER (exporter); + return self->objects; +} + +static gboolean +seahorse_gpgme_exporter_add_object (SeahorseExporter *exporter, + GObject *object) +{ + SeahorseGpgmeExporter *self = SEAHORSE_GPGME_EXPORTER (exporter); + SeahorseGpgmeKey *key; + + if (SEAHORSE_IS_GPGME_KEY (object)) { + key = SEAHORSE_GPGME_KEY (object); + if (self->secret && seahorse_gpgme_key_get_private (key) == NULL) + return FALSE; + + self->objects = g_list_append (self->objects, g_object_ref (key)); + return TRUE; + } + + return FALSE; +} + +typedef struct { + GPtrArray *keyids; + gint at; + gpgme_data_t data; + gpgme_ctx_t gctx; + GMemoryOutputStream *output; + GCancellable *cancellable; + gulong cancelled_sig; +} GpgmeExportClosure; + +static void +gpgme_export_closure_free (gpointer data) +{ + GpgmeExportClosure *closure = data; + g_cancellable_disconnect (closure->cancellable, closure->cancelled_sig); + g_clear_object (&closure->cancellable); + gpgme_data_release (closure->data); + if (closure->gctx) + gpgme_release (closure->gctx); + g_ptr_array_free (closure->keyids, TRUE); + g_object_unref (closure->output); + g_free (closure); +} + + +static gboolean +on_keyring_export_complete (gpgme_error_t gerr, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + GpgmeExportClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + + if (seahorse_gpgme_propagate_error (gerr, &error)) { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + return FALSE; /* don't call again */ + } + + if (closure->at >= 0) + seahorse_progress_end (closure->cancellable, + closure->keyids->pdata[closure->at]); + + g_assert (closure->at < (gint)closure->keyids->len); + closure->at++; + + if (closure->at == closure->keyids->len) { + g_simple_async_result_complete (res); + return FALSE; /* don't run this again */ + } + + /* Do the next key in the list */ + gerr = gpgme_op_export_start (closure->gctx, closure->keyids->pdata[closure->at], + 0, closure->data); + + if (seahorse_gpgme_propagate_error (gerr, &error)) { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + return FALSE; /* don't run this again */ + } + + seahorse_progress_begin (closure->cancellable, + closure->keyids->pdata[closure->at]); + return TRUE; /* call this source again */ +} + +static void +seahorse_gpgme_exporter_export_async (SeahorseExporter *exporter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseGpgmeExporter *self = SEAHORSE_GPGME_EXPORTER (exporter); + GSimpleAsyncResult *res; + GpgmeExportClosure *closure; + GError *error = NULL; + gpgme_error_t gerr = 0; + SeahorsePgpKey *key; + gchar *keyid; + GSource *gsource; + GList *l; + + res = g_simple_async_result_new (G_OBJECT (exporter), callback, user_data, + seahorse_gpgme_exporter_export_async); + closure = g_new0 (GpgmeExportClosure, 1); + closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + closure->gctx = seahorse_gpgme_keyring_new_context (&gerr); + closure->output = G_MEMORY_OUTPUT_STREAM (g_memory_output_stream_new (NULL, 0, g_realloc, g_free)); + closure->data = seahorse_gpgme_data_output (G_OUTPUT_STREAM (closure->output)); + closure->keyids = g_ptr_array_new_with_free_func (g_free); + closure->at = -1; + g_simple_async_result_set_op_res_gpointer (res, closure, gpgme_export_closure_free); + + if (seahorse_gpgme_propagate_error (gerr, &error)) { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); + return; + } + + gpgme_set_armor (closure->gctx, self->armor); + + for (l = self->objects; l != NULL; l = g_list_next (l)) { + key = SEAHORSE_PGP_KEY (l->data); + + /* Building list */ + keyid = g_strdup (seahorse_pgp_key_get_keyid (key)); + seahorse_progress_prep (closure->cancellable, keyid, NULL); + g_ptr_array_add (closure->keyids, keyid); + } + + if (self->secret) { + g_return_if_fail (self->armor == TRUE); + g_ptr_array_add (closure->keyids, NULL); + gerr = seahorse_gpg_op_export_secret (closure->gctx, (const gchar **)closure->keyids->pdata, + closure->data); + if (seahorse_gpgme_propagate_error (gerr, &error)) + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); + return; + } + + gsource = seahorse_gpgme_gsource_new (closure->gctx, cancellable); + g_source_set_callback (gsource, (GSourceFunc)on_keyring_export_complete, + g_object_ref (res), g_object_unref); + + /* Get things started */ + if (on_keyring_export_complete (0, res)) + g_source_attach (gsource, g_main_context_default ()); + + g_source_unref (gsource); + g_object_unref (res); +} + +static gpointer +seahorse_gpgme_exporter_export_finish (SeahorseExporter *exporter, + GAsyncResult *result, + gsize *size, + GError **error) +{ + GpgmeExportClosure *closure; + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (exporter), + seahorse_gpgme_exporter_export_async), NULL); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return NULL; + + closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); + g_output_stream_close (G_OUTPUT_STREAM (closure->output), NULL, NULL); + *size = g_memory_output_stream_get_data_size (closure->output); + return g_memory_output_stream_steal_data (closure->output); +} + +static void +seahorse_gpgme_exporter_iface_init (SeahorseExporterIface *iface) +{ + iface->add_object = seahorse_gpgme_exporter_add_object; + iface->export_async = seahorse_gpgme_exporter_export_async; + iface->export_finish = seahorse_gpgme_exporter_export_finish; + iface->get_objects = seahorse_gpgme_exporter_get_objects; +} + +SeahorseExporter * +seahorse_gpgme_exporter_new (GObject *object, + gboolean armor, + gboolean secret) +{ + SeahorseExporter *exporter; + + g_return_val_if_fail (secret == FALSE || armor == TRUE, NULL); + + exporter = g_object_new (SEAHORSE_TYPE_GPGME_EXPORTER, + "armor", armor, + "secret", secret, + NULL); + + if (!seahorse_exporter_add_object (exporter, object)) + g_return_val_if_reached (NULL); + + return exporter; +} + + +SeahorseExporter * +seahorse_gpgme_exporter_new_multiple (GList *keys, + gboolean armor) +{ + SeahorseExporter *exporter; + GList *l; + + exporter = g_object_new (SEAHORSE_TYPE_GPGME_EXPORTER, + "armor", armor, + "secret", FALSE, + NULL); + + for (l = keys; l != NULL; l = g_list_next (l)) { + if (!seahorse_exporter_add_object (exporter, l->data)) + g_return_val_if_reached (NULL); + } + + return exporter; +} diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-exporter.h seahorse-3.6.3/pgp/seahorse-gpgme-exporter.h --- seahorse-3.2.2/pgp/seahorse-gpgme-exporter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-exporter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,47 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_GPGME_EXPORTER_H__ +#define __SEAHORSE_GPGME_EXPORTER_H__ + +#include + +#include "seahorse-exporter.h" + +#define SEAHORSE_TYPE_GPGME_EXPORTER (seahorse_gpgme_exporter_get_type ()) +#define SEAHORSE_GPGME_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GPGME_EXPORTER, SeahorseGpgmeExporter)) +#define SEAHORSE_IS_GPGME_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GPGME_EXPORTER)) + +typedef struct _SeahorseGpgmeExporter SeahorseGpgmeExporter; + +GType seahorse_gpgme_exporter_get_type (void) G_GNUC_CONST; + +SeahorseExporter * seahorse_gpgme_exporter_new (GObject *object, + gboolean armor, + gboolean secret); + +SeahorseExporter * seahorse_gpgme_exporter_new_multiple (GList *keys, + gboolean armor); + + +#endif /* __SEAHORSE_GPGME_EXPORTER_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-generate.c seahorse-3.6.3/pgp/seahorse-gpgme-generate.c --- seahorse-3.2.2/pgp/seahorse-gpgme-generate.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-generate.c 2012-11-12 08:32:13.000000000 +0100 @@ -29,7 +29,8 @@ #include "egg-datetime.h" -#include "seahorse-gtkstock.h" +#include "seahorse-action.h" +#include "seahorse-icons.h" #include "seahorse-registry.h" #include "seahorse-passphrase.h" #include "seahorse-progress.h" @@ -37,11 +38,12 @@ #include "seahorse-widget.h" #include "seahorse-pgp.h" +#include "seahorse-pgp-backend.h" #include "seahorse-gpgme.h" #include "seahorse-gpgme-dialogs.h" #include "seahorse-gpgme-key.h" #include "seahorse-gpgme-key-op.h" -#include "seahorse-gpgme-source.h" +#include "seahorse-gpgme-keyring.h" /** * SECTION:seahorse-gpgme-generate @@ -77,18 +79,20 @@ static void on_pgp_generate_key (GtkAction *action, gpointer unused) { - SeahorseSource* sksrc; - + SeahorseGpgmeKeyring* keyring; + g_return_if_fail (GTK_IS_ACTION (action)); - - sksrc = seahorse_context_find_source (seahorse_context_instance (), SEAHORSE_PGP_TYPE, SEAHORSE_LOCATION_LOCAL); - g_return_if_fail (sksrc != NULL); - - seahorse_gpgme_generate_show (SEAHORSE_GPGME_SOURCE (sksrc), NULL, NULL, NULL, NULL); + + keyring = seahorse_pgp_backend_get_default_keyring (NULL); + g_return_if_fail (keyring != NULL); + + seahorse_gpgme_generate_show (keyring, + seahorse_action_get_window (action), + NULL, NULL, NULL); } static const GtkActionEntry ACTION_ENTRIES[] = { - { "pgp-generate-key", SEAHORSE_PGP_STOCK_ICON, N_ ("PGP Key"), "", + { "pgp-generate-key", GCR_ICON_KEY_PAIR, N_ ("PGP Key"), "", N_("Used to encrypt email and files"), G_CALLBACK (on_pgp_generate_key) } }; @@ -174,7 +178,7 @@ { GError *error = NULL; - if (!seahorse_gpgme_key_op_generate_finish (SEAHORSE_GPGME_SOURCE (source), result, &error)) + if (!seahorse_gpgme_key_op_generate_finish (SEAHORSE_GPGME_KEYRING (source), result, &error)) seahorse_util_handle_error (&error, NULL, _("Couldn't generate PGP key")); } @@ -194,7 +198,7 @@ * */ void -seahorse_gpgme_generate_key (SeahorseGpgmeSource *source, +seahorse_gpgme_generate_key (SeahorseGpgmeKeyring *keyring, const gchar *name, const gchar *email, const gchar *comment, @@ -205,6 +209,7 @@ GCancellable *cancellable; const gchar *pass; GtkDialog *dialog; + const gchar *notice; dialog = seahorse_passphrase_prompt_show (_("Passphrase for New PGP Key"), _("Enter the passphrase for your new key twice."), @@ -212,11 +217,18 @@ if (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) { pass = seahorse_passphrase_prompt_get (dialog); cancellable = g_cancellable_new (); - seahorse_gpgme_key_op_generate_async (source, name, email, comment, + seahorse_gpgme_key_op_generate_async (keyring, name, email, comment, pass, type, bits, expires, cancellable, on_generate_key_complete, NULL); - seahorse_progress_show (cancellable, _("Generating key"), FALSE); + + /* Has line breaks because GtkLabel is completely broken WRT wrapping */ + notice = _("When creating a key we need to generate a lot of\n" + "random data and we need you to help. It's a good\n" + "idea to perform some other action like typing on\n" + "the keyboard, moving the mouse, using applications.\n" + "This gives the system the random data that it needs."); + seahorse_progress_show_with_notice (cancellable, _("Generating key"), notice, FALSE); g_object_unref (cancellable); } @@ -240,7 +252,7 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseGpgmeSource *sksrc; + SeahorseGpgmeKeyring *keyring; GtkWidget *widget; gchar *name; const gchar *email; @@ -308,13 +320,13 @@ egg_datetime_get_as_time_t (EGG_DATETIME (widget), &expires); } - sksrc = SEAHORSE_GPGME_SOURCE (g_object_get_data (G_OBJECT (swidget), "source")); - g_assert (SEAHORSE_IS_GPGME_SOURCE (sksrc)); + keyring = SEAHORSE_GPGME_KEYRING (g_object_get_data (G_OBJECT (swidget), "source")); + g_assert (SEAHORSE_IS_GPGME_KEYRING (keyring)); /* Less confusing with less on the screen */ gtk_widget_hide (seahorse_widget_get_toplevel (swidget)); - seahorse_gpgme_generate_key (sksrc, name, email, comment, type, bits, expires); + seahorse_gpgme_generate_key (keyring, name, email, comment, type, bits, expires); seahorse_widget_destroy (swidget); @@ -404,7 +416,7 @@ /** * seahorse_gpgme_generate_show: - * @sksrc: the gpgme source + * @keyring: the gpgme source * @parent: the parent window * @name: The user name, can be NULL if not available * @email: The user's email address, can be NULL if not available @@ -414,7 +426,11 @@ * */ void -seahorse_gpgme_generate_show (SeahorseGpgmeSource *sksrc, GtkWindow *parent, const gchar * name, const gchar *email, const gchar *comment) +seahorse_gpgme_generate_show (SeahorseGpgmeKeyring *keyring, + GtkWindow *parent, + const gchar * name, + const gchar *email, + const gchar *comment) { SeahorseWidget *swidget; GtkWidget *widget, *datetime; @@ -447,12 +463,7 @@ g_return_if_fail (widget != NULL); gtk_entry_set_text(GTK_ENTRY(widget),comment); } - - widget = seahorse_widget_get_widget (swidget, "pgp-image"); - g_return_if_fail (widget != NULL); - gtk_image_set_from_stock (GTK_IMAGE (widget), SEAHORSE_STOCK_SECRET, - GTK_ICON_SIZE_DIALOG); - + /* The algoritms */ widget = seahorse_widget_get_widget (swidget, "algorithm-choice"); g_return_if_fail (widget != NULL); @@ -472,9 +483,8 @@ gtk_box_pack_start (GTK_BOX (widget), datetime, TRUE, TRUE, 0); gtk_widget_set_sensitive (datetime, FALSE); gtk_widget_show_all (widget); - - g_object_ref (sksrc); - g_object_set_data_full (G_OBJECT (swidget), "source", sksrc, g_object_unref); - + + g_object_set_data_full (G_OBJECT (swidget), "source", g_object_ref (keyring), g_object_unref); + on_gpgme_generate_entry_changed (NULL, swidget); } diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-key.c seahorse-3.6.3/pgp/seahorse-gpgme-key.c --- seahorse-3.2.2/pgp/seahorse-gpgme-key.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-key.c 2012-11-09 11:08:13.000000000 +0100 @@ -21,22 +21,29 @@ */ #include "config.h" -#include - -#include - -#include "seahorse-context.h" +#include "seahorse-gpgme.h" +#include "seahorse-gpgme-exporter.h" +#include "seahorse-gpgme-key-op.h" +#include "seahorse-gpgme-key-deleter.h" +#include "seahorse-gpgme-photo.h" +#include "seahorse-gpgme-keyring.h" +#include "seahorse-gpgme-secret-deleter.h" +#include "seahorse-gpgme-uid.h" +#include "seahorse-pgp-actions.h" +#include "seahorse-pgp-backend.h" +#include "seahorse-pgp-key.h" + +#include "seahorse-deletable.h" +#include "seahorse-exportable.h" +#include "seahorse-icons.h" +#include "seahorse-predicate.h" #include "seahorse-object-list.h" -#include "seahorse-source.h" -#include "seahorse-gtkstock.h" +#include "seahorse-place.h" #include "seahorse-util.h" -#include "pgp/seahorse-pgp-key.h" -#include "pgp/seahorse-gpgme.h" -#include "pgp/seahorse-gpgme-key-op.h" -#include "pgp/seahorse-gpgme-photo.h" -#include "pgp/seahorse-gpgme-source.h" -#include "pgp/seahorse-gpgme-uid.h" +#include + +#include enum { PROP_0, @@ -46,7 +53,14 @@ PROP_TRUST }; -G_DEFINE_TYPE (SeahorseGpgmeKey, seahorse_gpgme_key, SEAHORSE_TYPE_PGP_KEY); +static void seahorse_gpgme_key_deletable_iface (SeahorseDeletableIface *iface); + +static void seahorse_gpgme_key_exportable_iface (SeahorseExportableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseGpgmeKey, seahorse_gpgme_key, SEAHORSE_TYPE_PGP_KEY, + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTABLE, seahorse_gpgme_key_exportable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_DELETABLE, seahorse_gpgme_key_deletable_iface); +); struct _SeahorseGpgmeKeyPrivate { gpgme_key_t pubkey; /* The public key */ @@ -66,15 +80,21 @@ */ static gboolean -load_gpgme_key (GQuark id, int mode, int secret, gpgme_key_t *key) +load_gpgme_key (const gchar *keyid, + int mode, + int secret, + gpgme_key_t *key) { GError *error = NULL; gpgme_ctx_t ctx; gpgme_error_t gerr; - - ctx = seahorse_gpgme_source_new_context (); + + ctx = seahorse_gpgme_keyring_new_context (&gerr); + if (gerr != 0) + return FALSE; + gpgme_set_keylist_mode (ctx, mode); - gerr = gpgme_op_keylist_start (ctx, seahorse_pgp_key_calc_rawid (id), secret); + gerr = gpgme_op_keylist_start (ctx, keyid, secret); if (GPG_IS_OK (gerr)) { gerr = gpgme_op_keylist_next (ctx, key); gpgme_op_keylist_end (ctx); @@ -95,18 +115,16 @@ load_key_public (SeahorseGpgmeKey *self, int list_mode) { gpgme_key_t key = NULL; + const gchar *keyid; gboolean ret; - GQuark id; - + if (self->pv->block_loading) return; list_mode |= self->pv->list_mode; - - id = seahorse_object_get_id (SEAHORSE_OBJECT (self)); - g_return_if_fail (id); - - ret = load_gpgme_key (id, list_mode, FALSE, &key); + + keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (self)); + ret = load_gpgme_key (keyid, list_mode, FALSE, &key); if (ret) { self->pv->list_mode = list_mode; seahorse_gpgme_key_set_public (self, key); @@ -126,16 +144,14 @@ load_key_private (SeahorseGpgmeKey *self) { gpgme_key_t key = NULL; + const gchar *keyid; gboolean ret; - GQuark id; - + if (!self->pv->has_secret || self->pv->block_loading) return; - - id = seahorse_object_get_id (SEAHORSE_OBJECT (self)); - g_return_if_fail (id); - - ret = load_gpgme_key (id, GPGME_KEYLIST_MODE_LOCAL, TRUE, &key); + + keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (self)); + ret = load_gpgme_key (keyid, GPGME_KEYLIST_MODE_LOCAL, TRUE, &key); if (ret) { seahorse_gpgme_key_set_private (self, key); gpgme_key_unref (key); @@ -259,7 +275,7 @@ /* Add new UIDs */ while (guid != NULL) { - uid = seahorse_gpgme_uid_new (self->pv->pubkey, guid); + uid = seahorse_gpgme_uid_new (self, guid); changed = TRUE; results = seahorse_object_list_append (results, uid); g_object_unref (uid); @@ -293,20 +309,11 @@ seahorse_object_list_free (list); } -static void -refresh_each_gpgme_key (SeahorseObject *object, gpointer data) -{ - seahorse_gpgme_key_refresh (SEAHORSE_GPGME_KEY (object)); -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - void seahorse_gpgme_key_realize (SeahorseGpgmeKey *self) { SeahorseUsage usage; + GtkActionGroup *actions; guint flags; if (!self->pv->pubkey) @@ -349,15 +356,21 @@ !self->pv->pubkey->expired) flags |= SEAHORSE_FLAG_TRUSTED; - g_object_set (self, "flags", flags, NULL); - /* The type */ - if (self->pv->seckey) + if (self->pv->seckey) { usage = SEAHORSE_USAGE_PRIVATE_KEY; - else + flags |= SEAHORSE_FLAG_PERSONAL; + } else { usage = SEAHORSE_USAGE_PUBLIC_KEY; + } - g_object_set (self, "usage", usage, NULL); + actions = seahorse_gpgme_key_actions_instance (); + g_object_set (self, + "usage", usage, + "object-flags", flags, + "actions", actions, + NULL); + g_object_unref (actions); seahorse_pgp_key_realize (SEAHORSE_PGP_KEY (self)); } @@ -391,21 +404,12 @@ seahorse_gpgme_key_set_uids (SeahorsePgpKey *base, GList *uids) { SeahorseGpgmeKey *self = SEAHORSE_GPGME_KEY (base); - GList *l; - + SEAHORSE_PGP_KEY_CLASS (seahorse_gpgme_key_parent_class)->set_uids (base, uids); - - /* Remove the parent on each old one */ - for (l = self->pv->uids; l; l = g_list_next (l)) - seahorse_context_remove_object (seahorse_context_instance (), l->data); /* Keep our own copy of the UID list */ seahorse_object_list_free (self->pv->uids); self->pv->uids = seahorse_object_list_copy (uids); - - /* Add UIDS to context so that they show up */ - for (l = self->pv->uids; l; l = g_list_next (l)) - seahorse_context_add_object (seahorse_context_instance (), l->data); renumber_actual_uids (self); } @@ -439,7 +443,6 @@ seahorse_gpgme_key_init (SeahorseGpgmeKey *self) { self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GPGME_KEY, SeahorseGpgmeKeyPrivate); - g_object_set (self, "location", SEAHORSE_LOCATION_LOCAL, NULL); } static void @@ -494,11 +497,6 @@ seahorse_gpgme_key_object_dispose (GObject *obj) { SeahorseGpgmeKey *self = SEAHORSE_GPGME_KEY (obj); - GList *l; - - /* Remove the attached UIDs */ - for (l = self->pv->uids; l; l = g_list_next (l)) - seahorse_context_remove_object (seahorse_context_instance (), l->data); if (self->pv->pubkey) gpgme_key_unref (self->pv->pubkey); @@ -520,8 +518,8 @@ g_assert (self->pv->pubkey == NULL); g_assert (self->pv->seckey == NULL); g_assert (self->pv->uids == NULL); - - G_OBJECT_CLASS (seahorse_gpgme_key_parent_class)->finalize (obj); + + G_OBJECT_CLASS (seahorse_gpgme_key_parent_class)->finalize (G_OBJECT (self)); } static void @@ -558,27 +556,56 @@ g_object_class_override_property (gobject_class, PROP_TRUST, "trust"); } +static SeahorseDeleter * +seahorse_gpgme_key_create_deleter (SeahorseDeletable *deletable) +{ + SeahorseGpgmeKey *self = SEAHORSE_GPGME_KEY (deletable); + if (self->pv->seckey) + return seahorse_gpgme_secret_deleter_new (self); + else + return seahorse_gpgme_key_deleter_new (self); +} + +static void +seahorse_gpgme_key_deletable_iface (SeahorseDeletableIface *iface) +{ + iface->create_deleter = seahorse_gpgme_key_create_deleter; +} + +static GList * +seahorse_gpgme_key_create_exporters (SeahorseExportable *exportable, + SeahorseExporterType type) +{ + GList *result = NULL; + + if (type != SEAHORSE_EXPORTER_TEXTUAL) + result = g_list_append (result, seahorse_gpgme_exporter_new (G_OBJECT (exportable), FALSE, FALSE)); + result = g_list_append (result, seahorse_gpgme_exporter_new (G_OBJECT (exportable), TRUE, FALSE)); + + return result; +} + +static void +seahorse_gpgme_key_exportable_iface (SeahorseExportableIface *iface) +{ + iface->create_exporters = seahorse_gpgme_key_create_exporters; +} /* ----------------------------------------------------------------------------- * PUBLIC */ SeahorseGpgmeKey* -seahorse_gpgme_key_new (SeahorseSource *sksrc, gpgme_key_t pubkey, +seahorse_gpgme_key_new (SeahorsePlace *sksrc, + gpgme_key_t pubkey, gpgme_key_t seckey) { - const gchar *keyid; - g_return_val_if_fail (pubkey || seckey, NULL); - - if (pubkey != NULL) - keyid = pubkey->subkeys->keyid; - else - keyid = seckey->subkeys->keyid; - - return g_object_new (SEAHORSE_TYPE_GPGME_KEY, "source", sksrc, - "id", seahorse_pgp_key_canonize_id (keyid), - "pubkey", pubkey, "seckey", seckey, + + return g_object_new (SEAHORSE_TYPE_GPGME_KEY, + "place", sksrc, + "pubkey", pubkey, + "seckey", seckey, NULL); } @@ -611,11 +638,8 @@ seahorse_gpgme_key_realize (self); g_object_notify (obj, "fingerprint"); g_object_notify (obj, "validity"); - g_object_notify (obj, "validity-str"); g_object_notify (obj, "trust"); - g_object_notify (obj, "trust-str"); g_object_notify (obj, "expires"); - g_object_notify (obj, "expires-str"); g_object_notify (obj, "length"); g_object_notify (obj, "algo"); g_object_thaw_notify (obj); @@ -680,13 +704,12 @@ void seahorse_gpgme_key_refresh_matching (gpgme_key_t key) { - SeahorseObjectPredicate pred; - + SeahorseGpgmeKey *gkey; + g_return_if_fail (key->subkeys->keyid); - - memset (&pred, 0, sizeof (pred)); - pred.type = SEAHORSE_TYPE_GPGME_KEY; - pred.id = seahorse_pgp_key_canonize_id (key->subkeys->keyid); - seahorse_context_for_objects_full (NULL, &pred, refresh_each_gpgme_key, NULL); + gkey = seahorse_gpgme_keyring_lookup (seahorse_pgp_backend_get_default_keyring (NULL), + key->subkeys->keyid); + if (gkey != NULL) + seahorse_gpgme_key_refresh (gkey); } diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-key-deleter.c seahorse-3.6.3/pgp/seahorse-gpgme-key-deleter.c --- seahorse-3.2.2/pgp/seahorse-gpgme-key-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-key-deleter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,181 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-gpgme.h" +#include "seahorse-gpgme-key-deleter.h" +#include "seahorse-gpgme-key-op.h" + +#include "seahorse-delete-dialog.h" + +#include + +#define SEAHORSE_GPGME_KEY_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GPGME_KEY_DELETER, SeahorseGpgmeKeyDeleterClass)) +#define SEAHORSE_IS_GPGME_KEY_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GPGME_KEY_DELETER)) +#define SEAHORSE_GPGME_KEY_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GPGME_KEY_DELETER, SeahorseGpgmeKeyDeleterClass)) + +typedef struct _SeahorseGpgmeKeyDeleterClass SeahorseGpgmeKeyDeleterClass; + +struct _SeahorseGpgmeKeyDeleter { + SeahorseDeleter parent; + GList *keys; +}; + +struct _SeahorseGpgmeKeyDeleterClass { + SeahorseDeleterClass parent_class; +}; + +G_DEFINE_TYPE (SeahorseGpgmeKeyDeleter, seahorse_gpgme_key_deleter, SEAHORSE_TYPE_DELETER); + +static void +seahorse_gpgme_key_deleter_init (SeahorseGpgmeKeyDeleter *self) +{ + +} + +static void +seahorse_gpgme_key_deleter_finalize (GObject *obj) +{ + SeahorseGpgmeKeyDeleter *self = SEAHORSE_GPGME_KEY_DELETER (obj); + + g_list_free_full (self->keys, g_object_unref); + + G_OBJECT_CLASS (seahorse_gpgme_key_deleter_parent_class)->finalize (obj); +} + +static GtkDialog * +seahorse_gpgme_key_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorseGpgmeKeyDeleter *self = SEAHORSE_GPGME_KEY_DELETER (deleter); + GtkDialog *dialog; + gchar *prompt; + guint num; + + num = g_list_length (self->keys); + if (num == 1) { + prompt = g_strdup_printf (_("Are you sure you want to permanently delete %s?"), + seahorse_object_get_label (SEAHORSE_OBJECT (self->keys->data))); + } else { + prompt = g_strdup_printf (ngettext ("Are you sure you want to permanently delete %d keys?", + "Are you sure you want to permanently delete %d keys?", + num), + num); + } + + dialog = seahorse_delete_dialog_new (parent, "%s", prompt); + g_free (prompt); + + return dialog; +} + +static GList * +seahorse_gpgme_key_deleter_get_objects (SeahorseDeleter *deleter) +{ + SeahorseGpgmeKeyDeleter *self = SEAHORSE_GPGME_KEY_DELETER (deleter); + return self->keys; +} + +static gboolean +seahorse_gpgme_key_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorseGpgmeKeyDeleter *self = SEAHORSE_GPGME_KEY_DELETER (deleter); + + if (!SEAHORSE_IS_GPGME_KEY (object)) + return FALSE; + self->keys = g_list_append (self->keys, g_object_ref (object)); + return TRUE; +} + +static void +seahorse_gpgme_key_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseGpgmeKeyDeleter *self = SEAHORSE_GPGME_KEY_DELETER (deleter); + GSimpleAsyncResult *res; + GError *error = NULL; + gpgme_error_t gerr; + GList *l; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gpgme_key_deleter_delete_async); + + for (l = self->keys; l != NULL && !g_cancellable_is_cancelled (cancellable); + l = g_list_next (l)) { + gerr = seahorse_gpgme_key_op_delete (l->data); + if (seahorse_gpgme_propagate_error (gerr, &error)) { + g_simple_async_result_take_error (res, error); + break; + } + } + + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); +} + +static gboolean +seahorse_gpgme_key_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error) +{ + SeahorseGpgmeKeyDeleter *self = SEAHORSE_GPGME_KEY_DELETER (deleter); + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_gpgme_key_deleter_delete_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +seahorse_gpgme_key_deleter_class_init (SeahorseGpgmeKeyDeleterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseDeleterClass *deleter_class = SEAHORSE_DELETER_CLASS (klass); + + gobject_class->finalize = seahorse_gpgme_key_deleter_finalize; + + deleter_class->add_object = seahorse_gpgme_key_deleter_add_object; + deleter_class->create_confirm = seahorse_gpgme_key_deleter_create_confirm; + deleter_class->delete_async = seahorse_gpgme_key_deleter_delete_async; + deleter_class->delete_finish = seahorse_gpgme_key_deleter_delete_finish; + deleter_class->get_objects = seahorse_gpgme_key_deleter_get_objects; +} + +SeahorseDeleter * +seahorse_gpgme_key_deleter_new (SeahorseGpgmeKey *item) +{ + SeahorseDeleter *deleter; + + deleter = g_object_new (SEAHORSE_TYPE_GPGME_KEY_DELETER, NULL); + if (!seahorse_deleter_add_object (deleter, G_OBJECT (item))) + g_assert_not_reached (); + + return deleter; +} diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-key-deleter.h seahorse-3.6.3/pgp/seahorse-gpgme-key-deleter.h --- seahorse-3.2.2/pgp/seahorse-gpgme-key-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-key-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_GPGME_KEY_DELETER_H__ +#define __SEAHORSE_GPGME_KEY_DELETER_H__ + +#include + +#include "seahorse-deleter.h" +#include "seahorse-gpgme-key.h" + +#define SEAHORSE_TYPE_GPGME_KEY_DELETER (seahorse_gpgme_key_deleter_get_type ()) +#define SEAHORSE_GPGME_KEY_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GPGME_KEY_DELETER, SeahorseGpgmeKeyDeleter)) +#define SEAHORSE_IS_GPGME_KEY_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GPGME_KEY_DELETER)) + +typedef struct _SeahorseGpgmeKeyDeleter SeahorseGpgmeKeyDeleter; + +GType seahorse_gpgme_key_deleter_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_gpgme_key_deleter_new (SeahorseGpgmeKey *key); + +#endif /* __SEAHORSE_GPGME_KEY_DELETER_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-key.h seahorse-3.6.3/pgp/seahorse-gpgme-key.h --- seahorse-3.2.2/pgp/seahorse-gpgme-key.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-key.h 2012-08-21 12:23:17.000000000 +0200 @@ -49,7 +49,7 @@ SeahorsePgpKeyClass parent_class; }; -SeahorseGpgmeKey* seahorse_gpgme_key_new (SeahorseSource *sksrc, +SeahorseGpgmeKey* seahorse_gpgme_key_new (SeahorsePlace *sksrc, gpgme_key_t pubkey, gpgme_key_t seckey); diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-key-op.c seahorse-3.6.3/pgp/seahorse-gpgme-key-op.c --- seahorse-3.2.2/pgp/seahorse-gpgme-key-op.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-key-op.c 2012-08-21 12:23:17.000000000 +0200 @@ -69,7 +69,8 @@ { key_op_generate_closure *closure = data; g_clear_object (&closure->cancellable); - gpgme_release (closure->gctx); + if (closure->gctx) + gpgme_release (closure->gctx); g_free (closure); } @@ -117,7 +118,7 @@ * Tries to generate a new key based on given parameters. **/ void -seahorse_gpgme_key_op_generate_async (SeahorseGpgmeSource *source, +seahorse_gpgme_key_op_generate_async (SeahorseGpgmeKeyring *keyring, const gchar *name, const gchar *email, const gchar *comment, @@ -134,10 +135,10 @@ GSimpleAsyncResult *res; GError *error = NULL; const gchar *parms; - gpgme_error_t gerr; + gpgme_error_t gerr = 0; GSource *gsource; - g_return_if_fail (SEAHORSE_IS_GPGME_SOURCE (source)); + g_return_if_fail (SEAHORSE_IS_GPGME_KEYRING (keyring)); g_return_if_fail (name); g_return_if_fail (strlen (name) > 4); g_return_if_fail (passphrase); @@ -189,11 +190,11 @@ else parms = g_strdup_printf ("%s%d\n%s", start, length, common); - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, + res = g_simple_async_result_new (G_OBJECT (keyring), callback, user_data, seahorse_gpgme_key_op_generate_async); closure = g_new0 (key_op_generate_closure, 1); - closure->gctx = seahorse_gpgme_source_new_context (); + closure->gctx = seahorse_gpgme_keyring_new_context (&gerr); closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; gpgme_set_progress_cb (closure->gctx, on_key_op_generate_progress, res); g_simple_async_result_set_op_res_gpointer (res, closure, key_op_generate_free); @@ -203,7 +204,9 @@ g_source_set_callback (gsource, (GSourceFunc)on_key_op_generate_complete, g_object_ref (res), g_object_unref); - gerr = gpgme_op_genkey_start (closure->gctx, parms, NULL, NULL); + if (gerr == 0) + gerr = gpgme_op_genkey_start (closure->gctx, parms, NULL, NULL); + if (seahorse_gpgme_propagate_error (gerr, &error)) { g_simple_async_result_take_error (res, error); g_simple_async_result_complete_in_idle (res); @@ -222,11 +225,11 @@ } gboolean -seahorse_gpgme_key_op_generate_finish (SeahorseGpgmeSource *source, +seahorse_gpgme_key_op_generate_finish (SeahorseGpgmeKeyring *keyring, GAsyncResult *result, GError **error) { - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (keyring), seahorse_gpgme_key_op_generate_async), FALSE); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) @@ -239,24 +242,29 @@ static gpgme_error_t op_delete (SeahorseGpgmeKey *pkey, gboolean secret) { - SeahorseGpgmeSource *psrc; - gpgme_error_t err; + SeahorseGpgmeKeyring *keyring; + gpgme_error_t gerr; gpgme_key_t key; - - psrc = SEAHORSE_GPGME_SOURCE (seahorse_object_get_source (SEAHORSE_OBJECT (pkey))); - g_return_val_if_fail (psrc && SEAHORSE_IS_GPGME_SOURCE (psrc), GPG_E (GPG_ERR_INV_KEYRING)); - + gpgme_ctx_t ctx; + + keyring = SEAHORSE_GPGME_KEYRING (seahorse_object_get_place (SEAHORSE_OBJECT (pkey))); + g_return_val_if_fail (SEAHORSE_IS_GPGME_KEYRING (keyring), GPG_E (GPG_ERR_INV_KEYRING)); + g_object_ref (pkey); - + seahorse_util_wait_until ((key = seahorse_gpgme_key_get_public (pkey)) != NULL); - - err = gpgme_op_delete (psrc->gctx, key, secret); - if (GPG_IS_OK (err)) - seahorse_context_remove_object (SCTX_APP (), SEAHORSE_OBJECT (pkey)); - + + ctx = seahorse_gpgme_keyring_new_context (&gerr); + if (ctx == NULL) + return gerr; + + gerr = gpgme_op_delete (ctx, key, secret); + if (GPG_IS_OK (gerr)) + seahorse_gpgme_keyring_remove_key (keyring, SEAHORSE_GPGME_KEY (pkey)); + + gpgme_release (ctx); g_object_unref (pkey); - - return err; + return gerr; } gpgme_error_t @@ -344,39 +352,39 @@ /* Common edit operation */ static gpgme_error_t -edit_gpgme_key (gpgme_ctx_t ctx, gpgme_key_t key, SeahorseEditParm *parms) +edit_gpgme_key (gpgme_ctx_t ctx, + gpgme_key_t key, + SeahorseEditParm *parms) { gboolean own_context = FALSE; gpgme_data_t out; gpgme_error_t gerr; - + g_assert (key); g_assert (parms); - + gpgme_key_ref (key); - - if (!ctx) { - ctx = seahorse_gpgme_source_new_context (); - g_return_val_if_fail (ctx, GPG_E (GPG_ERR_GENERAL)); + + if (ctx == NULL) { + ctx = seahorse_gpgme_keyring_new_context (&gerr); + if (ctx == NULL) + return gerr; own_context = TRUE; } - + out = seahorse_gpgme_data_new (); - + /* do edit callback, release data */ gerr = gpgme_op_edit (ctx, key, seahorse_gpgme_key_op_edit, parms, out); if (gpgme_err_code (gerr) == GPG_ERR_BAD_PASSPHRASE) { seahorse_util_show_error(NULL, _("Wrong password"), _("This was the third time you entered a wrong password. Please try again.")); } - + seahorse_gpgme_data_release (out); - if (own_context) gpgme_release (ctx); - gpgme_key_unref (key); - return gerr; } @@ -395,22 +403,26 @@ static gpgme_error_t edit_key (SeahorseGpgmeKey *pkey, SeahorseEditParm *parms) { - SeahorseGpgmeSource *psrc; - gpgme_error_t err; + SeahorseGpgmeKeyring *keyring; + gpgme_error_t gerr; gpgme_key_t key; - - psrc = SEAHORSE_GPGME_SOURCE (seahorse_object_get_source (SEAHORSE_OBJECT (pkey))); - g_return_val_if_fail (psrc && SEAHORSE_IS_GPGME_SOURCE (psrc), GPG_E (GPG_ERR_INV_KEYRING)); + gpgme_ctx_t ctx; + + keyring = SEAHORSE_GPGME_KEYRING (seahorse_object_get_place (SEAHORSE_OBJECT (pkey))); + g_return_val_if_fail (SEAHORSE_IS_GPGME_KEYRING (keyring), GPG_E (GPG_ERR_INV_KEYRING)); g_object_ref (pkey); - + seahorse_util_wait_until ((key = seahorse_gpgme_key_get_public (pkey)) != NULL); - - err = edit_refresh_gpgme_key (psrc->gctx, key, parms); + + ctx = seahorse_gpgme_keyring_new_context (&gerr); + if (ctx != NULL) { + gerr = edit_refresh_gpgme_key (ctx, key, parms); + gpgme_release (ctx); + } g_object_unref (pkey); - - return err; + return gerr; } typedef struct @@ -586,9 +598,10 @@ gpgme_ctx_t ctx; gpgme_error_t gerr; - ctx = seahorse_gpgme_source_new_context (); - g_return_val_if_fail (ctx, GPG_E (GPG_ERR_GENERAL)); - + ctx = seahorse_gpgme_keyring_new_context (&gerr); + if (ctx == NULL) + return gerr; + gerr = gpgme_signers_add (ctx, signing_key); if (!GPG_IS_OK (gerr)) return gerr; @@ -1290,19 +1303,19 @@ seahorse_gpgme_key_op_add_revoker (SeahorseGpgmeKey *pkey, SeahorseGpgmeKey *revoker) { SeahorseEditParm *parms; - GQuark id; - + const gchar *keyid; + g_return_val_if_fail (SEAHORSE_IS_GPGME_KEY (pkey), GPG_E (GPG_ERR_WRONG_KEY_USAGE)); g_return_val_if_fail (SEAHORSE_IS_GPGME_KEY (revoker), GPG_E (GPG_ERR_WRONG_KEY_USAGE)); g_return_val_if_fail (seahorse_object_get_usage (SEAHORSE_OBJECT (pkey)) == SEAHORSE_USAGE_PRIVATE_KEY, GPG_E (GPG_ERR_WRONG_KEY_USAGE)); g_return_val_if_fail (seahorse_object_get_usage (SEAHORSE_OBJECT (revoker)) == SEAHORSE_USAGE_PRIVATE_KEY, GPG_E (GPG_ERR_WRONG_KEY_USAGE)); - id = seahorse_object_get_id (SEAHORSE_OBJECT (revoker)); - g_return_val_if_fail (id, GPG_E (GPG_ERR_INV_VALUE)); - + keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (pkey)); + g_return_val_if_fail (keyid, GPG_E (GPG_ERR_INV_VALUE)); + parms = seahorse_edit_parm_new (ADD_REVOKER_START, add_revoker_action, - add_revoker_transit, (gpointer)seahorse_pgp_key_calc_rawid (id)); - + add_revoker_transit, (gpointer)keyid); + return edit_key (pkey, parms); } diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-key-op.h seahorse-3.6.3/pgp/seahorse-gpgme-key-op.h --- seahorse-3.2.2/pgp/seahorse-gpgme-key-op.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-key-op.h 2012-08-21 12:23:17.000000000 +0200 @@ -27,9 +27,9 @@ #include #include "pgp/seahorse-gpgme-key.h" +#include "pgp/seahorse-gpgme-keyring.h" #include "pgp/seahorse-gpgme-subkey.h" #include "pgp/seahorse-gpgme-uid.h" -#include "pgp/seahorse-gpgme-source.h" #include "pgp/seahorse-gpgme-photo.h" /* @@ -135,7 +135,7 @@ REVOKE_NOT_USED = 3 } SeahorseRevokeReason; -void seahorse_gpgme_key_op_generate_async (SeahorseGpgmeSource *source, +void seahorse_gpgme_key_op_generate_async (SeahorseGpgmeKeyring *keyring, const gchar *name, const gchar *email, const gchar *comment, @@ -147,7 +147,7 @@ GAsyncReadyCallback callback, gpointer user_data); -gboolean seahorse_gpgme_key_op_generate_finish (SeahorseGpgmeSource *source, +gboolean seahorse_gpgme_key_op_generate_finish (SeahorseGpgmeKeyring *keyring, GAsyncResult *Result, GError **error); diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-keyring.c seahorse-3.6.3/pgp/seahorse-gpgme-keyring.c --- seahorse-3.2.2/pgp/seahorse-gpgme-keyring.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-keyring.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,980 @@ +/* + * Seahorse + * + * Copyright (C) 2004-2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-gpgme-keyring.h" + +#include "seahorse-gpgme-data.h" +#include "seahorse-gpgme.h" +#include "seahorse-gpgme-key-op.h" +#include "seahorse-gpg-options.h" +#include "seahorse-pgp-actions.h" +#include "seahorse-pgp-key.h" + +#include "seahorse-place.h" +#include "seahorse-progress.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" +#include "seahorse-passphrase.h" + +#include + +#include +#include + +#include +#include +#include +#include + +#define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION +#include "seahorse-debug.h" + +enum { + PROP_0, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ICON, + PROP_URI, + PROP_ACTIONS +}; + +/* Amount of keys to load in a batch */ +#define DEFAULT_LOAD_BATCH 50 + +enum { + LOAD_FULL = 0x01, + LOAD_PHOTOS = 0x02 +}; + +static gpgme_error_t +passphrase_get (gconstpointer dummy, const gchar *passphrase_hint, + const char* passphrase_info, int flags, int fd) +{ + GtkDialog *dialog; + gpgme_error_t err; + gchar **split_uid = NULL; + gchar *label = NULL; + gchar *errmsg = NULL; + const gchar *pass; + gboolean confirm = FALSE; + + if (passphrase_info && strlen(passphrase_info) < 16) { + flags |= SEAHORSE_PASS_NEW; + confirm = TRUE; + } + + if (passphrase_hint) + split_uid = g_strsplit (passphrase_hint, " ", 2); + + if (flags & SEAHORSE_PASS_BAD) + errmsg = g_strdup_printf (_("Wrong passphrase.")); + + if (split_uid && split_uid[0] && split_uid[1]) { + if (flags & SEAHORSE_PASS_NEW) + label = g_strdup_printf (_("Enter new passphrase for '%s'"), split_uid[1]); + else + label = g_strdup_printf (_("Enter passphrase for '%s'"), split_uid[1]); + } else { + if (flags & SEAHORSE_PASS_NEW) + label = g_strdup (_("Enter new passphrase")); + else + label = g_strdup (_("Enter passphrase")); + } + + g_strfreev (split_uid); + + dialog = seahorse_passphrase_prompt_show (_("Passphrase"), errmsg ? errmsg : label, + NULL, NULL, confirm); + g_free (label); + g_free (errmsg); + + switch (gtk_dialog_run (dialog)) { + case GTK_RESPONSE_ACCEPT: + pass = seahorse_passphrase_prompt_get (dialog); + seahorse_util_printf_fd (fd, "%s\n", pass); + err = GPG_OK; + break; + default: + err = GPG_E (GPG_ERR_CANCELED); + break; + }; + + gtk_widget_destroy (GTK_WIDGET (dialog)); + return err; +} + +struct _SeahorseGpgmeKeyringPrivate { + GHashTable *keys; + guint scheduled_refresh; /* Source for refresh timeout */ + GFileMonitor *monitor_handle; /* For monitoring the .gnupg directory */ + GList *orphan_secret; /* Orphan secret keys */ + GtkActionGroup *actions; +}; + +static void seahorse_gpgme_keyring_place_iface (SeahorsePlaceIface *iface); + +static void seahorse_gpgme_keyring_collection_iface (GcrCollectionIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseGpgmeKeyring, seahorse_gpgme_keyring, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_gpgme_keyring_collection_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_PLACE, seahorse_gpgme_keyring_place_iface); +); + +typedef struct { + SeahorseGpgmeKeyring *keyring; + GCancellable *cancellable; + gulong cancelled_sig; + gpgme_ctx_t gctx; + GHashTable *checks; + gint parts; + gint loaded; +} keyring_list_closure; + +static void +keyring_list_free (gpointer data) +{ + keyring_list_closure *closure = data; + if (closure->gctx) + gpgme_release (closure->gctx); + if (closure->checks) + g_hash_table_destroy (closure->checks); + g_cancellable_disconnect (closure->cancellable, + closure->cancelled_sig); + g_clear_object (&closure->cancellable); + g_clear_object (&closure->keyring); + g_free (closure); +} + +/* Add a key to the context */ +static SeahorseGpgmeKey* +add_key_to_context (SeahorseGpgmeKeyring *self, + gpgme_key_t key) +{ + SeahorseGpgmeKey *pkey = NULL; + SeahorseGpgmeKey *prev; + const gchar *keyid; + gpgme_key_t seckey; + GList *l; + + g_return_val_if_fail (key->subkeys && key->subkeys->keyid, NULL); + + keyid = key->subkeys->keyid; + g_return_val_if_fail (keyid, NULL); + + g_assert (SEAHORSE_IS_GPGME_KEYRING (self)); + prev = seahorse_gpgme_keyring_lookup (self, keyid); + + /* Check if we can just replace the key on the object */ + if (prev != NULL) { + if (key->secret) + g_object_set (prev, "seckey", key, NULL); + else + g_object_set (prev, "pubkey", key, NULL); + return prev; + } + + /* Create a new key with secret */ + if (key->secret) { + pkey = seahorse_gpgme_key_new (SEAHORSE_PLACE (self), NULL, key); + + /* Since we don't have a public key yet, save this away */ + self->pv->orphan_secret = g_list_append (self->pv->orphan_secret, pkey); + + /* No key was loaded as far as everyone is concerned */ + return NULL; + } + + /* Just a new public key */ + + /* Check for orphans */ + for (l = self->pv->orphan_secret; l; l = g_list_next (l)) { + + seckey = seahorse_gpgme_key_get_private (l->data); + g_return_val_if_fail (seckey && seckey->subkeys && seckey->subkeys->keyid, NULL); + g_assert (seckey); + + /* Look for a matching key */ + if (g_str_equal (keyid, seckey->subkeys->keyid)) { + + /* Set it up properly */ + pkey = SEAHORSE_GPGME_KEY (l->data); + g_object_set (pkey, "pubkey", key, NULL); + + /* Remove item from orphan list cleanly */ + self->pv->orphan_secret = g_list_remove_link (self->pv->orphan_secret, l); + g_list_free (l); + break; + } + } + + if (pkey == NULL) + pkey = seahorse_gpgme_key_new (SEAHORSE_PLACE (self), key, NULL); + + /* Add to context */ + g_hash_table_insert (self->pv->keys, g_strdup (keyid), pkey); + gcr_collection_emit_added (GCR_COLLECTION (self), G_OBJECT (pkey)); + + return pkey; +} + + +/* Remove the given key from the context */ +static void +remove_key (SeahorseGpgmeKeyring *self, + const gchar *keyid) +{ + SeahorseGpgmeKey *key; + + key = g_hash_table_lookup (self->pv->keys, keyid); + if (key != NULL) + seahorse_gpgme_keyring_remove_key (self, key); +} + +/* Completes one batch of key loading */ +static gboolean +on_idle_list_batch_of_keys (gpointer data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (data); + keyring_list_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + SeahorseGpgmeKey *pkey; + GHashTableIter iter; + gpgme_key_t key; + guint batch; + gchar *detail; + const gchar *keyid; + + /* We load until done if batch is zero */ + batch = DEFAULT_LOAD_BATCH; + + while (batch-- > 0) { + + if (!GPG_IS_OK (gpgme_op_keylist_next (closure->gctx, &key))) { + + gpgme_op_keylist_end (closure->gctx); + + /* If we were a refresh loader, then we remove the keys we didn't find */ + if (closure->checks) { + g_hash_table_iter_init (&iter, closure->checks); + while (g_hash_table_iter_next (&iter, (gpointer *)&keyid, NULL)) + remove_key (closure->keyring, keyid); + } + + seahorse_progress_end (closure->cancellable, res); + g_simple_async_result_complete (res); + return FALSE; /* Remove event handler */ + } + + g_return_val_if_fail (key->subkeys && key->subkeys->keyid, FALSE); + + /* During a refresh if only new or removed keys */ + if (closure->checks) { + + /* Make note that this key exists in key ring */ + g_hash_table_remove (closure->checks, key->subkeys->keyid); + + } + + pkey = add_key_to_context (closure->keyring, key); + + /* Load additional info */ + if (pkey && closure->parts & LOAD_PHOTOS) + seahorse_gpgme_key_op_photos_load (pkey); + + gpgme_key_unref (key); + closure->loaded++; + } + + detail = g_strdup_printf (ngettext("Loaded %d key", "Loaded %d keys", closure->loaded), closure->loaded); + seahorse_progress_update (closure->cancellable, res, detail); + g_free (detail); + + return TRUE; +} + +static void +on_keyring_list_cancelled (GCancellable *cancellable, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + keyring_list_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + + gpgme_op_keylist_end (closure->gctx); +} + +static void +seahorse_gpgme_keyring_list_async (SeahorseGpgmeKeyring *self, + const gchar **patterns, + gint parts, + gboolean secret, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + keyring_list_closure *closure; + GSimpleAsyncResult *res; + SeahorseObject *object; + gpgme_error_t gerr = 0; + GHashTableIter iter; + GError *error = NULL; + gchar *keyid; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gpgme_keyring_list_async); + + closure = g_new0 (keyring_list_closure, 1); + closure->parts = parts; + closure->gctx = seahorse_gpgme_keyring_new_context (&gerr); + closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + closure->keyring = g_object_ref (self); + g_simple_async_result_set_op_res_gpointer (res, closure, keyring_list_free); + + /* Start the key listing */ + if (closure->gctx) { + if (parts & LOAD_FULL) + gpgme_set_keylist_mode (closure->gctx, GPGME_KEYLIST_MODE_SIGS | + gpgme_get_keylist_mode (closure->gctx)); + if (patterns) + gerr = gpgme_op_keylist_ext_start (closure->gctx, patterns, secret, 0); + else + gerr = gpgme_op_keylist_start (closure->gctx, NULL, secret); + } + + if (gerr != 0) { + seahorse_gpgme_propagate_error (gerr, &error); + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); + return; + } + + /* Loading all the keys? */ + if (patterns == NULL) { + + closure->checks = g_hash_table_new_full (seahorse_pgp_keyid_hash, + seahorse_pgp_keyid_equal, + g_free, NULL); + g_hash_table_iter_init (&iter, self->pv->keys); + while (g_hash_table_iter_next (&iter, (gpointer *)&keyid, (gpointer *)&object)) { + if ((secret && seahorse_object_get_usage (object) == SEAHORSE_USAGE_PRIVATE_KEY) || + (!secret && seahorse_object_get_usage (object) == SEAHORSE_USAGE_PUBLIC_KEY)) { + keyid = g_strdup (keyid); + g_hash_table_insert (closure->checks, keyid, keyid); + } + } + } + + seahorse_progress_prep_and_begin (cancellable, res, NULL); + if (cancellable) + closure->cancelled_sig = g_cancellable_connect (cancellable, + G_CALLBACK (on_keyring_list_cancelled), + res, NULL); + + g_idle_add_full (G_PRIORITY_LOW, on_idle_list_batch_of_keys, + g_object_ref (res), g_object_unref); + + g_object_unref (res); +} + +static gboolean +seahorse_gpgme_keyring_list_finish (SeahorseGpgmeKeyring *keyring, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (keyring), + seahorse_gpgme_keyring_list_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +cancel_scheduled_refresh (SeahorseGpgmeKeyring *self) +{ + if (self->pv->scheduled_refresh != 0) { + seahorse_debug ("cancelling scheduled refresh event"); + g_source_remove (self->pv->scheduled_refresh); + self->pv->scheduled_refresh = 0; + } +} + +static gboolean +scheduled_dummy (gpointer user_data) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (user_data); + seahorse_debug ("dummy refresh event occurring now"); + self->pv->scheduled_refresh = 0; + return FALSE; /* don't run again */ +} + +typedef struct { + gboolean public_done; + gboolean secret_done; +} keyring_load_closure; + +static void +on_keyring_secret_list_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + keyring_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + + if (!seahorse_gpgme_keyring_list_finish (SEAHORSE_GPGME_KEYRING (source), + result, &error)) + g_simple_async_result_take_error (res, error); + + closure->secret_done = TRUE; + if (closure->public_done) + g_simple_async_result_complete (res); + + g_object_unref (res); +} + +static void +on_keyring_public_list_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + keyring_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + + if (!seahorse_gpgme_keyring_list_finish (SEAHORSE_GPGME_KEYRING (source), + result, &error)) + g_simple_async_result_take_error (res, error); + + closure->public_done = TRUE; + if (closure->secret_done) + g_simple_async_result_complete (res); + + g_object_unref (res); +} + +static void +seahorse_gpgme_keyring_load_full_async (SeahorseGpgmeKeyring *self, + const gchar **patterns, + gint parts, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + keyring_load_closure *closure; + + /* Schedule a dummy refresh. This blocks all monitoring for a while */ + cancel_scheduled_refresh (self); + self->pv->scheduled_refresh = g_timeout_add (500, scheduled_dummy, self); + seahorse_debug ("scheduled a dummy refresh"); + + seahorse_debug ("refreshing keys..."); + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gpgme_keyring_load_full_async); + closure = g_new0 (keyring_load_closure, 1); + g_simple_async_result_set_op_res_gpointer (res, closure, g_free); + + /* Secret keys */ + seahorse_gpgme_keyring_list_async (self, patterns, 0, TRUE, cancellable, + on_keyring_secret_list_complete, + g_object_ref (res)); + + /* Public keys */ + seahorse_gpgme_keyring_list_async (self, patterns, 0, FALSE, cancellable, + on_keyring_public_list_complete, + g_object_ref (res)); + + g_object_unref (res); +} + +SeahorseGpgmeKey * +seahorse_gpgme_keyring_lookup (SeahorseGpgmeKeyring *self, + const gchar *keyid) +{ + g_return_val_if_fail (SEAHORSE_IS_GPGME_KEYRING (self), NULL); + g_return_val_if_fail (keyid != NULL, NULL); + + return g_hash_table_lookup (self->pv->keys, keyid); +} + +void +seahorse_gpgme_keyring_remove_key (SeahorseGpgmeKeyring *self, + SeahorseGpgmeKey *key) +{ + const gchar *keyid; + + g_return_if_fail (SEAHORSE_IS_GPGME_KEYRING (self)); + g_return_if_fail (SEAHORSE_IS_GPGME_KEY (key)); + + keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (key)); + g_return_if_fail (g_hash_table_lookup (self->pv->keys, keyid) == key); + + g_object_ref (key); + g_hash_table_remove (self->pv->keys, keyid); + gcr_collection_emit_removed (GCR_COLLECTION (self), G_OBJECT (key)); + g_object_unref (key); + +} + +static void +seahorse_gpgme_keyring_load_async (SeahorsePlace *place, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (place); + seahorse_gpgme_keyring_load_full_async (self, NULL, 0, cancellable, + callback, user_data); +} + +static gboolean +seahorse_gpgme_keyring_load_finish (SeahorsePlace *place, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (place), + seahorse_gpgme_keyring_load_full_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +typedef struct { + GCancellable *cancellable; + SeahorseGpgmeKeyring *keyring; + gpgme_ctx_t gctx; + gpgme_data_t data; + gchar **patterns; + GList *keys; +} keyring_import_closure; + +static void +keyring_import_free (gpointer data) +{ + keyring_import_closure *closure = data; + g_clear_object (&closure->cancellable); + if (closure->gctx) + gpgme_release (closure->gctx); + gpgme_data_release (closure->data); + g_object_unref (closure->keyring); + g_strfreev (closure->patterns); + g_list_free (closure->keys); + g_free (closure); +} + +static void +on_keyring_import_loaded (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + keyring_import_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + SeahorseObject *object; + guint i; + + for (i = 0; closure->patterns[i] != NULL; i++) { + object = g_hash_table_lookup (closure->keyring->pv->keys, closure->patterns[i]); + if (object == NULL) { + g_warning ("imported key but then couldn't find it in keyring: %s", + closure->patterns[i]); + continue; + } + + closure->keys = g_list_prepend (closure->keys, object); + } + + seahorse_progress_end (closure->cancellable, res); + g_simple_async_result_complete (res); + g_object_unref (res); +} + +static gboolean +on_keyring_import_complete (gpgme_error_t gerr, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + keyring_import_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + gpgme_import_result_t results; + gpgme_import_status_t import; + GError *error = NULL; + const gchar *msg; + guint i; + + if (seahorse_gpgme_propagate_error (gerr, &error)) { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + return FALSE; /* don't call again */ + } + + /* Figure out which keys were imported */ + results = gpgme_op_import_result (closure->gctx); + if (results == NULL) { + g_simple_async_result_complete (res); + return FALSE; /* don't call again */ + } + + /* Dig out all the fingerprints for use as load patterns */ + closure->patterns = g_new0 (gchar*, results->considered + 1); + for (i = 0, import = results->imports; + i < results->considered && import; + import = import->next) { + if (GPG_IS_OK (import->result)) + closure->patterns[i++] = g_strdup (import->fpr); + } + + /* See if we've managed to import any ... */ + if (closure->patterns[0] == NULL) { + + /* ... try and find out why */ + if (results->considered > 0 && results->no_user_id) { + msg = _("Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature."); + g_simple_async_result_set_error (res, SEAHORSE_ERROR, -1, "%s", msg); + } + + g_simple_async_result_complete (res); + return FALSE; /* don't call again */ + } + + /* Reload public keys */ + seahorse_gpgme_keyring_load_full_async (closure->keyring, (const gchar **)closure->patterns, + LOAD_FULL, closure->cancellable, + on_keyring_import_loaded, g_object_ref (res)); + + return FALSE; /* don't call again */ +} + +void +seahorse_gpgme_keyring_import_async (SeahorseGpgmeKeyring *self, + GInputStream *input, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + keyring_import_closure *closure; + gpgme_error_t gerr = 0; + GError *error = NULL; + GSource *gsource = NULL; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gpgme_keyring_import_async); + closure = g_new0 (keyring_import_closure, 1); + closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + closure->gctx = seahorse_gpgme_keyring_new_context (&gerr); + closure->data = seahorse_gpgme_data_input (input); + closure->keyring = g_object_ref (self); + g_simple_async_result_set_op_res_gpointer (res, closure, keyring_import_free); + + if (gerr == 0) { + seahorse_progress_prep_and_begin (cancellable, res, NULL); + gsource = seahorse_gpgme_gsource_new (closure->gctx, cancellable); + g_source_set_callback (gsource, (GSourceFunc)on_keyring_import_complete, + g_object_ref (res), g_object_unref); + gerr = gpgme_op_import_start (closure->gctx, closure->data); + } + + if (seahorse_gpgme_propagate_error (gerr, &error)) { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete_in_idle (res); + + } else { + g_source_attach (gsource, g_main_context_default ()); + } + + g_source_unref (gsource); + g_object_unref (res); +} + +GList * +seahorse_gpgme_keyring_import_finish (SeahorseGpgmeKeyring *self, + GAsyncResult *result, + GError **error) +{ + keyring_import_closure *closure; + GList *results; + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_gpgme_keyring_import_async), NULL); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return NULL; + + closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); + results = closure->keys; + closure->keys = NULL; + return results; +} + +static gboolean +scheduled_refresh (gpointer user_data) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (user_data); + + seahorse_debug ("scheduled refresh event ocurring now"); + cancel_scheduled_refresh (self); + seahorse_gpgme_keyring_load_async (SEAHORSE_PLACE (self), NULL, NULL, NULL); + + return FALSE; /* don't run again */ +} + +static void +monitor_gpg_homedir (GFileMonitor *handle, GFile *file, GFile *other_file, + GFileMonitorEvent event_type, gpointer user_data) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (user_data); + gchar *name; + + if (event_type == G_FILE_MONITOR_EVENT_CHANGED || + event_type == G_FILE_MONITOR_EVENT_DELETED || + event_type == G_FILE_MONITOR_EVENT_CREATED) { + + name = g_file_get_basename (file); + if (g_str_has_suffix (name, ".gpg")) { + if (self->pv->scheduled_refresh == 0) { + seahorse_debug ("scheduling refresh event due to file changes"); + self->pv->scheduled_refresh = g_timeout_add (500, scheduled_refresh, self); + } + } + } +} + +static void +seahorse_gpgme_keyring_init (SeahorseGpgmeKeyring *self) +{ + GError *err = NULL; + const gchar *gpg_homedir; + GFile *file; + + self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GPGME_KEYRING, + SeahorseGpgmeKeyringPrivate); + + self->pv->keys = g_hash_table_new_full (seahorse_pgp_keyid_hash, + seahorse_pgp_keyid_equal, + g_free, g_object_unref); + + /* init private vars */ + self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GPGME_KEYRING, + SeahorseGpgmeKeyringPrivate); + + self->pv->scheduled_refresh = 0; + self->pv->monitor_handle = NULL; + + gpg_homedir = seahorse_gpg_homedir (); + if (gpg_homedir) { + file = g_file_new_for_path (gpg_homedir); + g_return_if_fail (file != NULL); + + self->pv->monitor_handle = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, &err); + g_object_unref (file); + + if (self->pv->monitor_handle) { + g_signal_connect (self->pv->monitor_handle, "changed", + G_CALLBACK (monitor_gpg_homedir), self); + } else { + g_warning ("couldn't monitor the GPG home directory: %s: %s", + gpg_homedir, err && err->message ? err->message : ""); + } + } +} + +static void +seahorse_gpgme_keyring_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (obj); + + switch (prop_id) { + case PROP_LABEL: + g_value_set_string (value, _("GnuPG keys")); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, _("GnuPG: default keyring directory")); + break; + case PROP_ICON: + g_value_take_object (value, g_themed_icon_new (GCR_ICON_GNUPG)); + break; + case PROP_URI: + g_value_set_string (value, "gnupg://"); + break; + case PROP_ACTIONS: + g_value_set_object (value, self->pv->actions); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_gpgme_keyring_dispose (GObject *object) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object); + GList *l; + + if (self->pv->actions) + gtk_action_group_set_sensitive (self->pv->actions, TRUE); + g_hash_table_remove_all (self->pv->keys); + + cancel_scheduled_refresh (self); + if (self->pv->monitor_handle) { + g_object_unref (self->pv->monitor_handle); + self->pv->monitor_handle = NULL; + } + + for (l = self->pv->orphan_secret; l != NULL; l = g_list_next (l)) + g_object_unref (l->data); + g_list_free (self->pv->orphan_secret); + self->pv->orphan_secret = NULL; + + G_OBJECT_CLASS (seahorse_gpgme_keyring_parent_class)->dispose (object); +} + +static void +seahorse_gpgme_keyring_finalize (GObject *object) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object); + + g_clear_object (&self->pv->actions); + g_hash_table_destroy (self->pv->keys); + + /* All monitoring and scheduling should be done */ + g_assert (self->pv->scheduled_refresh == 0); + g_assert (self->pv->monitor_handle == 0); + + G_OBJECT_CLASS (seahorse_gpgme_keyring_parent_class)->finalize (object); +} + +static void +seahorse_gpgme_keyring_class_init (SeahorseGpgmeKeyringClass *klass) +{ + GObjectClass *gobject_class; + + g_message ("init gpgme version %s", gpgme_check_version (NULL)); + +#ifdef ENABLE_NLS + gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); + gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL)); +#endif + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->get_property = seahorse_gpgme_keyring_get_property; + gobject_class->dispose = seahorse_gpgme_keyring_dispose; + gobject_class->finalize = seahorse_gpgme_keyring_finalize; + + g_type_class_add_private (klass, sizeof (SeahorseGpgmeKeyringPrivate)); + + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_URI, "uri"); + g_object_class_override_property (gobject_class, PROP_ICON, "icon"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); +} + +static void +seahorse_gpgme_keyring_place_iface (SeahorsePlaceIface *iface) +{ + iface->load_async = seahorse_gpgme_keyring_load_async; + iface->load_finish = seahorse_gpgme_keyring_load_finish; +} + +static guint +seahorse_gpgme_keyring_get_length (GcrCollection *collection) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (collection); + return g_hash_table_size (self->pv->keys); +} + +static GList * +seahorse_gpgme_keyring_get_objects (GcrCollection *collection) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (collection); + return g_hash_table_get_values (self->pv->keys); +} + +static gboolean +seahorse_gpgme_keyring_contains (GcrCollection *collection, + GObject *object) +{ + SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (collection); + const gchar *keyid; + + if (!SEAHORSE_IS_GPGME_KEY (object)) + return FALSE; + + keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (object)); + return g_hash_table_lookup (self->pv->keys, keyid) == object; +} + +static void +seahorse_gpgme_keyring_collection_iface (GcrCollectionIface *iface) +{ + iface->get_objects = seahorse_gpgme_keyring_get_objects; + iface->get_length = seahorse_gpgme_keyring_get_length; + iface->contains = seahorse_gpgme_keyring_contains; +} + +/** + * seahorse_gpgme_keyring_new + * + * Creates a new PGP key source + * + * Returns: The key source. + **/ +SeahorseGpgmeKeyring * +seahorse_gpgme_keyring_new (void) +{ + return g_object_new (SEAHORSE_TYPE_GPGME_KEYRING, NULL); +} + +gpgme_ctx_t +seahorse_gpgme_keyring_new_context (gpgme_error_t *gerr) +{ + gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; + gpgme_error_t error = 0; + gpgme_ctx_t ctx = NULL; + + error = gpgme_engine_check_version (proto); + if (error == 0) + error = gpgme_new (&ctx); + if (error == 0) + error = gpgme_set_protocol (ctx, proto); + + if (error != 0) { + g_message ("couldn't initialize gnupg properly: %s", + gpgme_strerror (error)); + if (gerr) + *gerr = error; + return NULL; + } + + gpgme_set_passphrase_cb (ctx, (gpgme_passphrase_cb_t)passphrase_get, NULL); + gpgme_set_keylist_mode (ctx, GPGME_KEYLIST_MODE_LOCAL); + return ctx; +} diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-keyring.h seahorse-3.6.3/pgp/seahorse-gpgme-keyring.h --- seahorse-3.2.2/pgp/seahorse-gpgme-keyring.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-keyring.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,91 @@ +/* + * Seahorse + * + * Copyright (C) 2004 Stefan Walter + * + * 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. + */ + +/** + * SeahorseGpgmeKeyring: A key keyring for PGP keys retrieved from GPGME. + * + * - Derived from SeahorseKeyring + * - Since GPGME represents secret keys as seperate from public keys, this + * class takes care to combine them into one logical SeahorsePGPKey object. + * - Adds the keys it loads to the SeahorseContext. + * - Eventually a lot of stuff from seahorse-op.* should probably be merged + * into this class. + * - Monitors ~/.gnupg for changes and reloads the key ring as necessary. + * + * Properties: + * location: (SeahorseLocation) The location of keys that come from this + * keyring. (ie: SEAHORSE_LOCATION_LOCAL, SEAHORSE_LOCATION_REMOTE) + */ + +#ifndef __SEAHORSE_GPGME_KEYRING_H__ +#define __SEAHORSE_GPGME_KEYRING_H__ + +#include + +#include + +#include + +#include "seahorse-gpgme-key.h" + +#define SEAHORSE_TYPE_GPGME_KEYRING (seahorse_gpgme_keyring_get_type ()) +#define SEAHORSE_GPGME_KEYRING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GPGME_KEYRING, SeahorseGpgmeKeyring)) +#define SEAHORSE_GPGME_KEYRING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GPGME_KEYRING, SeahorseGpgmeKeyringClass)) +#define SEAHORSE_IS_GPGME_KEYRING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GPGME_KEYRING)) +#define SEAHORSE_IS_GPGME_KEYRING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GPGME_KEYRING)) +#define SEAHORSE_GPGME_KEYRING_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GPGME_KEYRING, SeahorseGpgmeKeyringClass)) + +typedef struct _SeahorseGpgmeKeyring SeahorseGpgmeKeyring; +typedef struct _SeahorseGpgmeKeyringClass SeahorseGpgmeKeyringClass; +typedef struct _SeahorseGpgmeKeyringPrivate SeahorseGpgmeKeyringPrivate; + +struct _SeahorseGpgmeKeyring { + GObject parent; + SeahorseGpgmeKeyringPrivate *pv; +}; + +struct _SeahorseGpgmeKeyringClass { + GObjectClass parent_class; +}; + +GType seahorse_gpgme_keyring_get_type (void); + +SeahorseGpgmeKeyring * seahorse_gpgme_keyring_new (void); + +gpgme_ctx_t seahorse_gpgme_keyring_new_context (gpgme_error_t *gerr); + +SeahorseGpgmeKey * seahorse_gpgme_keyring_lookup (SeahorseGpgmeKeyring *self, + const gchar *keyid); + +void seahorse_gpgme_keyring_remove_key (SeahorseGpgmeKeyring *self, + SeahorseGpgmeKey *key); + +void seahorse_gpgme_keyring_import_async (SeahorseGpgmeKeyring *self, + GInputStream *input, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +GList * seahorse_gpgme_keyring_import_finish (SeahorseGpgmeKeyring *self, + GAsyncResult *result, + GError **error); + +#endif /* __SEAHORSE_GPGME_KEYRING_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-photos.c seahorse-3.6.3/pgp/seahorse-gpgme-photos.c --- seahorse-3.2.2/pgp/seahorse-gpgme-photos.c 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-gpgme-photos.c 2012-08-21 12:23:17.000000000 +0200 @@ -246,62 +246,66 @@ gboolean -seahorse_gpgme_photo_add (SeahorseGpgmeKey *pkey, GtkWindow *parent, const gchar *path) +seahorse_gpgme_photo_add (SeahorseGpgmeKey *pkey, + GtkWindow *parent, + const gchar *path) { - gchar *filename = NULL; - gchar *tempfile = NULL; - GError *error = NULL; - gpgme_error_t gerr; - GtkDialog *chooser; - gboolean res = TRUE; - - g_return_val_if_fail (SEAHORSE_IS_GPGME_KEY (pkey), FALSE); - - if (NULL == path) { - chooser = seahorse_util_chooser_open_new (_("Choose Photo to Add to Key"), parent); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), TRUE); - add_image_files (GTK_WIDGET (chooser)); - - if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); - - gtk_widget_destroy (GTK_WIDGET (chooser)); - - if (!filename) - return FALSE; - } else { - filename = g_strdup (path); - } - - if (!prepare_photo_id (parent, filename, &tempfile, &error)) { - if (error) - seahorse_util_handle_error (&error, NULL, _("Couldn't prepare photo")); - return FALSE; - } - - gerr = seahorse_gpgme_key_op_photo_add (pkey, tempfile ? tempfile : filename); - if (!GPG_IS_OK (gerr)) { - - /* A special error value set by seahorse_key_op_photoid_add to - denote an invalid format file */ - if (gerr == GPG_E (GPG_ERR_USER_1)) - seahorse_util_show_error (NULL, _("Couldn't add photo"), - _("The file could not be loaded. It may be in an invalid format")); - - else - seahorse_gpgme_handle_error (gerr, _("Couldn't add photo")); - - res = FALSE; - } - - g_free (filename); - - if (tempfile) { - unlink (tempfile); - g_free (tempfile); - } - - return res; + gchar *filename = NULL; + gchar *tempfile = NULL; + GError *error = NULL; + gpgme_error_t gerr; + GtkWidget *chooser; + gboolean res = TRUE; + + g_return_val_if_fail (SEAHORSE_IS_GPGME_KEY (pkey), FALSE); + + if (NULL == path) { + chooser = gtk_file_chooser_dialog_new (_("Choose Photo to Add to Key"), parent, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), TRUE); + add_image_files (chooser); + + if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); + + gtk_widget_destroy (chooser); + + if (!filename) + return FALSE; + } else { + filename = g_strdup (path); + } + + if (!prepare_photo_id (parent, filename, &tempfile, &error)) { + seahorse_util_handle_error (&error, NULL, _("Couldn't prepare photo")); + return FALSE; + } + + gerr = seahorse_gpgme_key_op_photo_add (pkey, tempfile ? tempfile : filename); + if (!GPG_IS_OK (gerr)) { + + /* A special error value set by seahorse_key_op_photoid_add to + denote an invalid format file */ + if (gerr == GPG_E (GPG_ERR_USER_1)) + seahorse_util_show_error (NULL, _("Couldn't add photo"), + _("The file could not be loaded. It may be in an invalid format")); + else + seahorse_gpgme_handle_error (gerr, _("Couldn't add photo")); + res = FALSE; + } + + g_free (filename); + if (tempfile) { + unlink (tempfile); + g_free (tempfile); + } + + return res; } gboolean diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-secret-deleter.c seahorse-3.6.3/pgp/seahorse-gpgme-secret-deleter.c --- seahorse-3.2.2/pgp/seahorse-gpgme-secret-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-secret-deleter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,177 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-gpgme.h" +#include "seahorse-gpgme-key-op.h" +#include "seahorse-gpgme-secret-deleter.h" + +#include "seahorse-delete-dialog.h" + +#include + +#define SEAHORSE_GPGME_SECRET_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GPGME_SECRET_DELETER, SeahorseGpgmeSecretDeleterClass)) +#define SEAHORSE_IS_GPGME_SECRET_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GPGME_SECRET_DELETER)) +#define SEAHORSE_GPGME_SECRET_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GPGME_SECRET_DELETER, SeahorseGpgmeSecretDeleterClass)) + +typedef struct _SeahorseGpgmeSecretDeleterClass SeahorseGpgmeSecretDeleterClass; + +struct _SeahorseGpgmeSecretDeleter { + SeahorseDeleter parent; + SeahorseGpgmeKey *key; + GList *keys; +}; + +struct _SeahorseGpgmeSecretDeleterClass { + SeahorseDeleterClass parent_class; +}; + +G_DEFINE_TYPE (SeahorseGpgmeSecretDeleter, seahorse_gpgme_secret_deleter, SEAHORSE_TYPE_DELETER); + +static void +seahorse_gpgme_secret_deleter_init (SeahorseGpgmeSecretDeleter *self) +{ + +} + +static void +seahorse_gpgme_secret_deleter_finalize (GObject *obj) +{ + SeahorseGpgmeSecretDeleter *self = SEAHORSE_GPGME_SECRET_DELETER (obj); + + g_clear_object (&self->key); + g_list_free (self->keys); + + G_OBJECT_CLASS (seahorse_gpgme_secret_deleter_parent_class)->finalize (obj); +} + +static GtkDialog * +seahorse_gpgme_secret_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorseGpgmeSecretDeleter *self = SEAHORSE_GPGME_SECRET_DELETER (deleter); + GtkDialog *dialog; + gchar *prompt; + + prompt = g_strdup_printf (_("Are you sure you want to permanently delete %s?"), + seahorse_object_get_label (SEAHORSE_OBJECT (self->key))); + + dialog = seahorse_delete_dialog_new (parent, "%s", prompt); + + seahorse_delete_dialog_set_check_label (SEAHORSE_DELETE_DIALOG (dialog), _("I understand that this secret key will be permanently deleted.")); + seahorse_delete_dialog_set_check_require (SEAHORSE_DELETE_DIALOG (dialog), TRUE); + + g_free (prompt); + return dialog; +} + +static GList * +seahorse_gpgme_secret_deleter_get_objects (SeahorseDeleter *deleter) +{ + SeahorseGpgmeSecretDeleter *self = SEAHORSE_GPGME_SECRET_DELETER (deleter); + return self->keys; +} + +static gboolean +seahorse_gpgme_secret_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorseGpgmeSecretDeleter *self = SEAHORSE_GPGME_SECRET_DELETER (deleter); + + if (!SEAHORSE_IS_GPGME_KEY (object)) + return FALSE; + if (self->key) + return FALSE; + if (seahorse_object_get_usage (SEAHORSE_OBJECT (object)) != SEAHORSE_USAGE_PRIVATE_KEY) + return FALSE; + self->key = g_object_ref (object); + self->keys = g_list_append (self->keys, object); + return TRUE; +} + +static void +seahorse_gpgme_secret_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseGpgmeSecretDeleter *self = SEAHORSE_GPGME_SECRET_DELETER (deleter); + GSimpleAsyncResult *res; + GError *error = NULL; + gpgme_error_t gerr; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_gpgme_secret_deleter_delete_async); + + gerr = seahorse_gpgme_key_op_delete_pair (self->key); + if (seahorse_gpgme_propagate_error (gerr, &error)) + g_simple_async_result_take_error (res, error); + + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); +} + +static gboolean +seahorse_gpgme_secret_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error) +{ + SeahorseGpgmeSecretDeleter *self = SEAHORSE_GPGME_SECRET_DELETER (deleter); + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_gpgme_secret_deleter_delete_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + + +static void +seahorse_gpgme_secret_deleter_class_init (SeahorseGpgmeSecretDeleterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseDeleterClass *deleter_class = SEAHORSE_DELETER_CLASS (klass); + + gobject_class->finalize = seahorse_gpgme_secret_deleter_finalize; + + deleter_class->add_object = seahorse_gpgme_secret_deleter_add_object; + deleter_class->create_confirm = seahorse_gpgme_secret_deleter_create_confirm; + deleter_class->delete_async = seahorse_gpgme_secret_deleter_delete_async; + deleter_class->delete_finish = seahorse_gpgme_secret_deleter_delete_finish; + deleter_class->get_objects = seahorse_gpgme_secret_deleter_get_objects; +} + +SeahorseDeleter * +seahorse_gpgme_secret_deleter_new (SeahorseGpgmeKey *key) +{ + SeahorseDeleter *deleter; + + deleter = g_object_new (SEAHORSE_TYPE_GPGME_SECRET_DELETER, NULL); + if (!seahorse_deleter_add_object (deleter, G_OBJECT (key))) + g_assert_not_reached (); + + return deleter; +} diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-secret-deleter.h seahorse-3.6.3/pgp/seahorse-gpgme-secret-deleter.h --- seahorse-3.2.2/pgp/seahorse-gpgme-secret-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-secret-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_GPGME_SECRET_DELETER_H__ +#define __SEAHORSE_GPGME_SECRET_DELETER_H__ + +#include + +#include "seahorse-deleter.h" +#include "seahorse-gpgme-key.h" + +#define SEAHORSE_TYPE_GPGME_SECRET_DELETER (seahorse_gpgme_secret_deleter_get_type ()) +#define SEAHORSE_GPGME_SECRET_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GPGME_SECRET_DELETER, SeahorseGpgmeSecretDeleter)) +#define SEAHORSE_IS_GPGME_SECRET_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GPGME_SECRET_DELETER)) + +typedef struct _SeahorseGpgmeSecretDeleter SeahorseGpgmeSecretDeleter; + +GType seahorse_gpgme_secret_deleter_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_gpgme_secret_deleter_new (SeahorseGpgmeKey *key); + +#endif /* __SEAHORSE_GPGME_SECRET_DELETER_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-sign.c seahorse-3.6.3/pgp/seahorse-gpgme-sign.c --- seahorse-3.2.2/pgp/seahorse-gpgme-sign.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-sign.c 2012-08-21 12:23:17.000000000 +0200 @@ -23,9 +23,8 @@ #include "config.h" #include "seahorse-combo-keys.h" -#include "seahorse-gtkstock.h" +#include "seahorse-icons.h" #include "seahorse-object-widget.h" -#include "seahorse-set.h" #include "seahorse-util.h" #include "pgp/seahorse-gpgme-dialogs.h" @@ -42,7 +41,7 @@ { SeahorseSignCheck check; SeahorseSignOptions options = 0; - SeahorseObject *signer; + SeahorsePgpKey *signer; GtkWidget *w; gpgme_error_t err; SeahorseObject *to_sign; @@ -98,7 +97,8 @@ if (!GPG_IS_OK (err)) { if (gpgme_err_code (err) == GPG_ERR_EALREADY) { w = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, - _("This key was already signed by\n\"%s\""), seahorse_object_get_label (signer)); + _("This key was already signed by\n\"%s\""), + seahorse_object_get_label (SEAHORSE_OBJECT (signer))); gtk_dialog_run (GTK_DIALOG (w)); gtk_widget_destroy (w); } else @@ -111,12 +111,15 @@ } static void -keyset_changed (SeahorseSet *skset, GtkWidget *widget) +on_collection_changed (GcrCollection *collection, + GObject *object, + gpointer user_data) { - if (seahorse_set_get_count (skset) <= 1) - gtk_widget_hide (widget); - else - gtk_widget_show (widget); + GtkWidget *widget = GTK_WIDGET (user_data); + if (gcr_collection_get_length (collection) <= 1) + gtk_widget_hide (widget); + else + gtk_widget_show (widget); } G_MODULE_EXPORT void @@ -144,7 +147,7 @@ static void sign_internal (SeahorseObject *to_sign, GtkWindow *parent) { - SeahorseSet *skset; + GcrCollection *collection; GtkWidget *w; gint response; SeahorseWidget *swidget; @@ -152,10 +155,10 @@ gchar *userid; /* Some initial checks */ - skset = seahorse_keyset_pgp_signers_new (); - + collection = seahorse_keyset_pgp_signers_new (); + /* If no signing keys then we can't sign */ - if (seahorse_set_get_count (skset) == 0) { + if (gcr_collection_get_length (collection) == 0) { /* TODO: We should be giving an error message that allows them to generate or import a key */ seahorse_util_show_error (NULL, _("No keys usable for signing"), @@ -201,20 +204,21 @@ /* Signature area */ w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "signer-frame")); g_return_if_fail (w != NULL); - g_signal_connect_object (skset, "set-changed", G_CALLBACK (keyset_changed), w, 0); - keyset_changed (skset, w); + g_signal_connect_object (collection, "added", G_CALLBACK (on_collection_changed), w, 0); + g_signal_connect_object (collection, "removed", G_CALLBACK (on_collection_changed), w, 0); + on_collection_changed (collection, NULL, w); /* Signer box */ w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "signer-select")); g_return_if_fail (w != NULL); - seahorse_combo_keys_attach (GTK_COMBO_BOX (w), skset, NULL); + seahorse_combo_keys_attach (GTK_COMBO_BOX (w), collection, NULL); /* Image */ w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "sign-image")); g_return_if_fail (w != NULL); - gtk_image_set_from_stock (GTK_IMAGE (w), SEAHORSE_STOCK_SIGN, GTK_ICON_SIZE_DIALOG); - - g_object_unref (skset); + gtk_image_set_from_icon_name (GTK_IMAGE (w), SEAHORSE_ICON_SIGN, GTK_ICON_SIZE_DIALOG); + + g_object_unref (collection); seahorse_widget_show (swidget); while (do_sign) { diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-source.c seahorse-3.6.3/pgp/seahorse-gpgme-source.c --- seahorse-3.2.2/pgp/seahorse-gpgme-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-source.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1047 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2004-2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include -#include "seahorse-gpgme-source.h" - -#include "seahorse-gpgme-data.h" -#include "seahorse-gpgme.h" -#include "seahorse-gpgme-key-op.h" -#include "seahorse-gpg-options.h" -#include "seahorse-pgp-key.h" - -#include "seahorse-progress.h" -#include "seahorse-registry.h" -#include "seahorse-util.h" -#include "seahorse-passphrase.h" - -#include - -#include -#include -#include - -#define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION -#include "seahorse-debug.h" - -/* Amount of keys to load in a batch */ -#define DEFAULT_LOAD_BATCH 50 - -enum { - LOAD_FULL = 0x01, - LOAD_PHOTOS = 0x02 -}; - -enum { - PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION -}; - -static gpgme_error_t -passphrase_get (gconstpointer dummy, const gchar *passphrase_hint, - const char* passphrase_info, int flags, int fd) -{ - GtkDialog *dialog; - gpgme_error_t err; - gchar **split_uid = NULL; - gchar *label = NULL; - gchar *errmsg = NULL; - const gchar *pass; - gboolean confirm = FALSE; - - if (passphrase_info && strlen(passphrase_info) < 16) { - flags |= SEAHORSE_PASS_NEW; - confirm = TRUE; - } - - if (passphrase_hint) - split_uid = g_strsplit (passphrase_hint, " ", 2); - - if (flags & SEAHORSE_PASS_BAD) - errmsg = g_strdup_printf (_("Wrong passphrase.")); - - if (split_uid && split_uid[0] && split_uid[1]) { - if (flags & SEAHORSE_PASS_NEW) - label = g_strdup_printf (_("Enter new passphrase for '%s'"), split_uid[1]); - else - label = g_strdup_printf (_("Enter passphrase for '%s'"), split_uid[1]); - } else { - if (flags & SEAHORSE_PASS_NEW) - label = g_strdup (_("Enter new passphrase")); - else - label = g_strdup (_("Enter passphrase")); - } - - g_strfreev (split_uid); - - dialog = seahorse_passphrase_prompt_show (NULL, errmsg ? errmsg : label, - NULL, NULL, confirm); - g_free (label); - g_free (errmsg); - - switch (gtk_dialog_run (dialog)) { - case GTK_RESPONSE_ACCEPT: - pass = seahorse_passphrase_prompt_get (dialog); - seahorse_util_printf_fd (fd, "%s\n", pass); - err = GPG_OK; - break; - default: - err = GPG_E (GPG_ERR_CANCELED); - break; - }; - - gtk_widget_destroy (GTK_WIDGET (dialog)); - return err; -} - -/* Initialise a GPGME context for PGP keys */ -static gpgme_error_t -init_gpgme (gpgme_ctx_t *ctx) -{ - gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; - gpgme_error_t err; - - err = gpgme_engine_check_version (proto); - g_return_val_if_fail (GPG_IS_OK (err), err); - - err = gpgme_new (ctx); - g_return_val_if_fail (GPG_IS_OK (err), err); - - err = gpgme_set_protocol (*ctx, proto); - g_return_val_if_fail (GPG_IS_OK (err), err); - - gpgme_set_passphrase_cb (*ctx, (gpgme_passphrase_cb_t)passphrase_get, - NULL); - - gpgme_set_keylist_mode (*ctx, GPGME_KEYLIST_MODE_LOCAL); - return err; -} - -struct _SeahorseGpgmeSourcePrivate { - guint scheduled_refresh; /* Source for refresh timeout */ - GFileMonitor *monitor_handle; /* For monitoring the .gnupg directory */ - GList *orphan_secret; /* Orphan secret keys */ -}; - -static void seahorse_source_iface (SeahorseSourceIface *iface); - -G_DEFINE_TYPE_EXTENDED (SeahorseGpgmeSource, seahorse_gpgme_source, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); - -typedef struct { - SeahorseGpgmeSource *source; - GCancellable *cancellable; - gulong cancelled_sig; - gpgme_ctx_t gctx; - GHashTable *checks; - gint parts; - gint loaded; -} source_list_closure; - -static void -source_list_free (gpointer data) -{ - source_list_closure *closure = data; - gpgme_release (closure->gctx); - if (closure->checks) - g_hash_table_destroy (closure->checks); - g_cancellable_disconnect (closure->cancellable, - closure->cancelled_sig); - g_clear_object (&closure->cancellable); - g_clear_object (&closure->source); - g_free (closure); -} - -/* Add a key to the context */ -static SeahorseGpgmeKey* -add_key_to_context (SeahorseGpgmeSource *self, - gpgme_key_t key) -{ - SeahorseGpgmeKey *pkey = NULL; - SeahorseGpgmeKey *prev; - const gchar *id; - gpgme_key_t seckey; - GQuark keyid; - GList *l; - - g_return_val_if_fail (key->subkeys && key->subkeys->keyid, NULL); - - id = key->subkeys->keyid; - keyid = seahorse_pgp_key_canonize_id (id); - g_return_val_if_fail (keyid, NULL); - - g_assert (SEAHORSE_IS_GPGME_SOURCE (self)); - prev = SEAHORSE_GPGME_KEY (seahorse_context_get_object (seahorse_context_instance (), - SEAHORSE_SOURCE (self), keyid)); - - /* Check if we can just replace the key on the object */ - if (prev != NULL) { - if (key->secret) - g_object_set (prev, "seckey", key, NULL); - else - g_object_set (prev, "pubkey", key, NULL); - return prev; - } - - /* Create a new key with secret */ - if (key->secret) { - pkey = seahorse_gpgme_key_new (SEAHORSE_SOURCE (self), NULL, key); - - /* Since we don't have a public key yet, save this away */ - self->pv->orphan_secret = g_list_append (self->pv->orphan_secret, pkey); - - /* No key was loaded as far as everyone is concerned */ - return NULL; - } - - /* Just a new public key */ - - /* Check for orphans */ - for (l = self->pv->orphan_secret; l; l = g_list_next (l)) { - - seckey = seahorse_gpgme_key_get_private (l->data); - g_return_val_if_fail (seckey && seckey->subkeys && seckey->subkeys->keyid, NULL); - g_assert (seckey); - - /* Look for a matching key */ - if (g_str_equal (id, seckey->subkeys->keyid)) { - - /* Set it up properly */ - pkey = SEAHORSE_GPGME_KEY (l->data); - g_object_set (pkey, "pubkey", key, NULL); - - /* Remove item from orphan list cleanly */ - self->pv->orphan_secret = g_list_remove_link (self->pv->orphan_secret, l); - g_list_free (l); - break; - } - } - - if (pkey == NULL) - pkey = seahorse_gpgme_key_new (SEAHORSE_SOURCE (self), key, NULL); - - /* Add to context */ - seahorse_context_take_object (SCTX_APP (), SEAHORSE_OBJECT (pkey)); - - return pkey; -} - -/* Remove the given key from the context */ -static void -remove_key_from_context (gpointer hash_key, - SeahorseObject *dummy, - SeahorseGpgmeSource *self) -{ - /* This function gets called as a GHRFunc on the lctx->checks hashtable. */ - GQuark keyid = GPOINTER_TO_UINT (hash_key); - SeahorseObject *object; - - object = seahorse_context_get_object (seahorse_context_instance (), - SEAHORSE_SOURCE (self), keyid); - if (object != NULL) - seahorse_context_remove_object (seahorse_context_instance (), object); -} - -/* Completes one batch of key loading */ -static gboolean -on_idle_list_batch_of_keys (gpointer data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (data); - source_list_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - SeahorseGpgmeKey *pkey; - gpgme_key_t key; - guint batch; - GQuark keyid; - gchar *detail; - - /* We load until done if batch is zero */ - batch = DEFAULT_LOAD_BATCH; - - while (batch-- > 0) { - - if (!GPG_IS_OK (gpgme_op_keylist_next (closure->gctx, &key))) { - - gpgme_op_keylist_end (closure->gctx); - - /* If we were a refresh loader, then we remove the keys we didn't find */ - if (closure->checks) - g_hash_table_foreach (closure->checks, (GHFunc)remove_key_from_context, - closure->source); - - seahorse_progress_end (closure->cancellable, res); - g_simple_async_result_complete (res); - return FALSE; /* Remove event handler */ - } - - g_return_val_if_fail (key->subkeys && key->subkeys->keyid, FALSE); - keyid = seahorse_pgp_key_canonize_id (key->subkeys->keyid); - - /* Invalid id from GPG ? */ - if (keyid == 0) { - gpgme_key_unref (key); - continue; - } - - /* During a refresh if only new or removed keys */ - if (closure->checks) { - - /* Make note that this key exists in key ring */ - g_hash_table_remove (closure->checks, GUINT_TO_POINTER (keyid)); - - } - - pkey = add_key_to_context (closure->source, key); - - /* Load additional info */ - if (pkey && closure->parts & LOAD_PHOTOS) - seahorse_gpgme_key_op_photos_load (pkey); - - gpgme_key_unref (key); - closure->loaded++; - } - - detail = g_strdup_printf (ngettext("Loaded %d key", "Loaded %d keys", closure->loaded), closure->loaded); - seahorse_progress_update (closure->cancellable, res, detail); - g_free (detail); - - return TRUE; -} - -static void -on_source_list_cancelled (GCancellable *cancellable, gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_list_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - - gpgme_op_keylist_end (closure->gctx); -} - -static void -seahorse_gpgme_source_list_async (SeahorseGpgmeSource *self, - const gchar **patterns, - gint parts, - gboolean secret, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - source_list_closure *closure; - GSimpleAsyncResult *res; - SeahorseObject *object; - gpgme_error_t gerr; - GList *keys, *l; - - res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_gpgme_source_list_async); - - closure = g_new0 (source_list_closure, 1); - closure->parts = parts; - closure->gctx = seahorse_gpgme_source_new_context (); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - closure->source = g_object_ref (self); - g_simple_async_result_set_op_res_gpointer (res, closure, source_list_free); - - if (parts & LOAD_FULL) { - gpgme_set_keylist_mode (closure->gctx, GPGME_KEYLIST_MODE_SIGS | - gpgme_get_keylist_mode (closure->gctx)); - } - - /* Start the key listing */ - if (patterns) - gerr = gpgme_op_keylist_ext_start (closure->gctx, patterns, secret, 0); - else - gerr = gpgme_op_keylist_start (closure->gctx, NULL, secret); - g_return_if_fail (GPG_IS_OK (gerr)); - - /* Loading all the keys? */ - if (patterns == NULL) { - - closure->checks = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL); - keys = seahorse_context_get_objects (seahorse_context_instance (), - SEAHORSE_SOURCE (self)); - for (l = keys; l != NULL; l = g_list_next (l)) { - object = SEAHORSE_OBJECT (l->data); - if ((secret && seahorse_object_get_usage (object) == SEAHORSE_USAGE_PRIVATE_KEY) || - (!secret && seahorse_object_get_usage (object) == SEAHORSE_USAGE_PUBLIC_KEY)) { - g_hash_table_insert (closure->checks, - GUINT_TO_POINTER (seahorse_object_get_id (l->data)), - GUINT_TO_POINTER (TRUE)); - } - } - g_list_free (keys); - - } - - seahorse_progress_prep_and_begin (cancellable, res, NULL); - if (cancellable) - closure->cancelled_sig = g_cancellable_connect (cancellable, - G_CALLBACK (on_source_list_cancelled), - res, NULL); - - g_idle_add_full (G_PRIORITY_LOW, on_idle_list_batch_of_keys, - g_object_ref (res), g_object_unref); - - g_object_unref (res); -} - -static gboolean -seahorse_gpgme_source_list_finish (SeahorseGpgmeSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_gpgme_source_list_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} - -static void -cancel_scheduled_refresh (SeahorseGpgmeSource *self) -{ - if (self->pv->scheduled_refresh != 0) { - seahorse_debug ("cancelling scheduled refresh event"); - g_source_remove (self->pv->scheduled_refresh); - self->pv->scheduled_refresh = 0; - } -} - -static gboolean -scheduled_dummy (gpointer user_data) -{ - SeahorseGpgmeSource *self = SEAHORSE_GPGME_SOURCE (user_data); - seahorse_debug ("dummy refresh event occurring now"); - self->pv->scheduled_refresh = 0; - return FALSE; /* don't run again */ -} - -typedef struct { - gboolean public_done; - gboolean secret_done; -} source_load_closure; - -static void -on_source_secret_list_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - if (!seahorse_gpgme_source_list_finish (SEAHORSE_GPGME_SOURCE (source), - result, &error)) - g_simple_async_result_take_error (res, error); - - closure->secret_done = TRUE; - if (closure->public_done) - g_simple_async_result_complete (res); - - g_object_unref (res); -} - -static void -on_source_public_list_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_load_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - if (!seahorse_gpgme_source_list_finish (SEAHORSE_GPGME_SOURCE (source), - result, &error)) - g_simple_async_result_take_error (res, error); - - closure->public_done = TRUE; - if (closure->secret_done) - g_simple_async_result_complete (res); - - g_object_unref (res); -} - -static void -seahorse_gpgme_source_load_full_async (SeahorseGpgmeSource *source, - const gchar **patterns, - gint parts, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SeahorseGpgmeSource *self = SEAHORSE_GPGME_SOURCE (source); - GSimpleAsyncResult *res; - source_load_closure *closure; - - /* Schedule a dummy refresh. This blocks all monitoring for a while */ - cancel_scheduled_refresh (self); - self->pv->scheduled_refresh = g_timeout_add (500, scheduled_dummy, self); - seahorse_debug ("scheduled a dummy refresh"); - - seahorse_debug ("refreshing keys..."); - - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, - seahorse_gpgme_source_load_full_async); - closure = g_new0 (source_load_closure, 1); - g_simple_async_result_set_op_res_gpointer (res, closure, g_free); - - /* Secret keys */ - seahorse_gpgme_source_list_async (self, patterns, 0, TRUE, cancellable, - on_source_secret_list_complete, - g_object_ref (res)); - - /* Public keys */ - seahorse_gpgme_source_list_async (self, patterns, 0, FALSE, cancellable, - on_source_public_list_complete, - g_object_ref (res)); - - g_object_unref (res); -} - -static void -seahorse_gpgme_source_load_async (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - seahorse_gpgme_source_load_full_async (SEAHORSE_GPGME_SOURCE (source), - NULL, 0, cancellable, callback, - user_data); -} - -static gboolean -seahorse_gpgme_source_load_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_gpgme_source_load_full_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} - -typedef struct { - GCancellable *cancellable; - SeahorseGpgmeSource *source; - gpgme_ctx_t gctx; - gpgme_data_t data; - gchar **patterns; - GList *keys; -} source_import_closure; - -static void -source_import_free (gpointer data) -{ - source_import_closure *closure = data; - g_clear_object (&closure->cancellable); - gpgme_release (closure->gctx); - gpgme_data_release (closure->data); - g_object_unref (closure->source); - g_strfreev (closure->patterns); - g_list_free (closure->keys); - g_free (closure); -} - -static void -on_source_import_loaded (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_import_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - SeahorseObject *object; - GQuark keyid; - guint i; - - for (i = 0; closure->patterns[i] != NULL; i++) { - keyid = seahorse_pgp_key_canonize_id (closure->patterns[i]); - if (!keyid) { - g_warning ("imported non key with strange keyid: %s", - closure->patterns[i]); - continue; - } - - object = seahorse_context_get_object (seahorse_context_instance (), - SEAHORSE_SOURCE (closure->source), - keyid); - if (object == NULL) { - g_warning ("imported key but then couldn't find it in keyring: %s", - closure->patterns[i]); - continue; - } - - closure->keys = g_list_prepend (closure->keys, object); - } - - seahorse_progress_end (closure->cancellable, res); - g_simple_async_result_complete (res); - g_object_unref (res); -} - -static gboolean -on_source_import_complete (gpgme_error_t gerr, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_import_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - gpgme_import_result_t results; - gpgme_import_status_t import; - GError *error = NULL; - const gchar *msg; - guint i; - - if (seahorse_gpgme_propagate_error (gerr, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - return FALSE; /* don't call again */ - } - - /* Figure out which keys were imported */ - results = gpgme_op_import_result (closure->gctx); - if (results == NULL) { - g_simple_async_result_complete (res); - return FALSE; /* don't call again */ - } - - /* Dig out all the fingerprints for use as load patterns */ - closure->patterns = g_new0 (gchar*, results->considered + 1); - for (i = 0, import = results->imports; - i < results->considered && import; - import = import->next) { - if (GPG_IS_OK (import->result)) - closure->patterns[i++] = g_strdup (import->fpr); - } - - /* See if we've managed to import any ... */ - if (closure->patterns[0] == NULL) { - - /* ... try and find out why */ - if (results->considered > 0 && results->no_user_id) { - msg = _("Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature."); - g_simple_async_result_set_error (res, SEAHORSE_ERROR, -1, "%s", msg); - } - - g_simple_async_result_complete (res); - return FALSE; /* don't call again */ - } - - /* Reload public keys */ - seahorse_gpgme_source_load_full_async (closure->source, (const gchar **)closure->patterns, - LOAD_FULL, closure->cancellable, - on_source_import_loaded, g_object_ref (res)); - - return FALSE; /* don't call again */ -} - -static void -seahorse_gpgme_source_import_async (SeahorseSource *source, - GInputStream *input, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SeahorseGpgmeSource *self = SEAHORSE_GPGME_SOURCE (source); - GSimpleAsyncResult *res; - source_import_closure *closure; - gpgme_error_t gerr; - GError *error = NULL; - GSource *gsource; - - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, - seahorse_gpgme_source_import_async); - closure = g_new0 (source_import_closure, 1); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - closure->gctx = seahorse_gpgme_source_new_context (); - closure->data = seahorse_gpgme_data_input (input); - closure->source = g_object_ref (self); - g_simple_async_result_set_op_res_gpointer (res, closure, source_import_free); - - seahorse_progress_prep_and_begin (cancellable, res, NULL); - gsource = seahorse_gpgme_gsource_new (closure->gctx, cancellable); - g_source_set_callback (gsource, (GSourceFunc)on_source_import_complete, - g_object_ref (res), g_object_unref); - - gerr = gpgme_op_import_start (closure->gctx, closure->data); - - if (seahorse_gpgme_propagate_error (gerr, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - - } else { - g_source_attach (gsource, g_main_context_default ()); - } - - g_source_unref (gsource); - g_object_unref (res); -} - -static GList * -seahorse_gpgme_source_import_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - source_import_closure *closure; - GList *results; - - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_gpgme_source_import_async), NULL); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; - - closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); - results = closure->keys; - closure->keys = NULL; - return results; -} - -typedef struct { - GPtrArray *keyids; - gint at; - gpgme_data_t data; - gpgme_ctx_t gctx; - GOutputStream *output; - GCancellable *cancellable; - gulong cancelled_sig; -} source_export_closure; - -static void -source_export_free (gpointer data) -{ - source_export_closure *closure = data; - g_cancellable_disconnect (closure->cancellable, closure->cancelled_sig); - g_clear_object (&closure->cancellable); - gpgme_data_release (closure->data); - gpgme_release (closure->gctx); - g_ptr_array_free (closure->keyids, TRUE); - g_object_unref (closure->output); - g_free (closure); -} - -static gboolean -on_source_export_complete (gpgme_error_t gerr, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_export_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - - if (seahorse_gpgme_propagate_error (gerr, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - return FALSE; /* don't call again */ - } - - if (closure->at >= 0) - seahorse_progress_end (closure->cancellable, - closure->keyids->pdata[closure->at]); - - g_assert (closure->at < (gint)closure->keyids->len); - closure->at++; - - if (closure->at == closure->keyids->len) { - g_simple_async_result_complete (res); - return FALSE; /* don't run this again */ - } - - /* Do the next key in the list */ - gerr = gpgme_op_export_start (closure->gctx, closure->keyids->pdata[closure->at], - 0, closure->data); - - if (seahorse_gpgme_propagate_error (gerr, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - return FALSE; /* don't run this again */ - } - - seahorse_progress_begin (closure->cancellable, - closure->keyids->pdata[closure->at]); - return TRUE; /* call this source again */ -} - -static void -seahorse_gpgme_source_export_async (SeahorseSource *source, - GList *objects, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - source_export_closure *closure; - SeahorsePgpKey *key; - gchar *keyid; - GSource *gsource; - GList *l; - - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, - seahorse_gpgme_source_export_async); - closure = g_new0 (source_export_closure, 1); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - closure->gctx = seahorse_gpgme_source_new_context (); - closure->data = seahorse_gpgme_data_output (output); - closure->keyids = g_ptr_array_new_with_free_func (g_free); - closure->output = g_object_ref (output); - closure->at = -1; - g_simple_async_result_set_op_res_gpointer (res, closure, source_export_free); - - gpgme_set_armor (closure->gctx, TRUE); - gpgme_set_textmode (closure->gctx, TRUE); - - for (l = objects; l != NULL; l = g_list_next (l)) { - - /* Ignore PGP Uids */ - if (SEAHORSE_IS_PGP_UID (l->data)) - continue; - - g_return_if_fail (SEAHORSE_IS_PGP_KEY (l->data)); - key = SEAHORSE_PGP_KEY (l->data); - g_return_if_fail (seahorse_object_get_source (SEAHORSE_OBJECT (key)) == source); - - /* Building list */ - keyid = g_strdup (seahorse_pgp_key_get_keyid (key)); - seahorse_progress_prep (closure->cancellable, keyid, NULL); - g_ptr_array_add (closure->keyids, keyid); - } - - gsource = seahorse_gpgme_gsource_new (closure->gctx, cancellable); - g_source_set_callback (gsource, (GSourceFunc)on_source_export_complete, - g_object_ref (res), g_object_unref); - - /* Get things started */ - if (on_source_export_complete (0, res)) - g_source_attach (gsource, g_main_context_default ()); - - g_source_unref (gsource); - g_object_unref (res); -} - -static GOutputStream * -seahorse_gpgme_source_export_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - source_export_closure *closure; - - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_gpgme_source_export_async), NULL); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; - - closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); - return closure->output; -} - -static gboolean -scheduled_refresh (gpointer user_data) -{ - SeahorseGpgmeSource *self = SEAHORSE_GPGME_SOURCE (user_data); - - seahorse_debug ("scheduled refresh event ocurring now"); - cancel_scheduled_refresh (self); - seahorse_source_load_async (SEAHORSE_SOURCE (self), NULL, NULL, NULL); - - return FALSE; /* don't run again */ -} - -static void -monitor_gpg_homedir (GFileMonitor *handle, GFile *file, GFile *other_file, - GFileMonitorEvent event_type, gpointer user_data) -{ - SeahorseGpgmeSource *self = SEAHORSE_GPGME_SOURCE (user_data); - gchar *name; - - if (event_type == G_FILE_MONITOR_EVENT_CHANGED || - event_type == G_FILE_MONITOR_EVENT_DELETED || - event_type == G_FILE_MONITOR_EVENT_CREATED) { - - name = g_file_get_basename (file); - if (g_str_has_suffix (name, SEAHORSE_EXT_GPG)) { - if (self->pv->scheduled_refresh == 0) { - seahorse_debug ("scheduling refresh event due to file changes"); - self->pv->scheduled_refresh = g_timeout_add (500, scheduled_refresh, self); - } - } - } -} - -static void -seahorse_gpgme_source_init (SeahorseGpgmeSource *self) -{ - gpgme_error_t gerr; - GError *err = NULL; - const gchar *gpg_homedir; - GFile *file; - - gerr = init_gpgme (&self->gctx); - g_return_if_fail (GPG_IS_OK (gerr)); - - /* init private vars */ - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GPGME_SOURCE, SeahorseGpgmeSourcePrivate); - - self->pv->scheduled_refresh = 0; - self->pv->monitor_handle = NULL; - - gpg_homedir = seahorse_gpg_homedir (); - file = g_file_new_for_path (gpg_homedir); - g_return_if_fail (file != NULL); - - self->pv->monitor_handle = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, &err); - g_object_unref (file); - - if (self->pv->monitor_handle) { - g_signal_connect (self->pv->monitor_handle, "changed", - G_CALLBACK (monitor_gpg_homedir), self); - } else { - g_warning ("couldn't monitor the GPG home directory: %s: %s", - gpg_homedir, err && err->message ? err->message : ""); - } -} - -static void -seahorse_gpgme_source_dispose (GObject *object) -{ - SeahorseGpgmeSource *self = SEAHORSE_GPGME_SOURCE (object); - GList *l; - - /* - * Note that after this executes the rest of the object should - * still work without a segfault. This basically nullifies the - * object, but doesn't free it. - * - * This function should also be able to run multiple times. - */ - - cancel_scheduled_refresh (self); - if (self->pv->monitor_handle) { - g_object_unref (self->pv->monitor_handle); - self->pv->monitor_handle = NULL; - } - - for (l = self->pv->orphan_secret; l != NULL; l = g_list_next (l)) - g_object_unref (l->data); - g_list_free (self->pv->orphan_secret); - self->pv->orphan_secret = NULL; - - if (self->gctx) - gpgme_release (self->gctx); - - G_OBJECT_CLASS (seahorse_gpgme_source_parent_class)->dispose (object); -} - -static void -seahorse_gpgme_source_finalize (GObject *object) -{ - SeahorseGpgmeSource *self = SEAHORSE_GPGME_SOURCE (object); - - /* All monitoring and scheduling should be done */ - g_assert (self->pv->scheduled_refresh == 0); - g_assert (self->pv->monitor_handle == 0); - - G_OBJECT_CLASS (seahorse_gpgme_source_parent_class)->finalize (object); -} - -static void -seahorse_gpgme_source_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_PGP); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -seahorse_gpgme_source_class_init (SeahorseGpgmeSourceClass *klass) -{ - GObjectClass *gobject_class; - - g_message ("init gpgme version %s", gpgme_check_version (NULL)); - -#ifdef ENABLE_NLS - gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); - gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL)); -#endif - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->dispose = seahorse_gpgme_source_dispose; - gobject_class->finalize = seahorse_gpgme_source_finalize; - gobject_class->get_property = seahorse_gpgme_source_get_property; - - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - - g_type_class_add_private (klass, sizeof (SeahorseGpgmeSourcePrivate)); - - seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GPGME_SOURCE, "source", "local", SEAHORSE_PGP_STR, NULL); - seahorse_registry_register_function (NULL, seahorse_pgp_key_canonize_id, "canonize", SEAHORSE_PGP_STR, NULL); -} - -static void -seahorse_source_iface (SeahorseSourceIface *iface) -{ - iface->load_async = seahorse_gpgme_source_load_async; - iface->load_finish = seahorse_gpgme_source_load_finish; - iface->import_async = seahorse_gpgme_source_import_async; - iface->import_finish = seahorse_gpgme_source_import_finish; - iface->export_async = seahorse_gpgme_source_export_async; - iface->export_finish = seahorse_gpgme_source_export_finish; -} - -/** - * seahorse_gpgme_source_new - * - * Creates a new PGP key source - * - * Returns: The key source. - **/ -SeahorseGpgmeSource * -seahorse_gpgme_source_new (void) -{ - return g_object_new (SEAHORSE_TYPE_GPGME_SOURCE, NULL); -} - -gpgme_ctx_t -seahorse_gpgme_source_new_context (void) -{ - gpgme_ctx_t ctx = NULL; - g_return_val_if_fail (GPG_IS_OK (init_gpgme (&ctx)), NULL); - return ctx; -} diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-source.h seahorse-3.6.3/pgp/seahorse-gpgme-source.h --- seahorse-3.2.2/pgp/seahorse-gpgme-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-source.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2004 Stefan Walter - * - * 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. - */ - -/** - * SeahorseGpgmeSource: A key source for PGP keys retrieved from GPGME. - * - * - Derived from SeahorseSource - * - Since GPGME represents secret keys as seperate from public keys, this - * class takes care to combine them into one logical SeahorsePGPKey object. - * - Adds the keys it loads to the SeahorseContext. - * - Eventually a lot of stuff from seahorse-op.* should probably be merged - * into this class. - * - Monitors ~/.gnupg for changes and reloads the key ring as necessary. - * - * Properties: - * ktype: (GQuark) The ktype (ie: SEAHORSE_PGP) of keys originating from this - key source. - * location: (SeahorseLocation) The location of keys that come from this - * source. (ie: SEAHORSE_LOCATION_LOCAL, SEAHORSE_LOCATION_REMOTE) - */ - -#ifndef __SEAHORSE_GPGME_SOURCE_H__ -#define __SEAHORSE_GPGME_SOURCE_H__ - -#include "seahorse-source.h" - -#include - -#define SEAHORSE_TYPE_GPGME_SOURCE (seahorse_gpgme_source_get_type ()) -#define SEAHORSE_GPGME_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GPGME_SOURCE, SeahorseGpgmeSource)) -#define SEAHORSE_GPGME_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GPGME_SOURCE, SeahorseGpgmeSourceClass)) -#define SEAHORSE_IS_GPGME_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GPGME_SOURCE)) -#define SEAHORSE_IS_GPGME_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GPGME_SOURCE)) -#define SEAHORSE_GPGME_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GPGME_SOURCE, SeahorseGpgmeSourceClass)) - -typedef struct _SeahorseGpgmeSource SeahorseGpgmeSource; -typedef struct _SeahorseGpgmeSourceClass SeahorseGpgmeSourceClass; -typedef struct _SeahorseGpgmeSourcePrivate SeahorseGpgmeSourcePrivate; - -struct _SeahorseGpgmeSource { - GObject parent; - gpgme_ctx_t gctx; - SeahorseGpgmeSourcePrivate *pv; -}; - -struct _SeahorseGpgmeSourceClass { - GObjectClass parent_class; -}; - -GType seahorse_gpgme_source_get_type (void); - -SeahorseGpgmeSource* seahorse_gpgme_source_new (void); - -gpgme_ctx_t seahorse_gpgme_source_new_context (void); - -#endif /* __SEAHORSE_GPGME_SOURCE_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-uid.c seahorse-3.6.3/pgp/seahorse-gpgme-uid.c --- seahorse-3.2.2/pgp/seahorse-gpgme-uid.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-uid.c 2012-08-21 12:23:17.000000000 +0200 @@ -138,20 +138,6 @@ self->pv->actual_index = -1; } -static GObject* -seahorse_gpgme_uid_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - GObject *obj = G_OBJECT_CLASS (seahorse_gpgme_uid_parent_class)->constructor (type, n_props, props); - SeahorseGpgmeUid *self = NULL; - - if (obj) { - self = SEAHORSE_GPGME_UID (obj); - g_object_set (self, "location", SEAHORSE_LOCATION_LOCAL, NULL); - } - - return obj; -} - static void seahorse_gpgme_uid_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) @@ -233,7 +219,6 @@ seahorse_gpgme_uid_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (SeahorseGpgmeUidPrivate)); - gobject_class->constructor = seahorse_gpgme_uid_constructor; gobject_class->finalize = seahorse_gpgme_uid_object_finalize; gobject_class->set_property = seahorse_gpgme_uid_set_property; gobject_class->get_property = seahorse_gpgme_uid_get_property; @@ -260,10 +245,12 @@ */ SeahorseGpgmeUid* -seahorse_gpgme_uid_new (gpgme_key_t pubkey, gpgme_user_id_t userid) +seahorse_gpgme_uid_new (SeahorseGpgmeKey *parent, + gpgme_user_id_t userid) { - return g_object_new (SEAHORSE_TYPE_GPGME_UID, - "pubkey", pubkey, + return g_object_new (SEAHORSE_TYPE_GPGME_UID, + "parent", parent, + "pubkey", seahorse_gpgme_key_get_public (parent), "userid", userid, NULL); } @@ -318,19 +305,19 @@ g_object_notify (obj, "gpgme_index"); base = SEAHORSE_PGP_UID (self); - - string = convert_string (userid->name); - seahorse_pgp_uid_set_name (base, string); + + string = convert_string (userid->comment); + seahorse_pgp_uid_set_comment (base, string); g_free (string); - + string = convert_string (userid->email); seahorse_pgp_uid_set_email (base, string); g_free (string); - - string = convert_string (userid->comment); - seahorse_pgp_uid_set_comment (base, string); + + string = convert_string (userid->name); + seahorse_pgp_uid_set_name (base, string); g_free (string); - + realize_signatures (self); seahorse_pgp_uid_set_validity (base, seahorse_gpgme_convert_validity (userid->validity)); diff -Nru seahorse-3.2.2/pgp/seahorse-gpgme-uid.h seahorse-3.6.3/pgp/seahorse-gpgme-uid.h --- seahorse-3.2.2/pgp/seahorse-gpgme-uid.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpgme-uid.h 2012-08-21 12:23:17.000000000 +0200 @@ -28,6 +28,7 @@ #include "seahorse-object.h" +#include "pgp/seahorse-gpgme-key.h" #include "pgp/seahorse-pgp-uid.h" #define SEAHORSE_TYPE_GPGME_UID (seahorse_gpgme_uid_get_type ()) @@ -52,7 +53,7 @@ GType seahorse_gpgme_uid_get_type (void); -SeahorseGpgmeUid* seahorse_gpgme_uid_new (gpgme_key_t pubkey, +SeahorseGpgmeUid* seahorse_gpgme_uid_new (SeahorseGpgmeKey *parent, gpgme_user_id_t userid); gpgme_key_t seahorse_gpgme_uid_get_pubkey (SeahorseGpgmeUid *self); diff -Nru seahorse-3.2.2/pgp/seahorse-gpg-op.c seahorse-3.6.3/pgp/seahorse-gpg-op.c --- seahorse-3.2.2/pgp/seahorse-gpg-op.c 2011-09-14 17:04:58.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-gpg-op.c 2012-08-21 12:23:17.000000000 +0200 @@ -61,34 +61,33 @@ return gerr; } -gpgme_error_t -seahorse_gpg_op_export_secret (gpgme_ctx_t ctx, const char *pattern, - gpgme_data_t keydata) +gpgme_error_t +seahorse_gpg_op_export_secret (gpgme_ctx_t ctx, + const gchar **patterns, + gpgme_data_t keydata) { - gchar *output = NULL; - gpgme_error_t err; - gchar *args; - - g_return_val_if_fail (pattern != NULL, GPG_E (GPG_ERR_INV_VALUE)); - - /* - * We have to use armor mode, because otherwise below - * string stuff doesn't work - */ - args = g_strdup_printf ("--armor --export-secret-key '%s'", - pattern); - - err = execute_gpg_command (ctx, args, &output, NULL); - g_free (args); - - if (!GPG_IS_OK (err)) - return err; - - if (gpgme_data_write (keydata, output, strlen (output)) == -1) - return GPG_E (GPG_ERR_GENERAL); - - g_free (output); - return GPG_OK; + gchar *output = NULL; + gpgme_error_t gerr; + gchar *args; + gsize i; + + g_return_val_if_fail (patterns != NULL, GPG_E (GPG_ERR_INV_VALUE)); + + for (i = 0; patterns[i] != NULL; i++) { + args = g_strdup_printf ("--armor --export-secret-key '%s'", patterns[i]); + gerr = execute_gpg_command (ctx, args, &output, NULL); + g_free (args); + + if (!GPG_IS_OK (gerr)) + return gerr; + + if (gpgme_data_write (keydata, output, strlen (output)) == -1) + return GPG_E (GPG_ERR_GENERAL); + + g_free (output); + } + + return GPG_OK; } gpgme_error_t diff -Nru seahorse-3.2.2/pgp/seahorse-gpg-op.h seahorse-3.6.3/pgp/seahorse-gpg-op.h --- seahorse-3.2.2/pgp/seahorse-gpg-op.h 2011-09-14 17:04:58.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-gpg-op.h 2012-08-21 12:23:17.000000000 +0200 @@ -27,7 +27,7 @@ #include gpgme_error_t seahorse_gpg_op_export_secret (gpgme_ctx_t ctx, - const char *pattern, + const gchar **patterns, gpgme_data_t keydata); gpgme_error_t seahorse_gpg_op_num_uids (gpgme_ctx_t ctx, diff -Nru seahorse-3.2.2/pgp/seahorse-gpg-options.c seahorse-3.6.3/pgp/seahorse-gpg-options.c --- seahorse-3.2.2/pgp/seahorse-gpg-options.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-gpg-options.c 2012-08-21 12:23:17.000000000 +0200 @@ -34,7 +34,6 @@ #include #include "seahorse-util.h" -#include "seahorse-context.h" #include "pgp/seahorse-gpgme.h" #include "pgp/seahorse-gpg-options.h" @@ -72,13 +71,14 @@ static gchar * find_config_file (gboolean read, GError **err) { - gchar *conf = NULL; + gchar *conf = NULL; - g_assert (gpg_options_inited); - g_assert (!err || !*err); + g_assert (!err || !*err); - if (!gpg_homedir) - return NULL; + if (!gpg_options_inited) + return NULL; + if (!gpg_homedir) + return NULL; /* Check for and open ~/.gnupg/gpg.conf */ conf = g_strconcat (gpg_homedir, "/gpg.conf", NULL); @@ -240,35 +240,37 @@ static gboolean gpg_options_init (GError **err) { - if (!gpg_options_inited) { - gpgme_error_t gerr; - gpgme_engine_info_t engine; - - gerr = gpgme_get_engine_info (&engine); - g_return_val_if_fail (GPG_IS_OK (gerr), - (seahorse_gpgme_propagate_error (gerr, err), FALSE)); - - /* Look for the OpenPGP engine */ - while (engine && engine->protocol != GPGME_PROTOCOL_OpenPGP) - engine = engine->next; - - /* - * Make sure it's the right version for us to be messing - * around with the configuration file. - */ - g_return_val_if_fail (engine && engine->version && engine->file_name && - (g_str_has_prefix (engine->version, GPG_VERSION_PREFIX1) || - g_str_has_prefix (engine->version, GPG_VERSION_PREFIX2)), - (seahorse_gpgme_propagate_error (GPG_E (GPG_ERR_INV_ENGINE), err), FALSE)); - - /* Now run the binary and read in the home directory */ - if (!parse_home_directory (engine, err)) - return FALSE; + gpgme_error_t gerr; + gpgme_engine_info_t engine; - gpg_options_inited = TRUE; - } + if (gpg_options_inited) + return TRUE; + + gerr = gpgme_get_engine_info (&engine); + if (seahorse_gpgme_propagate_error (gerr, err)) + return FALSE; + + /* Look for the OpenPGP engine */ + while (engine && engine->protocol != GPGME_PROTOCOL_OpenPGP) + engine = engine->next; + + /* + * Make sure it's the right version for us to be messing + * around with the configuration file. + */ + if (!engine || !engine->version || !engine->file_name || + !(g_str_has_prefix (engine->version, GPG_VERSION_PREFIX1) || + g_str_has_prefix (engine->version, GPG_VERSION_PREFIX2))) { + seahorse_gpgme_propagate_error (GPG_E (GPG_ERR_INV_ENGINE), err); + return FALSE; + } + + /* Now run the binary and read in the home directory */ + if (!parse_home_directory (engine, err)) + return FALSE; - return TRUE; + gpg_options_inited = TRUE; + return TRUE; } /** @@ -276,13 +278,12 @@ * * Returns: The home dir that GPG uses for it's keys and configuration **/ -const gchar* +const gchar * seahorse_gpg_homedir (void) { - /* THis shouldn't normally fail, and as such we return an invalid - * directory to avoid NULL memory access */ - g_return_val_if_fail (gpg_options_init (NULL), "/invalid/gpg/dir"); - return gpg_homedir; + if (!gpg_options_init (NULL)) + return NULL; + return gpg_homedir; } /** diff -Nru seahorse-3.2.2/pgp/seahorse-hkp-source.c seahorse-3.6.3/pgp/seahorse-hkp-source.c --- seahorse-3.2.2/pgp/seahorse-hkp-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-hkp-source.c 2012-11-12 08:32:13.000000000 +0100 @@ -35,6 +35,7 @@ #include "seahorse-servers.h" #include "seahorse-object-list.h" +#include "seahorse-place.h" #include "seahorse-progress.h" #include "seahorse-registry.h" #include "seahorse-util.h" @@ -363,7 +364,7 @@ v = g_strsplit_set (t, " ", 3); if (!v[0] || !v[1] || !v[2]) { - g_warning ("Invalid key line from server: %s", line); + g_message ("Invalid key line from server: %s", line); } else { gchar *fingerprint, *fpr = NULL; @@ -376,7 +377,7 @@ /* Cut the length and fingerprint */ fpr = strchr (v[0], '/'); if (fpr == NULL) { - g_warning ("couldn't find key fingerprint in line from server: %s", line); + g_message ("couldn't find key fingerprint in line from server: %s", line); fpr = ""; } else { *(fpr++) = 0; @@ -411,15 +412,15 @@ seahorse_object_list_free (uids); seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (key), subkeys); seahorse_object_list_free (subkeys); + seahorse_pgp_key_realize (SEAHORSE_PGP_KEY (key)); uids = subkeys = NULL; key = NULL; } key = seahorse_pgp_key_new (); keys = g_list_prepend (keys, key); - g_object_set (key, "location", SEAHORSE_LOCATION_REMOTE, "flags", - flags, NULL); - + g_object_set (key, "object-flags", flags, NULL); + /* Add all the info to the key */ subkey = seahorse_pgp_subkey_new (); seahorse_pgp_subkey_set_keyid (subkey, fpr); @@ -434,7 +435,7 @@ /* And the UID if one was found */ if (has_uid) { - SeahorsePgpUid *uid = seahorse_pgp_uid_new (v[2]); + SeahorsePgpUid *uid = seahorse_pgp_uid_new (key, v[2]); uids = g_list_prepend (uids, uid); } } @@ -447,7 +448,7 @@ SeahorsePgpUid *uid; g_strstrip (line); - uid = seahorse_pgp_uid_new (line); + uid = seahorse_pgp_uid_new (key, line); uids = g_list_prepend (uids, uid); /* Signatures */ @@ -465,39 +466,13 @@ seahorse_object_list_free (uids); seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (key), g_list_reverse (subkeys)); seahorse_object_list_free (subkeys); + seahorse_pgp_key_realize (SEAHORSE_PGP_KEY (key)); } return keys; } /** -* ssrc: The SeahorseHKPSource to add -* key: The SeahorsePgpKey to add -* -* Adds the key with the source ssrc to the application context -* -**/ -static void -add_key (SeahorseHKPSource *ssrc, SeahorsePgpKey *key) -{ - SeahorseObject *prev; - GQuark keyid; - - keyid = seahorse_pgp_key_canonize_id (seahorse_pgp_key_get_keyid (key)); - prev = seahorse_context_get_object (SCTX_APP (), SEAHORSE_SOURCE (ssrc), keyid); - if (prev != NULL) { - g_return_if_fail (SEAHORSE_IS_PGP_KEY (prev)); - seahorse_pgp_key_set_uids (SEAHORSE_PGP_KEY (prev), seahorse_pgp_key_get_uids (key)); - seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (prev), seahorse_pgp_key_get_subkeys (key)); - return; - } - - /* Add to context */ - seahorse_object_set_source (SEAHORSE_OBJECT (key), SEAHORSE_SOURCE (ssrc)); - seahorse_context_add_object (SCTX_APP (), SEAHORSE_OBJECT (key)); -} - -/** * response: The server response * * Parses the response and extracts an error message @@ -585,16 +560,10 @@ * SEAHORSE HKP SOURCE */ -enum { - PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION -}; - -static void seahorse_source_iface (SeahorseSourceIface *iface); +static void seahorse_place_iface (SeahorsePlaceIface *iface); G_DEFINE_TYPE_EXTENDED (SeahorseHKPSource, seahorse_hkp_source, SEAHORSE_TYPE_SERVER_SOURCE, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_PLACE, seahorse_place_iface)); static void seahorse_hkp_source_init (SeahorseHKPSource *hsrc) @@ -602,51 +571,6 @@ } -/** -* object: ignored -* prop_id: id of the property -* value: the resulting value -* pspec: ignored -* -* Returns data for PROP_SOURCE_TAG and PROP_SOURCE_LOCATION -* -**/ -static void -seahorse_hkp_source_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_PGP); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE); - break; - }; -} - -/** -* klass: -* -* Initialize the basic class stuff -* -**/ -static void -seahorse_hkp_source_class_init (SeahorseHKPSourceClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->get_property = seahorse_hkp_source_get_property; - - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - - seahorse_registry_register_type (NULL, SEAHORSE_TYPE_HKP_SOURCE, "source", "remote", SEAHORSE_PGP_STR, NULL); - seahorse_servers_register_type ("hkp", _("HTTP Key Server"), seahorse_hkp_is_valid_uri); - - seahorse_registry_register_function (NULL, seahorse_pgp_key_canonize_id, "canonize", SEAHORSE_PGP_STR, NULL); -} - static gboolean hkp_message_propagate_error (SeahorseHKPSource *self, SoupMessage *message, @@ -702,7 +626,7 @@ gulong cancelled_sig; SoupSession *session; gint requests; - GList *keys; + GcrSimpleCollection *results; } source_search_closure; static void @@ -713,7 +637,7 @@ g_cancellable_disconnect (closure->cancellable, closure->cancelled_sig); g_clear_object (&closure->cancellable); g_object_unref (closure->session); - seahorse_object_list_free (closure->keys); + g_clear_object (&closure->results); g_free (closure); } @@ -734,9 +658,11 @@ } else { keys = parse_hkp_index (message->response_body->data); - for (l = keys; l; l = g_list_next (l)) - add_key (closure->source, SEAHORSE_PGP_KEY (l->data)); - closure->keys = keys; + for (l = keys; l; l = g_list_next (l)) { + g_object_set (l->data, "place", closure->source, NULL); + gcr_simple_collection_add (closure->results, l->data); + } + g_list_free_full (keys, g_object_unref); } g_simple_async_result_complete_in_idle (res); @@ -762,8 +688,9 @@ return TRUE; } static void -seahorse_hkp_source_search_async (SeahorseSource *source, +seahorse_hkp_source_search_async (SeahorseServerSource *source, const gchar *match, + GcrSimpleCollection *results, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) @@ -782,6 +709,7 @@ closure->source = g_object_ref (self); closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; closure->session = create_hkp_soup_session (); + closure->results = g_object_ref (results); g_simple_async_result_set_op_res_gpointer (res, closure, source_search_free); uri = get_http_server_uri (self, "/pks/lookup"); @@ -816,24 +744,18 @@ g_object_unref (res); } -static GList * -seahorse_hkp_source_search_finish (SeahorseSource *source, +static gboolean +seahorse_hkp_source_search_finish (SeahorseServerSource *source, GAsyncResult *result, GError **error) { - source_search_closure *closure; - GList *keys; - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_hkp_source_search_async), NULL); + seahorse_hkp_source_search_async), FALSE); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; + return FALSE; - closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); - keys = closure->keys; - closure->keys = NULL; - return keys; + return TRUE; } typedef struct { @@ -867,7 +789,9 @@ GError *error = NULL; gchar *errmsg; - seahorse_progress_end (closure->cancellable, message); + g_assert (closure->requests > 0); + seahorse_progress_end (closure->cancellable, GUINT_TO_POINTER (closure->requests)); + closure->requests--; if (hkp_message_propagate_error (closure->source, message, &error)) { g_simple_async_result_take_error (res, error); @@ -881,9 +805,6 @@ /* A successful status from the server is all we want in this case */ } else { - g_assert (closure->requests > 0); - closure->requests--; - if (closure->requests == 0) g_simple_async_result_complete_in_idle (res); } @@ -898,7 +819,7 @@ * Imports a list of keys from the input stream to the keyserver **/ static void -seahorse_hkp_source_import_async (SeahorseSource *source, +seahorse_hkp_source_import_async (SeahorseServerSource *source, GInputStream *input, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -969,7 +890,7 @@ on_import_message_complete, g_object_ref (res)); closure->requests++; - seahorse_progress_prep_and_begin (cancellable, message, NULL); + seahorse_progress_prep_and_begin (cancellable, GUINT_TO_POINTER (closure->requests), NULL); } g_hash_table_destroy (form); @@ -988,7 +909,7 @@ } static GList * -seahorse_hkp_source_import_finish (SeahorseSource *source, +seahorse_hkp_source_import_finish (SeahorseServerSource *source, GAsyncResult *result, GError **error) { @@ -1005,19 +926,20 @@ typedef struct { SeahorseHKPSource *source; - GOutputStream *output; + GString *data; GCancellable *cancellable; gulong cancelled_sig; SoupSession *session; gint requests; -} source_export_raw_closure; +} ExportClosure; static void -source_export_raw_free (gpointer data) +export_closure_free (gpointer data) { - source_export_raw_closure *closure = data; + ExportClosure *closure = data; g_object_unref (closure->source); - g_object_unref (closure->output); + if (closure->data) + g_string_free (closure->data, TRUE); g_cancellable_disconnect (closure->cancellable, closure->cancelled_sig); g_clear_object (&closure->cancellable); g_object_unref (closure->session); @@ -1030,44 +952,31 @@ gpointer user_data) { GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_export_raw_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + ExportClosure *closure = g_simple_async_result_get_op_res_gpointer (res); GError *error = NULL; const gchar *start; const gchar *end; const gchar *text; - gboolean ret; guint len; - gsize written; seahorse_progress_end (closure->cancellable, message); if (hkp_message_propagate_error (closure->source, message, &error)) { g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - g_object_unref (res); - return; - } - - end = text = message->response_body->data; - len = message->response_body->length; - - for (;;) { + } else { + end = text = message->response_body->data; + len = message->response_body->length; - len -= end - text; - text = end; + for (;;) { - if (!detect_key (text, len, &start, &end)) - break; + len -= end - text; + text = end; - ret = g_output_stream_write_all (closure->output, start, end - start, &written, NULL, &error) && - g_output_stream_write_all (closure->output, "\n", 1, &written, NULL, &error) && - g_output_stream_flush (closure->output, NULL, &error); + if (!detect_key (text, len, &start, &end)) + break; - if (!ret) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete_in_idle (res); - g_object_unref (res); - return; + g_string_append_len (closure->data, start, end - start); + g_string_append_c (closure->data, '\n'); } } @@ -1088,15 +997,14 @@ * Gets data from the keyserver, writes it to the output stream **/ static void -seahorse_hkp_source_export_raw_async (SeahorseSource *source, - GList *keyids, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +seahorse_hkp_source_export_async (SeahorseServerSource *source, + const gchar **keyids, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { SeahorseHKPSource *self = SEAHORSE_HKP_SOURCE (source); - source_export_raw_closure *closure; + ExportClosure *closure; GSimpleAsyncResult *res; SoupMessage *message; SoupURI *uri; @@ -1104,18 +1012,18 @@ gchar hexfpr[11]; GHashTable *form; guint len; - GList *l; + gint i; res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_hkp_source_export_raw_async); - closure = g_new0 (source_export_raw_closure, 1); + seahorse_hkp_source_export_async); + closure = g_new0 (ExportClosure, 1); closure->source = g_object_ref (self); - closure->output = g_object_ref (output); + closure->data = g_string_sized_new (1024); closure->session = create_hkp_soup_session (); closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - g_simple_async_result_set_op_res_gpointer (res, closure, source_export_raw_free); + g_simple_async_result_set_op_res_gpointer (res, closure, export_closure_free); - if (g_list_length (keyids) == 0) { + if (!keyids || !keyids[0]) { g_simple_async_result_complete_in_idle (res); g_object_unref (res); return; @@ -1128,12 +1036,11 @@ strncpy (hexfpr, "0x", 3); form = g_hash_table_new (g_str_hash, g_str_equal); - for (l = keyids; l; l = g_list_next (l)) { - + for (i = 0; keyids[i] != NULL; i++) { g_hash_table_remove_all (form); /* Get the key id and limit it to 8 characters */ - fpr = seahorse_pgp_key_calc_rawid (GPOINTER_TO_UINT (l->data)); + fpr = keyids[i]; len = strlen (fpr); if (len > 8) fpr += (len - 8); @@ -1164,21 +1071,27 @@ g_object_unref (res); } -static GOutputStream * -seahorse_hkp_source_export_raw_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) +static gpointer +seahorse_hkp_source_export_finish (SeahorseServerSource *source, + GAsyncResult *result, + gsize *size, + GError **error) { - source_export_raw_closure *closure; + ExportClosure *closure; + gpointer output; + g_return_val_if_fail (size != NULL, NULL); g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_hkp_source_export_raw_async), NULL); + seahorse_hkp_source_export_async), NULL); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) return NULL; closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); - return closure->output; + *size = closure->data->len; + output = g_string_free (closure->data, FALSE); + closure->data = NULL; + return output; } /** @@ -1188,17 +1101,32 @@ * **/ static void -seahorse_source_iface (SeahorseSourceIface *iface) +seahorse_place_iface (SeahorsePlaceIface *iface) { - iface->search_async = seahorse_hkp_source_search_async; - iface->search_finish = seahorse_hkp_source_search_finish; - iface->import_async = seahorse_hkp_source_import_async; - iface->import_finish = seahorse_hkp_source_import_finish; - iface->export_raw_async = seahorse_hkp_source_export_raw_async; - iface->export_raw_finish = seahorse_hkp_source_export_raw_finish; + } /** +* klass: +* +* Initialize the basic class stuff +* +**/ +static void +seahorse_hkp_source_class_init (SeahorseHKPSourceClass *klass) +{ + SeahorseServerSourceClass *server_class = SEAHORSE_SERVER_SOURCE_CLASS (klass); + + server_class->search_async = seahorse_hkp_source_search_async; + server_class->search_finish = seahorse_hkp_source_search_finish; + server_class->export_async = seahorse_hkp_source_export_async; + server_class->export_finish = seahorse_hkp_source_export_finish; + server_class->import_async = seahorse_hkp_source_import_async; + server_class->import_finish = seahorse_hkp_source_import_finish; + + seahorse_servers_register_type ("hkp", _("HTTP Key Server"), seahorse_hkp_is_valid_uri); +} +/** * seahorse_hkp_source_new * @uri: The server to connect to * diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-results.c seahorse-3.6.3/pgp/seahorse-keyserver-results.c --- seahorse-3.2.2/pgp/seahorse-keyserver-results.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-results.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,541 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-pgp-backend.h" +#include "seahorse-gpgme-keyring.h" +#include "seahorse-keyserver-search.h" +#include "seahorse-keyserver-results.h" + +#include "seahorse-key-manager-store.h" +#include "seahorse-progress.h" +#include "seahorse-util.h" + +#include + +#include + +gboolean on_key_list_button_pressed (GtkTreeView* view, + GdkEventButton* event, + SeahorseKeyserverResults* self); + +gboolean on_key_list_popup_menu (GtkTreeView* view, + SeahorseKeyserverResults* self); + +enum { + PROP_0, + PROP_SEARCH +}; + +struct _SeahorseKeyserverResultsPrivate { + char *search_string; + SeahorsePredicate pred; + GtkTreeView *view; + GcrSimpleCollection *collection; + GtkActionGroup *import_actions; + SeahorseKeyManagerStore *store; + GSettings *settings; +}; + +G_DEFINE_TYPE (SeahorseKeyserverResults, seahorse_keyserver_results, SEAHORSE_TYPE_CATALOG); + +/* ----------------------------------------------------------------------------- + * INTERNAL + */ + + +static gboolean +fire_selection_changed (SeahorseKeyserverResults* self) +{ + gint rows; + GtkTreeSelection* selection; + g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); + + selection = gtk_tree_view_get_selection (self->pv->view); + rows = gtk_tree_selection_count_selected_rows (selection); + if (self->pv->import_actions) + gtk_action_group_set_sensitive (self->pv->import_actions, rows > 0); + g_signal_emit_by_name (self, "selection-changed"); + return FALSE; +} + +/** +* selection: +* self: the results object +* +* Adds fire_selection_changed as idle function +* +**/ +static void +on_view_selection_changed (GtkTreeSelection *selection, SeahorseKeyserverResults *self) +{ + g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); + g_return_if_fail (GTK_IS_TREE_SELECTION (selection)); + g_idle_add ((GSourceFunc)fire_selection_changed, self); +} + +static void +on_row_activated (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *column, SeahorseKeyserverResults *self) +{ + GObject *obj; + + g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); + g_return_if_fail (GTK_IS_TREE_VIEW (view)); + g_return_if_fail (path != NULL); + g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column)); + + obj = seahorse_key_manager_store_get_object_from_path (view, path); + if (obj != NULL) + seahorse_catalog_show_properties (SEAHORSE_CATALOG (self), obj); +} + +G_MODULE_EXPORT gboolean +on_key_list_button_pressed (GtkTreeView* view, GdkEventButton* event, SeahorseKeyserverResults* self) +{ + g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); + g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE); + if (event->button == 3) + seahorse_catalog_show_context_menu (SEAHORSE_CATALOG (self), + SEAHORSE_CATALOG_MENU_OBJECT, + event->button, event->time); + return FALSE; +} + +G_MODULE_EXPORT gboolean +on_key_list_popup_menu (GtkTreeView* view, SeahorseKeyserverResults* self) +{ + GList *objects; + + g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); + g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE); + + objects = seahorse_catalog_get_selected_objects (SEAHORSE_CATALOG (self)); + if (objects != NULL) + seahorse_catalog_show_context_menu (SEAHORSE_CATALOG (self), + SEAHORSE_CATALOG_MENU_OBJECT, + 0, gtk_get_current_event_time ()); + g_list_free (objects); + return TRUE; +} + +/** +* action: the closing action or NULL +* self: The SeahorseKeyServerResults widget to destroy +* +* destroys the widget +* +**/ +static void +on_app_close (GtkAction* action, SeahorseKeyserverResults* self) +{ + g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); + g_return_if_fail (action == NULL || GTK_IS_ACTION (action)); + seahorse_widget_destroy (SEAHORSE_WIDGET (self)); +} + +static void +on_remote_find (GtkAction* action, SeahorseKeyserverResults* self) +{ + g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); + g_return_if_fail (GTK_IS_ACTION (action)); + seahorse_keyserver_search_show (seahorse_catalog_get_window (SEAHORSE_CATALOG (self))); +} + +static void +on_import_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + SeahorseCatalog *self = SEAHORSE_CATALOG (user_data); + GError *error = NULL; + + if (!seahorse_pgp_backend_transfer_finish (SEAHORSE_PGP_BACKEND (source), + result, &error)) + seahorse_util_handle_error (&error, seahorse_catalog_get_window (self), + _("Couldn't import keys")); + + g_object_unref (self); +} + +static GList* +objects_prune_non_exportable (GList *objects) +{ + GList *exportable = NULL; + GList *l; + + for (l = objects; l; l = g_list_next (l)) { + if (seahorse_object_get_flags (l->data) & SEAHORSE_FLAG_EXPORTABLE) + exportable = g_list_append (exportable, l->data); + } + + g_list_free (objects); + return exportable; +} + +static void +on_key_import_keyring (GtkAction* action, SeahorseCatalog* self) +{ + GCancellable *cancellable; + SeahorsePgpBackend *backend; + SeahorseGpgmeKeyring *keyring; + GList* objects; + + g_return_if_fail (SEAHORSE_IS_CATALOG (self)); + g_return_if_fail (GTK_IS_ACTION (action)); + + objects = seahorse_catalog_get_selected_objects (self); + objects = objects_prune_non_exportable (objects); + + /* No objects, nothing to do */ + if (objects == NULL) + return; + + cancellable = g_cancellable_new (); + backend = seahorse_pgp_backend_get (); + keyring = seahorse_pgp_backend_get_default_keyring (NULL); + seahorse_pgp_backend_transfer_async (backend, objects, SEAHORSE_PLACE (keyring), + cancellable, on_import_complete, g_object_ref (self)); + seahorse_progress_show (cancellable, _ ("Importing keys from key servers"), TRUE); + g_object_unref (cancellable); + + g_list_free (objects); +} + +/** +* widget: sending widget +* event: ignored +* self: The SeahorseKeyserverResults widget to destroy +* +* When this window closes we quit seahorse +* +* Returns TRUE on success +**/ +static gboolean +on_delete_event (GtkWidget* widget, GdkEvent* event, SeahorseKeyserverResults* self) +{ + g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + on_app_close (NULL, self); + return TRUE; +} + +static const GtkActionEntry GENERAL_ENTRIES[] = { + /* TRANSLATORS: The "Remote" menu contains key operations on remote systems. */ + { "remote-menu", NULL, N_("_Remote") }, + { "app-close", GTK_STOCK_CLOSE, NULL, "W", + N_("Close this window"), G_CALLBACK (on_app_close) }, +}; + +static const GtkActionEntry SERVER_ENTRIES[] = { + { "remote-find", GTK_STOCK_FIND, N_("_Find Remote Keys..."), "", + N_("Search for keys on a key server"), G_CALLBACK (on_remote_find) } +}; + +static const GtkActionEntry IMPORT_ENTRIES[] = { + { "key-import-keyring", GTK_STOCK_ADD, N_("_Import"), "", + N_("Import selected keys to local key ring"), G_CALLBACK (on_key_import_keyring) } +}; + +static GList * +seahorse_keyserver_results_get_selected_objects (SeahorseCatalog *catalog) +{ + SeahorseKeyserverResults * self = SEAHORSE_KEYSERVER_RESULTS (catalog); + return seahorse_key_manager_store_get_selected_objects (self->pv->view); +} + +static SeahorsePlace * +seahorse_keyserver_results_get_focused_place (SeahorseCatalog *catalog) +{ + SeahorseGpgmeKeyring *keyring; + keyring = seahorse_pgp_backend_get_default_keyring (NULL); + return SEAHORSE_PLACE (keyring); +} + +static void +seahorse_keyserver_results_constructed (GObject *obj) +{ + SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (obj); + GtkActionGroup* actions; + GtkTreeSelection *selection; + GtkWindow *window; + char* title; + + G_OBJECT_CLASS (seahorse_keyserver_results_parent_class)->constructed (obj); + + if (g_utf8_strlen (self->pv->search_string, -1) == 0) { + title = g_strdup (_("Remote Keys")); + } else { + title = g_strdup_printf (_ ("Remote Keys Containing '%s'"), self->pv->search_string); + } + + window = seahorse_catalog_get_window (SEAHORSE_CATALOG (self)); + gtk_window_set_title (window, title); + g_free (title); + + g_signal_connect (window, "delete-event", G_CALLBACK (on_delete_event), self); + + actions = gtk_action_group_new ("general"); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, GENERAL_ENTRIES, G_N_ELEMENTS (GENERAL_ENTRIES), self); + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions); + + actions = gtk_action_group_new ("keyserver"); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, SERVER_ENTRIES, G_N_ELEMENTS (SERVER_ENTRIES), self); + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions); + + self->pv->import_actions = gtk_action_group_new ("import"); + gtk_action_group_set_translation_domain (self->pv->import_actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (self->pv->import_actions, IMPORT_ENTRIES, G_N_ELEMENTS (IMPORT_ENTRIES), self); + g_object_set (gtk_action_group_get_action (self->pv->import_actions, "key-import-keyring"), "is-important", TRUE, NULL); + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), self->pv->import_actions); + + /* init key list & selection settings */ + self->pv->view = GTK_TREE_VIEW (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "key_list")); + selection = gtk_tree_view_get_selection (self->pv->view); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); + g_signal_connect_object (selection, "changed", G_CALLBACK (on_view_selection_changed), self, 0); + g_signal_connect_object (self->pv->view, "row-activated", G_CALLBACK (on_row_activated), self, 0); + g_signal_connect_object (self->pv->view, "button-press-event", G_CALLBACK (on_key_list_button_pressed), self, 0); + g_signal_connect_object (self->pv->view, "popup-menu", G_CALLBACK (on_key_list_popup_menu), self, 0); + gtk_widget_realize (GTK_WIDGET (self->pv->view)); + + /* Set focus to the current key list */ + gtk_widget_grab_focus (GTK_WIDGET (self->pv->view)); + + /* To avoid flicker */ + seahorse_catalog_ensure_updated (SEAHORSE_CATALOG (self)); + seahorse_widget_show (SEAHORSE_WIDGET (SEAHORSE_CATALOG (self))); + + self->pv->store = seahorse_key_manager_store_new (GCR_COLLECTION (self->pv->collection), + self->pv->view, + &self->pv->pred, + self->pv->settings); + on_view_selection_changed (selection, self); + + /* Include actions from the backend */ + actions = NULL; + g_object_get (seahorse_pgp_backend_get (), "actions", &actions, NULL); + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions); + g_object_unref (actions); +} + +/** +* self: The SeahorseKeyserverResults object to init +* +* Inits the results object +* +**/ +static void +seahorse_keyserver_results_init (SeahorseKeyserverResults *self) +{ + self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResultsPrivate); + self->pv->settings = g_settings_new ("org.gnome.seahorse.manager"); + self->pv->collection = GCR_SIMPLE_COLLECTION (gcr_simple_collection_new ()); +} + +/** +* obj: SeahorseKeyserverResults object +* +* Finalize the results object +* +**/ +static void +seahorse_keyserver_results_finalize (GObject *obj) +{ + SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (obj); + + g_free (self->pv->search_string); + self->pv->search_string = NULL; + + g_clear_object (&self->pv->import_actions); + + g_clear_object (&self->pv->collection); + + if (self->pv->store) + g_object_unref (self->pv->store); + self->pv->store = NULL; + + if (self->pv->view) + gtk_tree_view_set_model (self->pv->view, NULL); + self->pv->view = NULL; + + g_clear_object (&self->pv->settings); + g_clear_object (&self->pv->collection); + + G_OBJECT_CLASS (seahorse_keyserver_results_parent_class)->finalize (obj); +} + +/** +* obj: The SeahorseKeyserverResults object to set +* prop_id: Property to set +* value: Value of this property +* pspec: GParamSpec for the warning +* +* Supported properties are PROP_SEARCH and PROP_SELECTED +* +**/ +static void +seahorse_keyserver_results_set_property (GObject *obj, guint prop_id, const GValue *value, + GParamSpec *pspec) +{ + SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (obj); + const gchar* str; + + switch (prop_id) { + case PROP_SEARCH: + /* Many key servers ignore spaces at the beginning and end, so we do too */ + str = g_value_get_string (value); + if (!str) + str = ""; + self->pv->search_string = g_strstrip (g_utf8_casefold (str, -1)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +/** +* obj: The SeahorseKeyserverResults object to get properties from +* prop_id: the ide of the property to get +* value: Value returned +* pspec: GParamSpec for the warning +* +* Supported properties: PROP_SEARCH and PROP_SELECTED +* +**/ +static void +seahorse_keyserver_results_get_property (GObject *obj, guint prop_id, GValue *value, + GParamSpec *pspec) +{ + SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (obj); + + switch (prop_id) { + case PROP_SEARCH: + g_value_set_string (value, seahorse_keyserver_results_get_search (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +/** +* klass: The SeahorseKeyserverResultsClass +* +* Inits the class +* +**/ +static void +seahorse_keyserver_results_class_init (SeahorseKeyserverResultsClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseCatalogClass *catalog_class = SEAHORSE_CATALOG_CLASS (klass); + + seahorse_keyserver_results_parent_class = g_type_class_peek_parent (klass); + g_type_class_add_private (klass, sizeof (SeahorseKeyserverResultsPrivate)); + + gobject_class->constructed = seahorse_keyserver_results_constructed; + gobject_class->finalize = seahorse_keyserver_results_finalize; + gobject_class->set_property = seahorse_keyserver_results_set_property; + gobject_class->get_property = seahorse_keyserver_results_get_property; + + catalog_class->get_selected_objects = seahorse_keyserver_results_get_selected_objects; + catalog_class->get_focused_place = seahorse_keyserver_results_get_focused_place; + + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SEARCH, + g_param_spec_string ("search", "search", "search", NULL, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); +} + +static void +on_search_completed (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (user_data); + GError *error = NULL; + GtkWindow *window; + + seahorse_pgp_backend_search_remote_finish (NULL, result, &error); + if (error != NULL) { + window = seahorse_catalog_get_window (SEAHORSE_CATALOG (self)); + g_dbus_error_strip_remote_error (error); + seahorse_util_show_error (window, _("The search for keys failed."), error->message); + g_error_free (error); + } + + g_object_unref (self); +} +/** + * seahorse_keyserver_results_show: + * @parent: A GTK window as parent (or NULL) + * @search_text: The test to search for + * + * Creates a search results window and adds the operation to it's progress status. + * + */ +void +seahorse_keyserver_results_show (const char* search_text) +{ + SeahorseKeyserverResults* self; + GCancellable *cancellable; + + g_return_if_fail (search_text != NULL); + + self = g_object_new (SEAHORSE_TYPE_KEYSERVER_RESULTS, + "name", "keyserver-results", + "search", search_text, + NULL); + + /* Destorys itself with destroy */ + g_object_ref_sink (self); + + cancellable = g_cancellable_new (); + + seahorse_pgp_backend_search_remote_async (NULL, search_text, + self->pv->collection, + cancellable, on_search_completed, + g_object_ref (self)); + + seahorse_progress_attach (cancellable, SEAHORSE_WIDGET (self)); + + g_object_unref (cancellable); +} + +/** + * seahorse_keyserver_results_get_search: + * @self: SeahorseKeyserverResults object to get the search string from + * + * + * + * Returns: The search string in from the results + */ +const gchar* +seahorse_keyserver_results_get_search (SeahorseKeyserverResults* self) +{ + g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), NULL); + return self->pv->search_string; +} diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-results.h seahorse-3.6.3/pgp/seahorse-keyserver-results.h --- seahorse-3.2.2/pgp/seahorse-keyserver-results.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-results.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,65 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_KEYSERVER_RESULTS_H__ +#define __SEAHORSE_KEYSERVER_RESULTS_H__ + +#include +#include +#include + +#include "seahorse-catalog.h" +#include "seahorse-object.h" + +G_BEGIN_DECLS + + +#define SEAHORSE_TYPE_KEYSERVER_RESULTS (seahorse_keyserver_results_get_type ()) +#define SEAHORSE_KEYSERVER_RESULTS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResults)) +#define SEAHORSE_KEYSERVER_RESULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResultsClass)) +#define SEAHORSE_IS_KEYSERVER_RESULTS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEYSERVER_RESULTS)) +#define SEAHORSE_IS_KEYSERVER_RESULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEYSERVER_RESULTS)) +#define SEAHORSE_KEYSERVER_RESULTS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResultsClass)) + +typedef struct _SeahorseKeyserverResults SeahorseKeyserverResults; +typedef struct _SeahorseKeyserverResultsClass SeahorseKeyserverResultsClass; +typedef struct _SeahorseKeyserverResultsPrivate SeahorseKeyserverResultsPrivate; + +struct _SeahorseKeyserverResults { + SeahorseCatalog parent_instance; + SeahorseKeyserverResultsPrivate *pv; +}; + +struct _SeahorseKeyserverResultsClass { + SeahorseCatalogClass parent_class; +}; + +GType seahorse_keyserver_results_get_type (void); + +void seahorse_keyserver_results_show (const gchar *search_text); + +const gchar* seahorse_keyserver_results_get_search (SeahorseKeyserverResults* self); + + +G_END_DECLS + +#endif diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-results.ui seahorse-3.6.3/pgp/seahorse-keyserver-results.ui --- seahorse-3.2.2/pgp/seahorse-keyserver-results.ui 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-results.ui 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-results.xml seahorse-3.6.3/pgp/seahorse-keyserver-results.xml --- seahorse-3.2.2/pgp/seahorse-keyserver-results.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-results.xml 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,97 @@ + + + + + + True + window1 + 640 + 476 + + + True + + + True + + + + + + False + 0 + + + + + True + + + + + + False + 1 + + + + + True + 1 + + + True + True + automatic + + + True + True + 12 + True + + + + + + + 0 + + + + + True + + + True + 0.10000000149 + + + False + False + 0 + + + + + True + + + 1 + + + + + False + 1 + + + + + 2 + + + + + + diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-search.c seahorse-3.6.3/pgp/seahorse-keyserver-search.c --- seahorse-3.2.2/pgp/seahorse-keyserver-search.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-search.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,502 @@ +/* + * Seahorse + * + * Copyright (C) 2004-2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include + +#include "seahorse-discovery.h" +#include "seahorse-keyserver-search.h" +#include "seahorse-keyserver-results.h" +#include "seahorse-pgp-backend.h" + +#include "seahorse-preferences.h" +#include "seahorse-servers.h" +#include "seahorse-util.h" +#include "seahorse-widget.h" + +#include "seahorse-keyserver-results.h" + +/** + * SECTION:seahorse-keyserver-search + * @short_description: Contains the functions to start a search for keys on a + * keyserver. + **/ + +void on_keyserver_search_control_changed (GtkWidget *widget, + SeahorseWidget *swidget); + +void on_keyserver_search_ok_clicked (GtkButton *button, + SeahorseWidget *swidget); + +/** + * KeyserverSelection: + * @names: A list of keyserver names + * @uris: A list of keyserver URIs + * @all: TRUE if all keyservers are selected + **/ +typedef struct _KeyserverSelection { + GPtrArray *names; + GPtrArray *uris; + gboolean all; +} KeyserverSelection; + + +/* Selection Retrieval ------------------------------------------------------ */ + +/** + * widget: CHECK_BUTTON widget to read + * selection: will be updated depending on the state of the widget + * + * Adds the name/uri of the checked widget to the selection + * + **/ +static void +get_checks (GtkWidget *widget, KeyserverSelection *selection) +{ + const gchar *value; + + if (!GTK_IS_CHECK_BUTTON (widget)) + return; + + /* Pull in the selected name and uri */ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { + value = gtk_button_get_label (GTK_BUTTON (widget)); + g_ptr_array_add (selection->names, g_strdup (value)); + value = g_object_get_data (G_OBJECT (widget), "keyserver-uri"); + g_ptr_array_add (selection->uris, g_strdup (value)); + + /* Note that not all checks are selected */ + } else { + selection->all = FALSE; + } +} + +/** + * swidget: the window/main widget + * + * extracts all keyservers in the sub-widgets "key-server-list" and + * "shared-keys-list" and fills a KeyserverSelection structure. + * + * returns the selection + **/ +static KeyserverSelection* +get_keyserver_selection (SeahorseWidget *swidget) +{ + KeyserverSelection *selection; + GtkWidget *widget; + + selection = g_new0 (KeyserverSelection, 1); + selection->all = TRUE; + selection->uris = g_ptr_array_new_with_free_func (g_free); + selection->names = g_ptr_array_new_with_free_func (g_free); + + /* Key servers */ + widget = seahorse_widget_get_widget (swidget, "key-server-list"); + g_return_val_if_fail (widget != NULL, selection); + gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback)get_checks, selection); + + /* Shared Key */ + widget = seahorse_widget_get_widget (swidget, "shared-keys-list"); + g_return_val_if_fail (widget != NULL, selection); + gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback)get_checks, selection); + + g_ptr_array_add (selection->uris, NULL); + g_ptr_array_add (selection->names, NULL); + + return selection; +} + +/** + * selection: The selection to free + * + * All data (string lists, structures) are freed + * + **/ +static void +free_keyserver_selection (KeyserverSelection *selection) +{ + if (selection) { + g_ptr_array_free (selection->uris, TRUE); + g_ptr_array_free (selection->names, TRUE); + g_free (selection); + } +} + +/** + * widget: a CHECK_BUTTON + * checked: out- TRUE if the button is active, stays the same else. + * + **/ +static void +have_checks (GtkWidget *widget, gboolean *checked) +{ + if (GTK_IS_CHECK_BUTTON (widget)) { + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) + *checked = TRUE; + } +} + +/** + * swidget: sub widgets in here will be checked + * + * returns TRUE if at least one of the CHECK_BUTTONS in "key-server-list" or + * "shared-keys-list" is TRUE + **/ +static gboolean +have_keyserver_selection (SeahorseWidget *swidget) +{ + GtkWidget *w; + gboolean checked = FALSE; + + /* Key servers */ + w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "key-server-list")); + g_return_val_if_fail (w != NULL, FALSE); + gtk_container_foreach (GTK_CONTAINER (w), (GtkCallback)have_checks, &checked); + + /* Shared keys */ + w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "shared-keys-list")); + g_return_val_if_fail (w != NULL, FALSE); + gtk_container_foreach (GTK_CONTAINER (w), (GtkCallback)have_checks, &checked); + + return checked; +} + +/** + * on_keyserver_search_control_changed: + * @widget: ignored + * @swidget: main widget + * + * + * Enables the "search" button if the edit-field contains text and at least a + * server is selected + */ +G_MODULE_EXPORT void +on_keyserver_search_control_changed (GtkWidget *widget, SeahorseWidget *swidget) +{ + gboolean enabled = TRUE; + GtkWidget *w; + gchar *text; + + /* Need to have at least one key server selected ... */ + if (!have_keyserver_selection (swidget)) + enabled = FALSE; + + /* ... and some search text */ + else { + w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "search-text")); + text = gtk_editable_get_chars (GTK_EDITABLE (w), 0, -1); + if (!text || !text[0]) + enabled = FALSE; + g_free (text); + } + + w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "search")); + gtk_widget_set_sensitive (w, enabled); +} + +/* Initial Selection -------------------------------------------------------- */ + +static void +foreach_child_select_checks (GtkWidget *widget, gpointer user_data) +{ + gchar **names = user_data; + gboolean checked; + gchar *name; + guint i; + + if (GTK_IS_CHECK_BUTTON (widget)) { + name = g_utf8_casefold (gtk_button_get_label (GTK_BUTTON (widget)), -1); + checked = names != NULL && names[0] != NULL ? FALSE : TRUE; + for (i = 0; names && names[i] != NULL; i++) { + if (g_utf8_collate (names[i], name) == 0) { + checked = TRUE; + break; + } + } + g_free (name); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), checked); + } +} + +/** + * swidget: the main widget + * + * Reads key servers from settings and updates the UI content. + * + **/ +static void +select_inital_keyservers (SeahorseWidget *swidget) +{ + gchar **names; + GtkWidget *widget; + gchar *name; + guint i; + + names = g_settings_get_strv (seahorse_application_settings (NULL), "last-search-servers"); + + /* Close the expander if all servers are selected */ + widget = seahorse_widget_get_widget (swidget, "search-where"); + g_return_if_fail (widget != NULL); + gtk_expander_set_expanded (GTK_EXPANDER (widget), names != NULL && names[0] != NULL); + + /* We do case insensitive matches */ + for (i = 0; names[i] != NULL; i++) { + name = g_utf8_casefold (names[i], -1); + g_free (names[i]); + names[i] = name; + } + + widget = seahorse_widget_get_widget (swidget, "key-server-list"); + g_return_if_fail (widget != NULL); + gtk_container_foreach (GTK_CONTAINER (widget), foreach_child_select_checks, names); + + widget = seahorse_widget_get_widget (swidget, "shared-keys-list"); + g_return_if_fail (widget != NULL); + gtk_container_foreach (GTK_CONTAINER (widget), foreach_child_select_checks, names); +} + +/* Populating Lists --------------------------------------------------------- */ + +/** + * widget: a check button + * unchecked: a hash table containing the state of the servers + * + * If the button is not checked, the hash table entry associate with it will be + * replaced with "" + * + **/ +static void +remove_checks (GtkWidget *widget, GHashTable *unchecked) +{ + if (GTK_IS_CHECK_BUTTON (widget)) { + + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) + g_hash_table_replace (unchecked, + g_strdup (gtk_button_get_label (GTK_BUTTON (widget))), ""); + + gtk_widget_destroy (widget); + } +} + +/** +* swidget: the main widget +* box: the GTK_CONTAINER with the checkboxes +* uris: the uri list of the keyservers +* names: the keyserver names +* +* Updates the box and adds checkboxes containing names/uris. The check-status +* of already existing check boxes is not changed. +**/ +static void +populate_keyserver_list (SeahorseWidget *swidget, GtkWidget *box, gchar **uris, + gchar **names) +{ + GtkContainer *cont = GTK_CONTAINER (box); + GHashTable *unchecked; + gboolean any = FALSE; + GtkWidget *check; + guint i; + + /* Remove all checks, and note which ones were unchecked */ + unchecked = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + gtk_container_foreach (cont, (GtkCallback)remove_checks, unchecked); + + /* Now add the new ones back */ + for (i = 0; uris && uris[i] && names && names[i]; i++) { + any = TRUE; + + /* A new checkbox with this the name as the label */ + check = gtk_check_button_new_with_label (names[i]); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), + g_hash_table_lookup (unchecked, names[i]) == NULL); + g_signal_connect (check, "toggled", G_CALLBACK (on_keyserver_search_control_changed), swidget); + gtk_widget_show (check); + + /* Save URI and set it as the tooltip */ + g_object_set_data_full (G_OBJECT (check), "keyserver-uri", g_strdup (uris[i]), g_free); + gtk_widget_set_tooltip_text (check, uris[i]); + + gtk_container_add (cont, check); + } + + g_hash_table_destroy (unchecked); + + /* Only display the container if we had some checks */ + if (any) + gtk_widget_show (box); + else + gtk_widget_hide (box); +} + +static void +on_settings_keyservers_changed (GSettings *settings, const gchar *key, gpointer user_data) +{ + SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); + GtkWidget *widget; + gchar **keyservers; + gchar **names; + + widget = seahorse_widget_get_widget (swidget, "key-server-list"); + g_return_if_fail (widget != NULL); + + keyservers = seahorse_servers_get_uris (); + names = seahorse_servers_get_names (); + populate_keyserver_list (swidget, widget, keyservers, names); + + g_strfreev (keyservers); + g_strfreev (names); +} + +/** +* ssd: the SeahorseServiceDiscovery. List-data is read from there +* name: ignored +* swidget: The SeahorseWidget +* +* refreshes the "shared-keys-list" +* +**/ +static void +refresh_shared_keys (SeahorseDiscovery *ssd, + const gchar *name, + SeahorseWidget *swidget) +{ + gchar **keyservers; + gchar **names; + GtkWidget *widget; + + widget = seahorse_widget_get_widget (swidget, "shared-keys-list"); + g_return_if_fail (widget != NULL); + + names = seahorse_discovery_list (ssd); + keyservers = seahorse_discovery_get_uris (ssd, (const gchar **)names); + populate_keyserver_list (swidget, widget, keyservers, names); + + g_strfreev (keyservers); + g_strfreev (names); +} + +/* -------------------------------------------------------------------------- */ + +/** + * on_keyserver_search_ok_clicked: + * @button: ignored + * @swidget: The SeahorseWidget to work with + * + * Extracts data, stores it in settings and starts a search using the entered + * search data. + * + * This function gets the things done + */ +G_MODULE_EXPORT void +on_keyserver_search_ok_clicked (GtkButton *button, SeahorseWidget *swidget) +{ + KeyserverSelection *selection; + const gchar *search; + GtkWidget *widget; + + widget = seahorse_widget_get_widget (swidget, "search-text"); + g_return_if_fail (widget != NULL); + + /* Get search text and save it for next time */ + search = gtk_entry_get_text (GTK_ENTRY (widget)); + g_return_if_fail (search != NULL && search[0] != 0); + g_settings_set_string (seahorse_application_settings (NULL), "last-search-text", search); + + /* The keyservers to search, and save for next time */ + selection = get_keyserver_selection (swidget); + g_return_if_fail (selection->uris != NULL); + g_settings_set_strv (seahorse_application_settings (NULL), "last-search-servers", + selection->all ? NULL : (const gchar * const*)selection->uris->pdata); + + /* Open the new result window */ + seahorse_keyserver_results_show (search); + + free_keyserver_selection (selection); + seahorse_widget_destroy (swidget); +} + +/** +* widget: ignored +* swidget: the SeahorseWidget to remove the signals from +* +* Disconnects the added/removed signals +* +**/ +static void +cleanup_signals (GtkWidget *widget, SeahorseWidget *swidget) +{ + SeahorseDiscovery *ssd = seahorse_pgp_backend_get_discovery (NULL); + g_signal_handlers_disconnect_by_func (ssd, refresh_shared_keys, swidget); +} + + +/** + * seahorse_keyserver_search_show: + * @parent: the parent window to connect this window to + * + * Shows a remote search window. + * + * Returns: the new window. + */ +GtkWindow* +seahorse_keyserver_search_show (GtkWindow *parent) +{ + SeahorseDiscovery *ssd; + SeahorseWidget *swidget; + GtkWindow *window; + GtkWidget *widget; + GSettings *settings; + gchar *search; + + swidget = seahorse_widget_new ("keyserver-search", parent); + g_return_val_if_fail (swidget != NULL, NULL); + + window = GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)); + + widget = seahorse_widget_get_widget (swidget, "search-text"); + g_return_val_if_fail (widget != NULL, window); + + search = g_settings_get_string (seahorse_application_settings (NULL), + "last-search-text"); + if (search != NULL) { + gtk_entry_set_text (GTK_ENTRY (widget), search); + gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); + g_free (search); + } + + /* The key servers to list */ + settings = seahorse_application_pgp_settings (NULL); + on_settings_keyservers_changed (settings, "keyservers", swidget); + g_signal_connect_object (settings, "changed::keyservers", + G_CALLBACK (on_settings_keyservers_changed), swidget, 0); + + /* Any shared keys to list */ + ssd = seahorse_pgp_backend_get_discovery (NULL); + refresh_shared_keys (ssd, NULL, swidget); + g_signal_connect (ssd, "added", G_CALLBACK (refresh_shared_keys), swidget); + g_signal_connect (ssd, "removed", G_CALLBACK (refresh_shared_keys), swidget); + g_signal_connect (window, "destroy", G_CALLBACK (cleanup_signals), swidget); + + select_inital_keyservers (swidget); + on_keyserver_search_control_changed (NULL, swidget); + + return window; +} diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-search.h seahorse-3.6.3/pgp/seahorse-keyserver-search.h --- seahorse-3.2.2/pgp/seahorse-keyserver-search.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-search.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,31 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_KEYSERVER_SEARCH_H__ +#define __SEAHORSE_KEYSERVER_SEARCH_H__ + +#include + +GtkWindow * seahorse_keyserver_search_show (GtkWindow *parent); + +#endif diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-search.xml seahorse-3.6.3/pgp/seahorse-keyserver-search.xml --- seahorse-3.2.2/pgp/seahorse-keyserver-search.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-search.xml 2012-11-12 08:32:13.000000000 +0100 @@ -0,0 +1,243 @@ + + + + + + gtk-find + 4 + + + True + 5 + Find Remote Keys + False + center-on-parent + dialog + True + center + + + + True + 2 + + + True + 5 + 12 + + + True + 12 + + + True + gtk-find + 5 + + + False + 0 + + + + + True + 0 + 0 + This will find keys for others on the Internet. These keys can then be imported into your local key ring. + True + + + False + False + 1 + + + + + False + False + 0 + + + + + True + 12 + + + True + 4 + _Search for keys containing: + True + search-text + + + False + False + 0 + + + + + True + True + True + + + + + + 1 + + + + + False + 1 + + + + + True + True + + + 135 + True + True + never + automatic + etched-out + + + True + + + True + + + True + 6 + + + True + 0 + <b>Key Servers:</b> + True + + + False + False + 0 + + + + + False + False + 0 + + + + + True + 6 + + + True + 0 + <b>Shared Keys Near Me:</b> + True + + + False + False + 0 + + + + + False + False + 1 + + + + + + + + + + + True + Where to search: + True + True + + + + + 2 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + + False + False + 0 + + + + + True + True + True + True + False + search-image + _Search + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + button3 + search + + + diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-sync.c seahorse-3.6.3/pgp/seahorse-keyserver-sync.c --- seahorse-3.2.2/pgp/seahorse-keyserver-sync.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-sync.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,242 @@ +/* + * Seahorse + * + * Copyright (C) 2005 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include + +#include + +#include "seahorse-object.h" +#include "seahorse-progress.h" +#include "seahorse-preferences.h" +#include "seahorse-servers.h" +#include "seahorse-util.h" +#include "seahorse-widget.h" + +#include "seahorse-keyserver-sync.h" +#include "seahorse-pgp-backend.h" +#include "seahorse-transfer.h" + +void on_sync_ok_clicked (GtkButton *button, + SeahorseWidget *swidget); + +void on_sync_configure_clicked (GtkButton *button, + SeahorseWidget *swidget); + +static void +on_transfer_upload_complete (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePlace *place = SEAHORSE_PLACE (user_data); + GError *error = NULL; + gchar *publish_to; + + if (!seahorse_pgp_backend_transfer_finish (SEAHORSE_PGP_BACKEND (object), result, &error)) { + publish_to = g_settings_get_string (seahorse_application_settings (NULL), + "server-publish-to"); + seahorse_util_handle_error (&error, NULL, + _("Couldn't publish keys to server"), publish_to); + g_free (publish_to); + } + + g_object_unref (place); +} + +static void +on_transfer_download_complete (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePlace *place = SEAHORSE_PLACE (user_data); + GError *error = NULL; + gchar *keyserver; + + if (!seahorse_transfer_finish (result, &error)) { + g_object_get (place, "key-server", &keyserver, NULL); + seahorse_util_handle_error (&error, NULL, + _("Couldn't retrieve keys from server: %s"), keyserver); + g_free (keyserver); + } + + g_object_unref (place); +} + +G_MODULE_EXPORT void +on_sync_ok_clicked (GtkButton *button, SeahorseWidget *swidget) +{ + GList *keys; + + keys = (GList*)g_object_get_data (G_OBJECT (swidget), "publish-keys"); + keys = g_list_copy (keys); + + seahorse_widget_destroy (swidget); + + seahorse_keyserver_sync (keys); + g_list_free (keys); +} + +G_MODULE_EXPORT void +on_sync_configure_clicked (GtkButton *button, SeahorseWidget *swidget) +{ + seahorse_preferences_show (GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)), "keyserver-tab"); +} + +static void +update_message (SeahorseWidget *swidget) +{ + GtkWidget *widget; + GtkWidget *widget2; + GtkWidget *sync_button; + gchar *text; + + widget = seahorse_widget_get_widget (swidget, "publish-message"); + widget2 = seahorse_widget_get_widget (swidget, "sync-message"); + sync_button = seahorse_widget_get_widget (swidget, "sync-button"); + + text = g_settings_get_string (seahorse_application_settings (NULL), + "server-publish-to"); + if (text && text[0]) { + gtk_widget_show (widget); + gtk_widget_hide (widget2); + gtk_widget_set_sensitive (sync_button, TRUE); + } else { + gtk_widget_hide (widget); + gtk_widget_show (widget2); + gtk_widget_set_sensitive (sync_button, FALSE); + } + g_free (text); +} + +static void +on_settings_publish_to_changed (GSettings *settings, const gchar *key, gpointer user_data) +{ + SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); + update_message (swidget); +} + +/** + * seahorse_keyserver_sync_show + * @keys: The keys to synchronize + * + * Shows a synchronize window. + * + * Returns the new window. + **/ +GtkWindow* +seahorse_keyserver_sync_show (GList *keys, GtkWindow *parent) +{ + SeahorseWidget *swidget; + GtkWindow *win; + GtkWidget *w; + guint n; + gchar *t; + + swidget = seahorse_widget_new_allow_multiple ("keyserver-sync", parent); + g_return_val_if_fail (swidget != NULL, NULL); + + win = GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)); + + /* The details message */ + n = g_list_length (keys); + t = g_strdup_printf (ngettext ("%d key is selected for synchronizing", + "%d keys are selected for synchronizing", n), n); + + w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "detail-message")); + g_return_val_if_fail (swidget != NULL, win); + gtk_label_set_markup (GTK_LABEL (w), t); + g_free (t); + + /* The right help message */ + update_message (swidget); + g_signal_connect_object (seahorse_application_settings (NULL), "changed::server-publish-to", + G_CALLBACK (on_settings_publish_to_changed), swidget, 0); + + keys = g_list_copy (keys); + g_return_val_if_fail (!keys || SEAHORSE_IS_OBJECT (keys->data), win); + g_object_set_data_full (G_OBJECT (swidget), "publish-keys", keys, + (GDestroyNotify)g_list_free); + + return win; +} + +void +seahorse_keyserver_sync (GList *keys) +{ + SeahorseServerSource *source; + SeahorseGpgmeKeyring *keyring; + gchar *keyserver; + GCancellable *cancellable; + gchar **keyservers; + GPtrArray *keyids; + GList *l; + guint i; + + if (!keys) + return; + + cancellable = g_cancellable_new (); + + keyids = g_ptr_array_new (); + for (l = keys; l != NULL; l = g_list_next (l)) + g_ptr_array_add (keyids, (gchar *)seahorse_pgp_key_get_keyid (l->data)); + g_ptr_array_add (keyids, NULL); + + /* And now synchronizing keys from the servers */ + keyservers = seahorse_servers_get_uris (); + for (i = 0; keyservers[i] != NULL; i++) { + source = seahorse_pgp_backend_lookup_remote (NULL, keyservers[i]); + + /* This can happen if the URI scheme is not supported */ + if (source == NULL) + continue; + + keyring = seahorse_pgp_backend_get_default_keyring (NULL); + seahorse_transfer_keyids_async (SEAHORSE_SERVER_SOURCE (source), + SEAHORSE_PLACE (keyring), + (const gchar **)keyids->pdata, + cancellable, + on_transfer_download_complete, + g_object_ref (source)); + } + + g_ptr_array_free (keyids, TRUE); + g_strfreev (keyservers); + + /* Publishing keys online */ + keyserver = g_settings_get_string (seahorse_application_settings (NULL), + "server-publish-to"); + if (keyserver && keyserver[0]) { + source = seahorse_pgp_backend_lookup_remote (NULL, keyserver); + + /* This can happen if the URI scheme is not supported */ + if (source != NULL) { + seahorse_pgp_backend_transfer_async (NULL, keys, SEAHORSE_PLACE (source), + cancellable, on_transfer_upload_complete, + g_object_ref (source)); + } + } + + g_free (keyserver); + + seahorse_progress_show (cancellable, _("Synchronizing keys..."), FALSE); + g_object_unref (cancellable); +} diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-sync.h seahorse-3.6.3/pgp/seahorse-keyserver-sync.h --- seahorse-3.2.2/pgp/seahorse-keyserver-sync.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-sync.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,31 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Adam Schreiber + * + * 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 __SEAHORSE_KEYSERVER_SYNC_H__ +#define __SEAHORSE_KEYSERVER_SYNC_H__ + +void seahorse_keyserver_sync (GList *keys); + + +GtkWindow* seahorse_keyserver_sync_show (GList *keys, + GtkWindow *parent); + +#endif diff -Nru seahorse-3.2.2/pgp/seahorse-keyserver-sync.xml seahorse-3.6.3/pgp/seahorse-keyserver-sync.xml --- seahorse-3.2.2/pgp/seahorse-keyserver-sync.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-keyserver-sync.xml 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,180 @@ + + + + + + gtk-properties + + + gtk-refresh + + + True + 5 + Sync Keys + center + dialog + + + True + 2 + + + True + 5 + 12 + + + True + 12 + + + True + 0 + 0 + gtk-network + 5 + + + False + 0 + + + + + True + 12 + + + True + 0 + 0 + This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys. + True + + + False + False + 0 + + + + + 0 + 0 + This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others. + True + + + False + False + 1 + + + + + True + 0 + 0 + + True + True + + + False + False + 2 + + + + + False + False + 1 + + + + + False + False + 0 + + + + + False + 1 + + + + + True + end + + + _Key Servers + True + True + True + False + configure-image + True + + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + True + + + + False + False + 1 + + + + + _Sync + True + True + True + True + True + False + sync-image + True + + + + False + False + 2 + + + + + False + end + 0 + + + + + + configure + button3 + sync-button + + + diff -Nru seahorse-3.2.2/pgp/seahorse-ldap-source.c seahorse-3.6.3/pgp/seahorse-ldap-source.c --- seahorse-3.2.2/pgp/seahorse-ldap-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-ldap-source.c 2012-08-21 12:23:17.000000000 +0200 @@ -35,6 +35,7 @@ #include "seahorse-pgp-uid.h" #include "seahorse-object-list.h" +#include "seahorse-place.h" #include "seahorse-progress.h" #include "seahorse-registry.h" #include "seahorse-servers.h" @@ -735,58 +736,22 @@ return ldap; } -enum { - PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION -}; - -static void seahorse_source_iface (SeahorseSourceIface *iface); +static void seahorse_place_iface (SeahorsePlaceIface *iface); G_DEFINE_TYPE_EXTENDED (SeahorseLDAPSource, seahorse_ldap_source, SEAHORSE_TYPE_SERVER_SOURCE, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); - -static void -seahorse_ldap_source_init (SeahorseLDAPSource *lsrc) -{ - -} + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_PLACE, seahorse_place_iface)); static void -seahorse_ldap_source_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_PGP); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE); - break; - }; -} - -/* Initialize the basic class stuff */ -static void -seahorse_ldap_source_class_init (SeahorseLDAPSourceClass *klass) +seahorse_ldap_source_init (SeahorseLDAPSource *self) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->get_property = seahorse_ldap_source_get_property; - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - - seahorse_registry_register_type (NULL, SEAHORSE_TYPE_LDAP_SOURCE, "source", "remote", SEAHORSE_PGP_STR, NULL); - seahorse_servers_register_type ("ldap", _("LDAP Key Server"), seahorse_ldap_is_valid_uri); - seahorse_registry_register_function (NULL, seahorse_pgp_key_canonize_id, "canonize", SEAHORSE_PGP_STR, NULL); } typedef struct { GCancellable *cancellable; gchar *filter; LDAP *ldap; - GList *results; + GcrSimpleCollection *results; } source_search_closure; static void @@ -794,7 +759,7 @@ { source_search_closure *closure = data; g_clear_object (&closure->cancellable); - g_list_free (closure->results); + g_clear_object (&closure->results); g_free (closure->filter); if (closure->ldap) ldap_unbind_ext (closure->ldap, NULL, NULL); @@ -813,34 +778,13 @@ NULL }; -static void -add_key (SeahorseLDAPSource *ssrc, SeahorsePgpKey *key) -{ - SeahorseObject *prev; - GQuark keyid; - - keyid = seahorse_pgp_key_canonize_id (seahorse_pgp_key_get_keyid (key)); - prev = seahorse_context_get_object (SCTX_APP (), SEAHORSE_SOURCE (ssrc), keyid); - - if (prev != NULL) { - g_return_if_fail (SEAHORSE_IS_PGP_KEY (prev)); - seahorse_pgp_key_set_uids (SEAHORSE_PGP_KEY (prev), seahorse_pgp_key_get_uids (key)); - seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (prev), seahorse_pgp_key_get_subkeys (key)); - return; - } - - /* Add to context */ - seahorse_object_set_source (SEAHORSE_OBJECT (key), SEAHORSE_SOURCE (ssrc)); - seahorse_context_add_object (SCTX_APP (), SEAHORSE_OBJECT (key)); -} - /* Add a key to the key source from an LDAP entry */ -static SeahorseObject * +static void search_parse_key_from_ldap_entry (SeahorseLDAPSource *self, + GcrSimpleCollection *results, LDAP *ldap, LDAPMessage *res) { - SeahorseObject *result = NULL; const gchar *algo; long int timestamp; long int expires; @@ -850,7 +794,7 @@ gboolean disabled; int length; - g_return_val_if_fail (ldap_msgtype (res) == LDAP_RES_SEARCH_ENTRY, NULL); + g_return_if_fail (ldap_msgtype (res) == LDAP_RES_SEARCH_ENTRY); fpr = get_string_attribute (ldap, res, "pgpcertid"); uidstr = get_string_attribute (ldap, res, "pgpuserid"); @@ -886,31 +830,32 @@ flags |= SEAHORSE_FLAG_DISABLED; seahorse_pgp_subkey_set_flags (subkey, flags); + key = seahorse_pgp_key_new (); + /* Build up a uid */ - uid = seahorse_pgp_uid_new (uidstr); + uid = seahorse_pgp_uid_new (key, uidstr); if (revoked) seahorse_pgp_uid_set_validity (uid, SEAHORSE_VALIDITY_REVOKED); /* Now build them into a key */ - key = seahorse_pgp_key_new (); list = g_list_prepend (NULL, uid); seahorse_pgp_key_set_uids (key, list); seahorse_object_list_free (list); list = g_list_prepend (NULL, subkey); seahorse_pgp_key_set_subkeys (key, list); seahorse_object_list_free (list); - g_object_set (key, "location", SEAHORSE_LOCATION_REMOTE, - "flags", flags, NULL); + g_object_set (key, + "object-flags", flags, + "place", self, + NULL); - add_key (self, key); + seahorse_pgp_key_realize (key); + gcr_simple_collection_add (results, G_OBJECT (key)); g_object_unref (key); - result = SEAHORSE_OBJECT (key); } g_free (fpr); g_free (uidstr); - - return result; } static gboolean @@ -921,7 +866,6 @@ source_search_closure *closure = g_simple_async_result_get_op_res_gpointer (res); SeahorseLDAPSource *self = SEAHORSE_LDAP_SOURCE (g_async_result_get_source_object (user_data)); GError *error = NULL; - SeahorseObject *key; char *message; int code; int type; @@ -938,9 +882,8 @@ dump_ldap_entry (closure->ldap, result); #endif - key = search_parse_key_from_ldap_entry (self, closure->ldap, result); - if (key != NULL) - closure->results = g_list_prepend (closure->results, key); + search_parse_key_from_ldap_entry (self, closure->results, + closure->ldap, result); return TRUE; /* keep calling this callback */ /* All entries done */ @@ -1019,8 +962,9 @@ static void -seahorse_ldap_source_search_async (SeahorseSource *source, +seahorse_ldap_source_search_async (SeahorseServerSource *source, const gchar *match, + GcrSimpleCollection *results, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) @@ -1034,6 +978,7 @@ seahorse_ldap_source_search_async); closure = g_new0 (source_search_closure, 1); closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + closure->results = g_object_ref (results); text = escape_ldap_value (match); closure->filter = g_strdup_printf ("(pgpuserid=*%s*)", text); g_free (text); @@ -1048,24 +993,18 @@ g_object_unref (res); } -static GList * -seahorse_ldap_source_search_finish (SeahorseSource *source, +static gboolean +seahorse_ldap_source_search_finish (SeahorseServerSource *source, GAsyncResult *result, GError **error) { - source_search_closure *closure; - GList *keys; - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_ldap_source_search_async), NULL); + seahorse_ldap_source_search_async), FALSE); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; + return FALSE; - closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); - keys = closure->results; - closure->results = NULL; - return keys; + return TRUE; } typedef struct { @@ -1207,7 +1146,7 @@ } static void -seahorse_ldap_source_import_async (SeahorseSource *source, +seahorse_ldap_source_import_async (SeahorseServerSource *source, GInputStream *input, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -1249,7 +1188,7 @@ } static GList * -seahorse_ldap_source_import_finish (SeahorseSource *source, +seahorse_ldap_source_import_finish (SeahorseServerSource *source, GAsyncResult *result, GError **error) { @@ -1266,17 +1205,18 @@ typedef struct { GPtrArray *fingerprints; gint current_index; - GOutputStream *output; + GString *data; GCancellable *cancellable; LDAP *ldap; -} source_export_closure; +} ExportClosure; static void -source_export_free (gpointer data) +export_closure_free (gpointer data) { - source_export_closure *closure = data; + ExportClosure *closure = data; g_ptr_array_free (closure->fingerprints, TRUE); - g_object_unref (closure->output); + if (closure->data) + g_string_free (closure->data, TRUE); g_clear_object (&closure->cancellable); if (closure->ldap) ldap_unbind_ext (closure->ldap, NULL, NULL); @@ -1291,14 +1231,12 @@ gpointer user_data) { GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_export_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + ExportClosure *closure = g_simple_async_result_get_op_res_gpointer (res); SeahorseLDAPSource *self = SEAHORSE_LDAP_SOURCE (g_async_result_get_source_object (G_ASYNC_RESULT (res))); LDAPServerInfo *sinfo; char *message; GError *error = NULL; - gboolean ret; gchar *key; - gsize written; int code; int type; int rc; @@ -1326,18 +1264,10 @@ return FALSE; } - ret = g_output_stream_write_all (closure->output, key, strlen (key), &written, NULL, &error) && - g_output_stream_write_all (closure->output, "\n", 1, &written, NULL, &error) && - g_output_stream_flush (closure->output, NULL, &error); + g_string_append (closure->data, key); + g_string_append_c (closure->data, '\n'); g_free (key); - - if (!ret) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - return FALSE; - } - return TRUE; /* No more entries, result */ @@ -1364,7 +1294,7 @@ export_retrieve_key (SeahorseLDAPSource *self, GSimpleAsyncResult *res) { - source_export_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + ExportClosure *closure = g_simple_async_result_get_op_res_gpointer (res); LDAPServerInfo *sinfo; gchar *filter; char *attrs[2]; @@ -1424,7 +1354,7 @@ gpointer user_data) { GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - source_export_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + ExportClosure *closure = g_simple_async_result_get_op_res_gpointer (res); GError *error = NULL; closure->ldap = seahorse_ldap_source_connect_finish (SEAHORSE_LDAP_SOURCE (source), @@ -1440,32 +1370,31 @@ } static void -seahorse_ldap_source_export_raw_async (SeahorseSource *source, - GList *keyids, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +seahorse_ldap_source_export_async (SeahorseServerSource *source, + const gchar **keyids, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { SeahorseLDAPSource *self = SEAHORSE_LDAP_SOURCE (source); - source_export_closure *closure; + ExportClosure *closure; GSimpleAsyncResult *res; gchar *fingerprint; - GList *l; + gint i; res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - seahorse_ldap_source_export_raw_async); - closure = g_new0 (source_export_closure, 1); - closure->output = g_object_ref (output); + seahorse_ldap_source_export_async); + closure = g_new0 (ExportClosure, 1); + closure->data = g_string_sized_new (1024); closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; closure->fingerprints = g_ptr_array_new_with_free_func (g_free); - for (l = keyids; l; l = g_list_next (l)) { - fingerprint = g_strdup (seahorse_pgp_key_calc_rawid (GPOINTER_TO_UINT (l->data))); + for (i = 0; keyids[i] != NULL; i++) { + fingerprint = g_strdup (keyids[i]); g_ptr_array_add (closure->fingerprints, fingerprint); seahorse_progress_prep (closure->cancellable, fingerprint, NULL); } closure->current_index = -1; - g_simple_async_result_set_op_res_gpointer (res, closure, source_export_free); + g_simple_async_result_set_op_res_gpointer (res, closure, export_closure_free); seahorse_ldap_source_connect_async (self, cancellable, on_export_connect_completed, @@ -1474,32 +1403,48 @@ g_object_unref (res); } -static GOutputStream * -seahorse_ldap_source_export_raw_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) +static gpointer +seahorse_ldap_source_export_finish (SeahorseServerSource *source, + GAsyncResult *result, + gsize *size, + GError **error) { - source_export_closure *closure; + ExportClosure *closure; + gpointer output; + g_return_val_if_fail (size != NULL, NULL); g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_ldap_source_export_raw_async), FALSE); + seahorse_ldap_source_export_async), NULL); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; + return NULL; closure = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); - return closure->output; + *size = closure->data->len; + output = g_string_free (closure->data, FALSE); + closure->data = NULL; + return output; } static void -seahorse_source_iface (SeahorseSourceIface *iface) +seahorse_place_iface (SeahorsePlaceIface *iface) { - iface->search_async = seahorse_ldap_source_search_async; - iface->search_finish = seahorse_ldap_source_search_finish; - iface->import_async = seahorse_ldap_source_import_async; - iface->import_finish = seahorse_ldap_source_import_finish; - iface->export_raw_async = seahorse_ldap_source_export_raw_async; - iface->export_raw_finish = seahorse_ldap_source_export_raw_finish; +} + +/* Initialize the basic class stuff */ +static void +seahorse_ldap_source_class_init (SeahorseLDAPSourceClass *klass) +{ + SeahorseServerSourceClass *server_class = SEAHORSE_SERVER_SOURCE_CLASS (klass); + + server_class->search_async = seahorse_ldap_source_search_async; + server_class->search_finish = seahorse_ldap_source_search_finish; + server_class->export_async = seahorse_ldap_source_export_async; + server_class->export_finish = seahorse_ldap_source_export_finish; + server_class->import_async = seahorse_ldap_source_import_async; + server_class->import_finish = seahorse_ldap_source_import_finish; + + seahorse_servers_register_type ("ldap", _("LDAP Key Server"), seahorse_ldap_is_valid_uri); } /** diff -Nru seahorse-3.2.2/pgp/seahorse-ldap-source.h seahorse-3.6.3/pgp/seahorse-ldap-source.h --- seahorse-3.2.2/pgp/seahorse-ldap-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-ldap-source.h 2012-08-21 12:23:17.000000000 +0200 @@ -45,7 +45,7 @@ struct _SeahorseLDAPSource { SeahorseServerSource parent; - + /*< private >*/ }; diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-actions.c seahorse-3.6.3/pgp/seahorse-pgp-actions.c --- seahorse-3.2.2/pgp/seahorse-pgp-actions.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-actions.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,207 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include + +#include "seahorse-gpgme-dialogs.h" +#include "seahorse-gpgme-key.h" +#include "seahorse-gpgme-key-op.h" +#include "seahorse-gpgme-uid.h" +#include "seahorse-pgp-backend.h" +#include "seahorse-pgp-actions.h" +#include "seahorse-pgp-dialogs.h" +#include "seahorse-keyserver-search.h" +#include "seahorse-keyserver-sync.h" + +#include "seahorse-action.h" +#include "seahorse-actions.h" +#include "seahorse-delete-dialog.h" +#include "seahorse-object.h" +#include "seahorse-object-list.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" + +GType seahorse_pgp_backend_actions_get_type (void) G_GNUC_CONST; +#define SEAHORSE_TYPE_PGP_BACKEND_ACTIONS (seahorse_pgp_backend_actions_get_type ()) +#define SEAHORSE_PGP_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_BACKEND_ACTIONS, SeahorsePgpBackendActions)) +#define SEAHORSE_PGP_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_BACKEND_ACTIONS, SeahorsePgpBackendActionsClass)) +#define SEAHORSE_IS_PGP_BACKEND_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_BACKEND_ACTIONS)) +#define SEAHORSE_IS_PGP_BACKEND_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_BACKEND_ACTIONS)) +#define SEAHORSE_PGP_BACKEND_ACTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_BACKEND_ACTIONS, SeahorsePgpBackendActionsClass)) + +typedef struct { + SeahorseActions parent_instance; +} SeahorsePgpBackendActions; + +typedef struct { + SeahorseActionsClass parent_class; +} SeahorsePgpBackendActionsClass; + +G_DEFINE_TYPE (SeahorsePgpBackendActions, seahorse_pgp_backend_actions, SEAHORSE_TYPE_ACTIONS); + +static const gchar* BACKEND_DEFINITION = ""\ +""\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +""; + +static void +on_remote_find (GtkAction* action, + gpointer user_data) +{ + seahorse_keyserver_search_show (seahorse_action_get_window (action)); +} + +static void +on_remote_sync (GtkAction* action, + gpointer user_data) +{ + SeahorseActions *actions = SEAHORSE_ACTIONS (user_data); + SeahorseGpgmeKeyring *keyring; + SeahorseCatalog *catalog; + GList *objects = NULL; + GList *keys = NULL; + GList *l; + + catalog = seahorse_actions_get_catalog (actions); + if (catalog != NULL) { + objects = seahorse_catalog_get_selected_objects (catalog); + for (l = objects; l != NULL; l = g_list_next (l)) { + if (SEAHORSE_IS_PGP_KEY (l->data)) + keys = g_list_prepend (keys, l->data); + } + g_list_free (objects); + } + + if (keys == NULL) { + keyring = seahorse_pgp_backend_get_default_keyring (NULL); + keys = gcr_collection_get_objects (GCR_COLLECTION (keyring)); + } + + seahorse_keyserver_sync_show (keys, seahorse_action_get_window (action)); + g_list_free (keys); +} + +static const GtkActionEntry FIND_ACTIONS[] = { + { "remote-find", GTK_STOCK_FIND, N_("_Find Remote Keys..."), "", + N_("Search for keys on a key server"), G_CALLBACK (on_remote_find) }, +}; + +static const GtkActionEntry SYNC_ACTIONS[] = { + { "remote-sync", GTK_STOCK_REFRESH, N_("_Sync and Publish Keys..."), "", + N_("Publish and/or synchronize your keys with those online."), G_CALLBACK (on_remote_sync) } +}; + +static void +seahorse_pgp_backend_actions_init (SeahorsePgpBackendActions *self) +{ + GtkActionGroup *actions = GTK_ACTION_GROUP (self); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, FIND_ACTIONS, + G_N_ELEMENTS (FIND_ACTIONS), NULL); + gtk_action_group_add_actions (actions, SYNC_ACTIONS, + G_N_ELEMENTS (SYNC_ACTIONS), self); + seahorse_actions_register_definition (SEAHORSE_ACTIONS (self), BACKEND_DEFINITION); +} + +static void +seahorse_pgp_backend_actions_class_init (SeahorsePgpBackendActionsClass *klass) +{ + +} + +GtkActionGroup * +seahorse_pgp_backend_actions_instance (void) +{ + static GtkActionGroup *actions = NULL; + + if (actions == NULL) { + actions = g_object_new (SEAHORSE_TYPE_PGP_BACKEND_ACTIONS, + "name", "pgp-backend", + NULL); + g_object_add_weak_pointer (G_OBJECT (actions), + (gpointer *)&actions); + } else { + g_object_ref (actions); + } + + return actions; +} + +GType seahorse_gpgme_key_actions_get_type (void) G_GNUC_CONST; +#define SEAHORSE_TYPE_GPGME_KEY_ACTIONS (seahorse_gpgme_key_actions_get_type ()) +#define seahorse_gpgme_key_actions(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_ACTIONS, SeahorseGpgmeKeyActions)) +#define seahorse_gpgme_key_actions_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_ACTIONS, SeahorseGpgmeKeyActionsClass)) +#define SEAHORSE_IS_PGP_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_ACTIONS)) +#define SEAHORSE_IS_PGP_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_ACTIONS)) +#define seahorse_gpgme_key_actions_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_ACTIONS, SeahorseGpgmeKeyActionsClass)) + +typedef struct { + SeahorseActions parent_instance; +} SeahorseGpgmeKeyActions; + +typedef struct { + SeahorseActionsClass parent_class; +} SeahorseGpgmeKeyActionsClass; + +G_DEFINE_TYPE (SeahorseGpgmeKeyActions, seahorse_gpgme_key_actions, SEAHORSE_TYPE_ACTIONS); + +static void +seahorse_gpgme_key_actions_init (SeahorseGpgmeKeyActions *self) +{ + GtkActionGroup *actions = GTK_ACTION_GROUP (self); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, SYNC_ACTIONS, + G_N_ELEMENTS (SYNC_ACTIONS), NULL); +} + +static void +seahorse_gpgme_key_actions_class_init (SeahorseGpgmeKeyActionsClass *klass) +{ + +} + +GtkActionGroup * +seahorse_gpgme_key_actions_instance (void) +{ + static GtkActionGroup *actions = NULL; + + if (actions == NULL) { + actions = g_object_new (SEAHORSE_TYPE_GPGME_KEY_ACTIONS, + "name", "gpgme-key", + NULL); + g_object_add_weak_pointer (G_OBJECT (actions), + (gpointer *)&actions); + } else { + g_object_ref (actions); + } + + return actions; +} diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-actions.h seahorse-3.6.3/pgp/seahorse-pgp-actions.h --- seahorse-3.2.2/pgp/seahorse-pgp-actions.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-actions.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,32 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PGP_ACTIONS_H__ +#define __SEAHORSE_PGP_ACTIONS_H__ + +#include + +GtkActionGroup * seahorse_pgp_backend_actions_instance (void); + +GtkActionGroup * seahorse_gpgme_key_actions_instance (void); + +#endif diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-backend.c seahorse-3.6.3/pgp/seahorse-pgp-backend.c --- seahorse-3.2.2/pgp/seahorse-pgp-backend.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-backend.c 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,720 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-gpgme-dialogs.h" +#include "seahorse-pgp-actions.h" +#include "seahorse-pgp-backend.h" +#include "seahorse-server-source.h" +#include "seahorse-transfer.h" +#include "seahorse-unknown-source.h" + +#include "seahorse-backend.h" +#include "seahorse-progress.h" +#include "seahorse-registry.h" +#include "seahorse-servers.h" +#include "seahorse-util.h" + +#include + +#include + +enum { + PROP_0, + PROP_NAME, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ACTIONS +}; + +static SeahorsePgpBackend *pgp_backend = NULL; + +struct _SeahorsePgpBackend { + GObject parent; + SeahorseGpgmeKeyring *keyring; + SeahorseDiscovery *discovery; + SeahorseUnknownSource *unknown; + GHashTable *remotes; + GtkActionGroup *actions; +}; + +struct _SeahorsePgpBackendClass { + GObjectClass parent_class; +}; + +static void seahorse_pgp_backend_iface (SeahorseBackendIface *iface); + +static void seahorse_pgp_backend_collection_init (GcrCollectionIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorsePgpBackend, seahorse_pgp_backend, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_pgp_backend_collection_init); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_BACKEND, seahorse_pgp_backend_iface); +); + +static void +seahorse_pgp_backend_init (SeahorsePgpBackend *self) +{ + g_return_if_fail (pgp_backend == NULL); + pgp_backend = self; + + self->remotes = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_object_unref); + + self->actions = seahorse_pgp_backend_actions_instance (); + + seahorse_gpgme_generate_register (); +} + +#ifdef WITH_KEYSERVER + +static void +on_settings_keyservers_changed (GSettings *settings, + gchar *key, + gpointer user_data) +{ + SeahorsePgpBackend *self = SEAHORSE_PGP_BACKEND (user_data); + SeahorseServerSource *source; + gchar **keyservers; + GHashTable *check; + const gchar *uri; + GHashTableIter iter; + guint i; + + check = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_iter_init (&iter, self->remotes); + while (g_hash_table_iter_next (&iter, (gpointer*)&uri, (gpointer*)&source)) + g_hash_table_replace (check, (gpointer)uri, source); + + /* Load and strip names from keyserver list */ + keyservers = seahorse_servers_get_uris (); + + for (i = 0; keyservers[i] != NULL; i++) { + uri = keyservers[i]; + + /* If we don't have a keysource then add it */ + if (!g_hash_table_lookup (self->remotes, uri)) { + source = seahorse_server_source_new (uri); + if (source != NULL) { + seahorse_pgp_backend_add_remote (self, uri, source); + g_object_unref (source); + } + } + + /* Mark this one as present */ + g_hash_table_remove (check, uri); + } + + /* Now remove any extras */ + g_hash_table_iter_init (&iter, check); + while (g_hash_table_iter_next (&iter, (gpointer*)&uri, NULL)) + seahorse_pgp_backend_remove_remote (self, uri); + + g_hash_table_destroy (check); + g_strfreev (keyservers); +} + +#endif /* WITH_KEYSERVER */ + +static void +seahorse_pgp_backend_constructed (GObject *obj) +{ + SeahorsePgpBackend *self = SEAHORSE_PGP_BACKEND (obj); + + G_OBJECT_CLASS (seahorse_pgp_backend_parent_class)->constructed (obj); + + self->keyring = seahorse_gpgme_keyring_new (); + seahorse_place_load_async (SEAHORSE_PLACE (self->keyring), NULL, NULL, NULL); + + self->discovery = seahorse_discovery_new (); + self->unknown = seahorse_unknown_source_new (); + +#ifdef WITH_KEYSERVER + g_signal_connect (seahorse_application_pgp_settings (NULL), "changed::keyservers", + G_CALLBACK (on_settings_keyservers_changed), self); + + /* Initial loading */ + on_settings_keyservers_changed (seahorse_application_pgp_settings (NULL), "keyservers", self); +#endif +} + +static void +seahorse_pgp_backend_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorsePgpBackend *self = SEAHORSE_PGP_BACKEND (obj); + + switch (prop_id) { + case PROP_NAME: + g_value_set_string (value, SEAHORSE_PGP_NAME); + break; + case PROP_LABEL: + g_value_set_string (value, _("PGP Keys")); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, _("PGP keys are for encrypting email or files")); + break; + case PROP_ACTIONS: + g_value_set_object (value, self->actions); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_pgp_backend_finalize (GObject *obj) +{ + SeahorsePgpBackend *self = SEAHORSE_PGP_BACKEND (obj); + +#ifdef WITH_KEYSERVER + g_signal_handlers_disconnect_by_func (seahorse_application_pgp_settings (NULL), + on_settings_keyservers_changed, self); +#endif + + g_clear_object (&self->keyring); + g_clear_object (&self->discovery); + g_clear_object (&self->unknown); + g_hash_table_destroy (self->remotes); + g_clear_object (&self->actions); + pgp_backend = NULL; + + G_OBJECT_CLASS (seahorse_pgp_backend_parent_class)->finalize (obj); +} + +static void +seahorse_pgp_backend_class_init (SeahorsePgpBackendClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->constructed = seahorse_pgp_backend_constructed; + gobject_class->finalize = seahorse_pgp_backend_finalize; + gobject_class->get_property = seahorse_pgp_backend_get_property; + + g_object_class_override_property (gobject_class, PROP_NAME, "name"); + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); +} + +static guint +seahorse_pgp_backend_get_length (GcrCollection *collection) +{ + return 1; +} + +static GList * +seahorse_pgp_backend_get_objects (GcrCollection *collection) +{ + SeahorsePgpBackend *self = SEAHORSE_PGP_BACKEND (collection); + return g_list_append (NULL, self->keyring); +} + +static gboolean +seahorse_pgp_backend_contains (GcrCollection *collection, + GObject *object) +{ + SeahorsePgpBackend *self = SEAHORSE_PGP_BACKEND (collection); + return G_OBJECT (self->keyring) == object; +} + +static void +seahorse_pgp_backend_collection_init (GcrCollectionIface *iface) +{ + iface->contains = seahorse_pgp_backend_contains; + iface->get_length = seahorse_pgp_backend_get_length; + iface->get_objects = seahorse_pgp_backend_get_objects; +} + +static SeahorsePlace * +seahorse_pgp_backend_lookup_place (SeahorseBackend *backend, + const gchar *uri) +{ + SeahorsePgpBackend *self = SEAHORSE_PGP_BACKEND (backend); + if (g_str_equal (uri, "gnupg://")) + return SEAHORSE_PLACE (seahorse_pgp_backend_get_default_keyring (self)); + return NULL; +} + +static void +seahorse_pgp_backend_iface (SeahorseBackendIface *iface) +{ + iface->lookup_place = seahorse_pgp_backend_lookup_place; +} + +SeahorsePgpBackend * +seahorse_pgp_backend_get (void) +{ + g_return_val_if_fail (pgp_backend, NULL); + return pgp_backend; +} + +void +seahorse_pgp_backend_initialize (void) +{ + SeahorsePgpBackend *self; + + g_return_if_fail (pgp_backend == NULL); + self = g_object_new (SEAHORSE_TYPE_PGP_BACKEND, NULL); + + seahorse_backend_register (SEAHORSE_BACKEND (self)); + g_object_unref (self); + + g_return_if_fail (pgp_backend != NULL); +} + +SeahorseGpgmeKeyring * +seahorse_pgp_backend_get_default_keyring (SeahorsePgpBackend *self) +{ + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL); + g_return_val_if_fail (self->keyring, NULL); + return self->keyring; +} + +SeahorsePgpKey * +seahorse_pgp_backend_get_default_key (SeahorsePgpBackend *self) +{ + SeahorsePgpKey *key = NULL; + GSettings *settings; + const gchar *keyid; + gchar *value; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL); + + settings = seahorse_application_pgp_settings (NULL); + if (settings != NULL) { + value = g_settings_get_string (settings, "default-key"); + if (value != NULL && value[0]) { + if (g_str_has_prefix (value, "openpgp:")) + keyid = value + strlen ("openpgp:"); + else + keyid = value; + key = SEAHORSE_PGP_KEY (seahorse_gpgme_keyring_lookup (self->keyring, keyid)); + } + g_free (value); + } + + return key; +} + +SeahorseDiscovery * +seahorse_pgp_backend_get_discovery (SeahorsePgpBackend *self) +{ + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL); + g_return_val_if_fail (self->discovery, NULL); + return self->discovery; +} + +SeahorseServerSource * +seahorse_pgp_backend_lookup_remote (SeahorsePgpBackend *self, + const gchar *uri) +{ + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL); + + return g_hash_table_lookup (self->remotes, uri); +} + +void +seahorse_pgp_backend_add_remote (SeahorsePgpBackend *self, + const gchar *uri, + SeahorseServerSource *source) +{ + self = self ? self : seahorse_pgp_backend_get (); + g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self)); + g_return_if_fail (uri != NULL); + g_return_if_fail (SEAHORSE_IS_SERVER_SOURCE (source)); + g_return_if_fail (g_hash_table_lookup (self->remotes, uri) == NULL); + + g_hash_table_insert (self->remotes, g_strdup (uri), g_object_ref (source)); +} + +void +seahorse_pgp_backend_remove_remote (SeahorsePgpBackend *self, + const gchar *uri) +{ + self = self ? self : seahorse_pgp_backend_get (); + g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self)); + g_return_if_fail (uri != NULL); + + g_hash_table_remove (self->remotes, uri); +} + +typedef struct { + GCancellable *cancellable; + gint num_searches; + GList *objects; +} search_remote_closure; + +static void +search_remote_closure_free (gpointer user_data) +{ + search_remote_closure *closure = user_data; + g_clear_object (&closure->cancellable); + g_list_free (closure->objects); + g_free (closure); +} + +static void +on_source_search_ready (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + search_remote_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + + g_return_if_fail (closure->num_searches > 0); + + if (!seahorse_server_source_search_finish (SEAHORSE_SERVER_SOURCE (source), + result, &error)) + g_simple_async_result_take_error (res, error); + + closure->num_searches--; + seahorse_progress_end (closure->cancellable, GINT_TO_POINTER (closure->num_searches)); + + if (closure->num_searches == 0) + g_simple_async_result_complete (res); + + g_object_unref (user_data); +} + +void +seahorse_pgp_backend_search_remote_async (SeahorsePgpBackend *self, + const gchar *search, + GcrSimpleCollection *results, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + search_remote_closure *closure; + GSimpleAsyncResult *res; + SeahorseServerSource *source; + GHashTable *servers = NULL; + GHashTableIter iter; + gchar **names; + gchar *uri; + guint i; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self)); + + /* Get a list of all selected key servers */ + names = g_settings_get_strv (seahorse_application_settings (NULL), "last-search-servers"); + if (names != NULL && names[0] != NULL) { + servers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + for (i = 0; names[i] != NULL; i++) + g_hash_table_insert (servers, g_strdup (names[i]), GINT_TO_POINTER (TRUE)); + } + g_strfreev (names); + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_pgp_backend_search_remote_async); + closure = g_new0 (search_remote_closure, 1); + g_simple_async_result_set_op_res_gpointer (res, closure, + search_remote_closure_free); + if (cancellable) + closure->cancellable = g_object_ref (cancellable); + + g_hash_table_iter_init (&iter, self->remotes); + while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&source)) { + if (servers) { + g_object_get (source, "uri", &uri, NULL); + if (!g_hash_table_lookup (servers, uri)) { + g_free (uri); + continue; + } + g_free (uri); + } + + seahorse_progress_prep_and_begin (closure->cancellable, GINT_TO_POINTER (closure->num_searches), NULL); + seahorse_server_source_search_async (source, search, results, closure->cancellable, + on_source_search_ready, g_object_ref (res)); + closure->num_searches++; + } + + if (servers) + g_hash_table_unref (servers); + + if (closure->num_searches == 0) + g_simple_async_result_complete_in_idle (res); + + g_object_unref (res); +} + +gboolean +seahorse_pgp_backend_search_remote_finish (SeahorsePgpBackend *self, + GAsyncResult *result, + GError **error) +{ + GSimpleAsyncResult *res; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), FALSE); + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_pgp_backend_search_remote_async), FALSE); + + res = G_SIMPLE_ASYNC_RESULT (result); + + if (g_simple_async_result_propagate_error (res, error)) + return FALSE; + + return TRUE; +} + +typedef struct { + GCancellable *cancellable; + gint num_transfers; +} transfer_closure; + +static void +transfer_closure_free (gpointer user_data) +{ + transfer_closure *closure = user_data; + g_clear_object (&closure->cancellable); + g_free (closure); +} + +static void +on_source_transfer_ready (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + transfer_closure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + + g_return_if_fail (closure->num_transfers > 0); + + seahorse_transfer_finish (result, &error); + if (error != NULL) + g_simple_async_result_take_error (res, error); + + closure->num_transfers--; + seahorse_progress_end (closure->cancellable, GINT_TO_POINTER (closure->num_transfers)); + + if (closure->num_transfers == 0) { + g_simple_async_result_complete (res); + } + + g_object_unref (user_data); +} + +void +seahorse_pgp_backend_transfer_async (SeahorsePgpBackend *self, + GList *keys, + SeahorsePlace *to, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + transfer_closure *closure; + SeahorseObject *object; + GSimpleAsyncResult *res; + SeahorsePlace *from; + GList *next; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self)); + g_return_if_fail (SEAHORSE_IS_PLACE (to)); + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_pgp_backend_transfer_async); + closure = g_new0 (transfer_closure, 1); + g_simple_async_result_set_op_res_gpointer (res, closure, + transfer_closure_free); + if (cancellable) + closure->cancellable = g_object_ref (cancellable); + + keys = g_list_copy (keys); + + /* Sort by key plage */ + keys = seahorse_util_objects_sort_by_place (keys); + + while (keys) { + + /* break off one set (same keysource) */ + next = seahorse_util_objects_splice_by_place (keys); + + g_assert (SEAHORSE_IS_OBJECT (keys->data)); + object = SEAHORSE_OBJECT (keys->data); + + /* Export from this key place */ + from = seahorse_object_get_place (object); + g_return_if_fail (SEAHORSE_IS_PLACE (from)); + + if (from != to) { + /* Start a new transfer operation between the two places */ + seahorse_progress_prep_and_begin (cancellable, GINT_TO_POINTER (closure->num_transfers), NULL); + seahorse_transfer_keys_async (from, to, keys, cancellable, + on_source_transfer_ready, g_object_ref (res)); + closure->num_transfers++; + } + + g_list_free (keys); + keys = next; + } + + if (closure->num_transfers == 0) + g_simple_async_result_complete_in_idle (res); + + g_object_unref (res); +} + +gboolean +seahorse_pgp_backend_transfer_finish (SeahorsePgpBackend *self, + GAsyncResult *result, + GError **error) +{ + GSimpleAsyncResult *res; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), FALSE); + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_pgp_backend_transfer_async), FALSE); + + res = G_SIMPLE_ASYNC_RESULT (result); + + if (g_simple_async_result_propagate_error (res, error)) + return FALSE; + + return TRUE; +} + +void +seahorse_pgp_backend_retrieve_async (SeahorsePgpBackend *self, + const gchar **keyids, + SeahorsePlace *to, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + transfer_closure *closure; + GSimpleAsyncResult *res; + SeahorsePlace *place; + GHashTableIter iter; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self)); + g_return_if_fail (SEAHORSE_IS_PLACE (to)); + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_pgp_backend_retrieve_async); + closure = g_new0 (transfer_closure, 1); + g_simple_async_result_set_op_res_gpointer (res, closure, + transfer_closure_free); + if (cancellable) + closure->cancellable = g_object_ref (cancellable); + + g_hash_table_iter_init (&iter, self->remotes); + while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&place)) { + /* Start a new transfer operation between the two places */ + seahorse_progress_prep_and_begin (cancellable, GINT_TO_POINTER (closure->num_transfers), NULL); + seahorse_transfer_keyids_async (SEAHORSE_SERVER_SOURCE (place), to, keyids, cancellable, + on_source_transfer_ready, g_object_ref (res)); + closure->num_transfers++; + } + + if (closure->num_transfers == 0) + g_simple_async_result_complete_in_idle (res); + + g_object_unref (res); +} + +gboolean +seahorse_pgp_backend_retrieve_finish (SeahorsePgpBackend *self, + GAsyncResult *result, + GError **error) +{ + GSimpleAsyncResult *res; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), FALSE); + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_pgp_backend_retrieve_async), FALSE); + + res = G_SIMPLE_ASYNC_RESULT (result); + + if (g_simple_async_result_propagate_error (res, error)) + return FALSE; + + return TRUE; +} + +GList * +seahorse_pgp_backend_discover_keys (SeahorsePgpBackend *self, + const gchar **keyids, + GCancellable *cancellable) +{ + GList *robjects = NULL; + const gchar *keyid; + SeahorseGpgmeKey *key; + SeahorseObject *object; + GPtrArray *todiscover; + gint i; + + self = self ? self : seahorse_pgp_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PGP_BACKEND (self), NULL); + + todiscover = g_ptr_array_new (); + + /* Check all the ids */ + for (i = 0; keyids[i] != NULL; i++) { + keyid = keyids[i]; + + /* Do we know about this object? */ + key = seahorse_gpgme_keyring_lookup (self->keyring, keyid); + + /* No such object anywhere, discover it */ + if (key == NULL) { + g_ptr_array_add (todiscover, (gchar *)keyid); + continue; + } + + /* Our return value */ + robjects = g_list_prepend (robjects, key); + } + + if (todiscover->len > 0) { + g_ptr_array_add (todiscover, NULL); + keyids = (const gchar **)todiscover->pdata; + + /* Start a discover process on all todiscover */ + if (g_settings_get_boolean (seahorse_application_settings (NULL), "server-auto-retrieve")) + seahorse_pgp_backend_retrieve_async (self, keyids, SEAHORSE_PLACE (self->keyring), + cancellable, NULL, NULL); + + /* Add unknown objects for all these */ + for (i = 0; keyids[i] != NULL; i++) { + object = seahorse_unknown_source_add_object (self->unknown, keyids[i], cancellable); + robjects = g_list_prepend (robjects, object); + } + } + + g_ptr_array_free (todiscover, TRUE); + return robjects; +} diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-backend.h seahorse-3.6.3/pgp/seahorse-pgp-backend.h --- seahorse-3.2.2/pgp/seahorse-pgp-backend.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-backend.h 2012-08-21 12:23:17.000000000 +0200 @@ -0,0 +1,109 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef SEAHORSE_PGP_BACKEND_H_ +#define SEAHORSE_PGP_BACKEND_H_ + +#include +#include + +#include + +#include "seahorse-pgp.h" +#include "seahorse-discovery.h" +#include "seahorse-gpgme-keyring.h" +#include "seahorse-pgp-key.h" +#include "seahorse-server-source.h" + +G_BEGIN_DECLS + +#define SEAHORSE_TYPE_PGP_BACKEND (seahorse_pgp_backend_get_type ()) +#define SEAHORSE_PGP_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_BACKEND, SeahorsePgpBackend)) +#define SEAHORSE_PGP_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_BACKEND, SeahorsePgpBackendClass)) +#define SEAHORSE_IS_PGP_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_BACKEND)) +#define SEAHORSE_IS_PGP_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_BACKEND)) +#define SEAHORSE_PGP_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_BACKEND, SeahorsePgpBackendClass)) + +typedef struct _SeahorsePgpBackend SeahorsePgpBackend; +typedef struct _SeahorsePgpBackendClass SeahorsePgpBackendClass; + +GType seahorse_pgp_backend_get_type (void) G_GNUC_CONST; + +SeahorsePgpBackend * seahorse_pgp_backend_get (void); + +SeahorseGpgmeKeyring * seahorse_pgp_backend_get_default_keyring (SeahorsePgpBackend *self); + +SeahorsePgpKey * seahorse_pgp_backend_get_default_key (SeahorsePgpBackend *self); + +SeahorseDiscovery * seahorse_pgp_backend_get_discovery (SeahorsePgpBackend *self); + +SeahorseServerSource * seahorse_pgp_backend_lookup_remote (SeahorsePgpBackend *self, + const gchar *uri); + +void seahorse_pgp_backend_add_remote (SeahorsePgpBackend *self, + const gchar *uri, + SeahorseServerSource *source); + +void seahorse_pgp_backend_remove_remote (SeahorsePgpBackend *self, + const gchar *uri); + +void seahorse_pgp_backend_search_remote_async (SeahorsePgpBackend *self, + const gchar *search, + GcrSimpleCollection *results, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_pgp_backend_search_remote_finish (SeahorsePgpBackend *self, + GAsyncResult *result, + GError **error); + +void seahorse_pgp_backend_transfer_async (SeahorsePgpBackend *self, + GList *keys, + SeahorsePlace *to, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_pgp_backend_transfer_finish (SeahorsePgpBackend *self, + GAsyncResult *result, + GError **error); + +void seahorse_pgp_backend_retrieve_async (SeahorsePgpBackend *self, + const gchar **keyids, + SeahorsePlace *to, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_pgp_backend_retrieve_finish (SeahorsePgpBackend *self, + GAsyncResult *result, + GError **error); + +GList* seahorse_pgp_backend_discover_keys (SeahorsePgpBackend *self, + const gchar **keyids, + GCancellable *cancellable); + +G_END_DECLS + +#endif /*SEAHORSE_PGP_BACKEND_H_*/ diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-commands.c seahorse-3.6.3/pgp/seahorse-pgp-commands.c --- seahorse-3.2.2/pgp/seahorse-pgp-commands.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-commands.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,334 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include - -#include "seahorse-gpgme-dialogs.h" -#include "seahorse-gpgme-key.h" -#include "seahorse-gpgme-key-op.h" -#include "seahorse-gpgme-uid.h" -#include "seahorse-pgp.h" -#include "seahorse-pgp-commands.h" -#include "seahorse-pgp-dialogs.h" - -#include "seahorse-object.h" -#include "seahorse-registry.h" -#include "seahorse-util.h" - -enum { - PROP_0 -}; - -struct _SeahorsePgpCommandsPrivate { - GtkActionGroup* command_actions; -}; - -G_DEFINE_TYPE (SeahorsePgpCommands, seahorse_pgp_commands, SEAHORSE_TYPE_COMMANDS); - -static const char* UI_DEFINITION = ""\ -""\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -""; - -static SeahorseObjectPredicate actions_predicate = { 0 }; -static SeahorseObjectPredicate commands_predicate = { 0 }; - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static void -on_key_sign (GtkAction* action, SeahorsePgpCommands* self) -{ - SeahorseView *view; - GtkWindow *window; - GList *keys; - - g_return_if_fail (SEAHORSE_IS_PGP_COMMANDS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - keys = seahorse_view_get_selected_matching (view, &actions_predicate); - - if (keys == NULL) - return; - - /* Indicate what we're actually going to operate on */ - seahorse_view_set_selected (view, keys->data); - - window = seahorse_commands_get_window (SEAHORSE_COMMANDS (self)); - - if (G_TYPE_FROM_INSTANCE (keys->data) == SEAHORSE_TYPE_GPGME_KEY) { - seahorse_gpgme_sign_prompt (SEAHORSE_GPGME_KEY (keys->data), window); - } else if (G_TYPE_FROM_INSTANCE (keys->data) == SEAHORSE_TYPE_GPGME_UID) { - seahorse_gpgme_sign_prompt_uid (SEAHORSE_GPGME_UID (keys->data), window); - } -} - -static const GtkActionEntry COMMAND_ENTRIES[] = { - { "key-sign", GTK_STOCK_INDEX, N_("_Sign Key..."), "", N_("Sign public key"), G_CALLBACK (on_key_sign) } -}; - - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_pgp_commands_show_properties (SeahorseCommands* base, SeahorseObject* obj) -{ - g_return_if_fail (SEAHORSE_IS_OBJECT (obj)); - - if (G_TYPE_FROM_INSTANCE (G_OBJECT (obj)) == SEAHORSE_TYPE_PGP_UID || - G_TYPE_FROM_INSTANCE (G_OBJECT (obj)) == SEAHORSE_TYPE_GPGME_UID) - obj = seahorse_object_get_parent (obj); - - g_return_if_fail (G_TYPE_FROM_INSTANCE (G_OBJECT (obj)) == SEAHORSE_TYPE_PGP_KEY || - G_TYPE_FROM_INSTANCE (G_OBJECT (obj)) == SEAHORSE_TYPE_GPGME_KEY); - seahorse_pgp_key_properties_show (SEAHORSE_PGP_KEY (obj), seahorse_commands_get_window (base)); -} - -static gboolean -seahorse_pgp_commands_delete_objects (SeahorseCommands* base, GList* objects) -{ - guint num; - gint num_keys; - gint num_identities; - char* message; - SeahorseObject *obj; - GList* to_delete, *l; - GtkWidget *parent; - gpgme_error_t gerr; - guint length; - GError *error = NULL; - - num = g_list_length (objects); - if (num == 0) - return TRUE; - - num_keys = 0; - num_identities = 0; - message = NULL; - - /* - * Go through and validate all what we have to delete, - * removing UIDs where the parent Key is also on the - * chopping block. - */ - to_delete = NULL; - - for (l = objects; l; l = g_list_next (l)) { - obj = SEAHORSE_OBJECT (l->data); - if (G_OBJECT_TYPE (obj) == SEAHORSE_TYPE_GPGME_UID) { - if (g_list_find (objects, seahorse_object_get_parent (obj)) == NULL) { - to_delete = g_list_prepend (to_delete, obj); - ++num_identities; - } - } else if (G_OBJECT_TYPE (obj) == SEAHORSE_TYPE_GPGME_KEY) { - to_delete = g_list_prepend (to_delete, obj); - ++num_keys; - } - } - - /* Figure out a good prompt message */ - length = g_list_length (to_delete); - switch (length) { - case 0: - return TRUE; - case 1: - message = g_strdup_printf (_ ("Are you sure you want to permanently delete %s?"), - seahorse_object_get_label (to_delete->data)); - break; - default: - if (num_keys > 0 && num_identities > 0) { - message = g_strdup_printf (_("Are you sure you want to permanently delete %d keys and identities?"), length); - } else if (num_keys > 0) { - message = g_strdup_printf (_("Are you sure you want to permanently delete %d keys?"), length); - } else if (num_identities > 0){ - message = g_strdup_printf (_("Are you sure you want to permanently delete %d identities?"), length); - } else { - g_assert_not_reached (); - } - break; - } - - parent = GTK_WIDGET (seahorse_commands_get_window (base)); - if (!seahorse_util_prompt_delete (message, parent)) { - g_free (message); - return FALSE; - } - - gerr = 0; - for (l = objects; l; l = g_list_next (l)) { - obj = SEAHORSE_OBJECT (l->data); - if (SEAHORSE_IS_GPGME_UID (obj)) { - gerr = seahorse_gpgme_key_op_del_uid (SEAHORSE_GPGME_UID (obj)); - message = _("Couldn't delete user ID"); - } else if (SEAHORSE_IS_GPGME_KEY (obj)) { - if (seahorse_object_get_usage (obj) == SEAHORSE_USAGE_PRIVATE_KEY) { - gerr = seahorse_gpgme_key_op_delete_pair (SEAHORSE_GPGME_KEY (obj)); - message = _("Couldn't delete private key"); - } else { - gerr = seahorse_gpgme_key_op_delete (SEAHORSE_GPGME_KEY (obj)); - message = _("Couldn't delete public key"); - } - } - - if (seahorse_gpgme_propagate_error (gerr, &error)) { - seahorse_util_handle_error (&error, parent, "%s", message); - return FALSE; - } - } - - return TRUE; -} - -static GObject* -seahorse_pgp_commands_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - GObject *obj = G_OBJECT_CLASS (seahorse_pgp_commands_parent_class)->constructor (type, n_props, props); - SeahorsePgpCommands *self = NULL; - SeahorseCommands *base; - SeahorseView *view; - - if (obj) { - self = SEAHORSE_PGP_COMMANDS (obj); - base = SEAHORSE_COMMANDS (self); - - view = seahorse_commands_get_view (base); - g_return_val_if_fail (view, NULL); - - self->pv->command_actions = gtk_action_group_new ("pgp"); - gtk_action_group_set_translation_domain (self->pv->command_actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (self->pv->command_actions, COMMAND_ENTRIES, - G_N_ELEMENTS (COMMAND_ENTRIES), self); - - seahorse_view_register_commands (view, &commands_predicate, base); - seahorse_view_register_ui (view, &actions_predicate, UI_DEFINITION, self->pv->command_actions); - } - - return obj; -} - -static void -seahorse_pgp_commands_init (SeahorsePgpCommands *self) -{ - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PGP_COMMANDS, SeahorsePgpCommandsPrivate); - -} - -static void -seahorse_pgp_commands_dispose (GObject *obj) -{ - SeahorsePgpCommands *self = SEAHORSE_PGP_COMMANDS (obj); - - if (self->pv->command_actions) - g_object_unref (self->pv->command_actions); - self->pv->command_actions = NULL; - - G_OBJECT_CLASS (seahorse_pgp_commands_parent_class)->dispose (obj); -} - -static void -seahorse_pgp_commands_finalize (GObject *obj) -{ - SeahorsePgpCommands *self = SEAHORSE_PGP_COMMANDS (obj); - - g_assert (!self->pv->command_actions); - - G_OBJECT_CLASS (seahorse_pgp_commands_parent_class)->finalize (obj); -} - -static void -seahorse_pgp_commands_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pgp_commands_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pgp_commands_class_init (SeahorsePgpCommandsClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_pgp_commands_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorsePgpCommandsPrivate)); - - gobject_class->constructor = seahorse_pgp_commands_constructor; - gobject_class->dispose = seahorse_pgp_commands_dispose; - gobject_class->finalize = seahorse_pgp_commands_finalize; - gobject_class->set_property = seahorse_pgp_commands_set_property; - gobject_class->get_property = seahorse_pgp_commands_get_property; - - SEAHORSE_COMMANDS_CLASS (klass)->show_properties = seahorse_pgp_commands_show_properties; - SEAHORSE_COMMANDS_CLASS (klass)->delete_objects = seahorse_pgp_commands_delete_objects; - - /* Setup predicate for matching entries for these commands */ - commands_predicate.tag = SEAHORSE_PGP_TYPE; - actions_predicate.tag = SEAHORSE_PGP_TYPE; - actions_predicate.location = SEAHORSE_LOCATION_LOCAL; - - /* Register this class as a commands */ - seahorse_registry_register_type (seahorse_registry_get (), SEAHORSE_TYPE_PGP_COMMANDS, - SEAHORSE_PGP_TYPE_STR, "commands", NULL, NULL); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorsePgpCommands* -seahorse_pgp_commands_new (void) -{ - return g_object_new (SEAHORSE_TYPE_PGP_COMMANDS, NULL); -} diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-commands.h seahorse-3.6.3/pgp/seahorse-pgp-commands.h --- seahorse-3.2.2/pgp/seahorse-pgp-commands.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-commands.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PGP_COMMANDS_H__ -#define __SEAHORSE_PGP_COMMANDS_H__ - -#include -#include - -#include "seahorse-commands.h" -#include "seahorse-object.h" - -#define SEAHORSE_TYPE_PGP_COMMANDS (seahorse_pgp_commands_get_type ()) -#define SEAHORSE_PGP_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_COMMANDS, SeahorsePgpCommands)) -#define SEAHORSE_PGP_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PGP_COMMANDS, SeahorsePgpCommandsClass)) -#define SEAHORSE_IS_PGP_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PGP_COMMANDS)) -#define SEAHORSE_IS_PGP_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PGP_COMMANDS)) -#define SEAHORSE_PGP_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PGP_COMMANDS, SeahorsePgpCommandsClass)) - -typedef struct _SeahorsePgpCommands SeahorsePgpCommands; -typedef struct _SeahorsePgpCommandsClass SeahorsePgpCommandsClass; -typedef struct _SeahorsePgpCommandsPrivate SeahorsePgpCommandsPrivate; - -struct _SeahorsePgpCommands { - SeahorseCommands parent_instance; - SeahorsePgpCommandsPrivate *pv; -}; - -struct _SeahorsePgpCommandsClass { - SeahorseCommandsClass parent_class; -}; - -GType seahorse_pgp_commands_get_type (void); - -SeahorsePgpCommands* seahorse_pgp_commands_new (void); - - -#endif diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-generate.xml seahorse-3.6.3/pgp/seahorse-pgp-generate.xml --- seahorse-3.2.2/pgp/seahorse-pgp-generate.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-generate.xml 2012-11-12 08:32:13.000000000 +0100 @@ -1,18 +1,17 @@ - + - - - gtk-ok - 4 - - 2048 512 8192 + 2048 512 1 + + False + gtk-ok + @@ -20,46 +19,119 @@ - Algorithms here + True + False 5 - New PGP Key False + True dialog - - + + - + True + False + vertical 2 + + + True + False + end + + + gtk-help + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 1 + + + + + C_reate + True + False + True + True + True + False + Generate a new key + False + create-image + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 7 12 True + False 0 - gtk-missing-image - 4 + gcr-key-pair + 48 False + True 0 True + False 12 True + False 0 0 A PGP key allows you to encrypt email or files to other people. @@ -73,6 +145,7 @@ True + False 3 2 12 @@ -82,9 +155,9 @@ 180 True True - ● + ● True - + 1 @@ -99,9 +172,9 @@ 180 True True - ● + ● True - + 1 @@ -114,9 +187,9 @@ 180 True True - ● + ● True - + 1 @@ -129,9 +202,10 @@ True + False 0 0 - Full _Name: + Full _Name: True name-entry @@ -143,6 +217,7 @@ True + False _Email Address: True email-entry @@ -157,6 +232,7 @@ True + False 0 _Comment: True @@ -172,6 +248,7 @@ False + True 1 @@ -182,6 +259,7 @@ True + False 0 0 0 @@ -191,6 +269,7 @@ True + False 3 2 12 @@ -198,6 +277,7 @@ True + False 12 @@ -208,10 +288,11 @@ True True False + False True True True - + False @@ -233,6 +314,7 @@ True + False 0 0 0 @@ -258,15 +340,17 @@ True + False 0 0 0 True - 1 + False 0 - + 1 + @@ -279,6 +363,7 @@ True + False 0 Encryption _Type: True @@ -291,6 +376,7 @@ True + False 0 Key _Strength (bits): True @@ -305,6 +391,7 @@ True + False 0 E_xpiration Date: True @@ -323,6 +410,7 @@ True + False <b>_Advanced key options</b> True True @@ -330,78 +418,23 @@ + True + True 2 False + True 1 - 1 - - - - - True - end - - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - False - True - - - False - False - 1 - - - - - True - False - True - True - True - False - Generate a new key - create-image - C_reate - True - - - False - False - 2 - - - - False - end - 0 + True + 1 diff -Nru seahorse-3.2.2/pgp/seahorse-pgp.h seahorse-3.6.3/pgp/seahorse-pgp.h --- seahorse-3.2.2/pgp/seahorse-pgp.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp.h 2012-08-21 12:23:18.000000000 +0200 @@ -25,11 +25,19 @@ #include #include +#include + G_BEGIN_DECLS -#define SEAHORSE_PGP_TYPE_STR "openpgp" -#define SEAHORSE_PGP_TYPE g_quark_from_string ("openpgp") -#define SEAHORSE_PGP_STOCK_ICON "seahorse-key-personal" +#define SEAHORSE_PGP_NAME "openpgp" +#define SEAHORSE_PGP_TYPE_STR SEAHORSE_PGP_NAME +#define SEAHORSE_PGP g_quark_from_string (SEAHORSE_PGP_NAME) + +#ifdef WITH_PGP + +void seahorse_pgp_backend_initialize (void); + +#endif G_END_DECLS diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-key.c seahorse-3.6.3/pgp/seahorse-pgp-key.c --- seahorse-3.2.2/pgp/seahorse-pgp-key.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-key.c 2012-11-09 11:08:13.000000000 +0100 @@ -20,19 +20,22 @@ */ #include "config.h" -#include - -#include +#include "seahorse-pgp.h" +#include "seahorse-pgp-dialogs.h" +#include "seahorse-pgp-key.h" +#include "seahorse-pgp-uid.h" +#include "seahorse-pgp-subkey.h" -#include "seahorse-gtkstock.h" +#include "seahorse-icons.h" #include "seahorse-object-list.h" -#include "seahorse-source.h" #include "seahorse-util.h" +#include "seahorse-viewable.h" + +#include -#include "pgp/seahorse-pgp.h" -#include "pgp/seahorse-pgp-key.h" -#include "pgp/seahorse-pgp-uid.h" -#include "pgp/seahorse-pgp-subkey.h" +#include + +#include enum { PROP_0, @@ -41,23 +44,58 @@ PROP_UIDS, PROP_FINGERPRINT, PROP_VALIDITY, - PROP_VALIDITY_STR, PROP_TRUST, - PROP_TRUST_STR, PROP_EXPIRES, - PROP_EXPIRES_STR, PROP_LENGTH, - PROP_ALGO + PROP_ALGO, + PROP_DESCRIPTION }; -G_DEFINE_TYPE (SeahorsePgpKey, seahorse_pgp_key, SEAHORSE_TYPE_OBJECT); +static void seahorse_pgp_key_viewable_iface (SeahorseViewableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorsePgpKey, seahorse_pgp_key, SEAHORSE_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEWABLE, seahorse_pgp_key_viewable_iface); +); struct _SeahorsePgpKeyPrivate { + gchar *keyid; GList *uids; /* All the UID objects */ GList *subkeys; /* All the Subkey objects */ GList *photos; /* List of photos */ }; +/* + * PGP key ids can be of varying lengths. Shorter keyids are the last + * characters of the longer ones. When hashing match on the last 8 + * characters. + */ + +guint +seahorse_pgp_keyid_hash (gconstpointer v) +{ + const gchar *keyid = v; + gsize len = strlen (keyid); + if (len > 8) + keyid += len - 8; + return g_str_hash (keyid); +} + +gboolean +seahorse_pgp_keyid_equal (gconstpointer v1, + gconstpointer v2) +{ + const gchar *keyid_1 = v1; + const gchar *keyid_2 = v2; + gsize len_1 = strlen (keyid_1); + gsize len_2 = strlen (keyid_2); + + if (len_1 != len_2 && len_1 >= 8 && len_2 >= 8) { + keyid_1 += len_1 - 8; + keyid_2 += len_2 - 8; + } + return g_str_equal (keyid_1, keyid_2); +} + /* ----------------------------------------------------------------------------- * INTERNAL HELPERS */ @@ -78,13 +116,84 @@ seahorse_pgp_uid_get_comment (uids->data)) : g_strdup (""); } -static gchar* -calc_markup (SeahorsePgpKey *self, guint flags) +static gchar * +calc_markup (SeahorsePgpKey *self) { - GList *uids = seahorse_pgp_key_get_uids (self); - return uids ? seahorse_pgp_uid_calc_markup (seahorse_pgp_uid_get_name (uids->data), - seahorse_pgp_uid_get_email (uids->data), - seahorse_pgp_uid_get_comment (uids->data), flags) : g_strdup (""); + guint flags = seahorse_object_get_flags (SEAHORSE_OBJECT (self)); + GList *uids; + GString *result; + gchar *text; + const gchar *name; + const gchar *email; + const gchar *comment; + const gchar *primary = NULL; + + uids = seahorse_pgp_key_get_uids (self); + + result = g_string_new ("'); + + /* The first name is the key name */ + if (uids != NULL) { + name = seahorse_pgp_uid_get_name (uids->data); + text = g_markup_escape_text (name, -1); + g_string_append (result, text); + g_free (text); + primary = name; + } + + g_string_append (result, ""); + if (uids != NULL) { + email = seahorse_pgp_uid_get_email (uids->data); + if (email && !email[0]) + email = NULL; + comment = seahorse_pgp_uid_get_comment (uids->data); + if (comment && !comment[0]) + comment = NULL; + text = g_markup_printf_escaped ("\n%s%s%s%s%s", + email ? email : "", + email ? " " : "", + comment ? "'" : "", + comment ? comment : "", + comment ? "'" : ""); + g_string_append (result, text); + g_free (text); + uids = uids->next; + } + + while (uids != NULL) { + name = seahorse_pgp_uid_get_name (uids->data); + if (name && !name[0]) + name = NULL; + if (g_strcmp0 (name, primary) == 0) + name = NULL; + email = seahorse_pgp_uid_get_email (uids->data); + if (email && !email[0]) + email = NULL; + comment = seahorse_pgp_uid_get_comment (uids->data); + if (comment && !comment[0]) + comment = NULL; + text = g_markup_printf_escaped ("\n%s%s%s%s%s%s%s", + name ? name : "", + name ? ": " : "", + email ? email : "", + email ? " " : "", + comment ? "'" : "", + comment ? comment : "", + comment ? "'" : ""); + g_string_append (result, text); + g_free (text); + uids = uids->next; + } + + g_string_append (result, ""); + + return g_string_free (result, FALSE); } /* ----------------------------------------------------------------------------- @@ -101,28 +210,11 @@ static void _seahorse_pgp_key_set_uids (SeahorsePgpKey *self, GList *uids) { - guint index; - GQuark id; - GList *l; - g_return_if_fail (SEAHORSE_IS_PGP_KEY (self)); - id = seahorse_object_get_id (SEAHORSE_OBJECT (self)); - - /* Remove the parent on each old one */ - for (l = self->pv->uids; l; l = g_list_next (l)) - seahorse_object_set_parent (l->data, NULL); - seahorse_object_list_free (self->pv->uids); self->pv->uids = seahorse_object_list_copy (uids); - - /* Set parent and source on each new one, except the first */ - for (l = self->pv->uids, index = 0; l; l = g_list_next (l), ++index) { - g_object_set (l->data, "id", seahorse_pgp_uid_calc_id (id, index), NULL); - if (l != self->pv->uids) - seahorse_object_set_parent (l->data, SEAHORSE_OBJECT (self)); - } - + g_object_notify (G_OBJECT (self), "uids"); } @@ -136,17 +228,30 @@ static void _seahorse_pgp_key_set_subkeys (SeahorsePgpKey *self, GList *subkeys) { - GQuark id; - + const gchar *keyid = NULL; + g_return_if_fail (SEAHORSE_IS_PGP_KEY (self)); g_return_if_fail (subkeys); - + + keyid = seahorse_pgp_subkey_get_keyid (subkeys->data); + g_return_if_fail (keyid); + + /* The keyid can't change */ + if (self->pv->keyid) { + if (g_strcmp0 (self->pv->keyid, keyid) != 0) { + g_warning ("The keyid of a SeahorsePgpKey changed by " + "setting a different subkey on it: %s != %s", + self->pv->keyid, keyid); + return; + } + + } else { + self->pv->keyid = g_strdup (keyid); + } + seahorse_object_list_free (self->pv->subkeys); self->pv->subkeys = seahorse_object_list_copy (subkeys); - - id = seahorse_pgp_key_canonize_id (seahorse_pgp_subkey_get_keyid (subkeys->data)); - g_object_set (self, "id", id, NULL); - + g_object_notify (G_OBJECT (self), "subkeys"); } @@ -172,10 +277,11 @@ seahorse_pgp_key_realize (SeahorsePgpKey *self) { const gchar *nickname, *keyid; - const gchar *icon; + const gchar *icon_name; gchar *markup, *name, *identifier; SeahorseUsage usage; GList *subkeys; + GIcon *icon; subkeys = seahorse_pgp_key_get_subkeys (self); if (subkeys) { @@ -186,20 +292,21 @@ } name = calc_name (self); - markup = calc_markup (self, seahorse_object_get_flags (SEAHORSE_OBJECT (self))); + markup = calc_markup (self); nickname = calc_short_name (self); g_object_get (self, "usage", &usage, NULL); /* The type */ if (usage == SEAHORSE_USAGE_PRIVATE_KEY) { - icon = SEAHORSE_STOCK_SECRET; + icon_name = GCR_ICON_KEY_PAIR; } else { - icon = SEAHORSE_STOCK_KEY; + icon_name = GCR_ICON_KEY; if (usage == SEAHORSE_USAGE_NONE) g_object_set (self, "usage", SEAHORSE_USAGE_PUBLIC_KEY, NULL); } + icon = g_themed_icon_new (icon_name); g_object_set (self, "label", name, "markup", markup, @@ -207,7 +314,8 @@ "identifier", identifier, "icon", icon, NULL); - + + g_object_unref (icon); g_free (identifier); g_free (markup); g_free (name); @@ -224,7 +332,8 @@ GValue *value, GParamSpec *pspec) { SeahorsePgpKey *self = SEAHORSE_PGP_KEY (object); - + SeahorseUsage usage; + switch (prop_id) { case PROP_PHOTOS: g_value_set_boxed (value, seahorse_pgp_key_get_photos (self)); @@ -238,18 +347,16 @@ case PROP_FINGERPRINT: g_value_set_string (value, seahorse_pgp_key_get_fingerprint (self)); break; - case PROP_VALIDITY_STR: - g_value_set_string (value, seahorse_pgp_key_get_validity_str (self)); - break; - case PROP_TRUST_STR: - g_value_set_string (value, seahorse_pgp_key_get_trust_str (self)); + case PROP_DESCRIPTION: + g_object_get (self, "usage", &usage, NULL); + if (usage == SEAHORSE_USAGE_PRIVATE_KEY) + g_value_set_string (value, _("Personal PGP key")); + else + g_value_set_string (value, _("PGP key")); break; case PROP_EXPIRES: g_value_set_ulong (value, seahorse_pgp_key_get_expires (self)); break; - case PROP_EXPIRES_STR: - g_value_take_string (value, seahorse_pgp_key_get_expires_str (self)); - break; case PROP_LENGTH: g_value_set_uint (value, seahorse_pgp_key_get_length (self)); break; @@ -289,12 +396,6 @@ { SeahorsePgpKey *self = SEAHORSE_PGP_KEY (obj); - GList *l; - - /* Free all the attached UIDs */ - for (l = self->pv->uids; l; l = g_list_next (l)) - seahorse_object_set_parent (l->data, NULL); - seahorse_object_list_free (self->pv->uids); self->pv->uids = NULL; @@ -314,6 +415,7 @@ { SeahorsePgpKey *self = SEAHORSE_PGP_KEY (obj); + g_free (self->pv->keyid); g_assert (self->pv->uids == NULL); g_assert (self->pv->photos == NULL); g_assert (self->pv->subkeys == NULL); @@ -326,7 +428,6 @@ { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - seahorse_pgp_key_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (SeahorsePgpKeyPrivate)); gobject_class->dispose = seahorse_pgp_key_object_dispose; @@ -357,30 +458,22 @@ g_param_spec_string ("fingerprint", "Fingerprint", "Unique fingerprint for this key", "", G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_DESCRIPTION, + g_param_spec_string ("description", "Description", "Description for key", + "", G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_VALIDITY, g_param_spec_uint ("validity", "Validity", "Validity of this key", 0, G_MAXUINT, 0, G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, PROP_VALIDITY_STR, - g_param_spec_string ("validity-str", "Validity String", "Validity of this key as a string", - "", G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, PROP_TRUST, g_param_spec_uint ("trust", "Trust", "Trust in this key", 0, G_MAXUINT, 0, G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, PROP_TRUST_STR, - g_param_spec_string ("trust-str", "Trust String", "Trust in this key as a string", - "", G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, PROP_EXPIRES, g_param_spec_ulong ("expires", "Expires On", "Date this key expires on", 0, G_MAXULONG, 0, G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, PROP_EXPIRES_STR, - g_param_spec_string ("expires-str", "Expires String", "Readable expiry date", - "", G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, PROP_LENGTH, g_param_spec_uint ("length", "Length", "The length of this key.", 0, G_MAXUINT, 0, G_PARAM_READABLE)); @@ -390,56 +483,17 @@ "", G_PARAM_READABLE)); } - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -GQuark -seahorse_pgp_key_canonize_id (const gchar *keyid) +static void +seahorse_pgp_key_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent) { - gchar *str; - GQuark id; - - str = seahorse_pgp_key_calc_id (keyid, 0); - g_return_val_if_fail (str, 0); - - id = g_quark_from_string (str); - g_free (str); - - return id; + seahorse_pgp_key_properties_show (SEAHORSE_PGP_KEY (viewable), parent); } -gchar* -seahorse_pgp_key_calc_id (const gchar *keyid, guint index) -{ - guint len; - - g_return_val_if_fail (keyid, 0); - len = strlen (keyid); - - if (len < 16) - g_message ("invalid keyid (less than 16 chars): %s", keyid); - - if (len > 16) - keyid += len - 16; - - if (index == 0) - return g_strdup_printf ("%s:%s", SEAHORSE_PGP_STR, keyid); - else - return g_strdup_printf ("%s:%s:%u", SEAHORSE_PGP_STR, keyid, index); -} - -const gchar* -seahorse_pgp_key_calc_rawid (GQuark id) +static void +seahorse_pgp_key_viewable_iface (SeahorseViewableIface *iface) { - const gchar* keyid, *strid; - - strid = g_quark_to_string (id); - g_return_val_if_fail (strid != NULL, NULL); - - keyid = strchr (strid, ':'); - return keyid ? keyid + 1 : strid; + iface->show_viewer = seahorse_pgp_key_show_viewer; } gchar* @@ -535,12 +589,6 @@ return validity; } -const gchar* -seahorse_pgp_key_get_validity_str (SeahorsePgpKey *self) -{ - return seahorse_validity_get_string (seahorse_pgp_key_get_validity (self)); -} - gulong seahorse_pgp_key_get_expires (SeahorsePgpKey *self) { @@ -555,25 +603,6 @@ return seahorse_pgp_subkey_get_expires (subkeys->data); } -gchar* -seahorse_pgp_key_get_expires_str (SeahorsePgpKey *self) -{ - GTimeVal timeval; - gulong expires; - - g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (self), NULL); - - expires = seahorse_pgp_key_get_expires (self); - if (expires == 0) - return g_strdup (""); - - g_get_current_time (&timeval); - if (timeval.tv_sec > expires) - return g_strdup (_("Expired")); - - return seahorse_util_get_date_string (expires); -} - SeahorseValidity seahorse_pgp_key_get_trust (SeahorsePgpKey *self) { @@ -582,12 +611,6 @@ return trust; } -const gchar* -seahorse_pgp_key_get_trust_str (SeahorsePgpKey *self) -{ - return seahorse_validity_get_string (seahorse_pgp_key_get_trust (self)); -} - guint seahorse_pgp_key_get_length (SeahorsePgpKey *self) { diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-key.h seahorse-3.6.3/pgp/seahorse-pgp-key.h --- seahorse-3.2.2/pgp/seahorse-pgp-key.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-key.h 2012-08-21 12:23:18.000000000 +0200 @@ -24,8 +24,6 @@ #include -#include "pgp/seahorse-pgp-module.h" - #include "seahorse-object.h" #include "seahorse-validity.h" @@ -53,7 +51,7 @@ struct _SeahorsePgpKeyClass { SeahorseObjectClass parent_class; - + /* virtual methods */ GList* (*get_uids) (SeahorsePgpKey *self); void (*set_uids) (SeahorsePgpKey *self, GList *uids); @@ -67,7 +65,7 @@ GType seahorse_pgp_key_get_type (void); -SeahorsePgpKey* seahorse_pgp_key_new (void); +SeahorsePgpKey * seahorse_pgp_key_new (void); void seahorse_pgp_key_realize (SeahorsePgpKey *self); @@ -90,16 +88,10 @@ SeahorseValidity seahorse_pgp_key_get_validity (SeahorsePgpKey *self); -const gchar* seahorse_pgp_key_get_validity_str (SeahorsePgpKey *self); - gulong seahorse_pgp_key_get_expires (SeahorsePgpKey *self); -gchar* seahorse_pgp_key_get_expires_str (SeahorsePgpKey *self); - SeahorseValidity seahorse_pgp_key_get_trust (SeahorsePgpKey *self); -const gchar* seahorse_pgp_key_get_trust_str (SeahorsePgpKey *self); - guint seahorse_pgp_key_get_length (SeahorsePgpKey *self); const gchar* seahorse_pgp_key_get_algo (SeahorsePgpKey *self); @@ -111,11 +103,9 @@ gchar* seahorse_pgp_key_calc_identifier (const gchar *keyid); -gchar* seahorse_pgp_key_calc_id (const gchar *keyid, - guint index); - -const gchar* seahorse_pgp_key_calc_rawid (GQuark id); +guint seahorse_pgp_keyid_hash (gconstpointer v); -GQuark seahorse_pgp_key_canonize_id (const gchar *keyid); +gboolean seahorse_pgp_keyid_equal (gconstpointer v1, + gconstpointer v2); #endif /* __SEAHORSE_KEY_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-key-properties.c seahorse-3.6.3/pgp/seahorse-pgp-key-properties.c --- seahorse-3.2.2/pgp/seahorse-pgp-key-properties.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-key-properties.c 2012-11-12 08:32:13.000000000 +0100 @@ -31,15 +31,20 @@ #include #include "seahorse-bind.h" -#include "seahorse-gtkstock.h" +#include "seahorse-delete-dialog.h" +#include "seahorse-exportable.h" +#include "seahorse-exporter.h" +#include "seahorse-icons.h" #include "seahorse-object.h" #include "seahorse-object-model.h" #include "seahorse-object-widget.h" #include "seahorse-util.h" #include "seahorse-gpgme-dialogs.h" +#include "seahorse-gpgme-exporter.h" #include "seahorse-gpgme-key.h" #include "seahorse-gpgme-key-op.h" +#include "seahorse-pgp-backend.h" #include "seahorse-gpg-op.h" #include "seahorse-pgp-dialogs.h" #include "seahorse-pgp-key.h" @@ -152,14 +157,16 @@ } static void -set_gtkbuilder_image (SeahorseWidget *swidget, const gchar *name, const gchar *stock) +set_gtkbuilder_image (SeahorseWidget *swidget, + const gchar *name, + const gchar *icon_name) { GtkWidget *widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, name)); if (!widget) return; - gtk_image_set_from_stock (GTK_IMAGE (widget), stock, GTK_ICON_SIZE_DIALOG); + gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG); } static void @@ -234,7 +241,7 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object = NULL; + GObject *object = NULL; GtkTreeModel *model; GtkTreeIter iter; @@ -244,7 +251,7 @@ model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)); g_return_if_fail (gtk_tree_model_get_iter (model, &iter, path)); - + object = seahorse_object_model_get_row_key (SEAHORSE_OBJECT_MODEL (model), &iter); if (object != NULL && SEAHORSE_IS_PGP_KEY (object)) { seahorse_pgp_key_properties_show (SEAHORSE_PGP_KEY (object), @@ -252,19 +259,18 @@ } } -static GList* -unique_slist_strings (GList *keyids) +static void +unique_strings (GPtrArray *keyids) { - GList *l; - - keyids = g_list_sort (keyids, (GCompareFunc)g_ascii_strcasecmp); - for (l = keyids; l; l = g_list_next (l)) { - while (l->next && l->data && l->next->data && - g_ascii_strcasecmp (l->data, l->next->data) == 0) - keyids = g_list_delete_link (keyids, l->next); - } - - return keyids; + gint i; + + g_ptr_array_sort (keyids, (GCompareFunc)g_ascii_strcasecmp); + for (i = 0; i + 1 < keyids->len; ) { + if (g_ascii_strcasecmp (keyids->pdata[i], keyids->pdata[i + 1]) == 0) + g_ptr_array_remove_index (keyids, i); + else + i++; + } } /* ----------------------------------------------------------------------------- @@ -279,9 +285,9 @@ UIDSIG_N_COLUMNS }; -const GType uidsig_columns[] = { +static GType uidsig_columns[] = { G_TYPE_OBJECT, /* index */ - G_TYPE_STRING, /* icon */ + 0 /* later */, /* icon */ G_TYPE_STRING, /* name */ G_TYPE_STRING /* keyid */ }; @@ -297,7 +303,7 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *obj = SEAHORSE_OBJECT_WIDGET (swidget)->object; + GObject *obj = SEAHORSE_OBJECT_WIDGET (swidget)->object; g_return_if_fail (SEAHORSE_IS_GPGME_KEY (obj)); seahorse_gpgme_add_uid_new (SEAHORSE_GPGME_KEY (obj), GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name))); @@ -337,7 +343,7 @@ g_return_if_fail (SEAHORSE_IS_GPGME_UID (uid)); message = g_strdup_printf (_("Are you sure you want to permanently delete the '%s' user ID?"), seahorse_object_get_label (SEAHORSE_OBJECT (uid))); - ret = seahorse_util_prompt_delete (message, seahorse_widget_get_toplevel (swidget)); + ret = seahorse_delete_dialog_prompt (GTK_WINDOW (seahorse_widget_get_toplevel (swidget)), message); g_free (message); if (ret == FALSE) @@ -408,43 +414,35 @@ names_update_row (SeahorseObjectModel *skmodel, SeahorseObject *object, GtkTreeIter *iter, SeahorseWidget *swidget) { - SeahorseObject *preferred; - const gchar *icon; + GIcon *icon; const gchar *name, *id; - - /* Always use the most preferred key for this keyid */ - preferred = seahorse_object_get_preferred (object); - if (preferred) { - while (SEAHORSE_IS_OBJECT (preferred)) { - object = SEAHORSE_OBJECT (preferred); - preferred = seahorse_object_get_preferred (preferred); - } - seahorse_object_model_set_row_object (skmodel, iter, object); - } - icon = seahorse_object_get_location (object) < SEAHORSE_LOCATION_LOCAL ? - GTK_STOCK_DIALOG_QUESTION : SEAHORSE_STOCK_SIGN; + icon = g_themed_icon_new (SEAHORSE_IS_PGP_KEY (object) ? + SEAHORSE_ICON_SIGN : GTK_STOCK_DIALOG_QUESTION); name = seahorse_object_get_markup (object); id = seahorse_object_get_identifier (object); - + + /* TRANSLATORS: [Unknown] signature name */ gtk_tree_store_set (GTK_TREE_STORE (skmodel), iter, UIDSIG_OBJECT, NULL, UIDSIG_ICON, icon, UIDSIG_NAME, name ? name : _("[Unknown]"), UIDSIG_KEYID, id, -1); + g_object_unref (icon); } static void names_populate (SeahorseWidget *swidget, GtkTreeStore *store, SeahorsePgpKey *pkey) { - SeahorseObject *object; + GObject *object; GtkTreeIter uiditer, sigiter; - GList *rawids = NULL; + GPtrArray *keyids; SeahorsePgpUid *uid; GList *keys, *l; GList *uids, *u; GList *sigs, *s; GCancellable *cancellable; + GIcon *icon; /* Insert all the fun-ness */ uids = seahorse_pgp_key_get_uids (pkey); @@ -452,38 +450,41 @@ for (u = uids; u; u = g_list_next (u)) { uid = SEAHORSE_PGP_UID (u->data); - + icon = g_themed_icon_new (SEAHORSE_ICON_PERSON); gtk_tree_store_append (store, &uiditer, NULL); gtk_tree_store_set (store, &uiditer, UIDSIG_OBJECT, uid, - UIDSIG_ICON, SEAHORSE_STOCK_PERSON, + UIDSIG_ICON, icon, UIDSIG_NAME, seahorse_object_get_markup (SEAHORSE_OBJECT (uid)), -1); - - + g_object_unref (icon); + + keyids = g_ptr_array_new (); + /* Build a list of all the keyids */ sigs = seahorse_pgp_uid_get_signatures (uid); for (s = sigs; s; s = g_list_next (s)) { /* Never show self signatures, they're implied */ if (seahorse_pgp_key_has_keyid (pkey, seahorse_pgp_signature_get_keyid (s->data))) continue; - rawids = g_list_prepend (rawids, (gpointer)seahorse_pgp_signature_get_keyid (s->data)); + g_ptr_array_add (keyids, (gpointer)seahorse_pgp_signature_get_keyid (s->data)); } + g_ptr_array_add (keyids, NULL); + /* * Pass it to 'DiscoverKeys' for resolution/download, cancellable * ties search scope together */ cancellable = g_cancellable_new (); - keys = seahorse_context_discover_objects (seahorse_context_instance (), - SEAHORSE_PGP, rawids, cancellable); + keys = seahorse_pgp_backend_discover_keys (NULL, (const gchar **)keyids->pdata, cancellable); g_object_unref (cancellable); - g_list_free (rawids); - rawids = NULL; - + g_ptr_array_free (keyids, TRUE); + keyids = NULL; + /* Add the keys to the store */ for (l = keys; l; l = g_list_next (l)) { - object = SEAHORSE_OBJECT (l->data); + object = G_OBJECT (l->data); gtk_tree_store_append (store, &sigiter, &uiditer); /* This calls the 'update-row' callback, to set the values for the key */ @@ -500,8 +501,8 @@ GtkWidget *widget; GtkTreeStore *store; GtkCellRenderer *renderer; - - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); pkey = SEAHORSE_PGP_KEY (object); if (seahorse_object_get_usage (object) != SEAHORSE_USAGE_PRIVATE_KEY) @@ -516,9 +517,11 @@ gtk_tree_store_clear (store); } else { - + g_assert (UIDSIG_N_COLUMNS == G_N_ELEMENTS (uidsig_columns)); + uidsig_columns[UIDSIG_ICON] = G_TYPE_ICON; + /* This is our first time so create a store */ - store = GTK_TREE_STORE (seahorse_object_model_new (UIDSIG_N_COLUMNS, (GType*)uidsig_columns)); + store = GTK_TREE_STORE (seahorse_object_model_new (UIDSIG_N_COLUMNS, uidsig_columns)); g_signal_connect (store, "update-row", G_CALLBACK (names_update_row), swidget); /* Icon column */ @@ -526,16 +529,20 @@ g_object_set (renderer, "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), -1, "", renderer, - "stock-id", UIDSIG_ICON, NULL); + "gicon", UIDSIG_ICON, NULL); - /* The name column */ + /* TRANSLATORS: The name and email set on the PGP key */ + renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, "yalign", 0.0, "xalign", 0.0, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), - -1, _("Name/Email"), gtk_cell_renderer_text_new (), + -1, _("Name/Email"), renderer, "markup", UIDSIG_NAME, NULL); /* The signature ID column */ + renderer = gtk_cell_renderer_text_new (); + g_object_set (renderer, "yalign", 0.0, "xalign", 0.0, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), - -1, _("Signature ID"), gtk_cell_renderer_text_new (), + -1, _("Signature ID"), renderer, "text", UIDSIG_KEYID, NULL); } @@ -553,9 +560,9 @@ SeahorseObject *object; GtkTreeSelection *selection; GtkWidget *widget; - - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; - + + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); + if (seahorse_object_get_usage (object) != SEAHORSE_USAGE_PRIVATE_KEY) return; widget = seahorse_widget_get_widget (swidget, "names-tree"); @@ -722,9 +729,9 @@ if (pixbuf) gtk_image_set_from_pixbuf (GTK_IMAGE (photo_image), pixbuf); else if (etype == SEAHORSE_USAGE_PRIVATE_KEY) - gtk_image_set_from_stock (GTK_IMAGE (photo_image), SEAHORSE_STOCK_SECRET, (GtkIconSize)-1); + gtk_image_set_from_icon_name (GTK_IMAGE (photo_image), SEAHORSE_ICON_SECRET, GTK_ICON_SIZE_DIALOG); else - gtk_image_set_from_stock (GTK_IMAGE (photo_image), SEAHORSE_STOCK_KEY, (GtkIconSize)-1); + gtk_image_set_from_icon_name (GTK_IMAGE (photo_image), SEAHORSE_ICON_KEY, GTK_ICON_SIZE_DIALOG); } static void @@ -825,9 +832,9 @@ UID_N_COLUMNS }; -const GType uid_columns[] = { +static GType uid_columns[] = { G_TYPE_OBJECT, /* object */ - G_TYPE_STRING, /* icon */ + 0 /* later */, /* icon */ G_TYPE_STRING, /* name */ G_TYPE_STRING, /* email */ G_TYPE_STRING /* comment */ @@ -838,7 +845,7 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + SeahorseObject *object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); if (seahorse_object_get_usage (object) == SEAHORSE_USAGE_PRIVATE_KEY && SEAHORSE_IS_GPGME_KEY (object)) seahorse_gpgme_key_op_change_pass (SEAHORSE_GPGME_KEY (object)); @@ -850,8 +857,8 @@ SeahorseObject *object; SeahorseUsage etype; GtkWidget *frame; - - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); etype = seahorse_object_get_usage (object); if (etype == SEAHORSE_USAGE_PRIVATE_KEY ) { @@ -882,8 +889,9 @@ const gchar *markup; const gchar *label; GList *uids, *l; + GIcon *icon; - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); pkey = SEAHORSE_PGP_KEY (object); flags = seahorse_object_get_flags (object); @@ -897,9 +905,10 @@ if (flags & SEAHORSE_FLAG_EXPIRED) { widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "expired-message")); if (widget) { - + expires_date = seahorse_pgp_key_get_expires (pkey); - if (expires_date == 0) + if (expires_date == 0) + /* TRANSLATORS: (unknown) expiry date */ t = g_strdup (_("(unknown)")); else t = seahorse_util_get_display_date_string (expires_date); @@ -952,7 +961,9 @@ gtk_list_store_clear (GTK_LIST_STORE (store)); } else { - + g_assert (UID_N_COLUMNS != G_N_ELEMENTS (uid_columns)); + uid_columns[1] = G_TYPE_ICON; + /* This is our first time so create a store */ store = gtk_list_store_newv (UID_N_COLUMNS, (GType*)uid_columns); @@ -961,7 +972,7 @@ g_object_set (renderer, "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), -1, "", renderer, - "stock-id", UID_ICON, NULL); + "gicon", UID_ICON, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), -1, _("Name"), gtk_cell_renderer_text_new (), @@ -971,11 +982,13 @@ for (l = uids; l; l = g_list_next (l)) { markup = seahorse_object_get_markup (l->data); + icon = g_themed_icon_new (SEAHORSE_ICON_PERSON); gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, UID_OBJECT, l->data, - UID_ICON, SEAHORSE_STOCK_PERSON, + UID_ICON, icon, UID_MARKUP, markup, -1); + g_object_unref (icon); } gtk_tree_view_set_model (GTK_TREE_VIEW (widget), GTK_TREE_MODEL(store)); @@ -1048,7 +1061,7 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + GObject *object = SEAHORSE_OBJECT_WIDGET (swidget)->object; g_return_if_fail (SEAHORSE_IS_GPGME_KEY (object)); seahorse_gpgme_add_subkey_new (SEAHORSE_GPGME_KEY (object), GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name))); } @@ -1076,7 +1089,7 @@ index = seahorse_pgp_subkey_get_index (subkey); label = seahorse_object_get_label (SEAHORSE_OBJECT (pkey)); message = g_strdup_printf (_("Are you sure you want to permanently delete subkey %d of %s?"), index, label); - ret = seahorse_util_prompt_delete (message, seahorse_widget_get_toplevel (swidget)); + ret = seahorse_delete_dialog_prompt (GTK_WINDOW (seahorse_widget_get_toplevel (swidget)), message); g_free (message); if (ret == FALSE) @@ -1114,8 +1127,8 @@ set = gtk_combo_box_get_active_iter (selection, &iter); if (!set) return; - - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); g_return_if_fail (SEAHORSE_IS_GPGME_KEY (object)); model = gtk_combo_box_get_model (selection); @@ -1129,21 +1142,17 @@ } static void -export_complete (GFile *file, GAsyncResult *result, gchar *contents) +on_export_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) { - GError *err = NULL; - gchar *uri, *unesc_uri; - - g_free (contents); + GtkWindow *parent = GTK_WINDOW (user_data); + GError *error = NULL; - if (!g_file_replace_contents_finish (file, result, NULL, &err)) { - uri = g_file_get_uri (file); - unesc_uri = g_uri_unescape_string (seahorse_util_uri_get_last (uri), NULL); - seahorse_util_handle_error (&err, NULL, _("Couldn't export key to \"%s\""), - unesc_uri); - g_free (uri); - g_free (unesc_uri); - } + if (!seahorse_exporter_export_to_file_finish (SEAHORSE_EXPORTER (source), result, &error)) + seahorse_util_handle_error (&error, parent, _("Couldn't export key")); + + g_object_unref (parent); } G_MODULE_EXPORT void @@ -1151,53 +1160,25 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object; - GtkDialog *dialog; - gchar* uri = NULL; - GError *err = NULL; + SeahorseExporter *exporter; + GList *exporters = NULL; + GtkWindow *window; + GObject *object; GFile *file; - gpgme_error_t gerr; - gpgme_ctx_t ctx; - gpgme_data_t data; - gchar *results; - gsize n_results; - gpgme_key_t seckey; - + object = SEAHORSE_OBJECT_WIDGET (swidget)->object; - g_return_if_fail (SEAHORSE_IS_GPGME_KEY (object)); - seckey = seahorse_gpgme_key_get_private (SEAHORSE_GPGME_KEY (object)); - g_return_if_fail (seckey && seckey->subkeys && seckey->subkeys->keyid); + exporters = g_list_append (exporters, seahorse_gpgme_exporter_new (object, TRUE, TRUE)); - dialog = seahorse_util_chooser_save_new (_("Export Complete Key"), - GTK_WINDOW (seahorse_widget_get_toplevel (swidget))); - seahorse_util_chooser_show_key_files (dialog); - seahorse_util_chooser_set_filename (dialog, object); - - uri = seahorse_util_chooser_save_prompt (dialog); - if (!uri) - return; - - /* Export to a data block */ - gerr = gpgme_data_new (&data); - g_return_if_fail (GPG_IS_OK (gerr)); - ctx = seahorse_gpgme_source_new_context (); - g_return_if_fail (ctx); - gerr = seahorse_gpg_op_export_secret (ctx, seckey->subkeys->keyid, data); - gpgme_release (ctx); - results = gpgme_data_release_and_get_mem (data, &n_results); - - if (GPG_IS_OK (gerr)) { - file = g_file_new_for_uri (uri); - g_file_replace_contents_async (file, results, n_results, NULL, FALSE, - G_FILE_CREATE_PRIVATE, NULL, - (GAsyncReadyCallback)export_complete, results); - } else { - seahorse_gpgme_propagate_error (gerr, &err); - seahorse_util_handle_error (&err, NULL, _("Couldn't export key.")); + window = GTK_WINDOW (seahorse_widget_get_toplevel (swidget)); + if (seahorse_exportable_prompt (exporters, window, NULL, &file, &exporter)) { + seahorse_exporter_export_to_file_async (exporter, file, TRUE, NULL, + on_export_complete, g_object_ref (window)); + g_object_unref (file); + g_object_unref (exporter); } - - g_free (uri); + + g_list_free_full (exporters, g_object_unref); } G_MODULE_EXPORT void @@ -1252,7 +1233,7 @@ seahorse_debug ("KeyProperties: Setting up Trust Combo Box Store"); - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); etype = seahorse_object_get_usage (object); widget = GTK_WIDGET (seahorse_widget_get_widget (swidget, "details-trust-combobox")); @@ -1311,8 +1292,8 @@ SeahorseObject *object; SeahorseUsage etype; GtkWidget *widget; - - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); etype = seahorse_object_get_usage (object); /* @@ -1352,17 +1333,14 @@ const gchar *label; gint trust; GList *subkeys, *l; - guint keyloc; gboolean valid; - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); pkey = SEAHORSE_PGP_KEY (object); subkeys = seahorse_pgp_key_get_subkeys (pkey); g_return_if_fail (subkeys && subkeys->data); subkey = SEAHORSE_PGP_SUBKEY (subkeys->data); - - keyloc = seahorse_object_get_location (object); widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "details-id-label")); if (widget) { @@ -1401,7 +1379,7 @@ widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "details-expires-label")); if (widget) { gulong expires = seahorse_pgp_subkey_get_expires (subkey); - if (seahorse_object_get_location (object) == SEAHORSE_LOCATION_REMOTE) + if (!SEAHORSE_IS_GPGME_KEY (object)) fp_label = NULL; else if (expires == 0) fp_label = g_strdup (C_("Expires", "Never")); @@ -1411,7 +1389,7 @@ g_free (fp_label); } - show_gtkbuilder_widget (swidget, "details-trust-combobox", keyloc == SEAHORSE_LOCATION_LOCAL); + show_gtkbuilder_widget (swidget, "details-trust-combobox", SEAHORSE_IS_GPGME_KEY (object)); widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "details-trust-combobox")); if (widget) { @@ -1527,8 +1505,8 @@ SIGN_N_COLUMNS }; -const GType sign_columns[] = { - G_TYPE_STRING, +static GType sign_columns[] = { + 0 /* later */, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN @@ -1551,10 +1529,10 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object; + GObject *object; guint trust; gpgme_error_t err; - + object = SEAHORSE_OBJECT_WIDGET (swidget)->object; g_return_if_fail (SEAHORSE_IS_GPGME_KEY (object)); @@ -1573,49 +1551,39 @@ trust_update_row (SeahorseObjectModel *skmodel, SeahorseObject *object, GtkTreeIter *iter, SeahorseWidget *swidget) { - SeahorseObject *preferred; gboolean trusted = FALSE; - const gchar *icon; + GIcon *icon; const gchar *name, *id; - - /* Always use the most preferred key for this keyid */ - preferred = seahorse_object_get_preferred (object); - if (SEAHORSE_IS_OBJECT (preferred)) { - while (SEAHORSE_IS_OBJECT (preferred)) { - object = SEAHORSE_OBJECT (preferred); - preferred = seahorse_object_get_preferred (preferred); - } - seahorse_object_model_set_row_object (skmodel, iter, object); - } - if (seahorse_object_get_usage (object) == SEAHORSE_USAGE_PRIVATE_KEY) trusted = TRUE; else if (seahorse_object_get_flags (object) & SEAHORSE_FLAG_TRUSTED) trusted = TRUE; - - icon = seahorse_object_get_location (object) < SEAHORSE_LOCATION_LOCAL ? - GTK_STOCK_DIALOG_QUESTION : SEAHORSE_STOCK_SIGN; + + icon = g_themed_icon_new (SEAHORSE_IS_PGP_KEY (object) ? + SEAHORSE_ICON_SIGN : GTK_STOCK_DIALOG_QUESTION); name = seahorse_object_get_label (object); id = seahorse_object_get_identifier (object); - + + /* TRANSLATORS: [Unknown] signature name */ gtk_tree_store_set (GTK_TREE_STORE (skmodel), iter, SIGN_ICON, icon, SIGN_NAME, name ? name : _("[Unknown]"), SIGN_KEYID, id, SIGN_TRUSTED, trusted, - -1); + -1); + g_object_unref (icon); } static void signatures_populate_model (SeahorseWidget *swidget, SeahorseObjectModel *skmodel) { - SeahorseObject *object; + GObject *object; SeahorsePgpKey *pkey; GtkTreeIter iter; GtkWidget *widget; gboolean have_sigs = FALSE; - GList *rawids = NULL; + GPtrArray *rawids; GList *keys, *l, *uids; GList *sigs, *s; GCancellable *cancellable; @@ -1624,7 +1592,8 @@ widget = GTK_WIDGET (seahorse_widget_get_widget (swidget, "signatures-tree")); if (!widget) return; - + + rawids = g_ptr_array_new (); uids = seahorse_pgp_key_get_uids (pkey); /* Build a list of all the keyids */ @@ -1635,38 +1604,39 @@ if (seahorse_pgp_key_has_keyid (pkey, seahorse_pgp_signature_get_keyid (s->data))) continue; have_sigs = TRUE; - rawids = g_list_prepend (rawids, (gpointer)seahorse_pgp_signature_get_keyid (s->data)); + g_ptr_array_add (rawids, (gchar *)seahorse_pgp_signature_get_keyid (s->data)); } } - + + /* Strip out duplicates */ + unique_strings (rawids); + g_ptr_array_add (rawids, NULL); + /* Only show signatures area when there are signatures */ seahorse_widget_set_visible (swidget, "signatures-area", have_sigs); if (skmodel) { - - /* String out duplicates */ - rawids = unique_slist_strings (rawids); /* * Pass it to 'DiscoverKeys' for resolution/download. cancellable ties * search scope together */ cancellable = g_cancellable_new (); - keys = seahorse_context_discover_objects (seahorse_context_instance (), SEAHORSE_PGP, - rawids, cancellable); + keys = seahorse_pgp_backend_discover_keys (NULL, (const gchar **)rawids->pdata, cancellable); g_object_unref (cancellable); - g_list_free (rawids); - rawids = NULL; - + /* Add the keys to the store */ for (l = keys; l; l = g_list_next (l)) { - object = SEAHORSE_OBJECT (l->data); + object = G_OBJECT (l->data); gtk_tree_store_append (GTK_TREE_STORE (skmodel), &iter, NULL); - + /* This calls the 'update-row' callback, to set the values for the key */ seahorse_object_model_set_row_object (SEAHORSE_OBJECT_MODEL (skmodel), &iter, object); } } + + g_ptr_array_free (rawids, TRUE); + rawids = NULL; } /* Refilter when the user toggles the 'only show trusted' checkbox */ @@ -1686,7 +1656,7 @@ gpointer user_data) { SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - SeahorseObject *object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + GObject *object = SEAHORSE_OBJECT_WIDGET (swidget)->object; g_return_if_fail (SEAHORSE_IS_GPGME_KEY (object)); seahorse_gpgme_sign_prompt (SEAHORSE_GPGME_KEY (object), GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name))); } @@ -1697,8 +1667,8 @@ SeahorseObject *object; SeahorseUsage etype; const gchar *user; - - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); etype = seahorse_object_get_usage (object); if (etype != SEAHORSE_USAGE_PUBLIC_KEY) @@ -1761,24 +1731,21 @@ GtkTreeModelFilter *filter; gboolean sigpersonal; GtkCellRenderer *renderer; - guint keyloc; - - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); pkey = SEAHORSE_PGP_KEY (object); - keyloc = seahorse_object_get_location (object); - + if (seahorse_object_get_usage (object) != SEAHORSE_USAGE_PUBLIC_KEY) return; /* Remote keys */ - if (keyloc < SEAHORSE_LOCATION_LOCAL) { - + if (!SEAHORSE_IS_GPGME_KEY (object)) { show_gtkbuilder_widget (swidget, "manual-trust-area", FALSE); show_gtkbuilder_widget (swidget, "manage-trust-area", TRUE); show_gtkbuilder_widget (swidget, "sign-area", FALSE); show_gtkbuilder_widget (swidget, "revoke-area", FALSE); sensitive_gtkbuilder_widget (swidget, "trust-marginal-check", FALSE); - set_gtkbuilder_image (swidget, "sign-image", SEAHORSE_STOCK_SIGN_UNKNOWN); + set_gtkbuilder_image (swidget, "sign-image", SEAHORSE_ICON_SIGN_UNKNOWN); /* Local keys */ } else { @@ -1800,26 +1767,26 @@ /* Trust is specified manually */ case SEAHORSE_VALIDITY_ULTIMATE: managed = FALSE; - icon = SEAHORSE_STOCK_SIGN_OK; + icon = SEAHORSE_ICON_SIGN_OK; break; /* Trust is specified manually */ case SEAHORSE_VALIDITY_NEVER: managed = FALSE; - icon = SEAHORSE_STOCK_SIGN_BAD; + icon = SEAHORSE_ICON_SIGN_BAD; break; /* We manage the trust through this page */ case SEAHORSE_VALIDITY_FULL: case SEAHORSE_VALIDITY_MARGINAL: managed = TRUE; - icon = SEAHORSE_STOCK_SIGN_OK; + icon = SEAHORSE_ICON_SIGN_OK; break; /* We manage the trust through this page */ case SEAHORSE_VALIDITY_UNKNOWN: managed = TRUE; - icon = SEAHORSE_STOCK_SIGN; + icon = SEAHORSE_ICON_SIGN; break; default: @@ -1867,6 +1834,7 @@ } else { /* Create a new SeahorseObjectModel store.... */ + sign_columns[SIGN_ICON] = G_TYPE_ICON; store = GTK_TREE_STORE (seahorse_object_model_new (SIGN_N_COLUMNS, (GType*)sign_columns)); g_signal_connect (store, "update-row", G_CALLBACK (trust_update_row), swidget); @@ -1880,7 +1848,8 @@ g_object_set (renderer, "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), -1, "", renderer, - "stock-id", SIGN_ICON, NULL); + "gicon", SIGN_ICON, NULL); + /* TRANSLATORS: The name and email set on the PGP key */ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (widget), -1, _("Name/Email"), gtk_cell_renderer_text_new (), "text", SIGN_NAME, NULL); @@ -1928,8 +1897,8 @@ SeahorseWidget *swidget; GtkWidget *widget; - swidget = seahorse_object_widget_new ("pgp-public-key-properties", parent, SEAHORSE_OBJECT (pkey)); - + swidget = seahorse_object_widget_new ("pgp-public-key-properties", parent, G_OBJECT (pkey)); + /* This happens if the window is already open */ if (swidget == NULL) return NULL; @@ -1963,7 +1932,7 @@ SeahorseWidget *swidget; GtkWidget *widget; - swidget = seahorse_object_widget_new ("pgp-private-key-properties", parent, SEAHORSE_OBJECT (pkey)); + swidget = seahorse_object_widget_new ("pgp-private-key-properties", parent, G_OBJECT (pkey)); /* This happens if the window is already open */ if (swidget == NULL) @@ -1995,28 +1964,18 @@ void seahorse_pgp_key_properties_show (SeahorsePgpKey *pkey, GtkWindow *parent) { - SeahorseObject *sobj = SEAHORSE_OBJECT (pkey); - SeahorseSource *sksrc; - SeahorseWidget *swidget; + SeahorseWidget *swidget; - /* Reload the key to make sure to get all the props */ - sksrc = seahorse_object_get_source (sobj); - g_return_if_fail (sksrc != NULL); - - /* Don't trigger the import of remote keys if possible */ - if (SEAHORSE_IS_GPGME_KEY (pkey)) { - /* This causes the key source to get any specific info about the key */ - seahorse_gpgme_key_refresh (SEAHORSE_GPGME_KEY (pkey)); - seahorse_gpgme_key_ensure_signatures (SEAHORSE_GPGME_KEY (pkey)); - sobj = seahorse_context_get_object (SCTX_APP(), sksrc, seahorse_object_get_id (sobj)); - g_return_if_fail (sobj != NULL); - } - - if (seahorse_object_get_usage (sobj) == SEAHORSE_USAGE_PUBLIC_KEY) - swidget = setup_public_properties (pkey, parent); - else - swidget = setup_private_properties (pkey, parent); - - if (swidget) - seahorse_widget_show (swidget); + /* This causes the key source to get any specific info about the key */ + if (SEAHORSE_IS_GPGME_KEY (pkey)) { + seahorse_gpgme_key_refresh (SEAHORSE_GPGME_KEY (pkey)); + seahorse_gpgme_key_ensure_signatures (SEAHORSE_GPGME_KEY (pkey)); + } + + if (seahorse_object_get_usage (SEAHORSE_OBJECT (pkey)) == SEAHORSE_USAGE_PUBLIC_KEY) + swidget = setup_public_properties (pkey, parent); + else + swidget = setup_private_properties (pkey, parent); + if (swidget) + seahorse_widget_show (swidget); } diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-keysets.c seahorse-3.6.3/pgp/seahorse-pgp-keysets.c --- seahorse-3.2.2/pgp/seahorse-pgp-keysets.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-keysets.c 2012-08-21 12:23:18.000000000 +0200 @@ -21,9 +21,14 @@ #include "config.h" +#include "seahorse-application.h" +#include "seahorse-collection.h" #include "seahorse-object.h" +#include "seahorse-predicate.h" -#include "seahorse-pgp-module.h" +#include "seahorse-gpgme-key.h" +#include "seahorse-pgp-backend.h" +#include "seahorse-pgp-key.h" #include "seahorse-pgp-keysets.h" /* ----------------------------------------------------------------------------- @@ -33,47 +38,49 @@ static void on_settings_default_key_changed (GSettings *settings, const gchar *key, gpointer user_data) { - SeahorseSet *skset = SEAHORSE_SET (user_data); - /* Default key changed, refresh */ - seahorse_set_refresh (skset); + seahorse_collection_refresh (SEAHORSE_COLLECTION (user_data)); } static gboolean -pgp_signers_match (SeahorseObject *obj, gpointer data) +pgp_signers_match (GObject *obj, + gpointer data) { - SeahorseObject *defkey; - - if (!SEAHORSE_IS_OBJECT (obj)) - return FALSE; - - defkey = seahorse_context_get_default_key (SCTX_APP ()); - - /* Default key overrides all, and becomes the only signer available*/ - if (defkey && seahorse_object_get_id (obj) != seahorse_object_get_id (defkey)) - return FALSE; - - return TRUE; + SeahorsePgpKey *defkey; + + if (!SEAHORSE_IS_PGP_KEY (obj)) + return FALSE; + + defkey = seahorse_pgp_backend_get_default_key (NULL); + + /* Default key overrides all, and becomes the only signer available*/ + if (defkey != NULL && + g_strcmp0 (seahorse_pgp_key_get_keyid (defkey), + seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (obj))) != 0) + return FALSE; + + return TRUE; } -SeahorseSet * +GcrCollection * seahorse_keyset_pgp_signers_new (void) { - SeahorseObjectPredicate *pred = g_new0 (SeahorseObjectPredicate, 1); - SeahorseSet *skset; - - pred->location = SEAHORSE_LOCATION_LOCAL; - pred->tag = SEAHORSE_PGP; - pred->usage = SEAHORSE_USAGE_PRIVATE_KEY; - pred->flags = SEAHORSE_FLAG_CAN_SIGN; - pred->nflags = SEAHORSE_FLAG_EXPIRED | SEAHORSE_FLAG_REVOKED | SEAHORSE_FLAG_DISABLED; - pred->custom = pgp_signers_match; - - skset = seahorse_set_new_full (pred); - g_object_set_data_full (G_OBJECT (skset), "pgp-signers-predicate", pred, g_free); + SeahorsePredicate *predicate = g_new0 (SeahorsePredicate, 1); + SeahorseCollection *collection; + SeahorseGpgmeKeyring *keyring; + + predicate->type = SEAHORSE_TYPE_GPGME_KEY; + predicate->usage = SEAHORSE_USAGE_PRIVATE_KEY; + predicate->flags = SEAHORSE_FLAG_CAN_SIGN; + predicate->nflags = SEAHORSE_FLAG_EXPIRED | SEAHORSE_FLAG_REVOKED | SEAHORSE_FLAG_DISABLED; + predicate->custom = pgp_signers_match; + + keyring = seahorse_pgp_backend_get_default_keyring (NULL); + collection = seahorse_collection_new_for_predicate (GCR_COLLECTION (keyring), + predicate, g_free); - g_signal_connect_object (seahorse_context_pgp_settings (NULL), "changed::default-key", - G_CALLBACK (on_settings_default_key_changed), skset, 0); + g_signal_connect_object (seahorse_application_pgp_settings (NULL), "changed::default-key", + G_CALLBACK (on_settings_default_key_changed), collection, 0); - return skset; + return GCR_COLLECTION (collection); } diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-keysets.h seahorse-3.6.3/pgp/seahorse-pgp-keysets.h --- seahorse-3.2.2/pgp/seahorse-pgp-keysets.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-keysets.h 2012-08-21 12:23:18.000000000 +0200 @@ -22,12 +22,12 @@ #ifndef SEAPGPKEYSETS_H_ #define SEAPGPKEYSETS_H_ -#include "seahorse-set.h" +#include /* ----------------------------------------------------------------------------- * SOME COMMON KEYSETS */ -SeahorseSet* seahorse_keyset_pgp_signers_new (void); +GcrCollection * seahorse_keyset_pgp_signers_new (void); #endif /*SEAPGPKEYSETS_H_*/ diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-module.c seahorse-3.6.3/pgp/seahorse-pgp-module.c --- seahorse-3.2.2/pgp/seahorse-pgp-module.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-module.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-pgp-module.h" - -#include "seahorse-gpgme-source.h" -#include "seahorse-gpgme-dialogs.h" -#include "seahorse-pgp-commands.h" - -#ifdef WITH_LDAP -#include "seahorse-ldap-source.h" -#endif -#ifdef WITH_HKP -#include "seahorse-hkp-source.h" -#endif - -#include "seahorse-context.h" - -void -seahorse_pgp_module_init (void) -{ - SeahorseSource *source; - - /* Always have a default pgp source added */ - source = g_object_new (SEAHORSE_TYPE_GPGME_SOURCE, NULL); - seahorse_context_take_source (NULL, source); - - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_GPGME_SOURCE)); - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_PGP_COMMANDS)); -#ifdef WITH_LDAP - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_LDAP_SOURCE)); -#endif -#ifdef WITH_HKP - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_HKP_SOURCE)); -#endif - - seahorse_gpgme_generate_register (); -} diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-module.h seahorse-3.6.3/pgp/seahorse-pgp-module.h --- seahorse-3.2.2/pgp/seahorse-pgp-module.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-module.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 SEAHORSEPGP_H_ -#define SEAHORSEPGP_H_ - -#define SEAHORSE_PGP_STR "openpgp" -#define SEAHORSE_PGP (g_quark_from_static_string (SEAHORSE_PGP_STR)) - -void seahorse_pgp_module_init (void); - -#endif /*SEAHORSEPGP_H_*/ diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-private-key-properties.xml seahorse-3.6.3/pgp/seahorse-pgp-private-key-properties.xml --- seahorse-3.2.2/pgp/seahorse-pgp-private-key-properties.xml 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-pgp-private-key-properties.xml 2012-11-12 08:32:13.000000000 +0100 @@ -382,7 +382,7 @@ True 0 0 - <b>Photo </b> + <b>Photo </b> True @@ -431,7 +431,7 @@ True 1 0 - <b>Name:</b> + <b>Name:</b> True @@ -888,7 +888,7 @@ True - _Add Name + _Add Name True @@ -1000,7 +1000,7 @@ True 3 - Names and Signatures + Names and Signatures 1 diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-public-key-properties.xml seahorse-3.6.3/pgp/seahorse-pgp-public-key-properties.xml --- seahorse-3.2.2/pgp/seahorse-pgp-public-key-properties.xml 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-pgp-public-key-properties.xml 2012-11-12 08:32:13.000000000 +0100 @@ -302,7 +302,7 @@ True 0 0 - <b>Photo </b> + <b>Photo </b> True @@ -353,7 +353,7 @@ True 0 - Encrypt files and email to the key's owner + Encrypt files and email to the key's owner 1 @@ -398,7 +398,7 @@ True 1 0 - <b>Name:</b> + <b>Name:</b> True @@ -548,7 +548,7 @@ True - <b>_Other Names:</b> + <b>_Other Names:</b> True True diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-signature.c seahorse-3.6.3/pgp/seahorse-pgp-signature.c --- seahorse-3.2.2/pgp/seahorse-pgp-signature.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-signature.c 2012-08-21 12:23:18.000000000 +0200 @@ -21,11 +21,12 @@ #include "config.h" -#include "seahorse-pgp.h" +#include "seahorse-gpgme-key.h" +#include "seahorse-gpgme-keyring.h" +#include "seahorse-pgp-backend.h" #include "seahorse-pgp-key.h" #include "seahorse-pgp-signature.h" -#include "seahorse-context.h" #include "seahorse-object.h" #include @@ -185,18 +186,20 @@ guint seahorse_pgp_signature_get_sigtype (SeahorsePgpSignature *self) { - SeahorseObject *sobj; - GQuark id; + SeahorseGpgmeKeyring *keyring; + SeahorseGpgmeKey *key; + SeahorseObject *obj; g_return_val_if_fail (SEAHORSE_IS_PGP_SIGNATURE (self), 0); - - id = seahorse_pgp_key_canonize_id (self->pv->keyid); - sobj = seahorse_context_find_object (SCTX_APP (), id, SEAHORSE_LOCATION_LOCAL); - - if (sobj) { - if (seahorse_object_get_usage (sobj) == SEAHORSE_USAGE_PRIVATE_KEY) + + keyring = seahorse_pgp_backend_get_default_keyring (NULL); + key = seahorse_gpgme_keyring_lookup (keyring, self->pv->keyid); + + if (key != NULL) { + obj = SEAHORSE_OBJECT (key); + if (seahorse_object_get_usage (obj) == SEAHORSE_USAGE_PRIVATE_KEY) return SKEY_PGPSIG_TRUSTED | SKEY_PGPSIG_PERSONAL; - if (seahorse_object_get_flags (sobj) & SEAHORSE_FLAG_TRUSTED) + if (seahorse_object_get_flags (obj) & SEAHORSE_FLAG_TRUSTED) return SKEY_PGPSIG_TRUSTED; } diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-signature.h seahorse-3.6.3/pgp/seahorse-pgp-signature.h --- seahorse-3.2.2/pgp/seahorse-pgp-signature.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-signature.h 2012-08-21 12:23:18.000000000 +0200 @@ -24,8 +24,6 @@ #include -#include "pgp/seahorse-pgp-module.h" - #include "seahorse-validity.h" #define SEAHORSE_TYPE_PGP_SIGNATURE (seahorse_pgp_signature_get_type ()) diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-uid.c seahorse-3.6.3/pgp/seahorse-pgp-uid.c --- seahorse-3.2.2/pgp/seahorse-pgp-uid.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-uid.c 2012-08-21 12:23:18.000000000 +0200 @@ -34,9 +34,9 @@ enum { PROP_0, + PROP_PARENT, PROP_SIGNATURES, PROP_VALIDITY, - PROP_VALIDITY_STR, PROP_NAME, PROP_EMAIL, PROP_COMMENT @@ -45,6 +45,7 @@ G_DEFINE_TYPE (SeahorsePgpUid, seahorse_pgp_uid, SEAHORSE_TYPE_OBJECT); struct _SeahorsePgpUidPrivate { + SeahorsePgpKey *parent; GList *signatures; SeahorseValidity validity; gboolean realized; @@ -203,6 +204,7 @@ seahorse_pgp_uid_realize (SeahorsePgpUid *self) { gchar *markup; + gchar *label; /* Don't realize if no name present */ if (!self->pv->name) @@ -210,18 +212,18 @@ self->pv->realized = TRUE; - g_object_set (self, "label", self->pv->name ? self->pv->name : "", NULL); + label = seahorse_pgp_uid_calc_label (self->pv->name, self->pv->email, self->pv->comment); markup = seahorse_pgp_uid_calc_markup (self->pv->name, self->pv->email, self->pv->comment, 0); - g_object_set (self, "markup", markup, NULL); + g_object_set (self, "markup", markup, "label", label, NULL); g_free (markup); + g_free (label); } static void seahorse_pgp_uid_init (SeahorsePgpUid *self) { self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PGP_UID, SeahorsePgpUidPrivate); - g_object_set (self, "icon", "", "usage", SEAHORSE_USAGE_IDENTITY, NULL); - g_object_set (self, "tag", SEAHORSE_PGP_TYPE, NULL); + g_object_set (self, "icon", NULL, "usage", SEAHORSE_USAGE_IDENTITY, NULL); } static void @@ -241,12 +243,12 @@ case PROP_SIGNATURES: g_value_set_boxed (value, seahorse_pgp_uid_get_signatures (self)); break; + case PROP_PARENT: + g_value_set_object (value, seahorse_pgp_uid_get_parent (self)); + break; case PROP_VALIDITY: g_value_set_uint (value, seahorse_pgp_uid_get_validity (self)); break; - case PROP_VALIDITY_STR: - g_value_set_string (value, seahorse_pgp_uid_get_validity_str (self)); - break; case PROP_NAME: g_value_set_string (value, seahorse_pgp_uid_get_name (self)); break; @@ -269,6 +271,10 @@ case PROP_SIGNATURES: seahorse_pgp_uid_set_signatures (self, g_value_get_boxed (value)); break; + case PROP_PARENT: + g_return_if_fail (self->pv->parent == NULL); + self->pv->parent = g_value_get_object (value); + break; case PROP_VALIDITY: seahorse_pgp_uid_set_validity (self, g_value_get_uint (value)); break; @@ -321,10 +327,10 @@ g_param_spec_uint ("validity", "Validity", "Validity of this identity", 0, G_MAXUINT, 0, G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, PROP_VALIDITY_STR, - g_param_spec_string ("validity-str", "Validity String", "Validity of this identity as a string", - "", G_PARAM_READABLE)); - + g_object_class_install_property (gobject_class, PROP_PARENT, + g_param_spec_object ("parent", "Parent Key", "Parent Key", + SEAHORSE_TYPE_PGP_KEY, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (gobject_class, PROP_NAME, g_param_spec_string ("name", "Name", "User ID name", "", G_PARAM_READWRITE)); @@ -346,8 +352,9 @@ * PUBLIC */ -SeahorsePgpUid* -seahorse_pgp_uid_new (const gchar *uid_string) +SeahorsePgpUid * +seahorse_pgp_uid_new (SeahorsePgpKey *parent, + const gchar *uid_string) { SeahorsePgpUid *uid; gchar *name = NULL; @@ -356,9 +363,14 @@ if (uid_string) parse_user_id (uid_string, &name, &email, &comment); - - uid = g_object_new (SEAHORSE_TYPE_PGP_UID, "name", name, "email", email, "comment", comment, NULL); - + + uid = g_object_new (SEAHORSE_TYPE_PGP_UID, + "parent", parent, + "name", name, + "email", email, + "comment", comment, + NULL); + g_free (name); g_free (comment); g_free (email); @@ -366,6 +378,13 @@ return uid; } +SeahorsePgpKey * +seahorse_pgp_uid_get_parent (SeahorsePgpUid *self) +{ + g_return_val_if_fail (SEAHORSE_IS_PGP_UID (self), NULL); + return self->pv->parent; +} + GList* seahorse_pgp_uid_get_signatures (SeahorsePgpUid *self) { @@ -397,13 +416,6 @@ g_return_if_fail (SEAHORSE_IS_PGP_UID (self)); self->pv->validity = validity; g_object_notify (G_OBJECT (self), "validity"); - g_object_notify (G_OBJECT (self), "validity-str"); -} - -const gchar* -seahorse_pgp_uid_get_validity_str (SeahorsePgpUid *self) -{ - return seahorse_validity_get_string (seahorse_pgp_uid_get_validity (self)); } const gchar* diff -Nru seahorse-3.2.2/pgp/seahorse-pgp-uid.h seahorse-3.6.3/pgp/seahorse-pgp-uid.h --- seahorse-3.2.2/pgp/seahorse-pgp-uid.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-pgp-uid.h 2012-08-21 12:23:18.000000000 +0200 @@ -27,6 +27,8 @@ #include "seahorse-object.h" #include "seahorse-validity.h" +#include "seahorse-pgp-key.h" + #define SEAHORSE_TYPE_PGP_UID (seahorse_pgp_uid_get_type ()) #define SEAHORSE_PGP_UID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PGP_UID, SeahorsePgpUid)) @@ -50,7 +52,10 @@ GType seahorse_pgp_uid_get_type (void); -SeahorsePgpUid* seahorse_pgp_uid_new (const gchar *uid_string); +SeahorsePgpUid* seahorse_pgp_uid_new (SeahorsePgpKey *parent, + const gchar *uid_string); + +SeahorsePgpKey * seahorse_pgp_uid_get_parent (SeahorsePgpUid *self); void seahorse_pgp_uid_realize (SeahorsePgpUid *self); @@ -64,9 +69,6 @@ void seahorse_pgp_uid_set_validity (SeahorsePgpUid *self, SeahorseValidity validity); -const gchar* seahorse_pgp_uid_get_validity_str (SeahorsePgpUid *self); - - const gchar* seahorse_pgp_uid_get_name (SeahorsePgpUid *self); void seahorse_pgp_uid_set_name (SeahorsePgpUid *self, diff -Nru seahorse-3.2.2/pgp/seahorse-server-source.c seahorse-3.6.3/pgp/seahorse-server-source.c --- seahorse-3.2.2/pgp/seahorse-server-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-server-source.c 2012-10-23 14:55:39.000000000 +0200 @@ -44,10 +44,12 @@ enum { PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ICON, PROP_KEY_SERVER, - PROP_URI + PROP_URI, + PROP_ACTIONS }; /* ----------------------------------------------------------------------------- @@ -59,10 +61,11 @@ gchar *uri; }; -static void seahorse_source_iface (SeahorseSourceIface *iface); +static void seahorse_server_source_collection_init (GcrCollectionIface *iface); -G_DEFINE_TYPE_EXTENDED (SeahorseServerSource, seahorse_server_source, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); +G_DEFINE_TYPE_WITH_CODE (SeahorseServerSource, seahorse_server_source, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_server_source_collection_init); +); /* GObject handlers */ static void seahorse_server_source_finalize (GObject *gobject); @@ -88,9 +91,17 @@ gobject_class->set_property = seahorse_server_set_property; gobject_class->get_property = seahorse_server_get_property; - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - + /* These properties are used to conform to SeahorseSource, but are not actually used */ + g_object_class_install_property (gobject_class, PROP_LABEL, + g_param_spec_string ("label", "Label", "Label", "", G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_DESCRIPTION, + g_param_spec_string ("description", "Description", "Description", "", G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_ICON, + g_param_spec_object ("icon", "icon", "Icon", G_TYPE_ICON, G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_ACTIONS, + g_param_spec_object ("actions", "actions", "Actions", + GTK_TYPE_ACTION_GROUP, G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_KEY_SERVER, g_param_spec_string ("key-server", "Key Server", "Key Server to search on", "", @@ -99,52 +110,7 @@ g_object_class_install_property (gobject_class, PROP_URI, g_param_spec_string ("uri", "Key Server URI", "Key Server full URI", "", - G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); - - seahorse_registry_register_function (NULL, seahorse_pgp_key_canonize_id, "canonize", SEAHORSE_PGP_STR, NULL); -} - -static void -seahorse_server_source_load_async (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, - seahorse_server_source_load_async); - g_simple_async_result_complete_in_idle (res); - g_object_unref (res); -} - -static gboolean -seahorse_server_source_load_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_server_source_load_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} - -/** -* iface: The #SeahorseSourceIface to init -* -* Sets the load function in @iface -* -* This is the init function of the interface SEAHORSE_TYPE_SOURCE -* -**/ -static void -seahorse_source_iface (SeahorseSourceIface *iface) -{ - iface->load_async = seahorse_server_source_load_async; - iface->load_finish = seahorse_server_source_load_finish; + G_PARAM_READWRITE)); } /** @@ -205,7 +171,7 @@ g_return_if_fail (ssrc->priv->server && ssrc->priv->server[0]); break; case PROP_URI: - g_assert (ssrc->priv->uri == NULL); + g_free (ssrc->priv->uri); ssrc->priv->uri = g_strdup (g_value_get_string (value)); g_return_if_fail (ssrc->priv->uri && ssrc->priv->uri[0]); break; @@ -221,29 +187,64 @@ * pspec: ignored * * The properties that can be read are: -* PROP_KEY_SERVER, PROP_URI, PROP_SOURCE_TAG, PROP_SOURCE_LOCATION +* PROP_KEY_SERVER, PROP_URI * **/ static void -seahorse_server_get_property (GObject *object, guint prop_id, GValue *value, +seahorse_server_get_property (GObject *obj, + guint prop_id, + GValue *value, GParamSpec *pspec) { - SeahorseServerSource *ssrc = SEAHORSE_SERVER_SOURCE (object); - - switch (prop_id) { - case PROP_KEY_SERVER: - g_value_set_string (value, ssrc->priv->server); - break; - case PROP_URI: - g_value_set_string (value, ssrc->priv->uri); - break; - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_PGP); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE); - break; - } + SeahorseServerSource *self = SEAHORSE_SERVER_SOURCE (obj); + + switch (prop_id) { + case PROP_LABEL: + case PROP_KEY_SERVER: + g_value_set_string (value, self->priv->server); + break; + case PROP_DESCRIPTION: + case PROP_URI: + g_value_set_string (value, self->priv->uri); + break; + case PROP_ICON: + g_value_take_object (value, g_themed_icon_new (GTK_STOCK_DIALOG_QUESTION)); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static guint +seahorse_server_source_get_length (GcrCollection *collection) +{ + return 0; +} + +static GList * +seahorse_server_source_get_objects (GcrCollection *collection) +{ + return NULL; +} + +static gboolean +seahorse_server_source_contains (GcrCollection *collection, + GObject *object) +{ + return FALSE; +} + +static void +seahorse_server_source_collection_init (GcrCollectionIface *iface) +{ + /* This is implemented because SeahorseSource requires it */ + iface->get_length = seahorse_server_source_get_length; + iface->get_objects = seahorse_server_source_get_objects; + iface->contains = seahorse_server_source_contains; } /* -------------------------------------------------------------------------- @@ -366,3 +367,94 @@ g_free (uri); return ssrc; } + +void +seahorse_server_source_search_async (SeahorseServerSource *self, + const gchar *match, + GcrSimpleCollection *results, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_return_if_fail (SEAHORSE_IS_SERVER_SOURCE (self)); + g_return_if_fail (match != NULL); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + g_return_if_fail (SEAHORSE_SERVER_SOURCE_GET_CLASS (self)->search_async); + SEAHORSE_SERVER_SOURCE_GET_CLASS (self)->search_async (self, match, results, + cancellable, callback, user_data); +} + +gboolean +seahorse_server_source_search_finish (SeahorseServerSource *self, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (self), FALSE); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (SEAHORSE_SERVER_SOURCE_GET_CLASS (self)->search_finish, FALSE); + return SEAHORSE_SERVER_SOURCE_GET_CLASS (self)->search_finish (self, result, error); +} + +void +seahorse_server_source_export_async (SeahorseServerSource *self, + const gchar **keyids, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseServerSourceClass *klass; + + g_return_if_fail (SEAHORSE_IS_SERVER_SOURCE (self)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + + klass = SEAHORSE_SERVER_SOURCE_GET_CLASS (self); + g_return_if_fail (klass->export_async); + (klass->export_async) (self, keyids, cancellable, callback, user_data); +} + +gpointer +seahorse_server_source_export_finish (SeahorseServerSource *self, + GAsyncResult *result, + gsize *size, + GError **error) +{ + SeahorseServerSourceClass *klass; + + g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (self), NULL); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); + g_return_val_if_fail (size != NULL, NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + klass = SEAHORSE_SERVER_SOURCE_GET_CLASS (self); + g_return_val_if_fail (klass->export_async != NULL, NULL); + g_return_val_if_fail (klass->export_finish != NULL, NULL); + return (klass->export_finish) (self, result, size, error); +} + +void +seahorse_server_source_import_async (SeahorseServerSource *source, + GInputStream *input, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_return_if_fail (SEAHORSE_IS_SERVER_SOURCE (source)); + g_return_if_fail (G_IS_INPUT_STREAM (input)); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + g_return_if_fail (SEAHORSE_SERVER_SOURCE_GET_CLASS (source)->import_async); + SEAHORSE_SERVER_SOURCE_GET_CLASS (source)->import_async (source, input, cancellable, + callback, user_data); +} + +GList * +seahorse_server_source_import_finish (SeahorseServerSource *source, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (source), NULL); + g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + g_return_val_if_fail (SEAHORSE_SERVER_SOURCE_GET_CLASS (source)->import_finish, NULL); + return SEAHORSE_SERVER_SOURCE_GET_CLASS (source)->import_finish (source, result, error); +} diff -Nru seahorse-3.2.2/pgp/seahorse-server-source.h seahorse-3.6.3/pgp/seahorse-server-source.h --- seahorse-3.2.2/pgp/seahorse-server-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-server-source.h 2012-08-21 12:23:18.000000000 +0200 @@ -41,7 +41,9 @@ #ifndef __SEAHORSE_SERVER_SOURCE_H__ #define __SEAHORSE_SERVER_SOURCE_H__ -#include "seahorse-source.h" +#include "seahorse-pgp-key.h" + +#include #define SEAHORSE_TYPE_SERVER_SOURCE (seahorse_server_source_get_type ()) #define SEAHORSE_SERVER_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SERVER_SOURCE, SeahorseServerSource)) @@ -61,10 +63,74 @@ struct _SeahorseServerSourceClass { GObjectClass parent_class; + + void (* import_async) (SeahorseServerSource *source, + GInputStream *input, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + GList * (* import_finish) (SeahorseServerSource *source, + GAsyncResult *result, + GError **error); + + void (*export_async) (SeahorseServerSource *source, + const gchar **keyids, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + gpointer (*export_finish) (SeahorseServerSource *source, + GAsyncResult *result, + gsize *size, + GError **error); + + void (*search_async) (SeahorseServerSource *source, + const gchar *match, + GcrSimpleCollection *results, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + gboolean (*search_finish) (SeahorseServerSource *source, + GAsyncResult *result, + GError **error); }; GType seahorse_server_source_get_type (void); SeahorseServerSource* seahorse_server_source_new (const gchar *uri); +void seahorse_server_source_search_async (SeahorseServerSource *self, + const gchar *match, + GcrSimpleCollection *results, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_server_source_search_finish (SeahorseServerSource *self, + GAsyncResult *result, + GError **error); + +void seahorse_server_source_import_async (SeahorseServerSource *self, + GInputStream *input, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +GList * seahorse_server_source_import_finish (SeahorseServerSource *self, + GAsyncResult *result, + GError **error); + +void seahorse_server_source_export_async (SeahorseServerSource *self, + const gchar **keyids, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gpointer seahorse_server_source_export_finish (SeahorseServerSource *self, + GAsyncResult *result, + gsize *size, + GError **error); + #endif /* __SEAHORSE_SERVER_SOURCE_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-signer.c seahorse-3.6.3/pgp/seahorse-signer.c --- seahorse-3.2.2/pgp/seahorse-signer.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-signer.c 2012-08-21 12:23:18.000000000 +0200 @@ -40,20 +40,21 @@ seahorse_signer_get (GtkWindow *parent) { SeahorseWidget *swidget; - SeahorseSet *skset; - SeahorseObject *object = NULL; + GcrCollection *collection; + SeahorsePgpKey *key = NULL; GtkWidget *combo; GtkWidget *widget; gint response; gboolean done = FALSE; gboolean ok = FALSE; GSettings *settings; + const gchar *keyid; gchar *id; guint nkeys; - skset = seahorse_keyset_pgp_signers_new (); - nkeys = seahorse_set_get_count (skset); - + collection = seahorse_keyset_pgp_signers_new (); + nkeys = gcr_collection_get_length (collection); + /* If no signing keys then we can't sign */ if (nkeys == 0) { /* TODO: We should be giving an error message that allows them to @@ -65,14 +66,11 @@ /* If only one key (probably default) then return it immediately */ if (nkeys == 1) { - GList *keys = seahorse_set_get_objects (skset); - object = SEAHORSE_OBJECT (keys->data); - + GList *keys = gcr_collection_get_objects (collection); + key = keys->data; g_list_free (keys); - g_object_unref (skset); - - g_assert (SEAHORSE_IS_PGP_KEY (object)); - return SEAHORSE_PGP_KEY (object); + g_object_unref (collection); + return key; } swidget = seahorse_widget_new ("signer", parent); @@ -80,14 +78,20 @@ combo = GTK_WIDGET (seahorse_widget_get_widget (swidget, "signer-select")); g_return_val_if_fail (combo != NULL, NULL); - seahorse_combo_keys_attach (GTK_COMBO_BOX (combo), skset, NULL); - g_object_unref (skset); + seahorse_combo_keys_attach (GTK_COMBO_BOX (combo), collection, NULL); + g_object_unref (collection); - settings = seahorse_context_pgp_settings (NULL); + settings = seahorse_application_pgp_settings (NULL); /* Select the last key used */ id = g_settings_get_string (settings, "last-signer"); - seahorse_combo_keys_set_active_id (GTK_COMBO_BOX (combo), g_quark_from_string (id)); + if (!id || !id[0]) + keyid = NULL; + else if (g_str_has_prefix (id, "openpgp:")) + keyid = id + strlen ("openpgp:"); + else + keyid = id; + seahorse_combo_keys_set_active_id (GTK_COMBO_BOX (combo), keyid); g_free (id); widget = seahorse_widget_get_toplevel (swidget); @@ -107,14 +111,13 @@ } if (ok) { - object = seahorse_combo_keys_get_active (GTK_COMBO_BOX (combo)); - g_return_val_if_fail (SEAHORSE_IS_PGP_KEY (object), NULL); + key = seahorse_combo_keys_get_active (GTK_COMBO_BOX (combo)); /* Save this as the last key signed with */ g_settings_set_string (settings, "last-signer", - object == NULL ? "" : g_quark_to_string (seahorse_object_get_id (object))); + key ? seahorse_pgp_key_get_keyid (key) : NULL); } seahorse_widget_destroy (swidget); - return SEAHORSE_PGP_KEY (object); + return key; } diff -Nru seahorse-3.2.2/pgp/seahorse-sign.xml seahorse-3.6.3/pgp/seahorse-sign.xml --- seahorse-3.2.2/pgp/seahorse-sign.xml 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/pgp/seahorse-sign.xml 2012-11-12 08:32:13.000000000 +0100 @@ -189,7 +189,7 @@ True 0 0 - <i>Casually:</i> means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. + <i>Casually:</i> means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. True fill True @@ -438,7 +438,6 @@ True False True - False diff -Nru seahorse-3.2.2/pgp/seahorse-transfer.c seahorse-3.6.3/pgp/seahorse-transfer.c --- seahorse-3.2.2/pgp/seahorse-transfer.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-transfer.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,310 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-server-source.h" +#include "seahorse-gpgme-exporter.h" +#include "seahorse-gpgme-keyring.h" + +#define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION +#include "seahorse-debug.h" +#include "seahorse-exporter.h" +#include "seahorse-object-list.h" +#include "seahorse-progress.h" +#include "seahorse-transfer.h" +#include "seahorse-util.h" + +#include + +#include + +typedef struct { + GCancellable *cancellable; + SeahorsePlace *from; + SeahorsePlace *to; + gchar **keyids; + GList *keys; +} TransferClosure; + +static void +transfer_closure_free (gpointer user_data) +{ + TransferClosure *closure = user_data; + g_clear_object (&closure->from); + g_clear_object (&closure->to); + g_clear_object (&closure->cancellable); + g_strfreev (closure->keyids); + seahorse_object_list_free (closure->keys); + g_free (closure); +} + +static void +on_source_import_ready (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + TransferClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + GList *results; + + seahorse_debug ("[transfer] import done"); + seahorse_progress_end (closure->cancellable, &closure->to); + + if (SEAHORSE_IS_GPGME_KEYRING (closure->to)) { + results = seahorse_gpgme_keyring_import_finish (SEAHORSE_GPGME_KEYRING (closure->to), + result, &error); + } else { + results = seahorse_server_source_import_finish (SEAHORSE_SERVER_SOURCE (closure->to), + result, &error); + } + + if (results != NULL) + g_cancellable_set_error_if_cancelled (closure->cancellable, &error); + + g_list_free (results); + + if (error != NULL) + g_simple_async_result_take_error (res, error); + + g_simple_async_result_complete (res); + g_object_unref (user_data); +} + +static void +on_source_export_ready (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + TransferClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + gpointer stream_data = NULL; + gsize stream_size; + GInputStream *input; + + seahorse_debug ("[transfer] export done"); + seahorse_progress_end (closure->cancellable, &closure->from); + + if (SEAHORSE_IS_SERVER_SOURCE (closure->from)) { + stream_data = seahorse_server_source_export_finish (SEAHORSE_SERVER_SOURCE (object), + result, &stream_size, &error); + + } else if (SEAHORSE_IS_GPGME_KEYRING (closure->from)) { + stream_data = seahorse_exporter_export_finish (SEAHORSE_EXPORTER (object), result, + &stream_size, &error); + + } else { + g_warning ("unsupported source for export: %s", G_OBJECT_TYPE_NAME (object)); + } + + if (error == NULL) + g_cancellable_set_error_if_cancelled (closure->cancellable, &error); + + if (error == NULL) { + seahorse_progress_begin (closure->cancellable, &closure->to); + + if (!stream_size) { + seahorse_debug ("[transfer] nothing to import"); + seahorse_progress_end (closure->cancellable, &closure->to); + g_simple_async_result_complete (res); + + } else { + input = g_memory_input_stream_new_from_data (stream_data, stream_size, g_free); + stream_data = NULL; + stream_size = 0; + + seahorse_debug ("[transfer] starting import"); + if (SEAHORSE_IS_GPGME_KEYRING (closure->to)) { + seahorse_gpgme_keyring_import_async (SEAHORSE_GPGME_KEYRING (closure->to), + input, closure->cancellable, + on_source_import_ready, + g_object_ref (res)); + } else { + seahorse_server_source_import_async (SEAHORSE_SERVER_SOURCE (closure->to), + input, closure->cancellable, + on_source_import_ready, + g_object_ref (res)); + } + g_object_unref (input); + } + + } else { + seahorse_debug ("[transfer] stopped after export"); + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + } + + g_free (stream_data); + g_object_unref (user_data); +} + +static gboolean +on_timeout_start_transfer (gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + TransferClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + SeahorseExporter *exporter; + + g_assert (SEAHORSE_IS_PLACE (closure->from)); + + seahorse_progress_begin (closure->cancellable, &closure->from); + if (SEAHORSE_IS_SERVER_SOURCE (closure->from)) { + g_assert (closure->keyids != NULL); + seahorse_server_source_export_async (SEAHORSE_SERVER_SOURCE (closure->from), + (const gchar **)closure->keyids, + closure->cancellable, on_source_export_ready, + g_object_ref (res)); + + } else if (SEAHORSE_IS_GPGME_KEYRING (closure->from)) { + g_assert (closure->keys != NULL); + exporter = seahorse_gpgme_exporter_new_multiple (closure->keys, TRUE); + seahorse_exporter_export_async (exporter, closure->cancellable, + on_source_export_ready, g_object_ref (res)); + g_object_unref (exporter); + + } else { + g_warning ("unsupported source for transfer: %s", G_OBJECT_TYPE_NAME (closure->from)); + } + + return FALSE; /* Don't run again */ +} + +void +seahorse_transfer_keys_async (SeahorsePlace *from, + SeahorsePlace *to, + GList *keys, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + TransferClosure *closure; + GPtrArray *keyids; + GList *l; + + g_return_if_fail (SEAHORSE_IS_PLACE (from)); + g_return_if_fail (SEAHORSE_IS_PLACE (to)); + + res = g_simple_async_result_new (NULL, callback, user_data, + seahorse_transfer_finish); + + if (!keys) { + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); + return; + } + + closure = g_new0 (TransferClosure, 1); + closure->cancellable = cancellable ? g_object_ref (cancellable) : cancellable; + closure->from = g_object_ref (from); + closure->to = g_object_ref (to); + g_simple_async_result_set_op_res_gpointer (res, closure, transfer_closure_free); + + if (SEAHORSE_IS_GPGME_KEYRING (from)) { + closure->keys = seahorse_object_list_copy (keys); + + } else { + keyids = g_ptr_array_new (); + for (l = keys; l != NULL; l = g_list_next (l)) + g_ptr_array_add (keyids, g_strdup (seahorse_pgp_key_get_keyid (l->data))); + g_ptr_array_add (keyids, NULL); + closure->keyids = (gchar **)g_ptr_array_free (keyids, FALSE); + } + + seahorse_progress_prep (cancellable, &closure->from, + SEAHORSE_IS_GPGME_KEYRING (closure->from) ? + _("Exporting data") : _("Retrieving data")); + seahorse_progress_prep (cancellable, &closure->to, + SEAHORSE_IS_GPGME_KEYRING (closure->to) ? + _("Importing data") : _("Sending data")); + + seahorse_debug ("starting export"); + + /* We delay and continue from a callback */ + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 0, + on_timeout_start_transfer, + g_object_ref (res), g_object_unref); + + g_object_unref (res); +} + +void +seahorse_transfer_keyids_async (SeahorseServerSource *from, + SeahorsePlace *to, + const gchar **keyids, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + TransferClosure *closure; + + g_return_if_fail (SEAHORSE_IS_SERVER_SOURCE (from)); + g_return_if_fail (SEAHORSE_PLACE (to)); + + res = g_simple_async_result_new (NULL, callback, user_data, + seahorse_transfer_finish); + + if (!keyids || !keyids[0]) { + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); + return; + } + + closure = g_new0 (TransferClosure, 1); + closure->cancellable = cancellable ? g_object_ref (cancellable) : cancellable; + closure->from = g_object_ref (from); + closure->to = g_object_ref (to); + closure->keyids = g_strdupv ((gchar **)keyids); + g_simple_async_result_set_op_res_gpointer (res, closure, transfer_closure_free); + + seahorse_progress_prep (cancellable, &closure->from, + SEAHORSE_IS_GPGME_KEYRING (closure->from) ? + _("Exporting data") : _("Retrieving data")); + seahorse_progress_prep (cancellable, &closure->to, + SEAHORSE_IS_GPGME_KEYRING (closure->to) ? + _("Importing data") : _("Sending data")); + + seahorse_debug ("starting export"); + + /* We delay and continue from a callback */ + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 0, + on_timeout_start_transfer, + g_object_ref (res), g_object_unref); + + g_object_unref (res); +} + +gboolean +seahorse_transfer_finish (GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, + seahorse_transfer_finish), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} diff -Nru seahorse-3.2.2/pgp/seahorse-transfer.h seahorse-3.6.3/pgp/seahorse-transfer.h --- seahorse-3.2.2/pgp/seahorse-transfer.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-transfer.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,47 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __SEAHORSE_TRANSFER_H__ +#define __SEAHORSE_TRANSFER_H__ + +#include "seahorse-place.h" + +#include "seahorse-server-source.h" + +void seahorse_transfer_keyids_async (SeahorseServerSource *from, + SeahorsePlace *to, + const gchar **keyids, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +void seahorse_transfer_keys_async (SeahorsePlace *from, + SeahorsePlace *to, + GList *keys, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean seahorse_transfer_finish (GAsyncResult *result, + GError **error); + +#endif /* __SEAHORSE_TRANSFER_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-unknown.c seahorse-3.6.3/pgp/seahorse-unknown.c --- seahorse-3.2.2/pgp/seahorse-unknown.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-unknown.c 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Stefan Walter + * + * 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 "config.h" + +#include "seahorse-pgp-key.h" +#include "seahorse-unknown.h" +#include "seahorse-unknown-source.h" + +#include + +G_DEFINE_TYPE (SeahorseUnknown, seahorse_unknown, SEAHORSE_TYPE_OBJECT); + +/* ----------------------------------------------------------------------------- + * OBJECT + */ + + +static void +seahorse_unknown_init (SeahorseUnknown *self) +{ + +} + +static void +seahorse_unknown_class_init (SeahorseUnknownClass *klass) +{ + +} + +/* ----------------------------------------------------------------------------- + * PUBLIC METHODS + */ + +SeahorseUnknown* +seahorse_unknown_new (SeahorseUnknownSource *source, + const gchar *keyid, + const gchar *display) +{ + gchar *identifier; + + if (!display) + display = _("Unavailable"); + identifier = seahorse_pgp_key_calc_identifier (keyid); + + return g_object_new (SEAHORSE_TYPE_UNKNOWN, + "place", source, + "label", display, + "identifier", identifier, + NULL); +} diff -Nru seahorse-3.2.2/pgp/seahorse-unknown.h seahorse-3.6.3/pgp/seahorse-unknown.h --- seahorse-3.2.2/pgp/seahorse-unknown.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-unknown.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,57 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Stefan Walter + * + * 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 __SEAHORSE_UNKNOWN_H__ +#define __SEAHORSE_UNKNOWN_H__ + +#include + +#include "seahorse-object.h" +#include "seahorse-unknown-source.h" + +#define SEAHORSE_TYPE_UNKNOWN (seahorse_unknown_get_type ()) +#define SEAHORSE_UNKNOWN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_UNKNOWN, SeahorseUnknown)) +#define SEAHORSE_UNKNOWN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_UNKNOWN, SeahorseUnknownClass)) +#define SEAHORSE_IS_UNKNOWN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_UNKNOWN)) +#define SEAHORSE_IS_UNKNOWN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_UNKNOWN)) +#define SEAHORSE_UNKNOWN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_UNKNOWN, SeahorseUnknownClass)) + +typedef struct _SeahorseUnknown SeahorseUnknown; +typedef struct _SeahorseUnknownClass SeahorseUnknownClass; + +struct _SeahorseUnknown { + SeahorseObject parent; + + /*< public >*/ + gchar *display; +}; + +struct _SeahorseUnknownClass { + SeahorseObjectClass parent_class; +}; + +GType seahorse_unknown_get_type (void); + +SeahorseUnknown* seahorse_unknown_new (SeahorseUnknownSource *usrc, + const gchar *keyid, + const gchar *display); + +#endif /* __SEAHORSE_UNKNOWN_H__ */ diff -Nru seahorse-3.2.2/pgp/seahorse-unknown-source.c seahorse-3.6.3/pgp/seahorse-unknown-source.c --- seahorse-3.2.2/pgp/seahorse-unknown-source.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-unknown-source.c 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,192 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-pgp-key.h" +#include "seahorse-unknown-source.h" + +#include "seahorse-place.h" +#include "seahorse-registry.h" +#include "seahorse-unknown.h" + +#include + +#include + +enum { + PROP_0, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ICON, + PROP_URI, + PROP_ACTIONS +}; + +struct _SeahorseUnknownSource { + GObject parent; + GHashTable *keys; +}; + +struct _SeahorseUnknownSourceClass { + GObjectClass parent_class; +}; + +static void seahorse_unknown_source_collection_iface (GcrCollectionIface *iface); + +static void seahorse_unknown_source_place_iface (SeahorsePlaceIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseUnknownSource, seahorse_unknown_source, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_unknown_source_collection_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_PLACE, seahorse_unknown_source_place_iface); +); + +static void +seahorse_unknown_source_init (SeahorseUnknownSource *self) +{ + self->keys = g_hash_table_new_full (seahorse_pgp_keyid_hash, + seahorse_pgp_keyid_equal, + g_free, g_object_unref); +} + +static void +seahorse_unknown_source_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + switch (prop_id) { + case PROP_LABEL: + g_value_set_string (value, ""); + break; + case PROP_DESCRIPTION: + case PROP_URI: + g_value_set_string (value, NULL); + break; + case PROP_ICON: + g_value_set_object (value, NULL); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_unknown_source_finalize (GObject *obj) +{ + SeahorseUnknownSource *self = SEAHORSE_UNKNOWN_SOURCE (obj); + + g_hash_table_destroy (self->keys); + + G_OBJECT_CLASS (seahorse_unknown_source_parent_class)->finalize (obj); +} + +static void +seahorse_unknown_source_class_init (SeahorseUnknownSourceClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->get_property = seahorse_unknown_source_get_property; + gobject_class->finalize = seahorse_unknown_source_finalize; + + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_ICON, "icon"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); + g_object_class_override_property (gobject_class, PROP_URI, "uri"); +} + +static guint +seahorse_unknown_source_get_length (GcrCollection *collection) +{ + SeahorseUnknownSource *self = SEAHORSE_UNKNOWN_SOURCE (collection); + return g_hash_table_size (self->keys); +} + +static GList * +seahorse_unknown_source_get_objects (GcrCollection *collection) +{ + SeahorseUnknownSource *self = SEAHORSE_UNKNOWN_SOURCE (collection); + return g_hash_table_get_values (self->keys); +} + +static gboolean +seahorse_unknown_source_contains (GcrCollection *collection, + GObject *object) +{ + SeahorseUnknownSource *self = SEAHORSE_UNKNOWN_SOURCE (collection); + const gchar *identifier = seahorse_object_get_identifier (SEAHORSE_OBJECT (object)); + return g_hash_table_lookup (self->keys, identifier) == object; +} + +static void +seahorse_unknown_source_collection_iface (GcrCollectionIface *iface) +{ + iface->contains = seahorse_unknown_source_contains; + iface->get_length = seahorse_unknown_source_get_length; + iface->get_objects = seahorse_unknown_source_get_objects; +} + +static void +seahorse_unknown_source_place_iface (SeahorsePlaceIface *iface) +{ + /* no implementation */ +} + +SeahorseUnknownSource* +seahorse_unknown_source_new (void) +{ + return g_object_new (SEAHORSE_TYPE_UNKNOWN_SOURCE, NULL); +} + +static void +on_cancellable_gone (gpointer user_data, + GObject *where_the_object_was) +{ + /* TODO: Change the icon */ +} + +SeahorseObject * +seahorse_unknown_source_add_object (SeahorseUnknownSource *self, + const gchar *keyid, + GCancellable *cancellable) +{ + SeahorseObject *object; + + g_return_val_if_fail (keyid != NULL, NULL); + g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), NULL); + + object = g_hash_table_lookup (self->keys, keyid); + if (object == NULL) { + object = SEAHORSE_OBJECT (seahorse_unknown_new (self, keyid, NULL)); + g_hash_table_insert (self->keys, g_strdup (keyid), object); + } + + if (cancellable) + g_object_weak_ref (G_OBJECT (cancellable), on_cancellable_gone, object); + + return object; +} diff -Nru seahorse-3.2.2/pgp/seahorse-unknown-source.h seahorse-3.6.3/pgp/seahorse-unknown-source.h --- seahorse-3.2.2/pgp/seahorse-unknown-source.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pgp/seahorse-unknown-source.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,47 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __SEAHORSE_UNKNOWN_SOURCE_H__ +#define __SEAHORSE_UNKNOWN_SOURCE_H__ + +#include "seahorse-object.h" + +#define SEAHORSE_TYPE_UNKNOWN_SOURCE (seahorse_unknown_source_get_type ()) +#define SEAHORSE_UNKNOWN_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_UNKNOWN_SOURCE, SeahorseUnknownSource)) +#define SEAHORSE_UNKNOWN_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_UNKNOWN_SOURCE, SeahorseUnknownSourceClass)) +#define SEAHORSE_IS_UNKNOWN_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_UNKNOWN_SOURCE)) +#define SEAHORSE_IS_UNKNOWN_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_UNKNOWN_SOURCE)) +#define SEAHORSE_UNKNOWN_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_UNKNOWN_SOURCE, SeahorseUnknownSourceClass)) + +typedef struct _SeahorseUnknownSource SeahorseUnknownSource; +typedef struct _SeahorseUnknownSourceClass SeahorseUnknownSourceClass; +typedef struct _SeahorseUnknownSourcePrivate SeahorseUnknownSourcePrivate; + +GType seahorse_unknown_source_get_type (void); + +SeahorseUnknownSource* seahorse_unknown_source_new (void); + +SeahorseObject* seahorse_unknown_source_add_object (SeahorseUnknownSource *self, + const gchar *keyid, + GCancellable *cancellable); + +#endif /* __SEAHORSE_UNKNOWN_SOURCE_H__ */ diff -Nru seahorse-3.2.2/pixmaps/22x22/Makefile.am seahorse-3.6.3/pixmaps/22x22/Makefile.am --- seahorse-3.2.2/pixmaps/22x22/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ - -icon22dir = $(datadir)/pixmaps/seahorse/22x22/ -icon22_DATA = seahorse-key.png \ - seahorse-key-personal.png \ - seahorse-key-ssh.png \ - seahorse-person.png \ - seahorse-sign.png \ - seahorse-sign-ok.png \ - seahorse-sign-bad.png - -iconsrc = seahorse-key.svg \ - seahorse-key-personal.svg \ - seahorse-key-ssh.svg \ - seahorse-person.svg \ - seahorse-sign.svg \ - seahorse-sign-ok.svg \ - seahorse-sign-bad.svg - -EXTRA_DIST = $(iconsrc) $(icon22_DATA) diff -Nru seahorse-3.2.2/pixmaps/22x22/Makefile.in seahorse-3.6.3/pixmaps/22x22/Makefile.in --- seahorse-3.2.2/pixmaps/22x22/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,490 +0,0 @@ -# Makefile.in generated by automake 1.11.1 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 = pixmaps/22x22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(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 = -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)$(icon22dir)" -DATA = $(icon22_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGG_CFLAGS = @EGG_CFLAGS@ -EGG_LIBS = @EGG_LIBS@ -EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@ -EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCK_CFLAGS = @GCK_CFLAGS@ -GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNUPG = @GNUPG@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -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@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NETLIBS = @NETLIBS@ -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@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ -SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ -SEAHORSE_LIBS = @SEAHORSE_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHARING_CFLAGS = @SHARING_CFLAGS@ -SHARING_LIBS = @SHARING_LIBS@ -SHELL = @SHELL@ -SOUP_CFLAGS = @SOUP_CFLAGS@ -SOUP_LIBS = @SOUP_LIBS@ -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ -SSH_PATH = @SSH_PATH@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -gsettingsschemadir = @gsettingsschemadir@ -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@ -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@ -icon22dir = $(datadir)/pixmaps/seahorse/22x22/ -icon22_DATA = seahorse-key.png \ - seahorse-key-personal.png \ - seahorse-key-ssh.png \ - seahorse-person.png \ - seahorse-sign.png \ - seahorse-sign-ok.png \ - seahorse-sign-bad.png - -iconsrc = seahorse-key.svg \ - seahorse-key-personal.svg \ - seahorse-key-ssh.svg \ - seahorse-person.svg \ - seahorse-sign.svg \ - seahorse-sign-ok.svg \ - seahorse-sign-bad.svg - -EXTRA_DIST = $(iconsrc) $(icon22_DATA) -all: all-am - -.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 pixmaps/22x22/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/22x22/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 -install-icon22DATA: $(icon22_DATA) - @$(NORMAL_INSTALL) - test -z "$(icon22dir)" || $(MKDIR_P) "$(DESTDIR)$(icon22dir)" - @list='$(icon22_DATA)'; test -n "$(icon22dir)" || 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)$(icon22dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icon22dir)" || exit $$?; \ - done - -uninstall-icon22DATA: - @$(NORMAL_UNINSTALL) - @list='$(icon22_DATA)'; test -n "$(icon22dir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(icon22dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(icon22dir)" && rm -f $$files -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icon22dir)"; 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 mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-icon22DATA - -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 -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-icon22DATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool 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-icon22DATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-icon22DATA - - -# 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: Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/22x22/seahorse-key-personal.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/22x22/seahorse-key-personal.png sind verschieden. diff -Nru seahorse-3.2.2/pixmaps/22x22/seahorse-key-personal.svg seahorse-3.6.3/pixmaps/22x22/seahorse-key-personal.svg --- seahorse-3.2.2/pixmaps/22x22/seahorse-key-personal.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/seahorse-key-personal.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,807 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/22x22/seahorse-key.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/22x22/seahorse-key.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/22x22/seahorse-key-ssh.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/22x22/seahorse-key-ssh.png sind verschieden. diff -Nru seahorse-3.2.2/pixmaps/22x22/seahorse-key-ssh.svg seahorse-3.6.3/pixmaps/22x22/seahorse-key-ssh.svg --- seahorse-3.2.2/pixmaps/22x22/seahorse-key-ssh.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/seahorse-key-ssh.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,1131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru seahorse-3.2.2/pixmaps/22x22/seahorse-key.svg seahorse-3.6.3/pixmaps/22x22/seahorse-key.svg --- seahorse-3.2.2/pixmaps/22x22/seahorse-key.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/seahorse-key.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,357 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/22x22/seahorse-person.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/22x22/seahorse-person.png sind verschieden. diff -Nru seahorse-3.2.2/pixmaps/22x22/seahorse-person.svg seahorse-3.6.3/pixmaps/22x22/seahorse-person.svg --- seahorse-3.2.2/pixmaps/22x22/seahorse-person.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/seahorse-person.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,532 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - People - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - users - people - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/22x22/seahorse-sign-bad.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/22x22/seahorse-sign-bad.png sind verschieden. diff -Nru seahorse-3.2.2/pixmaps/22x22/seahorse-sign-bad.svg seahorse-3.6.3/pixmaps/22x22/seahorse-sign-bad.svg --- seahorse-3.2.2/pixmaps/22x22/seahorse-sign-bad.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/seahorse-sign-bad.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,588 +0,0 @@ - - - - - - image/svg+xml - - - - - - CertificateJakub Steinercertificate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ Kein Zeilenumbruch am Dateiende. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/22x22/seahorse-sign-ok.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/22x22/seahorse-sign-ok.png sind verschieden. diff -Nru seahorse-3.2.2/pixmaps/22x22/seahorse-sign-ok.svg seahorse-3.6.3/pixmaps/22x22/seahorse-sign-ok.svg --- seahorse-3.2.2/pixmaps/22x22/seahorse-sign-ok.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/seahorse-sign-ok.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,751 +0,0 @@ - - - - - - image/svg+xml - - - - - - CertificateJakub Steinercertificate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ Kein Zeilenumbruch am Dateiende. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/22x22/seahorse-sign.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/22x22/seahorse-sign.png sind verschieden. diff -Nru seahorse-3.2.2/pixmaps/22x22/seahorse-sign.svg seahorse-3.6.3/pixmaps/22x22/seahorse-sign.svg --- seahorse-3.2.2/pixmaps/22x22/seahorse-sign.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/22x22/seahorse-sign.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,446 +0,0 @@ - - - - - - image/svg+xml - - - - - - CertificateJakub Steinercertificate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ Kein Zeilenumbruch am Dateiende. diff -Nru seahorse-3.2.2/pixmaps/48x48/Makefile.am seahorse-3.6.3/pixmaps/48x48/Makefile.am --- seahorse-3.2.2/pixmaps/48x48/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/48x48/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ - -icon48dir = $(datadir)/pixmaps/seahorse/48x48/ -icon48_DATA = seahorse-key.png \ - seahorse-key-personal.png \ - seahorse-key-ssh.png \ - seahorse-person.png \ - seahorse-sign.png \ - seahorse-sign-bad.png \ - seahorse-sign-ok.png \ - seahorse-sign-unknown.png - -EXTRA_DIST = $(icon48_DATA) diff -Nru seahorse-3.2.2/pixmaps/48x48/Makefile.in seahorse-3.6.3/pixmaps/48x48/Makefile.in --- seahorse-3.2.2/pixmaps/48x48/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/pixmaps/48x48/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,483 +0,0 @@ -# Makefile.in generated by automake 1.11.1 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 = pixmaps/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(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 = -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)$(icon48dir)" -DATA = $(icon48_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGG_CFLAGS = @EGG_CFLAGS@ -EGG_LIBS = @EGG_LIBS@ -EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@ -EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCK_CFLAGS = @GCK_CFLAGS@ -GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNUPG = @GNUPG@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -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@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NETLIBS = @NETLIBS@ -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@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ -SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ -SEAHORSE_LIBS = @SEAHORSE_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHARING_CFLAGS = @SHARING_CFLAGS@ -SHARING_LIBS = @SHARING_LIBS@ -SHELL = @SHELL@ -SOUP_CFLAGS = @SOUP_CFLAGS@ -SOUP_LIBS = @SOUP_LIBS@ -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ -SSH_PATH = @SSH_PATH@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -gsettingsschemadir = @gsettingsschemadir@ -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@ -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@ -icon48dir = $(datadir)/pixmaps/seahorse/48x48/ -icon48_DATA = seahorse-key.png \ - seahorse-key-personal.png \ - seahorse-key-ssh.png \ - seahorse-person.png \ - seahorse-sign.png \ - seahorse-sign-bad.png \ - seahorse-sign-ok.png \ - seahorse-sign-unknown.png - -EXTRA_DIST = $(icon48_DATA) -all: all-am - -.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 pixmaps/48x48/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/48x48/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 -install-icon48DATA: $(icon48_DATA) - @$(NORMAL_INSTALL) - test -z "$(icon48dir)" || $(MKDIR_P) "$(DESTDIR)$(icon48dir)" - @list='$(icon48_DATA)'; test -n "$(icon48dir)" || 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)$(icon48dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icon48dir)" || exit $$?; \ - done - -uninstall-icon48DATA: - @$(NORMAL_UNINSTALL) - @list='$(icon48_DATA)'; test -n "$(icon48dir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(icon48dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(icon48dir)" && rm -f $$files -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icon48dir)"; 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 mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-icon48DATA - -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 -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-icon48DATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool 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-icon48DATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-icon48DATA - - -# 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: Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-key-personal.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-key-personal.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-key.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-key.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-key-ssh.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-key-ssh.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-person.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-person.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-sign-bad.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-sign-bad.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-sign-ok.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-sign-ok.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-sign.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-sign.png sind verschieden. Binärdateien /tmp/mWczyWkoQM/seahorse-3.2.2/pixmaps/48x48/seahorse-sign-unknown.png und /tmp/lzerpLe8rK/seahorse-3.6.3/pixmaps/48x48/seahorse-sign-unknown.png sind verschieden. diff -Nru seahorse-3.2.2/pixmaps/Makefile.am seahorse-3.6.3/pixmaps/Makefile.am --- seahorse-3.2.2/pixmaps/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -SUBDIRS = 22x22 48x48 scalable - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi diff -Nru seahorse-3.2.2/pixmaps/Makefile.in seahorse-3.6.3/pixmaps/Makefile.in --- seahorse-3.2.2/pixmaps/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/pixmaps/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,642 +0,0 @@ -# Makefile.in generated by automake 1.11.1 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 = pixmaps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(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@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGG_CFLAGS = @EGG_CFLAGS@ -EGG_LIBS = @EGG_LIBS@ -EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@ -EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCK_CFLAGS = @GCK_CFLAGS@ -GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNUPG = @GNUPG@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -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@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NETLIBS = @NETLIBS@ -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@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ -SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ -SEAHORSE_LIBS = @SEAHORSE_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHARING_CFLAGS = @SHARING_CFLAGS@ -SHARING_LIBS = @SHARING_LIBS@ -SHELL = @SHELL@ -SOUP_CFLAGS = @SOUP_CFLAGS@ -SOUP_LIBS = @SOUP_LIBS@ -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ -SSH_PATH = @SSH_PATH@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -gsettingsschemadir = @gsettingsschemadir@ -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@ -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 = 22x22 48x48 scalable -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -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 pixmaps/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/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): - @fail= 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): - @fail= 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: - @$(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-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: - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.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 \ - 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-data-hook 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 uninstall-hook - - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -# 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 seahorse-3.2.2/pixmaps/scalable/Makefile.am seahorse-3.6.3/pixmaps/scalable/Makefile.am --- seahorse-3.2.2/pixmaps/scalable/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -iconsvgdir = $(datadir)/pixmaps/seahorse/scalable/ -iconsvg_DATA = seahorse-key.svg \ - seahorse-key-personal.svg \ - seahorse-key-ssh.svg \ - seahorse-person.svg \ - seahorse-sign.svg \ - seahorse-sign-bad.svg \ - seahorse-sign-ok.svg \ - seahorse-sign-unknown.svg - -EXTRA_DIST = $(iconsvg_DATA) diff -Nru seahorse-3.2.2/pixmaps/scalable/Makefile.in seahorse-3.6.3/pixmaps/scalable/Makefile.in --- seahorse-3.2.2/pixmaps/scalable/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,483 +0,0 @@ -# Makefile.in generated by automake 1.11.1 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 = pixmaps/scalable -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(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 = -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)$(iconsvgdir)" -DATA = $(iconsvg_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGG_CFLAGS = @EGG_CFLAGS@ -EGG_LIBS = @EGG_LIBS@ -EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@ -EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCK_CFLAGS = @GCK_CFLAGS@ -GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNUPG = @GNUPG@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -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@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NETLIBS = @NETLIBS@ -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@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ -SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@ -SEAHORSE_LIBS = @SEAHORSE_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHARING_CFLAGS = @SHARING_CFLAGS@ -SHARING_LIBS = @SHARING_LIBS@ -SHELL = @SHELL@ -SOUP_CFLAGS = @SOUP_CFLAGS@ -SOUP_LIBS = @SOUP_LIBS@ -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@ -SSH_PATH = @SSH_PATH@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -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@ -gsettingsschemadir = @gsettingsschemadir@ -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@ -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@ -iconsvgdir = $(datadir)/pixmaps/seahorse/scalable/ -iconsvg_DATA = seahorse-key.svg \ - seahorse-key-personal.svg \ - seahorse-key-ssh.svg \ - seahorse-person.svg \ - seahorse-sign.svg \ - seahorse-sign-bad.svg \ - seahorse-sign-ok.svg \ - seahorse-sign-unknown.svg - -EXTRA_DIST = $(iconsvg_DATA) -all: all-am - -.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 pixmaps/scalable/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pixmaps/scalable/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 -install-iconsvgDATA: $(iconsvg_DATA) - @$(NORMAL_INSTALL) - test -z "$(iconsvgdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsvgdir)" - @list='$(iconsvg_DATA)'; test -n "$(iconsvgdir)" || 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)$(iconsvgdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsvgdir)" || exit $$?; \ - done - -uninstall-iconsvgDATA: - @$(NORMAL_UNINSTALL) - @list='$(iconsvg_DATA)'; test -n "$(iconsvgdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsvgdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsvgdir)" && rm -f $$files -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 $(DATA) -installdirs: - for dir in "$(DESTDIR)$(iconsvgdir)"; 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 mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-iconsvgDATA - -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 -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-iconsvgDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool 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-iconsvgDATA 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsvgDATA - - -# 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 seahorse-3.2.2/pixmaps/scalable/seahorse-key-personal.svg seahorse-3.6.3/pixmaps/scalable/seahorse-key-personal.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-key-personal.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-key-personal.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,757 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru seahorse-3.2.2/pixmaps/scalable/seahorse-key-ssh.svg seahorse-3.6.3/pixmaps/scalable/seahorse-key-ssh.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-key-ssh.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-key-ssh.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,786 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru seahorse-3.2.2/pixmaps/scalable/seahorse-key.svg seahorse-3.6.3/pixmaps/scalable/seahorse-key.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-key.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-key.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru seahorse-3.2.2/pixmaps/scalable/seahorse-person.svg seahorse-3.6.3/pixmaps/scalable/seahorse-person.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-person.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-person.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,467 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - People - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - users - people - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru seahorse-3.2.2/pixmaps/scalable/seahorse-sign-bad.svg seahorse-3.6.3/pixmaps/scalable/seahorse-sign-bad.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-sign-bad.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-sign-bad.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,599 +0,0 @@ - - - - - - image/svg+xml - - - - - - CertificateJakub Steinercertificate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ Kein Zeilenumbruch am Dateiende. diff -Nru seahorse-3.2.2/pixmaps/scalable/seahorse-sign-ok.svg seahorse-3.6.3/pixmaps/scalable/seahorse-sign-ok.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-sign-ok.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-sign-ok.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,757 +0,0 @@ - - - - - - image/svg+xml - - - - - - CertificateJakub Steinercertificate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ Kein Zeilenumbruch am Dateiende. diff -Nru seahorse-3.2.2/pixmaps/scalable/seahorse-sign.svg seahorse-3.6.3/pixmaps/scalable/seahorse-sign.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-sign.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-sign.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,441 +0,0 @@ - - - - - - image/svg+xml - - - - - - CertificateJakub Steinercertificate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ Kein Zeilenumbruch am Dateiende. diff -Nru seahorse-3.2.2/pixmaps/scalable/seahorse-sign-unknown.svg seahorse-3.6.3/pixmaps/scalable/seahorse-sign-unknown.svg --- seahorse-3.2.2/pixmaps/scalable/seahorse-sign-unknown.svg 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pixmaps/scalable/seahorse-sign-unknown.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,1289 +0,0 @@ - - - - - - image/svg+xml - - - - - - CertificateJakub Steinercertificate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ Kein Zeilenumbruch am Dateiende. diff -Nru seahorse-3.2.2/pkcs11/Makefile.am seahorse-3.6.3/pkcs11/Makefile.am --- seahorse-3.2.2/pkcs11/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/Makefile.am 2012-11-09 11:08:13.000000000 +0100 @@ -7,32 +7,34 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ - -DGCR_API_SUBJECT_TO_CHANGE \ - -DGCK_API_SUBJECT_TO_CHANGE \ -DGETTEXT_PACKAGE=\""seahorse\"" noinst_LTLIBRARIES = libseahorse-pkcs11.la libseahorse_pkcs11_la_SOURCES = \ - seahorse-pkcs11-certificate.c seahorse-pkcs11-certificate.h \ - seahorse-pkcs11-certificate-props.c seahorse-pkcs11-certificate-props.h \ - seahorse-pkcs11-commands.c seahorse-pkcs11-commands.h \ - seahorse-pkcs11-module.c seahorse-pkcs11-module.h \ + seahorse-certificate.c seahorse-certificate.h \ + seahorse-certificate-der-exporter.c seahorse-certificate-der-exporter.h \ + seahorse-pkcs11-backend.c seahorse-pkcs11-backend.h \ + seahorse-pkcs11-deleter.c seahorse-pkcs11-deleter.h \ seahorse-pkcs11-helpers.c seahorse-pkcs11-helpers.h \ - seahorse-pkcs11-object.c seahorse-pkcs11-object.h \ - seahorse-pkcs11-operations.c seahorse-pkcs11-operations.h \ - seahorse-pkcs11-source.c seahorse-pkcs11-source.h\ - seahorse-pkcs11.c seahorse-pkcs11.h + seahorse-pkcs11-generate.c seahorse-pkcs11-generate.h \ + seahorse-pkcs11-key-deleter.c seahorse-pkcs11-key-deleter.h \ + seahorse-pkcs11-properties.c seahorse-pkcs11-properties.h \ + seahorse-pkcs11-request.c seahorse-pkcs11-request.h \ + seahorse-pkcs11.c seahorse-pkcs11.h \ + seahorse-private-key.c seahorse-private-key.h \ + seahorse-token.c seahorse-token.h libseahorse_pkcs11_la_LIBADD = \ $(top_builddir)/libseahorse/libseahorse.la \ $(GCR_LIBS) -ui_DATA = +ui_DATA = \ + seahorse-pkcs11-generate.xml \ + seahorse-pkcs11-request.xml EXTRA_DIST = \ $(ui_DATA) diff -Nru seahorse-3.2.2/pkcs11/Makefile.in seahorse-3.6.3/pkcs11/Makefile.in --- seahorse-3.2.2/pkcs11/Makefile.in 2011-11-14 11:51:42.000000000 +0100 +++ seahorse-3.6.3/pkcs11/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,13 +52,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = pkcs11 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -50,20 +67,32 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = libseahorse_pkcs11_la_DEPENDENCIES = \ - $(top_builddir)/libseahorse/libseahorse.la \ - $(am__DEPENDENCIES_1) -am_libseahorse_pkcs11_la_OBJECTS = seahorse-pkcs11-certificate.lo \ - seahorse-pkcs11-certificate-props.lo \ - seahorse-pkcs11-commands.lo seahorse-pkcs11-module.lo \ - seahorse-pkcs11-helpers.lo seahorse-pkcs11-object.lo \ - seahorse-pkcs11-operations.lo seahorse-pkcs11-source.lo \ - seahorse-pkcs11.lo + $(top_builddir)/libseahorse/libseahorse.la +am_libseahorse_pkcs11_la_OBJECTS = seahorse-certificate.lo \ + seahorse-certificate-der-exporter.lo \ + seahorse-pkcs11-backend.lo seahorse-pkcs11-deleter.lo \ + seahorse-pkcs11-helpers.lo seahorse-pkcs11-generate.lo \ + seahorse-pkcs11-key-deleter.lo seahorse-pkcs11-properties.lo \ + seahorse-pkcs11-request.lo seahorse-pkcs11.lo \ + seahorse-private-key.lo seahorse-token.lo libseahorse_pkcs11_la_OBJECTS = $(am_libseahorse_pkcs11_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -74,24 +103,25 @@ $(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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libseahorse_pkcs11_la_SOURCES) DIST_SOURCES = $(libseahorse_pkcs11_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -113,6 +143,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) ETAGS = etags @@ -142,9 +178,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,15 +193,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -186,10 +216,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -207,7 +244,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -242,6 +278,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -277,6 +314,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale @@ -302,31 +341,34 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ - -DGCR_API_SUBJECT_TO_CHANGE \ - -DGCK_API_SUBJECT_TO_CHANGE \ -DGETTEXT_PACKAGE=\""seahorse\"" noinst_LTLIBRARIES = libseahorse-pkcs11.la libseahorse_pkcs11_la_SOURCES = \ - seahorse-pkcs11-certificate.c seahorse-pkcs11-certificate.h \ - seahorse-pkcs11-certificate-props.c seahorse-pkcs11-certificate-props.h \ - seahorse-pkcs11-commands.c seahorse-pkcs11-commands.h \ - seahorse-pkcs11-module.c seahorse-pkcs11-module.h \ + seahorse-certificate.c seahorse-certificate.h \ + seahorse-certificate-der-exporter.c seahorse-certificate-der-exporter.h \ + seahorse-pkcs11-backend.c seahorse-pkcs11-backend.h \ + seahorse-pkcs11-deleter.c seahorse-pkcs11-deleter.h \ seahorse-pkcs11-helpers.c seahorse-pkcs11-helpers.h \ - seahorse-pkcs11-object.c seahorse-pkcs11-object.h \ - seahorse-pkcs11-operations.c seahorse-pkcs11-operations.h \ - seahorse-pkcs11-source.c seahorse-pkcs11-source.h\ - seahorse-pkcs11.c seahorse-pkcs11.h + seahorse-pkcs11-generate.c seahorse-pkcs11-generate.h \ + seahorse-pkcs11-key-deleter.c seahorse-pkcs11-key-deleter.h \ + seahorse-pkcs11-properties.c seahorse-pkcs11-properties.h \ + seahorse-pkcs11-request.c seahorse-pkcs11-request.h \ + seahorse-pkcs11.c seahorse-pkcs11.h \ + seahorse-private-key.c seahorse-private-key.h \ + seahorse-token.c seahorse-token.h libseahorse_pkcs11_la_LIBADD = \ $(top_builddir)/libseahorse/libseahorse.la \ $(GCR_LIBS) -ui_DATA = +ui_DATA = \ + seahorse-pkcs11-generate.xml \ + seahorse-pkcs11-request.xml + EXTRA_DIST = \ $(ui_DATA) @@ -343,9 +385,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pkcs11/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pkcs11/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu pkcs11/Makefile + $(AUTOMAKE) --foreign pkcs11/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -367,13 +409,15 @@ 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 -libseahorse-pkcs11.la: $(libseahorse_pkcs11_la_OBJECTS) $(libseahorse_pkcs11_la_DEPENDENCIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libseahorse-pkcs11.la: $(libseahorse_pkcs11_la_OBJECTS) $(libseahorse_pkcs11_la_DEPENDENCIES) $(EXTRA_libseahorse_pkcs11_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libseahorse_pkcs11_la_OBJECTS) $(libseahorse_pkcs11_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -382,39 +426,39 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-certificate-props.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-certificate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-commands.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-certificate-der-exporter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-certificate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-backend.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-deleter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-generate.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-helpers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-module.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-object.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-operations.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-key-deleter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-properties.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11-request.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-pkcs11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-private-key.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-token.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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -423,8 +467,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -438,9 +485,7 @@ @$(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 + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -491,6 +536,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -541,10 +600,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -630,18 +694,18 @@ .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 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-uiDATA + clean-libtool clean-noinstLTLIBRARIES cscopelist 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 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-uiDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru seahorse-3.2.2/pkcs11/seahorse-certificate.c seahorse-3.6.3/pkcs11/seahorse-certificate.c --- seahorse-3.2.2/pkcs11/seahorse-certificate.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-certificate.c 2012-11-09 17:31:53.000000000 +0100 @@ -0,0 +1,471 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-certificate.h" +#include "seahorse-certificate-der-exporter.h" +#include "seahorse-pkcs11.h" +#include "seahorse-pkcs11-deleter.h" +#include "seahorse-pkcs11-helpers.h" +#include "seahorse-pkcs11-properties.h" +#include "seahorse-private-key.h" +#include "seahorse-token.h" +#include "seahorse-types.h" + +#include "seahorse-deletable.h" +#include "seahorse-exportable.h" +#include "seahorse-util.h" +#include "seahorse-validity.h" +#include "seahorse-viewable.h" + +#include + +#include + +static const gulong REQUIRED_ATTRS[] = { + CKA_VALUE, + CKA_ID, + CKA_LABEL, + CKA_CLASS, + CKA_CERTIFICATE_CATEGORY, + CKA_MODIFIABLE +}; + +enum { + PROP_0, + PROP_PLACE, + PROP_ATTRIBUTES, + PROP_FLAGS, + PROP_ACTIONS, + PROP_PARTNER, + + PROP_EXPORTABLE, + PROP_DELETABLE, + PROP_ICON, + PROP_DESCRIPTION +}; + +struct _SeahorseCertificatePrivate { + SeahorseToken *token; + GckAttributes *attributes; + const GckAttribute *value; + SeahorsePrivateKey *private_key; + GIcon *icon; + guint flags; +}; + +static void seahorse_certificate_certificate_iface (GcrCertificateIface *iface); + +static void seahorse_certificate_object_cache_iface (GckObjectCacheIface *iface); + +static void seahorse_certificate_deletable_iface (SeahorseDeletableIface *iface); + +static void seahorse_certificate_exportable_iface (SeahorseExportableIface *iface); + +static void seahorse_certificate_viewable_iface (SeahorseViewableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseCertificate, seahorse_certificate, GCK_TYPE_OBJECT, + GCR_CERTIFICATE_MIXIN_IMPLEMENT_COMPARABLE (); + G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, seahorse_certificate_certificate_iface); + G_IMPLEMENT_INTERFACE (GCK_TYPE_OBJECT_CACHE, seahorse_certificate_object_cache_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_DELETABLE, seahorse_certificate_deletable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTABLE, seahorse_certificate_exportable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEWABLE, seahorse_certificate_viewable_iface); +); + +static void +update_icon (SeahorseCertificate *self) +{ + GEmblem *emblem; + GIcon *eicon; + GIcon *icon; + + g_clear_object (&self->pv->icon); + icon = gcr_certificate_get_icon (GCR_CERTIFICATE (self)); + if (self->pv->private_key) { + eicon = g_themed_icon_new (GCR_ICON_KEY); + emblem = g_emblem_new (eicon); + self->pv->icon = g_emblemed_icon_new (icon, emblem); + g_object_unref (icon); + g_object_unref (eicon); + g_object_unref (emblem); + } else { + self->pv->icon = icon; + } +} + +static void +seahorse_certificate_init (SeahorseCertificate *self) +{ + self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_CERTIFICATE, SeahorseCertificatePrivate)); + self->pv->value = NULL; + self->pv->flags = G_MAXUINT; +} + +static void +seahorse_certificate_notify (GObject *obj, + GParamSpec *pspec) +{ + /* When the base class attributes changes, it can affects lots */ + if (g_str_equal (pspec->name, "attributes")) + gcr_certificate_mixin_emit_notify (GCR_CERTIFICATE (obj)); + + if (G_OBJECT_CLASS (seahorse_certificate_parent_class)->notify) + G_OBJECT_CLASS (seahorse_certificate_parent_class)->notify (obj, pspec); +} + +static void +seahorse_certificate_dispose (GObject *obj) +{ + SeahorseCertificate *self = SEAHORSE_CERTIFICATE (obj); + + seahorse_certificate_set_partner (self, NULL); + + G_OBJECT_CLASS (seahorse_certificate_parent_class)->dispose (obj); +} + +static void +seahorse_certificate_finalize (GObject *obj) +{ + SeahorseCertificate *self = SEAHORSE_CERTIFICATE (obj); + + if (self->pv->attributes) + gck_attributes_unref (self->pv->attributes); + self->pv->value = NULL; + + G_OBJECT_CLASS (seahorse_certificate_parent_class)->finalize (obj); +} + +static guint +calc_is_personal_and_trusted (SeahorseCertificate *self) +{ + gulong category = 0; + gboolean is_ca; + + /* If a matching private key, then this is personal*/ + if (self->pv->private_key) + return SEAHORSE_FLAG_PERSONAL | SEAHORSE_FLAG_TRUSTED; + + if (gck_attributes_find_ulong (self->pv->attributes, CKA_CERTIFICATE_CATEGORY, &category)) { + if (category == 2) + return 0; + else if (category == 1) + return SEAHORSE_FLAG_PERSONAL; + } + + if (gcr_certificate_get_basic_constraints (GCR_CERTIFICATE (self), &is_ca, NULL)) + return is_ca ? 0 : SEAHORSE_FLAG_PERSONAL; + + return SEAHORSE_FLAG_PERSONAL; +} + +static void +ensure_flags (SeahorseCertificate *self) +{ + if (self->pv->flags != G_MAXUINT) + return; + + self->pv->flags = SEAHORSE_FLAG_EXPORTABLE | + calc_is_personal_and_trusted (self); +} + +static void +seahorse_certificate_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseCertificate *self = SEAHORSE_CERTIFICATE (obj); + + switch (prop_id) { + case PROP_PLACE: + g_value_set_object (value, self->pv->token); + break; + case PROP_ATTRIBUTES: + g_value_set_boxed (value, self->pv->attributes); + break; + case PROP_FLAGS: + ensure_flags (self); + g_value_set_flags (value, self->pv->flags); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + case PROP_PARTNER: + g_value_set_object (value, seahorse_certificate_get_partner (self)); + break; + case PROP_ICON: + g_value_set_object (value, seahorse_certificate_get_icon (self)); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, seahorse_certificate_get_description (self)); + break; + case PROP_EXPORTABLE: + g_value_set_boolean (value, gck_attributes_find (self->pv->attributes, CKA_VALUE) != NULL); + break; + case PROP_DELETABLE: + g_value_set_boolean (value, seahorse_token_is_deletable (self->pv->token, GCK_OBJECT (self))); + break; + default: + gcr_certificate_mixin_get_property (obj, prop_id, value, pspec); + break; + } +} + +static void +seahorse_certificate_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseCertificate *self = SEAHORSE_CERTIFICATE (obj); + + switch (prop_id) { + case PROP_PLACE: + if (self->pv->token) + g_object_remove_weak_pointer (G_OBJECT (self->pv->token), + (gpointer *)&self->pv->token); + self->pv->token = g_value_get_object (value); + if (self->pv->token) + g_object_add_weak_pointer (G_OBJECT (self->pv->token), + (gpointer *)&self->pv->token); + break; + case PROP_ATTRIBUTES: + if (self->pv->attributes) + gck_attributes_unref (self->pv->attributes); + self->pv->attributes = g_value_dup_boxed (value); + g_return_if_fail (self->pv->attributes); + self->pv->value = gck_attributes_find (self->pv->attributes, CKA_VALUE); + g_return_if_fail (self->pv->value != NULL); + g_return_if_fail (!gck_attribute_is_invalid (self->pv->value)); + break; + case PROP_PARTNER: + seahorse_certificate_set_partner (self, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_certificate_class_init (SeahorseCertificateClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (SeahorseCertificatePrivate)); + + gobject_class->dispose = seahorse_certificate_dispose; + gobject_class->finalize = seahorse_certificate_finalize; + gobject_class->set_property = seahorse_certificate_set_property; + gobject_class->get_property = seahorse_certificate_get_property; + gobject_class->notify = seahorse_certificate_notify; + + g_object_class_install_property (gobject_class, PROP_PLACE, + g_param_spec_object ("place", "place", "place", SEAHORSE_TYPE_TOKEN, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_FLAGS, + g_param_spec_flags ("object-flags", "flags", "flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_ACTIONS, + g_param_spec_object ("actions", "Actions", "Actions", GTK_TYPE_ACTION_GROUP, + G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_PARTNER, + g_param_spec_object ("partner", "Partner", "Private key associated with certificate", + SEAHORSE_TYPE_PRIVATE_KEY, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_override_property (gobject_class, PROP_ATTRIBUTES, "attributes"); + + g_object_class_override_property (gobject_class, PROP_DELETABLE, "deletable"); + + g_object_class_override_property (gobject_class, PROP_EXPORTABLE, "exportable"); + + g_object_class_override_property (gobject_class, PROP_ICON, "icon"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + + gcr_certificate_mixin_class_init (gobject_class); +} + +static const guchar * +seahorse_certificate_get_der_data (GcrCertificate *cert, + gsize *n_length) +{ + SeahorseCertificate *self = SEAHORSE_CERTIFICATE (cert); + + g_return_val_if_fail (self->pv->value != NULL && + !gck_attribute_is_invalid (self->pv->value), NULL); + *n_length = self->pv->value->length; + return self->pv->value->value; +} + +static void +seahorse_certificate_certificate_iface (GcrCertificateIface *iface) +{ + iface->get_der_data = (gpointer)seahorse_certificate_get_der_data; +} + +static void +seahorse_certificate_fill (GckObjectCache *object, + GckAttributes *attributes) +{ + SeahorseCertificate *self = SEAHORSE_CERTIFICATE (object); + GckBuilder builder = GCK_BUILDER_INIT; + + if (self->pv->attributes) + gck_builder_add_all (&builder, self->pv->attributes); + gck_builder_set_all (&builder, attributes); + gck_attributes_unref (self->pv->attributes); + self->pv->attributes = gck_builder_steal (&builder); + gck_builder_clear (&builder); + + g_object_notify (G_OBJECT (object), "attributes"); +} + +static void +seahorse_certificate_object_cache_iface (GckObjectCacheIface *iface) +{ + iface->default_types = REQUIRED_ATTRS; + iface->n_default_types = G_N_ELEMENTS (REQUIRED_ATTRS); + iface->fill = seahorse_certificate_fill; +} + +static GList * +seahorse_certificate_create_exporters (SeahorseExportable *exportable, + SeahorseExporterType type) +{ + SeahorseExporter *exporter; + gboolean can_export = FALSE; + + g_object_get (exportable, "exportable", &can_export, NULL); + if (!can_export) + return NULL; + + exporter = seahorse_certificate_der_exporter_new (SEAHORSE_CERTIFICATE (exportable)); + return g_list_append (NULL, exporter); +} + +static void +seahorse_certificate_exportable_iface (SeahorseExportableIface *iface) +{ + iface->create_exporters = seahorse_certificate_create_exporters; +} + +static SeahorseDeleter * +seahorse_certificate_create_deleter (SeahorseDeletable *deletable) +{ + SeahorseCertificate *self = SEAHORSE_CERTIFICATE (deletable); + SeahorseDeleter *deleter = NULL; + + if (self->pv->private_key) + deleter = seahorse_deletable_create_deleter (SEAHORSE_DELETABLE (self->pv->private_key)); + + if (seahorse_token_is_deletable (self->pv->token, GCK_OBJECT (self))) { + if (deleter == NULL) + deleter = seahorse_pkcs11_deleter_new (self); + else if (!seahorse_deleter_add_object (deleter, G_OBJECT (self))) + g_return_val_if_reached (NULL); + } + + return deleter; +} + +static void +seahorse_certificate_deletable_iface (SeahorseDeletableIface *iface) +{ + iface->create_deleter = seahorse_certificate_create_deleter; +} + +static void +seahorse_certificate_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent) +{ + GtkWindow *viewer = seahorse_pkcs11_properties_show (G_OBJECT (viewable), parent); + gtk_widget_show (GTK_WIDGET (viewer)); +} + +static void +seahorse_certificate_viewable_iface (SeahorseViewableIface *iface) +{ + iface->show_viewer = seahorse_certificate_show_viewer; +} + +GIcon * +seahorse_certificate_get_icon (SeahorseCertificate *self) +{ + g_return_val_if_fail (SEAHORSE_IS_CERTIFICATE (self), NULL); + + if (!self->pv->icon) + update_icon (self); + + return self->pv->icon; +} + +const gchar * +seahorse_certificate_get_description (SeahorseCertificate *self) +{ + g_return_val_if_fail (SEAHORSE_IS_CERTIFICATE (self), NULL); + + ensure_flags (self); + + if (self->pv->private_key) + return _("Personal certificate and key"); + + if (self->pv->flags & SEAHORSE_FLAG_PERSONAL) + return _("Personal certificate"); + else + return _("Certificate"); +} + +SeahorsePrivateKey * +seahorse_certificate_get_partner (SeahorseCertificate *self) +{ + g_return_val_if_fail (SEAHORSE_IS_CERTIFICATE (self), NULL); + return self->pv->private_key; +} + +void +seahorse_certificate_set_partner (SeahorseCertificate *self, + SeahorsePrivateKey *private_key) +{ + GObject *obj; + + g_return_if_fail (SEAHORSE_IS_CERTIFICATE (self)); + g_return_if_fail (private_key == NULL || SEAHORSE_IS_PRIVATE_KEY (private_key)); + + if (self->pv->private_key) + g_object_remove_weak_pointer (G_OBJECT (self->pv->private_key), + (gpointer *)self->pv->private_key); + self->pv->private_key = private_key; + if (self->pv->private_key) + g_object_add_weak_pointer (G_OBJECT (private_key), + (gpointer *)self->pv->private_key); + + obj = G_OBJECT (self); + g_object_notify (obj, "partner"); + g_clear_object (&self->pv->icon); + g_object_notify (obj, "icon"); + g_object_notify (obj, "description"); +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-certificate-der-exporter.c seahorse-3.6.3/pkcs11/seahorse-certificate-der-exporter.c --- seahorse-3.2.2/pkcs11/seahorse-certificate-der-exporter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-certificate-der-exporter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,245 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-certificate.h" +#include "seahorse-certificate-der-exporter.h" + +#include "seahorse-util.h" + +#include + +#include + +#include + +#define SEAHORSE_CERTIFICATE_DER_EXPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER, SeahorseCertificateDerExporterClass)) +#define SEAHORSE_IS_CERTIFICATE_DER_EXPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER)) +#define SEAHORSE_CERTIFICATE_DER_EXPORTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER, SeahorseCertificateDerExporterClass)) + +typedef struct _SeahorseCertificateDerExporterClass SeahorseCertificateDerExporterClass; + +struct _SeahorseCertificateDerExporter { + GObject parent; + SeahorseCertificate *certificate; + GList *objects; +}; + +struct _SeahorseCertificateDerExporterClass { + GObjectClass parent_class; +}; + +enum { + PROP_0, + PROP_FILENAME, + PROP_CONTENT_TYPE, + PROP_FILE_FILTER, +}; + +static void seahorse_certificate_der_exporter_iface_init (SeahorseExporterIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseCertificateDerExporter, seahorse_certificate_der_exporter, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTER, seahorse_certificate_der_exporter_iface_init); +); + +static gchar * +calc_filename (SeahorseCertificateDerExporter *self) +{ + const gchar *basename = NULL; + gchar *label = NULL; + gchar *filename; + + g_return_val_if_fail (self->certificate, NULL); + + g_object_get (self->certificate, "label", &label, NULL); + if (label == NULL) + basename = _("Certificate"); + else + basename = label; + + filename = g_strconcat (basename, ".crt", NULL); + g_strstrip (filename); + g_strdelimit (filename, SEAHORSE_BAD_FILENAME_CHARS, '_'); + g_free (label); + return filename; +} + +static const gchar * +calc_content_type (SeahorseCertificateDerExporter *self) +{ + return "application/pkix-cert"; +} + +static GtkFileFilter * +calc_file_filter (SeahorseCertificateDerExporter *self) +{ + GtkFileFilter *filter = gtk_file_filter_new (); + + gtk_file_filter_set_name (filter, _("Certificates (DER encoded)")); + gtk_file_filter_add_mime_type (filter, "application/pkix-cert"); + gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert"); + gtk_file_filter_add_mime_type (filter, "application/x-x509-user-cert"); + gtk_file_filter_add_pattern (filter, "*.cer"); + gtk_file_filter_add_pattern (filter, "*.crt"); + gtk_file_filter_add_pattern (filter, "*.cert"); + + return filter; +} + +static void +seahorse_certificate_der_exporter_init (SeahorseCertificateDerExporter *self) +{ + +} + +static void +seahorse_certificate_der_exporter_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseCertificateDerExporter *self = SEAHORSE_CERTIFICATE_DER_EXPORTER (object); + + switch (prop_id) { + case PROP_FILENAME: + g_value_take_string (value, calc_filename (self)); + break; + case PROP_CONTENT_TYPE: + g_value_set_string (value, calc_content_type (self)); + break; + case PROP_FILE_FILTER: + g_value_take_object (value, calc_file_filter (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +seahorse_certificate_der_exporter_finalize (GObject *obj) +{ + SeahorseCertificateDerExporter *self = SEAHORSE_CERTIFICATE_DER_EXPORTER (obj); + + g_clear_object (&self->certificate); + g_list_free (self->objects); + + G_OBJECT_CLASS (seahorse_certificate_der_exporter_parent_class)->finalize (obj); +} + +static void +seahorse_certificate_der_exporter_class_init (SeahorseCertificateDerExporterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->finalize = seahorse_certificate_der_exporter_finalize; + gobject_class->get_property = seahorse_certificate_der_exporter_get_property; + + g_object_class_override_property (gobject_class, PROP_FILENAME, "filename"); + g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type"); + g_object_class_override_property (gobject_class, PROP_FILE_FILTER, "file-filter"); +} + +static GList * +seahorse_certificate_der_exporter_get_objects (SeahorseExporter *exporter) +{ + SeahorseCertificateDerExporter *self = SEAHORSE_CERTIFICATE_DER_EXPORTER (exporter); + return self->objects; +} + +static gboolean +seahorse_certificate_der_exporter_add_object (SeahorseExporter *exporter, + GObject *object) +{ + SeahorseCertificateDerExporter *self = SEAHORSE_CERTIFICATE_DER_EXPORTER (exporter); + + if (self->certificate == NULL && SEAHORSE_IS_CERTIFICATE (object)) { + self->certificate = g_object_ref (object); + self->objects = g_list_append (self->objects, self->certificate); + return TRUE; + } + + return FALSE; +} + +static void +seahorse_certificate_der_exporter_export_async (SeahorseExporter *exporter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseCertificateDerExporter *self = SEAHORSE_CERTIFICATE_DER_EXPORTER (exporter); + GSimpleAsyncResult *res; + + g_return_if_fail (self->certificate != NULL); + + res = g_simple_async_result_new (G_OBJECT (exporter), callback, user_data, + seahorse_certificate_der_exporter_export_async); + + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); +} + +static gpointer +seahorse_certificate_der_exporter_export_finish (SeahorseExporter *exporter, + GAsyncResult *result, + gsize *size, + GError **error) +{ + SeahorseCertificateDerExporter *self = SEAHORSE_CERTIFICATE_DER_EXPORTER (exporter); + gconstpointer output; + + g_return_val_if_fail (self->certificate != NULL, NULL); + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (exporter), + seahorse_certificate_der_exporter_export_async), NULL); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return NULL; + + output = gcr_certificate_get_der_data (GCR_CERTIFICATE (self->certificate), size); + return g_memdup (output, *size); +} + +static void +seahorse_certificate_der_exporter_iface_init (SeahorseExporterIface *iface) +{ + iface->add_object = seahorse_certificate_der_exporter_add_object; + iface->export_async = seahorse_certificate_der_exporter_export_async; + iface->export_finish = seahorse_certificate_der_exporter_export_finish; + iface->get_objects = seahorse_certificate_der_exporter_get_objects; +} + +SeahorseExporter * +seahorse_certificate_der_exporter_new (SeahorseCertificate *certificate) +{ + SeahorseExporter *exporter; + + exporter = g_object_new (SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER, + NULL); + + if (!seahorse_exporter_add_object (exporter, G_OBJECT (certificate))) + g_assert_not_reached (); + + return exporter; +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-certificate-der-exporter.h seahorse-3.6.3/pkcs11/seahorse-certificate-der-exporter.h --- seahorse-3.2.2/pkcs11/seahorse-certificate-der-exporter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-certificate-der-exporter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,41 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_CERTIFICATE_DER_EXPORTER_H__ +#define __SEAHORSE_CERTIFICATE_DER_EXPORTER_H__ + +#include "seahorse-exporter.h" + +#include + +#define SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER (seahorse_certificate_der_exporter_get_type ()) +#define SEAHORSE_CERTIFICATE_DER_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER, SeahorseCertificateDerExporter)) +#define SEAHORSE_IS_CERTIFICATE_DER_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER)) + +typedef struct _SeahorseCertificateDerExporter SeahorseCertificateDerExporter; + +GType seahorse_certificate_der_exporter_get_type (void) G_GNUC_CONST; + +SeahorseExporter * seahorse_certificate_der_exporter_new (SeahorseCertificate *certificate); + +#endif /* __SEAHORSE_CERTIFICATE_DER_EXPORTER_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-certificate.h seahorse-3.6.3/pkcs11/seahorse-certificate.h --- seahorse-3.2.2/pkcs11/seahorse-certificate.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-certificate.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,61 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_CERTIFICATE_H__ +#define __SEAHORSE_CERTIFICATE_H__ + +#include + +#include + +#define SEAHORSE_TYPE_CERTIFICATE (seahorse_certificate_get_type ()) +#define SEAHORSE_CERTIFICATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_CERTIFICATE, SeahorseCertificate)) +#define SEAHORSE_CERTIFICATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_CERTIFICATE, SeahorseCertificateClass)) +#define SEAHORSE_IS_CERTIFICATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_CERTIFICATE)) +#define SEAHORSE_IS_CERTIFICATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_CERTIFICATE)) +#define SEAHORSE_CERTIFICATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_CERTIFICATE, SeahorseCertificateClass)) + +typedef struct _SeahorseCertificate SeahorseCertificate; +typedef struct _SeahorseCertificateClass SeahorseCertificateClass; +typedef struct _SeahorseCertificatePrivate SeahorseCertificatePrivate; +typedef struct _SeahorsePrivateKey SeahorsePrivateKey; + +struct _SeahorseCertificate { + GckObject parent; + SeahorseCertificatePrivate *pv; +}; + +struct _SeahorseCertificateClass { + GckObjectClass parent_class; +}; + +GType seahorse_certificate_get_type (void) G_GNUC_CONST; + +GIcon * seahorse_certificate_get_icon (SeahorseCertificate *self); + +const gchar * seahorse_certificate_get_description (SeahorseCertificate *self); + +SeahorsePrivateKey * seahorse_certificate_get_partner (SeahorseCertificate *self); + +void seahorse_certificate_set_partner (SeahorseCertificate *self, + SeahorsePrivateKey *private_key); + +#endif /* __SEAHORSE_CERTIFICATE_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-backend.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-backend.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-backend.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-backend.c 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,357 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-pkcs11-backend.h" +#include "seahorse-pkcs11-generate.h" +#include "seahorse-token.h" + +#include "seahorse-backend.h" +#include "seahorse-place.h" +#include "seahorse-util.h" + +#include + +#include + +#include + +enum { + PROP_0, + PROP_NAME, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ACTIONS +}; + +static SeahorsePkcs11Backend *pkcs11_backend = NULL; + +struct _SeahorsePkcs11Backend { + GObject parent; + GList *tokens; + GList *blacklist; +}; + +struct _SeahorsePkcs11BackendClass { + GObjectClass parent_class; +}; + +static const char *token_blacklist[] = { + "pkcs11:manufacturer=Gnome%20Keyring;serial=1:SSH:HOME", + "pkcs11:manufacturer=Gnome%20Keyring;serial=1:SECRET:MAIN", + "pkcs11:manufacturer=Mozilla%20Foundation;token=NSS%20Generic%20Crypto%20Services", + NULL +}; + +static void seahorse_pkcs11_backend_iface (SeahorseBackendIface *iface); + +static void seahorse_pkcs11_backend_collection_init (GcrCollectionIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorsePkcs11Backend, seahorse_pkcs11_backend, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_pkcs11_backend_collection_init) + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_BACKEND, seahorse_pkcs11_backend_iface); +); + +static void +seahorse_pkcs11_backend_init (SeahorsePkcs11Backend *self) +{ + GError *error = NULL; + GckUriData *uri; + guint i; + + g_return_if_fail (pkcs11_backend == NULL); + pkcs11_backend = self; + + for (i = 0; token_blacklist[i] != NULL; i++) { + uri = gck_uri_parse (token_blacklist[i], GCK_URI_FOR_TOKEN | GCK_URI_FOR_MODULE, &error); + if (uri == NULL) { + g_warning ("couldn't parse pkcs11 blacklist uri: %s", error->message); + g_clear_error (&error); + } + self->blacklist = g_list_prepend (self->blacklist, uri); + } + + seahorse_pkcs11_generate_register (); +} + +static gboolean +is_token_usable (SeahorsePkcs11Backend *self, + GckSlot *slot, + GckTokenInfo *token) +{ + GList *l; + + if (!(token->flags & CKF_TOKEN_INITIALIZED)) { + /* _gcr_debug ("token is not importable: %s: not initialized", token->label); */ + return FALSE; + } + if ((token->flags & CKF_LOGIN_REQUIRED) && + !(token->flags & CKF_USER_PIN_INITIALIZED)) { + /* _gcr_debug ("token is not importable: %s: user pin not initialized", token->label); */ + return FALSE; + } + + for (l = self->blacklist; l != NULL; l = g_list_next (l)) { + if (gck_slot_match (slot, l->data)) + return FALSE; + } + + return TRUE; +} + +static void +on_initialized_registered (GObject *unused, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (user_data); + SeahorsePlace *place; + GList *slots, *s; + GList *modules, *m; + GError *error = NULL; + GckTokenInfo *token; + + modules = gck_modules_initialize_registered_finish (result, &error); + if (error != NULL) { + g_warning ("%s", error->message); + g_clear_error (&error); + } + + for (m = modules; m != NULL; m = g_list_next (m)) { + slots = gck_module_get_slots (m->data, TRUE); + for (s = slots; s; s = g_list_next (s)) { + token = gck_slot_get_token_info (s->data); + if (token == NULL) + continue; + if (is_token_usable (self, s->data, token)) { + place = SEAHORSE_PLACE (seahorse_token_new (s->data)); + self->tokens = g_list_append (self->tokens, place); + gcr_collection_emit_added (GCR_COLLECTION (self), G_OBJECT (place)); + } + gck_token_info_free (token); + } + + /* These will have been refed by the source above */ + gck_list_unref_free (slots); + } + + gck_list_unref_free (modules); + g_object_unref (self); +} + +static void +seahorse_pkcs11_backend_constructed (GObject *obj) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (obj); + + G_OBJECT_CLASS (seahorse_pkcs11_backend_parent_class)->constructed (obj); + + gck_modules_initialize_registered_async (NULL, on_initialized_registered, + g_object_ref (self)); +} + +static void +seahorse_pkcs11_backend_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + switch (prop_id) { + case PROP_NAME: + g_value_set_string (value, SEAHORSE_PKCS11_NAME); + break; + case PROP_LABEL: + g_value_set_string (value, _("Certificates")); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, _("X.509 certificates and related keys")); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_pkcs11_backend_dispose (GObject *obj) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (obj); + + g_list_free_full (self->tokens, g_object_unref); + self->tokens = NULL; + + G_OBJECT_CLASS (seahorse_pkcs11_backend_parent_class)->dispose (obj); +} + +static void +seahorse_pkcs11_backend_finalize (GObject *obj) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (obj); + + g_list_free_full (self->blacklist, (GDestroyNotify)gck_uri_data_free); + g_assert (self->tokens == NULL); + g_return_if_fail (pkcs11_backend == self); + pkcs11_backend = NULL; + + G_OBJECT_CLASS (seahorse_pkcs11_backend_parent_class)->finalize (obj); +} + +static void +seahorse_pkcs11_backend_class_init (SeahorsePkcs11BackendClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->constructed = seahorse_pkcs11_backend_constructed; + gobject_class->dispose = seahorse_pkcs11_backend_dispose; + gobject_class->finalize = seahorse_pkcs11_backend_finalize; + gobject_class->get_property = seahorse_pkcs11_backend_get_property; + + g_object_class_override_property (gobject_class, PROP_NAME, "name"); + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); +} + +static guint +seahorse_pkcs11_backend_get_length (GcrCollection *collection) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (collection); + return g_list_length (self->tokens); +} + +static GList * +seahorse_pkcs11_backend_get_objects (GcrCollection *collection) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (collection); + return g_list_copy (self->tokens); +} + +static gboolean +seahorse_pkcs11_backend_contains (GcrCollection *collection, + GObject *object) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (collection); + return g_list_find (self->tokens, object) != NULL; +} + +static void +seahorse_pkcs11_backend_collection_init (GcrCollectionIface *iface) +{ + iface->contains = seahorse_pkcs11_backend_contains; + iface->get_length = seahorse_pkcs11_backend_get_length; + iface->get_objects = seahorse_pkcs11_backend_get_objects; +} + +static SeahorsePlace * +seahorse_pkcs11_backend_lookup_place (SeahorseBackend *backend, + const gchar *uri) +{ + SeahorsePkcs11Backend *self = SEAHORSE_PKCS11_BACKEND (backend); + GckUriData *uri_data; + GList *l; + + if (!g_str_has_prefix (uri, "pkcs11:")) + return NULL; + + uri_data = gck_uri_parse (uri, GCK_URI_FOR_TOKEN | GCK_URI_FOR_MODULE, NULL); + if (uri_data == NULL) + return NULL; + + for (l = self->tokens; l != NULL; l = g_list_next (l)) { + if (gck_slot_match (seahorse_token_get_slot (l->data), uri_data)) + break; + } + + gck_uri_data_free (uri_data); + return l != NULL ? l->data : NULL; +} + +static void +seahorse_pkcs11_backend_iface (SeahorseBackendIface *iface) +{ + iface->lookup_place = seahorse_pkcs11_backend_lookup_place; +} + +void +seahorse_pkcs11_backend_initialize (void) +{ + SeahorsePkcs11Backend *self; + + g_return_if_fail (pkcs11_backend == NULL); + self = g_object_new (SEAHORSE_TYPE_PKCS11_BACKEND, NULL); + + seahorse_backend_register (SEAHORSE_BACKEND (self)); + g_object_unref (self); + + g_return_if_fail (pkcs11_backend != NULL); +} + +SeahorsePkcs11Backend * +seahorse_pkcs11_backend_get (void) +{ + g_return_val_if_fail (pkcs11_backend, NULL); + return pkcs11_backend; +} + +static gboolean +on_filter_writable (GObject *object, + gpointer user_data) +{ + SeahorseToken *token = SEAHORSE_TOKEN (object); + guint mechanism = GPOINTER_TO_UINT (user_data); + GckTokenInfo *info; + + info = seahorse_token_get_info (token); + g_return_val_if_fail (info != NULL, FALSE); + + if (info->flags & CKF_WRITE_PROTECTED) + return FALSE; + + if (mechanism != G_MAXUINT) { + if (!seahorse_token_has_mechanism (token, (gulong)mechanism)) + return FALSE; + } + + return TRUE; +} + +GcrCollection * +seahorse_pkcs11_backend_get_writable_tokens (SeahorsePkcs11Backend *self, + gulong with_mechanism) +{ + gpointer mechanism; + + self = self ? self : seahorse_pkcs11_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_PKCS11_BACKEND (self), NULL); + + if (with_mechanism == GCK_INVALID) + mechanism = GUINT_TO_POINTER (G_MAXUINT); + else + mechanism = GUINT_TO_POINTER (with_mechanism); + + return gcr_filter_collection_new_with_callback (GCR_COLLECTION (self), + on_filter_writable, + mechanism, NULL); +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-backend.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-backend.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-backend.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-backend.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,50 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 SEAHORSE_PKCS11_BACKEND_H_ +#define SEAHORSE_PKCS11_BACKEND_H_ + +#include "seahorse-pkcs11.h" +#include "seahorse-token.h" + +#include + +#define SEAHORSE_PKCS11_STR "pkcs11" +#define SEAHORSE_PKCS11 (g_quark_from_static_string (SEAHORSE_PKCS11_STR)) + +#define SEAHORSE_TYPE_PKCS11_BACKEND (seahorse_pkcs11_backend_get_type ()) +#define SEAHORSE_PKCS11_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_BACKEND, SeahorsePkcs11Backend)) +#define SEAHORSE_PKCS11_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_BACKEND, SeahorsePkcs11BackendClass)) +#define SEAHORSE_IS_PKCS11_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_BACKEND)) +#define SEAHORSE_IS_PKCS11_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_BACKEND)) +#define SEAHORSE_PKCS11_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_BACKEND, SeahorsePkcs11BackendClass)) + +typedef struct _SeahorsePkcs11Backend SeahorsePkcs11Backend; +typedef struct _SeahorsePkcs11BackendClass SeahorsePkcs11BackendClass; + +GType seahorse_pkcs11_backend_get_type (void) G_GNUC_CONST; + +SeahorsePkcs11Backend * seahorse_pkcs11_backend_get (void); + +GcrCollection * seahorse_pkcs11_backend_get_writable_tokens (SeahorsePkcs11Backend *self, + gulong with_mechanism); + +#endif /* SEAHORSE_PKCS11_BACKEND_H_ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,391 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-pkcs11-certificate.h" -#include "seahorse-pkcs11-helpers.h" - -#include "seahorse-object.h" -#include "seahorse-pkcs11.h" -#include "seahorse-util.h" -#include "seahorse-validity.h" - -#include - -#include - -#include - -static const gulong REQUIRED_ATTRS[] = { - CKA_VALUE, - CKA_ID, - CKA_TRUSTED, - CKA_END_DATE -}; - -enum { - PROP_0, - PROP_FINGERPRINT, - PROP_VALIDITY, - PROP_VALIDITY_STR, - PROP_TRUST, - PROP_TRUST_STR, - PROP_EXPIRES, - PROP_EXPIRES_STR -}; - -struct _SeahorsePkcs11CertificatePrivate { - GckAttribute der_value; -}; - -static void seahorse_pkcs11_certificate_iface (GcrCertificateIface *iface); - -G_DEFINE_TYPE_WITH_CODE (SeahorsePkcs11Certificate, seahorse_pkcs11_certificate, SEAHORSE_PKCS11_TYPE_OBJECT, - GCR_CERTIFICATE_MIXIN_IMPLEMENT_COMPARABLE (); - G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, seahorse_pkcs11_certificate_iface); -); - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static gchar* -calc_display_id (SeahorsePkcs11Certificate* self) -{ - gsize len; - gchar *id, *ret; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), NULL); - - id = seahorse_pkcs11_certificate_get_fingerprint (self); - g_return_val_if_fail (id, NULL); - - len = strlen (id); - if (len <= 8) - return id; - - ret = g_strndup (id + (len - 8), 8); - g_free (id); - return ret; -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -void -seahorse_pkcs11_certificate_realize (SeahorsePkcs11Certificate *self) -{ - gchar *identifier = NULL; - guint flags; - - seahorse_pkcs11_object_require_attributes (SEAHORSE_PKCS11_OBJECT (self), - REQUIRED_ATTRS, G_N_ELEMENTS (REQUIRED_ATTRS)); - - if (!seahorse_object_get_label (SEAHORSE_OBJECT (self))) - g_object_set (self, "label", _("Certificate"), NULL); - - flags = seahorse_object_get_flags (SEAHORSE_OBJECT (self)) | SEAHORSE_FLAG_DELETABLE; - - /* TODO: Expiry, revoked, disabled etc... */ - if (seahorse_pkcs11_certificate_get_trust (self) >= SEAHORSE_VALIDITY_MARGINAL) - flags |= SEAHORSE_FLAG_TRUSTED; - - identifier = calc_display_id (self); - - g_object_set (self, - "location", SEAHORSE_LOCATION_LOCAL, - "usage", SEAHORSE_USAGE_PUBLIC_KEY, - "flags", flags, - "identifier", identifier, - NULL); - - g_free (identifier); -} - -static GObject* -seahorse_pkcs11_certificate_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - SeahorsePkcs11Certificate *self = SEAHORSE_PKCS11_CERTIFICATE (G_OBJECT_CLASS (seahorse_pkcs11_certificate_parent_class)->constructor(type, n_props, props)); - - g_return_val_if_fail (self, NULL); - - return G_OBJECT (self); -} - -static void -seahorse_pkcs11_certificate_init (SeahorsePkcs11Certificate *self) -{ - self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PKCS11_TYPE_CERTIFICATE, SeahorsePkcs11CertificatePrivate)); - gck_attribute_init_invalid (&self->pv->der_value, CKA_VALUE); -} - -static void -seahorse_pkcs11_certificate_notify (GObject *obj, GParamSpec *pspec) -{ - /* When the base class pkcs11-attributes changes, it can affects lots */ - if (g_str_equal (pspec->name, "pkcs11-attributes")) { - g_object_notify (obj, "fingerprint"); - g_object_notify (obj, "validity"); - g_object_notify (obj, "validity-str"); - g_object_notify (obj, "trust"); - g_object_notify (obj, "trust-str"); - g_object_notify (obj, "expires"); - g_object_notify (obj, "expires-str"); - } - - if (G_OBJECT_CLASS (seahorse_pkcs11_certificate_parent_class)->notify) - G_OBJECT_CLASS (seahorse_pkcs11_certificate_parent_class)->notify (obj, pspec); -} - - -static void -seahorse_pkcs11_certificate_finalize (GObject *obj) -{ - SeahorsePkcs11Certificate *self = SEAHORSE_PKCS11_CERTIFICATE (obj); - - gck_attribute_clear (&self->pv->der_value); - - G_OBJECT_CLASS (seahorse_pkcs11_certificate_parent_class)->finalize (obj); -} - -static void -seahorse_pkcs11_certificate_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorsePkcs11Certificate *self = SEAHORSE_PKCS11_CERTIFICATE (obj); - - switch (prop_id) { - case PROP_FINGERPRINT: - g_value_take_string (value, seahorse_pkcs11_certificate_get_fingerprint (self)); - break; - case PROP_VALIDITY: - g_value_set_uint (value, seahorse_pkcs11_certificate_get_validity (self)); - break; - case PROP_VALIDITY_STR: - g_value_set_string (value, seahorse_pkcs11_certificate_get_validity_str (self)); - break; - case PROP_TRUST: - g_value_set_uint (value, seahorse_pkcs11_certificate_get_trust (self)); - break; - case PROP_TRUST_STR: - g_value_set_string (value, seahorse_pkcs11_certificate_get_trust_str (self)); - break; - case PROP_EXPIRES: - g_value_set_ulong (value, seahorse_pkcs11_certificate_get_expires (self)); - break; - case PROP_EXPIRES_STR: - g_value_take_string (value, seahorse_pkcs11_certificate_get_expires_str (self)); - break; - default: - gcr_certificate_mixin_get_property (obj, prop_id, value, pspec); - break; - } -} - -static void -seahorse_pkcs11_certificate_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pkcs11_certificate_class_init (SeahorsePkcs11CertificateClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_pkcs11_certificate_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorsePkcs11CertificatePrivate)); - - gobject_class->constructor = seahorse_pkcs11_certificate_constructor; - gobject_class->finalize = seahorse_pkcs11_certificate_finalize; - gobject_class->set_property = seahorse_pkcs11_certificate_set_property; - gobject_class->get_property = seahorse_pkcs11_certificate_get_property; - gobject_class->notify = seahorse_pkcs11_certificate_notify; - - g_object_class_install_property (gobject_class, PROP_FINGERPRINT, - g_param_spec_string ("fingerprint", "fingerprint", "fingerprint", NULL, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, PROP_VALIDITY, - g_param_spec_uint ("validity", "validity", "validity", 0, G_MAXUINT, 0U, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, PROP_VALIDITY_STR, - g_param_spec_string ("validity-str", "validity-str", "validity-str", NULL, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, PROP_TRUST, - g_param_spec_uint ("trust", "trust", "trust", 0, G_MAXUINT, 0U, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, PROP_TRUST_STR, - g_param_spec_string ("trust-str", "trust-str", "trust-str", NULL, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, PROP_EXPIRES, - g_param_spec_ulong ("expires", "expires", "expires", 0, G_MAXULONG, 0UL, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, PROP_EXPIRES_STR, - g_param_spec_string ("expires-str", "expires-str", "expires-str", NULL, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); - - gcr_certificate_mixin_class_init (gobject_class); -} - -static const guchar* -seahorse_pkcs11_certificate_get_der_data (GcrCertificate *cert, gsize *n_length) -{ - SeahorsePkcs11Object *obj = SEAHORSE_PKCS11_OBJECT (cert); - SeahorsePkcs11Certificate *self = SEAHORSE_PKCS11_CERTIFICATE (cert); - GckAttributes *attrs; - GckAttribute *attr; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (cert), NULL); - - if (!seahorse_pkcs11_object_require_attributes (obj, REQUIRED_ATTRS, - G_N_ELEMENTS (REQUIRED_ATTRS))) - return NULL; - - /* TODO: This whole copying and possibly freeing memory in use is risky */ - - if (gck_attribute_is_invalid (&self->pv->der_value)) { - attrs = seahorse_pkcs11_object_get_pkcs11_attributes (obj); - g_return_val_if_fail (attrs, NULL); - attr = gck_attributes_find (attrs, CKA_VALUE); - g_return_val_if_fail (attr, NULL); - gck_attribute_clear (&self->pv->der_value); - gck_attribute_init_copy (&self->pv->der_value, attr); - } - - g_return_val_if_fail (!gck_attribute_is_invalid (&self->pv->der_value), NULL); - *n_length = self->pv->der_value.length; - return self->pv->der_value.value; -} - -static void -seahorse_pkcs11_certificate_iface (GcrCertificateIface *iface) -{ - iface->get_der_data = (gpointer)seahorse_pkcs11_certificate_get_der_data; -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorsePkcs11Certificate* -seahorse_pkcs11_certificate_new (GckObject* object) -{ - return g_object_new (SEAHORSE_PKCS11_TYPE_CERTIFICATE, - "pkcs11-object", object, NULL); -} - -gchar* -seahorse_pkcs11_certificate_get_fingerprint (SeahorsePkcs11Certificate* self) -{ - GckAttribute* attr; - - /* TODO: We should be using the fingerprint off the DER */ - attr = seahorse_pkcs11_object_require_attribute (SEAHORSE_PKCS11_OBJECT (self), CKA_ID); - if (attr == NULL) - return g_strdup (""); - - return seahorse_util_hex_encode (attr->value, attr->length); -} - -guint -seahorse_pkcs11_certificate_get_validity (SeahorsePkcs11Certificate* self) -{ - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), 0U); - - /* TODO: We need to implement proper validity checking */ - return SEAHORSE_VALIDITY_UNKNOWN; -} - -const char* -seahorse_pkcs11_certificate_get_validity_str (SeahorsePkcs11Certificate* self) -{ - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), NULL); - return seahorse_validity_get_string (seahorse_pkcs11_certificate_get_validity (self)); -} - -guint -seahorse_pkcs11_certificate_get_trust (SeahorsePkcs11Certificate* self) -{ - GckAttribute *attr; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), 0); - - attr = seahorse_pkcs11_object_require_attribute (SEAHORSE_PKCS11_OBJECT (self), CKA_TRUSTED); - if (attr && gck_attribute_get_boolean (attr)) - return SEAHORSE_VALIDITY_FULL; - - return SEAHORSE_VALIDITY_UNKNOWN; -} - -const char* -seahorse_pkcs11_certificate_get_trust_str (SeahorsePkcs11Certificate* self) -{ - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), NULL); - return seahorse_validity_get_string (seahorse_pkcs11_certificate_get_trust (self)); -} - - -gulong -seahorse_pkcs11_certificate_get_expires (SeahorsePkcs11Certificate* self) -{ - GckAttribute *attr; - GDate date = { 0 }; - struct tm time = { 0 }; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), 0); - - attr = seahorse_pkcs11_object_require_attribute (SEAHORSE_PKCS11_OBJECT (self), CKA_END_DATE); - if (attr == NULL) - return 0; - - gck_attribute_get_date (attr, &date); - g_date_to_struct_tm (&date, &time); - return (gulong)(mktime (&time)); -} - -char* -seahorse_pkcs11_certificate_get_expires_str (SeahorsePkcs11Certificate* self) -{ - gulong expiry; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (self), NULL); - - /* TODO: When expired return Expired */ - expiry = seahorse_pkcs11_certificate_get_expires (self); - if (expiry == 0) - return g_strdup (""); - return seahorse_util_get_date_string (expiry); -} - diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PKCS11_CERTIFICATE_H__ -#define __SEAHORSE_PKCS11_CERTIFICATE_H__ - -#include - -#include - -#include "seahorse-pkcs11-object.h" - -#define SEAHORSE_PKCS11_TYPE_CERTIFICATE (seahorse_pkcs11_certificate_get_type ()) -#define SEAHORSE_PKCS11_CERTIFICATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PKCS11_TYPE_CERTIFICATE, SeahorsePkcs11Certificate)) -#define SEAHORSE_PKCS11_CERTIFICATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PKCS11_TYPE_CERTIFICATE, SeahorsePkcs11CertificateClass)) -#define SEAHORSE_PKCS11_IS_CERTIFICATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PKCS11_TYPE_CERTIFICATE)) -#define SEAHORSE_PKCS11_IS_CERTIFICATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PKCS11_TYPE_CERTIFICATE)) -#define SEAHORSE_PKCS11_CERTIFICATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PKCS11_TYPE_CERTIFICATE, SeahorsePkcs11CertificateClass)) - -typedef struct _SeahorsePkcs11Certificate SeahorsePkcs11Certificate; -typedef struct _SeahorsePkcs11CertificateClass SeahorsePkcs11CertificateClass; -typedef struct _SeahorsePkcs11CertificatePrivate SeahorsePkcs11CertificatePrivate; - -struct _SeahorsePkcs11Certificate { - SeahorsePkcs11Object parent; - SeahorsePkcs11CertificatePrivate *pv; -}; - -struct _SeahorsePkcs11CertificateClass { - SeahorsePkcs11ObjectClass parent_class; -}; - -GType seahorse_pkcs11_certificate_get_type (void); - -SeahorsePkcs11Certificate* seahorse_pkcs11_certificate_new (GckObject* object); - -void seahorse_pkcs11_certificate_realize (SeahorsePkcs11Certificate *self); - -gchar* seahorse_pkcs11_certificate_get_fingerprint (SeahorsePkcs11Certificate* self); - -guint seahorse_pkcs11_certificate_get_validity (SeahorsePkcs11Certificate* self); - -const gchar* seahorse_pkcs11_certificate_get_validity_str (SeahorsePkcs11Certificate* self); - -guint seahorse_pkcs11_certificate_get_trust (SeahorsePkcs11Certificate* self); - -const gchar* seahorse_pkcs11_certificate_get_trust_str (SeahorsePkcs11Certificate* self); - -gulong seahorse_pkcs11_certificate_get_expires (SeahorsePkcs11Certificate* self); - -gchar* seahorse_pkcs11_certificate_get_expires_str (SeahorsePkcs11Certificate* self); - -#endif /* __SEAHORSE_PKCS11_CERTIFICATE_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate-props.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate-props.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate-props.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate-props.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,228 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-pkcs11-certificate.h" -#include "seahorse-pkcs11-certificate-props.h" - -#include - -enum { - PROP_0, - PROP_CERTIFICATE -}; - -struct _SeahorsePkcs11CertificatePropsPrivate { - GtkNotebook *tabs; - GcrCertificateWidget *widget; -}; - -G_DEFINE_TYPE (SeahorsePkcs11CertificateProps, seahorse_pkcs11_certificate_props, GTK_TYPE_DIALOG); - -#define SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS, SeahorsePkcs11CertificatePropsPrivate)) - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - - -static void -seahorse_pkcs11_certificate_props_init (SeahorsePkcs11CertificateProps *self) -{ - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - GtkWidget *button; - - pv->tabs = GTK_NOTEBOOK (gtk_notebook_new ()); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))), GTK_WIDGET (pv->tabs)); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - gtk_container_set_border_width (GTK_CONTAINER (pv->tabs), 5); - gtk_widget_show (GTK_WIDGET (pv->tabs)); - - pv->widget = gcr_certificate_widget_new (NULL); - seahorse_pkcs11_certificate_props_add_view (self, _("Certificate"), GTK_WIDGET (pv->widget)); - gtk_widget_show (GTK_WIDGET (pv->widget)); - - button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_dialog_add_action_widget (GTK_DIALOG (self), button, GTK_RESPONSE_CLOSE); - gtk_widget_show (button); -} - -static void -seahorse_pkcs11_certificate_props_dispose (GObject *obj) -{ - SeahorsePkcs11CertificateProps *self = SEAHORSE_PKCS11_CERTIFICATE_PROPS (obj); - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - - if (pv->widget) { - seahorse_pkcs11_certificate_props_remove_view (self, GTK_WIDGET (pv->widget)); - pv->widget = NULL; - } - - G_OBJECT_CLASS (seahorse_pkcs11_certificate_props_parent_class)->dispose (obj); -} - -static void -seahorse_pkcs11_certificate_props_finalize (GObject *obj) -{ - SeahorsePkcs11CertificateProps *self = SEAHORSE_PKCS11_CERTIFICATE_PROPS (obj); - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - - g_assert (pv->widget == NULL); - - G_OBJECT_CLASS (seahorse_pkcs11_certificate_props_parent_class)->finalize (obj); -} - -static void -seahorse_pkcs11_certificate_props_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorsePkcs11CertificateProps *self = SEAHORSE_PKCS11_CERTIFICATE_PROPS (obj); - - switch (prop_id) { - case PROP_CERTIFICATE: - seahorse_pkcs11_certificate_props_set_certificate (self, g_value_get_object (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pkcs11_certificate_props_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorsePkcs11CertificateProps *self = SEAHORSE_PKCS11_CERTIFICATE_PROPS (obj); - - switch (prop_id) { - case PROP_CERTIFICATE: - g_value_set_object (value, seahorse_pkcs11_certificate_props_get_certificate (self)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pkcs11_certificate_props_class_init (SeahorsePkcs11CertificatePropsClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_pkcs11_certificate_props_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorsePkcs11CertificatePropsPrivate)); - - gobject_class->dispose = seahorse_pkcs11_certificate_props_dispose; - gobject_class->finalize = seahorse_pkcs11_certificate_props_finalize; - gobject_class->set_property = seahorse_pkcs11_certificate_props_set_property; - gobject_class->get_property = seahorse_pkcs11_certificate_props_get_property; - - g_object_class_install_property (gobject_class, PROP_CERTIFICATE, - g_param_spec_object ("certificate", "Certificate", "Certificate to display", - SEAHORSE_PKCS11_TYPE_CERTIFICATE, G_PARAM_READWRITE)); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -GtkDialog* -seahorse_pkcs11_certificate_props_new (GcrCertificate *cert) -{ - return g_object_new (SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS, "certificate", cert, NULL); -} - -void -seahorse_pkcs11_certificate_props_set_certificate (SeahorsePkcs11CertificateProps *self, GcrCertificate *cert) -{ - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - g_return_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self)); - - gcr_certificate_widget_set_certificate (pv->widget, cert); - g_object_notify (G_OBJECT (self), "certificate"); -} - -GcrCertificate* -seahorse_pkcs11_certificate_props_get_certificate (SeahorsePkcs11CertificateProps *self) -{ - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - g_return_val_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self), NULL); - - return gcr_certificate_widget_get_certificate (pv->widget); -} - -void -seahorse_pkcs11_certificate_props_add_view (SeahorsePkcs11CertificateProps *self, const gchar *title, GtkWidget *view) -{ - g_return_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self)); - seahorse_pkcs11_certificate_props_insert_view (self, title, view, -1); -} - -void -seahorse_pkcs11_certificate_props_insert_view (SeahorsePkcs11CertificateProps *self, const gchar *title, - GtkWidget *view, gint position) -{ - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - - g_return_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self)); - g_return_if_fail (title); - - g_return_if_fail (GTK_IS_WIDGET (view)); - g_return_if_fail (gtk_notebook_page_num (pv->tabs, view) == -1); - - gtk_notebook_insert_page (pv->tabs, view, gtk_label_new (title), position); -} - -void -seahorse_pkcs11_certificate_props_focus_view (SeahorsePkcs11CertificateProps *self, GtkWidget *view) -{ - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - gint page; - - g_return_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self)); - g_return_if_fail (GTK_IS_WIDGET (view)); - - page = gtk_notebook_page_num (pv->tabs, view); - g_return_if_fail (page != -1); - - gtk_notebook_set_current_page (pv->tabs, page); -} - -void -seahorse_pkcs11_certificate_props_remove_view (SeahorsePkcs11CertificateProps *self, GtkWidget *view) -{ - SeahorsePkcs11CertificatePropsPrivate *pv = SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_PRIVATE (self); - gint page; - - g_return_if_fail (SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS (self)); - g_return_if_fail (GTK_IS_WIDGET (view)); - - page = gtk_notebook_page_num (pv->tabs, view); - g_return_if_fail (page != -1); - - gtk_notebook_remove_page (pv->tabs, page); -} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate-props.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate-props.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-certificate-props.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-certificate-props.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,75 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PKCS11_CERTIFICATE_PROPS_H__ -#define __SEAHORSE_PKCS11_CERTIFICATE_PROPS_H__ - -#include - -#include - -#include -#include - -#define SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS (seahorse_pkcs11_certificate_props_get_type ()) -#define SEAHORSE_PKCS11_CERTIFICATE_PROPS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS, SeahorsePkcs11CertificateProps)) -#define SEAHORSE_PKCS11_CERTIFICATE_PROPS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS, SeahorsePkcs11CertificatePropsClass)) -#define SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS)) -#define SEAHORSE_IS_PKCS11_CERTIFICATE_PROPS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS)) -#define SEAHORSE_PKCS11_CERTIFICATE_PROPS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_CERTIFICATE_PROPS, SeahorsePkcs11CertificatePropsClass)) - -typedef struct _SeahorsePkcs11CertificateProps SeahorsePkcs11CertificateProps; -typedef struct _SeahorsePkcs11CertificatePropsClass SeahorsePkcs11CertificatePropsClass; -typedef struct _SeahorsePkcs11CertificatePropsPrivate SeahorsePkcs11CertificatePropsPrivate; - -struct _SeahorsePkcs11CertificateProps { - GtkDialog parent; -}; - -struct _SeahorsePkcs11CertificatePropsClass { - GtkDialogClass parent_class; -}; - -GType seahorse_pkcs11_certificate_props_get_type (void); - -GtkDialog* seahorse_pkcs11_certificate_props_new (GcrCertificate *cert); - -void seahorse_pkcs11_certificate_props_set_certificate (SeahorsePkcs11CertificateProps *self, - GcrCertificate *cert); - -GcrCertificate* seahorse_pkcs11_certificate_props_get_certificate (SeahorsePkcs11CertificateProps *self); - -void seahorse_pkcs11_certificate_props_add_view (SeahorsePkcs11CertificateProps *self, - const gchar *title, - GtkWidget *view); - -void seahorse_pkcs11_certificate_props_insert_view (SeahorsePkcs11CertificateProps *self, - const gchar *title, - GtkWidget *view, - gint position); - -void seahorse_pkcs11_certificate_props_focus_view (SeahorsePkcs11CertificateProps *self, - GtkWidget *view); - -void seahorse_pkcs11_certificate_props_remove_view (SeahorsePkcs11CertificateProps *self, - GtkWidget *view); - -#endif /* __SEAHORSE_PKCS11_CERTIFICATE_PROPS_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-commands.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-commands.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-commands.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-commands.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,262 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-pkcs11-commands.h" - -#include "seahorse-pkcs11.h" -#include "seahorse-pkcs11-certificate.h" -#include "seahorse-pkcs11-certificate-props.h" -#include "seahorse-pkcs11-operations.h" - -#include "seahorse-progress.h" -#include "seahorse-registry.h" -#include "seahorse-util.h" - -enum { - PROP_0 -}; - -struct _SeahorsePkcs11CommandsPrivate { - GtkActionGroup *action_group; -}; - -static GQuark slot_certificate_window = 0; - -G_DEFINE_TYPE (SeahorsePkcs11Commands, seahorse_pkcs11_commands, SEAHORSE_TYPE_COMMANDS); - -#define SEAHORSE_PKCS11_COMMANDS_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEAHORSE_PKCS11_TYPE_COMMANDS, SeahorsePkcs11CommandsPrivate)) - -static SeahorseObjectPredicate commands_predicate = { 0, }; - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static void -properties_response (GtkDialog *dialog, gint response_id, gpointer user_data) -{ - gtk_widget_destroy (GTK_WIDGET (dialog)); -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_pkcs11_commands_show_properties (SeahorseCommands *cmds, SeahorseObject *object) -{ - GtkWindow *window; - gpointer previous; - - g_return_if_fail (SEAHORSE_PKCS11_IS_COMMANDS (cmds)); - g_return_if_fail (SEAHORSE_PKCS11_IS_CERTIFICATE (object)); - - /* Try to show an already present window */ - previous = g_object_get_qdata (G_OBJECT (object), slot_certificate_window); - if (GTK_IS_WINDOW (previous)) { - window = GTK_WINDOW (previous); - if (gtk_widget_get_visible (GTK_WIDGET (window))) { - gtk_window_present (window); - return; - } - } - - /* Create a new dialog for the certificate */ - window = GTK_WINDOW (seahorse_pkcs11_certificate_props_new (GCR_CERTIFICATE (object))); - gtk_window_set_transient_for (window, seahorse_commands_get_window (cmds)); - g_object_set_qdata (G_OBJECT (object), slot_certificate_window, window); - gtk_widget_show (GTK_WIDGET (window)); - - /* Close the window when we get a response */ - g_signal_connect (window, "response", G_CALLBACK (properties_response), NULL); -} - -static void -on_delete_completed (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseCommands *self = SEAHORSE_COMMANDS (user_data); - GError *error = NULL; - - if (!seahorse_pkcs11_delete_finish (result, &error)) - seahorse_util_handle_error (&error, seahorse_commands_get_window (self), - _("Couldn't delete")); - - g_object_unref (self); -} - -static gboolean -seahorse_pkcs11_commands_delete_objects (SeahorseCommands *cmds, GList *objects) -{ - GCancellable *cancellable; - gchar *prompt; - const gchar *display; - GtkWidget *parent; - gboolean ret; - guint num; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_COMMANDS (cmds), FALSE); - - num = g_list_length (objects); - - if (num == 1) { - display = seahorse_object_get_label (SEAHORSE_OBJECT (objects->data)); - prompt = g_strdup_printf (_("Are you sure you want to delete the certificate '%s'?"), display); - } else { - prompt = g_strdup_printf (ngettext ( - "Are you sure you want to delete %d certificate?", - "Are you sure you want to delete %d certificates?", - num), num); - } - - parent = GTK_WIDGET (seahorse_commands_get_window (cmds)); - ret = seahorse_util_prompt_delete (prompt, parent); - g_free (prompt); - - if (ret) { - cancellable = g_cancellable_new (); - seahorse_pkcs11_delete_async (objects, cancellable, - on_delete_completed, g_object_ref (cmds)); - seahorse_progress_show (cancellable, _("Deleting"), TRUE); - g_object_unref (cancellable); - } - - return ret; -} - -static GObject* -seahorse_pkcs11_commands_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - GObject *obj = G_OBJECT_CLASS (seahorse_pkcs11_commands_parent_class)->constructor (type, n_props, props); - SeahorsePkcs11CommandsPrivate *pv; - SeahorsePkcs11Commands *self = NULL; - SeahorseCommands *base; - SeahorseView *view; - - if (obj) { - pv = SEAHORSE_PKCS11_COMMANDS_GET_PRIVATE (obj); - self = SEAHORSE_PKCS11_COMMANDS (obj); - base = SEAHORSE_COMMANDS (self); - - view = seahorse_commands_get_view (base); - g_return_val_if_fail (view, NULL); - - seahorse_view_register_commands (view, &commands_predicate, base); - seahorse_view_register_ui (view, &commands_predicate, "", pv->action_group); - } - - return obj; -} - -static void -seahorse_pkcs11_commands_init (SeahorsePkcs11Commands *self) -{ - SeahorsePkcs11CommandsPrivate *pv = SEAHORSE_PKCS11_COMMANDS_GET_PRIVATE (self); - pv->action_group = gtk_action_group_new ("pkcs11"); -} - -static void -seahorse_pkcs11_commands_dispose (GObject *obj) -{ - SeahorsePkcs11Commands *self = SEAHORSE_PKCS11_COMMANDS (obj); - SeahorsePkcs11CommandsPrivate *pv = SEAHORSE_PKCS11_COMMANDS_GET_PRIVATE (self); - - if (pv->action_group) - g_object_unref (pv->action_group); - pv->action_group = NULL; - - G_OBJECT_CLASS (seahorse_pkcs11_commands_parent_class)->dispose (obj); -} - -static void -seahorse_pkcs11_commands_finalize (GObject *obj) -{ - SeahorsePkcs11Commands *self = SEAHORSE_PKCS11_COMMANDS (obj); - SeahorsePkcs11CommandsPrivate *pv = SEAHORSE_PKCS11_COMMANDS_GET_PRIVATE (self); - - g_assert (pv->action_group == NULL); - - G_OBJECT_CLASS (seahorse_pkcs11_commands_parent_class)->finalize (obj); -} - -static void -seahorse_pkcs11_commands_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pkcs11_commands_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pkcs11_commands_class_init (SeahorsePkcs11CommandsClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - SeahorseCommandsClass *cmd_class = SEAHORSE_COMMANDS_CLASS (klass); - - seahorse_pkcs11_commands_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorsePkcs11CommandsPrivate)); - - gobject_class->constructor = seahorse_pkcs11_commands_constructor; - gobject_class->dispose = seahorse_pkcs11_commands_dispose; - gobject_class->finalize = seahorse_pkcs11_commands_finalize; - gobject_class->set_property = seahorse_pkcs11_commands_set_property; - gobject_class->get_property = seahorse_pkcs11_commands_get_property; - - cmd_class->show_properties = seahorse_pkcs11_commands_show_properties; - cmd_class->delete_objects = seahorse_pkcs11_commands_delete_objects; - - slot_certificate_window = g_quark_from_static_string ("seahorse-pkcs11-commands-window"); - - commands_predicate.type = SEAHORSE_PKCS11_TYPE_CERTIFICATE; - - /* Register this as a source of commands */ - seahorse_registry_register_type (seahorse_registry_get (), SEAHORSE_PKCS11_TYPE_COMMANDS, - SEAHORSE_PKCS11_TYPE_STR, "commands", NULL); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorsePkcs11Commands* -seahorse_pkcs11_commands_new (void) -{ - return g_object_new (SEAHORSE_PKCS11_TYPE_COMMANDS, NULL); -} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-commands.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-commands.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-commands.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-commands.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PKCS11_COMMANDS_H__ -#define __SEAHORSE_PKCS11_COMMANDS_H__ - -#include "seahorse-commands.h" - -#include - -#define SEAHORSE_PKCS11_TYPE_COMMANDS (seahorse_pkcs11_commands_get_type ()) -#define SEAHORSE_PKCS11_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PKCS11_TYPE_COMMANDS, SeahorsePkcs11Commands)) -#define SEAHORSE_PKCS11_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PKCS11_TYPE_COMMANDS, SeahorsePkcs11CommandsClass)) -#define SEAHORSE_PKCS11_IS_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PKCS11_TYPE_COMMANDS)) -#define SEAHORSE_PKCS11_IS_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PKCS11_TYPE_COMMANDS)) -#define SEAHORSE_PKCS11_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PKCS11_TYPE_COMMANDS, SeahorsePkcs11CommandsClass)) - -typedef struct _SeahorsePkcs11Commands SeahorsePkcs11Commands; -typedef struct _SeahorsePkcs11CommandsClass SeahorsePkcs11CommandsClass; -typedef struct _SeahorsePkcs11CommandsPrivate SeahorsePkcs11CommandsPrivate; - -struct _SeahorsePkcs11Commands { - SeahorseCommands parent; -}; - -struct _SeahorsePkcs11CommandsClass { - SeahorseCommandsClass parent_class; -}; - -GType seahorse_pkcs11_commands_get_type (void); - -SeahorsePkcs11Commands* seahorse_pkcs11_commands_new (void); - -#endif /* __SEAHORSE_PKCS11_COMMANDS_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-deleter.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-deleter.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-deleter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,235 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-pkcs11-deleter.h" +#include "seahorse-token.h" + +#include "seahorse-delete-dialog.h" + +#include + +#include + +G_DEFINE_TYPE (SeahorsePkcs11Deleter, seahorse_pkcs11_deleter, SEAHORSE_TYPE_DELETER); + +static void +seahorse_pkcs11_deleter_init (SeahorsePkcs11Deleter *self) +{ + +} + +static void +seahorse_pkcs11_deleter_finalize (GObject *obj) +{ + SeahorsePkcs11Deleter *self = SEAHORSE_PKCS11_DELETER (obj); + + g_list_free_full (self->objects, g_object_unref); + + G_OBJECT_CLASS (seahorse_pkcs11_deleter_parent_class)->finalize (obj); +} + +static GtkDialog * +seahorse_pkcs11_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorsePkcs11Deleter *self = SEAHORSE_PKCS11_DELETER (deleter); + GtkDialog *dialog; + gchar *prompt; + gchar *label; + guint num; + + num = g_list_length (self->objects); + if (num == 1) { + g_object_get (self->objects->data, "label", &label, NULL); + prompt = g_strdup_printf (_("Are you sure you want to permanently delete %s?"), label); + g_free (label); + } else { + prompt = g_strdup_printf (ngettext ("Are you sure you want to permanently delete %d certificate?", + "Are you sure you want to permanently delete %d certificates?", + num), + num); + } + + dialog = seahorse_delete_dialog_new (parent, "%s", prompt); + g_free (prompt); + + return dialog; +} + +static GList * +seahorse_pkcs11_deleter_get_objects (SeahorseDeleter *deleter) +{ + SeahorsePkcs11Deleter *self = SEAHORSE_PKCS11_DELETER (deleter); + return self->objects; +} + +static gboolean +seahorse_pkcs11_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorsePkcs11Deleter *self = SEAHORSE_PKCS11_DELETER (deleter); + + if (!SEAHORSE_IS_CERTIFICATE (object)) + return FALSE; + + self->objects = g_list_append (self->objects, g_object_ref (object)); + return TRUE; +} + +typedef struct { + GQueue *objects; + GCancellable *cancellable; +} DeleteClosure; + + +static void +delete_closure_free (gpointer data) +{ + DeleteClosure *closure = data; + g_queue_foreach (closure->objects, (GFunc)g_object_unref, NULL); + g_queue_free (closure->objects); + g_clear_object (&closure->cancellable); + g_free (closure); +} + +static void pkcs11_delete_one_object (GSimpleAsyncResult *res); + +static void +on_delete_object_completed (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + DeleteClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + GckObject *object; + SeahorseToken *pkcs11_token; + + object = g_queue_pop_head (closure->objects); + + if (!gck_object_destroy_finish (GCK_OBJECT (source), result, &error)) { + + /* Ignore objects that have gone away */ + if (g_error_matches (error, GCK_ERROR, CKR_OBJECT_HANDLE_INVALID)) { + g_clear_error (&error); + } else { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + } + + } + + if (error == NULL) { + g_object_get (object, "place", &pkcs11_token, NULL); + g_return_if_fail (SEAHORSE_IS_TOKEN (pkcs11_token)); + seahorse_token_remove_object (pkcs11_token, GCK_OBJECT (object)); + pkcs11_delete_one_object (res); + } + + g_object_unref (object); + g_object_unref (res); +} + +static void +pkcs11_delete_one_object (GSimpleAsyncResult *res) +{ + DeleteClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GckObject *object; + + if (g_queue_is_empty (closure->objects)) { + g_simple_async_result_complete_in_idle (res); + return; + } + + object = g_queue_peek_head (closure->objects); + + gck_object_destroy_async (object, closure->cancellable, + on_delete_object_completed, g_object_ref (res)); +} + +static void +seahorse_pkcs11_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorsePkcs11Deleter *self = SEAHORSE_PKCS11_DELETER (deleter); + GSimpleAsyncResult *res; + DeleteClosure *closure; + GList *l; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_pkcs11_deleter_delete_async); + closure = g_new0 (DeleteClosure, 1); + closure->objects = g_queue_new (); + for (l = self->objects; l != NULL; l = g_list_next (l)) + g_queue_push_tail (closure->objects, g_object_ref (l->data)); + g_simple_async_result_set_op_res_gpointer (res, closure, delete_closure_free); + + pkcs11_delete_one_object (res); + + g_object_unref (res); +} + +static gboolean +seahorse_pkcs11_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (deleter), + seahorse_pkcs11_deleter_delete_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +seahorse_pkcs11_deleter_class_init (SeahorsePkcs11DeleterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseDeleterClass *deleter_class = SEAHORSE_DELETER_CLASS (klass); + + gobject_class->finalize = seahorse_pkcs11_deleter_finalize; + + deleter_class->add_object = seahorse_pkcs11_deleter_add_object; + deleter_class->create_confirm = seahorse_pkcs11_deleter_create_confirm; + deleter_class->delete_async = seahorse_pkcs11_deleter_delete_async; + deleter_class->delete_finish = seahorse_pkcs11_deleter_delete_finish; + deleter_class->get_objects = seahorse_pkcs11_deleter_get_objects; +} + +SeahorseDeleter * +seahorse_pkcs11_deleter_new (SeahorseCertificate *certificate) +{ + SeahorseDeleter *deleter; + + deleter = g_object_new (SEAHORSE_TYPE_PKCS11_DELETER, NULL); + if (!seahorse_deleter_add_object (deleter, G_OBJECT (certificate))) + g_assert_not_reached (); + + return deleter; +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-deleter.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-deleter.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,55 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_PKCS11_DELETER_H__ +#define __SEAHORSE_PKCS11_DELETER_H__ + +#include + +#include "seahorse-deleter.h" +#include "seahorse-certificate.h" + +#define SEAHORSE_TYPE_PKCS11_DELETER (seahorse_pkcs11_deleter_get_type ()) +#define SEAHORSE_PKCS11_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_DELETER, SeahorsePkcs11Deleter)) +#define SEAHORSE_IS_PKCS11_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_DELETER)) +#define SEAHORSE_PKCS11_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_DELETER, SeahorsePkcs11DeleterClass)) +#define SEAHORSE_IS_PKCS11_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_DELETER)) +#define SEAHORSE_PKCS11_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_DELETER, SeahorsePkcs11DeleterClass)) + +typedef struct _SeahorsePkcs11Deleter SeahorsePkcs11Deleter; +typedef struct _SeahorsePkcs11DeleterClass SeahorsePkcs11DeleterClass; + +struct _SeahorsePkcs11Deleter { + SeahorseDeleter parent; + GList *objects; +}; + +struct _SeahorsePkcs11DeleterClass { + SeahorseDeleterClass parent_class; +}; + +GType seahorse_pkcs11_deleter_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_pkcs11_deleter_new (SeahorseCertificate *cert); + +#endif /* __SEAHORSE_PKCS11_DELETER_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-generate.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-generate.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-generate.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-generate.c 2012-10-01 14:27:35.000000000 +0200 @@ -0,0 +1,519 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-pkcs11-backend.h" +#include "seahorse-pkcs11-generate.h" +#include "seahorse-token.h" + +#include "seahorse-action.h" +#include "seahorse-progress.h" +#include "seahorse-interaction.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" + +#include + +#include + +#include + +#define SEAHORSE_PKCS11_GENERATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_GENERATE, SeahorsePkcs11Generate)) +#define SEAHORSE_IS_PKCS11_GENERATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_GENERATE)) +#define SEAHORSE_PKCS11_GENERATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_GENERATE, SeahorsePkcs11GenerateClass)) +#define SEAHORSE_IS_PKCS11_GENERATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_GENERATE)) +#define SEAHORSE_PKCS11_GENERATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_GENERATE, SeahorsePkcs11GenerateClass)) + +typedef struct _SeahorsePkcs11Generate SeahorsePkcs11Generate; +typedef struct _SeahorsePkcs11GenerateClass SeahorsePkcs11GenerateClass; + +struct _SeahorsePkcs11Generate { + GtkDialog dialog; + + GtkEntry *label_entry; + + SeahorseToken *token; + GtkComboBox *token_box; + GcrCollectionModel *token_model; + + GckMechanism *mechanism; + GtkListStore *mechanism_store; + GtkComboBox *mechanism_box; + + GtkSpinButton *bits_entry; + + GCancellable *cancellable; + GckAttributes *pub_attrs; + GckAttributes *prv_attrs; +}; + +struct _SeahorsePkcs11GenerateClass { + GtkDialogClass dialog_class; +}; + +G_DEFINE_TYPE (SeahorsePkcs11Generate, seahorse_pkcs11_generate, GTK_TYPE_DIALOG); + +enum { + MECHANISM_LABEL, + MECHANISM_TYPE, + MECHANISM_N_COLS +}; + +static GType MECHANISM_TYPES[] = { + G_TYPE_STRING, + G_TYPE_ULONG +}; + +struct { + gulong mechanism_type; + const gchar *label; +} AVAILABLE_MECHANISMS[] = { + { CKM_RSA_PKCS_KEY_PAIR_GEN, N_("RSA") }, +}; + +static void +seahorse_pkcs11_generate_init (SeahorsePkcs11Generate *self) +{ + +} + +static void +update_response (SeahorsePkcs11Generate *self) +{ + gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, + self->token != NULL && self->mechanism != NULL); +} + +static void +complete_generate (SeahorsePkcs11Generate *self, + GError **error) +{ + g_assert (error != NULL); + + if (*error != NULL) + seahorse_util_handle_error (error, NULL, _("Couldn't generate private key")); + else + seahorse_place_load_async (SEAHORSE_PLACE (self->token), self->cancellable, NULL, NULL); + + g_clear_object (&self->cancellable); + gck_attributes_unref (self->pub_attrs); + gck_attributes_unref (self->prv_attrs); + self->pub_attrs = self->prv_attrs = NULL; +} + +static void +prepare_generate (SeahorsePkcs11Generate *self) +{ + CK_BYTE rsa_public_exponent[] = { 0x01, 0x00, 0x01 }; /* 65537 in bytes */ + GckBuilder publi = GCK_BUILDER_INIT; + GckBuilder priva = GCK_BUILDER_INIT; + const gchar *label; + + g_assert (self->cancellable == NULL); + g_assert (self->mechanism != NULL); + + gck_builder_add_ulong (&publi, CKA_CLASS, CKO_PUBLIC_KEY); + gck_builder_add_ulong (&priva, CKA_CLASS, CKO_PRIVATE_KEY); + + gck_builder_add_boolean (&publi, CKA_TOKEN, TRUE); + gck_builder_add_boolean (&priva, CKA_TOKEN, TRUE); + + gck_builder_add_boolean (&priva, CKA_PRIVATE, TRUE); + gck_builder_add_boolean (&priva, CKA_SENSITIVE, TRUE); + + label = gtk_entry_get_text (self->label_entry); + gck_builder_add_string (&publi, CKA_LABEL, label); + gck_builder_add_string (&priva, CKA_LABEL, label); + + if (self->mechanism->type == CKM_RSA_PKCS_KEY_PAIR_GEN) { + gck_builder_add_boolean (&publi, CKA_ENCRYPT, TRUE); + gck_builder_add_boolean (&publi, CKA_VERIFY, TRUE); + gck_builder_add_boolean (&publi, CKA_WRAP, TRUE); + + gck_builder_add_boolean (&priva, CKA_DECRYPT, TRUE); + gck_builder_add_boolean (&priva, CKA_SIGN, TRUE); + gck_builder_add_boolean (&priva, CKA_UNWRAP, TRUE); + + gck_builder_add_data (&publi, CKA_PUBLIC_EXPONENT, + rsa_public_exponent, sizeof (rsa_public_exponent)); + gck_builder_add_ulong (&publi, CKA_MODULUS_BITS, + gtk_spin_button_get_value_as_int (self->bits_entry)); + + } else { + g_warning ("currently no support for this mechanism"); + } + + self->prv_attrs = gck_builder_steal (&priva); + self->pub_attrs = gck_builder_steal (&publi); + + gck_builder_clear (&publi); + gck_builder_clear (&priva); +} + +static void +on_generate_complete (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePkcs11Generate *self = SEAHORSE_PKCS11_GENERATE (user_data); + GError *error = NULL; + + gck_session_generate_key_pair_finish (GCK_SESSION (object), result, NULL, NULL, &error); + complete_generate (self, &error); + + g_object_unref (self); +} + +static void +on_generate_open_session (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePkcs11Generate *self = SEAHORSE_PKCS11_GENERATE (user_data); + GError *error = NULL; + GckSession *session; + + session = gck_session_open_finish (result, &error); + if (session) { + gck_session_generate_key_pair_async (session, self->mechanism, + self->pub_attrs, self->prv_attrs, + self->cancellable, on_generate_complete, + g_object_ref (self)); + g_object_unref (session); + + } else { + complete_generate (self, &error); + } + + g_object_unref (self); +} + +static const gchar * +get_available_mechanism_label (gulong type) +{ + guint i; + + for (i = 0; i < G_N_ELEMENTS (AVAILABLE_MECHANISMS); i++) { + if (AVAILABLE_MECHANISMS[i].mechanism_type == type) + return AVAILABLE_MECHANISMS[i].label; + } + + return NULL; +} + +static void +on_token_changed (GtkComboBox *combo_box, + gpointer user_data) +{ + SeahorsePkcs11Generate *self = SEAHORSE_PKCS11_GENERATE (user_data); + GtkTreeIter iter; + GArray *mechanisms; + GObject *object; + gulong type, otype; + gboolean valid; + GtkTreeModel *model; + const gchar *label; + guint i; + + g_clear_object (&self->token); + + if (gtk_combo_box_get_active_iter (combo_box, &iter)) { + object = gcr_collection_model_object_for_iter (self->token_model, &iter); + self->token = g_object_ref (object); + } + + model = GTK_TREE_MODEL (self->mechanism_store); + valid = gtk_tree_model_get_iter_first (model, &iter); + if (self->token) { + mechanisms = seahorse_token_get_mechanisms (self->token); + for (i = 0; mechanisms && i < mechanisms->len; i++) { + type = g_array_index (mechanisms, gulong, i); + label = get_available_mechanism_label (type); + if (label == NULL) + continue; + while (valid) { + gtk_tree_model_get (model, &iter, MECHANISM_TYPE, &otype, -1); + if (otype == type) + break; + valid = gtk_list_store_remove (self->mechanism_store, &iter); + } + if (!valid) + gtk_list_store_append (self->mechanism_store, &iter); + gtk_list_store_set (self->mechanism_store, &iter, + MECHANISM_TYPE, type, + MECHANISM_LABEL, label, + -1); + valid = gtk_tree_model_iter_next (model, &iter); + } + } + while (valid) + valid = gtk_list_store_remove (self->mechanism_store, &iter); + + /* Select first mechanism if none are selected */ + if (!gtk_combo_box_get_active_iter (self->mechanism_box, &iter)) + if (gtk_tree_model_get_iter_first (model, &iter)) + gtk_combo_box_set_active_iter (self->mechanism_box, &iter); + + update_response (self); +} + +static void +on_mechanism_changed (GtkComboBox *widget, + gpointer user_data) +{ + SeahorsePkcs11Generate *self = SEAHORSE_PKCS11_GENERATE (user_data); + GckMechanismInfo *info; + GtkTreeIter iter; + GckSlot *slot; + guint min; + guint max; + + g_free (self->mechanism); + self->mechanism = NULL; + + if (gtk_combo_box_get_active_iter (widget, &iter)) { + self->mechanism = g_new0 (GckMechanism, 1); + gtk_tree_model_get (GTK_TREE_MODEL (self->mechanism_store), &iter, + MECHANISM_TYPE, &self->mechanism->type, -1); + + slot = seahorse_token_get_slot (self->token); + info = gck_slot_get_mechanism_info (slot, self->mechanism->type); + g_return_if_fail (info != NULL); + + min = info->min_key_size; + max = info->max_key_size; + + if (min < 512 && max >= 512) + min = 512; + if (max > 16384 && min <= 16384) + max = 16384; + gtk_spin_button_set_range (self->bits_entry, min, max); + + gck_mechanism_info_free (info); + } + + gtk_widget_set_sensitive (GTK_WIDGET (self->bits_entry), + self->mechanism != NULL); + + update_response (self); +} + +static gint +on_mechanism_sort (GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + gpointer user_data) +{ + gchar *label_a = NULL; + gchar *label_b = NULL; + gint ret; + + gtk_tree_model_get (model, a, MECHANISM_LABEL, &label_a, -1); + gtk_tree_model_get (model, b, MECHANISM_LABEL, &label_b, -1); + ret = g_strcmp0 (label_a, label_b); + g_free (label_a); + g_free (label_b); + + return ret; +} + +static void +seahorse_pkcs11_generate_constructed (GObject *obj) +{ + SeahorsePkcs11Generate *self = SEAHORSE_PKCS11_GENERATE (obj); + GtkCellRenderer *renderer; + GcrCollection *collection; + GtkBuilder *builder; + const gchar *path; + GError *error = NULL; + GtkWidget *content; + GtkWidget *widget; + + G_OBJECT_CLASS (seahorse_pkcs11_generate_parent_class)->constructed (obj); + + builder = gtk_builder_new (); + path = SEAHORSE_UIDIR "/seahorse-pkcs11-generate.xml"; + gtk_builder_add_from_file (builder, path, &error); + if (error != NULL) { + g_warning ("couldn't load ui file: %s", path); + g_clear_error (&error); + g_object_unref (builder); + return; + } + + gtk_window_set_resizable (GTK_WINDOW (self), FALSE); + content = gtk_dialog_get_content_area (GTK_DIALOG (self)); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "pkcs11-generate")); + gtk_container_add (GTK_CONTAINER (content), widget); + gtk_widget_show (widget); + + self->bits_entry = GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "key-bits")); + gtk_spin_button_set_range (self->bits_entry, 0, G_MAXINT); /* updated later */ + gtk_spin_button_set_increments (self->bits_entry, 128, 128); + gtk_spin_button_set_value (self->bits_entry, 2048); + + self->label_entry = GTK_ENTRY (gtk_builder_get_object (builder, "key-label")); + + /* The mechanism */ + self->mechanism_box = GTK_COMBO_BOX (gtk_builder_get_object (builder, "key-mechanism")); + G_STATIC_ASSERT (MECHANISM_N_COLS == G_N_ELEMENTS (MECHANISM_TYPES)); + self->mechanism_store = gtk_list_store_newv (MECHANISM_N_COLS, MECHANISM_TYPES); + gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (self->mechanism_store), + on_mechanism_sort, NULL, NULL); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->mechanism_store), + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); + gtk_combo_box_set_model (self->mechanism_box, GTK_TREE_MODEL (self->mechanism_store)); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self->mechanism_box), renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self->mechanism_box), renderer, "markup", MECHANISM_LABEL); + g_signal_connect (self->mechanism_box, "changed", G_CALLBACK (on_mechanism_changed), self); + + /* The tokens */ + self->token_box = GTK_COMBO_BOX (gtk_builder_get_object (builder, "key-token")); + collection = seahorse_pkcs11_backend_get_writable_tokens (NULL, CKM_RSA_PKCS_KEY_PAIR_GEN); + self->token_model = gcr_collection_model_new (collection, GCR_COLLECTION_MODEL_LIST, + "icon", G_TYPE_ICON, "label", G_TYPE_STRING, NULL); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->token_model), 1, GTK_SORT_ASCENDING); + gtk_combo_box_set_model (self->token_box, GTK_TREE_MODEL (self->token_model)); + renderer = gtk_cell_renderer_pixbuf_new (); + g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self->token_box), renderer, FALSE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self->token_box), renderer, "gicon", 0); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self->token_box), renderer, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self->token_box), renderer, "text", 1); + g_signal_connect (self->token_box, "changed", G_CALLBACK (on_token_changed), self); + if (gcr_collection_get_length (collection) > 0) + gtk_combo_box_set_active (self->token_box, 0); + g_object_unref (collection); + + /* The buttons */ + gtk_dialog_add_buttons (GTK_DIALOG (self), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Create"), GTK_RESPONSE_OK, + NULL); + gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK); + + update_response (self); + g_object_unref (builder); +} + +static void +seahorse_pkcs11_generate_finalize (GObject *obj) +{ + SeahorsePkcs11Generate *self = SEAHORSE_PKCS11_GENERATE (obj); + + g_clear_object (&self->token); + g_clear_object (&self->token_model); + + g_free (self->mechanism); + g_clear_object (&self->mechanism_store); + + g_clear_object (&self->cancellable); + gck_attributes_unref (self->pub_attrs); + gck_attributes_unref (self->prv_attrs); + + G_OBJECT_CLASS (seahorse_pkcs11_generate_parent_class)->finalize (obj); +} + +static void +seahorse_pkcs11_generate_response (GtkDialog *dialog, + gint response_id) +{ + SeahorsePkcs11Generate *self = SEAHORSE_PKCS11_GENERATE (dialog); + GTlsInteraction *interaction; + GtkWindow *parent; + + if (response_id == GTK_RESPONSE_OK) { + g_return_if_fail (self->token); + + prepare_generate (self); + parent = gtk_window_get_transient_for (GTK_WINDOW (self)); + interaction = seahorse_interaction_new (parent); + + gck_session_open_async (seahorse_token_get_slot (self->token), + GCK_SESSION_READ_WRITE | GCK_SESSION_LOGIN_USER, + interaction, self->cancellable, + on_generate_open_session, g_object_ref (self)); + + seahorse_progress_show (self->cancellable, _("Generating key"), FALSE); + g_object_unref (interaction); + } + + gtk_widget_hide (GTK_WIDGET (dialog)); +} + +static void +seahorse_pkcs11_generate_class_init (SeahorsePkcs11GenerateClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass); + + gobject_class->constructed = seahorse_pkcs11_generate_constructed; + gobject_class->finalize = seahorse_pkcs11_generate_finalize; + + dialog_class->response = seahorse_pkcs11_generate_response; +} + +void +seahorse_pkcs11_generate_prompt (GtkWindow *parent) +{ + GtkDialog *dialog; + + g_return_if_fail (GTK_IS_WINDOW (parent)); + + dialog = g_object_new (SEAHORSE_TYPE_PKCS11_GENERATE, + "transient-for", parent, + NULL); + g_object_ref_sink (dialog); + + gtk_dialog_run (dialog); + + g_object_unref (dialog); +} + +static void +on_generate_activate (GtkAction *action, + gpointer user_data) +{ + GtkWindow *parent; + + parent = seahorse_action_get_window (action); + seahorse_pkcs11_generate_prompt (parent); +} + +static const GtkActionEntry ACTION_ENTRIES[] = { + { "pkcs11-generate-key", GCR_ICON_KEY_PAIR, N_ ("Private key"), "", + N_("Used to request a certificate"), G_CALLBACK (on_generate_activate) } +}; + +void +seahorse_pkcs11_generate_register (void) +{ + GtkActionGroup *actions; + + actions = gtk_action_group_new ("pkcs11-generate"); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, ACTION_ENTRIES, G_N_ELEMENTS (ACTION_ENTRIES), NULL); + seahorse_registry_register_object (NULL, G_OBJECT (actions), "generator", NULL); +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-generate.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-generate.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-generate.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-generate.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,35 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PKCS11_GENERATE_H__ +#define __SEAHORSE_PKCS11_GENERATE_H__ + +#include + +#define SEAHORSE_TYPE_PKCS11_GENERATE (seahorse_pkcs11_generate_get_type ()) + +GType seahorse_pkcs11_generate_get_type (void) G_GNUC_CONST; + +void seahorse_pkcs11_generate_prompt (GtkWindow *parent); + +void seahorse_pkcs11_generate_register (void); + +#endif /* __SEAHORSE_PKCS11_GENERATE_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-generate.xml seahorse-3.6.3/pkcs11/seahorse-pkcs11-generate.xml --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-generate.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-generate.xml 2012-11-12 08:32:13.000000000 +0100 @@ -0,0 +1,246 @@ + + + + + True + False + 7 + 12 + + + True + False + 0 + 48 + gcr-key-pair + + + False + True + 0 + + + + + True + False + 12 + + + True + False + 0 + 0 + Create a new private key + + + False + False + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + Label: + + + 0 + 0 + 1 + 1 + + + + + True + False + Stored at: + + + 0 + 1 + 1 + 1 + + + + + True + True + ● + True + True + + + 1 + 0 + 1 + 1 + + + + + True + False + + + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + False + True + 1 + + + + + True + True + + + True + False + 0 + 0 + 0 + 0 + 12 + 12 + + + True + False + 6 + 12 + + + True + False + 0 + Key _Type: + True + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Key _Strength (bits): + True + + + 0 + 1 + 1 + 1 + + + + + True + False + + + 1 + 0 + 1 + 1 + + + + + True + True + ● + True + 64 + True + True + + + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + True + False + <b>_Advanced key options</b> + True + True + + + + + True + True + 2 + + + + + False + True + 1 + + + + diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11.h seahorse-3.6.3/pkcs11/seahorse-pkcs11.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11.h 2012-08-21 12:23:18.000000000 +0200 @@ -24,7 +24,14 @@ #include -#define SEAHORSE_PKCS11_TYPE_STR "pkcs11" -#define SEAHORSE_PKCS11_TYPE g_quark_from_string ("pkcs11") +#include + +#define SEAHORSE_PKCS11_NAME "pkcs11" + +#ifdef WITH_PKCS11 + +void seahorse_pkcs11_backend_initialize (void); + +#endif /* WITH_PKCS11 */ #endif diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-helpers.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-helpers.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-helpers.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-helpers.c 2012-08-21 12:23:18.000000000 +0200 @@ -25,129 +25,22 @@ #include #include -#include - -static char* -seahorse_pkcs11_klass_to_string (gulong klass) +guint +seahorse_pkcs11_ulong_hash (gconstpointer v) { - switch (klass) - { - case CKO_DATA: - return g_strdup ("data"); - case CKO_CERTIFICATE: - return g_strdup ("certificate"); - case CKO_PRIVATE_KEY: - return g_strdup ("private-key"); - case CKO_PUBLIC_KEY: - return g_strdup ("public-key"); - default: - return g_strdup_printf ("%lu", klass); - } -} + const signed char *p = v; + guint32 i, h = *p; -static gulong -seahorse_pkcs11_string_to_klass (const char* str) -{ - gulong klass; - gchar *end; - - g_return_val_if_fail (str != NULL, 0UL); - - if (g_str_equal (str, "data")) - return CKO_DATA; - if (g_str_equal (str, "certificate")) - return CKO_CERTIFICATE; - if (g_str_equal (str, "private-key")) - return CKO_PRIVATE_KEY; - if (g_str_equal (str, "public-key")) - return CKO_PUBLIC_KEY; - - klass = strtoul (str, &end, 10); - if (!*end) { - g_warning ("unrecognized and unparsable PKCS#11 class: %s", str); - return (gulong)-1; - } - - return klass; -} + for(i = 0; i < sizeof (gulong); ++i) + h = (h << 5) - h + *(p++); -GQuark -seahorse_pkcs11_id_from_attributes (GckAttributes* attrs) -{ - gulong klass; - GckAttribute* attr; - gchar *id, *encoded, *klass_str; - GQuark quark; - - g_return_val_if_fail (attrs != NULL, 0U); - - /* These cases should have been covered by the programmer */ - - klass = 0; - if (!gck_attributes_find_ulong (attrs, CKA_CLASS, &klass)) { - g_warning ("Cannot create object id. PKCS#11 attribute set did not contain CKA_CLASS."); - return 0; - } - - attr = gck_attributes_find (attrs, CKA_ID); - if (attr == NULL) { - g_warning ("Cannot create object id. PKCS#11 attribute set did not contain CKA_ID"); - return 0; - } - - encoded = g_base64_encode (attr->value, attr->length); - klass_str = seahorse_pkcs11_klass_to_string (klass); - id = g_strdup_printf ("%s:%s/%s", SEAHORSE_PKCS11_TYPE_STR, klass_str, encoded); - g_free (encoded); - g_free (klass_str); - - quark = g_quark_from_string (id); - g_free (id); - - return quark; + return h; } - -gboolean -seahorse_pkcs11_id_to_attributes (GQuark id, GckAttributes* attrs) +gboolean +seahorse_pkcs11_ulong_equal (gconstpointer v1, + gconstpointer v2) { - const gchar* value; - guchar *ckid; - gsize n_ckid; - gulong klass; - gchar **parts; - - g_return_val_if_fail (attrs != NULL, FALSE); - - if (id == 0) - return FALSE; - - value = g_quark_to_string (id); - - parts = g_strsplit_set (value, ":/", 3); - if (!parts[0] || !g_str_equal (parts[0], SEAHORSE_PKCS11_TYPE_STR) || - !parts[1] || !parts[2]) { - g_strfreev (parts); - return FALSE; - } - - klass = seahorse_pkcs11_string_to_klass (parts[1]); - if (klass == -1) { - g_strfreev (parts); - return FALSE; - } - - ckid = g_base64_decode (parts[2], &n_ckid); - g_strfreev (parts); - - if (!id) - return FALSE; - - gck_attributes_add_ulong (attrs, CKA_CLASS, klass); - gck_attributes_add_data (attrs, CKA_ID, ckid, n_ckid); - g_free (ckid); - - return TRUE; + return *((const gulong*)v1) == *((const gulong*)v2); } - diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-helpers.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-helpers.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-helpers.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-helpers.h 2012-08-21 12:23:18.000000000 +0200 @@ -25,8 +25,10 @@ #include #include -GQuark seahorse_pkcs11_id_from_attributes (GckAttributes* attrs); -gboolean seahorse_pkcs11_id_to_attributes (GQuark id, GckAttributes* attrs); +guint seahorse_pkcs11_ulong_hash (gconstpointer v); + +gboolean seahorse_pkcs11_ulong_equal (gconstpointer v1, + gconstpointer v2); #endif diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-key-deleter.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-key-deleter.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-key-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-key-deleter.c 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,150 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-certificate.h" +#include "seahorse-pkcs11-deleter.h" +#include "seahorse-pkcs11-key-deleter.h" +#include "seahorse-private-key.h" +#include "seahorse-token.h" + +#include "seahorse-delete-dialog.h" + +#include + +#include + +#define SEAHORSE_PKCS11_KEY_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_KEY_DELETER, SeahorsePkcs11KeyDeleterClass)) +#define SEAHORSE_IS_PKCS11_KEY_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_KEY_DELETER)) +#define SEAHORSE_PKCS11_KEY_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_KEY_DELETER, SeahorsePkcs11KeyDeleterClass)) + +typedef struct _SeahorsePkcs11KeyDeleterClass SeahorsePkcs11KeyDeleterClass; + +struct _SeahorsePkcs11KeyDeleter { + SeahorsePkcs11Deleter parent; + SeahorseCertificate *cert; + SeahorsePrivateKey *key; + gchar *label; +}; + +struct _SeahorsePkcs11KeyDeleterClass { + SeahorsePkcs11DeleterClass parent_class; +}; + +G_DEFINE_TYPE (SeahorsePkcs11KeyDeleter, seahorse_pkcs11_key_deleter, SEAHORSE_TYPE_PKCS11_DELETER); + +static void +seahorse_pkcs11_key_deleter_init (SeahorsePkcs11KeyDeleter *self) +{ + +} + +static void +seahorse_pkcs11_key_deleter_finalize (GObject *obj) +{ + SeahorsePkcs11KeyDeleter *self = SEAHORSE_PKCS11_KEY_DELETER (obj); + + g_free (self->label); + + G_OBJECT_CLASS (seahorse_pkcs11_key_deleter_parent_class)->finalize (obj); +} + +static GtkDialog * +seahorse_pkcs11_key_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorsePkcs11KeyDeleter *self = SEAHORSE_PKCS11_KEY_DELETER (deleter); + GtkDialog *dialog; + gchar *prompt; + + prompt = g_strdup_printf (_("Are you sure you want to permanently delete %s?"), self->label); + + dialog = seahorse_delete_dialog_new (parent, "%s", prompt); + + seahorse_delete_dialog_set_check_label (SEAHORSE_DELETE_DIALOG (dialog), _("I understand that this key will be permanently deleted.")); + seahorse_delete_dialog_set_check_require (SEAHORSE_DELETE_DIALOG (dialog), TRUE); + + g_free (prompt); + return dialog; +} + +static gboolean +seahorse_pkcs11_key_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorsePkcs11KeyDeleter *self = SEAHORSE_PKCS11_KEY_DELETER (deleter); + SeahorsePkcs11Deleter *base = SEAHORSE_PKCS11_DELETER (deleter); + gpointer partner = NULL; + + if (SEAHORSE_IS_PRIVATE_KEY (object)) { + if (self->key != NULL) + return FALSE; + if (self->cert != NULL) { + partner = seahorse_certificate_get_partner (SEAHORSE_CERTIFICATE (self->cert)); + if (partner != object) + return FALSE; + } + self->key = SEAHORSE_PRIVATE_KEY (object); + base->objects = g_list_prepend (base->objects, g_object_ref (self->key)); + + } else if (SEAHORSE_IS_CERTIFICATE (object)) { + if (self->cert != NULL) + return FALSE; + if (self->key != NULL) { + partner = seahorse_private_key_get_partner (SEAHORSE_PRIVATE_KEY (self->key)); + if (partner != object) + return FALSE; + } + self->cert = SEAHORSE_CERTIFICATE (object); + base->objects = g_list_append (base->objects, g_object_ref (self->cert)); + } + + if (self->label == NULL) + g_object_get (object, "label", &self->label, NULL); + return TRUE; +} + +static void +seahorse_pkcs11_key_deleter_class_init (SeahorsePkcs11KeyDeleterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseDeleterClass *deleter_class = SEAHORSE_DELETER_CLASS (klass); + + deleter_class->add_object = seahorse_pkcs11_key_deleter_add_object; + deleter_class->create_confirm = seahorse_pkcs11_key_deleter_create_confirm; + + gobject_class->finalize = seahorse_pkcs11_key_deleter_finalize; +} + +SeahorseDeleter * +seahorse_pkcs11_key_deleter_new (GObject *cert_or_key) +{ + SeahorseDeleter *deleter; + + deleter = g_object_new (SEAHORSE_TYPE_PKCS11_KEY_DELETER, NULL); + if (!seahorse_deleter_add_object (deleter, cert_or_key)) + g_assert_not_reached (); + + return deleter; +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-key-deleter.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-key-deleter.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-key-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-key-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_PKCS11_KEY_DELETER_H__ +#define __SEAHORSE_PKCS11_KEY_DELETER_H__ + +#include + +#include "seahorse-deleter.h" +#include "seahorse-certificate.h" + +#define SEAHORSE_TYPE_PKCS11_KEY_DELETER (seahorse_pkcs11_key_deleter_get_type ()) +#define SEAHORSE_PKCS11_KEY_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_KEY_DELETER, SeahorsePkcs11KeyDeleter)) +#define SEAHORSE_IS_PKCS11_KEY_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_KEY_DELETER)) + +typedef struct _SeahorsePkcs11KeyDeleter SeahorsePkcs11KeyDeleter; + +GType seahorse_pkcs11_key_deleter_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_pkcs11_key_deleter_new (GObject *cert_or_key); + +#endif /* __SEAHORSE_PKCS11_KEY_DELETER_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-module.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-module.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-module.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-module.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-pkcs11-module.h" - -#include "seahorse-pkcs11-commands.h" -#include "seahorse-pkcs11-source.h" - -#include "seahorse-util.h" - -#include - -void -seahorse_pkcs11_module_init (void) -{ - SeahorseSource *source; - GList *slots, *s; - GList *modules, *m; - GError *error = NULL; - - modules = gck_modules_initialize_registered (NULL, &error); - if (error != NULL) { - g_warning ("%s", error->message); - g_clear_error (&error); - } - - for (m = modules; m != NULL; m = g_list_next (m)) { - slots = gck_module_get_slots (m->data, FALSE); - for (s = slots; s; s = g_list_next (s)) { - source = SEAHORSE_SOURCE (seahorse_pkcs11_source_new (s->data)); - seahorse_context_take_source (NULL, source); - } - - /* These will have been refed by the source above */ - gck_list_unref_free (slots); - } - - gck_list_unref_free (modules); - - /* Let these register themselves */ - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_PKCS11_SOURCE)); - g_type_class_unref (g_type_class_ref (SEAHORSE_PKCS11_TYPE_COMMANDS)); -} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-module.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-module.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-module.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-module.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 SEAHORSE_PKCS11_H_ -#define SEAHORSE_PKCS11_H_ - -#define SEAHORSE_PKCS11_STR "pkcs11" -#define SEAHORSE_PKCS11 (g_quark_from_static_string (SEAHORSE_PKCS11_STR)) - -void seahorse_pkcs11_module_init (void); - -#endif /*SEAHORSE_PKCS11_H_*/ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-object.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-object.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-object.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-object.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,409 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-pkcs11-object.h" -#include "seahorse-pkcs11-operations.h" - -#include "seahorse-object.h" -#include "seahorse-pkcs11.h" -#include "seahorse-util.h" - -#include - -#include - -static const gulong REQUIRED_ATTRS[] = { - CKA_LABEL, - CKA_ID -}; - -enum { - PROP_0, - PROP_PKCS11_HANDLE, - PROP_PKCS11_OBJECT, - PROP_PKCS11_ATTRIBUTES -}; - -struct _SeahorsePkcs11ObjectPrivate { - GckObject *pkcs11_object; - GckAttributes* pkcs11_attributes; - GCancellable *request_attributes; -}; - -G_DEFINE_TYPE (SeahorsePkcs11Object, seahorse_pkcs11_object, SEAHORSE_TYPE_OBJECT); - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static void -received_object_attributes (GObject *object, GAsyncResult *result, gpointer user_data) -{ - SeahorsePkcs11Object *self = SEAHORSE_PKCS11_OBJECT (user_data); - GckAttributes *attrs; - GError *err = NULL; - - attrs = gck_object_get_finish (GCK_OBJECT (object), result, &err); - if (err && err->code == CKR_FUNCTION_CANCELED) - return; - - g_object_unref (self->pv->request_attributes); - self->pv->request_attributes = NULL; - - if (attrs == NULL) - g_message ("couldn't load attributes for pkcs#11 object: %s", - err && err->message ? err->message : ""); - else - seahorse_pkcs11_object_set_pkcs11_attributes (self, attrs); - - g_object_unref (self); -} - -static void -load_object_attributes (SeahorsePkcs11Object *self, const gulong *attr_types, - gsize n_attr_types) -{ - gboolean added = FALSE; - GckAttribute *attr; - GArray *types; - gsize i; - - g_assert (SEAHORSE_PKCS11_IS_OBJECT (self)); - g_assert (self->pv->pkcs11_attributes); - g_assert (self->pv->pkcs11_object); - - /* Add in any attirbutes not found, as invalid */ - for (i = 0; i < n_attr_types; ++i) { - attr = gck_attributes_find (self->pv->pkcs11_attributes, attr_types[i]); - if (attr == NULL) { - gck_attributes_add_invalid (self->pv->pkcs11_attributes, attr_types[i]); - added = TRUE; - } - - } - - /* Already a request happening */ - if (self->pv->request_attributes) { - if (added) { - /* Need to restart the request, our attributes not covered */ - g_cancellable_cancel (self->pv->request_attributes); - g_object_unref (self->pv->request_attributes); - self->pv->request_attributes = NULL; - } else { - /* The current request works for us */ - return; - } - } - - /* - * Build up an array of attribute types to load, from the - * ones that we alrady have plus the ones that are requested. - */ - - types = g_array_new (FALSE, TRUE, sizeof (gulong)); - for (i = 0; i < gck_attributes_count (self->pv->pkcs11_attributes); ++i) { - attr = gck_attributes_at (self->pv->pkcs11_attributes, i); - g_return_if_fail (attr); - g_array_append_val (types, attr->type); - } - - /* Off we go to load them all */ - self->pv->request_attributes = g_cancellable_new (); - gck_object_get_async (self->pv->pkcs11_object, (gulong*)types->data, types->len, - self->pv->request_attributes, received_object_attributes, g_object_ref (self)); - - g_array_free (types, TRUE); -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -void -seahorse_pkcs11_object_realize (SeahorsePkcs11Object *self) -{ - gboolean exportable; - gchar *label = NULL; - guint flags; - - seahorse_pkcs11_object_require_attributes (self, REQUIRED_ATTRS, G_N_ELEMENTS (REQUIRED_ATTRS)); - - flags = SEAHORSE_FLAG_DELETABLE; - if (gck_attributes_find_boolean (self->pv->pkcs11_attributes, CKA_EXTRACTABLE, &exportable) && exportable) - flags |= SEAHORSE_FLAG_EXPORTABLE; - - gck_attributes_find_string (self->pv->pkcs11_attributes, CKA_LABEL, &label); - g_object_set (self, - "label", label, - "location", SEAHORSE_LOCATION_LOCAL, - "flags", flags, - NULL); - - g_free (label); -} - -void -seahorse_pkcs11_object_refresh (SeahorsePkcs11Object *self) -{ - /* Reload the same attributes */ - load_object_attributes (self, NULL, 0); -} - -static GObject* -seahorse_pkcs11_object_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - SeahorsePkcs11Object *self = SEAHORSE_PKCS11_OBJECT (G_OBJECT_CLASS (seahorse_pkcs11_object_parent_class)->constructor(type, n_props, props)); - - g_return_val_if_fail (self, NULL); - - g_return_val_if_fail (self->pv->pkcs11_object, NULL); - g_object_set (self, "id", seahorse_pkcs11_object_cannonical_id (self->pv->pkcs11_object), NULL); - - return G_OBJECT (self); -} - -static void -seahorse_pkcs11_object_init (SeahorsePkcs11Object *self) -{ - self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_PKCS11_TYPE_OBJECT, SeahorsePkcs11ObjectPrivate)); - self->pv->pkcs11_attributes = gck_attributes_new (); -} - -static void -seahorse_pkcs11_object_dispose (GObject *obj) -{ - SeahorsePkcs11Object *self = SEAHORSE_PKCS11_OBJECT (obj); - - if (self->pv->pkcs11_object) - g_object_unref (self->pv->pkcs11_object); - self->pv->pkcs11_object = NULL; - - G_OBJECT_CLASS (seahorse_pkcs11_object_parent_class)->dispose (obj); -} - -static void -seahorse_pkcs11_object_finalize (GObject *obj) -{ - SeahorsePkcs11Object *self = SEAHORSE_PKCS11_OBJECT (obj); - - g_assert (self->pv->pkcs11_object == NULL); - - if (self->pv->pkcs11_attributes) - gck_attributes_unref (self->pv->pkcs11_attributes); - self->pv->pkcs11_attributes = NULL; - - G_OBJECT_CLASS (seahorse_pkcs11_object_parent_class)->finalize (obj); -} - -static void -seahorse_pkcs11_object_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorsePkcs11Object *self = SEAHORSE_PKCS11_OBJECT (obj); - - switch (prop_id) { - case PROP_PKCS11_OBJECT: - g_value_set_object (value, seahorse_pkcs11_object_get_pkcs11_object (self)); - break; - case PROP_PKCS11_ATTRIBUTES: - g_value_set_boxed (value, seahorse_pkcs11_object_get_pkcs11_attributes (self)); - break; - case PROP_PKCS11_HANDLE: - g_value_set_ulong (value, seahorse_pkcs11_object_get_pkcs11_handle (self)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pkcs11_object_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorsePkcs11Object *self = SEAHORSE_PKCS11_OBJECT (obj); - - switch (prop_id) { - case PROP_PKCS11_OBJECT: - g_return_if_fail (!self->pv->pkcs11_object); - self->pv->pkcs11_object = g_value_get_object (value); - g_return_if_fail (self->pv->pkcs11_object); - g_object_ref (self->pv->pkcs11_object); - break; - case PROP_PKCS11_ATTRIBUTES: - seahorse_pkcs11_object_set_pkcs11_attributes (self, g_value_get_boxed (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_pkcs11_object_class_init (SeahorsePkcs11ObjectClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_pkcs11_object_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorsePkcs11ObjectPrivate)); - - gobject_class->constructor = seahorse_pkcs11_object_constructor; - gobject_class->dispose = seahorse_pkcs11_object_dispose; - gobject_class->finalize = seahorse_pkcs11_object_finalize; - gobject_class->set_property = seahorse_pkcs11_object_set_property; - gobject_class->get_property = seahorse_pkcs11_object_get_property; - - g_object_class_install_property (gobject_class, PROP_PKCS11_OBJECT, - g_param_spec_object ("pkcs11-object", "pkcs11-object", "pkcs11-object", GCK_TYPE_OBJECT, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property (gobject_class, PROP_PKCS11_ATTRIBUTES, - g_param_spec_boxed ("pkcs11-attributes", "pkcs11-attributes", "pkcs11-attributes", GCK_TYPE_ATTRIBUTES, - G_PARAM_READABLE | G_PARAM_WRITABLE)); - - g_object_class_install_property (gobject_class, PROP_PKCS11_HANDLE, - g_param_spec_ulong ("pkcs11-handle", "pkcs11-handle", "pkcs11-handle", - 0, G_MAXULONG, 0, G_PARAM_READABLE)); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorsePkcs11Object* -seahorse_pkcs11_object_new (GckObject* object) -{ - return g_object_new (SEAHORSE_PKCS11_TYPE_OBJECT, - "pkcs11-object", object, NULL); -} - -GckObject* -seahorse_pkcs11_object_get_pkcs11_object (SeahorsePkcs11Object* self) -{ - g_return_val_if_fail (SEAHORSE_PKCS11_IS_OBJECT (self), NULL); - return self->pv->pkcs11_object; -} - -GckAttributes* -seahorse_pkcs11_object_get_pkcs11_attributes (SeahorsePkcs11Object* self) -{ - g_return_val_if_fail (SEAHORSE_PKCS11_IS_OBJECT (self), NULL); - return self->pv->pkcs11_attributes; -} - - -void -seahorse_pkcs11_object_set_pkcs11_attributes (SeahorsePkcs11Object* self, GckAttributes* value) -{ - GObject *obj; - - g_return_if_fail (SEAHORSE_PKCS11_IS_OBJECT (self)); - g_return_if_fail (value); - - if (value) - gck_attributes_ref (value); - if (self->pv->pkcs11_attributes) - gck_attributes_unref (self->pv->pkcs11_attributes); - self->pv->pkcs11_attributes = value; - - obj = G_OBJECT (self); - g_object_freeze_notify (obj); - seahorse_pkcs11_object_realize (self); - g_object_notify (obj, "pkcs11-attributes"); - g_object_thaw_notify (obj); - - gck_attributes_find (self->pv->pkcs11_attributes, CKA_LABEL); -} - -gulong -seahorse_pkcs11_object_get_pkcs11_handle (SeahorsePkcs11Object* self) -{ - g_return_val_if_fail (SEAHORSE_PKCS11_IS_OBJECT (self), 0); - if (self->pv->pkcs11_object) - return gck_object_get_handle (self->pv->pkcs11_object); - return GCK_INVALID; -} - -GckAttribute* -seahorse_pkcs11_object_require_attribute (SeahorsePkcs11Object *self, gulong attr_type) -{ - GckAttribute* attr; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_OBJECT (self), NULL); - - attr = gck_attributes_find (self->pv->pkcs11_attributes, attr_type); - if (attr == NULL) - load_object_attributes (self, &attr_type, 1); - if (gck_attribute_is_invalid (attr)) - attr = NULL; - - return attr; -} - -gboolean -seahorse_pkcs11_object_require_attributes (SeahorsePkcs11Object *self, const gulong *attr_types, - gsize n_attr_types) -{ - gsize i; - - g_return_val_if_fail (SEAHORSE_PKCS11_IS_OBJECT (self), FALSE); - - /* See if we have these attributes loaded */ - for (i = 0; i < n_attr_types; ++i) { - if (!gck_attributes_find (self->pv->pkcs11_attributes, attr_types[i])) - break; - } - - if (i == n_attr_types) - return TRUE; - - /* Go ahead and load these attributes */ - load_object_attributes (self, attr_types, n_attr_types); - return FALSE; -} - -GQuark -seahorse_pkcs11_object_cannonical_id (GckObject *object) -{ - GckSession *session; - GckSlot *slot; - GQuark quark; - gchar *text; - - /* TODO: This whole ID thing needs rethinking */ - - session = gck_object_get_session (object); - slot = gck_session_get_slot (session); - - text = g_strdup_printf("%s:%lu/%lu", SEAHORSE_PKCS11_TYPE_STR, - gck_slot_get_handle (slot), - gck_object_get_handle (object)); - - g_object_unref (session); - g_object_unref (slot); - - quark = g_quark_from_string (text); - g_free (text); - return quark; -} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-object.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-object.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-object.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-object.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PKCS11_OBJECT_H__ -#define __SEAHORSE_PKCS11_OBJECT_H__ - -#include - -#include - -#include "seahorse-object.h" - -#define SEAHORSE_PKCS11_TYPE_OBJECT (seahorse_pkcs11_object_get_type ()) -#define SEAHORSE_PKCS11_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_PKCS11_TYPE_OBJECT, SeahorsePkcs11Object)) -#define SEAHORSE_PKCS11_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_PKCS11_TYPE_OBJECT, SeahorsePkcs11ObjectClass)) -#define SEAHORSE_PKCS11_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_PKCS11_TYPE_OBJECT)) -#define SEAHORSE_PKCS11_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_PKCS11_TYPE_OBJECT)) -#define SEAHORSE_PKCS11_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_PKCS11_TYPE_OBJECT, SeahorsePkcs11ObjectClass)) - -typedef struct _SeahorsePkcs11Object SeahorsePkcs11Object; -typedef struct _SeahorsePkcs11ObjectClass SeahorsePkcs11ObjectClass; -typedef struct _SeahorsePkcs11ObjectPrivate SeahorsePkcs11ObjectPrivate; - -struct _SeahorsePkcs11Object { - SeahorseObject parent; - SeahorsePkcs11ObjectPrivate *pv; -}; - -struct _SeahorsePkcs11ObjectClass { - SeahorseObjectClass parent_class; -}; - -GType seahorse_pkcs11_object_get_type (void); - -SeahorsePkcs11Object* seahorse_pkcs11_object_new (GckObject* object); - -void seahorse_pkcs11_object_refresh (SeahorsePkcs11Object *self); - -void seahorse_pkcs11_object_realize (SeahorsePkcs11Object *self); - -gulong seahorse_pkcs11_object_get_pkcs11_handle (SeahorsePkcs11Object* self); - -GckObject* seahorse_pkcs11_object_get_pkcs11_object (SeahorsePkcs11Object* self); - -GckAttributes* seahorse_pkcs11_object_get_pkcs11_attributes (SeahorsePkcs11Object* self); - -void seahorse_pkcs11_object_set_pkcs11_attributes (SeahorsePkcs11Object* self, - GckAttributes* value); - -GckAttribute* seahorse_pkcs11_object_require_attribute (SeahorsePkcs11Object *self, - gulong attr_type); - -gboolean seahorse_pkcs11_object_require_attributes (SeahorsePkcs11Object *self, - const gulong *attr_types, - gsize n_attr_types); - -GQuark seahorse_pkcs11_object_cannonical_id (GckObject *object); - -#endif /* __SEAHORSE_PKCS11_OBJECT_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-operations.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-operations.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-operations.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-operations.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,297 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-pkcs11-object.h" -#include "seahorse-pkcs11-operations.h" -#include "seahorse-pkcs11-source.h" - -#include "seahorse-object-list.h" -#include "seahorse-progress.h" - -#include -#include - -#include - -typedef struct { - SeahorsePkcs11Source *source; - GCancellable *cancellable; - GHashTable *checks; - GckSession *session; -} pkcs11_refresh_closure; - -static void -pkcs11_refresh_free (gpointer data) -{ - pkcs11_refresh_closure *closure = data; - g_object_unref (closure->source); - g_clear_object (&closure->cancellable); - g_hash_table_destroy (closure->checks); - g_clear_object (&closure->session); - g_free (closure); -} - -static guint -ulong_hash (gconstpointer k) -{ - return (guint)*((gulong*)k); -} - -static gboolean -ulong_equal (gconstpointer a, gconstpointer b) -{ - return *((gulong*)a) == *((gulong*)b); -} - -static gboolean -remove_each_object (gpointer key, gpointer value, gpointer data) -{ - seahorse_context_remove_object (NULL, value); - return TRUE; -} - -static void -on_refresh_find_objects (GckSession *session, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - pkcs11_refresh_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GList *objects, *l; - GError *error = NULL; - gulong handle; - - objects = gck_session_find_objects_finish (session, result, &error); - if (error != NULL) { - g_simple_async_result_take_error (res, error); - } else { - - /* Remove all objects that were found, from the check table */ - for (l = objects; l; l = g_list_next (l)) { - seahorse_pkcs11_source_receive_object (closure->source, l->data); - handle = gck_object_get_handle (l->data); - g_hash_table_remove (closure->checks, &handle); - } - - /* Remove everything not found from the context */ - g_hash_table_foreach_remove (closure->checks, remove_each_object, NULL); - } - - g_simple_async_result_complete (res); - g_object_unref (res); -} - -static void -on_refresh_open_session (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - pkcs11_refresh_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - GckAttributes *attrs; - - closure->session = gck_slot_open_session_finish (GCK_SLOT (source), result, &error); - if (!closure->session) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - - /* Step 2. Load all the objects that we want */ - } else { - attrs = gck_attributes_new (); - gck_attributes_add_boolean (attrs, CKA_TOKEN, TRUE); - gck_attributes_add_ulong (attrs, CKA_CLASS, CKO_CERTIFICATE); - gck_session_find_objects_async (closure->session, attrs, closure->cancellable, - (GAsyncReadyCallback)on_refresh_find_objects, - g_object_ref (res)); - gck_attributes_unref (attrs); - } - - g_object_unref (res); -} - -void -seahorse_pkcs11_refresh_async (SeahorsePkcs11Source *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - pkcs11_refresh_closure *closure; - GckSlot *slot; - GList *objects, *l; - gulong handle; - - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, - seahorse_pkcs11_refresh_async); - closure = g_new0 (pkcs11_refresh_closure, 1); - closure->checks = g_hash_table_new_full (ulong_hash, ulong_equal, - g_free, g_object_unref); - closure->source = g_object_ref (source); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - g_simple_async_result_set_op_res_gpointer (res, closure, pkcs11_refresh_free); - - /* Make note of all the objects that were there */ - objects = seahorse_context_get_objects (seahorse_context_instance (), - SEAHORSE_SOURCE (source)); - for (l = objects; l; l = g_list_next (l)) { - if (g_object_class_find_property (G_OBJECT_GET_CLASS (l->data), "pkcs11-handle")) { - g_object_get (l->data, "pkcs11-handle", &handle, NULL); - g_hash_table_insert (closure->checks, - g_memdup (&handle, sizeof (handle)), - g_object_ref (l->data)); - } - } - g_list_free (objects); - - /* Step 1. Load the session */ - slot = seahorse_pkcs11_source_get_slot (closure->source); - gck_slot_open_session_async (slot, GCK_SESSION_READ_WRITE, closure->cancellable, - on_refresh_open_session, g_object_ref (res)); - - g_object_unref (res); -} - -gboolean -seahorse_pkcs11_refresh_finish (SeahorsePkcs11Source *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_pkcs11_refresh_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; - -} - -typedef struct { - GQueue *objects; - GCancellable *cancellable; -} pkcs11_delete_closure; - -static void -pkcs11_delete_free (gpointer data) -{ - pkcs11_delete_closure *closure = data; - g_queue_foreach (closure->objects, (GFunc)g_object_unref, NULL); - g_queue_free (closure->objects); - g_clear_object (&closure->cancellable); - g_free (closure); -} - -static void pkcs11_delete_one_object (GSimpleAsyncResult *res); - -static void -on_delete_object_completed (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - pkcs11_delete_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - GError *error = NULL; - SeahorseObject *object; - - object = g_queue_pop_head (closure->objects); - seahorse_progress_end (closure->cancellable, object); - - if (!gck_object_destroy_finish (GCK_OBJECT (source), result, &error)) { - - /* Ignore objects that have gone away */ - if (g_error_matches (error, GCK_ERROR, CKR_OBJECT_HANDLE_INVALID)) { - g_clear_error (&error); - } else { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - } - - } - - if (error == NULL) { - seahorse_context_remove_object (seahorse_context_instance (), - object); - pkcs11_delete_one_object (res); - } - - g_object_unref (object); - g_object_unref (res); -} - -static void -pkcs11_delete_one_object (GSimpleAsyncResult *res) -{ - pkcs11_delete_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - SeahorseObject *object; - - if (g_queue_is_empty (closure->objects)) { - g_simple_async_result_complete_in_idle (res); - return; - } - - object = g_queue_peek_head (closure->objects); - seahorse_progress_begin (closure->cancellable, object); - - gck_object_destroy_async (seahorse_pkcs11_object_get_pkcs11_object (SEAHORSE_PKCS11_OBJECT (object)), - closure->cancellable, on_delete_object_completed, g_object_ref (res)); -} - -void -seahorse_pkcs11_delete_async (GList *objects, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - pkcs11_delete_closure *closure; - GList *l; - - res = g_simple_async_result_new (NULL, callback, user_data, - seahorse_pkcs11_delete_async); - closure = g_new0 (pkcs11_delete_closure, 1); - closure->objects = g_queue_new (); - for (l = objects; l != NULL; l = g_list_next (l)) { - g_queue_push_tail (closure->objects, g_object_ref (l->data)); - seahorse_progress_prep (cancellable, l->data, NULL); - } - g_simple_async_result_set_op_res_gpointer (res, closure, pkcs11_delete_free); - - pkcs11_delete_one_object (res); - - g_object_unref (res); -} - -gboolean -seahorse_pkcs11_delete_finish (GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, - seahorse_pkcs11_delete_async), FALSE); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - - return TRUE; -} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-operations.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-operations.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-operations.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-operations.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PKCS11_OPERATIONS_H__ -#define __SEAHORSE_PKCS11_OPERATIONS_H__ - -#include - -#include "seahorse-pkcs11-object.h" -#include "seahorse-pkcs11-source.h" - -void seahorse_pkcs11_refresh_async (SeahorsePkcs11Source *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_pkcs11_refresh_finish (SeahorsePkcs11Source *source, - GAsyncResult *result, - GError **error); - -void seahorse_pkcs11_delete_async (GList *objects, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean seahorse_pkcs11_delete_finish (GAsyncResult *result, - GError **error); - -#endif /* __SEAHORSE_PKCS11_OPERATIONS_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-properties.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-properties.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-properties.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-properties.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,489 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-certificate.h" +#include "seahorse-pkcs11-deleter.h" +#include "seahorse-pkcs11-key-deleter.h" +#include "seahorse-pkcs11-properties.h" +#include "seahorse-pkcs11-request.h" +#include "seahorse-private-key.h" + +#include "seahorse-action.h" +#include "seahorse-deleter.h" +#include "seahorse-exportable.h" +#include "seahorse-progress.h" +#include "seahorse-util.h" + +#include + +#include + +static const gchar *UI_STRING = +"" +" " +" " +" " +" " +" " +" " +""; + +#define SEAHORSE_PKCS11_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_PROPERTIES, SeahorsePkcs11PropertiesClass)) +#define SEAHORSE_IS_PKCS11_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_PROPERTIES)) +#define SEAHORSE_PKCS11_PROPERTIES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_PROPERTIES, SeahorsePkcs11PropertiesClass)) + +typedef struct _SeahorsePkcs11PropertiesClass SeahorsePkcs11PropertiesClass; + +struct _SeahorsePkcs11Properties { + GtkWindow parent; + GtkBox *content; + GcrViewer *viewer; + GObject *object; + GCancellable *cancellable; + GckObject *request_key; + GtkUIManager *ui_manager; + GtkActionGroup *actions; +}; + +struct _SeahorsePkcs11PropertiesClass { + GtkWindowClass parent_class; +}; + +enum { + PROP_0, + PROP_OBJECT +}; + +static GQuark QUARK_WINDOW = 0; + +G_DEFINE_TYPE (SeahorsePkcs11Properties, seahorse_pkcs11_properties, GTK_TYPE_WINDOW); + +static void +seahorse_pkcs11_properties_init (SeahorsePkcs11Properties *self) +{ + GtkWidget *viewer; + + self->cancellable = g_cancellable_new (); + + gtk_window_set_default_size (GTK_WINDOW (self), 400, 400); + + self->content = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0)); + gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->content)); + gtk_widget_show (GTK_WIDGET (self->content)); + + self->viewer = gcr_viewer_new_scrolled (); + viewer = GTK_WIDGET (self->viewer); + gtk_container_add (GTK_CONTAINER (self->content), viewer); + gtk_widget_set_hexpand (viewer, TRUE); + gtk_widget_set_vexpand (viewer, TRUE); + gtk_widget_show (viewer); +} + +static void +add_renderer_for_object (SeahorsePkcs11Properties *self, + GObject *object) +{ + GckAttributes *attributes = NULL; + GcrRenderer *renderer; + gchar *label = NULL; + + g_object_get (object, "label", &label, "attributes", &attributes, NULL); + if (attributes != NULL) { + renderer = gcr_renderer_create (label, attributes); + if (renderer) { + g_object_bind_property (object, "label", + renderer, "label", + G_BINDING_DEFAULT); + g_object_bind_property (object, "attributes", + renderer, "attributes", + G_BINDING_DEFAULT); + + if (g_object_class_find_property (G_OBJECT_GET_CLASS (renderer), "object")) + g_object_set (renderer, "object", object, NULL); + + gcr_viewer_add_renderer (self->viewer, renderer); + g_object_unref (renderer); + } + gck_attributes_unref (attributes); + } + + g_free (label); +} + +static void +on_object_label_changed (GObject *obj, + GParamSpec *spec, + gpointer user_data) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (user_data); + gchar *description = NULL; + gchar *label = NULL; + gchar *title; + + g_object_get (obj, "label", &label, "description", &description, NULL); + if (label && !label[0]) { + g_free (label); + label = NULL; + label = _("Unnamed"); + } + + title = g_strdup_printf ("%s - %s", + label ? label : _("Unnamed"), + description); + + g_free (label); + g_free (description); + + gtk_window_set_title (GTK_WINDOW (self), title); + g_free (title); +} + +static void +on_export_certificate (GtkAction *action, + gpointer user_data) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (user_data); + GtkWindow *parent = GTK_WINDOW (self); + GError *error = NULL; + GList *objects; + + objects = g_list_append (NULL, self->object); + seahorse_exportable_export_to_prompt_wait (objects, parent, &error); + g_list_free (objects); + + if (error != NULL) + seahorse_util_handle_error (&error, parent, _("Failed to export certificate")); +} + +static void +on_delete_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (user_data); + GError *error = NULL; + + if (seahorse_deleter_delete_finish (SEAHORSE_DELETER (source), result, &error)) + gtk_widget_destroy (GTK_WIDGET (self)); + + else + seahorse_util_handle_error (&error, self, _("Couldn't delete")); + + g_object_unref (self); +} + +static void +on_delete_objects (GtkAction *action, + gpointer user_data) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (user_data); + SeahorseDeleter *deleter; + GObject *partner = NULL; + + g_object_get (self->object, "partner", &partner, NULL); + + if (partner || SEAHORSE_IS_PRIVATE_KEY (self->object)) { + deleter = seahorse_pkcs11_key_deleter_new (self->object); + if (!seahorse_deleter_add_object (SEAHORSE_DELETER (deleter), partner)) + g_assert_not_reached (); + } else { + deleter = seahorse_pkcs11_deleter_new (SEAHORSE_CERTIFICATE (self->object)); + } + + if (seahorse_deleter_prompt (deleter, GTK_WINDOW (self))) { + seahorse_deleter_delete_async (deleter, NULL, on_delete_complete, g_object_ref (self)); + } + + g_object_unref (deleter); + g_clear_object (&partner); +} + +static void +on_request_certificate (GtkAction *action, + gpointer user_data) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (user_data); + g_return_if_fail (self->request_key != NULL); + seahorse_pkcs11_request_prompt (GTK_WINDOW (self), self->request_key); +} + +static const GtkActionEntry UI_ACTIONS[] = { + { "export-object", GTK_STOCK_SAVE_AS, N_("_Export"), "", + N_("Export the certificate"), G_CALLBACK (on_export_certificate) }, + { "delete-object", GTK_STOCK_DELETE, N_("_Delete"), "Delete", + N_("Delete this certificate or key"), G_CALLBACK (on_delete_objects) }, + { "request-certificate", NULL, N_("Request _Certificate"), NULL, + N_("Create a certificate request file for this key"), G_CALLBACK (on_request_certificate) }, +}; + +static void +on_ui_manager_add_widget (GtkUIManager *manager, + GtkWidget *widget, + gpointer user_data) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (user_data); + + if (!GTK_IS_TOOLBAR (widget)) + return; + + gtk_box_pack_start (self->content, widget, FALSE, TRUE, 0); + gtk_box_reorder_child (self->content, widget, 0); + + gtk_style_context_add_class (gtk_widget_get_style_context (widget), + GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + gtk_widget_reset_style (widget); + gtk_widget_show (widget); +} + +typedef struct { + SeahorsePkcs11Properties *properties; + GckObject *private_key; +} CapableClosure; + +static void +on_certificate_request_capable (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + CapableClosure *closure = user_data; + SeahorsePkcs11Properties *self = closure->properties; + GError *error = NULL; + GtkAction *request; + + if (gcr_certificate_request_capable_finish (result, &error)) { + request = gtk_action_group_get_action (self->actions, "request-certificate"); + gtk_action_set_visible (request, TRUE); + g_clear_object (&self->request_key); + self->request_key = g_object_ref (closure->private_key); + + } else if (error != NULL) { + g_message ("couldn't check capabilities of private key: %s", error->message); + g_clear_error (&error); + } + + g_object_unref (closure->properties); + g_object_unref (closure->private_key); + g_slice_free (CapableClosure, closure); +} + +static void +check_certificate_request_capable (SeahorsePkcs11Properties *self, + GObject *object) +{ + CapableClosure *closure; + + if (!SEAHORSE_IS_PRIVATE_KEY (object)) + return; + + closure = g_slice_new (CapableClosure); + closure->properties = g_object_ref (self); + closure->private_key = g_object_ref (object); + + gcr_certificate_request_capable_async (closure->private_key, + self->cancellable, + on_certificate_request_capable, + closure); +} + +static void +seahorse_pkcs11_properties_constructed (GObject *obj) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (obj); + GObject *partner = NULL; + GError *error = NULL; + GList *exporters = NULL; + GtkAction *request; + GtkAction *action; + + G_OBJECT_CLASS (seahorse_pkcs11_properties_parent_class)->constructed (obj); + + self->actions = gtk_action_group_new ("Pkcs11Actions"); + gtk_action_group_add_actions (self->actions, UI_ACTIONS, G_N_ELEMENTS (UI_ACTIONS), self); + gtk_action_group_set_translation_domain (self->actions, GETTEXT_PACKAGE); + action = gtk_action_group_get_action (self->actions, "delete-object"); + g_object_bind_property (self->object, "deletable", action, "sensitive", G_BINDING_SYNC_CREATE); + action = gtk_action_group_get_action (self->actions, "export-object"); + g_object_bind_property (self->object, "exportable", action, "sensitive", G_BINDING_SYNC_CREATE); + request = gtk_action_group_get_action (self->actions, "request-certificate"); + gtk_action_set_is_important (request, TRUE); + gtk_action_set_visible (request, FALSE); + + self->ui_manager = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (self->ui_manager, self->actions, 0); + g_signal_connect (self->ui_manager, "add-widget", G_CALLBACK (on_ui_manager_add_widget), self); + gtk_ui_manager_add_ui_from_string (self->ui_manager, UI_STRING, -1, &error); + if (error != NULL) { + g_warning ("couldn't load ui: %s", error->message); + g_error_free (error); + } + gtk_ui_manager_ensure_update (self->ui_manager); + + g_return_if_fail (self->object != NULL); + g_object_set_qdata (self->object, QUARK_WINDOW, self); + + g_signal_connect_object (self->object, "notify::label", G_CALLBACK (on_object_label_changed), + self, G_CONNECT_AFTER); + on_object_label_changed (self->object, NULL, self); + + add_renderer_for_object (self, self->object); + check_certificate_request_capable (self, self->object); + + g_object_get (self->object, "partner", &partner, NULL); + if (partner != NULL) { + add_renderer_for_object (self, partner); + check_certificate_request_capable (self, partner); + + g_object_unref (partner); + } + + if (SEAHORSE_IS_EXPORTABLE (self->object)) + exporters = seahorse_exportable_create_exporters (SEAHORSE_EXPORTABLE (self->object), + SEAHORSE_EXPORTER_ANY); + + request = gtk_action_group_get_action (self->actions, "export-object"); + gtk_action_set_visible (request, exporters != NULL); + g_list_free_full (exporters, g_object_unref); + + gtk_widget_grab_focus (GTK_WIDGET (self->viewer)); +} + +static void +seahorse_pkcs11_properties_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (obj); + + switch (prop_id) { + case PROP_OBJECT: + g_return_if_fail (self->object == NULL); + self->object = g_value_dup_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_pkcs11_properties_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (obj); + + switch (prop_id) { + case PROP_OBJECT: + g_value_set_object (value, seahorse_pkcs11_properties_get_object (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_pkcs11_properties_dispose (GObject *obj) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (obj); + + g_cancellable_cancel (self->cancellable); + + G_OBJECT_CLASS (seahorse_pkcs11_properties_parent_class)->dispose (obj); +} + +static void +seahorse_pkcs11_properties_finalize (GObject *obj) +{ + SeahorsePkcs11Properties *self = SEAHORSE_PKCS11_PROPERTIES (obj); + + g_object_unref (self->cancellable); + g_clear_object (&self->request_key); + g_object_unref (self->actions); + g_object_unref (self->ui_manager); + + if (self->object) { + if (g_object_get_qdata (self->object, QUARK_WINDOW) == self) + g_object_set_qdata (self->object, QUARK_WINDOW, NULL); + } + + g_clear_object (&self->object); + + G_OBJECT_CLASS (seahorse_pkcs11_properties_parent_class)->finalize (obj); +} + +static void +seahorse_pkcs11_properties_class_init (SeahorsePkcs11PropertiesClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + seahorse_pkcs11_properties_parent_class = g_type_class_peek_parent (klass); + + gobject_class->constructed = seahorse_pkcs11_properties_constructed; + gobject_class->set_property = seahorse_pkcs11_properties_set_property; + gobject_class->get_property = seahorse_pkcs11_properties_get_property; + gobject_class->dispose = seahorse_pkcs11_properties_dispose; + gobject_class->finalize = seahorse_pkcs11_properties_finalize; + + g_object_class_install_property (gobject_class, PROP_OBJECT, + g_param_spec_object ("object", "Object", "Certificate or key to display", G_TYPE_OBJECT, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + QUARK_WINDOW = g_quark_from_static_string ("seahorse-pkcs11-properties-window"); +} + +/* ----------------------------------------------------------------------------- + * PUBLIC + */ + +GtkWindow * +seahorse_pkcs11_properties_show (GObject *object, + GtkWindow *parent) +{ + GObject *previous; + GtkWindow *window; + + /* Try to show an already present window */ + previous = g_object_get_qdata (object, QUARK_WINDOW); + if (GTK_IS_WINDOW (previous)) { + window = GTK_WINDOW (previous); + if (gtk_widget_get_visible (GTK_WIDGET (window))) { + gtk_window_present (window); + return window; + } + } + + return g_object_new (SEAHORSE_TYPE_PKCS11_PROPERTIES, + "object", object, + "transient-for", parent, + NULL); +} + +GObject * +seahorse_pkcs11_properties_get_object (SeahorsePkcs11Properties *self) +{ + g_return_val_if_fail (SEAHORSE_IS_PKCS11_PROPERTIES (self), NULL); + return self->object; +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-properties.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-properties.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-properties.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-properties.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,44 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PKCS11_PROPERTIES_H__ +#define __SEAHORSE_PKCS11_PROPERTIES_H__ + +#include + +#include + +#include + +#define SEAHORSE_TYPE_PKCS11_PROPERTIES (seahorse_pkcs11_properties_get_type ()) +#define SEAHORSE_PKCS11_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_PROPERTIES, SeahorsePkcs11Properties)) +#define SEAHORSE_IS_PKCS11_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_PROPERTIES)) + +typedef struct _SeahorsePkcs11Properties SeahorsePkcs11Properties; + +GType seahorse_pkcs11_properties_get_type (void); + +GtkWindow * seahorse_pkcs11_properties_show (GObject *object, + GtkWindow *parent); + +GObject * seahorse_pkcs11_properties_get_object (SeahorsePkcs11Properties *self); + +#endif /* __SEAHORSE_PKCS11_PROPERTIES_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-request.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-request.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-request.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-request.c 2012-10-01 14:27:58.000000000 +0200 @@ -0,0 +1,378 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-pkcs11-request.h" +#include "seahorse-token.h" + +#include "seahorse-action.h" +#include "seahorse-progress.h" +#include "seahorse-interaction.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" + +#include + +#include + +#include + +GType seahorse_pkcs11_request_get_type (void) G_GNUC_CONST; + +#define SEAHORSE_TYPE_PKCS11_REQUEST (seahorse_pkcs11_request_get_type ()) +#define SEAHORSE_PKCS11_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_REQUEST, SeahorsePkcs11Request)) +#define SEAHORSE_IS_PKCS11_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_REQUEST)) +#define SEAHORSE_PKCS11_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_REQUEST, SeahorsePkcs11RequestClass)) +#define SEAHORSE_IS_PKCS11_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_REQUEST)) +#define SEAHORSE_PKCS11_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_REQUEST, SeahorsePkcs11RequestClass)) + +typedef struct _SeahorsePkcs11Request SeahorsePkcs11Request; +typedef struct _SeahorsePkcs11RequestClass SeahorsePkcs11RequestClass; + +struct _SeahorsePkcs11Request { + GtkDialog dialog; + + GtkEntry *name_entry; + GckObject *private_key; + + guchar *encoded; + gsize n_encoded; +}; + +struct _SeahorsePkcs11RequestClass { + GtkDialogClass dialog_class; +}; + +enum { + PROP_0, + PROP_PRIVATE_KEY +}; + +G_DEFINE_TYPE (SeahorsePkcs11Request, seahorse_pkcs11_request, GTK_TYPE_DIALOG); + +enum { + MECHANISM_LABEL, + MECHANISM_TYPE, + MECHANISM_N_COLS +}; + +static void +seahorse_pkcs11_request_init (SeahorsePkcs11Request *self) +{ + +} + +static void +update_response (SeahorsePkcs11Request *self) +{ + const gchar *name = gtk_entry_get_text (self->name_entry); + gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, !g_str_equal (name, "")); +} + +static void +on_request_file_written (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (user_data); + GError *error = NULL; + GtkWindow *parent; + + parent = gtk_window_get_transient_for (GTK_WINDOW (self)); + if (!g_file_replace_contents_finish (G_FILE (source), result, NULL, &error)) + seahorse_util_handle_error (&error, parent, _("Couldn't save certificate request")); + + g_object_unref (self); +} + +static const gchar *BAD_FILENAME_CHARS = "/\\<>|?*"; + +static void +save_certificate_request (SeahorsePkcs11Request *self, + GcrCertificateRequest *req, + GtkWindow *parent) +{ + GtkFileChooser *chooser; + GtkFileFilter *pem_filter; + GtkFileFilter *der_filter; + GtkWidget *dialog; + gchar *filename; + gboolean textual; + gchar *label; + GFile *file; + gint response; + + parent = gtk_window_get_transient_for (GTK_WINDOW (self)); + dialog = gtk_file_chooser_dialog_new (_("Save certificate request"), + parent, GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + + chooser = GTK_FILE_CHOOSER (dialog); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + gtk_file_chooser_set_local_only (chooser, FALSE); + + der_filter = gtk_file_filter_new (); + gtk_file_filter_set_name (der_filter, _("Certificate request")); + gtk_file_filter_add_mime_type (der_filter, "application/pkcs10"); + gtk_file_filter_add_pattern (der_filter, "*.p10"); + gtk_file_filter_add_pattern (der_filter, "*.csr"); + gtk_file_chooser_add_filter (chooser, der_filter); + gtk_file_chooser_set_filter (chooser, der_filter); + + pem_filter = gtk_file_filter_new (); + gtk_file_filter_set_name (pem_filter, _("PEM encoded request")); + gtk_file_filter_add_mime_type (pem_filter, "application/pkcs10+pem"); + gtk_file_filter_add_pattern (pem_filter, "*.pem"); + gtk_file_chooser_add_filter (chooser, pem_filter); + + label = NULL; + g_object_get (self->private_key, "label", &label, NULL); + if (!label || g_str_equal (label, "")) + label = g_strdup ("Certificate Request"); + filename = g_strconcat (label, ".csr", NULL); + g_strdelimit (filename, BAD_FILENAME_CHARS, '_'); + gtk_file_chooser_set_current_name (chooser, filename); + g_free (label); + g_free (filename); + + gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + if (response == GTK_RESPONSE_ACCEPT) { + + g_free (self->encoded); + textual = gtk_file_chooser_get_filter (chooser) == pem_filter; + self->encoded = gcr_certificate_request_encode (req, textual, &self->n_encoded); + g_return_if_fail (self->encoded != NULL); + + file = gtk_file_chooser_get_file (chooser); + g_file_replace_contents_async (file, (const gchar *)self->encoded, + self->n_encoded, NULL, FALSE, + G_FILE_CREATE_NONE, NULL, + on_request_file_written, g_object_ref (self)); + g_object_unref (file); + } + + gtk_widget_destroy (dialog); +} + +static void +complete_request (SeahorsePkcs11Request *self, + GcrCertificateRequest *req, + GError **error) +{ + GtkWindow *parent; + + g_assert (error != NULL); + + parent = gtk_window_get_transient_for (GTK_WINDOW (self)); + if (*error != NULL) + seahorse_util_handle_error (error, parent, _("Couldn't create certificate request")); + else + save_certificate_request (self, req, parent); +} + +static void +on_request_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (user_data); + GcrCertificateRequest *req = GCR_CERTIFICATE_REQUEST (source); + GError *error = NULL; + + gcr_certificate_request_complete_finish (req, result, &error); + complete_request (self, req, &error); + + g_object_unref (self); +} + +static void +on_name_entry_changed (GtkEditable *editable, + gpointer user_data) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (user_data); + update_response (self); +} + +static void +seahorse_pkcs11_request_constructed (GObject *obj) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (obj); + GtkBuilder *builder; + const gchar *path; + GError *error = NULL; + GtkWidget *content; + GtkWidget *widget; + + G_OBJECT_CLASS (seahorse_pkcs11_request_parent_class)->constructed (obj); + + builder = gtk_builder_new (); + path = SEAHORSE_UIDIR "seahorse-pkcs11-request.xml"; + gtk_builder_add_from_file (builder, path, &error); + if (error != NULL) { + g_warning ("couldn't load ui file: %s", path); + g_clear_error (&error); + g_object_unref (builder); + return; + } + + gtk_window_set_resizable (GTK_WINDOW (self), FALSE); + content = gtk_dialog_get_content_area (GTK_DIALOG (self)); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "pkcs11-request")); + gtk_container_add (GTK_CONTAINER (content), widget); + gtk_widget_show (widget); + + self->name_entry = GTK_ENTRY (gtk_builder_get_object (builder, "request-name")); + g_signal_connect (self->name_entry, "changed", G_CALLBACK (on_name_entry_changed), self); + + /* The buttons */ + gtk_dialog_add_buttons (GTK_DIALOG (self), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Create"), GTK_RESPONSE_OK, + NULL); + gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK); + + update_response (self); + g_object_unref (builder); + + g_return_if_fail (GCK_IS_OBJECT (self->private_key)); +} + +static void +seahorse_pkcs11_request_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (obj); + + switch (prop_id) { + case PROP_PRIVATE_KEY: + g_return_if_fail (self->private_key == NULL); + self->private_key = g_value_dup_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_pkcs11_request_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (obj); + + switch (prop_id) { + case PROP_PRIVATE_KEY: + g_value_set_object (value, self->private_key); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_pkcs11_request_finalize (GObject *obj) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (obj); + + g_clear_object (&self->private_key); + g_free (self->encoded); + + G_OBJECT_CLASS (seahorse_pkcs11_request_parent_class)->finalize (obj); +} + +static void +seahorse_pkcs11_request_response (GtkDialog *dialog, + gint response_id) +{ + SeahorsePkcs11Request *self = SEAHORSE_PKCS11_REQUEST (dialog); + GcrCertificateRequest *req; + GTlsInteraction *interaction; + GckSession *session; + GtkWindow *parent; + + if (response_id == GTK_RESPONSE_OK) { + g_return_if_fail (self->private_key != NULL); + + parent = gtk_window_get_transient_for (GTK_WINDOW (self)); + interaction = seahorse_interaction_new (parent); + session = gck_object_get_session (self->private_key); + gck_session_set_interaction (session, interaction); + g_object_unref (interaction); + g_object_unref (session); + + req = gcr_certificate_request_prepare (GCR_CERTIFICATE_REQUEST_PKCS10, + self->private_key); + gcr_certificate_request_set_cn (req, gtk_entry_get_text (self->name_entry)); + gcr_certificate_request_complete_async (req, NULL, + on_request_complete, g_object_ref (self)); + } + + gtk_widget_hide (GTK_WIDGET (dialog)); +} + +static void +seahorse_pkcs11_request_class_init (SeahorsePkcs11RequestClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass); + + gobject_class->get_property = seahorse_pkcs11_request_get_property; + gobject_class->set_property = seahorse_pkcs11_request_set_property; + gobject_class->constructed = seahorse_pkcs11_request_constructed; + gobject_class->finalize = seahorse_pkcs11_request_finalize; + + dialog_class->response = seahorse_pkcs11_request_response; + + g_object_class_install_property (gobject_class, PROP_PRIVATE_KEY, + g_param_spec_object ("private-key", "Private key", "Private key", + GCK_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); +} + +void +seahorse_pkcs11_request_prompt (GtkWindow *parent, + GckObject *private_key) +{ + GtkDialog *dialog; + + g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent)); + + dialog = g_object_new (SEAHORSE_TYPE_PKCS11_REQUEST, + "transient-for", parent, + "private-key", private_key, + NULL); + g_object_ref_sink (dialog); + + gtk_dialog_run (dialog); + + g_object_unref (dialog); +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-request.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-request.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-request.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-request.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,34 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_PKCS11_REQUEST_H__ +#define __SEAHORSE_PKCS11_REQUEST_H__ + +#include + +#include + +void seahorse_pkcs11_request_prompt (GtkWindow *parent, + GckObject *private_key); + +#endif /* __SEAHORSE_PKCS11_REQUEST_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-request.xml seahorse-3.6.3/pkcs11/seahorse-pkcs11-request.xml --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-request.xml 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-request.xml 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,114 @@ + + + + + True + False + 7 + 12 + + + True + False + 0 + 48 + application-certificate + + + False + True + 0 + + + + + True + False + 12 + + + True + False + 0 + 0 + Create a certificate request file. + + + False + False + 0 + + + + + True + False + 6 + 12 + + + True + False + The common name (CN) placed in the certificate request. + 0 + Name (CN): + + + 0 + 0 + 1 + 1 + + + + + True + True + ● + True + True + + + 1 + 0 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + False + True + 1 + + + + + False + True + 1 + + + + diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-source.c seahorse-3.6.3/pkcs11/seahorse-pkcs11-source.c --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-source.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,238 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include -#include - -#include - -#include "seahorse-util.h" -#include "seahorse-secure-memory.h" -#include "seahorse-passphrase.h" - -#include "seahorse-pkcs11.h" -#include "seahorse-pkcs11-certificate.h" -#include "seahorse-pkcs11-object.h" -#include "seahorse-pkcs11-operations.h" -#include "seahorse-pkcs11-source.h" - -#include "seahorse-registry.h" - -enum { - PROP_0, - PROP_SLOT, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION, - PROP_FLAGS -}; - -struct _SeahorsePkcs11SourcePrivate { - GckSlot *slot; -}; - -static void seahorse_source_iface (SeahorseSourceIface *iface); - -G_DEFINE_TYPE_EXTENDED (SeahorsePkcs11Source, seahorse_pkcs11_source, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_pkcs11_source_init (SeahorsePkcs11Source *self) -{ - self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PKCS11_SOURCE, SeahorsePkcs11SourcePrivate)); -} - -static GObject* -seahorse_pkcs11_source_constructor (GType type, guint n_props, GObjectConstructParam* props) -{ - GObject* obj = G_OBJECT_CLASS (seahorse_pkcs11_source_parent_class)->constructor (type, n_props, props); - SeahorsePkcs11Source *self = NULL; - - if (obj) { - self = SEAHORSE_PKCS11_SOURCE (obj); - g_return_val_if_fail (self->pv->slot, NULL); - } - - return obj; -} - -static void -seahorse_pkcs11_source_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorsePkcs11Source *self = SEAHORSE_PKCS11_SOURCE (object); - - switch (prop_id) { - case PROP_SLOT: - g_value_set_object (value, self->pv->slot); - break; - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_PKCS11_TYPE); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL); - break; - case PROP_FLAGS: - g_value_set_uint (value, 0); - break; - } -} - -static void -seahorse_pkcs11_source_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorsePkcs11Source *self = SEAHORSE_PKCS11_SOURCE (object); - - switch (prop_id) { - case PROP_SLOT: - g_return_if_fail (!self->pv->slot); - self->pv->slot = g_value_get_object (value); - g_return_if_fail (self->pv->slot); - g_object_ref (self->pv->slot); - break; - }; -} - -static void -seahorse_pkcs11_source_load_async (SeahorseSource *source, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - seahorse_pkcs11_refresh_async (SEAHORSE_PKCS11_SOURCE (source), - cancellable, callback, user_data); -} - -static gboolean -seahorse_pkcs11_source_load_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - return seahorse_pkcs11_refresh_finish (SEAHORSE_PKCS11_SOURCE (source), - result, error); -} - -static void -seahorse_pkcs11_source_dispose (GObject *obj) -{ - SeahorsePkcs11Source *self = SEAHORSE_PKCS11_SOURCE (obj); - - /* The keyring object */ - if (self->pv->slot) - g_object_unref (self->pv->slot); - self->pv->slot = NULL; - - G_OBJECT_CLASS (seahorse_pkcs11_source_parent_class)->dispose (obj); -} - -static void -seahorse_pkcs11_source_finalize (GObject *obj) -{ - SeahorsePkcs11Source *self = SEAHORSE_PKCS11_SOURCE (obj); - - g_assert (self->pv->slot == NULL); - - G_OBJECT_CLASS (seahorse_pkcs11_source_parent_class)->finalize (obj); -} - -static void -seahorse_pkcs11_source_class_init (SeahorsePkcs11SourceClass *klass) -{ - GObjectClass *gobject_class; - - seahorse_pkcs11_source_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorsePkcs11SourcePrivate)); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->constructor = seahorse_pkcs11_source_constructor; - gobject_class->dispose = seahorse_pkcs11_source_dispose; - gobject_class->finalize = seahorse_pkcs11_source_finalize; - gobject_class->set_property = seahorse_pkcs11_source_set_property; - gobject_class->get_property = seahorse_pkcs11_source_get_property; - - g_object_class_install_property (gobject_class, PROP_SLOT, - g_param_spec_object ("slot", "Slot", "Pkcs#11 SLOT", - GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property (gobject_class, PROP_FLAGS, - g_param_spec_uint ("flags", "Flags", "Object Source flags.", - 0, G_MAXUINT, 0, G_PARAM_READABLE)); - - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); - - seahorse_registry_register_type (NULL, SEAHORSE_TYPE_PKCS11_SOURCE, "source", "local", SEAHORSE_PKCS11_TYPE_STR, NULL); -} - -static void -seahorse_source_iface (SeahorseSourceIface *iface) -{ - iface->load_async = seahorse_pkcs11_source_load_async; - iface->load_finish = seahorse_pkcs11_source_load_finish; -} - -/* -------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorsePkcs11Source* -seahorse_pkcs11_source_new (GckSlot *slot) -{ - return g_object_new (SEAHORSE_TYPE_PKCS11_SOURCE, "slot", slot, NULL); -} - -GckSlot* -seahorse_pkcs11_source_get_slot (SeahorsePkcs11Source *self) -{ - g_return_val_if_fail (SEAHORSE_IS_PKCS11_SOURCE (self), NULL); - return self->pv->slot; -} - -void -seahorse_pkcs11_source_receive_object (SeahorsePkcs11Source *self, GckObject *obj) -{ - GQuark id = seahorse_pkcs11_object_cannonical_id (obj); - SeahorsePkcs11Certificate *cert; - SeahorseObject *prev; - - g_return_if_fail (SEAHORSE_IS_PKCS11_SOURCE (self)); - - /* TODO: This will need to change once we get other kinds of objects */ - - prev = seahorse_context_get_object (NULL, SEAHORSE_SOURCE (self), id); - if (prev) { - seahorse_pkcs11_object_refresh (SEAHORSE_PKCS11_OBJECT (prev)); - g_object_unref (obj); - return; - } - - cert = seahorse_pkcs11_certificate_new (obj); - g_object_set (cert, "source", self, NULL); - seahorse_context_add_object (NULL, SEAHORSE_OBJECT (cert)); -} diff -Nru seahorse-3.2.2/pkcs11/seahorse-pkcs11-source.h seahorse-3.6.3/pkcs11/seahorse-pkcs11-source.h --- seahorse-3.2.2/pkcs11/seahorse-pkcs11-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-pkcs11-source.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * 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 __SEAHORSE_PKCS11_SOURCE_H__ -#define __SEAHORSE_PKCS11_SOURCE_H__ - -#include "seahorse-source.h" - -#include - -#define SEAHORSE_TYPE_PKCS11_SOURCE (seahorse_pkcs11_source_get_type ()) -#define SEAHORSE_PKCS11_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PKCS11_SOURCE, SeahorsePkcs11Source)) -#define SEAHORSE_PKCS11_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PKCS11_SOURCE, SeahorsePkcs11SourceClass)) -#define SEAHORSE_IS_PKCS11_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PKCS11_SOURCE)) -#define SEAHORSE_IS_PKCS11_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PKCS11_SOURCE)) -#define SEAHORSE_PKCS11_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PKCS11_SOURCE, SeahorsePkcs11SourceClass)) - -typedef struct _SeahorsePkcs11Source SeahorsePkcs11Source; -typedef struct _SeahorsePkcs11SourceClass SeahorsePkcs11SourceClass; -typedef struct _SeahorsePkcs11SourcePrivate SeahorsePkcs11SourcePrivate; - -struct _SeahorsePkcs11Source { - GObject parent; - SeahorsePkcs11SourcePrivate *pv; -}; - -struct _SeahorsePkcs11SourceClass { - GObjectClass parent_class; -}; - -GType seahorse_pkcs11_source_get_type (void); - -SeahorsePkcs11Source* seahorse_pkcs11_source_new (GckSlot *slot); - -GckSlot* seahorse_pkcs11_source_get_slot (SeahorsePkcs11Source *self); - -void seahorse_pkcs11_source_receive_object (SeahorsePkcs11Source *self, GckObject *obj); - -#endif /* __SEAHORSE_PKCS11_SOURCE_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-private-key.c seahorse-3.6.3/pkcs11/seahorse-private-key.c --- seahorse-3.2.2/pkcs11/seahorse-private-key.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-private-key.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,388 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-private-key.h" +#include "seahorse-pkcs11.h" +#include "seahorse-pkcs11-helpers.h" +#include "seahorse-pkcs11-key-deleter.h" +#include "seahorse-pkcs11-properties.h" +#include "seahorse-token.h" +#include "seahorse-types.h" + +#include "seahorse-deletable.h" +#include "seahorse-exportable.h" +#include "seahorse-util.h" +#include "seahorse-viewable.h" + +#include + +#include + +static const gulong REQUIRED_ATTRS[] = { + CKA_MODULUS_BITS, + CKA_ID, + CKA_ID, + CKA_LABEL, + CKA_CLASS, + CKA_KEY_TYPE, + CKA_MODIFIABLE, +}; + +enum { + PROP_0, + PROP_PLACE, + PROP_ATTRIBUTES, + PROP_FLAGS, + PROP_ACTIONS, + PROP_PARTNER, + + PROP_EXPORTABLE, + PROP_DELETABLE, + PROP_LABEL, + PROP_MARKUP, + PROP_DESCRIPTION, + PROP_ICON +}; + +struct _SeahorsePrivateKeyPrivate { + SeahorseToken *token; + GckAttributes *attributes; + SeahorseCertificate *certificate; + GIcon *icon; +}; + +static void seahorse_private_key_deletable_iface (SeahorseDeletableIface *iface); + +static void seahorse_private_key_exportable_iface (SeahorseExportableIface *iface); + +static void seahorse_private_key_object_cache_iface (GckObjectCacheIface *iface); + +static void seahorse_private_key_viewable_iface (SeahorseViewableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorsePrivateKey, seahorse_private_key, GCK_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCK_TYPE_OBJECT_CACHE, seahorse_private_key_object_cache_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_DELETABLE, seahorse_private_key_deletable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTABLE, seahorse_private_key_exportable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEWABLE, seahorse_private_key_viewable_iface); +); + +static void +update_icon (SeahorsePrivateKey *self) +{ + g_clear_object (&self->pv->icon); + self->pv->icon = g_themed_icon_new (GCR_ICON_KEY); +} + +static void +seahorse_private_key_init (SeahorsePrivateKey *self) +{ + self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_PRIVATE_KEY, SeahorsePrivateKeyPrivate)); +} + +static void +seahorse_private_key_finalize (GObject *obj) +{ + SeahorsePrivateKey *self = SEAHORSE_PRIVATE_KEY (obj); + + g_clear_object (&self->pv->icon); + + if (self->pv->attributes) + gck_attributes_unref (self->pv->attributes); + + G_OBJECT_CLASS (seahorse_private_key_parent_class)->finalize (obj); +} + +static gchar * +calculate_label (SeahorsePrivateKey *self) +{ + gchar *label = NULL; + + if (self->pv->attributes) { + if (gck_attributes_find_string (self->pv->attributes, CKA_LABEL, &label)) + return label; + } + + if (self->pv->certificate) { + g_object_get (self->pv->certificate, "label", &label, NULL); + return label; + } + + return g_strdup (_("Unnamed private key")); +} + +static gchar * +calculate_markup (SeahorsePrivateKey *self) +{ + gchar *label = calculate_label (self); + return g_markup_escape_text (label, -1); +} + +static void +seahorse_private_key_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorsePrivateKey *self = SEAHORSE_PRIVATE_KEY (obj); + + switch (prop_id) { + case PROP_PLACE: + g_value_set_object (value, self->pv->token); + break; + case PROP_ATTRIBUTES: + g_value_set_boxed (value, self->pv->attributes); + break; + case PROP_FLAGS: + g_value_set_flags (value, SEAHORSE_FLAG_PERSONAL); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + case PROP_PARTNER: + g_value_set_object (value, seahorse_private_key_get_partner (self)); + break; + case PROP_LABEL: + g_value_take_string (value, calculate_label (self)); + break; + case PROP_MARKUP: + g_value_take_string (value, calculate_markup (self)); + break; + case PROP_EXPORTABLE: + g_value_set_boolean (value, FALSE); + break; + case PROP_DELETABLE: + g_value_set_boolean (value, seahorse_token_is_deletable (self->pv->token, GCK_OBJECT (self))); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, _("Private key")); + break; + case PROP_ICON: + g_value_set_object (value, seahorse_private_key_get_icon (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_private_key_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorsePrivateKey *self = SEAHORSE_PRIVATE_KEY (obj); + + switch (prop_id) { + case PROP_PLACE: + if (self->pv->token) + g_object_remove_weak_pointer (G_OBJECT (self->pv->token), + (gpointer *)&self->pv->token); + self->pv->token = g_value_get_object (value); + if (self->pv->token) + g_object_add_weak_pointer (G_OBJECT (self->pv->token), + (gpointer *)&self->pv->token); + break; + case PROP_ATTRIBUTES: + if (self->pv->attributes) + gck_attributes_unref (self->pv->attributes); + self->pv->attributes = g_value_dup_boxed (value); + break; + case PROP_PARTNER: + seahorse_private_key_set_partner (self, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_private_key_class_init (SeahorsePrivateKeyClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (SeahorsePrivateKeyPrivate)); + + gobject_class->finalize = seahorse_private_key_finalize; + gobject_class->set_property = seahorse_private_key_set_property; + gobject_class->get_property = seahorse_private_key_get_property; + + g_object_class_install_property (gobject_class, PROP_PLACE, + g_param_spec_object ("place", "place", "place", SEAHORSE_TYPE_TOKEN, + G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_FLAGS, + g_param_spec_flags ("object-flags", "flags", "flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_ACTIONS, + g_param_spec_object ("actions", "Actions", "Actions", GTK_TYPE_ACTION_GROUP, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_PARTNER, + g_param_spec_object ("partner", "Partner", "Certificate associated with this private key", + SEAHORSE_TYPE_CERTIFICATE, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_LABEL, + g_param_spec_string ("label", "label", "label", + "", G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_MARKUP, + g_param_spec_string ("markup", "markup", "markup", + "", G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_DESCRIPTION, + g_param_spec_string ("description", "description", "description", + "", G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_ICON, + g_param_spec_object ("icon", "icon", "icon", + G_TYPE_ICON, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_override_property (gobject_class, PROP_ATTRIBUTES, "attributes"); + + g_object_class_override_property (gobject_class, PROP_EXPORTABLE, "exportable"); + + g_object_class_override_property (gobject_class, PROP_DELETABLE, "deletable"); +} + +static void +seahorse_private_key_fill (GckObjectCache *object, + GckAttributes *attributes) +{ + SeahorsePrivateKey *self = SEAHORSE_PRIVATE_KEY (object); + GckBuilder builder = GCK_BUILDER_INIT; + + if (self->pv->attributes) + gck_builder_add_all (&builder, self->pv->attributes); + gck_builder_set_all (&builder, attributes); + gck_attributes_unref (self->pv->attributes); + self->pv->attributes = gck_builder_steal (&builder); + gck_builder_clear (&builder); + + g_object_notify (G_OBJECT (object), "attributes"); +} + +static void +seahorse_private_key_object_cache_iface (GckObjectCacheIface *iface) +{ + iface->default_types = REQUIRED_ATTRS; + iface->n_default_types = G_N_ELEMENTS (REQUIRED_ATTRS); + iface->fill = seahorse_private_key_fill; +} + +static SeahorseDeleter * +seahorse_private_key_create_deleter (SeahorseDeletable *deletable) +{ + SeahorsePrivateKey *self = SEAHORSE_PRIVATE_KEY (deletable); + if (!seahorse_token_is_deletable (self->pv->token, GCK_OBJECT (self))) + return NULL; + return seahorse_pkcs11_key_deleter_new (G_OBJECT (self)); +} + +static void +seahorse_private_key_deletable_iface (SeahorseDeletableIface *iface) +{ + iface->create_deleter = seahorse_private_key_create_deleter; +} + +static GList * +seahorse_private_key_create_exporters (SeahorseExportable *exportable, + SeahorseExporterType type) +{ + /* In the future we may exporters here, but for now no exporting */ + return NULL; +} + +static void +seahorse_private_key_exportable_iface (SeahorseExportableIface *iface) +{ + iface->create_exporters = seahorse_private_key_create_exporters; +} + +static void +seahorse_private_key_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent) +{ + GtkWindow *viewer = seahorse_pkcs11_properties_show (G_OBJECT (viewable), parent); + gtk_widget_show (GTK_WIDGET (viewer)); +} + +static void +seahorse_private_key_viewable_iface (SeahorseViewableIface *iface) +{ + iface->show_viewer = seahorse_private_key_show_viewer; +} + +SeahorseCertificate * +seahorse_private_key_get_partner (SeahorsePrivateKey *self) +{ + g_return_val_if_fail (SEAHORSE_IS_PRIVATE_KEY (self), NULL); + return self->pv->certificate; +} + +static void +notify_certificate_change (GObject *obj) +{ + g_object_notify (obj, "partner"); + g_object_notify (obj, "label"); + g_object_notify (obj, "markup"); +} + +static void +on_certificate_gone (gpointer data, + GObject *where_the_object_was) +{ + SeahorsePrivateKey *self = SEAHORSE_PRIVATE_KEY (data); + self->pv->certificate = NULL; + notify_certificate_change (G_OBJECT (self)); +} + +void +seahorse_private_key_set_partner (SeahorsePrivateKey *self, + SeahorseCertificate *certificate) +{ + g_return_if_fail (SEAHORSE_IS_PRIVATE_KEY (self)); + g_return_if_fail (certificate == NULL || SEAHORSE_IS_CERTIFICATE (certificate)); + + if (self->pv->certificate) + g_object_weak_unref (G_OBJECT (self->pv->certificate), on_certificate_gone, self); + self->pv->certificate = certificate; + if (self->pv->certificate) + g_object_weak_ref (G_OBJECT (self->pv->certificate), on_certificate_gone, self); + + notify_certificate_change (G_OBJECT (self)); +} + +GIcon * +seahorse_private_key_get_icon (SeahorsePrivateKey *self) +{ + g_return_val_if_fail (SEAHORSE_IS_PRIVATE_KEY (self), NULL); + + if (!self->pv->icon) + update_icon (self); + + return self->pv->icon; +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-private-key.h seahorse-3.6.3/pkcs11/seahorse-private-key.h --- seahorse-3.2.2/pkcs11/seahorse-private-key.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-private-key.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_PRIVATE_KEY_H__ +#define __SEAHORSE_PRIVATE_KEY_H__ + +#include + +#include + +#include "seahorse-certificate.h" + +#define SEAHORSE_TYPE_PRIVATE_KEY (seahorse_private_key_get_type ()) +#define SEAHORSE_PRIVATE_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_PRIVATE_KEY, SeahorsePrivateKey)) +#define SEAHORSE_PRIVATE_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_PRIVATE_KEY, SeahorsePrivateKeyClass)) +#define SEAHORSE_IS_PRIVATE_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_PRIVATE_KEY)) +#define SEAHORSE_IS_PRIVATE_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_PRIVATE_KEY)) +#define SEAHORSE_PRIVATE_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_PRIVATE_KEY, SeahorsePrivateKeyClass)) + +typedef struct _SeahorsePrivateKeyClass SeahorsePrivateKeyClass; +typedef struct _SeahorsePrivateKeyPrivate SeahorsePrivateKeyPrivate; + +struct _SeahorsePrivateKey { + GckObject parent; + SeahorsePrivateKeyPrivate *pv; +}; + +struct _SeahorsePrivateKeyClass { + GckObjectClass parent_class; +}; + +GType seahorse_private_key_get_type (void) G_GNUC_CONST; + +SeahorseCertificate * seahorse_private_key_get_partner (SeahorsePrivateKey *self); + +void seahorse_private_key_set_partner (SeahorsePrivateKey *self, + SeahorseCertificate *certificate); + +GIcon * seahorse_private_key_get_icon (SeahorsePrivateKey *self); + +#endif /* __SEAHORSE_PRIVATE_KEY_H__ */ diff -Nru seahorse-3.2.2/pkcs11/seahorse-token.c seahorse-3.6.3/pkcs11/seahorse-token.c --- seahorse-3.2.2/pkcs11/seahorse-token.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-token.c 2012-11-12 08:32:13.000000000 +0100 @@ -0,0 +1,1087 @@ +/* + * Seahorse + * + * Copyright (C) 2006 Stefan Walter + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include +#include +#include + +#include + +#include "seahorse-certificate.h" +#include "seahorse-pkcs11.h" +#include "seahorse-pkcs11-helpers.h" +#include "seahorse-private-key.h" +#include "seahorse-token.h" + +#include "seahorse-lockable.h" +#include "seahorse-place.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" + +enum { + PROP_0, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ICON, + PROP_SLOT, + PROP_FLAGS, + PROP_URI, + PROP_ACTIONS, + PROP_INFO, + PROP_LOCKABLE, + PROP_UNLOCKABLE, + PROP_SESSION +}; + +struct _SeahorseTokenPrivate { + GckSlot *slot; + gchar *uri; + GckTokenInfo *info; + GArray *mechanisms; + GckSession *session; + GHashTable *object_for_handle; + GHashTable *objects_for_id; + GHashTable *id_for_object; + GHashTable *objects_visible; +}; + +static void seahorse_token_place_iface (SeahorsePlaceIface *iface); + +static void seahorse_token_collection_iface (GcrCollectionIface *iface); + +static void seahorse_token_lockable_iface (SeahorseLockableIface *iface); + +G_DEFINE_TYPE_EXTENDED (SeahorseToken, seahorse_token, G_TYPE_OBJECT, 0, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_token_collection_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_PLACE, seahorse_token_place_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_LOCKABLE, seahorse_token_lockable_iface); +); + +static void +update_mechanisms (SeahorseToken *self) +{ + GArray *mechanisms; + + mechanisms = gck_slot_get_mechanisms (self->pv->slot); + if (self->pv->mechanisms != NULL) + g_array_unref (self->pv->mechanisms); + self->pv->mechanisms = mechanisms; +} + +static void +update_token_info (SeahorseToken *self) +{ + GckTokenInfo *info; + GObject *obj; + + info = gck_slot_get_token_info (self->pv->slot); + if (info != NULL) { + gck_token_info_free (self->pv->info); + self->pv->info = info; + + obj = G_OBJECT (self); + g_object_notify (obj, "info"); + g_object_notify (obj, "lockable"); + g_object_notify (obj, "unlockable"); + } +} + +static void +update_id_map (SeahorseToken *self, + gpointer object, + const GckAttribute *id) +{ + GPtrArray *objects; + GckAttribute *pid; + gboolean remove = FALSE; + gboolean add = FALSE; + + /* See if this object was here before */ + pid = g_hash_table_lookup (self->pv->id_for_object, object); + + /* Decide what we're going to do */ + if (id == NULL) { + if (pid != NULL) { + id = pid; + remove = TRUE; + } + } else { + if (pid == NULL) { + add = TRUE; + } else if (!gck_attribute_equal (id, pid)) { + remove = TRUE; + add = TRUE; + } + } + + if (add) { + if (!g_hash_table_lookup_extended (self->pv->objects_for_id, id, + (gpointer *)&id, (gpointer *)&objects)) { + objects = g_ptr_array_new (); + g_hash_table_insert (self->pv->objects_for_id, + gck_attribute_dup (id), objects); + } + g_ptr_array_add (objects, object); + g_hash_table_insert (self->pv->id_for_object, object, (GckAttribute *)id); + } + + /* Remove this object from the map */ + if (remove) { + if (!g_hash_table_remove (self->pv->id_for_object, object)) + g_assert_not_reached (); + objects = g_hash_table_lookup (self->pv->objects_for_id, id); + g_assert (objects != NULL); + g_assert (objects->len > 0); + if (objects->len == 1) { + if (!g_hash_table_remove (self->pv->objects_for_id, id)) + g_assert_not_reached (); + } else { + if (!g_ptr_array_remove (objects, object)) + g_assert_not_reached (); + } + } +} + +static gpointer +lookup_id_map (SeahorseToken *self, + GType object_type, + const GckAttribute *id) +{ + GPtrArray *objects; + guint i; + + if (id == NULL) + return NULL; + + objects = g_hash_table_lookup (self->pv->objects_for_id, id); + if (objects == NULL) + return NULL; + + for (i = 0; i < objects->len; i++) { + if (G_TYPE_CHECK_INSTANCE_TYPE (objects->pdata[i], object_type)) + return objects->pdata[i]; + } + + return NULL; +} + +static void +update_visibility (SeahorseToken *self, + GList *objects, + gboolean visible) +{ + gboolean have; + gpointer object; + GList *l; + + for (l = objects; l != NULL; l = g_list_next (l)) { + object = l->data; + have = g_hash_table_lookup (self->pv->objects_visible, object) != NULL; + if (!have && visible) { + g_hash_table_insert (self->pv->objects_visible, object, object); + gcr_collection_emit_added (GCR_COLLECTION (self), object); + } else if (have && !visible) { + if (!g_hash_table_remove (self->pv->objects_visible, object)) + g_assert_not_reached (); + gcr_collection_emit_removed (GCR_COLLECTION (self), object); + } + } +} + +static gboolean +make_certificate_key_pair (SeahorseCertificate *certificate, + SeahorsePrivateKey *private_key) +{ + if (seahorse_certificate_get_partner (certificate) || + seahorse_private_key_get_partner (private_key)) + return FALSE; + + seahorse_certificate_set_partner (certificate, private_key); + seahorse_private_key_set_partner (private_key, certificate); + return TRUE; +} + +static gpointer +break_certificate_key_pair (gpointer object) +{ + SeahorseCertificate *certificate = NULL; + SeahorsePrivateKey *private_key = NULL; + gpointer pair; + + if (SEAHORSE_IS_CERTIFICATE (object)) { + certificate = SEAHORSE_CERTIFICATE (object); + pair = seahorse_certificate_get_partner (certificate); + seahorse_certificate_set_partner (certificate, NULL); + } else if (SEAHORSE_IS_PRIVATE_KEY (object)) { + private_key = SEAHORSE_PRIVATE_KEY (object); + pair = seahorse_private_key_get_partner (private_key); + seahorse_private_key_set_partner (private_key, NULL); + } else { + pair = NULL; + } + + return pair; +} + +static void +receive_objects (SeahorseToken *self, + GList *objects) +{ + GckAttributes *attrs; + const GckAttribute *id; + gpointer object; + gpointer prev; + gpointer pair; + gulong handle; + GList *show = NULL; + GList *hide = NULL; + GList *l; + + for (l = objects; l != NULL; l = g_list_next (l)) { + object = l->data; + handle = gck_object_get_handle (object); + attrs = gck_object_cache_get_attributes (object); + + prev = g_hash_table_lookup (self->pv->object_for_handle, &handle); + if (prev == NULL) { + g_hash_table_insert (self->pv->object_for_handle, + g_memdup (&handle, sizeof (handle)), + g_object_ref (object)); + g_object_set (object, "place", self, NULL); + } else if (prev != object) { + gck_object_cache_set_attributes (prev, attrs); + object = prev; + } + + id = attrs ? gck_attributes_find (attrs, CKA_ID) : NULL; + update_id_map (self, object, id); + + if (SEAHORSE_IS_CERTIFICATE (object)) { + pair = lookup_id_map (self, SEAHORSE_TYPE_PRIVATE_KEY, id); + if (pair && make_certificate_key_pair (object, pair)) + hide = g_list_prepend (hide, pair); + show = g_list_prepend (show, object); + + } else if (SEAHORSE_IS_PRIVATE_KEY (object)) { + pair = lookup_id_map (self, SEAHORSE_TYPE_CERTIFICATE, id); + if (pair && make_certificate_key_pair (pair, object)) + hide = g_list_prepend (hide, object); + else + show = g_list_prepend (show, object); + + } else { + show = g_list_prepend (show, object); + } + + gck_attributes_unref (attrs); + } + + update_visibility (self, hide, FALSE); + g_list_free (hide); + + update_visibility (self, show, TRUE); + g_list_free (show); +} + +static void +remove_objects (SeahorseToken *self, + GList *objects) +{ + GList *depaired = NULL; + GList *hide = NULL; + gulong handle; + gpointer object; + gpointer pair; + GList *l; + + for (l = objects; l != NULL; l = g_list_next (l)) { + object = l->data; + pair = break_certificate_key_pair (object); + if (pair != NULL) + depaired = g_list_prepend (depaired, pair); + update_id_map (self, object, NULL); + hide = g_list_prepend (hide, object); + } + + /* Remove the ownership of these */ + for (l = objects; l != NULL; l = g_list_next (l)) { + handle = gck_object_get_handle (l->data); + g_object_set (object, "place", NULL, NULL); + g_hash_table_remove (self->pv->object_for_handle, &handle); + } + + update_visibility (self, hide, FALSE); + g_list_free (hide); + + /* Add everything that was paired */ + receive_objects (self, depaired); + g_list_free (depaired); +} + + +typedef struct { + SeahorseToken *token; + GCancellable *cancellable; + GHashTable *checks; + GckEnumerator *enumerator; +} RefreshClosure; + +static void +pkcs11_refresh_free (gpointer data) +{ + RefreshClosure *closure = data; + g_object_unref (closure->token); + g_clear_object (&closure->cancellable); + g_hash_table_destroy (closure->checks); + g_clear_object (&closure->enumerator); + g_free (closure); +} + +static void +on_refresh_next_objects (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + RefreshClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + gulong handle; + GList *objects; + GList *l; + + objects = gck_enumerator_next_finish (closure->enumerator, result, &error); + + receive_objects (closure->token, objects); + + /* Remove all objects that were found from the check table */ + for (l = objects; l; l = g_list_next (l)) { + handle = gck_object_get_handle (l->data); + g_hash_table_remove (closure->checks, &handle); + } + + gck_list_unref_free (objects); + + /* If there was an error, report it */ + if (error != NULL) { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + + /* Otherwise if there were objects go back and get more */ + } else if (objects != NULL) { + gck_enumerator_next_async (closure->enumerator, 16, closure->cancellable, + on_refresh_next_objects, g_object_ref (res)); + + /* Otherwise we're done, remove everything not found */ + } else { + objects = g_hash_table_get_values (closure->checks); + remove_objects (closure->token, objects); + g_list_free (objects); + + g_simple_async_result_complete (res); + } + + g_object_unref (res); +} + +static void +refresh_enumerate (GSimpleAsyncResult *res) +{ + RefreshClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GckBuilder builder = GCK_BUILDER_INIT; + GckSession *session; + GckEnumerator *enumerator; + + session = seahorse_token_get_session (closure->token); + + gck_builder_add_boolean (&builder, CKA_TOKEN, TRUE); + gck_builder_add_ulong (&builder, CKA_CLASS, CKO_CERTIFICATE); + enumerator = gck_session_enumerate_objects (session, gck_builder_end (&builder)); + gck_enumerator_set_object_type (enumerator, SEAHORSE_TYPE_CERTIFICATE); + closure->enumerator = enumerator; + + gck_builder_add_boolean (&builder, CKA_TOKEN, TRUE); + gck_builder_add_ulong (&builder, CKA_CLASS, CKO_PRIVATE_KEY); + enumerator = gck_session_enumerate_objects (session, gck_builder_end (&builder)); + gck_enumerator_set_object_type (enumerator, SEAHORSE_TYPE_PRIVATE_KEY); + gck_enumerator_set_chained (closure->enumerator, enumerator); + g_object_unref (enumerator); + + gck_enumerator_next_async (closure->enumerator, 16, closure->cancellable, + on_refresh_next_objects, g_object_ref (res)); +} + +static void +on_refresh_session_open (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + RefreshClosure *closure = g_simple_async_result_get_op_res_gpointer (res); + GError *error = NULL; + GckSession *session; + + session = gck_session_open_finish (result, &error); + + if (error == NULL) { + seahorse_token_set_session (closure->token, session); + refresh_enumerate (res); + g_object_unref (session); + } else { + g_simple_async_result_take_error (res, error); + g_simple_async_result_complete (res); + } + + g_object_unref (res); +} + +static GckSessionOptions +calculate_session_options (SeahorseToken *self) +{ + GckTokenInfo *info = seahorse_token_get_info (self); + if (info->flags & CKF_WRITE_PROTECTED) + return GCK_SESSION_READ_ONLY; + else + return GCK_SESSION_READ_WRITE; +} + +static void +seahorse_token_load_async (SeahorsePlace *place, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseToken *self = SEAHORSE_TOKEN (place); + GSimpleAsyncResult *res; + RefreshClosure *closure; + GckSessionOptions options; + GList *objects, *l; + gulong handle; + + update_token_info (self); + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_token_load_async); + closure = g_new0 (RefreshClosure, 1); + closure->checks = g_hash_table_new_full (seahorse_pkcs11_ulong_hash, + seahorse_pkcs11_ulong_equal, + g_free, g_object_unref); + closure->token = g_object_ref (self); + closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + g_simple_async_result_set_op_res_gpointer (res, closure, pkcs11_refresh_free); + + /* Make note of all the objects that were there */ + objects = gcr_collection_get_objects (GCR_COLLECTION (self)); + for (l = objects; l; l = g_list_next (l)) { + handle = gck_object_get_handle (l->data); + g_hash_table_insert (closure->checks, + g_memdup (&handle, sizeof (handle)), + g_object_ref (l->data)); + } + g_list_free (objects); + + if (!self->pv->session) { + options = calculate_session_options (self); + gck_session_open_async (self->pv->slot, options, NULL, cancellable, + on_refresh_session_open, g_object_ref (res)); + } else { + refresh_enumerate (res); + } + + g_object_unref (res); +} + +static gboolean +seahorse_token_load_finish (SeahorsePlace *place, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (place), + seahorse_token_load_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; + +} + +static void +seahorse_token_init (SeahorseToken *self) +{ + self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_TOKEN, SeahorseTokenPrivate)); + self->pv->object_for_handle = g_hash_table_new_full (seahorse_pkcs11_ulong_hash, + seahorse_pkcs11_ulong_equal, + g_free, g_object_unref); + self->pv->objects_for_id = g_hash_table_new_full (gck_attribute_hash, + gck_attribute_equal, + gck_attribute_free, + (GDestroyNotify)g_ptr_array_unref); + self->pv->id_for_object = g_hash_table_new (g_direct_hash, g_direct_equal); + self->pv->objects_visible = g_hash_table_new (g_direct_hash, g_direct_equal); +} + +static void +seahorse_token_constructed (GObject *obj) +{ + SeahorseToken *self = SEAHORSE_TOKEN (obj); + GckUriData *data; + + G_OBJECT_CLASS (seahorse_token_parent_class)->constructed (obj); + + g_return_if_fail (self->pv->slot != NULL); + + seahorse_place_load_async (SEAHORSE_PLACE (self), NULL, NULL, NULL); + + data = gck_uri_data_new (); + data->token_info = seahorse_token_get_info (self); + self->pv->uri = gck_uri_build (data, GCK_URI_FOR_TOKEN); + data->token_info = NULL; + gck_uri_data_free (data); +} + +static void +seahorse_token_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseToken *self = SEAHORSE_TOKEN (object); + GckTokenInfo *token; + + switch (prop_id) { + case PROP_LABEL: + token = gck_slot_get_token_info (self->pv->slot); + if (token == NULL) + g_value_set_string (value, _("Unknown")); + else + g_value_set_string (value, token->label); + gck_token_info_free (token); + break; + case PROP_DESCRIPTION: + token = gck_slot_get_token_info (self->pv->slot); + if (token == NULL) + g_value_set_string (value, NULL); + else + g_value_set_string (value, token->manufacturer_id); + gck_token_info_free (token); + break; + case PROP_ICON: + token = gck_slot_get_token_info (self->pv->slot); + if (token == NULL) + g_value_take_object (value, g_themed_icon_new (GTK_STOCK_DIALOG_QUESTION)); + else + g_value_take_object (value, gcr_icon_for_token (token)); + gck_token_info_free (token); + break; + case PROP_SLOT: + g_value_set_object (value, self->pv->slot); + break; + case PROP_FLAGS: + g_value_set_uint (value, 0); + break; + case PROP_URI: + g_value_set_string (value, self->pv->uri); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + case PROP_INFO: + g_value_set_boxed (value, self->pv->info); + break; + case PROP_LOCKABLE: + g_value_set_boolean (value, seahorse_token_get_lockable (self)); + break; + case PROP_UNLOCKABLE: + g_value_set_boolean (value, seahorse_token_get_unlockable (self)); + break; + case PROP_SESSION: + g_value_set_object (value, seahorse_token_get_session (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +seahorse_token_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseToken *self = SEAHORSE_TOKEN (object); + + switch (prop_id) { + case PROP_SLOT: + g_return_if_fail (!self->pv->slot); + self->pv->slot = g_value_get_object (value); + g_return_if_fail (self->pv->slot); + g_object_ref (self->pv->slot); + break; + case PROP_INFO: + g_return_if_fail (!self->pv->info); + self->pv->info = g_value_dup_boxed (value); + break; + case PROP_SESSION: + seahorse_token_set_session (self, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + }; +} + +static void +seahorse_token_dispose (GObject *obj) +{ + SeahorseToken *self = SEAHORSE_TOKEN (obj); + + g_clear_object (&self->pv->slot); + g_clear_object (&self->pv->session); + + G_OBJECT_CLASS (seahorse_token_parent_class)->dispose (obj); +} + +static void +seahorse_token_finalize (GObject *obj) +{ + SeahorseToken *self = SEAHORSE_TOKEN (obj); + + g_hash_table_destroy (self->pv->objects_visible); + g_hash_table_destroy (self->pv->object_for_handle); + g_hash_table_destroy (self->pv->objects_for_id); + g_hash_table_destroy (self->pv->id_for_object); + g_assert (self->pv->slot == NULL); + g_free (self->pv->uri); + + G_OBJECT_CLASS (seahorse_token_parent_class)->finalize (obj); +} + +static void +seahorse_token_class_init (SeahorseTokenClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (SeahorseTokenPrivate)); + + gobject_class->constructed = seahorse_token_constructed; + gobject_class->dispose = seahorse_token_dispose; + gobject_class->finalize = seahorse_token_finalize; + gobject_class->set_property = seahorse_token_set_property; + gobject_class->get_property = seahorse_token_get_property; + + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_URI, "uri"); + g_object_class_override_property (gobject_class, PROP_ICON, "icon"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); + + g_object_class_install_property (gobject_class, PROP_SLOT, + g_param_spec_object ("slot", "Slot", "Pkcs#11 SLOT", + GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property (gobject_class, PROP_FLAGS, + g_param_spec_uint ("object-flags", "Flags", "Object Token flags.", + 0, G_MAXUINT, 0, G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_INFO, + g_param_spec_boxed ("info", "Info", "Token info", + GCK_TYPE_TOKEN_INFO, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property (gobject_class, PROP_LOCKABLE, + g_param_spec_boolean ("lockable", "Lockable", "Token can be locked", + FALSE, G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_UNLOCKABLE, + g_param_spec_boolean ("unlockable", "Unlockable", "Token can be unlocked", + FALSE, G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_SLOT, + g_param_spec_object ("session", "Session", "Pkcs#11 Session", + GCK_TYPE_SESSION, G_PARAM_READWRITE)); +} + +static void +seahorse_token_place_iface (SeahorsePlaceIface *iface) +{ + iface->load_async = seahorse_token_load_async; + iface->load_finish = seahorse_token_load_finish; +} + +static guint +seahorse_token_get_length (GcrCollection *collection) +{ + SeahorseToken *self = SEAHORSE_TOKEN (collection); + return g_hash_table_size (self->pv->objects_visible); +} + +static GList * +seahorse_token_get_objects (GcrCollection *collection) +{ + SeahorseToken *self = SEAHORSE_TOKEN (collection); + return g_hash_table_get_values (self->pv->objects_visible); +} + +static gboolean +seahorse_token_contains (GcrCollection *collection, + GObject *object) +{ + SeahorseToken *self = SEAHORSE_TOKEN (collection); + return g_hash_table_lookup (self->pv->objects_visible, object) != NULL; +} + +static void +seahorse_token_collection_iface (GcrCollectionIface *iface) +{ + iface->get_length = seahorse_token_get_length; + iface->get_objects = seahorse_token_get_objects; + iface->contains = seahorse_token_contains; +} + +static gboolean +is_session_logged_in (GckSession *session) +{ + GckSessionInfo *info; + gboolean logged_in; + + if (session == NULL) + return FALSE; + + info = gck_session_get_info (session); + logged_in = (info != NULL) && + (info->state == CKS_RW_USER_FUNCTIONS || + info->state == CKS_RO_USER_FUNCTIONS || + info->state == CKS_RW_SO_FUNCTIONS); + gck_session_info_free (info); + + return logged_in; +} + +static void +on_session_logout (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + SeahorseToken *self = SEAHORSE_TOKEN (g_async_result_get_source_object (user_data)); + GError *error = NULL; + + gck_session_logout_finish (GCK_SESSION (source), result, &error); + if (error == NULL) + seahorse_place_load_async (SEAHORSE_PLACE (self), NULL, NULL, NULL); + else + g_simple_async_result_take_error (res, error); + + g_simple_async_result_complete (res); + g_object_unref (self); + g_object_unref (res); +} + +static void +on_login_interactive (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + SeahorseToken *self = SEAHORSE_TOKEN (g_async_result_get_source_object (user_data)); + GError *error = NULL; + + gck_session_logout_finish (GCK_SESSION (source), result, &error); + if (error == NULL) + seahorse_token_load_async (SEAHORSE_PLACE (self), NULL, NULL, NULL); + else + g_simple_async_result_take_error (res, error); + + g_simple_async_result_complete (res); + g_object_unref (self); + g_object_unref (res); +} + +static void +on_session_login_open (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); + SeahorseToken *self = SEAHORSE_TOKEN (g_async_result_get_source_object (user_data)); + GckSession *session; + GError *error = NULL; + + session = gck_session_open_finish (result, &error); + if (error == NULL) { + seahorse_token_set_session (self, session); + seahorse_place_load_async (SEAHORSE_PLACE (self), NULL, NULL, NULL); + g_object_unref (session); + } else { + g_simple_async_result_take_error (res, error); + } + + g_simple_async_result_complete (res); + g_object_unref (self); + g_object_unref (res); +} + +static void +seahorse_token_lock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseToken *self = SEAHORSE_TOKEN (lockable); + GSimpleAsyncResult *res; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_token_lock_async); + + if (is_session_logged_in (self->pv->session)) + gck_session_logout_async (self->pv->session, cancellable, + on_session_logout, g_object_ref (res)); + else + g_simple_async_result_complete_in_idle (res); + + g_object_unref (res); +} + +static gboolean +seahorse_token_lock_finish (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (lockable), + seahorse_token_lock_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +seahorse_token_unlock_async (SeahorseLockable *lockable, + GTlsInteraction *interaction, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseToken *self = SEAHORSE_TOKEN (lockable); + GSimpleAsyncResult *res; + GckSessionOptions options; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_token_unlock_async); + + if (is_session_logged_in (self->pv->session)) { + g_simple_async_result_complete_in_idle (res); + + } else if (self->pv->session) { + gck_session_login_interactive_async (self->pv->session, CKU_USER, + interaction, NULL, on_login_interactive, + g_object_ref (res)); + } else { + options = calculate_session_options (self); + gck_session_open_async (self->pv->slot, options | GCK_SESSION_LOGIN_USER, interaction, + NULL, on_session_login_open, g_object_ref (res)); + } + + g_object_unref (res); +} + +static gboolean +seahorse_token_unlock_finish (SeahorseLockable *lockable, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (lockable), + seahorse_token_unlock_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +seahorse_token_lockable_iface (SeahorseLockableIface *iface) +{ + iface->lock_async = seahorse_token_lock_async; + iface->lock_finish = seahorse_token_lock_finish; + iface->unlock_async = seahorse_token_unlock_async; + iface->unlock_finish = seahorse_token_unlock_finish; +} + +SeahorseToken * +seahorse_token_new (GckSlot *slot) +{ + return g_object_new (SEAHORSE_TYPE_TOKEN, + "slot", slot, + NULL); +} + +GckSlot * +seahorse_token_get_slot (SeahorseToken *self) +{ + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), NULL); + return self->pv->slot; +} + +GckSession * +seahorse_token_get_session (SeahorseToken *self) +{ + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), NULL); + return self->pv->session; +} + +void +seahorse_token_set_session (SeahorseToken *self, + GckSession *session) +{ + GObject *obj; + + g_return_if_fail (SEAHORSE_IS_TOKEN (self)); + g_return_if_fail (session == NULL || GCK_IS_SESSION (session)); + + if (session) + g_object_ref (session); + g_clear_object (&self->pv->session); + self->pv->session = session; + + obj = G_OBJECT (self); + g_object_freeze_notify (obj); + g_object_notify (obj, "session"); + g_object_notify (obj, "lockable"); + g_object_notify (obj, "unlockable"); + g_object_thaw_notify (obj); +} + +GckTokenInfo * +seahorse_token_get_info (SeahorseToken *self) +{ + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), NULL); + + if (self->pv->info == NULL) + update_token_info (self); + + return self->pv->info; +} + +gboolean +seahorse_token_get_lockable (SeahorseToken *self) +{ + GckTokenInfo *info; + + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), FALSE); + + info = seahorse_token_get_info (self); + + if ((info->flags & CKF_LOGIN_REQUIRED) == 0) + return FALSE; + + if ((info->flags & CKF_USER_PIN_INITIALIZED) == 0) + return FALSE; + + return is_session_logged_in (self->pv->session); + +} + +gboolean +seahorse_token_get_unlockable (SeahorseToken *self) +{ + GckTokenInfo *info; + + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), FALSE); + + info = seahorse_token_get_info (self); + + if ((info->flags & CKF_LOGIN_REQUIRED) == 0) + return FALSE; + + if ((info->flags & CKF_USER_PIN_INITIALIZED) == 0) + return FALSE; + + return !is_session_logged_in (self->pv->session); +} + +GArray * +seahorse_token_get_mechanisms (SeahorseToken *self) +{ + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), NULL); + + if (!self->pv->mechanisms) + update_mechanisms (self); + + return self->pv->mechanisms; +} + +gboolean +seahorse_token_has_mechanism (SeahorseToken *self, + gulong mechanism) +{ + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), FALSE); + + if (!self->pv->mechanisms) + update_mechanisms (self); + + return gck_mechanisms_check (self->pv->mechanisms, + mechanism, + GCK_INVALID); +} + +void +seahorse_token_remove_object (SeahorseToken *self, + GckObject *object) +{ + GList *objects; + + g_return_if_fail (SEAHORSE_IS_TOKEN (self)); + g_return_if_fail (GCK_IS_OBJECT (object)); + + objects = g_list_prepend (NULL, g_object_ref (object)); + remove_objects (self, objects); + g_list_free_full (objects, g_object_unref); +} + +gboolean +seahorse_token_is_deletable (SeahorseToken *self, + GckObject *object) +{ + GckAttributes *attrs; + GckTokenInfo *info; + gboolean ret; + + g_return_val_if_fail (SEAHORSE_IS_TOKEN (self), FALSE); + g_return_val_if_fail (GCK_IS_OBJECT (object), FALSE); + + info = seahorse_token_get_info (self); + if (info->flags & CKF_WRITE_PROTECTED) + return FALSE; + + g_object_get (object, "attributes", &attrs, NULL); + + if (!gck_attributes_find_boolean (attrs, CKA_MODIFIABLE, &ret)) + ret = TRUE; + + gck_attributes_unref (attrs); + return ret; +} diff -Nru seahorse-3.2.2/pkcs11/seahorse-token.h seahorse-3.6.3/pkcs11/seahorse-token.h --- seahorse-3.2.2/pkcs11/seahorse-token.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/pkcs11/seahorse-token.h 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,76 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * 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 __SEAHORSE_TOKEN_H__ +#define __SEAHORSE_TOKEN_H__ + +#include + +#define SEAHORSE_TYPE_TOKEN (seahorse_token_get_type ()) +#define SEAHORSE_TOKEN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_TOKEN, SeahorseToken)) +#define SEAHORSE_TOKEN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_TOKEN, SeahorseTokenClass)) +#define SEAHORSE_IS_TOKEN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_TOKEN)) +#define SEAHORSE_IS_TOKEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_TOKEN)) +#define SEAHORSE_TOKEN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_TOKEN, SeahorseTokenClass)) + +typedef struct _SeahorseToken SeahorseToken; +typedef struct _SeahorseTokenClass SeahorseTokenClass; +typedef struct _SeahorseTokenPrivate SeahorseTokenPrivate; + +struct _SeahorseToken { + GObject parent; + SeahorseTokenPrivate *pv; +}; + +struct _SeahorseTokenClass { + GObjectClass parent_class; +}; + +GType seahorse_token_get_type (void); + +SeahorseToken * seahorse_token_new (GckSlot *slot); + +GckTokenInfo * seahorse_token_get_info (SeahorseToken *self); + +GckSlot * seahorse_token_get_slot (SeahorseToken *self); + +GckSession * seahorse_token_get_session (SeahorseToken *self); + +void seahorse_token_set_session (SeahorseToken *self, + GckSession *session); + +gboolean seahorse_token_get_lockable (SeahorseToken *self); + +gboolean seahorse_token_get_unlockable (SeahorseToken *self); + +GArray * seahorse_token_get_mechanisms (SeahorseToken *self); + +gboolean seahorse_token_has_mechanism (SeahorseToken *self, + gulong mechanism); + +void seahorse_token_remove_object (SeahorseToken *self, + GckObject *object); + +gboolean seahorse_token_is_deletable (SeahorseToken *self, + GckObject *object); + +#endif /* __SEAHORSE_TOKEN_H__ */ diff -Nru seahorse-3.2.2/po/ar.po seahorse-3.6.3/po/ar.po --- seahorse-3.2.2/po/ar.po 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/po/ar.po 2012-08-21 12:23:18.000000000 +0200 @@ -2,419 +2,187 @@ # Arabic translations for PACKAGE package. # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Khaled Hosny , 2006, 2007, 2008, 2009, 2010, 2011. +# Khaled Hosny , 2006, 2007, 2008, 2009, 2010, 2011, 2012. # Ahmad Farghal , 2007. # Usama Akkad , 2008. msgid "" msgstr "" "Project-Id-Version: seahorse.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-05 19:15+0200\n" -"PO-Revision-Date: 2011-02-05 19:14+0300\n" +"POT-Creation-Date: 2012-07-05 03:59+0200\n" +"PO-Revision-Date: 2012-07-05 04:06+0200\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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 ? 4 : 5;\n" -"X-Generator: Virtaal 0.6.1\n" +"X-Generator: Virtaal 0.7.0\n" "X-Poedit-Language: Arabic\n" -#: ../daemon/seahorse-daemon.c:64 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "لا تشغِّل seahorse-daemon كعفريت" - -#: ../daemon/seahorse-daemon.c:94 -msgid "couldn't fork process" -msgstr "تعذّر تشعيب العملية" - -#: ../daemon/seahorse-daemon.c:100 -msgid "couldn't create new process group" -msgstr "تعذّر بدأ مجموعة عملية جديدة" - -#: ../daemon/seahorse-daemon.c:250 -msgid "Encryption Daemon (Seahorse)" -msgstr "عفريت التعمية (حصان البحر)" - -#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "نوع مفتاح مجهول أو غير صالح: %s" - -#: ../daemon/seahorse-service.c:234 -#, c-format -msgid "This keytype is not supported: %s" -msgstr "نوع المفتاح هذا غير مدعوم: %s" - -#: ../daemon/seahorse-service.c:241 -#, c-format -msgid "Support for this feature was not enabled at build time" -msgstr "لم يفعّل دعم هذه الخاصية أثناء البناء" - -#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180 -#: ../daemon/seahorse-service-keyset.c:223 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "مفتاح مجهول أو غير صالح: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:204 -#, c-format -msgid "Signed by expired on %s." -msgstr "وقّعه انتهت صلاحيته في %s." - -#: ../daemon/seahorse-service-crypto.c:205 -msgid "Invalid Signature" -msgstr "توقيع غير صالح" - -#: ../daemon/seahorse-service-crypto.c:211 -#, c-format -msgid "Signed by on %s Expired." -msgstr "وقّعه في %s انتهت صلاحيته." - -#: ../daemon/seahorse-service-crypto.c:212 -msgid "Expired Signature" -msgstr "توقيع منتهي الصلاحية" - -#: ../daemon/seahorse-service-crypto.c:218 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "وقّعه نُقِض في %s." - -#: ../daemon/seahorse-service-crypto.c:219 -msgid "Revoked Signature" -msgstr "توقيع منقوض" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:225 -#, c-format -msgid "Signed by on %s." -msgstr "وقّعه في %s." - -#: ../daemon/seahorse-service-crypto.c:226 -msgid "Good Signature" -msgstr "توقيع سليم" - -#: ../daemon/seahorse-service-crypto.c:231 -msgid "Signing key not in keyring." -msgstr "مفتاح التوقيع ليس في حلقة المفاتيح." - -#: ../daemon/seahorse-service-crypto.c:232 -msgid "Unknown Signature" -msgstr "توقيع مجهول" - -#: ../daemon/seahorse-service-crypto.c:236 -msgid "Bad or forged signature. The signed data was modified." -msgstr "توقيع سيء أو مُزوّر. لقد عُدِّلت البيانات المُوقّعة." - -#: ../daemon/seahorse-service-crypto.c:237 -msgid "Bad Signature" -msgstr "توقيع سيّء" - -#: ../daemon/seahorse-service-crypto.c:245 -msgid "Couldn't verify signature." -msgstr "تعذّر التحقق من التوقيع" - -#: ../daemon/seahorse-service-crypto.c:317 -#: ../daemon/seahorse-service-crypto.c:646 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "مُوقِّع مجهول أو غير صالح: %s" - -#: ../daemon/seahorse-service-crypto.c:324 -#: ../daemon/seahorse-service-crypto.c:653 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "لا يصلح المفتاح للتوقيع: %s" - -#: ../daemon/seahorse-service-crypto.c:335 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "مُستلِم مجهول أو غير صالح: %s" - -#: ../daemon/seahorse-service-crypto.c:343 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "ليس المفتاخ مُستلِما صالحا للتعمية: %s" - -#: ../daemon/seahorse-service-crypto.c:352 -#, c-format -msgid "No recipients specified" -msgstr "لم يحدّد أي مُستلِم" - -#: ../daemon/seahorse-service-crypto.c:434 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "نوع مفتاح غير صالح لاستخراج التعمية: %s" - -#: ../daemon/seahorse-service-crypto.c:548 -#: ../daemon/seahorse-service-crypto.c:746 -#, c-format -msgid "Please set clearuri" -msgstr "" - -#: ../daemon/seahorse-service-crypto.c:554 -#: ../daemon/seahorse-service-crypto.c:752 -#, c-format -msgid "Please set crypturi" -msgstr "" - -#: ../daemon/seahorse-service-crypto.c:564 -#, c-format -msgid "Error opening clearuri" -msgstr "" - -#: ../daemon/seahorse-service-crypto.c:641 -#, c-format -msgid "No signer specified" -msgstr "لم يحدّد أي مُوقِّع" - -#: ../daemon/seahorse-service-crypto.c:830 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "نوع مفتاح غير صالح للتحقق: %s" - -#: ../daemon/seahorse-service-keyset.c:273 -#, c-format -msgid "Invalid key id: %s" -msgstr "معرّف مفتاح غير صالح: %s" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"قائمة بخواديم المفاتيح أو مسارات لمفاتيح PGP البعيدة. في الإصدارة الأخيرة " -"يُمكن تضمين اسم عرض، بإلحاق مسافة ثم الاسم." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "اجلب المفاتيح آليا" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "زامن المفاتيح آليا" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "يتحكم في ظهور عمود انتهاء الصلاحية في مدير المفاتيح." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "يتحكم في ظهور عمود الثقة في مدير المفاتيح." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "يتحكم في ظهور عمود النوع في مدير المفاتيح." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "يتحكم في ظهور عمود الصلاحية في مدير المفاتيح." - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "فعِّل مُشاركة DNS-SD" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"فعِّل مُشاركة ‪DNS-SD (Apple Bonjour)‬ للمفاتيح. يجب أن يكون seahorse-daemon " -"مُشتغلا وأن يكون قد بُنِي بدعم HKP و DNS-SD." - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "هويّة المفتاح المبدئي" - -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" -"إذا ضُبِط لصحيح، فستُصبح الملفات المعمّاة بواسطة حصان البحر مرمّزة بأسكي مصفّح." +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "أضِف حلقة كلمات سر" -#: ../data/seahorse.schemas.in.h:12 +#: ../gkr/seahorse-add-keyring.xml.h:2 msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "إذا ضُبِط لصحيح، سيُضاف المُفتاح المبدئي دائما إلى قائمة مُستلِمي التعمية." - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "آخر نمط بحث في خادوم مفاتيح" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "آخر خادوم مفاتيح استُخدِم" - -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "آخر مفتاح استُخدِم لتوقيع رسالة." - -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "خواديم مفاتيح PGP" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "انشر في خادوم المفاتيح هذا." - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "اعرض عمود انتهاء الصلاحية في مدير المفاتيح" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "اعرض عمود الثقة في مدير المفاتيح" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "اعرض عمود النوع في مدير المفاتيح" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "من فضلك اختر اسما للحلقة الجديدة. ستسأل عن كلمة سر للفتح." -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "اعرض عمود الصلاحية في مدير المفاتيح" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "اسم الحلقة الجديدة:" -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"حدد العمود الذي سترتب نافذة المستلمين طبقا له، الأعمدة هي 'name' و 'id'. ضع " -"'-' أمام اسم العمود لترتب تنازليا." +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "اسم المستضيف أو عنوان الخادوم." -#: ../data/seahorse.schemas.in.h:23 -msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." -msgstr "" -"حدد العمود الذي سترتب نافذة مدير مفاتيح حصان البحر طبقا له. أسماء الأعمدة هي " -"'name'، و 'id'، و 'validity'، و 'expires'، و trust' و 'type'. ضع '-' أمام " -"اسم العمود لترتب تنازليا." - -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "معرّف آخر مفتاح سري استخدم لتوقيع رسالة." - -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "العمود الذي سيرتب المستلمون طبقا له" - -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "العمود الذي سترتب مفاتيح حصان البحر طبقا له" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "حلقة مفاتيح كلمات سر جديدة" -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"خادوم المفاتيح الذي ستنشر به مفاتيح PGP. أو اجعله خاليا لتثبِّط نشر مفاتيح PGP." +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "تستخدم لحفظ كلمات سر التطبيقات والشبكة" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "آخر خادوم مفاتيح بُحث به أو فارغا لكل خواديم المفاتيح." +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "كلمة سر جديدة..." -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "آخر نمط بحث بحث عنه في خادوم مفاتيح." +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "احفظ كلمة سر أو أمر سري بأمان." -#: ../data/seahorse.schemas.in.h:30 -msgid "" -"This specifies the default key to use for certain operations, mainly signing." -msgstr "يحدد هذا المفتاح المبدئي الذي سيستخدم في عمليات معيّنة، غالبا التوقيع." +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "حلقة مفاتيح كلمات السر" -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "" -"ما إذا كان من المتعين الحصول آليا على المفاتيح المعدّلة من خادوم المفاتيح " -"المبدئي أم لا." +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "كلمات السر المحفوظة" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." -msgstr "" -"ما إذا كان من المتعين مزامنة المفاتيح المعدّلة آليا مع خادوم المفاتيح المبدئي " -"أم لا." +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "تعذّر تحديد حلقة المفاتيح المبدئية" -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "ما إذا كان سيُعمِّي دائما بالمفتاح المبدئي" - -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "فيما إذا سيستخدم أسكي مُحصّن" +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "تعذّر تغيير كلمة سر حلقة المفاتيح" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "أضِف حلقة كلمات سر" +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "اجعلها المب_دئية" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "اسم الحلقة الجديدة:" +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "عادة ما تحفظ التطبيقات كلمات السر في حلقة المفاتيح المبدئية." -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "من فضلك اختر اسما للحلقة الجديدة. ستسأل عن كلمة سر للفتح." +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "_غيّر كلمة السر" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "اسم المستضيف أو عنوان الخادوم." +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "غير كلمة سر حلقة مفاتيح تخزين كلمات الير" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73 -msgid "Couldn't add keyring" -msgstr "تعذّر إضافة حلقة مفاتيح" +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "تعذّر إضافة العنصر" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "أضف كلمة سر" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "ال_وصف:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_حلقة المفاتيح:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_كلمة السر:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "أ_ظهر كلمة السر" -#: ../gkr/seahorse-gkr-item.c:473 -msgid "Web Password" -msgstr "كلمة سر وِِب" - -#: ../gkr/seahorse-gkr-item.c:475 -msgid "Network Password" -msgstr "كلمة السر شبكة" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_حلقة المفاتيح:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "تعذّر إضافة حلقة مفاتيح" -#: ../gkr/seahorse-gkr-item.c:477 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "كلمة السر" +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "كلمات السر" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "كلمات السر الخاصة والأسرار المحفوظة" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "كلمة سر حساب المراسلة الفورية " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "كلمة سر" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "كلمة السر الشبكة" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "ملاحظة محفوظة" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "كلمة السر حلقة مفاتيح" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "كلمة سر مفتاح تعمية" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "كلم سر مخزن مفاتيح" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "كلمة سر جوجل كروم" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "كلمة سر حسابات جنوم على الإنترنت" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "كلمة سر تليباثي" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "كلمة سر التراسل الفوري" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "ملمة سر مدير الشبكة" -#: ../gkr/seahorse-gkr-item-commands.c:78 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "أمتأكد من رغبتك بحذف كلمة السر '%s'؟" -#: ../gkr/seahorse-gkr-item-commands.c:81 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -449,468 +217,269 @@ msgid "Network Credentials" msgstr "مُؤهلات الشبكة" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "كلمة السر" + +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "تعذّر تغيير كلمة السر." -#: ../gkr/seahorse-gkr-item-properties.c:350 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 +msgid "Updating password" +msgstr "يُحدّث كلمة السر" + +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "تعذّر وضع وصف." -#: ../gkr/seahorse-gkr-item-properties.c:656 -msgid "Couldn't set application access." -msgstr "تعذّر ضبط نفاذ التطبيق." - #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "كلمة السر:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "المسار:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "الصلاحيات:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "خصائص المفتاح" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "التفاصيل التقنية:" +msgid "Use:" +msgstr "الاستخدام:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "التطبيقات" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "النّوع:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "التفاصيل" +msgid "Server:" +msgstr "الخادوم:" #: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "مفتاح" +msgid "Login:" +msgstr "الولوج:" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "خصائص المفتاح" +msgid "Show pass_word" +msgstr "أظهر _كلمة السر" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "الولوج:" +msgid "Password:" +msgstr "كلمة السر:" #: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "الخادوم:" +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "مفتاح" #: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "أظهر _كلمة السر" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "التفاصيل التقنية:" #: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Type:" -msgstr "النّوع:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "التفاصيل" -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "الاستخدام:" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "حلقة مفاتيح تُفتح آليا عن ولوج المستخدم" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "حلقة مفاتيح لحفظ كلمات السر" -#. To translators: This is the infinitive not the imperative. This string refers to the ability of an application to delete this secret from its key ring. -#: ../gkr/seahorse-gkr-item-properties.xml.h:16 -msgid "_Delete" -msgstr "_احذف" +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "أمتأكد من رغبتك بحذف حلقة مفاتيح كلمات السر '%s'؟" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Read" -msgstr "_اقرأ" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "أفهم أن كل العناصر ستحذف للأبد." -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:21 -msgid "_Write" -msgstr "ا_كتب" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "خصائص حلقة المفاتيح" -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "يجري سرد كلمات السر" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "الاسم:" -#: ../gkr/seahorse-gkr-keyring.c:354 -#, c-format -msgid "Passwords: %s" -msgstr "كلمات السر: %s" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "تاريخ الإنشاء:" -#: ../gkr/seahorse-gkr-keyring.c:355 -#, c-format -msgid "Passwords: %s" -msgstr "كلمات السر: %s" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "حلقة مفاتيح" -#: ../gkr/seahorse-gkr-keyring-commands.c:119 -msgid "Password Keyring" -msgstr "حلقة مفاتيح كلمات السر" +#: ../libegg/egg-datetime.c:317 +msgid "Display flags" +msgstr "اعرض الشارات" -#: ../gkr/seahorse-gkr-keyring-commands.c:120 -msgid "Used to store application and network passwords" -msgstr "تستخدم لحفظ كلمات سر التطبيقات والشبكة:" +#: ../libegg/egg-datetime.c:318 +msgid "Displayed date and/or time properties" +msgstr "خصائص التاريخ و/أو الوقت المعروضة" -#: ../gkr/seahorse-gkr-keyring-commands.c:121 -msgid "Stored Password" -msgstr "كلمات السر المحفوظة" - -#: ../gkr/seahorse-gkr-keyring-commands.c:122 -msgid "Safely store a password or secret." -msgstr "احفظ كلمة سر أو أمر سري بأمان." - -#: ../gkr/seahorse-gkr-keyring-commands.c:136 -msgid "Couldn't unlock keyring" -msgstr "تعذّر فتح حلقة المفاتيح" - -#: ../gkr/seahorse-gkr-keyring-commands.c:177 -msgid "Couldn't lock keyring" -msgstr "تعذّر إيصاد حلقة المفاتيح" - -#: ../gkr/seahorse-gkr-keyring-commands.c:218 -msgid "Couldn't set default keyring" -msgstr "تعذّر تحديد حلقة المفاتيح المبدئية" - -#: ../gkr/seahorse-gkr-keyring-commands.c:257 -msgid "Couldn't change keyring password" -msgstr "تعذّر تغيير كلمة سر حلقة المفاتيح" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "_Lock" -msgstr "أو_صد" - -#: ../gkr/seahorse-gkr-keyring-commands.c:289 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"أوصد حلقة مفاتيح تخزين كلمات السر بحيث تحتاج إلى كلمة سر رئيسية لفتحها." - -#: ../gkr/seahorse-gkr-keyring-commands.c:290 -msgid "_Unlock" -msgstr "ا_فتح" - -#: ../gkr/seahorse-gkr-keyring-commands.c:291 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"افتح حلقة مفاتيح تخزين كلمات السر بكلمة السر الرئيسية بحيث تتاح للاستخدام." - -#: ../gkr/seahorse-gkr-keyring-commands.c:292 -msgid "_Set as default" -msgstr "اجعلها المب_دئية" - -#: ../gkr/seahorse-gkr-keyring-commands.c:293 -msgid "Applications usually store new passwords in the default keyring." -msgstr "عادة ما تحفظ التطبيقات كلمات السر في حلقة المفاتيح المبدئية." - -#: ../gkr/seahorse-gkr-keyring-commands.c:294 -msgid "Change _Password" -msgstr "_غيّر كلمة السر" - -#: ../gkr/seahorse-gkr-keyring-commands.c:295 -msgid "Change the unlock password of the password storage keyring" -msgstr "غير كلمة سر حلقة مفاتيح تخزين كلمات الير" - -#: ../gkr/seahorse-gkr-keyring-commands.c:360 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "أمتأكد من رغبتك بحذف حلقة مفاتيح كلمات السر '%s'؟" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -msgid "Created:" -msgstr "تاريخ الإنشاء:" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "حلقة مفاتيح" - -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "خصائص حلقة المفاتيح" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "الا_سم:" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "مُنِع الوصول لحلقة المفاتيح" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "رقيب حلقة مفاتيح جنوم غير مشغل" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "لقد فُتحت حلقة المفتيح مُسبقا" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "ليس ثمّة مفتاح" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "تعذر التواصل مع رقيب حلقة المفاتيح" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "العنصر موجود مسبقا" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "خطأ داخلي أثناء محاولة الوصول لحلقة مفاتيح جنوم" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "يحفظ العنصر..." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "يحذف العنصر..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "يحذف حلقة المفاتيح..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "يسرد حلقات المفاتيح" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"لا مفاتيح تعمية لتأدية العملية التي طلبتها. برنامج كلمات السر و مفاتيح " -"التعمية لن يبدأ لذا عليك إنشاء مفتاح أو استيراد واحد." - -#: ../libcryptui/cryptui-key-chooser.c:174 -#: ../libcryptui/cryptui-key-chooser.c:179 -msgid "All Keys" -msgstr "كل المفاتيح" - -#: ../libcryptui/cryptui-key-chooser.c:175 -#: ../libcryptui/cryptui-key-chooser.c:180 -msgid "Selected Recipients" -msgstr "المستلمون المُحددون" - -#: ../libcryptui/cryptui-key-chooser.c:176 -#: ../libcryptui/cryptui-key-chooser.c:181 -msgid "Search Results" -msgstr "نتائج البحث" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:192 -msgid "Search _for:" -msgstr "ا_بحث عن:" - -#: ../libcryptui/cryptui-key-chooser.c:250 -msgid "None (Don't Sign)" -msgstr "لا شيء (لا تُوقِّع)" - -#: ../libcryptui/cryptui-key-chooser.c:263 -#, c-format -msgid "Sign this message as %s" -msgstr "وقع الرسالة كـ %s" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:285 -msgid "_Sign message as:" -msgstr "_وقِّع الرسالة كـ:" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:865 -msgid "Name" -msgstr "الاسم" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1745 -#: ../src/seahorse-key-manager-store.c:877 -msgid "Key ID" -msgstr "معرّف المفتاح" - -#: ../libegg/egg-datetime.c:325 -msgid "Display flags" -msgstr "اعرض الشارات" - -#: ../libegg/egg-datetime.c:326 -msgid "Displayed date and/or time properties" -msgstr "خصائص التاريخ و/أو الوقت المعروضة" - -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "الطور الكسول" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "الطور الكسول لا يُطبّع قيم التاريخ والوقت المدخلة" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "السنة" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "السنة المعروضة" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "الشهر" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "الشهر المعروض" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "اليوم" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "يوم الشهر المعروض" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "الساعة" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "الساعة المعروضة" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "الدقيقة" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "الدقيقة المعروضة" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "الثانية" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "الثانية المعروضة" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "سنة الحد الأدنى" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "جزء السنة من تاريخ الحد الأدنى" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "سنة الحد الأقصى" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "جزء السنة من تاريخ الحد الأقصى" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "شهر الحد الأدنى" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "جزء الشهر من تاريخ الحد الأدنى" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "شهر الحد الأقصى" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "جزء الشهر من تاريخ الحد الأقصى" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "يوم الحد الأدنى" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "جزء اليوم من تاريخ الحد الأدنى" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "يوم الحد الأقصى" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "جزء اليوم من تاريخ الحد الأقصى" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "ساعة الحد الأدنى" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "جزء الساعة من تاريخ الحد الأدنى" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "ساعة الحد الأقصى" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "جزء الساعة من تاريخ الحد الأقصى" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "دقيقة الحد الأدنى" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "جزء الدقيقة من تاريخ الحد الأدنى" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "دقيقة الحد الأقصى" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "جزء الدقيقة من تاريخ الحد الأقصى" -#: ../libegg/egg-datetime.c:433 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "ثانية الحد الأدنى" -#: ../libegg/egg-datetime.c:434 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "جزء الثانية من تاريخ الحد الأدنى" -#: ../libegg/egg-datetime.c:439 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "ثانية الحد الأقصى" -#: ../libegg/egg-datetime.c:440 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "جزء الثانية من تاريخ الحد الأدنى" @@ -919,582 +488,619 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:482 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:0" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "التاريخ" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "أدخِل التاريخ مباشرة" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "اختر تاريخا" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "اختر تاريخا من التقويم" -#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "الوقت" -#: ../libegg/egg-datetime.c:529 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "أدخل الوقت مباشرة" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "اختر وقتا" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "اختر وقتا من القائمة" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:810 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: no" -#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274 -#: ../libegg/egg-datetime.c:1278 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "ص" -#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275 -#: ../libegg/egg-datetime.c:1282 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "م" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:824 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%I02d:%I02d:%I02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:827 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%I02d:%I02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:831 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%I02d:%I02d:%I02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:834 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%I02d:%I02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1190 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%I04d-%I02d-%I02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1255 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%Iu:%Iu:%Iu" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ليس الملف ملف .desktop سليم" +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "عنصر مؤقت أولي" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "إصدارة ملف سطح مكتب غير معروفة '%s'" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "أضِف خادوم مفاتيح" -#: ../libegg/eggdesktopfile.c:968 -#, c-format -msgid "Starting %s" -msgstr "بدء %s" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "نوع خادوم المفاتيح:" -#: ../libegg/eggdesktopfile.c:1110 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "التطبيق لا يقبل مستندات في سطر الأوامر" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "المستضيف:" -#: ../libegg/eggdesktopfile.c:1178 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "خيار إطلاق غير معروف %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1383 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "تعذّر تمرير مسارات المستندات إلى 'Type=Link' في مدخلة سطح المكتب" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "المنفذ الذي يتم الوصول إلى الخادوم عبره." -#: ../libegg/eggdesktopfile.c:1404 -#, c-format -msgid "Not a launchable item" -msgstr "عنصر لا يُطلق" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "إصدارة هذا التطبيق" -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "عطّل الاتصال بمدير الجلسات" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- إعدادات النظام" -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "حدد ملفا يحتوي الإعدادات المحفوظة" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "المساهمات:" -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "FILE" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "كلمات السرِّ ومفاتيح التعمية" -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "حدد معرف إدارة الجلسة" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"فريق عربآيز للترجة http://www.arabeyes.org:\n" +"خالد حسني " -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314 -msgid "ID" -msgstr "المعرّف" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "صفحة مشروع حصان البحر" -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "خيارات إدارة الجلسات:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "اعرض خيارات إدارة الجلسات" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "تعذّر الحذف" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "تعذر تصدير المفاتيح" -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "أضِف خادوم مفاتيح" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "تعذر تصدير البيانات" -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "المستضيف:" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_ملف" -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "نوع خادوم المفاتيح:" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_صدِّر..." -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "المنفذ الذي يتم الوصول إلى الخادوم عبره." +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "صدّر إلى ملف" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "عنصر مؤقت أولي" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_تحرير" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "انسخ للحافظة" -#: ../libseahorse/seahorse-notification.c:576 -#: ../libseahorse/seahorse-notification.c:604 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "لم تستورد مفاتيح" -msgstr[1] "استورد مفتاح" -msgstr[2] "استورد مفتاحين" -msgstr[3] "استوردت مفاتيح" -msgstr[4] "استوردت مفاتيح" -msgstr[5] "استوردت مفاتيح" - -#: ../libseahorse/seahorse-notification.c:580 -#: ../libseahorse/seahorse-notification.c:603 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "لم تستورد مفاتيح" -msgstr[1] "استورد مفتاح واحد" -msgstr[2] "استورد مفتاحين" -msgstr[3] "استورد %i مفاتيح" -msgstr[4] "استورد %i مفتاحا" -msgstr[5] "استورد %i مفتاح" - -#: ../libseahorse/seahorse-notification.c:582 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "لم تستورد مفاتيح لـ" -msgstr[1] "استورد مفتاح واحد لـ" -msgstr[2] "استورد مفتاحين لـ" -msgstr[3] "استوردت مفاتيح لـ" -msgstr[4] "استوردت مفاتيح لـ" -msgstr[5] "استوردت مفاتيح لـ" - -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "رسائل التنبيه" - -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "مفتاح متماثل" - -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "مفتاح علني" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_احذف" -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "مفتاح سري" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "احذف العناصر المختارة" -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "الاعتمادات" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "أظهر خصائص هذا العنصر" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "أظهر خصائص حلقة المفاتيح هذه" -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "الهوية" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "التف_ضيلات" -#: ../libseahorse/seahorse-passphrase.c:200 -msgid "Passphrase" -msgstr "عبارة السر" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "غيّر تفضيلات هذا البرنامج" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_عرض" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_مساعدة" -#: ../libseahorse/seahorse-passphrase.c:203 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "عن هذا البرنامج" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "ال_محتويات" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "اعرض مساعدة حصان البحر" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "صدِّر" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "ادخل كلمة السر أو رمز PIN ل‍: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "كلمة السر:" -#: ../libseahorse/seahorse-passphrase.c:269 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" msgstr "أكِّد:" -#: ../libseahorse/seahorse-prefs.c:62 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "ليس عنوانا سليما لخادوم مفاتيح." -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." msgstr "اتصل بمدير نظامك أو بمدير خادوم المفاتيح لتحصل على مساعدة." -#: ../libseahorse/seahorse-prefs.c:172 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "مسار" -#: ../libseahorse/seahorse-prefs.c:352 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" msgstr "مخصّص" -#: ../libseahorse/seahorse-prefs.c:425 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" msgstr "لا: لا تنشر المفاتيح" #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "ا_جلب المفاتيح آليا من خواديم المفاتيح" - -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "_زامن المفاتيح المعدّلة آليا مع خواديم المفاتيح." - -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "خواديم المفاتيح" - -#: ../libseahorse/seahorse-prefs.xml.h:4 msgid "Preferences" msgstr "التفضيلات" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "ا_بحث عن المفاتيح بواسطة:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "ا_نشر المفاتيح في:" -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "عنوان التقدّم" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "ا_جلب المفاتيح آليا من خواديم المفاتيح" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "_زامن المفاتيح المعدّلة آليا مع خواديم المفاتيح" -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "غير متوفّر" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "خواديم المفاتيح" -#: ../libseahorse/seahorse-util.c:240 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%OG-%Om-%Od" -#: ../libseahorse/seahorse-util.c:516 -msgid "Key Data" -msgstr "بيانات المفتاح" - -#: ../libseahorse/seahorse-util.c:518 -msgid "Multiple Keys" -msgstr "مفاتيح متعددة" - -#: ../libseahorse/seahorse-util.c:774 -msgid "Couldn't run file-roller" -msgstr "تعذّر تشغيل مُأرشف الملفات" - -#: ../libseahorse/seahorse-util.c:780 -msgid "Couldn't package files" -msgstr "تعذّر تحزيم الملفات" - -#: ../libseahorse/seahorse-util.c:781 -msgid "The file-roller process did not complete successfully" -msgstr "لم تُكمل عملية مُأرشف الملفات بنجاح" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:957 -msgid "All key files" -msgstr "كل ملفات المفاتيح" - -#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "كل الملفات" - -#: ../libseahorse/seahorse-util.c:1009 -msgid "Archive files" -msgstr "ملفات الأرشيفات" - -#: ../libseahorse/seahorse-util.c:1079 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"يوجد بالفعل ملف بهذا الاسم.\n" -"\n" -"أترغب في استبداله بملف جديد؟" - -#: ../libseahorse/seahorse-util.c:1082 -msgid "_Replace" -msgstr "است_بدل" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1133 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "مجهول" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1139 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "أبدًا" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1146 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "هامشي" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1152 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "كامل" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1158 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "نهائي" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "معطل" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1347 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "منقوض" -#: ../libseahorse/seahorse-widget.c:480 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "تعذّر عرض المساعدة: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "تاريخ الانتهاء:" +msgid "Never E_xpires" +msgstr "لا ينت_هي أبدا" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "ولِّد مفتاح فرعي جديد" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "إذا كان المفتاح لا ينتهي أبدًا" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "نوع ال_مفتاح:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_طول المفتاح:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "نوع ال_مفتاح:" +msgid "Expiration Date:" +msgstr "تاريخ الانتهاء:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "طول المفتاح" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "لا ينت_هي أبدا" +msgid "Generate a new subkey" +msgstr "ولِّد مفتاح فرعي جديد" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "أضف معرّف المستخدم" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "أنشئ معرّف مستخدم جديد" +msgid "Must be at least 5 characters long" +msgstr "يجب أن يكون طوله 5 محارف على الأقل" + +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "عنوان بريد إلكتروني اختياري" + +#: ../pgp/seahorse-add-uid.xml.h:4 +msgid "Optional comment describing key" +msgstr "تعليق اختياري يصف المفتاح" -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 msgid "Full _Name:" msgstr "الاسم الكامل:" -#: ../pgp/seahorse-add-uid.xml.h:4 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 +msgid "_Email Address:" +msgstr "_عنوان البريد الإلكتروني:" + +#: ../pgp/seahorse-add-uid.xml.h:8 msgid "Key Co_mment:" msgstr "_تعليق المُفتاح:" -#: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "يجب أن يكون طوله 5 محارف على الأقل" - -#: ../pgp/seahorse-add-uid.xml.h:6 -msgid "Optional comment describing key" -msgstr "تعليق اختياري يصف المفتاح" - -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "عنوان بريد إلكتروني اختياري" - -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 -msgid "_Email Address:" -msgstr "_عنوان البريد الإلكتروني:" +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "أنشئ معرّف مستخدم جديد" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_غيِّر" +msgid "_Never expires" +msgstr "لا _ينتهي أبدا" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "انقض المفتاح" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "لا _ينتهي أبدا" +msgid "C_hange" +msgstr "_غيِّر" -#: ../pgp/seahorse-gpgme-add-subkey.c:147 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "تعذّر إضافة مفتاح فرعي" -#: ../pgp/seahorse-gpgme-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "أضِف مفتاحا فرعيا إلى %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "‏DSA (توقيع فقط)" -#: ../pgp/seahorse-gpgme-add-subkey.c:190 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "الجمل (تعمية فقط)" -#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "‏RSA (توقيع فقط)" -#: ../pgp/seahorse-gpgme-add-subkey.c:202 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "‏RSA (تعمية فقط)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "تعذّر إضافة معرّف المستخدم" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "أضف معرّف المستخدم إلى %s" -#: ../pgp/seahorse-gpgme.c:72 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "فشل استخراج التعمية. ؤبما لا تملك مفتاح التعمية." -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "أُلغيت العملية" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "تاريخ انتهاء غير سليم" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "يجب أن يكون تاريخ انتهاء الصلاحية في المستقبل" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "تعذّر تغيير تاريخ الانتهاء" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "انتهاء الصلاحية: %s" -#: ../pgp/seahorse-gpgme-generate.c:79 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "مفاتيح متعددة" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "بيانات المفتاح" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "مفاتيح PGP محصّنة" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "مفاتيح PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "مفتاح PGP" -#: ../pgp/seahorse-gpgme-generate.c:80 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "يُستُخدم لتعمية البريد والملفات" -#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:117 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "خوارزمية الجمل للتوقيع الإلكتروني" -#: ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "تعذّر توليد مفتاح PGP" -#: ../pgp/seahorse-gpgme-generate.c:195 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "عبارة السر لمفتاح PGP الجديد" -#: ../pgp/seahorse-gpgme-generate.c:196 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "أدخل عبارة السر لمفتاحك الجديد مرتين." -#: ../pgp/seahorse-gpgme-generate.c:205 -msgid "Couldn't generate key" -msgstr "تعذّر توليد المفتاح" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" -#: ../pgp/seahorse-gpgme-generate.c:207 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "يجري توليد المفتاح" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "أمتأكد أنك تريد حذف %s نهائيا؟" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "أمتأكد من رغبتك بحذف %d مفاتيح نهائيا؟" +msgstr[1] "أمتأكد من رغبتك بحذف مفتاح واحد نهائيا؟" +msgstr[2] "أمتأكد من رغبتك بحذف مفتاحين نهائيا؟" +msgstr[3] "أمتأكد من رغبتك بحذف %d مفاتيح نهائيا؟" +msgstr[4] "أمتأكد من رغبتك بحذف %d مفتاحا نهائيا؟" +msgstr[5] "أمتأكد من رغبتك بحذف %d مفتاح نهائيا؟" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "كلمة السر خطأ" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "هذه المرة الثالثة التي تدخل فيها كلمة سر خطأ. أعد المحاولة من فضلك." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "عبارة السر خاطئة." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "أدخل عبارة سر جديدة لـ'%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "أدخل عبارة السر لـ'%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "أدخل عبارة سر جديدة" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "أدخل عبارة السر" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "عبارة السر" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "لم تُحمّل أي مفاتيح" +msgstr[1] "حُمِّل مفتاح واحد" +msgstr[2] "حُمِّل مفتاحين" +msgstr[3] "حُمِّلت %Id مفاتيح" +msgstr[4] "حُمِّل %Id مفتاحا" +msgstr[5] "حُمِّل %Id مفتاح" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"بيانات غير صالحة (تفتقد UID). قد يكون هذا بسبب حاسوب ضُبط تاريخه إلى تاريخ " +"مستقبلي أو لفقد التوقيع الذاتي." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "مفاتيح GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "‏GnuPG: دليل حلقة المفاتيح المبدئي" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1502,7 +1108,7 @@ "The recommended size for a photo on your key is %d x %d pixels." msgstr "" "الصورة كبيرة جدا\n" -"المقاس المنصوح به لمفتاحك هو %Id × %Id بكسِل" +"المقاس المنصوح به لمفتاحك هو %Id × %Id بكسِل." #: ../pgp/seahorse-gpgme-photos.c:78 msgid "_Don't Resize" @@ -1528,68 +1134,76 @@ msgid "All JPEG files" msgstr "كل ملفات JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "كل الملفات" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "اختر صورة لتُضاف إلى المفتاح" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +msgid "Couldn't prepare photo" +msgstr "تعذّر تجهيز الصورة" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "تعذّر إضافة الصورة" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "تعذّر تحميل الملف. قد يكون بتنسيق غير صالح" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "أواثق من رغبتك في حذف الصورة الحالية من المفتاح؟" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "تعذّر حذف الصورة" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "تعذّر نقض المفتاح الفرعي" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "انقض: %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "لا سبب" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "لا سبب لسحب المفتاح" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "معرّض للمخاطِر" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "لقد تعرّض هذا المفتاح للخطر" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "أُلغِي" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "أُلغِي المفتاح" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "غير مُستخدَم" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "لم يعد هذا المفتاح مًستخدما بعد الآن" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " @@ -1598,11 +1212,15 @@ "أنت على وشك إضافة %s كناقض لـ %s. لا يمكن التراجع في هذا! أواثق من رغبتك في " "المتابعة؟" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "تعذّر إضافة الناقض" -#: ../pgp/seahorse-gpgme-sign.c:99 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "أفهم أن هذا المفتاح السري سيحذف للأبد." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1611,561 +1229,586 @@ "هذا المفتاح وقعه سابقا\n" "\"%s\"" -#: ../pgp/seahorse-gpgme-sign.c:103 +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "تعذّر توقيع المفتاح" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "لا توجد مفاتيح قابلة للتوقيع" -#: ../pgp/seahorse-gpgme-sign.c:158 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "لا تملك مفتاح PGP شخصي يُمكن استخدامه ليبيِّن ثقتك في هذا المفتاح." -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "عبارة السر خاطئة." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "الجمل" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "أدخل عبارة سر جديدة لـ'%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "البحث لم يكن محددًا بما فيه الكفاية. وجد الخادوم '%s' مفاتيح كثيرة جدًا." -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "أدخل عبارة السر لـ'%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "تعذّر التواصل مع الخادوم '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "أدخل عبارة سر جديدة" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "خادوم مفاتيح HTTP" -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "أدخل عبارة السر" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "تعذّر استيراد المفاتيح" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "يجري استيراد المفاتيح من خادوم المفاتيح" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_بعيد" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "أغلق هذه النافذة" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "اع_ثر على مفاتيح بعيدة..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "ابحث عن مفاتيح في خادوم المفاتيح" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "ا_ستورد" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "استورد المفاتيح المُنتقاة لحلقة المفاتيح المحليّة" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "المفاتيح البعيدة" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "لم تُحمّل أي مفاتيح" -msgstr[1] "حُمِّل مفتاح واحد" -msgstr[2] "حُمِّل مفتاحين" -msgstr[3] "حُمِّلت %Id مفاتيح" -msgstr[4] "حُمِّل %Id مفتاحا" -msgstr[5] "حُمِّل %Id مفتاح" +msgid "Remote Keys Containing '%s'" +msgstr "المفاتيح البعيدة التي تحتوي على '%s'" -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "يجري تحميل المفاتيح..." +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "فشل البحث عن المفاتيح." -#: ../pgp/seahorse-gpgme-source.c:820 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "اعثر على مفاتيح بعيدة" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"بيانات غير صالحة (تفتقد UID). قد يكون هذا بسبب حاسوب ضُبط تاريخه إلى تاريخ " -"مستقبلي أو لفقد التوقيع الذاتي." - -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544 -msgid "Importing Keys" -msgstr "يستورد المفاتيح" - -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "يحمّل المفاتيح" +"سيُعثر هذا على مفاتيح الآخرين عبى الإنترنت. يُمكن بعد ذلك استيراد هذه المفاتيح " +"إلى حلقة مفاتيحك المحليّة." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "الجمل" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "ا_بحث عن المفاتيح التي تحتوي: " -#: ../pgp/seahorse-hkp-source.c:387 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "البحث لم يكن محددًا بما فيه الكفاية. وجد الخادوم '%s' مفاتيح كثيرة جدًا." +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "خواديم المفاتيح:" -#: ../pgp/seahorse-hkp-source.c:389 -#, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "تعذّر التواصل مع الخادوم '%s': %s" +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "المفاتيح المُشاركة القريبة منِّي" -#: ../pgp/seahorse-hkp-source.c:671 -msgid "Searching for keys..." -msgstr "يبحث عن المفاتيح..." - -#: ../pgp/seahorse-hkp-source.c:759 -msgid "Uploading keys..." -msgstr "يرفع المفاتيح..." - -#: ../pgp/seahorse-hkp-source.c:857 -msgid "Retrieving keys..." -msgstr "يجلب المفاتيح..." - -#: ../pgp/seahorse-hkp-source.c:987 -#, c-format -msgid "Searching for keys on: %s" -msgstr "يبحث عن المفاتيح على: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154 -#: ../pgp/seahorse-ldap-source.c:668 -#, c-format -msgid "Connecting to: %s" -msgstr "يتصل بـ: %s" +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "مكان البحث:" -#: ../pgp/seahorse-hkp-source.c:1184 -msgid "HTTP Key Server" -msgstr "خادوم مفاتيح HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "ا_بحث" -#: ../pgp/seahorse-ldap-source.c:459 -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "تعذّر التواصل مع '%s': %s" +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "تعذر نشر المفاتيح للخادوم" -#: ../pgp/seahorse-ldap-source.c:641 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't resolve address: %s" -msgstr "تعذّر حل العنوان: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "تعذّر الحصول على المفاتيح من الخادوم: %s" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Resolving server address: %s" -msgstr "يجري حل عنوان الخادوم: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "لم تُحدّد مفاتيح للمُزامنة" +msgstr[1] "حُدِّد مفتاح واحد للمُزامنة" +msgstr[2] "حُدِّد مفتاحين للمُزامنة" +msgstr[3] "حُدِّدت %Id مفاتيح للمُزامنة" +msgstr[4] "حُدِّد %Id مفتاحًا للمُزامنة" +msgstr[5] "حُدِّد %Id مفتاح للمُزامنة" -#: ../pgp/seahorse-ldap-source.c:955 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "يبحث عن المفاتيح التي تحتوي '%s'..." +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "يجري مزامنة المفاتيح..." -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "يبحث عن معرّف المفتاح '%s'..." +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "زامِن المفاتيح" -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "يجلب المفاتيح البعيدة..." +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"سيُنشر هذا المفاتيح في حلقة مفاتيحك لتتوفّر للآخرين ليستخدموها. أيضا ستحصل على " +"أي تغييرات قام بها الآخرون منذ تلقيّت مفاتيحهم." -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "يرسل المفاتيح لخادوم المفاتيح..." +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"سيحصل هذا على أي تغييرات قام با الآخرون منذ تلقّيت مفاتيحهم. لم يُحدد أي خادوم " +"مفاتيح للنشر، لذا لن تتوفّر مفاتيحك للآخرون." -#: ../pgp/seahorse-ldap-source.c:1423 -msgid "LDAP Key Server" -msgstr "خادوم مفاتيح LDAP" +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_خواديم المفاتيح" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "_وقّع المفتاح..." - -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "وقِّع المفتاح العلني" +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_زامِن" -#: ../pgp/seahorse-pgp-commands.c:171 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "أمتأكد أنك تريد حذف %s نهائيا؟" +msgid "Couldn't communicate with '%s': %s" +msgstr "تعذّر التواصل مع '%s': %s" -#: ../pgp/seahorse-pgp-commands.c:176 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "أمتأكد من رغبتك بحذف مفاتيح و معرّفات %d نهائيا؟" +msgid "Connecting to: %s" +msgstr "يتصل بـ: %s" -#: ../pgp/seahorse-pgp-commands.c:178 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "أمتأكد من رغبتك بحذف مفاتيح %d نهائيا؟" +msgid "Couldn't resolve address: %s" +msgstr "تعذّر حل العنوان: %s" -#: ../pgp/seahorse-pgp-commands.c:180 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "أمتأكد من رغبتك بحذف معرّفات %d نهائيا؟" +msgid "Resolving server address: %s" +msgstr "يجري حل عنوان الخادوم: %s" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "خيارات المفتاح ال_متقدّمة" +#: ../pgp/seahorse-ldap-source.c:1447 +msgid "LDAP Key Server" +msgstr "خادوم مفاتيح LDAP" -#: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "يسمح لك مفتاح PGP بتعمية البريد الإلكتروني أو الملفات للآخرين." +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_زامن وانشر المفاتيح..." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "الخوازميات هنا" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "انشر و/أو زامن مفاتيحك مع من على الخط." -#: ../pgp/seahorse-pgp-generate.xml.h:4 +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "مفاتيح PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "مفاتيح PGP لتعمية البريد والملفات" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 msgid "C_reate" msgstr "أن_شيء" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "تاريخ ا_نتهاء الصلاحية" - -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "Encryption _Type:" -msgstr "_نوع التعمية:" - -#: ../pgp/seahorse-pgp-generate.xml.h:8 +#: ../pgp/seahorse-pgp-generate.xml.h:2 msgid "Generate a new key" msgstr "ولِّد مفتاحًا جديدًا" -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "Key _Strength (bits):" -msgstr "شدة المفتاح (ثنائيات):" +#: ../pgp/seahorse-pgp-generate.xml.h:3 +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "يسمح لك مفتاح PGP بتعمية البريد الإلكتروني أو الملفات للآخرين." -#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_تعليق:" + +#: ../pgp/seahorse-pgp-generate.xml.h:8 msgid "Ne_ver Expires" msgstr "لا تنتهي صلاحيته أ_بدًا" +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 +msgid "Encryption _Type:" +msgstr "_نوع التعمية:" + +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 +msgid "Key _Strength (bits):" +msgstr "شدة المفتاح (ثنائيات):" + #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "مفتاح PGP جديد" +msgid "E_xpiration Date:" +msgstr "تاريخ ا_نتهاء الصلاحية:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_تعليق:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "خيارات المفتاح ال_متقدّمة" -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Private PGP Key" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" msgstr "مفتاح PGP سري" -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Public PGP Key" -msgstr "مفتاح PGP علني" - -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349 -msgid "Expired" -msgstr "منتهي الصلاحية" +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "مفتاح PGP" -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "تعذّر تغيير معرّف المستخدم الأوليّ" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "أمتأكدٌ أنّك تريد حذف معرّف المستخدم '%s' نهائيا؟" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "تعذر حذف معرّف المستخدم" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1464 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[مجهول]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1742 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "اسم/بريد إلكتروني" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "معرّف التوقيع" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "تعذّر تغيير الصورة الأوّلية" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(مجهول)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "انتهت صلاحية هذا المفتاح في: %s" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "الاسم" + +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "أمتأكدٌ أنّك تريد حذف المفتاح الفرعي %Id من %s نهائيًا؟" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "تعذّر حذف المفتاح الفرعي" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1427 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "تعذّر تغيير الثقة" -#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290 -#: ../ssh/seahorse-ssh-key-properties.c:168 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "تعذّر تصدير المفتاح إلى \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1035 -#: ../ssh/seahorse-ssh-key-properties.c:193 -msgid "Export Complete Key" -msgstr "صدِّر المفتاح كاملًا" - -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:215 -msgid "Couldn't export key." -msgstr "تعذر تصدير المفتاح." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "تعذر تصدير المفتاح" -#: ../pgp/seahorse-pgp-key-properties.c:1267 -#: ../pgp/seahorse-pgp-key-properties.c:1356 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "أبدًا" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1317 -#: ../src/seahorse-key-manager-store.c:896 +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "المعرّف" + +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "النّوع" -#: ../pgp/seahorse-pgp-key-properties.c:1320 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "تاريخ الإنشاء" -#: ../pgp/seahorse-pgp-key-properties.c:1323 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "تاريخ انتهاء الصلاحية" -#: ../pgp/seahorse-pgp-key-properties.c:1326 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "الحالة" -#: ../pgp/seahorse-pgp-key-properties.c:1329 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "الشدة" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "منتهي الصلاحية" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "جيّد" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "إجراءات" +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "معرّف المفتاح" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "تعليق:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "تواريخ" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "البريد الإلكتروني:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "البصمة" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "معرّف المفتاح:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "أبدًا" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "أسماء وتوقيعات المفاتيح" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "تم نقض هذا المفتاح" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "الاسم:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "لقد نُقِض هذا المفتح من قِبَل مالِكه. لم يعد من الممكن استخدامه." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -msgid "Photo " -msgstr "صورة " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "انتهت صلاحية هذا المفتاح" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -msgid "Technical Details" -msgstr "تفاصيل تقنيّة" +msgid "Add a photo to this key" +msgstr "أضِف صورة لهذا المفتاح" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has been revoked" -msgstr "تم نقض هذا المفتاح" +msgid "Remove this photo from this key" +msgstr "ازل هذه الصورة من هذا المفتاح" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -msgid "This key has expired" -msgstr "انتهت صلاحية هذا المفتاح" +msgid "Make this photo the primary photo" +msgstr "اجعل هذه الصورة الأوليّة" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "النوع:" +msgid "Go to previous photo" +msgstr "إذهب إلى الصورة السابقة" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "الاستخدام:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "إذهب إلى الصورة التالية" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "_Subkeys" -msgstr "مفاتيح _فرعية" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "صورة " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add" -msgstr "أضِف" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -msgid "Add a photo to this key" -msgstr "أضِف صورة لهذا المفتاح" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "معرّف المفتاح:" +#. Name of key, usually a persons name #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "غيِّر _عبارة السر" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "الاسم:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "البريد الإلكتروني:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Decrypt files and email sent to you." -msgstr "استخرج تعمية الملفات والبريد الإلكتروني المرسل إليك." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "تعليق:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -msgid "Delete" -msgstr "احذف" +#. To translators: This is the noun not the verb. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "الاستخدام:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -msgid "Expire" -msgstr "انهِ صلاحيّته" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "النوع:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Expires:" -msgstr "تنتهي صلاحيته:" +msgid "Decrypt files and email sent to you." +msgstr "استخرج تعمية الملفات والبريد الإلكتروني المرسل إليك." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 -msgid "Export" -msgstr "صدِّر" +msgid "Private PGP Key" +msgstr "مفتاح PGP سري" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "غيِّر _عبارة السر" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to next photo" -msgstr "إذهب إلى الصورة التالية" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "المالك" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -msgid "Go to previous photo" -msgstr "إذهب إلى الصورة السابقة" +msgid "Key Names and Signatures" +msgstr "أسماء وتوقيعات المفاتيح" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -msgid "Key ID:" -msgstr "معرّف المفتاح:" +msgid "Primary" +msgstr "أوّلي" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +msgid "Sign" +msgstr "وقِّع" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 -msgid "Make this photo the primary photo" -msgstr "ا_جعل هذه الصورة الصورة الأوليّة" +msgid "Delete" +msgstr "احذف" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -msgid "Names and Signatures" -msgstr "أسماء وتوقيعات" +msgid "_Add Name" +msgstr "أ_ضف اسمًا" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Never" -msgstr "أبدًا" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -msgid "Override Owner _Trust:" -msgstr "تخطّى _ثقة المالِك:" +msgid "Revoke" +msgstr "انقض" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Owner" -msgstr "المالك" +msgid "Names and Signatures" +msgstr "أسماء وتوقيعات" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Primary" -msgstr "أوّلي" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "معرّف المفتاح:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Remove this photo from this key" -msgstr "ازل هذه الصورة من هذا المفتاح" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "الشدة:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Revoke" -msgstr "انقض" +msgid "Technical Details" +msgstr "تفاصيل تقنيّة" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -msgid "Sign" -msgstr "وقِّع" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "Strength:" -msgstr "الشدة:" +msgid "Fingerprint" +msgstr "البصمة" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "لقد نُقِض هذا المفتح من قِبَل مالِكه. لم يعد من الممكن استخدامه." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "تنتهي صلاحيته:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 -msgid "_Add Name" -msgstr "أ_ضف اسمًا" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "تواريخ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "تخطّى _ثقة المالِك:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_صدِّر المفتاح كاملًا:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "التواريخ:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "البصمة:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +msgid "Actions" +msgstr "إجراءات" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "بيِّن الثقة:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "أضِف" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "Your trust of this key" -msgstr "ثقتك في هذا المفتاح" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "انهِ صلاحيّته" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_Other Names:" -msgstr "أسما_ء أخرى:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "مفاتيح _فرعية" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_People who have signed this key:" -msgstr "الأشخاص الذين وقّعوا هذا المفتاح:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "هامشيا" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Encrypt files and email to the key's owner " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 +msgid "Fully" +msgstr "كليا" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 +msgid "Ultimately" +msgstr "نهائيا" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +msgid "Encrypt files and email to the key's owner" msgstr "عمِّ ملفات وأرسلها إلى مالك المفتاح" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "مفتاح PGP علني" + +#. Names set on the PGP key. #: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 -msgid "Fully" -msgstr "كليا" +msgid "_Other Names:" +msgstr "أسما_ء أخرى:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "ثقتك في هذا المفتاح" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "تحدد ثِقتك يدويا في لِسان التفاصيل." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "أثِق بتوقيع '%s' على المفاتيح الأخرى" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -2174,45 +1817,48 @@ "إذا كنت تثق في أن الشخص الذي يمتلك هذا المفتاح هو '%s'، وقّع هذا " "المفتاح:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_وقِّع هذا المفتاح" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" -msgstr "إذا لم تعد تثق في أن '%s' يمتلك هذا المفتاح؛ انقض توقيعك." +msgstr "إذا لم تعد تثق في أن '%s' يمتلك هذا المفتاح؛ انقض توقيعك:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Marginally" -msgstr "هامشيا" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "ا_نقض التوقيع" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -#: ../src/seahorse-key-manager-store.c:890 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "الأشخاص الذين وقّعوا هذا المفتاح:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "لا تظهر _سوى توقيعات من أثق بهم" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 msgid "Trust" msgstr "الثقة" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 -msgid "Ultimately" -msgstr "نهائيا" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "You _Trust the Owner:" -msgstr "_تثِق في المالك:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "البصمة:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "Your trust is manually specified on the Details tab." -msgstr "تحدد ثِقتك يدويا في لِسان التفاصيل." - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Only display the signatures of people I trust" -msgstr "لا تظهر _سوى توقيعات من أثق بهم" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Revoke Signature" -msgstr "ا_نقض التوقيع" +msgid "Dates:" +msgstr "التواريخ:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgid "_Sign this Key" -msgstr "_وقِّع هذا المفتاح" +msgid "Indicate Trust:" +msgstr "بيِّن الثقة:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_تثِق في المالك:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -2220,78 +1866,82 @@ msgstr "المفتاح الفرعي %Id من %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "وصف إختياري للسحب" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "أَبْ_طِل" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "سبب سحب المفتاح" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "ال_سبب:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "وصف إختياري للسحب" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "أَبْ_طِل" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "لا توجد مفاتيح PGP شخصية يمكن استخدامها لتوقيع الملف أو الرسالة." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_وقّع الرسالة بالمفتاح:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "ما مدى حرصك عند فحص هذا المُفتاح؟" +msgid "Sign Key" +msgstr "وقّع المفتاح" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "كيف سيرى الآخرون هذا التوقيع:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "بالتوقيع تبيِّن أنك تثق في انتماء هذا المفتاح إلى:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "وقع المفتاح باسم:" +msgid "Key Name" +msgstr "اسم المفتاح" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"معتاد: يعني أنك قمت بتحقق عادي من أن هذا المفتاح ملك للشخص الذي يدِّعي " -"ملكيته. مثلا، قد تقرأ بصمة المفتاح مع المالك عبر الهاتف." +msgid "How carefully have you checked this key?" +msgstr "ما مدى حرصك عند فحص هذا المُفتاح؟" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "اسم المفتاح" +msgid "_Not at all" +msgstr "_بتاتا" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_معتاد" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "بحر_ص شديد" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." msgstr "" -"بتاتًا: يعني أنك تؤمن بأن المفتاح ملك للشخص الذي يدعي ملكيته لكنك لم " +"بتاتًا: يعني أنك تؤمن بأن المفتاح ملك للشخص الذي يدعي ملكيته لكنك لم " "تستطع أو لم تتحقق من هذه الحقيقة." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"معتاد: يعني أنك قمت بتحقق عادي من أن هذا المفتاح ملك للشخص الذي يدِّعي " +"ملكيته. مثلا، قد تقرأ بصمة المفتاح مع المالك عبر الهاتف." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." msgstr "" "بحرص شديد: اختر هذا إذا كنت واثقا بشكل تام من أن هذا المفتاح أصيل." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "بالتوقيع تبيِّن أنك تثق في انتماء هذا المفتاح إلى:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "يمكنني _نقض هذا التوقيع في وقت لاحق." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "وقّع المفتاح" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -2303,201 +1953,311 @@ "العناوين تخصّ المالك." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_معتاد" +msgid "How others will see this signature:" +msgstr "كيف سيرى الآخرون هذا التوقيع:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_بتاتا" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "يمكن للآ_خرين رؤية هذا التوقيع" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "يمكنني _نقض هذا التوقيع في وقت لاحق." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_وقِّع" +msgid "Sign key as:" +msgstr "وقع المفتاح باسم:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "ال_مُوقّع:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "بحر_ص شديد" +msgid "_Sign" +msgstr "_وقِّع" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_وقّع الرسالة بالمفتاح:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "يصدّر البيانات" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "يجلب البيانات" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "يستورد البيانات" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "يرسل البيانات" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "غير متوفّر" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "شهادة ومفتاح شخصييْن" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "شهادة شخصية" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "شهادة" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "أمتأكد من رغبتك بحذف الشهادة '%s'؟" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "الشّهادة (بترميز DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "الشّهادات" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "شهادات X.509 والمفاتيح المتعلقة بها" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "أمتأكد من رغبتك بحذف %d معرّفات نهائيا؟" +msgstr[1] "أمتأكد من رغبتك بحذف معرّف واحد نهائيا؟" +msgstr[2] "أمتأكد من رغبتك بحذف معرّفين نهائيا؟" +msgstr[3] "أمتأكد من رغبتك بحذف %d معرّفات نهائيا؟" +msgstr[4] "أمتأكد من رغبتك بحذف %d معرّفا نهائيا؟" +msgstr[5] "أمتأكد من رغبتك بحذف %d معرّف نهائيا؟" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "تعذّر توليد المفتاح السري" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "أنشئ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "مفتاح سري" -#: ../pkcs11/seahorse-pkcs11-commands.c:111 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "أمتأكد من رغبتك بحذف %d شهادة؟" -msgstr[1] "أمتأكد من رغبتك بحذف شهادة واحدة؟" -msgstr[2] "أمتأكد من رغبتك بحذف شهادتين؟" -msgstr[3] "أمتأكد من رغبتك بحذف %d شهادات؟" -msgstr[4] "أمتأكد من رغبتك بحذف %d شهادة؟" -msgstr[5] "أمتأكد من رغبتك بحذف %d شهادة؟" +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "يستخدم لطلب الشهادات" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "أنشئ مفتاحًا سريا جديدًا" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "العنوان:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "محفوظ في:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "أفهم أن هذا المفتاح سيحذف للأبد." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "بلا اسم" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "فشل تصدير الشهادة" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "تعذّر الحذف" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_صدِّر" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "صدّر الشهادة" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "احذف هذه الشهادة أو المفتاح" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "ا_طلب شهادة" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "أنشئ ملف طلب شهادة لهذا المفتاح" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "تعذّر حفظ طلب الشهادة" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "احفظ طلب الشهادة" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "طلب شهادة" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "طلب بترميز PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "تعذّر إنشاء طلب الشهادة" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "أنشئ ملف طلب شهادة." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "لم يوضع اسم شائع (CN) في طلب الشهادة." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "الا_سم (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "مفتاح سري بلا اسم" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "غيّر عبارة السر" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "أ_كد عبارة السر:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "_عبارة سر جديدة:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "أكِّد عبارة السر الجديدة" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "_عبارة سر جديدة:" +msgid "Con_firm Passphrase:" +msgstr "أ_كد عبارة السر:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "أدِر كلمات سرّك ومفاتيح تعميتك" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862 -msgid "Passwords and Encryption Keys" -msgstr "كلمات السرِّ ومفاتيح التعمية" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "تابع" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "ا_ختر نوع العنصر الذي ترغب بإنشائه" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_تابِع" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "أن_شئ جديدًا..." - -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "لا مفاتيح محددة" -msgstr[1] "مفتاح واحد محدد" -msgstr[2] "مفتاحين محددين" -msgstr[3] "%Id مفاتيح محددة" -msgstr[4] "%Id مفتاحا محددا" -msgstr[5] "%Id مفتاح محدد" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "فشل الاستيراد" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "استورد" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "البيانات التي ستُستورَد" -#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470 -#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458 -msgid "Couldn't import keys" -msgstr "تعذّر استيراد المفاتيح" - -#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463 -msgid "Imported keys" -msgstr "المفاتيح المستوردة" - -#: ../src/seahorse-key-manager.c:464 -msgid "Importing keys" -msgstr "يستورد المفاتيح" - -#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "استورد مفتاح" -#: ../src/seahorse-key-manager.c:533 -msgid "Unrecognized key type, or invalid data format" -msgstr "نوع مفتاح لم يُتعرّف عليه" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "كل ملفات المفاتيح" -#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245 -msgid "_Remote" -msgstr "_بعيد" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "النص المُفلت" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "نص الحافظة" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_جديد" -#: ../src/seahorse-key-manager.c:733 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "أغلق هذا البرنامج" -#: ../src/seahorse-key-manager.c:734 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_جديد..." -#: ../src/seahorse-key-manager.c:735 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "أنشئ مفتاحا أو عنصرا جديدا" -#: ../src/seahorse-key-manager.c:736 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "أضف مفتاحا أو عنصرا جديدا" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "ا_ستورد..." -#: ../src/seahorse-key-manager.c:737 +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "استورد من ملف" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "استورد من الحافظة" -#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255 -msgid "_Find Remote Keys..." -msgstr "اع_ثر على مفاتيح بعيدة..." - -#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256 -msgid "Search for keys on a key server" -msgstr "ابحث عن مفاتيح في خادوم المفاتيح" - -#: ../src/seahorse-key-manager.c:746 -msgid "_Sync and Publish Keys..." -msgstr "_زامن وانشر المفاتيح..." +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "ب_حلقة المفاتيح:" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "أظهر شريطا جانبيا يسرد حلقات المفاتيح" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "أظهر ال_خاص" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "أظهر المفاتيح والشهادات وكلمات السر الخاصة" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "أظهر المو_ثوق" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "أظهر المفاتيح والشهادات وكلمات السر الموثوقة" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "أظهر ال_كل" -#: ../src/seahorse-key-manager.c:747 -msgid "Publish and/or synchronize your keys with those online." -msgstr "انشر و/أو زامن مفاتيحك مع من على الخط." +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "أظهر المفاتيح والشهادات وكلمات السر" -#: ../src/seahorse-key-manager.c:752 -msgid "T_ypes" -msgstr "الأ_نواع" - -#: ../src/seahorse-key-manager.c:752 -msgid "Show type column" -msgstr "أظهر عمود النوع" - -#: ../src/seahorse-key-manager.c:754 -msgid "_Expiry" -msgstr "انتهاء ال_صلاحية" - -#: ../src/seahorse-key-manager.c:754 -msgid "Show expiry column" -msgstr "اظهر عمود انتهاء الصلاحية" - -#: ../src/seahorse-key-manager.c:756 -msgid "_Trust" -msgstr "ال_ثقة" - -#: ../src/seahorse-key-manager.c:756 -msgid "Show owner trust column" -msgstr "اظهر عمود ثقة المالك" - -#: ../src/seahorse-key-manager.c:758 -msgid "_Validity" -msgstr "ال_صلاحية" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show validity column" -msgstr "اظهر عمود الصلاحية" - -#: ../src/seahorse-key-manager.c:931 -msgid "Filter:" -msgstr "مرشِّح:" +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "رشّح" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -2507,541 +2267,903 @@ msgid "Generate a new key of your own: " msgstr "ولِّد مفتاحا جديدا لك:" -#: ../src/seahorse-key-manager.xml.h:3 +#: ../src/seahorse-key-manager.xml.h:4 msgid "Import existing keys from a file:" msgstr "استورد مفاتيح موجودة من ملف:" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "مفاتيحي ال_شخصية" - #: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "مفاتيح أ_خرى" - -#: ../src/seahorse-key-manager.xml.h:6 msgid "To get started with encryption you will need keys." msgstr "لتبدأ بالتعمية ستحتاج مفاتيح." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522 -msgid "_Import" -msgstr "ا_ستورد" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "تعذّر الإيصاد" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "تعذّر الفتح" -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_كلمات السر" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "أو_صد" -#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256 -msgid "Couldn't export keys" -msgstr "تعذر تصدير المفاتيح" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "ا_فتح" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "ال_خصائص" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "اضبط مفتاح الصدفة الآ_منة..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"أرسل مفتاح الصدفة الآمنة العلني لجهاز آخر، لتُفعِّل الولوج باستخدام هذا المفتاح." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "عبارة سر لمفتاح الصدفة الآمنة:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "عبارة سر المفتاح القديمة" + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "أدخل عبارة السر القديمة لـ: %s" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "عبارة سر مفتاح جديدة" + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "أدخل عبارة السر الجديدة لـ: %s" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "أدخل عبارة السر الجديدة مرة أخرى: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "صدفة آمنة" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "يُستخدم للاتصال بالحواسيب الأخرى بأمان" + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "أمتأكد من رغبتك في حذف مفتاح الصدفة الآمنة '%s'؟" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "أمتأكد من رغبتك بحذف %d مفاتيح الصدفة الآمنة؟" +msgstr[1] "أمتأكد من رغبتك بحذف مفتاح صدفة آمنة؟" +msgstr[2] "أمتأكد من رغبتك بحذف مفتاحيْ صدفة آمنة؟" +msgstr[3] "أمتأكد من رغبتك بحذف %d مفاتيح صدفة آمنة؟" +msgstr[4] "أمتأكد من رغبتك بحذف %d مفتاح صدفة آمنة؟" +msgstr[5] "أمتأكد من رغبتك بحذف %d مفتاح صدفة آمنة؟" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "مفتاح صدفة آمنة" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "مفتاح صدفة آمنة سري" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "مفتاح صدفة آمنة علني" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "لا ملف مفتاح عام متوفر لهذا المفتاح." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "مفتاح صدفة آمنة" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "يستخدم للنفاذ لحواسيب أخرى (مثلا: عبر الطرفية)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "تعذّر توليد مفتاح صدفة آمنة" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "يجري إنشاء مفتاح صدفة آمنة" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "مفتاح صدفة آمنة جديد" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "أنشئ مفتاح _فقط" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "أ_نشيء واضبط" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "يسمح لك مفتاح الصدفة الآمنة (SSH) بالاتصال بشكل آمن بحواسيب أخرى." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "عنوان بريدك الإلكتروني، وأي مُذكِّر آخر لماهية هذا المفتاح." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"إذا كان هناك حاسوب ترغب في استعمال هذا المفتاح معه، يمكنك ضبط ذلك الحاسوب " +"ليتعرّف على مفتاحك الجديد." + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(مفتاح صدفة آمنة غير مقروء)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "مفتاح صدفة آمنة سري" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "مفتاح صدفة آمنة" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "تعذّر تغيير اسم المفتاح." + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "تعذّر تغيير سماحية المفتاح." + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "تعذّر تغيير عبارة سر المفتاح." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "المميز:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "الاسم:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "يُستخدم للاتصال بالحواسيب الأخرى." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "الثقة" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "يُ_سمح لمالك هذا المفتاح بالاتصال بهذا الحاسوب" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "ينطبق هذا فقط على حساب %s." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "الخوارزمية:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "الشدة:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "الموقع:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "_صدِّر المفتاح كاملًا" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "لقد انتهى أمر ssh بشكل غير متوقّع." + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "فشل أمر SSH." + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "كلمة سر المستضيف البعيد" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "أدخل عبارة سر المفتاح" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "عبارة سر لمفتاح الصدفة الآمنة الجديد" + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "استيراد المفتاح: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "يستورد المفتاح. أدخل عبارة السر" + +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "مفاتيح OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "‏OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "لا ملف مفتاح خاص متوفر لهذا المفتاح." + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "تعذّر إعداد مفتاح الصدفة الآمنة على الحاسوب البعيد." + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "اضبط مفاتيح الصدفة الآمنة..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "اضبط الحاسوب لاتصال SSH" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"لتستخدم مفتاح الصدفة الآمنة خاصتك مع حاسوب آخر يستخدم SSH، يجب أن يكون لك " +"بالفعل حساب ولوج على ذاك الحاسوب." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "مثلا: fileserver.example.com:port" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "اسم ال_حاسوب:" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "اسم ال_ولوج:" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "_ركِّب" + +#~ msgid "Login keyring" +#~ msgstr "حلقة مفاتيح الولوج" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "مُنِع الوصول لحلقة المفاتيح" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "رقيب حلقة مفاتيح جنوم غير مشغل" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "لقد فُتحت حلقة المفتيح مُسبقا" + +#~ msgid "No such key ring exists" +#~ msgstr "ليس ثمّة مفتاح" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "تعذر التواصل مع رقيب حلقة المفاتيح" + +#~ msgid "The item already exists" +#~ msgstr "العنصر موجود مسبقا" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "خطأ داخلي أثناء محاولة الوصول لحلقة مفاتيح جنوم" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "لا تشغِّل seahorse-daemon كعفريت" + +#~ msgid "couldn't fork process" +#~ msgstr "تعذّر تشعيب العملية" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "عفريت التعمية (حصان البحر)" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "نوع مفتاح مجهول أو غير صالح: %s" + +#~ msgid "This keytype is not supported: %s" +#~ msgstr "نوع المفتاح هذا غير مدعوم: %s" + +#~ msgid "Support for this feature was not enabled at build time" +#~ msgstr "لم يفعّل دعم هذه الخاصية أثناء البناء" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "مفتاح مجهول أو غير صالح: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr "وقّعه انتهت صلاحيته في %s." + +#~ msgid "Invalid Signature" +#~ msgstr "توقيع غير صالح" + +#~ msgid "Signed by on %s Expired." +#~ msgstr "وقّعه في %s انتهت صلاحيته." + +#~ msgid "Expired Signature" +#~ msgstr "توقيع منتهي الصلاحية" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr "وقّعه نُقِض في %s." + +#~ msgid "Revoked Signature" +#~ msgstr "توقيع منقوض" + +#~ msgid "Signed by on %s." +#~ msgstr "وقّعه في %s." + +#~ msgid "Good Signature" +#~ msgstr "توقيع سليم" + +#~ msgid "Signing key not in keyring." +#~ msgstr "مفتاح التوقيع ليس في حلقة المفاتيح." + +#~ msgid "Unknown Signature" +#~ msgstr "توقيع مجهول" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "توقيع سيء أو مُزوّر. لقد عُدِّلت البيانات المُوقّعة." + +#~ msgid "Bad Signature" +#~ msgstr "توقيع سيّء" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "مُوقِّع مجهول أو غير صالح: %s" + +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "لا يصلح المفتاح للتوقيع: %s" + +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "مُستلِم مجهول أو غير صالح: %s" + +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "ليس المفتاخ مُستلِما صالحا للتعمية: %s" + +#~ msgid "No recipients specified" +#~ msgstr "لم يحدّد أي مُستلِم" + +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "نوع مفتاح غير صالح لاستخراج التعمية: %s" + +#~ msgid "No signer specified" +#~ msgstr "لم يحدّد أي مُوقِّع" + +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "نوع مفتاح غير صالح للتحقق: %s" + +#~ msgid "Invalid key id: %s" +#~ msgstr "معرّف مفتاح غير صالح: %s" + +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "قائمة بخواديم المفاتيح أو مسارات لمفاتيح PGP البعيدة. في الإصدارة الأخيرة " +#~ "يُمكن تضمين اسم عرض، بإلحاق مسافة ثم الاسم." + +#~ msgid "Auto Retrieve Keys" +#~ msgstr "اجلب المفاتيح آليا" + +#~ msgid "Auto Sync Keys" +#~ msgstr "زامن المفاتيح آليا" + +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "يتحكم في ظهور عمود انتهاء الصلاحية في مدير المفاتيح." + +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "يتحكم في ظهور عمود الثقة في مدير المفاتيح." + +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "يتحكم في ظهور عمود النوع في مدير المفاتيح." + +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "يتحكم في ظهور عمود الصلاحية في مدير المفاتيح." + +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "فعِّل مُشاركة DNS-SD" + +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "فعِّل مُشاركة ‪DNS-SD (Apple Bonjour)‬ للمفاتيح. يجب أن يكون seahorse-daemon " +#~ "مُشتغلا وأن يكون قد بُنِي بدعم HKP و DNS-SD." + +#~ msgid "ID of the default key" +#~ msgstr "هويّة المفتاح المبدئي" + +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "إذا ضُبِط لصحيح، فستُصبح الملفات المعمّاة بواسطة حصان البحر مرمّزة بأسكي مصفّح." + +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "إذا ضُبِط لصحيح، سيُضاف المُفتاح المبدئي دائما إلى قائمة مُستلِمي التعمية." + +#~ msgid "Last key server search pattern" +#~ msgstr "آخر نمط بحث في خادوم مفاتيح" + +#~ msgid "Last key servers used" +#~ msgstr "آخر خادوم مفاتيح استُخدِم" + +#~ msgid "Last key used to sign a message." +#~ msgstr "آخر مفتاح استُخدِم لتوقيع رسالة." + +#~ msgid "PGP Key servers" +#~ msgstr "خواديم مفاتيح PGP" + +#~ msgid "Publish keys to this key server." +#~ msgstr "انشر في خادوم المفاتيح هذا." + +#~ msgid "Show expires column in key manager" +#~ msgstr "اعرض عمود انتهاء الصلاحية في مدير المفاتيح" + +#~ msgid "Show trust column in key manager" +#~ msgstr "اعرض عمود الثقة في مدير المفاتيح" + +#~ msgid "Show type column in key manager" +#~ msgstr "اعرض عمود النوع في مدير المفاتيح" + +#~ msgid "Show validity column in key manager" +#~ msgstr "اعرض عمود الصلاحية في مدير المفاتيح" + +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "حدد العمود الذي سترتب نافذة المستلمين طبقا له، الأعمدة هي 'name' و 'id'. " +#~ "ضع '-' أمام اسم العمود لترتب تنازليا." + +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "حدد العمود الذي سترتب نافذة مدير مفاتيح حصان البحر طبقا له. أسماء الأعمدة " +#~ "هي 'name'، و 'id'، و 'validity'، و 'expires'، و trust' و 'type'. ضع '-' " +#~ "أمام اسم العمود لترتب تنازليا." + +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "معرّف آخر مفتاح سري استخدم لتوقيع رسالة." + +#~ msgid "The column to sort the recipients by" +#~ msgstr "العمود الذي سيرتب المستلمون طبقا له" -#: ../src/seahorse-key-manager-store.c:883 -msgid "Validity" -msgstr "الصلاحية" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:902 -msgid "Expiration Date" -msgstr "تاريخ انتهاء الصلاحية" +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "العمود الذي سترتب مفاتيح حصان البحر طبقا له" -#: ../src/seahorse-keyserver-results.c:247 -msgid "Close this window" -msgstr "أغلق هذه النافذة" +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "خادوم المفاتيح الذي ستنشر به مفاتيح PGP. أو اجعله خاليا لتثبِّط نشر مفاتيح " +#~ "PGP." -#: ../src/seahorse-keyserver-results.c:248 -msgid "_Expand All" -msgstr "و_سّع الكل" - -#: ../src/seahorse-keyserver-results.c:249 -msgid "Expand all listings" -msgstr "وسِّع كل السّرْد" - -#: ../src/seahorse-keyserver-results.c:250 -msgid "_Collapse All" -msgstr "إ_طوِ الكل" - -#: ../src/seahorse-keyserver-results.c:251 -msgid "Collapse all listings" -msgstr "إطوِ كل السّرْد" +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "آخر خادوم مفاتيح بُحث به أو فارغا لكل خواديم المفاتيح." -#: ../src/seahorse-keyserver-results.c:322 -msgid "Remote Keys" -msgstr "المفاتيح البعيدة" +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "آخر نمط بحث بُحِث عنه في خادوم مفاتيح." -#: ../src/seahorse-keyserver-results.c:324 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "المفاتيح البعيدة التي تحتوي على '%s'" +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "يحدد هذا المفتاح المبدئي الذي سيستخدم في عمليات معيّنة، غالبا التوقيع." -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "خواديم المفاتيح:" +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "" +#~ "ما إذا كان من المتعين الحصول آليا على المفاتيح المعدّلة من خادوم المفاتيح " +#~ "المبدئي أم لا." -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "المفاتيح المُشاركة القريبة منِّي" +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "" +#~ "ما إذا كان من المتعين مزامنة المفاتيح المعدّلة آليا مع خادوم المفاتيح " +#~ "المبدئي أم لا." -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "اعثر على مفاتيح بعيدة" +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "ما إذا كان سيُعمِّي دائما بالمفتاح المبدئي" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"سيُعثر هذا على مفاتيح الآخرين عبى الإنترنت. يُمكن بعد ذلك استيراد هذه المفاتيح " -"إلى حلقة مفاتيحك المحليّة." +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "فيما إذا سيستخدم أسكي مُحصّن" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "مكان البحث:" +#~ msgid "Web Password" +#~ msgstr "كلمة سر وِِب" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "ا_بحث" +#~ msgid "Couldn't set application access." +#~ msgstr "تعذّر ضبط نفاذ التطبيق." -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "ا_بحث عن المفاتيح التي تحتوي: " +#~ msgid "Path:" +#~ msgstr "المسار:" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "تعذر نشر المفاتيح للخادوم" +#~ msgid "Permissions:" +#~ msgstr "الصلاحيات:" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "تعذّر الحصول على المفاتيح من الخادوم: %s" +#~ msgid "Applications" +#~ msgstr "التطبيقات" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "لم تُحدّد مفاتيح للمُزامنة" -msgstr[1] "حُدِّد مفتاح واحد للمُزامنة" -msgstr[2] "حُدِّد مفتاحين للمُزامنة" -msgstr[3] "حُدِّدت %Id مفاتيح للمُزامنة" -msgstr[4] "حُدِّد %Id مفتاحًا للمُزامنة" -msgstr[5] "حُدِّد %Id مفتاح للمُزامنة" +#~ msgid "_Read" +#~ msgstr "_اقرأ" -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "يجري مزامنة المفاتيح" +#~ msgid "_Write" +#~ msgstr "ا_كتب" -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "يجري مزامنة المفاتيح..." +#~ msgid "Passwords: %s" +#~ msgstr "كلمات السر: %s" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "زامِن المفاتيح" +#~ msgid "Passwords: %s" +#~ msgstr "كلمات السر: %s" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"سيُنشر هذا المفاتيح في حلقة مفاتيحك لتتوفّر للآخرين ليستخدموها. أيضا ستحصل على " -"أي تغييرات قام بها الآخرون منذ تلقيّت مفاتيحهم." +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "أوصد حلقة مفاتيح تخزين كلمات السر بحيث تحتاج إلى كلمة سر رئيسية لفتحها." -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"سيحصل هذا على أي تغييرات قام با الآخرون منذ تلقّيت مفاتيحهم. لم يُحدد أي خادوم " -"مفاتيح للنشر، لذا لن تتوفّر مفاتيحك للآخرون." +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "افتح حلقة مفاتيح تخزين كلمات السر بكلمة السر الرئيسية بحيث تتاح للاستخدام." -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_خواديم المفاتيح" +#~ msgid "Saving item..." +#~ msgstr "يحفظ العنصر..." -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_زامِن" +#~ msgid "Deleting item..." +#~ msgstr "يحذف العنصر..." -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "إصدارة هذا التطبيق" +#~ msgid "Listing password keyrings" +#~ msgstr "يسرد حلقات المفاتيح" -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144 -msgid "Encryption Key Manager" -msgstr "مدير مفاتيح التعمية" +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "لا مفاتيح تعمية لتأدية العملية التي طلبتها. برنامج كلمات السر و " +#~ "مفاتيح التعمية لن يبدأ لذا عليك إنشاء مفتاح أو استيراد واحد." -#: ../src/seahorse-viewer.c:120 -msgid "Contributions:" -msgstr "المساهمات:" +#~ msgid "All Keys" +#~ msgstr "كل المفاتيح" -#: ../src/seahorse-viewer.c:146 -msgid "translator-credits" -msgstr "" -"فريق عربآيز للترجة http://www.arabeyes.org:\n" -"خالد حسني\t" +#~ msgid "Selected Recipients" +#~ msgstr "المستلمون المُحددون" -#: ../src/seahorse-viewer.c:149 -msgid "Seahorse Project Homepage" -msgstr "صفحة مشروع حصان البحر" +#~ msgid "Search Results" +#~ msgstr "نتائج البحث" -#. Top menu items -#: ../src/seahorse-viewer.c:168 -msgid "_File" -msgstr "_ملف" +#~ msgid "Search _for:" +#~ msgstr "ا_بحث عن:" -#: ../src/seahorse-viewer.c:169 -msgid "_Edit" -msgstr "_تحرير" +#~ msgid "None (Don't Sign)" +#~ msgstr "لا شيء (لا تُوقِّع)" -#: ../src/seahorse-viewer.c:170 -msgid "_View" -msgstr "_عرض" +#~ msgid "Sign this message as %s" +#~ msgstr "وقع الرسالة كـ %s" -#: ../src/seahorse-viewer.c:171 -msgid "_Help" -msgstr "_مساعدة" +#~ msgid "_Sign message as:" +#~ msgstr "_وقِّع الرسالة كـ:" -#: ../src/seahorse-viewer.c:173 -msgid "Prefere_nces" -msgstr "التف_ضيلات" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ليس الملف ملف .desktop سليم" -#: ../src/seahorse-viewer.c:174 -msgid "Change preferences for this program" -msgstr "غيّر تفضيلات هذا البرنامج" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "إصدارة ملف سطح مكتب غير معروفة '%s'" -#: ../src/seahorse-viewer.c:177 -msgid "About this program" -msgstr "عن هذا البرنامج" +#~ msgid "Starting %s" +#~ msgstr "بدء %s" -#: ../src/seahorse-viewer.c:178 -msgid "_Contents" -msgstr "ال_محتويات" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "التطبيق لا يقبل مستندات في سطر الأوامر" -#: ../src/seahorse-viewer.c:179 -msgid "Show Seahorse help" -msgstr "اعرض مساعدة حصان البحر" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "خيار إطلاق غير معروف %d" -#: ../src/seahorse-viewer.c:276 -msgid "Export public key" -msgstr "صدّر المفتاح العلني" +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "تعذّر تمرير مسارات المستندات إلى 'Type=Link' في مدخلة سطح المكتب" -#: ../src/seahorse-viewer.c:296 -msgid "Exporting keys" -msgstr "يصدّر المفاتيح" +#~ msgid "Not a launchable item" +#~ msgstr "عنصر لا يُطلق" -#: ../src/seahorse-viewer.c:321 -msgid "Couldn't retrieve data from key server" -msgstr "تعذّر الحصول على البيانات من خادوم المفاتيح" +#~ msgid "Disable connection to session manager" +#~ msgstr "عطّل الاتصال بمدير الجلسات" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:340 -msgid "Copied keys" -msgstr "نُسخت المفاتيح" +#~ msgid "Specify file containing saved configuration" +#~ msgstr "حدد ملفا يحتوي الإعدادات المحفوظة" -#: ../src/seahorse-viewer.c:360 -msgid "Retrieving keys" -msgstr "يجلب المفاتيح" +#~ msgid "FILE" +#~ msgstr "FILE" -#: ../src/seahorse-viewer.c:375 -msgid "Couldn't delete." -msgstr "تعذّر الحذف." +#~ msgid "Specify session management ID" +#~ msgstr "حدد معرف إدارة الجلسة" -#: ../src/seahorse-viewer.c:409 -msgid "Deleting..." -msgstr "يحذف..." +#~ msgid "Session management options:" +#~ msgstr "خيارات إدارة الجلسات:" -#: ../src/seahorse-viewer.c:435 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "‏%s مفتاح سري. أمتأكد أنك ترغب في المواصلة؟" +#~ msgid "Show session management options" +#~ msgstr "اعرض خيارات إدارة الجلسات" -#: ../src/seahorse-viewer.c:483 -msgid "Importing keys from key servers" -msgstr "يجري استيراد المفاتيح من خادوم المفاتيح" +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "لم تستورد مفاتيح" +#~ msgstr[1] "استورد مفتاح" +#~ msgstr[2] "استورد مفتاحين" +#~ msgstr[3] "استوردت مفاتيح" +#~ msgstr[4] "استوردت مفاتيح" +#~ msgstr[5] "استوردت مفاتيح" -#: ../src/seahorse-viewer.c:509 -msgid "Show properties" -msgstr "أظهر الخصائص" +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "لم تستورَد أي مفاتيح" +#~ msgstr[1] "استورِد مفتاح واحد" +#~ msgstr[2] "استورِد مفتاحين" +#~ msgstr[3] "استورِد %i مفاتيح" +#~ msgstr[4] "استورِد %i مفتاحا" +#~ msgstr[5] "استورِد %i مفتاح" -#: ../src/seahorse-viewer.c:510 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "ا_حذف" +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "لم تستورد مفاتيح لـ" +#~ msgstr[1] "استورد مفتاح واحد لـ" +#~ msgstr[2] "استورد مفتاحين لـ" +#~ msgstr[3] "استوردت مفاتيح لـ" +#~ msgstr[4] "استوردت مفاتيح لـ" +#~ msgstr[5] "استوردت مفاتيح لـ" -#: ../src/seahorse-viewer.c:511 -msgid "Delete selected items" -msgstr "احذف العناصر المختارة" +#~ msgid "Notification Messages" +#~ msgstr "رسائل التنبيه" -#: ../src/seahorse-viewer.c:515 -msgid "E_xport..." -msgstr "_صدِّر..." +#~ msgid "Symmetric Key" +#~ msgstr "مفتاح متماثل" -#: ../src/seahorse-viewer.c:516 -msgid "Export to a file" -msgstr "صدّر إلى ملف" +#~ msgid "Credentials" +#~ msgstr "الاعتمادات" -#: ../src/seahorse-viewer.c:518 -msgid "Copy to the clipboard" -msgstr "انسخ للحافظة" +#~ msgid "Identity" +#~ msgstr "الهوية" -#: ../src/seahorse-viewer.c:523 -msgid "Import selected keys to local key ring" -msgstr "استورد المفاتيح المُنتقاة لحلقة المفاتيح المحليّة" +#~ msgid "Progress Title" +#~ msgstr "عنوان التقدّم" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "عبارة سر لمفتاح الصدفة الآمنة :" +#~ msgid "Couldn't run file-roller" +#~ msgstr "تعذّر تشغيل مُأرشف الملفات" -#: ../ssh/seahorse-ssh-commands.c:85 -msgid "Configure Key for _Secure Shell..." -msgstr "اضبط مفتاح الصدفة الآ_منة..." +#~ msgid "Couldn't package files" +#~ msgstr "تعذّر تحزيم الملفات" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"أرسل مفتاح الصدفة الآمنة العلني لجهاز آخر، لتُفعِّل الولوج باستخدام هذا المفتاح." +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "لم تُكمل عملية مُأرشف الملفات بنجاح" -#: ../ssh/seahorse-ssh-commands.c:115 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "أمتأكد من رغبتكدب حذفمفتاح الصدفة الآمنة '%sًّا؟" +#~ msgid "Archive files" +#~ msgstr "ملفات الأرشيفات" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "أمتأكد من رغبتك بحذف %d مفاتيح الصدفة الآمنة؟" +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "يوجد بالفعل ملف بهذا الاسم.\n" +#~ "\n" +#~ "أترغب في استبداله بملف جديد؟" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "مفتاح صدفة آمنة" +#~ msgid "_Replace" +#~ msgstr "است_بدل" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "يستخدم للنفاذ لحواسيب أخرى (مثلا: عبر الطرفية)" +#~ msgid "Loading Keys..." +#~ msgstr "يجري تحميل المفاتيح..." -#: ../ssh/seahorse-ssh-generate.c:90 -msgid "Couldn't generate Secure Shell key" -msgstr "تعذّر توليد مفتاح صدفة آمنة" +#~ msgid "Uploading keys..." +#~ msgstr "يرفع المفاتيح..." -#: ../ssh/seahorse-ssh-generate.c:213 -msgid "Creating Secure Shell Key" -msgstr "يجري إنشاء مفتاح صدفة آمنة" +#~ msgid "Retrieving keys..." +#~ msgstr "يجلب المفاتيح..." -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"استعمل عناوين بريدك الإلكتروني، وأي مُذكِّر آخر تحتاجه لتعرف لأي شيء هذا " -"المفتاح." +#~ msgid "Searching for keys on: %s" +#~ msgstr "يبحث عن المفاتيح على: %s" -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"يسمح لك مفتاح الصدفة الآمنة (SSH) بالاتصال بشكل آمن بحواسيب موثوقة باستخدام " -"SSH، بدون إدخال كلمة سر مختلفة لكل واحد منهم." +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "يبحث عن المفاتيح التي تحتوي '%s'..." -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +#~ msgid "Searching for key id '%s'..." +#~ msgstr "يبحث عن معرّف المفتاح '%s'..." -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"إذا كان هناك بالفعل حاسوب ترغب في استعمال هذا المفتاح معه، يمكنك ضبط ذلك " -"الحاسوب ليتعرّف على مفتاحك الآن." +#~ msgid "Retrieving remote keys..." +#~ msgstr "يجلب المفاتيح البعيدة..." -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" -msgstr "مفتاح صدفة آمنة جديد" +#~ msgid "Sending keys to key server..." +#~ msgstr "يرسل المفاتيح لخادوم المفاتيح..." -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "أ_نشيء واضبط" +#~ msgid "_Sign Key..." +#~ msgstr "_وقّع المفتاح..." -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "أنشئ مفتاح _فقط" +#~ msgid "Sign public key" +#~ msgstr "وقِّع المفتاح العلني" -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "و_صف المفتاح:" +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "أمتأكد من رغبتك بحذف مفاتيح و معرّفات %d نهائيا؟" -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(مفتاح صدفة آمنة غير مقروء)" +#~ msgid "Algorithms here" +#~ msgstr "الخوازميات هنا" -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "غير صالح" +#~ msgid "New PGP Key" +#~ msgstr "مفتاح PGP جديد" -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "مفتاح صدفة آمنة سري" +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "تعذّر تصدير المفتاح إلى \"%s\"" -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "مفتاح صدفة آمنة علني" +#~ msgid "Export Complete Key" +#~ msgstr "صدِّر المفتاح كاملًا" -#: ../ssh/seahorse-ssh-key-properties.c:71 -msgid "Couldn't rename key." -msgstr "تعذّر تغيير اسم المفتاح." +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "أمتأكد من رغبتك بحذف الشهادة '%s'؟" -#: ../ssh/seahorse-ssh-key-properties.c:112 -msgid "Couldn't change authorization for key." -msgstr "تعذّر تغيير سماحية المفتاح." +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "أمتأكد من رغبتك بحذف %d شهادة؟" +#~ msgstr[1] "أمتأكد من رغبتك بحذف شهادة واحدة؟" +#~ msgstr[2] "أمتأكد من رغبتك بحذف شهادتين؟" +#~ msgstr[3] "أمتأكد من رغبتك بحذف %d شهادات؟" +#~ msgstr[4] "أمتأكد من رغبتك بحذف %d شهادة؟" +#~ msgstr[5] "أمتأكد من رغبتك بحذف %d شهادة؟" -#: ../ssh/seahorse-ssh-key-properties.c:127 -msgid "Couldn't change passphrase for key." -msgstr "تعذّر تغيير عبارة سر المفتاح." +#~ msgid "Create New ..." +#~ msgstr "أن_شئ جديدًا..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "الخوارزمية:" +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "لا مفاتيح محددة" +#~ msgstr[1] "مفتاح واحد محدد" +#~ msgstr[2] "مفتاحين محددين" +#~ msgstr[3] "%Id مفاتيح محددة" +#~ msgstr[4] "%Id مفتاحا محددا" +#~ msgstr[5] "%Id مفتاح محدد" -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "المميز:" +#~ msgid "Importing keys" +#~ msgstr "يستورد المفاتيح" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "الموقع:" +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "نوع مفتاح لم يُتعرّف عليه" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "الشدة:" +#~ msgid "T_ypes" +#~ msgstr "الأ_نواع" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "الثقة" +#~ msgid "Show type column" +#~ msgstr "أظهر عمود النوع" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr " ينطبق هذا فقط على حساب '%s'." +#~ msgid "_Expiry" +#~ msgstr "انتهاء ال_صلاحية" -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_صدِّر المفتاح كاملًا" +#~ msgid "Show expiry column" +#~ msgstr "اظهر عمود انتهاء الصلاحية" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "يُ_سمح لمالك هذا المفتاح بالاتصال بهذا الحاسوب" +#~ msgid "_Trust" +#~ msgstr "ال_ثقة" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "يُستخدم للاتصال بالحواسيب الأخرى." +#~ msgid "Show owner trust column" +#~ msgstr "اظهر عمود ثقة المالك" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format -msgid "The SSH command was terminated unexpectedly." -msgstr "لقد انتهى أمر ssh بشكل غير متوقّع." +#~ msgid "_Validity" +#~ msgstr "ال_صلاحية" -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 -msgid "The SSH command failed." -msgstr "فشل أمر SSH." +#~ msgid "Show validity column" +#~ msgstr "اظهر عمود الصلاحية" -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "مفتاح صدفة آمنة" +#~ msgid "Other _Keys" +#~ msgstr "مفاتيح أ_خرى" -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "عبارة السر:" +#~ msgid "Validity" +#~ msgstr "الصلاحية" -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 -msgid "Remote Host Password" -msgstr "كلمة سر المستضيف البعيد" +#~ msgid "Expiration Date" +#~ msgstr "تاريخ انتهاء الصلاحية" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "عبارة سر المفتاح القديمة" +#~ msgid "_Expand All" +#~ msgstr "و_سّع الكل" -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "أدخل عبارة السر القديمة لـ: %s " +#~ msgid "Expand all listings" +#~ msgstr "وسِّع كل السّرْد" -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "عبارة سر مفتاح جديدة" +#~ msgid "_Collapse All" +#~ msgstr "إ_طوِ الكل" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "أدخل عبارة السر الجديدة لـ: %s" +#~ msgid "Collapse all listings" +#~ msgstr "إطوِ كل السّرْد" -#: ../ssh/seahorse-ssh-operation.c:864 -msgid "Enter Key Passphrase" -msgstr "أدخل عبارة سر المفتاح" +#~ msgid "Synchronizing keys" +#~ msgstr "يجري مزامنة المفاتيح" -#: ../ssh/seahorse-ssh-operation.c:931 -msgid "Passphrase for New Secure Shell Key" -msgstr "عبارة سر لمفتاح الصدفة الآمنة الجديد" +#~ msgid "Export public key" +#~ msgstr "صدّر المفتاح العلني" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "أدخل عبارة سر لمفتاح صدفتك الآمنة الجديد." +#~ msgid "Exporting keys" +#~ msgstr "يصدّر المفاتيح" -#: ../ssh/seahorse-ssh-operation.c:1013 -#, c-format -msgid "Importing key: %s" -msgstr "استيراد المفتاح: %s" +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "تعذّر الحصول على البيانات من خادوم المفاتيح" -#: ../ssh/seahorse-ssh-operation.c:1015 -msgid "Importing key. Enter passphrase" -msgstr "يستورد المفتاح. أدخل عبارة السر" +#~ msgid "Retrieving keys" +#~ msgstr "يجلب المفاتيح" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." -msgstr "لا ملف مفتاح خاص متوفر لهذا المفتاح." +#~ msgid "Deleting..." +#~ msgstr "يحذف..." -#: ../ssh/seahorse-ssh-upload.c:45 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "تعذّر إعداد مفتاح الصدفة الآمنة على الحاسوب البعيد." +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "‏%s مفتاح سري. أمتأكد أنك ترغب في المواصلة؟" -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 -msgid "Configuring Secure Shell Keys..." -msgstr "اضبط مفاتيح الصدفة الآمنة..." +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "ا_حذف" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "مثلا: fileserver.example.com:port" +#~ msgid "_Key Description:" +#~ msgstr "و_صف المفتاح:" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "اضبط الحاسوب لاتصال SSH" +#~ msgid "Invalid" +#~ msgstr "غير صالح" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "" -"لتستخدم مفتاح الصدفة الآمنة خاصتك مع حاسوب آخر يستخدم SSH، يجب أن يكون لك " -"بالفعل حساب ولوج على ذاك الحاسوب." +#~ msgid "Private Secure Shell Key" +#~ msgstr "مفتاح صدفة آمنة سري" -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "اسم ال_حاسوب:" +#~ msgid "Public Secure Shell Key" +#~ msgstr "مفتاح صدفة آمنة علني" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "اسم ال_ولوج:" +#~ msgid "Passphrase:" +#~ msgstr "عبارة السر:" -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "_ركِّب" +#~ msgid "Enter a passphrase for your new Secure Shell key." +#~ msgstr "أدخل عبارة سر لمفتاح صدفتك الآمنة الجديد." #~ msgid "Couldn't share keys" #~ msgstr "تعذّر مشاركة المفاتيح" @@ -3118,19 +3240,9 @@ #~ msgid "_Trusted Keys" #~ msgstr "المفاتيح المو_ثوق بها" -#, fuzzy -#~ msgid "P_roperties" -#~ msgstr "خصائص المفتاح" - -#~ msgid "Retrieving key" -#~ msgstr "يجري جلب المفتاح" - #~ msgid "Removing item" #~ msgstr "يُحذف العنصر" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "الغ القفل آليا عن ولوج المستخدم." - #~ msgid "Couldn't get default password keyring" #~ msgstr "لا وجود لكلمة سر مبدئية في حلقة المفاتيح" @@ -3185,9 +3297,6 @@ #~ msgid "_Quit" #~ msgstr "إ_نهِ" -#~ msgid "Create a new personal key" -#~ msgstr "انشئ مفتاحًا شخصيًا جديدًا" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "استورد المفاتيح إلى حلقة مفاتيحك من ملف" diff -Nru seahorse-3.2.2/po/as.po seahorse-3.6.3/po/as.po --- seahorse-3.2.2/po/as.po 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/po/as.po 2012-09-03 10:44:42.000000000 +0200 @@ -2,1559 +2,1129 @@ # This file is distributed under the same license as the PACKAGE package. # # Amitakhya Phukan , 2009. -# Nilamdyuti Goswami , 2011. +# Nilamdyuti Goswami , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: as\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=seahorse&component=general\n" -"POT-Creation-Date: 2011-01-19 20:34+0000\n" -"PO-Revision-Date: 2011-03-22 19:53+0000\n" +"cgi?product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-16 22:08+0000\n" +"PO-Revision-Date: 2012-08-17 15:44+0530\n" "Last-Translator: Nilamdyuti Goswami \n" -"Language-Team: Assamese \n" +"Language-Team: as_IN \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.0\n" -#: ../daemon/seahorse-daemon.c:64 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "seahorse-daemon ডেমন ৰূপে সঞ্চালন কৰা ন'হ'ব" - -#: ../daemon/seahorse-daemon.c:94 -msgid "couldn't fork process" -msgstr "প্ৰসেস fork (ফৰ্ক) কৰা সম্ভব নহয়" - -# -#: ../daemon/seahorse-daemon.c:100 -msgid "couldn't create new process group" -msgstr "নতুন প্ৰসেস সংকলন নিৰ্মাণ কৰিবলৈ ব্যৰ্থ" - -#: ../daemon/seahorse-daemon.c:250 -msgid "Encryption Daemon (Seahorse)" -msgstr "এনক্ৰিপশন ডেমন (Seahorse)" - -#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "অবৈধ অথবা অজানা চাবিৰ ধৰন: %s" - -#: ../daemon/seahorse-service.c:234 -#, c-format -#| msgid "This key expired on: %s" -msgid "This keytype is not supported: %s" -msgstr "এই keytype সমৰ্থিত নহয়: %s" - -#: ../daemon/seahorse-service.c:241 -#, c-format -msgid "Support for this feature was not enabled at build time" -msgstr "বনোৱাৰ সময়ত এই বৈশিষ্টৰ বাবে সমৰ্থন সামৰ্থবান কৰা হোৱা নাছিল" - -#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180 -#: ../daemon/seahorse-service-keyset.c:223 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "অবৈধ অথবা অজানা কি: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:204 -#, c-format -msgid "Signed by expired on %s." -msgstr " দ্বাৰা স্বাক্ষৰিত । এটি মেয়াদ পূৰ্ণ হৈছে %s-এ ।" - -# -#: ../daemon/seahorse-service-crypto.c:205 -msgid "Invalid Signature" -msgstr "অবৈধ স্বাক্ষৰ" - -#: ../daemon/seahorse-service-crypto.c:211 -#, c-format -msgid "Signed by on %s Expired." -msgstr "" -" দ্বাৰা স্বাক্ষৰিত । %s-এ এটিৰ মেয়াদ পূৰ্ণ হৈছে ।" - -# -#: ../daemon/seahorse-service-crypto.c:212 -msgid "Expired Signature" -msgstr "মেয়াদ উত্তীৰ্ণ স্বাক্ষৰ" - -#: ../daemon/seahorse-service-crypto.c:218 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "" -"যিটি দিয়ে স্বাক্ষৰ কৰা হৈছে বাতিল কৰাৰ তাৰিখ %s ।" - -# -#: ../daemon/seahorse-service-crypto.c:219 -msgid "Revoked Signature" -msgstr "বাতিল কৰা স্বাক্ষৰ" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:225 -#, c-format -msgid "Signed by on %s." -msgstr " দ্বাৰা %s-এ স্বাক্ষৰ কৰা হৈছে ।" - -# -#: ../daemon/seahorse-service-crypto.c:226 -msgid "Good Signature" -msgstr "বৈধ স্বাক্ষৰ" - -# -#: ../daemon/seahorse-service-crypto.c:231 -msgid "Signing key not in keyring." -msgstr "স্বাক্ষৰে ব্যবহৃত চাবি চাবি ৰিং এ অনুপস্থিত ।" - -# -#: ../daemon/seahorse-service-crypto.c:232 -msgid "Unknown Signature" -msgstr "অজ্ঞাত স্বাক্ষৰ" - -# -#: ../daemon/seahorse-service-crypto.c:236 -msgid "Bad or forged signature. The signed data was modified." -msgstr "অবৈধ বা জাল স্বাক্ষৰ । স্বাক্ষৰ কৰা তথ্যিৰ পৰিবৰ্তন ঘটেছে ।" - -# -#: ../daemon/seahorse-service-crypto.c:237 -msgid "Bad Signature" -msgstr "অবৈধ স্বাক্ষৰ" - -# -#: ../daemon/seahorse-service-crypto.c:245 -msgid "Couldn't verify signature." -msgstr "স্বাক্ষৰ যাচাই কৰা সম্ভব নহয় ।" - -#: ../daemon/seahorse-service-crypto.c:317 -#: ../daemon/seahorse-service-crypto.c:646 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "অবৈধ অথবা অজানা স্বাক্ষৰকাৰী: %s" - -#: ../daemon/seahorse-service-crypto.c:324 -#: ../daemon/seahorse-service-crypto.c:653 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "স্বাক্ষৰ কৰাৰ উদ্দেশ্যে, চাবি বৈধ নয়: %s" - -#: ../daemon/seahorse-service-crypto.c:335 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "অবৈধ অথবা অজানা প্ৰাপক: %s" - -#: ../daemon/seahorse-service-crypto.c:343 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "এনক্ৰিপশনপৰ বাবে এই চাবিটি বৈধ প্ৰাপক নয়: %s" - -#: ../daemon/seahorse-service-crypto.c:352 -#, c-format -msgid "No recipients specified" -msgstr "প্ৰাপক নিৰ্ধাৰণ কৰা নহয়" - -#: ../daemon/seahorse-service-crypto.c:434 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "ডিক্ৰিপশনেৰ বাবে অবৈধ প্ৰকৃতিৰ কি: %s" - -#: ../daemon/seahorse-service-crypto.c:548 -#: ../daemon/seahorse-service-crypto.c:746 -#, c-format -msgid "Please set clearuri" -msgstr "অনুগ্ৰহ কৰি clearuri সংহতি কৰা" - -#: ../daemon/seahorse-service-crypto.c:554 -#: ../daemon/seahorse-service-crypto.c:752 -#, c-format -msgid "Please set crypturi" -msgstr "অনুগ্ৰহ কৰি crypturi সংহতি কৰা" - -#: ../daemon/seahorse-service-crypto.c:564 -#, c-format -msgid "Error opening clearuri" -msgstr "clearuri খোলোতে ত্ৰুটি" - -#: ../daemon/seahorse-service-crypto.c:641 -#, c-format -msgid "No signer specified" -msgstr "স্বাক্ষৰকাৰী নিৰ্ধাৰণ কৰা নহয়" - -#: ../daemon/seahorse-service-crypto.c:830 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "পৰীক্ষণেৰ বাবে অবৈধ প্ৰকৃতিৰ কি: %s" - -#: ../daemon/seahorse-service-keyset.c:273 -#, c-format -msgid "Invalid key id: %s" -msgstr "চাবিৰ id অবৈধ: %s" - -# -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"দূৰবৰ্তী চাবি খোঁজাৰ বাবে চাবি সেৱকৰ URIৰ তালিকা । পৰবৰ্তী সংস্কৰণে এটা নাম " -"যোগ কৰা সম্ভব হ'ব পাৰে এটা ৰিক্ত স্থানেৰ পৰে নাম যোগ কৰি ।" - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "স্বয়ংক্ৰিয়ভাবে চাবি পুনৰুদ্ধাৰ কৰা হ'ব" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "স্বয়ংক্ৰিয়ভাবে চাবি সুংগত কৰা হ'ব" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "চাবি পৰিচালন ব্যবস্থাৰ মেয়াদপূৰ্তী স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয় ।" - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "চাবি পৰিচালন ব্যবস্থাৰ বিশ্বস্ততা স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয় ।" - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "চাবি পৰিচালন ব্যবস্থাৰ প্ৰকৃতি স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয় ।" - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "চাবি পৰিচালন ব্যবস্থাৰ বৈধতা স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয় ।" - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "DNS-SD শেয়াৰ সক্ৰিয় কৰা হ'ব" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"DNS-SD (Apple Bonjour) শেয়াৰ সক্ৰিয় কৰা হ'ব । seahorse-daemon সক্ৰিয় থকা " -"প্ৰয়োজনীয় আৰু HKP আৰু DNS-SD সৈতে প্ৰস্তুত কৰা দৰকাৰ ।" - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "অবিকল্পিত চাবিৰ ID" - -# -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "মান সত্য হ'লে, seahorse দ্বাৰা এনক্ৰিপ্ট কৰা ফাইল ASCII আৰ্মাৰ এনকোডেড হ'ব ।" - -# -#: ../data/seahorse.schemas.in.h:12 -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "মান সত্য হ'লে অবিকল্পিত চাবি সবসময় এনক্ৰিপশন প্ৰাপকৰ তালিকায় যুক্ত হ'ব ।" - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "সৰ্বশেষ চাবি সেৱক খোঁজেৰ বিন্যাস" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "সৰ্বশেষ ব্যবহৃত চাবিসেৱক" - -# -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "বাৰ্তা স্বাক্ষৰ কৰাৰ উদ্দেশ্যি সৰ্বশেষ ব্যবহৃত চাবি ।" - -# -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "PGP-চাবি সেৱক" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "চিহ্নিত চাবিসেৱকে উপস্থিত চাবি প্ৰকাশিত কৰা হ'ব ।" - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "চাবি পৰিচালনব্যবস্থাৰ অধীন মেয়াদপূৰ্তীৰ কলাম প্ৰদৰ্শন কৰা হ'ব" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "চাবি পৰিচালনব্যবস্থাৰ অধীন বিশ্বস্ততাৰ কলাম প্ৰদৰ্শন কৰা হ'ব" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "চাবি পৰিচালনব্যবস্থাৰ অধীন প্ৰকৃতি কলাম প্ৰদৰ্শন কৰা হ'ব" - -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "চাবি পৰিচালনব্যবস্থাৰ অধীন বৈধতা কলাম প্ৰদৰ্শন কৰা হ'ব" - -# -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"প্ৰাপক তালিকাৰ উইন্ডোৰ ক্ৰমবিন্যাস কৰিবলৈ ব্যবহাৰযোগ্য কলাম নিৰ্ধাৰণ কৰক । স্তম্ভৰ " -"নাম হল: 'name' আৰু 'id' । বড়ৰ পৰা ছোট অনুক্ৰমে সুবিন্যাস্ত কৰাৰ বাবে স্তম্ভৰ নামেৰ " -"পূৰ্বে '-' লিখক ।" +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "পাছৱাৰ্ড কি'ৰিং যোগ কৰক" -#: ../data/seahorse.schemas.in.h:23 +#: ../gkr/seahorse-add-keyring.xml.h:2 msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." msgstr "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." - -# -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "শেষবাৰ যি গোপন চাবি দিয়ে এই বাৰ্তা স্বাক্ষৰ কৰা হৈছে তাৰ ID ।" +"অনুগ্ৰহ কৰি নতুন কি'ৰিংৰ নাম বাছক। আনলক কৰাৰ বাবে পাছৱাৰ্ড লিখাৰ অনুৰোধ জনোৱা হ'ব।" -# -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "প্ৰাপক তালিকাৰ ক্ৰমবিন্যাস নিৰ্ধাৰণেৰ বাবে ব্যবহৃত কলাম" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "নতুন কি'ৰিংৰ নাম:" -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "seahorse-চাবি তালিকাৰ ক্ৰমবিন্যাস নিৰ্ধাৰণেৰ বাবে ব্যবহৃত কলাম" +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "চাৰ্ভাৰৰ হস্টনাম অথবা ঠিকনা।" -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"যে চাবি সেৱক-এ PGP চাবি প্ৰকাশ কৰা হ'ব । অথবা PGP কিৰ প্ৰকাশ বন্ধ কৰাৰ বাবে " -"মুছে ফেলুন ।" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "নতুন পাছৱাৰ্ড কি'ৰিং" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "" -"অনুসন্ধানেৰ বাবে ব্যবহৃত সৰ্বশেষ চাবিসেৱক অথবা সকল চাবিসেৱকে অনুসন্ধানেৰ বাবে ৰিক্ত " -"ৰাখুন ।" +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "এপ্লিকেচন আৰু নেটৱাৰ্কৰ পাছৱাৰ্ড সংৰক্ষণ কৰিবলৈ ব্যবহৃত হয়" -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "চাবিসেৱকে অনুসন্ধানেৰ বাবে সৰ্বশেষ ব্যবহৃত বিন্যাস ।" +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "নতুন পাছৱাৰ্ড..." -# -#: ../data/seahorse.schemas.in.h:30 -msgid "This specifies the default key to use for certain operations, mainly signing." -msgstr "" -"সুনিৰ্দিষ্ট কৰ্ম, মূলত স্বাক্ষৰ কৰাৰ বাবে ব্যবহাৰযোগ্য অবিকল্পিত-চাবি এৰ দ্বাৰা " -"নিৰ্ধাৰিত হ'ব ।" +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "পাছৱাৰ্ড অথবা গোপন তথ্য নিৰাপদভাবে সংৰক্ষণ কৰক।" -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "চাবিসেৱক থেকে স্বয়ংক্ৰিয়ৰূপে চাবি প্ৰাপ্ত কৰা হ'ব চাবি না ।" +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "পাছৱাৰ্ডৰ কি'ৰিং" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." -msgstr "পৰিবৰ্তিত চাবিগুলি ডিফল্ট চাবিসেৱকেৰ সৈতে সুসংগত কৰা হ'ব চাবি না ।" +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "সংৰক্ষিত পাছৱাৰ্ড" -# -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "অবিকল্পিত-চাবি দ্বাৰা সৰ্বদা এনক্ৰিপ্ট কৰা হ'ব চাবি না" +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "অবিকল্পিত কি'ৰিং নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ" -# -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "ASCII Armor ব্যবহাৰ কৰা হ'ব চাবি না" +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "কি'ৰিং পাছৱাৰ্ড পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "গুপ্তশব্দ চাবি ৰিং যোগ কৰক" +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "অবিকল্পিত ৰূপে নিৰ্ধাৰণ কৰক (_S)" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "নতুন চাবিৰিংয়েৰ নাম:" +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "এপ্লিকেচনসমূহ সাধাৰণত নতুন পাছৱাৰ্ড অবিকল্পিত কি'ৰিংত সংৰক্ষণ কৰে।" -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"অনুগ্ৰহ কৰে নতুন চাবিৰিংয়েৰ নাম নিৰ্বাচন কৰক । আন-লক কৰাৰ বাবে গুপ্তশব্দ লেখাৰ " -"অনুৰোধ জানানো হ'ব ।" +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "পাছৱাৰ্ড পৰিবৰ্তন কৰক (_P)" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "সেৱকেৰ হোস্ট-নেম অথবা ঠিকানা ।" +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "পাছৱাৰ্ড সংৰক্ষণ কি'ৰিংৰ আনলক পাছৱাৰ্ড পৰিবৰ্তন কৰক" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73 -msgid "Couldn't add keyring" -msgstr "চাবিৰিং যোগ কৰিবলৈ ব্যৰ্থ" +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "বস্তু যোগ কৰিব নোৱাৰি" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" -msgstr "গুপ্তশব্দ যোগ কৰক" +msgstr "পাছৱাৰ্ড যোগ কৰক" # #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:15 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" -msgstr "বৰ্ণনা:(_D)" +msgstr "বিৱৰণ (_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "কি-ৰিং: (_K)" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" -msgstr "গুপ্তশব্দ:(_P)" +msgstr "পাছৱাৰ্ড (_P):" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" -msgstr "গুপ্তশব্দ প্ৰদৰ্শন কৰা হ'ব (_S)" +msgstr "পাছৱাৰ্ড প্ৰদৰ্শন কৰা হ'ব (_S)" -#: ../gkr/seahorse-gkr-item.c:470 -msgid "Web Password" -msgstr "ৱেব গুপ্তশব্দ" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "কি'ৰিং (_K):" -#: ../gkr/seahorse-gkr-item.c:472 -msgid "Network Password" -msgstr "নেটৱৰ্ক গুপ্তশব্দ" +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "কি'ৰিং যোগ কৰিবলৈ ব্যৰ্থ" -# -#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "গুপ্তশব্দ" +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "পাছৱাৰ্ডসমূহ" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "সংৰক্ষিত ব্যক্তিগত পাছৱাৰ্ডসমূহ, তথ্যসমূহ আৰু গোপন তথ্যসমূহ" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "বাবে IM একাওন্ট পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "পাছৱাৰ্ড অথবা গোপন" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "নেটৱাৰ্ক পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "সংৰক্ষিত টোকা" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "কি'ৰিং পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "ইনক্ৰিপষণ কি পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "কি' সংৰক্ষণ পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Gnome অনলাইন একাওন্ট পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "টেলিপেথী পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "তৎক্ষণাত বাৰ্তা পাছৱাৰ্ড" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "নেটৱাৰ্ক ব্যৱস্থাপক গোপণ" -#: ../gkr/seahorse-gkr-item-commands.c:78 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে '%s' গুপ্তশব্দ আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgstr "আপুনি কি নিশ্চিতৰূপে '%s' পাছৱাৰ্ড আঁতৰাবলৈ ইচ্ছুক?" -#: ../gkr/seahorse-gkr-item-commands.c:81 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "আপুনি নিশ্চিতৰূপে '%d' গুপ্তশব্দ আঁতৰাবলৈ ইচ্ছুক নেকি ?" -msgstr[1] "আপুনি চাবি নিশ্চিতৰূপে %d গুপ্তশব্দ আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgstr[0] "আপুনি নিশ্চিতৰূপে '%d' পাছৱাৰ্ড আঁতৰাবলৈ ইচ্ছুক?" +msgstr[1] "আপুনি নিশ্চিতৰূপে %d পাছৱাৰ্ড আঁতৰাবলৈ ইচ্ছুক?" #: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" -msgstr "এটা নেটৱৰ্ক শেয়াৰ বা তথ্যসমূহেৰ সৈতে সংযোগ স্থাপন কৰক" +msgstr "এটা নেটৱাৰ্ক অংশীদাৰী বা তথ্যসমূহৰ সৈতে সংযোগ স্থাপন কৰক" #: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" -msgstr "এটা ৱেবসাইটৰ সৈতে সংযোগ স্থাপন কৰক" +msgstr "এটা ৱেবছাইট অভিগম কৰক" #: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" -msgstr "এটা PGP চাবি খোলক" +msgstr "এটা PGP কি' খোলক" #: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" -msgstr "এটা Secure Shell চাবি খোলক" +msgstr "এটা সুৰক্ষিত শ্বেল কি' খোলক" #: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" -msgstr "সংৰক্ষিত গুপ্তশব্দ বা লগ-ইন" +msgstr "সংৰক্ষিত পাছৱাৰ্ড বা লগিন" #: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" -msgstr "নেটৱৰ্কৰ বৈশিষ্ট্য" +msgstr "নেটৱাৰ্কৰ তথ্যসমূহ" + +# +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "পাছৱাৰ্ড" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." -msgstr "গুপ্তশব্দ পৰিবৰ্তন কৰা সম্ভব নহয় ।" +msgstr "পাছৱাৰ্ড পৰিবৰ্তন কৰা সম্ভব নহয়।" -#: ../gkr/seahorse-gkr-item-properties.c:350 -msgid "Couldn't set description." -msgstr "বৰ্ণনা স্থাপন কৰা সম্ভব নহয় ।" +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 +msgid "Updating password" +msgstr "পাছৱাৰ্ড আপডেইট কৰা হৈছে" -#: ../gkr/seahorse-gkr-item-properties.c:654 -msgid "Couldn't set application access." -msgstr "এপ্লিকেশনৰ সংযোগ স্থাপন সম্ভব নহয় ।" +#: ../gkr/seahorse-gkr-item-properties.c:344 +msgid "Couldn't set description." +msgstr "বিৱৰণ স্থাপন কৰা সম্ভব নহয়।" -# #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "গুপ্তশব্দ:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "পথ: " - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "অনুমতি: " +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "কি'ৰ বৈশিষ্ট্যসমূহ" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "প্ৰযুক্তি বৈশিষ্ট্য:" +msgid "Use:" +msgstr "ব্যবহাৰ কৰক:" # #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "অনুপ্ৰয়োগ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "ধৰণ:" # #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "বিবৰণ" +msgid "Server:" +msgstr "চাৰ্ভাৰ:" -# #: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "কি" +msgid "Login:" +msgstr "লগিন:" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "কিৰ বৈশিষ্ট্য" +msgid "Show pass_word" +msgstr "পাছৱাৰ্ড দেখুৱাওক (_w)" +# #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "লগ-ইন:" +msgid "Password:" +msgstr "পাছৱাৰ্ড:" # #: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "সেৱক" +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "কি'" #: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "গুপ্তশব্দ প্ৰদৰ্শন কৰক(_w)" - -# -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "প্ৰকৃতি:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "ব্যবহাৰ কৰক:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "কাৰিকৰী বিৱৰণসমূহ:" # -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 -msgid "_Read" -msgstr "পড়া (_R)" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "বিবৰণসমূহ" -# -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Write" -msgstr "লেখা (_W)" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:20 -#| msgid "_Delete" -msgctxt "infinitive" -msgid "_Delete" -msgstr "মচি দিয়ক (_D)" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "এটা কি'ৰিং যি লগিনত স্বচালিতভাৱে আনলক হয়" -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "গুপ্তশব্দৰ তালিকা প্ৰস্তুতি" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "পাছৱাৰ্ডসমূহ সংৰক্ষণ কৰিবলে ব্যৱহৃত এটা কি'ৰিং" -#: ../gkr/seahorse-gkr-keyring.c:354 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format -msgid "Passwords: %s" -msgstr "গুপ্তশব্দ: %s" +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "আপুনি কি নিশ্চিতৰূপে '%s' পাছৱাৰ্ড কি'ৰিং আঁতৰাবলৈ ইচ্ছুক?" -#: ../gkr/seahorse-gkr-keyring.c:355 -#, c-format -msgid "Passwords: %s" -msgstr "গুপ্তশব্দ:: %s" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "মই বুজি পাও যে সকলো বস্তু স্থায়ীভাৱে মচি পেলোৱা হব।" -#: ../gkr/seahorse-gkr-keyring-commands.c:119 -msgid "Password Keyring" -msgstr "গুপ্তশব্দেৰ চাবিৰিং" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "কি'ৰিংৰ বৈশিষ্ট্য" -#: ../gkr/seahorse-gkr-keyring-commands.c:120 -msgid "Used to store application and network passwords" -msgstr "এপ্লিকেশন আৰু নেটৱৰ্কেৰ গুপ্তশব্দ সংৰক্ষণ কৰিবলৈ ব্যবহৃত হয়" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "নাম:" -#: ../gkr/seahorse-gkr-keyring-commands.c:121 -msgid "Stored Password" -msgstr "সংৰক্ষিত গুপ্তশব্দ" +# +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "সৃষ্টি কৰা হৈছিল:" -#: ../gkr/seahorse-gkr-keyring-commands.c:122 -msgid "Safely store a password or secret." -msgstr "গুপ্তশব্দ অথবা গোপন তথ্য নিৰাপদভাবে সংৰক্ষণ কৰক ।" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "কি'ৰিং" -#: ../gkr/seahorse-gkr-keyring-commands.c:136 -msgid "Couldn't unlock keyring" -msgstr "চাবিৰিং আন-লক কৰিবলৈ ব্যৰ্থ" +#: ../libegg/egg-datetime.c:317 +msgid "Display flags" +msgstr "ফ্লেগসমূহ দেখুৱাওক" -#: ../gkr/seahorse-gkr-keyring-commands.c:177 -msgid "Couldn't lock keyring" -msgstr "চাবিৰিং লক কৰিবলৈ ব্যৰ্থ" +#: ../libegg/egg-datetime.c:318 +msgid "Displayed date and/or time properties" +msgstr "তাৰিখ আৰু/অথবা সময় সংক্ৰান্ত প্ৰদৰ্শিত বৈশিষ্ট্য" -#: ../gkr/seahorse-gkr-keyring-commands.c:218 -msgid "Couldn't set default keyring" -msgstr "ডিফল্ট চাবিৰিং নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ" +#: ../libegg/egg-datetime.c:323 +msgid "Lazy mode" +msgstr "অলস অৱস্থা" -#: ../gkr/seahorse-gkr-keyring-commands.c:257 -msgid "Couldn't change keyring password" -msgstr "চাবিৰিং গুপ্তশব্দ পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ" +#: ../libegg/egg-datetime.c:324 +msgid "Lazy mode doesn't normalize entered date and time values" +msgstr "অলস অৱস্থাত সুমুৱা তাৰিখ আৰু সময় মানসমূহ স্বাভাৱিক নকৰে" -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "_Lock" -msgstr "লক কৰক (_L)" +# +#: ../libegg/egg-datetime.c:329 +msgid "Year" +msgstr "বছৰ" -#: ../gkr/seahorse-gkr-keyring-commands.c:289 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Lock the password storage keyring so a master password is required to unlock " -"it." +#: ../libegg/egg-datetime.c:330 +msgid "Displayed year" +msgstr "প্ৰদৰ্শিত বছৰ" # -#: ../gkr/seahorse-gkr-keyring-commands.c:290 -msgid "_Unlock" -msgstr "আনলক (_U)" +#: ../libegg/egg-datetime.c:335 +msgid "Month" +msgstr "মাহ" -#: ../gkr/seahorse-gkr-keyring-commands.c:291 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Unlock the password storage keyring with a master password so it is " -"available for use." +#: ../libegg/egg-datetime.c:336 +msgid "Displayed month" +msgstr "প্ৰদৰ্শিত মাহ" -#: ../gkr/seahorse-gkr-keyring-commands.c:292 -msgid "_Set as default" -msgstr "ডিফল্ট ৰূপে নিৰ্ধাৰণ কৰক (_S)" +#: ../libegg/egg-datetime.c:341 +msgid "Day" +msgstr "দিন" -#: ../gkr/seahorse-gkr-keyring-commands.c:293 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Applications usually store new passwords in the default keyring." - -#: ../gkr/seahorse-gkr-keyring-commands.c:294 -msgid "Change _Password" -msgstr "গুপ্তশব্দ পৰিবৰ্তন কৰক (_P)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:295 -msgid "Change the unlock password of the password storage keyring" -msgstr "Change the unlock password of the password storage keyring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:360 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে '%s' গুপ্তশব্দ চাবিৰিং আঁতৰাবলৈ ইচ্ছুক নেকি ?" - -# -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "Created:" -msgstr "নিমাৰ্ণেৰ সময়কাল:" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "চাবিৰিং" - -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "চাবিৰিংয়েৰ বৈশিষ্ট্য" - -# -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "নাম :(_N)" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "চাবি ৰিংৰ সৈতে সংযোগস্থাপন কৰিবলৈ দেওয়া নহয়" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring ডেমন স্বক্ৰিয় নয়" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "চাবি ৰিং-টি খোলা অবস্থায় ৰয়েছে" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "ঐ নামেৰ চাবি ৰিং অনুপস্থিত" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "চাবি ৰিং ডেমনৰ সৈতে সংযোগস্থাপন কৰা সম্ভব নহয়" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "এই বস্তুটি বৰ্তমানে উপস্থিত" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "gnome-keyring ব্যবহাৰ কৰিবলৈ অভ্যন্তৰীণ সমস্যা" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "সংৰক্ষণ কৰা হচ্ছে..." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "বস্তু মুছে ফেলা হচ্ছে..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "চাবিৰিং মুছে ফেলা হচ্ছে..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "গুপ্তশব্দ চাবিৰিংয়েৰ তালিকা প্ৰস্তুতি" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr " ।" - -#: ../libcryptui/cryptui-key-chooser.c:174 -#: ../libcryptui/cryptui-key-chooser.c:179 -msgid "All Keys" -msgstr "সৰ্বধৰনেৰ কি" - -#: ../libcryptui/cryptui-key-chooser.c:175 -#: ../libcryptui/cryptui-key-chooser.c:180 -msgid "Selected Recipients" -msgstr "নিৰ্বাচিত প্ৰাপক" - -# -#: ../libcryptui/cryptui-key-chooser.c:176 -#: ../libcryptui/cryptui-key-chooser.c:181 -msgid "Search Results" -msgstr "বিচাৰক ফলাফল" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:192 -msgid "Search _for:" -msgstr "অনুসন্ধান কৰা হ'ব: (_f)" - -#: ../libcryptui/cryptui-key-chooser.c:250 -msgid "None (Don't Sign)" -msgstr "শূণ্য (স্বাক্ষৰ কৰা ন'হ'ব)" - -#: ../libcryptui/cryptui-key-chooser.c:263 -#, c-format -msgid "Sign this message as %s" -msgstr "%s ৰূপে বাৰ্তা স্বাক্ষৰ কৰা হ'ব" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:285 -msgid "_Sign message as:" -msgstr "বাৰ্তা স্বাক্ষৰেৰ বাবে ব্যবহৃত হ'ব: (_S)" - -# -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:865 -msgid "Name" -msgstr "নাম" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1745 -#: ../src/seahorse-key-manager-store.c:877 -msgid "Key ID" -msgstr "চাবিৰ ID" - -#: ../libegg/egg-datetime.c:325 -msgid "Display flags" -msgstr "বৈশিষ্ট্য প্ৰদৰ্শন কৰক" - -#: ../libegg/egg-datetime.c:326 -msgid "Displayed date and/or time properties" -msgstr "তাৰিখ আৰু/অথবা সময় সংক্ৰান্ত প্ৰদৰ্শিত বৈশিষ্ট্য" - -#: ../libegg/egg-datetime.c:331 -msgid "Lazy mode" -msgstr "অলস মোড" - -#: ../libegg/egg-datetime.c:332 -msgid "Lazy mode doesn't normalize entered date and time values" -msgstr "Lazy mode doesn't normalize entered date and time values" - -# -#: ../libegg/egg-datetime.c:337 -msgid "Year" -msgstr "বছৰ" - -#: ../libegg/egg-datetime.c:338 -msgid "Displayed year" -msgstr "প্ৰদৰ্শিত বৎসৰ" - -# -#: ../libegg/egg-datetime.c:343 -msgid "Month" -msgstr "মাস" - -#: ../libegg/egg-datetime.c:344 -msgid "Displayed month" -msgstr "প্ৰদৰ্শিত মাস" - -#: ../libegg/egg-datetime.c:349 -msgid "Day" -msgstr "দিন" - -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" -msgstr "মাসেৰ প্ৰদৰ্শিত দিন" +msgstr "মাহৰ প্ৰদৰ্শিত দিন" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "ঘন্টা" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "প্ৰদৰ্শিত ঘন্টা" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "মিনিট" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "প্ৰদৰ্শিত মিনিট" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:359 msgid "Second" -msgstr "সেকন্ড" +msgstr "ছেকেণ্ড" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" -msgstr "প্ৰদৰ্শিত সেকেন্ড" +msgstr "প্ৰদৰ্শিত ছেকেণ্ড" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" -msgstr "বৎসৰেৰ সৰ্বনিম্ন মান" +msgstr "বছৰৰ সৰ্বনিম্ন মান" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" -msgstr "তাৰিখেৰ সৰ্বনিম্ন মানেৰ মধ্যে বৎসৰেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বনিম্ন মানৰ মাজত বছৰৰ অংশ" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" -msgstr "বৎসৰেৰ সৰ্বাধিক মান" +msgstr "বছৰৰ সৰ্বাধিক মান" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" -msgstr "তাৰিখেৰ সৰ্বাধিক মানেৰ মধ্যে বৎসৰেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বাধিক মানৰ মাজত বছৰৰ অংশ" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" -msgstr "মাসেৰ সৰ্বনিম্ন মান" +msgstr "মাহৰ সৰ্বনিম্ন মান" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" -msgstr "তাৰিখেৰ সৰ্বনিম্ন মানেৰ মধ্যে মাসেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বনিম্ন মানৰ মাজত মাহৰ অংশ" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" -msgstr "মাসেৰ সৰ্বাধিক মান" +msgstr "মাহৰ সৰ্বাধিক মান" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" -msgstr "তাৰিখেৰ সৰ্বাধিক মানেৰ মধ্যে মাসেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বাধিক মানৰ মাজত মাহৰ অংশ" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" -msgstr "দিনেৰ সৰ্বনিম্ন মান" +msgstr "দিনৰ সৰ্বনিম্ন মান" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" -msgstr "তাৰিখেৰ সৰ্বনিম্ন মানেৰ মধ্যে মাসেৰ দিনেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বনিম্ন মানৰ মাজত মাহৰ দিনৰ অংশ" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" -msgstr "দিনেৰ সৰ্বাধিক মান" +msgstr "দিনৰ সৰ্বাধিক মান" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" -msgstr "তাৰিখেৰ সৰ্বাধিক মানেৰ মধ্যে মাসেৰ দিনেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বাধিক মানৰ মাজত মাহৰ দিনৰ অংশ" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "ঘন্টাৰ সৰ্বনিম্ন মান" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" -msgstr "তাৰিখেৰ সৰ্বনিম্ন মানেৰ মধ্যে ঘন্টাৰ অংশ" +msgstr "তাৰিখৰ সৰ্বনিম্ন মানৰ মাজত ঘন্টাৰ অংশ" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "ঘন্টাৰ সৰ্বাধিক মান" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" -msgstr "তাৰিখেৰ সৰ্বাধিক মানেৰ মধ্যে ঘন্টাৰ অংশ" +msgstr "তাৰিখৰ সৰ্বাধিক মানৰ মাজত ঘন্টাৰ অংশ" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" -msgstr "মিনিটেৰ সৰ্বনিম্ন মান" +msgstr "মিনিটৰ সৰ্বনিম্ন মান" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" -msgstr "তাৰিখেৰ সৰ্বনিম্ন মানেৰ মধ্যে মিনিটেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বনিম্ন মানৰ মাজত মিনিটৰ অংশ" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" -msgstr "মিনিটেৰ সৰ্বাধিক মান" +msgstr "মিনিটৰ সৰ্বাধিক মান" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" -msgstr "তাৰিখেৰ সৰ্বাধিক মানেৰ মধ্যে মিনিটেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বাধিক মানৰ মাজত মিনিটৰ অংশ" -#: ../libegg/egg-datetime.c:433 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" -msgstr "সেকেন্ডেৰ সৰ্বনিম্ন মান" +msgstr "ছেকেণ্ডৰ সৰ্বনিম্ন মান" -#: ../libegg/egg-datetime.c:434 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" -msgstr "তাৰিখেৰ সৰ্বনিম্ন মানেৰ মধ্যে সেকেন্ডেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বনিম্ন মানৰ মাজত ছেকেণ্ডৰ অংশ" -#: ../libegg/egg-datetime.c:439 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" -msgstr "সেকেন্ডেৰ সৰ্বাধিক মান" +msgstr "ছেকেণ্ডৰ সৰ্বাধিক মান" -#: ../libegg/egg-datetime.c:440 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" -msgstr "তাৰিখেৰ সৰ্বাধিক মানেৰ মধ্যে সেকেন্ডেৰ অংশ" +msgstr "তাৰিখৰ সৰ্বাধিক মানৰ মাজত ছেকেণ্ডৰ অংশ" #. Translate to calendar:week_start:1 if you want Monday to be the #. * first day of the week; otherwise translate to calendar:week_start:0. #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:482 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:0" # -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "তাৰিখ" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" -msgstr "সৰাসৰি তাৰিখ লিখক" +msgstr "প্ৰত্যক্ষভাৱে তাৰিখ লিখক" # -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" -msgstr "তাৰিখ নিৰ্বাচন কৰক" +msgstr "তাৰিখ বাছক" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" -msgstr "বৰ্ষপঞ্জি থেকে তাৰিখ নিৰ্বাচন কৰক" +msgstr "এটা কেলেন্ডাৰ পৰা তাৰিখ বাছক" # -#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "সময়" -#: ../libegg/egg-datetime.c:529 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" -msgstr "সৰাসৰি সময় লিখক" +msgstr "প্ৰত্যক্ষভাৱে সময় লিখক" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" -msgstr "সময় নিৰ্বাচন কৰক" +msgstr "সময় বাছক" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" -msgstr "তালিকা থেকে সময় নিৰ্বাচন কৰক" +msgstr "এটা তালিকা পৰা সময় বাছক" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:810 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: no" -#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274 -#: ../libegg/egg-datetime.c:1278 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "AM" -#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275 -#: ../libegg/egg-datetime.c:1282 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "PM" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:824 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:827 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:831 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:834 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1190 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1255 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "বৈধ .desktop ফাইল নহয় " +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "প্ৰাৰম্ভিক অস্থায়ী বস্তু" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "ডেস্কটপ ফাইলেৰ অজ্ঞাত সংস্কৰণ '%s'" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "কি' চাৰ্ভাৰ যোগ কৰক" -#: ../libegg/eggdesktopfile.c:968 -#, c-format -msgid "Starting %s" -msgstr "%s আৰম্ভ কৰা হৈছে" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "কি' চাৰ্ভাৰৰ ধৰণ:" -#: ../libegg/eggdesktopfile.c:1110 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "এই এপ্লিকেশন দ্বাৰা আদেশ-শাৰীেৰ মাধ্যমে নথিপত্ৰ গ্ৰহণ কৰা হয় না" +# +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "হস্ট:" -#: ../libegg/eggdesktopfile.c:1178 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "প্ৰাৰম্ভকালীন বিকল্প পৰিচিত নহয় : %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1383 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "'Type=Link' ডেস্কটপ এনট্ৰিৰ ক্ষেত্ৰত ডকুমেন্টেৰ URI উল্লেখ কৰা যাব না" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "চাৰ্ভাৰ ব্যৱহাৰৰ বাবে চিহ্নিত পোৰ্ট।" -#: ../libegg/eggdesktopfile.c:1404 -#, c-format -msgid "Not a launchable item" -msgstr "প্ৰাৰম্ভ কৰাৰ যোগ্য বস্তু নহয় " +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "এই এপ্লিকেচনৰ সংস্কৰণ সংখ্যা" -# -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "অধিবেশন পৰিচালন ব্যৱস্থাৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হ'ব" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- চিস্টেম সংহতিসমূহ" -# -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "সংৰক্ষিত বিন্যাস সহ নথিপত্ৰ চিহ্নিত কৰক" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "বৰঙণিসমূহ:" + +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "পাছৱাৰ্ডসমূহ আৰু কি'সমূহ" # -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "ফাইল: [1]" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat." +"com)" # -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "অধিবেশন পৰিচালনাৰ ID উল্লেখ কৰক" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse প্ৰকল্পৰ ঘৰ-পৃষ্ঠা" -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314 -msgid "ID" -msgstr "ID" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "মচিব নোৱাৰি" -# -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "অধিবেশন পৰিচালনা সংক্ৰান্ত বিকল্প:" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "কি' এক্সপোৰ্ট কৰিবলৈ বিফল" + +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "তথ্য এক্সপোৰ্ট কৰিব নোৱাৰি" # -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "অধিবেশন পৰিচালনা সংক্ৰান্ত বিকল্প প্ৰদৰ্শন কৰা হ'ব" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "ফাইল (_F)" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "এক্সপোৰ্ট কৰক (_x)..." -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "চাবিসেৱক যোগ কৰক" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ফাইললে এক্সপোৰ্ট কৰক" # -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "গৃহস্থ:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "চাবিসেৱকেৰ ধৰন:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "সম্পাদনা (_E)" -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "সেৱক ব্যবহাৰেৰ বাবে চিহ্নিত পোৰ্ট ।" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "ক্লিপবৰ্ডত কপি কৰক" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "প্ৰাৰম্ভিক অস্থায়ী বস্তু" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "মচি পেলাওক (_D)" -# -#: ../libseahorse/seahorse-notification.c:576 -#: ../libseahorse/seahorse-notification.c:604 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "চাবি ইম্পোৰ্ট কৰা হৈছে" -msgstr[1] "চাবি ইম্পোৰ্ট কৰা হৈছে" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "নিৰ্বাচিত সামগ্ৰী মচি পেলাওক" -#: ../libseahorse/seahorse-notification.c:580 -#: ../libseahorse/seahorse-notification.c:603 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "%i-টি চাবি ইম্পোৰ্ট কৰা হৈছে" -msgstr[1] "%i-টি চাবি ইম্পোৰ্ট কৰা হৈছে" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "এই বস্তুৰ বৈশিষ্ট্যসমূহ দেখুৱাওক" -#: ../libseahorse/seahorse-notification.c:582 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "চিহ্নিত বস্তুৰ বাবে চাবি ইম্পোৰ্ট কৰা হৈছে" -msgstr[1] "চিহ্নিত বস্তুৰ বাবে চাবি ইম্পোৰ্ট কৰা হৈছে" +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "এই কি'ৰিংৰ বৈশিষ্ট্যসমূহ দেখুৱাওক" # -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "সূচনামূলক বাৰ্তা" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "পছন্দসমূহ (_n)" -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "Symmetric Key" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "এই প্ৰগ্ৰামৰ বাবে পছন্দসমূহ পৰিবৰ্তন কৰক" # -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "সাৰ্বজনীন কি" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "দৰ্শন (_V)" # -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "গোপনীয় কি" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "সহায় (_H)" -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "Credentials" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "এই প্ৰগ্ৰামৰ বিষয়ে" # -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "পৰিচয়" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "সমল (_C)" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Seahorse সংক্ৰান্ত সহায়তা প্ৰদৰ্শন কৰা হ'ব" # -#: ../libseahorse/seahorse-passphrase.c:200 -msgid "Passphrase" -msgstr "পৰিচিত-পংক্তি" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "এক্সপোৰ্ট কৰক" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "PIN অথবা পাছৱাৰ্ড সুমুৱাওক: %s" # -#: ../libseahorse/seahorse-passphrase.c:203 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" -msgstr "গুপ্তশব্দ:" +msgstr "পাছৱাৰ্ড:" -#: ../libseahorse/seahorse-passphrase.c:269 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" -msgstr "নিশ্চায়ণ:" +msgstr "নিশ্চিত কৰক:" -#: ../libseahorse/seahorse-prefs.c:62 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." -msgstr "চাবি সেৱকেৰ বৈধ ঠিকানা নয়" +msgstr "এটা বৈধ কি' চাৰ্ভাৰৰ ঠিকনা নহয়" -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." -msgstr "" -"সাহায্যেৰ বাবে সিস্টেম এডমিনিস্ট্ৰেটৰ অথবা চাবিসেৱকেৰ এডমিনিস্ট্ৰেটৰেৰ সৈতে " -"যোগাযোগ কৰক ।" +msgstr "সহায়ৰ বাবে চিস্টেম প্ৰশাসক অথবা কি' চাৰ্ভাৰৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।" -#: ../libseahorse/seahorse-prefs.c:172 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "URL" # -#: ../libseahorse/seahorse-prefs.c:352 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" -msgstr "নিজস্ব" +msgstr "স্বনিৰ্বাচিত" -#: ../libseahorse/seahorse-prefs.c:425 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" -msgstr "শূণ্য: চাবি প্ৰকাশ কৰা ন'হ'ব" +msgstr "শূণ্য: কি' প্ৰকাশ নকৰিব" +# #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "চাবিৰিং থেকে স্বয়ংক্ৰিয়ভাবে চাবি প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ (_k)" +msgid "Preferences" +msgstr "পছন্দসমূহ" #: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "পৰিবৰ্তিত চাবিগুলি স্বয়ংক্ৰিয়ভাবে চাবিসেৱকেৰ সৈতে সুসংগত কৰা হ'ব (_m)" +msgid "_Find keys via:" +msgstr "কি' সন্ধানৰ মাধ্যম (_F):" #: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "চাবিসেৱক" +msgid "_Publish keys to:" +msgstr "কি'সমূহ প্ৰকাশিত কৰা হ'ব (_P):" -# #: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "পছন্দ" +msgid "Automatically retrieve keys from _key servers" +msgstr "কি'ৰিং পৰা স্বচালিতভাবে কি' প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ (_k)" #: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "চাবি অনুসন্ধানেৰ মাধ্যম: (_F)" +msgid "Automatically synchronize _modified keys with key servers" +msgstr "পৰিবৰ্তিত কি'সমূহ স্বচালিতভাবে কি' চাৰ্ভাৰৰ সৈতে সংমিহলি কৰা হ'ব (_m)" #: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "চিহ্নিত চাবিসেৱকে উপস্থিত চাবি প্ৰকাশিত কৰা হ'ব: (_P)" - -# -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "প্ৰগতিসূচক শিৰোনাম" - -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "উপলব্ধ নয়" +msgid "Key Servers" +msgstr "কি' চাৰ্ভাৰসমূহ" -#: ../libseahorse/seahorse-util.c:240 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:516 -msgid "Key Data" -msgstr "চাবিৰ তথ্য" - -#: ../libseahorse/seahorse-util.c:518 -msgid "Multiple Keys" -msgstr "একাধিক কি" - -# -#: ../libseahorse/seahorse-util.c:774 -msgid "Couldn't run file-roller" -msgstr "file-roller সঞ্চালন কৰিবলৈ ব্যৰ্থ" - -# -#: ../libseahorse/seahorse-util.c:780 -msgid "Couldn't package files" -msgstr "ফাইল প্যাকেজ কৰিবলৈ ব্যৰ্থ" - -# -#: ../libseahorse/seahorse-util.c:781 -msgid "The file-roller process did not complete successfully" -msgstr "file-roller-ৰ কৰ্ম সাফল্যিৰ সৈতে সমাপ্ত নহয়" - -# -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:957 -msgid "All key files" -msgstr "সৰ্বধৰনেৰ চাবি ৰ ফাইল" - -# -#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "সৰ্বধৰনৰ নথিপত্ৰ" - -# -#: ../libseahorse/seahorse-util.c:1009 -msgid "Archive files" -msgstr "আৰ্কাইভ ফাইল" - -# -#: ../libseahorse/seahorse-util.c:1079 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"এই নামেৰ এটা ফাইল বৰ্তমানে উপস্থিত ৰয়েছে ।\n" -"\n" -"এই ফাইলটিৰ পৰিবৰ্তে নতুন ফাইলটি স্থাপন কৰা হ'ব কি?" - -# -#: ../libseahorse/seahorse-util.c:1082 -msgid "_Replace" -msgstr "প্ৰতিস্থাপন (_R)" - # #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1133 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "অজ্ঞাত" # #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1139 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" -msgstr "কখনো নয়" +msgstr "কেতিয়াও নহয়" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1146 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "আংশিক" # #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1152 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "পূৰ্ণ" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1158 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" -msgstr "Ultimate" +msgstr "চৰম" # #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" -msgstr "নিষ্ক্ৰিয়" +msgstr "অসামৰ্থবান" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1347 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "প্ৰত্যাখ্যাত" -#: ../libseahorse/seahorse-widget.c:480 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" -msgstr "সহায়িকা প্ৰদৰ্শন কৰা গেল না: %s" +msgstr "সহায়িকা প্ৰদৰ্শন কৰা নগল: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "মেয়াদপূৰ্তীৰ তাৰিখ:" +msgid "Never E_xpires" +msgstr "কেতিয়াও অৱসান নঘটে (_x)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "নতুন সাব-চাবি নিৰ্মাণ কৰক" +msgid "If key never expires" +msgstr "কি'ৰ মেয়াদ কেতিয়াও পূৰ্ণ না হ'লে" #: ../pgp/seahorse-add-subkey.xml.h:3 -msgid "If key never expires" -msgstr "চাবিৰ মেয়াদ কখনো পূৰ্ণ না হ'লে" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "কি'ৰ ধৰণ (_T):" #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" -msgstr "চাবিৰ দৈৰ্ঘ্য: (_L)" +msgstr "কি'ৰ দৈৰ্ঘ্য (_L):" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "চাবিৰ ধৰন: (_T)" +msgid "Expiration Date:" +msgstr "অৱসানৰ তাৰিখ:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" -msgstr "চাবিৰ দৈৰ্ঘ্য" +msgstr "কি'ৰ দৈৰ্ঘ্য" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "মেয়াদ পূৰ্ণ ন'হ'ব (_x)" +msgid "Generate a new subkey" +msgstr "নতুন উপ-কি' সৃজন কৰক" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "ব্যবহাৰকাৰীৰ ID যোগ কৰক" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "নতুন ব্যবহাৰকাৰীৰ ID তৈৰি কৰক" +msgid "Must be at least 5 characters long" +msgstr "অন্তত ৫ অক্ষৰ বিশিষ্ট হোৱা আবশ্যক" -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "সম্পূৰ্ণ নাম: (_N)" +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "বৈকল্পিক ই-মেইল ঠিকনা" #: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "চাবি সংক্ৰান্ত বিবৃতি: (_m)" - -#: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "অন্তত ৫ অক্ষৰ বিশিষ্ট হওয়া আবশ্যক" - -#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Optional comment describing key" -msgstr "চাবিৰ বিবৰণ উল্লেখকাৰী বিবৃতি (ঐচ্ছিক)" +msgstr "কি'ৰ বিবৰণ উল্লেখকাৰী বৈকল্পিক মন্তব্য" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "ই-মেইল ঠিকানা (ঐচ্ছিক)" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "সম্পূৰ্ণ নাম (_N):" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" -msgstr "ই-মেইল ঠিকানা: (_E)" +msgstr "ই-মেইল ঠিকনা (_E):" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "কি'ৰ মন্তব্য (_m):" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "নতুন ব্যবহাৰকাৰীৰ ID সৃষ্টি কৰক" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "পৰিবৰ্তন কৰক (_h)" +msgid "_Never expires" +msgstr "কেতিয়াও অৱসান নঘটিব (_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" -msgstr "চাবি প্ৰত্যাখ্যান কৰক" +msgstr "কি' প্ৰত্যাহাৰ কৰক" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "মেয়াদ পূৰ্ণ ন'হ'ব (_N)" +msgid "C_hange" +msgstr "পৰিবৰ্তন কৰক (_h)" -#: ../pgp/seahorse-gpgme-add-subkey.c:147 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" -msgstr "সাব-চাবি যোগ কৰা নাযায়" +msgstr "উপ-কি' যোগ কৰা নাযায়" -#: ../pgp/seahorse-gpgme-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" -msgstr "%s-এ সাব-চাবি যোগ কৰক" +msgstr "%s লে উপ-কি' যোগ কৰক" -#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (অকল স্বাক্ষৰ)" -#: ../pgp/seahorse-gpgme-add-subkey.c:190 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (অকল এনক্ৰিপশন)" -#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (অকল স্বাক্ষৰ)" -#: ../pgp/seahorse-gpgme-add-subkey.c:202 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (অকল এনক্ৰিপশন)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "ব্যবহাৰকাৰীৰ id যোগ কৰিবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" -msgstr "Add user ID to %s" +msgstr "%s লে ব্যৱহাৰকাৰী ID যোগ কৰক" # -#: ../pgp/seahorse-gpgme.c:72 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." -msgstr "ডিক্ৰিপশন কৰিবলৈ ব্যৰ্থ । সম্ভবত ডিক্ৰিপশন-চাবি উপস্থিত নেই ।" +msgstr "ডিক্ৰিপশন কৰিবলৈ ব্যৰ্থ। সম্ভবত ডিক্ৰিপশন-কি উপস্থিত নাই।" -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "কাৰ্য্য বাতিল কৰা হৈছিল।" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" -msgstr "মেয়াদপূৰ্তীৰ তাৰিখ বৈধ নয়" +msgstr "অৱসানৰ তাৰিখ বৈধ নহয়" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" -msgstr "মেয়াদপূৰ্তীৰ ক্ষেত্ৰত ভবিষ্যতেৰ এটা তাৰিখ নিৰ্ধাৰণ কৰা আবশ্যক" +msgstr "অৱসানৰ ক্ষেত্ৰত ভৱিষ্যতৰ এটা তাৰিখ নিৰ্ধাৰণ কৰা আবশ্যক" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" -msgstr "মেয়াদপূৰ্তীৰ তাৰিখ পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ" +msgstr "অৱসানৰ তাৰিখ পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" -msgstr "মেয়াদপূৰ্তী: %s" +msgstr "অৱসান: %s" + +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "একাধিক কি'" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "কি'ৰ তথ্য" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "কৱচিত PGP কি'সমূহ" -#: ../pgp/seahorse-gpgme-generate.c:79 +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP কি'সমূহ" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" -msgstr "PGP-কি" +msgstr "PGP-কি'" -#: ../pgp/seahorse-gpgme-generate.c:80 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "ই-মেইল আৰু ফাইল এনক্ৰিপ্ট কৰিবলৈ ব্যবহৃত" -#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:117 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" -msgstr "PGP-চাবি নিৰ্মাণ কৰিবলৈ ব্যৰ্থ" +msgstr "PGP-কি' সৃষ্টি কৰিবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-gpgme-generate.c:195 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" -msgstr "নতুন PGP-কিৰ পৰিচয়-পংক্তি" +msgstr "নতুন PGP-কি'ৰ পাচফ্ৰেইছ" -#: ../pgp/seahorse-gpgme-generate.c:196 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." -msgstr "নতুন চাবিৰ পৰিচয়-পংক্তি দুইবাৰ লেখা আবশ্যক ।" +msgstr "নতুন কি'ৰ পাচফ্ৰেইছ দুবাৰ লিখা আবশ্যক।" -#: ../pgp/seahorse-gpgme-generate.c:205 -msgid "Couldn't generate key" -msgstr "চাবি নিৰ্মাণ কৰিবলৈ ব্যৰ্থ" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"এটা কি' সৃষ্টি কৰোতে আমাৰ ভালেমান যাদৃচ্ছিক তথ্য সৃজন কৰাৰ\n" +"প্ৰয়োজন হয় আৰু আমি আপোনাৰ সহায় বিচাৰো। কিছুমান অন্য কাৰ্য্য\n" +"কৰা যেনে কিবৰ্ডত টাইপ কৰা, মাউছ গমন কৰোৱা, এপ্লিকেচনসমূহ ব্যৱহাৰ\n" +"কৰাটো এটা ভাল বুদ্ধি। ই চিস্টেমক তাৰ প্ৰয়োজনীয় যাদৃচ্ছিক তথ্য প্ৰদান কৰে।" -#: ../pgp/seahorse-gpgme-generate.c:207 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" -msgstr "চাবি নিৰ্মাণ কৰিবলৈ ব্যৰ্থ" +msgstr "কি' সৃষ্টি কৰিবলৈ ব্যৰ্থ" + +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "আপুনি কি' নিশ্চিতৰূপে %s স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "আপুনি নিশ্চিতৰূপে %d কি'সমূহক স্থায়ীৰূপে আঁতৰাবলৈ ইচ্ছুক নে?" +msgstr[1] "আপুনি নিশ্চিতৰূপে %d কি'সমূহক স্থায়ীৰূপে আঁতৰাবলৈ ইচ্ছুক নে?" -#: ../pgp/seahorse-gpgme-key-op.c:301 -#| msgid "Show pass_word" +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" -msgstr "ভুল পাছওৱাৰ্ড" +msgstr "ভুল পাছৱাৰ্ড" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" -"এইটো লৈ তিনি নম্বৰ বাৰ আপুনি ভুল পাছওৱাৰ্ড সোমাইছে। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।" +"এইটো লৈ তিনি নম্বৰ বাৰ আপুনি ভুল পাছৱাৰ্ড সুমুৱাইছে। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।" + +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "ভুল পাচফ্ৰেইছ।" + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' ৰ বাবে নতুন পাচফ্ৰেইছ লিখক" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' ৰ পাচফ্ৰেইছ লিখক" + +# +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "নতুন পাচফ্ৰেইছ লিখক" + +# +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "পাচফ্ৰেইছ লিখক" + +# +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "পাচফ্ৰেইছ" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d কি' ল'ড কৰা হৈছে" +msgstr[1] "%d কি'সমূহ ল'ড কৰা হৈছে" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"অবৈধ কি' তথ্য (সন্ধানহিন UIDs)। ই এটা কমপিউটাৰ যাৰ তাৰিখ ভৱিষ্যতত সংহতি কৰা আছে " +"অথবা এটা সন্ধানহিন স্ব-স্বাক্ষৰৰ বাবে হব পাৰে।" + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG কি'সমূহ" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: অবিকল্পিত কি'ৰিং ডাইৰেকটৰি" #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format @@ -1562,12 +1132,12 @@ "The photo is too large\n" "The recommended size for a photo on your key is %d x %d pixels." msgstr "" -"ফোটোৰ মাপ অত্যন্ত বড়\n" -"চাবিৰ বাবে ফোটোৰ প্ৰস্তাবিত মান হল %d x %d পিক্সেল ।" +"ফটোৰ মাপ অত্যন্ত ডাঙৰ\n" +"কি'ৰ বাবে ফটোৰ প্ৰস্তাবিত মান হল %d x %d পিক্সেল।" #: ../pgp/seahorse-gpgme-photos.c:78 msgid "_Don't Resize" -msgstr "মাপ পৰিবৰ্তন কৰা ন'হ'ব (_D)" +msgstr "মাপ পৰিবৰ্তন কৰা নহব (_D)" # #: ../pgp/seahorse-gpgme-photos.c:79 @@ -1580,801 +1150,847 @@ "This is not a image file, or an unrecognized kind of image file. Try to use " "a JPEG image." msgstr "" -"এটি সম্ভবত ছবিৰ ফাইল নয় অথবা পৰিচিত ধৰনেৰ ছবিৰ ফাইল নয় । JPEG ছবিৰ ব্যবহাৰেৰ " -"প্ৰয়াস কৰক ।" +"এইটো সম্ভবত ছবিৰ ফাইল নহয় অথবা পৰিচিত ধৰণৰ ছবিৰ ফাইল নহয়। JPEG ছবিৰ " +"ব্যৱহাৰৰ চেষ্টা কৰক।" #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" -msgstr "সৰ্বধৰনেৰ ছবিৰ ফাইল" +msgstr "সকলো ছবিৰ ফাইল" #: ../pgp/seahorse-gpgme-photos.c:237 msgid "All JPEG files" -msgstr "সৰ্বধৰনেৰ JPEG ফাইল" +msgstr "সকলো JPEG ফাইল" + +# +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "সকলো ফাইল" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" -msgstr "চাবিৰ সৈতে যোগ কৰাৰ উদ্দেশ্যে ফোটো নিৰ্বাচন কৰক" +msgstr "কি'ৰ সৈতে যোগ কৰাৰ বাবে ফটো বাছক" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +msgid "Couldn't prepare photo" +msgstr "ফটো প্ৰস্তুত কৰিব নোৱাৰি" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "ছবি যোগ কৰিবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" -msgstr "ফাইল লোড কৰা নাযায় । সম্ভবত বৈধ বিন্যাস নয় ।" +msgstr "ফাইল ল'ড কৰা নাযায়। সম্ভবত বৈধ বিন্যাস নহয়।" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে চাবি থেকে বৰ্তমান ফোটো আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgstr "আপুনি কি নিশ্চিতৰূপে কি' পৰা বৰ্তমান ফটো আঁতৰাবলৈ ইচ্ছুক?" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "ছবি আঁতৰাবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" -msgstr "সাব-চাবি প্ৰত্যাখ্যান কৰিবলৈ ব্যৰ্থ" +msgstr "উপ-কি' প্ৰত্যাহাৰ কৰিবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" -msgstr "প্ৰত্যাখ্যান কৰক: %s" +msgstr "প্ৰত্যাহাৰ কৰক: %s" # -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "বিনা কাৰণে" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" -msgstr "চাবি প্ৰত্যাখ্যানেৰ কোনো কাৰণ নেই" +msgstr "কি' প্ৰত্যাহাৰৰ কোনো কাৰণ নাই" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" -msgstr "Compromised" +msgstr "আপোচ কৰা" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" -msgstr "Key has been compromised" +msgstr "কি' আপোচ কৰা হৈছে" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" -msgstr "Superseded" +msgstr "প্ৰতিস্থাপিত" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" -msgstr "Key has been superseded" +msgstr "কি' প্ৰতিস্থাপিত হৈছে" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" -msgstr "ব্যবহৃত নয়" +msgstr "ব্যবহৃত নহয়" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" -msgstr "এই চাবি এখন ব্যবহত হয় না" +msgstr "এই কি' এতিয়া ব্যবহত নহয়" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " "undone! Are you sure you want to continue?" msgstr "" -"You are about to add %s as a revoker for %s. This operation cannot be " -"undone! Are you sure you want to continue?" +"আপুনি %s ক %s ৰ বাবে এজন প্ৰত্যাখক হিচাপে যোগ কৰিব লৈছে। এই কাৰ্য্য বাতিল কৰিব " +"নোৱাৰি! আপুনি চলাই নিবলে নিশ্চিত নে?" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" -msgstr "Couldn't add revoker" +msgstr "প্ৰত্যাখক যোগ কৰিব পৰা নগল" + +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "মই বুজি পাও যে এই গোপণ কি' স্থায়ীভাৱে মচি পেলোৱা হব।" -#: ../pgp/seahorse-gpgme-sign.c:99 +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" "\"%s\"" msgstr "" -"এইটো চাবি ইতিমধ্যে স্বাক্ষৰিত কৰা হৈছে\n" +"এইটো কি' ইতিমধ্যে স্বাক্ষৰিত কৰা হৈছে\n" "\"%s\" দ্বাৰা" -#: ../pgp/seahorse-gpgme-sign.c:103 +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" -msgstr "চাবি স্বাক্ষৰ কৰিবলৈ ব্যৰ্থ" +msgstr "কি' স্বাক্ষৰ কৰিবলৈ ব্যৰ্থ" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" -msgstr "স্বাক্ষৰেৰ বাবে কোনো চাবি ব্যবহাৰযোগ্য নয়" +msgstr "স্বাক্ষৰৰ বাবে কোনো কি ব্যবহাৰযোগ্য নহয়" -#: ../pgp/seahorse-gpgme-sign.c:158 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "" -"You have no personal PGP keys that can be used to indicate your trust of " -"this key." +"আপোনাৰ ওচৰত কোনো ব্যক্তিগত PGP কি' নাই যাক এই কি'ৰ বাবে আপোনাৰ ভৰষা চিনাক্তকৰাৰ " +"কাৰণে ব্যৱহাৰ কৰিব পাৰি।" -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "ভুল পৰিচিতি-পংক্তি ।" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s'-ৰ বাবে নতুন পৰিচিতি-পংক্তি লিখক" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"সুনিৰ্দিষ্ট সন্ধান প্ৰয়োগ কৰা নহয়। '%s' চাৰ্ভাৰ দ্বাৰা একাধিক কি' বিচাৰি পোৱা গৈছে।" -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s'-ৰ পৰিচিতি-পংক্তি লিখক" +msgid "Couldn't communicate with server '%s': %s" +msgstr "'%s' চাৰ্ভাৰৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ: %s" + +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP কি' চাৰ্ভাৰ" # -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "নতুন পৰিচিতি-পংক্তি লিখক" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "কি' ইমপোৰ্ট কৰিবলৈ ব্যৰ্থ" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "কি' চাৰ্ভাৰ পৰা কি ইমপোৰ্ট কৰাৰ প্ৰণালী" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "দূৰবৰ্তী (_R)" # -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "পৰিচিতি-পংক্তি লিখক" +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "এই উইন্ডোটো বন্ধ কৰক" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 -#, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d-টি চাবি লোড কৰা হৈছে" -msgstr[1] "%d-টি চাবি লোড কৰা হৈছে" +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "দূৰবৰ্তী কি সন্ধান কৰক...(_F)" -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "চাবি লোড কৰা হচ্ছে..." +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "কি' চাৰ্ভাৰৰ মাজত কি সন্ধান কৰক" -#: ../pgp/seahorse-gpgme-source.c:820 -msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +# +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "ইমপোৰ্ট (_I)" -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544 -msgid "Importing Keys" -msgstr "চাবি ইম্পোৰ্ট কৰা হচ্ছে" - -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "চাবি এক্সপোৰ্ট কৰা হচ্ছে" +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "নিৰ্বাচিত কি'সমূহ স্থানীয় কি'ৰিংৰ মাজত ইমপোৰ্ট কৰক" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "দূৰবৰ্তী কি'" -#: ../pgp/seahorse-hkp-source.c:387 +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"সুনিৰ্দিষ্ট অনুসন্ধান প্ৰয়োগ কৰা নহয় । '%s' সেৱক দ্বাৰা একাধিক চাবি সনাক্ত হৈছে ।" +msgid "Remote Keys Containing '%s'" +msgstr "'%s' সহ দূৰবৰ্তী কি'" -#: ../pgp/seahorse-hkp-source.c:389 -#, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "'%s' সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ: %s" +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "কি'সমূহৰ বাবে সন্ধান ব্যৰ্থ হল।" -#: ../pgp/seahorse-hkp-source.c:671 -msgid "Searching for keys..." -msgstr "চাবি অনুসন্ধান কৰা হচ্ছে..." +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "দূৰবৰ্তী কি' সন্ধান কৰক" -#: ../pgp/seahorse-hkp-source.c:759 -msgid "Uploading keys..." -msgstr "চাবি আপলোড কৰা হচ্ছে..." +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "" +"ইয়াৰ দ্বাৰা ইন্টাৰনেটৰ অন্যৰ বাবে কি' সন্ধান কৰা হ'ব। ইয়াৰ পিছত স্থানীয় কি'ৰিংৰ " +"মাজত এই কি' ইমপোৰ্ট কৰা হ'ব।" -#: ../pgp/seahorse-hkp-source.c:857 -msgid "Retrieving keys..." -msgstr "চাবি পুনৰুদ্ধাৰ কৰা হচ্ছে..." +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "অন্তৰ্ভুক্ত কৰা কি'সমূহ সন্ধান কৰক (_S): " -#: ../pgp/seahorse-hkp-source.c:987 -#, c-format -msgid "Searching for keys on: %s" -msgstr "চিহ্নিত স্থানে চাবি অনুসন্ধান কৰা হচ্ছে: %s" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "কি' চাৰ্ভাৰসমূহ:" -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154 -#: ../pgp/seahorse-ldap-source.c:668 -#, c-format -msgid "Connecting to: %s" -msgstr "সংযোগ স্থাপন কৰা হচ্ছে: %s" +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "মোৰ ওচৰত থকা অংশীদাৰী কি'সমূহ:" -#: ../pgp/seahorse-hkp-source.c:1184 -msgid "HTTP Key Server" -msgstr "HTTP চাবিসেৱক" +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "কত সন্ধান কৰা হব:" -#: ../pgp/seahorse-ldap-source.c:459 -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "'%s'-ৰ সৈতে সংযোগ কৰিবলৈ ব্যৰ্থ: %s" +# +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "সন্ধান (_S)" -#: ../pgp/seahorse-ldap-source.c:641 -#, c-format -msgid "Couldn't resolve address: %s" -msgstr "চিহ্নিত ঠিকানা মীমাংসা কৰিবলৈ ব্যৰ্থ: %s" +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "চাৰ্ভাৰ কি' প্ৰকাশ কৰিবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Resolving server address: %s" -msgstr "সেৱকেৰ ঠিকানা মীমাংসা কৰিবলৈ ব্যৰ্থ: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "চাৰ্ভাৰ পৰা কি' উদ্ধাৰ কৰিবলৈ ব্যৰ্থ: %s" -#: ../pgp/seahorse-ldap-source.c:955 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Searching for keys containing '%s'..." -msgstr "'%s' সহ চাবি অনুসন্ধান কৰা হ'ব..." +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "সংমিহলি কৰাৰ বাবে %d কি' নিৰ্বাচন কৰা হৈছে।" +msgstr[1] "সংমিহলি কৰাৰ বাবে %d কি' নিৰ্বাচন কৰা হৈছে।" -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "চাবিid '%s' অনুসন্ধান কৰক..." +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "কি' সুসংগতি..." -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "দূৰবৰ্তী-চাবি উদ্ধাৰ কৰা হচ্ছে..." +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "কি' সংমিহলি কৰক" -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "চাবিসেৱকে চাবি পাঠানো হচ্ছে..." +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"ই কি'সমূহক আপোনাৰ কি' ৰিংত প্ৰকাশ কৰিব যাতে সিহত অন্যৰ ব্যৱহাৰৰ বাবে উপলব্ধ থাকে। " +"আপুনি লগতে অন্য কৰা যিকোনো পৰিবৰ্তন প্ৰাপ্ত কৰিব যিহেতু আপুনি সিহতৰ কি'সমূহ গ্ৰহণ " +"কৰিছে।" -#: ../pgp/seahorse-ldap-source.c:1423 -msgid "LDAP Key Server" -msgstr "LDAP চাবিসেৱক" +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"ই অন্য কৰা যিকোনো পৰিবৰ্তন উদ্ধাৰ কৰিব যিহেতু আপুনি সিহতৰ কি গ্ৰহণ কৰিছে। কোনো কি' " +"চাৰ্ভাৰক প্ৰকাশনৰ বাবে নিৰ্বাচন কৰা হোৱা নাই, সেয়েহে আপোনাৰ কি'সমূহ অন্যলে উপলব্ধ " +"কৰোৱা নহব।" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "চাবি স্বাক্ষৰ কৰক...(_S)" +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "কি' চাৰ্ভাৰসমূহ (_K)" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "সাৰ্বজনীন-চাবি স্বাক্ষৰ কৰক" +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "সংমিহলি কৰক (_S)" -#: ../pgp/seahorse-pgp-commands.c:171 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে %s স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgid "Couldn't communicate with '%s': %s" +msgstr "'%s' ৰ সৈতে সংযোগ কৰিবলৈ ব্যৰ্থ: %s" -#: ../pgp/seahorse-pgp-commands.c:176 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে %d চাবি আৰু পৰিচয় স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgid "Connecting to: %s" +msgstr "সংযোগ স্থাপন কৰা হৈছে: %s" -#: ../pgp/seahorse-pgp-commands.c:178 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে %d-টি চাবি স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgid "Couldn't resolve address: %s" +msgstr "চিহ্নিত ঠিকনা মীমাংসা কৰিবলৈ ব্যৰ্থ: %s" -#: ../pgp/seahorse-pgp-commands.c:180 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে %d-টি পৰিচয় স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgid "Resolving server address: %s" +msgstr "চাৰ্ভাৰৰ ঠিকনা মীমাংসা কৰিবলৈ ব্যৰ্থ: %s" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "চাবি সংক্ৰান্ত উন্নত বিকল্প (_A)" +#: ../pgp/seahorse-ldap-source.c:1447 +msgid "LDAP Key Server" +msgstr "LDAP কি' চাৰ্ভাৰ" -#: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "" -"PGP চাবিৰ সাহায্যে অন্যান্য ব্যক্তিৰ পাঠানো ই-মেইল আৰু ফাইল এনক্ৰিপ্ট কৰা যাবে ।" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "কি' সংমিহলি আৰু প্ৰকাশ কৰক...(_S)" -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algorithms here" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "অন-লাইন উপস্থিত কি'ৰ সৈতে আপোনাৰ কি' সংমিহলি আৰু/অথবা প্ৰকাশ কৰক।" + +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP কি'সমূহ" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP কি'সমূহ ই-মেইল অথবা ফাইলসমূহ ইনক্ৰিপ্ট কৰি আছে" # -#: ../pgp/seahorse-pgp-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:1 msgid "C_reate" -msgstr "C" +msgstr "সৃষ্টি কৰক (_r)" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "মেয়াদপূৰ্তীৰ তাৰিখ: (_x)" +#: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "এটা নতুন কি' সৃষ্টি কৰক" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "Encryption _Type:" -msgstr "এনক্ৰিপশনেৰ ধৰন: (_T)" +#: ../pgp/seahorse-pgp-generate.xml.h:3 +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "PGP কি'ৰ সহায় অন্য ব্যক্তিৰ পাঠানো ই-মেইল আৰু ফাইল এনক্ৰিপ্ট কৰা যাবে।" + +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "বিবৃতি: (_C)" #: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "এটা নতুন চাবি নিৰ্মাণ কৰক" +msgid "Ne_ver Expires" +msgstr "মেয়াদ পূৰ্ণ নহয় (_v)" #: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "Key _Strength (bits):" -msgstr "চাবিৰ ক্ষমতা (বিট): (_S)" +msgid "Encryption _Type:" +msgstr "এনক্ৰিপশনেৰ ধৰণ: (_T)" #: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "মেয়াদ পূৰ্ণ হয় না (_v)" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 +msgid "Key _Strength (bits):" +msgstr "কি'ৰ ক্ষমতা (বিট): (_S)" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "নতুন PGP-কি" +msgid "E_xpiration Date:" +msgstr "অৱসানৰ তাৰিখ: (_x)" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "বিবৃতি: (_C)" - -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "ব্যক্তিগত PGP-কি" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "কি সংক্ৰান্ত উন্নত বিকল্প (_A)" -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "সাৰ্বজনীন PGP-কি" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "ব্যক্তিগত PGP কি" -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349 -msgid "Expired" -msgstr "মেয়াদ উত্তীৰ্ণ" +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP কি" -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "ব্যবহাৰকাৰীৰ প্ৰধান ID পৰিবৰ্তন কৰা নাযায়" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে '%s' ব্যবহাৰকাৰীৰ ID স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক নেকি ?" +msgstr "আপুনি কি' নিশ্চিতৰূপে '%s' ব্যবহাৰকাৰীৰ ID স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক?" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "ব্যবহাৰকাৰীৰ ID আঁতৰাবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1464 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[অজানা]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1742 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "নাম/ই-মেইল" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" -msgstr "স্বাক্ষৰেৰ ID" +msgstr "স্বাক্ষৰৰ ID" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" -msgstr "প্ৰধান ফোটো পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ" +msgstr "প্ৰধান ফটো পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ" # -#: ../pgp/seahorse-pgp-key-properties.c:775 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(অজ্ঞাত)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" -msgstr "চাবিৰ মেয়াদপূৰ্তীৰ তাৰিখ: %s" +msgstr "কি'ৰ অৱসানৰ তাৰিখ: %s" + +# +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "নাম" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" -msgstr "Are you sure you want to permanently delete subkey %d of %s?" +msgstr "আপুনি নিশ্চিতৰূপে স্থায়ীৰূপে আঁতৰাবলৈ ইচ্ছুক নে উপকি' %d %s ৰ?" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" -msgstr "সাব-চাবি আঁতৰাবলৈ ব্যৰ্থ" +msgstr "উপ-কি' আঁতৰাবলৈ ব্যৰ্থ" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1427 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" -msgstr "Unable to change trust" - -#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290 -#: ../ssh/seahorse-ssh-key-properties.c:168 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "\"%s\"-এ চাবি এক্সপোৰ্ট কৰিবলৈ ব্যৰ্থ" +msgstr "ভৰষা সলনি কৰিব নোৱাৰি" -#: ../pgp/seahorse-pgp-key-properties.c:1035 -#: ../ssh/seahorse-ssh-key-properties.c:193 -msgid "Export Complete Key" -msgstr "সম্পূৰ্ণ চাবি এক্সপোৰ্ট কৰক" - -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:215 -msgid "Couldn't export key." -msgstr "চাবি এক্সপোৰ্ট কৰিবলৈ বিফল ।" +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "কি' এক্সপোৰ্ট কৰিব পৰা নগল" # -#: ../pgp/seahorse-pgp-key-properties.c:1267 -#: ../pgp/seahorse-pgp-key-properties.c:1356 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" -msgstr "কখনো নয়" +msgstr "কেতিয়াও নহয়" + +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "ID" # -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1317 -#: ../src/seahorse-key-manager-store.c:896 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" -msgstr "ধৰন" +msgstr "ধৰণ" # -#: ../pgp/seahorse-pgp-key-properties.c:1320 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" -msgstr "নিৰ্মাণেৰ সময়" +msgstr "সৃষ্টিৰ সময়" # -#: ../pgp/seahorse-pgp-key-properties.c:1323 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "মেয়াদ পূৰ্ণ হ'ব" # -#: ../pgp/seahorse-pgp-key-properties.c:1326 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "অবস্থা" -#: ../pgp/seahorse-pgp-key-properties.c:1329 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "ক্ষমতা" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "মেয়াদ উত্তীৰ্ণ" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "ভাল" -# -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "কৰ্ম" +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "কি'ৰ ID" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "বিবৃতি:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "তাৰিখ" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "ই-মেইল:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "ফিঙ্গাৰ-প্ৰিন্ট" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "চাবিৰ ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "কেতিয়াও নহয়" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "চাবিৰ নাম আৰু স্বাক্ষৰ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "চিহ্নিত কি' প্ৰত্যাখ্যাত হৈছে" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "ছবি " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "কি'ৰ গৰাকীয়ে কি' প্ৰত্যাহাৰ কৰিলে। ইয়াক আৰু ব্যৱহাৰ কৰিব নোৱাৰি।" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "প্ৰযুক্তিগত বিবৰণ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "চিহ্নিত কি'ৰ মেয়াদ পূৰ্ণ হৈছে" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "চিহ্নিত চাবি প্ৰত্যাখ্যাত হৈছে" +msgid "Add a photo to this key" +msgstr "কি'ৰ বাবে ছবি যোগ কৰক" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "চিহ্নিত চাবিৰ মেয়াদ পূৰ্ণ হৈছে" +msgid "Remove this photo from this key" +msgstr "বৰ্তমান কি' পৰা চিহ্নিত ছবি মচি ফেলা হ'ব" -# #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "প্ৰকৃতি:" +msgid "Make this photo the primary photo" +msgstr "চিহ্নিত ছবিটি প্ৰধান ছবি ৰূপে ধাৰ্য কৰা হ'ব" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "ব্যবহাৰ:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "পূৰ্ববৰ্তী ছবিতে পিছিয়ে যান" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "সাব-চাবি (_S)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "পৰবৰ্তী ছবিতে এগিয়ে চলুন" -# +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "যোগ কৰক" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "ছবি " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "চাবিৰ বাবে ছবি যোগ কৰক" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "পৰিচয়-পংক্তি পৰিবৰ্তন কৰক (_P)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "কি'ৰ ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "আপনাৰ দ্বাৰা প্ৰাপ্ত ফাইল আৰু ই-মেইল ডি-ক্ৰিপ্ট কৰা হ'ব ।" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "নাম:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "ই-মেইল:" -# #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Delete" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "মন্তব্য:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "মেয়াদপূৰ্তী" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "ব্যবহাৰ:" # #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "মেয়াদ:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "ধৰণ:" -# #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "এক্সপোৰ্ট কৰক" +msgid "Decrypt files and email sent to you." +msgstr "আপোনাৰ দ্বাৰা প্ৰাপ্ত ফাইল আৰু ই-মেইল ডি-ক্ৰিপ্ট কৰা হ'ব।" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "ব্যক্তিগত PGP-কি'" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "পৰবৰ্তী ছবিতে এগিয়ে চলুন" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "পাচফ্ৰেইছ পৰিবৰ্তন কৰক (_P)" +# #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "পূৰ্ববৰ্তী ছবিতে পিছিয়ে যান" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "গৰাকী" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "চাবিৰ ID:" +msgid "Key Names and Signatures" +msgstr "কি'ৰ নাম আৰু স্বাক্ষৰ" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "প্ৰধান" +# #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "চিহ্নিত ছবিটি প্ৰধান ছবি ৰূপে ধাৰ্য কৰা হ'ব" +msgid "Sign" +msgstr "স্বাক্ষৰ কৰক" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "নাম আৰু স্বাক্ষৰ" +# +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "মচি পেলাওক" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "কেতিয়াও নহয়" +msgid "_Add Name" +msgstr "নাম যোগ কৰক (_A)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Override Owner _Trust:" - -# -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "মালিক" +msgid "Revoke" +msgstr "প্ৰত্যাহাৰ কৰক" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "প্ৰধান" +msgid "Names and Signatures" +msgstr "নাম আৰু স্বাক্ষৰসমূহ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "বৰ্তমান চাবি থেকে চিহ্নিত ছবি মুছে ফেলা হ'ব" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "কি'ৰ ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "প্ৰত্যাখ্যান কৰক" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "ক্ষমতা:" -# #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "স্বাক্ষৰ কৰক" +msgid "Technical Details" +msgstr "কাৰিকৰী বিবৰণ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "ক্ষমতা:" +msgid "Fingerprint" +msgstr "ফিঙ্গাৰ-প্ৰিন্ট" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "The owner of the key revoked the key. It can no longer be used." +# +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "মেয়াদ:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "নাম যোগ কৰক (_A)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "তাৰিখ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "গৰাকীৰ ভৰষা অভাৰৰাইড কৰক (_T):" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" -msgstr "সম্পূৰ্ণ চাবি এক্সপোৰ্ট কৰক: (_E)" +msgstr "সম্পূৰ্ণ কি' এক্সপোৰ্ট কৰক: (_E)" +# #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -#| msgid "Name:" -msgctxt "name-of-key" -msgid "Name:" -msgstr "নাম:" +msgid "Actions" +msgstr "কৰ্ম" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "তাৰিখ:" +# +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "যোগ কৰক" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "অৱসান" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "উপ-কি'সমূহ (_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "আংশিক" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "ফিঙ্গাৰ-প্ৰিন্ট:" +msgid "Fully" +msgstr "সম্পূৰ্ণ" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "বিশ্বাসেৰ মাত্ৰা চিহ্নিত কৰক:" +msgid "Ultimately" +msgstr "সৰ্বাধিক" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "এই চাবিৰ উপৰ আপনাৰ বিশ্বাসেৰ মাত্ৰা" +msgid "Encrypt files and email to the key's owner" +msgstr "ফাইল এনক্ৰিপ্ট কৰক আৰু কি'ৰ গৰাকীলে ই-মেইল কৰক" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "_Other Names:" -msgstr "অন্যান্য নাম: (_O)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "সাৰ্বজনীন PGP-কি'" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "এই চাবি স্বাক্ষৰকাৰী ব্যবহাৰকাৰীৰা: (_P)" +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +msgid "_Other Names:" +msgstr "অন্য নাম: (_O)" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "চাবিৰ মালিকেৰ বাবে ফাইল আৰু ই-মেইল এনক্ৰিপ্ট কৰক " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "এই কি'ৰ উপৰ আপোনাৰ ভৰষাৰ মাত্ৰা" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "সম্পূৰ্ণ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "আপোনাৰ ভৰষা হস্তচালিতভাৱে বিৱৰণসমূহ টেবত ধাৰ্য্য কৰা আছে।" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" -msgstr "অন্যান্য চাবিৰ বাবে '%s'-ৰ স্বাক্ষৰ বিশ্বাস কৰা হ'ব" +msgstr "অন্য কি'ৰ বাবে '%s'ৰ স্বাক্ষৰ বিশ্বাস কৰা হ'ব" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" -msgstr "" -"If you believe that the person that owns this key is '%s', sign this " -"key:" +msgstr "যদি আপুনি ভাৱে যে এই কি'ৰ অধিকাৰী মানুহজন '%s', এই কি স্বাক্ষৰ কৰক:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "এই কি' স্বাক্ষৰ কৰক (_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "If you no longer trust that '%s' owns this key, revoke your signature:" -msgstr "If you no longer trust that '%s' owns this key, revoke your signature:" +msgstr "" +"যদি আপুনি নাভাৱে যে '%s' এই কি'ৰ অধিকাৰী, আপোনাৰ স্বাক্ষৰ প্ৰত্যাহাৰ কৰক:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "আংশিক" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "স্বাক্ষৰ প্ৰত্যাহাৰ কৰক (_R)" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:890 -msgid "Trust" -msgstr "বিশ্বাসেৰ মাত্ৰা" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "এই কি' স্বাক্ষৰকাৰী ব্যবহাৰকাৰীসমূহ: (_P)" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "সৰ্বাধিক" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "অকল বিশ্বস্ত ব্যক্তিৰ স্বাক্ষৰ প্ৰদৰ্শন কৰা হ'ব (_O)" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "মালিক আপনাৰ বিশ্বস্ত: (_T)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 +msgid "Trust" +msgstr "ভৰষাৰ মাত্ৰা" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Your trust is manually specified on the Details tab." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "ফিঙ্গাৰ-প্ৰিন্ট:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "অকল বিশ্বস্ত ব্যক্তিৰ স্বাক্ষৰ প্ৰদৰ্শন কৰা হ'ব (_O)" +msgid "Dates:" +msgstr "তাৰিখ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "স্বাক্ষৰ প্ৰত্যাখ্যান কৰক (_R)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "ভৰষাৰ মাত্ৰা চিহ্নিত কৰক:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "এই চাবি স্বাক্ষৰ কৰক (_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "গৰাকী আপোনাৰ বিশ্বস্ত: (_T)" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format msgid "Subkey %d of %s" -msgstr "সাব-চাবি %d, %s-ৰ" +msgstr "উপ-কি' %d, %sৰ" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Optional description of revocation" +msgid "Reason for revoking the key" +msgstr "এই কি' প্ৰত্যাহাৰ কৰাৰ কাৰণ" #: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_voke" +msgid "_Reason:" +msgstr "কাৰণ (_R):" -#: ../pgp/seahorse-revoke.xml.h:3 -msgid "Reason for revoking the key" -msgstr "Reason for revoking the key" +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "প্ৰত্যাহাৰৰ বৈকল্পিক বিৱৰণ" #: ../pgp/seahorse-revoke.xml.h:6 -msgid "_Reason:" -msgstr "কাৰণ: (_R)" +msgid "Re_voke" +msgstr "প্ৰত্যাহাৰ কৰক (_v)" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "You have no personal PGP keys that can be used to sign a document or message." msgstr "" -"কোনো নথি অথবা বাৰ্তা স্বাক্ষৰ কৰাৰ উদ্দেশ্যে আপনাৰ কোনো ব্যক্তিগত PGP-চাবি উপস্থিত " -"নেই ।" +"কোনো নথি অথবা বাৰ্তা স্বাক্ষৰ কৰাৰ বাবে আপোনাৰ কোনো ব্যক্তিগত PGP-কি' উপস্থিত নাই।" + +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "কি' সহযোগে বাৰ্তা স্বাক্ষৰ কৰা হ'ব (_S)" #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "এই চাবিটি পুঙ্খানুপুঙ্খভাবে পৰীক্ষা কৰা হৈছে চাবি না?" +msgid "Sign Key" +msgstr "কি' স্বাক্ষৰ কৰক" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "অন্যান্যৰ বাবে এই চাবিটি কীভাবে প্ৰদৰ্শন কৰা হ'ব:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "স্বাক্ষৰ কৰি আপুনি এই কি'ৰ প্ৰতি ভৰষাৰ ইংগিত দিয়ে:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "চাবি স্বাক্ষৰেৰ :" +msgid "Key Name" +msgstr "কি'ৰ নাম" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " +msgid "How carefully have you checked this key?" +msgstr "এই কিটো পুঙ্খানুপুঙ্খভাবে পৰীক্ষা কৰা হৈছে কি না?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "চাবিৰ নাম" +msgid "_Not at all" +msgstr "কেতিয়াও নহয় (_N)" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "সহজভাৱে (_C)" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "পুঙ্খানুপুঙ্খভাবে (_V)" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." msgstr "" -"Not at all: means you believe the key is owned by the person who " -"claims to own it, but you could not or did not verify this to be a fact." +"কেতিয়াও নহয়: বুজায় যে আপুনি ভাৱে কি সেই মানুহজনৰ ওচৰত আছে যোনে ইয়াৰ " +"অধিকাৰিত্ব দাবি কৰে, কিন্তু আপুনি ইয়াক সত্য বুলি সতাসত্য নিৰূপণ কৰিব নোৱাৰিলে বা " +"নকৰিলে।" -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 msgid "" -"Very Carefully: Select this only if you are absolutely sure that this " -"key is genuine." +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." msgstr "" -"Very Carefully: Select this only if you are absolutely sure that this " -"key is genuine." - -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "By signing you indicate your trust that this key belongs to:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "I can _revoke this signature at a later date." +"সহজভাৱে: বুজায় যে আপুনি সহজভাৱে সতাসত্য নিৰূপণ কৰিছে যে কি এনে এজন মানুহৰ " +"ওচৰত আছে যোনে ইয়াৰ অধিকাৰিত্ব দাবি কৰিছে। উদাহৰণস্বৰূপ, আপুনি ফোনত গৰাকীৰ কি " +"ফিংগাৰপ্ৰিন্ট পঢ়িব পাৰিব।" #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "চাবি স্বাক্ষৰ কৰক" +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "" +"সাৱধাণে: ইয়াক কেৱল তেতিয়াহে বাছক যেতিয়া আপুনি কিটো সম্পূৰ্ণ সঠিক বুলি " +"সুনিশ্চিত।" #: ../pgp/seahorse-sign.xml.h:11 msgid "" @@ -2382,780 +1998,1272 @@ "personally check that the name on the key is correct. You should have also " "used email to check that the email address belongs to the owner." msgstr "" -"You could use a hard to forge photo identification (such as a passport) to " -"personally check that the name on the key is correct. You should have also " -"used email to check that the email address belongs to the owner." +"আপুনি এটা জালিয়াতী কৰিবলে কঠিন ফটো পৰিচয় (যেনে এটা পাচপোৰ্ট) ব্যৱহাৰ কৰিব পাৰে " +"ব্যক্তিগতভাৱে নীৰিক্ষণ কৰিবলে যে কিত থকা নাম সঠিক। আপুনি হয়তো ই-মেইল ঠিকনা " +"ব্যৱহাৰ কৰিছে নীৰিক্ষণ কৰিবলে যে ই-মেইল ঠিকনা গৰাকীৰ হয়।" #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Casually" +msgid "How others will see this signature:" +msgstr "অন্যৰ বাবে এই স্বাক্ষৰ কীভাবে প্ৰদৰ্শন কৰা হ'ব:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Not at all" +msgid "_Others may not see this signature" +msgstr "এই স্বাক্ষৰ অন্যৰ বাবে দৃশ্যমান নহব (_O)" #: ../pgp/seahorse-sign.xml.h:14 -msgid "_Others may not see this signature" -msgstr "এই স্বাক্ষৰ অন্যান্যৰ বাবে দৃশ্যমান ন'হ'ব (_O)" +msgid "I can _revoke this signature at a later date." +msgstr "মই এই স্বাক্ষৰক এটা পিছৰ তাৰিখত প্ৰত্যাহাৰ কৰিব পাৰো (_r)।" -# #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "স্বাক্ষৰ কৰক (_S)" +msgid "Sign key as:" +msgstr "কি'ক এই ধৰণে স্বাক্ষৰ কৰক :" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" -msgstr "স্বাক্ষৰকাৰী: (_S)" +msgstr "স্বাক্ষৰকাৰী (_S):" +# #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "পুঙ্খানুপুঙ্খভাবে (_V)" +msgid "_Sign" +msgstr "স্বাক্ষৰ কৰক (_S)" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "চাবি সহযোগে বাৰ্তা স্বাক্ষৰ কৰা হ'ব (_S)" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "তথ্য এক্সপোৰ্ট কৰা হৈছে" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "তথ্য উদ্ধাৰ কৰা হৈছে" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "তথ্য ইমপোৰ্ট কৰা" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "তথ্য প্ৰেৰণ কৰা" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "উপলব্ধ নহয়" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "ব্যক্তিগত প্ৰমাণপত্ৰ আৰু কি'" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "ব্যক্তিগত প্ৰমাণপত্ৰ" # -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" -msgstr "সাৰ্টিফিকেট" +msgstr "প্ৰমাণপত্ৰ" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে '%s' সাৰ্টিফিকেট আঁতৰাবলৈ ইচ্ছুক নেকি ?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:111 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "আপুনি কি নিশ্চিতৰূপে '%d' প্ৰমাণপত্ৰ আঁতৰাবলৈ ইচ্ছুক নেকি ?" -msgstr[1] "আপুনি চাবি নিশ্চিতৰূপে %d প্ৰমাণপত্ৰ আঁতৰাবলৈ ইচ্ছুক নেকি ?" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "প্ৰমাণপত্ৰসমূহ (DER এনক'ড কৰা)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "প্ৰমাণপত্ৰসমূহ" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 প্ৰমাণপত্ৰসমূহ আৰু প্ৰাসংগিক কি'সমূহ" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "আপুনি নিশ্চিতৰূপে %d প্ৰমাণপত্ৰক স্থায়ীৰূপে আঁতৰাবলৈ ইচ্ছুক নে?" +msgstr[1] "আপুনি নিশ্চিতৰূপে %d প্ৰমাণপত্ৰসমূহক স্থায়ীৰূপে আঁতৰাবলৈ ইচ্ছুক নে?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "ব্যক্তিগত কি সৃজন কৰিব পৰা নগল" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "সৃষ্টি কৰক" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "গোপনীয় কি'" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "এটা প্ৰমাণপত্ৰ অনুৰোধ কৰাৰ বাবে ব্যৱহৃত" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "এটা নতুন ব্যক্তিগত কি' সৃষ্টি কৰক" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "লেবেল:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "সংৰক্ষিত:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "মই বুজি পাও যে এই কি স্থায়ীভাৱে মচি পেলোৱা হব।" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "নাম নহোৱা" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "প্ৰমাণপত্ৰ এক্সপোৰ্ট কৰিবলে ব্যৰ্থ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "মচিব পৰা নগল" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "এক্সপোৰ্ট কৰক (_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "প্ৰমাণপত্ৰ এক্সপোৰ্ট কৰক" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "এই প্ৰমাণপত্ৰ অথবা কি' মচি পেলাওক" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "প্ৰমাণপত্ৰ অনুৰোধ কৰক (_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "এই কি'ৰ বাবে এটা প্ৰমাণপত্ৰ অনুৰোধ ফাইল সৃষ্টি কৰক" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "প্ৰমাণপত্ৰ অনুৰোধ সংৰক্ষণ কৰিব পৰা নগল" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "প্ৰমাণপত্ৰ অনুৰোধ সংৰক্ষণ কৰক" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "প্ৰমাণপত্ৰ অনুৰোধ" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM এনক'ডেড অনুৰোধ" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "প্ৰমাণপত্ৰ অনুৰোধ সৃষ্টি কৰিব পৰা নগল" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "এটা প্ৰমাণপত্ৰ অনুৰোধ ফাইল সৃষ্টি কৰক।" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "প্ৰমাণপত্ৰ অনুৰোধত স্থাপন কৰা সাধাৰণ নাম (CN)।" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "নাম (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "নামবিহিন গোপনীয় কি'" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" -msgstr "পৰিচিতি-পংক্তি পৰিবৰ্তন কৰক" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "পৰিচয়-পংক্তি নিশ্চিত কৰক: (_f)" +msgstr "পাচফ্ৰেইছ পৰিবৰ্তন কৰক" #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "নতুন পাচফ্ৰেইছ (_P):" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" -msgstr "নতুন পৰিচয়-পংক্তি নিশ্চিত কৰক" +msgstr "নতুন পাচফ্ৰেইছ নিশ্চিত কৰক" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "নতুন পৰিচয়-পংক্তি: (_P)" +msgid "Con_firm Passphrase:" +msgstr "পাচফ্ৰেইছ নিশ্চিত কৰক (_f):" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" -msgstr "গুপ্তশব্দ আৰু এনক্ৰিপশন-চাবি পৰিচালনা কৰক" +msgstr "পাছৱাৰ্ড আৰু এনক্ৰিপশন-কি' ব্যৱস্থাপনা কৰক" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862 -msgid "Passwords and Encryption Keys" -msgstr "গুপ্তশব্দ আৰু এনক্ৰিপশন কি" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "চলাই নিয়ক" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" -msgstr "নিৰ্মাণেৰ উদ্দেশ্যে বস্তুৰ ধৰন নিৰ্ধাৰণ কৰক: (_S)" +msgstr "সৃষ্টিৰ বাবে বস্তুৰ ধৰণ নিৰ্ধাৰণ কৰক (_S):" + +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "ইমপোৰ্ট ব্যৰ্থ হল" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "ইমপোৰ্ট কৰক" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "ইমপোৰ্ট কৰিব লগিয়া তথ্য:" + +# +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "কি' ইমপোৰ্ট কৰক" + +# +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "সকলো কি' ফাইল" + +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "বাদ দিয়া লিখনী" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "ক্লিপবৰ্ড লিখনী" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "নতুন (_N)" + +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "এই প্ৰগ্ৰাম বন্ধ কৰক" + +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "নতুন (_N)..." + +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "নতুন কি' অথবা বস্তু সৃষ্টি কৰক" + +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "এটা নতুন কি' অথবা বস্তু যোগ কৰক" + +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "ইমপোৰ্ট কৰক...(_I)" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "এগিয়ে চলুন (_o)" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "এটা ফাইল পৰা ইমপোৰ্ট কৰক" -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "নতুন নিৰ্মাণ কৰক..." +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "ক্লিপ-বৰ্ড পৰা ইমপোৰ্ট কৰক" -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "কি'ৰিংৰে (_k)" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "কাষবাৰ তালিকাভুক্ত কি'ৰিংসমূহ দেখুৱাওক" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "ব্যক্তিগত দেখুৱাওক (_p)" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "কেৱল ব্যক্তিগত কি'সমূহ, প্ৰমাণপত্ৰসমূহ আৰু পাছৱাৰ্ডসমূহ দেখুৱাওক" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "ভৰষাবান দেখুৱাওক (_t)" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "কেৱল ভৰষাবান কি'সমূহ, প্ৰমাণপত্ৰসমূহ আৰু পাছৱাৰ্ডসমূহ দেখুৱাওক" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "যিকোনো দেখুৱাওক (_a)" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "সকলো কি'সমূহ, প্ৰমাণপত্ৰসমূহ আৰু পাছৱাৰ্ডসমূহ দেখুৱাওক" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "পৰিস্ৰাৱক" + +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "প্ৰথমবাৰ প্ৰযোজ্য বিকল্প:" + +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "নিজেৰ ব্যৱহাৰৰ বাবে এটা নতুন কি' সৃষ্টি কৰক: " + +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "এটা ফাইল পৰা উপস্থিত কি' ইমপোৰ্ট কৰক: " + +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "এনক্ৰিপশন ব্যৱহাৰৰ বাবে কি'ৰ উপস্থিতি আবশ্যক।" + +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "লক কৰিব পৰা নগল" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "আনলক কৰিব পৰা নগল" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "লক কৰক (_L)" + +# +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "আনলক (_U)" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "বৈশিষ্ট্যসমূহ (_P)" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "সুৰক্ষিত শেলেৰ বাবে কি' সংৰূপণ কৰক...(_S)" + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"ৰাজহুৱা সুৰক্ষিত শ্বেল কি'ক অন্য মেচিনলে প্ৰেৰণ কৰক, আৰু সেই কি' ব্যৱহাৰ কৰি লগিন " +"সামৰ্থবান কৰক।" + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "সুৰক্ষিত শ্বেল পাচফ্ৰেইছ লিখক:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "পুৰনি কি'ৰ পাচফ্ৰেইছ" + +#: ../ssh/seahorse-ssh-askpass.c:83 #, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "নিৰ্বাচিত %d-টি কি" -msgstr[1] "নিৰ্বাচিত %d-টি কি" +msgid "Enter the old passphrase for: %s" +msgstr "পুৰনি পাচফ্ৰেইছ লিখক: %s" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "নতুন কি'ৰ পাচফ্ৰেইছ" + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "নতুন পাচফ্ৰেইছ লিখক: %s" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "নতুন পাচফ্ৰেইছ আকৌ সুমুৱাওক: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "সুৰক্ষিত শ্বেল" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "অন্য কমপিউটাৰসমূহৰ সৈতে সংযোগ কৰিবলে ব্যৱহৃত কি'সমূহ" + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "আপুনি কি নিশ্চিতৰূপে '%s'ৰ সুৰক্ষিত শ্বেল কি' আঁতৰাবলৈ ইচ্ছুক?" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "আপুনি কি নিশ্চিতৰূপে %d সুৰক্ষিত শ্বেল কি' আঁতৰাবলৈ ইচ্ছুক?" +msgstr[1] "আপুনি কি নিশ্চিতৰূপে %d সুৰক্ষিত শ্বেল কি' আঁতৰাবলৈ ইচ্ছুক?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ssh কি'" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "গোপণ SSH কি'সমূহ" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "ৰাজহুৱা SSH কি'সমূহ" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "এই কি'ৰ বাবে কোনো গোপনীয় কি' ফাইল উপলব্ধ নাই।" + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "সুৰক্ষিত শ্বেল কি'" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "অন্য কমপিউটাৰত অভিগম কৰিবলৈ ব্যবহৃত (উদাহৰণ: টাৰ্মিনালেৰ মাধ্যমে)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "সুৰক্ষিত শ্বেল কি' সৃষ্টি কৰিবলৈ ব্যৰ্থ" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "সুৰক্ষিত শ্বেল কি' সৃষ্টি কৰা হৈছে" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "নতুন সুৰক্ষিত শ্বেল কি'" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "অকল কি' সৃষ্টি কৰক (_J)" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "সৃষ্টি আৰু প্ৰস্তুত কৰক (_C)" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"এটা সুৰক্ষিত শ্বেল (SSH) কি' আপোনাক অন্য কমপিউটাৰৰ সৈতে সুৰক্ষিতভাৱে সংযোগ কৰাৰ " +"অনুমতি দিয়ে।" + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "আপোনাৰ ই-মেইল ঠিকনা, অথবা কি'টো কিহৰ বাবে তাৰ এটা সোঁৱৰণি।" + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"যদি এটা কমপিউটাৰ যাৰ সৈতে আপুনি এই কি ব্যৱহাৰ কৰিব বিচাৰে উপস্থিত আছে, আপুনি " +"আপোনাৰ নতুন কি চিনাক্ত কৰিবলে সেই কমপিউটাৰক সংস্থাপন কৰিব পাৰে।" + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(সুৰক্ষিত শ্বেল কি' পাঠযোগ্য নহয়)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "ব্যক্তিগত SSH কি'" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH কি'" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "কি'ৰ নাম পৰিবৰ্তন কৰা নাযায়।" + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "কি'ৰ অনুমতি পৰিবৰ্তন কৰা নাযায়" + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "কি'ৰ পাচফ্ৰেইছ পৰিবৰ্তন কৰা নাযায়।" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "পৰিচয়কাৰী:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "নাম:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "অন্য কমপিউটাৰৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যবহৃত।" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "ভৰষা" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "এই কি'ৰ গৰাকীক এই কমপিউটাৰলে সংযোগ কৰাৰ অনুমতি আছে (_a)" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "এইটো অকল %s একাউন্টৰ ক্ষেত্ৰত প্ৰযোজ্য।" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "এলগোৰিথম:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "ক্ষমতা:" # -#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470 -#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458 -msgid "Couldn't import keys" -msgstr "চাবি ইম্পোৰ্ট কৰিবলৈ ব্যৰ্থ" +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "অৱস্থান:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "সম্পূৰ্ণ কি' এক্সপোৰ্ট কৰক (_x)" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH পাছৱাৰ্ড অপ্ৰত্যাশিতভাবে বন্ধ কৰা হৈছে।" + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH পাছৱাৰ্ড বিফল।" + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "দূৰবৰ্তী হস্টৰ পাছৱাৰ্ড" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "কি'ৰ পাচফ্ৰেইছ লিখক" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "নতুন সুৰক্ষিত শ্বেল কি'ৰ পাচফ্ৰেইছ লিখক" + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "কি' ইমপোৰ্ট কৰা হৈছে: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "কি' ইমপোৰ্ট কৰা হৈছে। পাচফ্ৰেইছ লিখক।" + +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH কি'সমূহ" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "এই কি'ৰ বাবে কোনো গোপনীয় কি'ৰ ফাইল উপস্থিত নাই।" + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "দূৰবৰ্তী কমপিউটাৰৰ মাজত সুৰক্ষিত শ্বেল কি' সংৰূপণ কৰিবলৈ ব্যৰ্থ।" + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "সুৰক্ষিত শ্বেল কি' সংৰূপণ কৰা হৈছে..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "SSH সংযোগেৰ বাবে কমপিউটাৰ প্ৰস্তুত কৰক" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"আপোনাৰ সুৰক্ষিত শ্বেল কি' SSH ব্যৱহাৰ কৰা অন্য কমপিউটাৰৰ সৈতে ব্যৱহাৰ কৰিবলে, " +"আপোনাৰ সেই কমপিউটাৰত এটা লগিন একাওন্ট থকা আৱশ্যক।" + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "উদাহৰণ: fileserver.example.com:port" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "কমপিউটাৰৰ নাম (_C):" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "লগিন নাম (_L):" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "প্ৰস্তুত কৰক (_S)" + +#~ msgid "Login keyring" +#~ msgstr "লগিন কি'ৰিং" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "কি'ৰিংৰ অভিগম কৰিবলে দিয়া নহয়" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "gnome-keyring ডিমন স্বক্ৰিয় নহয়" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "কি'ৰিং ইতিমধ্যে আনলক" + +#~ msgid "No such key ring exists" +#~ msgstr "সেই নামৰ কি'ৰিং অনুপস্থিত" -#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463 -msgid "Imported keys" -msgstr "ইম্পোৰ্ট কৰা কি" +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "কি'ৰিং ডিমনৰ সৈতে সংযোগস্থাপন কৰা সম্ভব নহয়" -#: ../src/seahorse-key-manager.c:464 -msgid "Importing keys" -msgstr "চাবি ইম্পোৰ্ট কৰা হচ্ছে" +#~ msgid "The item already exists" +#~ msgstr "এই বস্তুটি বৰ্তমান উপস্থিত" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "gnome-keyring ব্যবহাৰ কৰিবলৈ অভ্যন্তৰীণ সমস্যা" + +#~ msgid "Algorithms here" +#~ msgstr "এলগোৰিথমসমূহ ইয়াত" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "seahorse-daemon ডিমন ৰূপে সঞ্চালন কৰা নহব" + +#~ msgid "couldn't fork process" +#~ msgstr "প্ৰসেস fork (ফৰ্ক) কৰা সম্ভব নহয়" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "এনক্ৰিপশন ডিমন (Seahorse)" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "অবৈধ অথবা অজানা কি'ৰ ধৰণ: %s" + +#~| msgid "This key expired on: %s" +#~ msgid "This keytype is not supported: %s" +#~ msgstr "এই keytype সমৰ্থিত নহয়: %s" + +#~ msgid "Support for this feature was not enabled at build time" +#~ msgstr "বনোৱাৰ সময়ত এই বৈশিষ্টৰ বাবে সমৰ্থন সামৰ্থবান কৰা হোৱা নাছিল" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "অবৈধ অথবা অজানা কি: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr "" +#~ " দ্বাৰা স্বাক্ষৰিত। এইটো মেয়াদ পূৰ্ণ হৈছে %sএ।" # -#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017 -msgid "Import Key" -msgstr "চাবি ইম্পোৰ্ট কৰক" +#~ msgid "Invalid Signature" +#~ msgstr "অবৈধ স্বাক্ষৰ" -#: ../src/seahorse-key-manager.c:533 -msgid "Unrecognized key type, or invalid data format" -msgstr "অপৰিচিত ধৰনেৰ চাবি অথবা তাৰিখেৰ বিন্যাস বৈধ নয়" +#~ msgid "Signed by on %s Expired." +#~ msgstr "" +#~ " দ্বাৰা স্বাক্ষৰিত। %sএ এইটোৰ মেয়াদ পূৰ্ণ হৈছে।" -#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245 -msgid "_Remote" -msgstr "দূৰবৰ্তী (_R)" +# +#~ msgid "Expired Signature" +#~ msgstr "মেয়াদ উত্তীৰ্ণ স্বাক্ষৰ" -#: ../src/seahorse-key-manager.c:733 -msgid "Close this program" -msgstr "এই প্ৰোগ্ৰাম বন্ধ কৰক" +#~ msgid "Signed by Revoked on %s." +#~ msgstr "" +#~ "যিটি দিয়ে স্বাক্ষৰ কৰা হৈছে বাতিল কৰাৰ তাৰিখ %" +#~ "s।" + +# +#~ msgid "Revoked Signature" +#~ msgstr "বাতিল কৰা স্বাক্ষৰ" + +#~ msgid "Signed by on %s." +#~ msgstr " দ্বাৰা %sএ স্বাক্ষৰ কৰা হৈছে।" + +# +#~ msgid "Good Signature" +#~ msgstr "বৈধ স্বাক্ষৰ" + +# +#~ msgid "Signing key not in keyring." +#~ msgstr "স্বাক্ষৰ ব্যবহৃত কি কি'ৰিং এ অনুপস্থিত।" + +# +#~ msgid "Unknown Signature" +#~ msgstr "অজ্ঞাত স্বাক্ষৰ" + +# +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "অবৈধ বা জাল স্বাক্ষৰ। স্বাক্ষৰ কৰা তথ্যিৰ পৰিবৰ্তন ঘটেছে।" + +# +#~ msgid "Bad Signature" +#~ msgstr "অবৈধ স্বাক্ষৰ" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "অবৈধ অথবা অজানা স্বাক্ষৰকাৰী: %s" -#: ../src/seahorse-key-manager.c:734 -msgid "_New..." -msgstr "নতুন (_N)..." +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "স্বাক্ষৰ কৰাৰ বাবে, কি বৈধ নহয়: %s" -#: ../src/seahorse-key-manager.c:735 -msgid "Create a new key or item" -msgstr "নতুন চাবি অথবা বস্তু নিৰ্মাণ কৰক" +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "অবৈধ অথবা অজানা প্ৰাপক: %s" -#: ../src/seahorse-key-manager.c:736 -msgid "_Import..." -msgstr "ইম্পোৰ্ট কৰক...(_I)" +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "এনক্ৰিপশনপৰ বাবে এই কিটো বৈধ প্ৰাপক নহয়: %s" -#: ../src/seahorse-key-manager.c:737 -msgid "Import from a file" -msgstr "এটা ফাইল থেকে ইম্পোৰ্ট কৰক" +#~ msgid "No recipients specified" +#~ msgstr "প্ৰাপক নিৰ্ধাৰণ কৰা নহয়" -#: ../src/seahorse-key-manager.c:739 -msgid "Import from the clipboard" -msgstr "ক্লিপ-বোৰ্ড থেকে ইম্পোৰ্ট কৰক" +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "ডিক্ৰিপশনেৰ বাবে অবৈধ প্ৰকৃতিৰ কি: %s" -#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255 -msgid "_Find Remote Keys..." -msgstr "দূৰবৰ্তী চাবি অনুসন্ধান কৰক...(_F)" +#~ msgid "Please set clearuri" +#~ msgstr "অনুগ্ৰহ কৰি clearuri সংহতি কৰা" -#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256 -msgid "Search for keys on a key server" -msgstr "চাবিসেৱকেৰ মধ্যে চাবি অনুসন্ধান কৰক" +#~ msgid "Please set crypturi" +#~ msgstr "অনুগ্ৰহ কৰি crypturi সংহতি কৰা" -#: ../src/seahorse-key-manager.c:746 -msgid "_Sync and Publish Keys..." -msgstr "চাবি সুসংগত আৰু প্ৰকাশ কৰক...(_S)" +#~ msgid "Error opening clearuri" +#~ msgstr "clearuri খোলোতে ত্ৰুটি" -#: ../src/seahorse-key-manager.c:747 -msgid "Publish and/or synchronize your keys with those online." -msgstr "অন-লাইন উপস্থিত চাবিৰ সৈতে আপনাৰ চাবি সুসংগত আৰু/অথবা প্ৰকাশ কৰক ।" +#~ msgid "No signer specified" +#~ msgstr "স্বাক্ষৰকাৰী নিৰ্ধাৰণ কৰা নহয়" -#: ../src/seahorse-key-manager.c:752 -msgid "T_ypes" -msgstr "ধৰন (_y)" - -#: ../src/seahorse-key-manager.c:752 -msgid "Show type column" -msgstr "ধৰনেৰ কলাম প্ৰদৰ্শন কৰা হ'ব" - -#: ../src/seahorse-key-manager.c:754 -msgid "_Expiry" -msgstr "মেয়াদ পূৰ্তী (_E)" - -#: ../src/seahorse-key-manager.c:754 -msgid "Show expiry column" -msgstr "মেয়াদপূৰ্তীৰ কলাম প্ৰদৰ্শন কৰা হ'ব" - -#: ../src/seahorse-key-manager.c:756 -msgid "_Trust" -msgstr "বিশ্বাসেৰ মাত্ৰা (_T)" - -#: ../src/seahorse-key-manager.c:756 -msgid "Show owner trust column" -msgstr "ব্যবহাৰকাৰীৰ বিশ্বাসেৰ মাত্ৰা চিহ্নকাৰী কলাম প্ৰদৰ্শন কৰা হ'ব" - -#: ../src/seahorse-key-manager.c:758 -msgid "_Validity" -msgstr "বৈধতা (_V)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show validity column" -msgstr "বৈধতাৰ কলাম প্ৰদৰ্শন কৰা হ'ব" - -#: ../src/seahorse-key-manager.c:931 -msgid "Filter:" -msgstr "ফিল্টাৰ:" +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "পৰীক্ষণেৰ বাবে অবৈধ প্ৰকৃতিৰ কি: %s" -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "প্ৰথমবাৰ প্ৰযোজ্য বিকল্প:" +#~ msgid "Invalid key id: %s" +#~ msgstr "কি'ৰ id অবৈধ: %s" -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "নিজেৰ ব্যবহাৰেৰ বাবে এটা নতুন চাবি নিৰ্মাণ কৰক: " +# +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "দূৰবৰ্তী কি খোঁজাৰ বাবে কি চাৰ্ভাৰৰ URIৰ তালিকা। পৰবৰ্তী সংস্কৰণে এটা নাম যোগ " +#~ "কৰা সম্ভব হ'ব পাৰে এটা ৰিক্ত স্থানেৰ পিছত নাম যোগ কৰি।" -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "এটা ফাইল থেকে উপস্থিত চাবি ইম্পোৰ্ট কৰক: " +#~ msgid "Auto Retrieve Keys" +#~ msgstr "স্বচালিতভাবে কি পুনৰুদ্ধাৰ কৰা হ'ব" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "আমাৰ ব্যক্তিগত চাবি (_P)" +#~ msgid "Auto Sync Keys" +#~ msgstr "স্বচালিতভাবে কি সুংগত কৰা হ'ব" -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "অন্যান্য চাবি (_K)" +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "কি' পৰিচালন ব্যবস্থাৰ অৱসান স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয়।" -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "এনক্ৰিপশন ব্যবহাৰেৰ বাবে চাবিৰ উপস্থিতি আবশ্যক ।" +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "কি' পৰিচালন ব্যবস্থাৰ বিশ্বস্ততা স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয়।" -# -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522 -msgid "_Import" -msgstr "ইম্পোৰ্ট (_I)" +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "কি' পৰিচালন ব্যবস্থাৰ প্ৰকৃতি স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয়।" -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "গুপ্তশব্দ (_P)" +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "কি' পৰিচালন ব্যবস্থাৰ বৈধতা স্তম্ভৰ প্ৰদৰ্শন নিয়ন্ত্ৰণ কৰা হয়।" -#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256 -msgid "Couldn't export keys" -msgstr "চাবি এক্সপোৰ্ট কৰিবলৈ বিফল" +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "DNS-SD অংশীদাৰী সক্ৰিয় কৰা হ'ব" -#: ../src/seahorse-key-manager-store.c:883 -msgid "Validity" -msgstr "বৈধতা" +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "DNS-SD (Apple Bonjour) অংশীদাৰী সক্ৰিয় কৰা হ'ব। seahorse-daemon সক্ৰিয় থকা " +#~ "প্ৰয়োজনীয় আৰু HKP আৰু DNS-SD সৈতে প্ৰস্তুত কৰা দৰকাৰ।" -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:902 -msgid "Expiration Date" -msgstr "মেয়াদপূৰ্তীৰ তাৰিখ" +#~ msgid "ID of the default key" +#~ msgstr "অবিকল্পিত কি'ৰ ID" # -#: ../src/seahorse-keyserver-results.c:247 -msgid "Close this window" -msgstr "এই উইন্ডোটি বন্ধ কৰক" +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "মান সত্য হ'লে, seahorse দ্বাৰা এনক্ৰিপ্ট কৰা ফাইল ASCII আৰ্মাৰ এনকোডেড হ'ব।" # -#: ../src/seahorse-keyserver-results.c:248 -msgid "_Expand All" -msgstr "সমস্ত প্ৰসাৰণ কৰা হ'ব (_E)" +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "মান সত্য হ'লে অবিকল্পিত কি সবসময় এনক্ৰিপশন প্ৰাপকৰ তালিকায় যুক্ত হ'ব।" -#: ../src/seahorse-keyserver-results.c:249 -msgid "Expand all listings" -msgstr "সকল তালিকা প্ৰসাৰিত কৰক" +#~ msgid "Last key server search pattern" +#~ msgstr "সৰ্বশেষ কি চাৰ্ভাৰ খোঁজেৰ বিন্যাস" + +#~ msgid "Last key servers used" +#~ msgstr "সৰ্বশেষ ব্যবহৃত কি চাৰ্ভাৰ" # -#: ../src/seahorse-keyserver-results.c:250 -msgid "_Collapse All" -msgstr "সমস্ত গুটিয়ে ফেলা হ'ব (_C)" +#~ msgid "Last key used to sign a message." +#~ msgstr "বাৰ্তা স্বাক্ষৰ কৰাৰ উদ্দেশ্যি সৰ্বশেষ ব্যবহৃত কি।" -#: ../src/seahorse-keyserver-results.c:251 -msgid "Collapse all listings" -msgstr "সকল তালিকা সংকুচিত কৰক" +# +#~ msgid "PGP Key servers" +#~ msgstr "PGP-কি চাৰ্ভাৰ" -#: ../src/seahorse-keyserver-results.c:322 -msgid "Remote Keys" -msgstr "দূৰবৰ্তী কি" +#~ msgid "Publish keys to this key server." +#~ msgstr "চিহ্নিত কি চাৰ্ভাৰ উপস্থিত কি প্ৰকাশিত কৰা হ'ব।" -#: ../src/seahorse-keyserver-results.c:324 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "'%s' সহ দূৰবৰ্তী কি" +#~ msgid "Show expires column in key manager" +#~ msgstr "কি' পৰিচালনব্যবস্থাৰ অধীন অৱসানৰ কলাম প্ৰদৰ্শন কৰা হ'ব" -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "চাবি সেৱক:" +#~ msgid "Show trust column in key manager" +#~ msgstr "কি' পৰিচালনব্যবস্থাৰ অধীন বিশ্বস্ততাৰ কলাম প্ৰদৰ্শন কৰা হ'ব" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Shared Keys Near Me:" +#~ msgid "Show type column in key manager" +#~ msgstr "কি' পৰিচালনব্যবস্থাৰ অধীন প্ৰকৃতি কলাম প্ৰদৰ্শন কৰা হ'ব" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "দূৰবৰ্তী চাবি অনুসন্ধান কৰক" +#~ msgid "Show validity column in key manager" +#~ msgstr "কি' পৰিচালনব্যবস্থাৰ অধীন বৈধতা কলাম প্ৰদৰ্শন কৰা হ'ব" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"এৰ দ্বাৰা ইন্টাৰনেটেৰ অন্যান্যৰ চাবি অনুসন্ধান কৰা হ'ব আৰু এৰ পৰে স্থানীয় " -"চাবিৰিংয়েৰ মধ্যে এই চাবি ইম্পোৰ্ট কৰা হ'ব ।" +# +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "প্ৰাপক তালিকাৰ উইন্ডোৰ ক্ৰমবিন্যাস কৰিবলৈ ব্যবহাৰযোগ্য কলাম নিৰ্ধাৰণ কৰক। স্তম্ভৰ " +#~ "নাম হল: 'name' আৰু 'id'। ডাঙৰৰ পৰা ছোট অনুক্ৰমে সুবিন্যাস্ত কৰাৰ বাবে স্তম্ভৰ " +#~ "নামৰ পূৰ্বে '-' লিখক।" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "অনুসন্ধান স্থল:" +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." # -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "অনুসন্ধান (_S)" +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "শেষবাৰ যি গোপন কি দিয়ে এই বাৰ্তা স্বাক্ষৰ কৰা হৈছে তাৰ ID।" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Search for keys containing: " +# +#~ msgid "The column to sort the recipients by" +#~ msgstr "প্ৰাপক তালিকাৰ ক্ৰমবিন্যাস নিৰ্ধাৰণেৰ বাবে ব্যবহৃত কলাম" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "সেৱকে চাবি প্ৰকাশ কৰিবলৈ ব্যৰ্থ" +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "seahorse-কি তালিকাৰ ক্ৰমবিন্যাস নিৰ্ধাৰণেৰ বাবে ব্যবহৃত কলাম" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "সেৱক থেকে চাবি উদ্ধাৰ কৰিবলৈ ব্যৰ্থ: %s" +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "যে কি চাৰ্ভাৰএ PGP কি প্ৰকাশ কৰা হ'ব। অথবা PGP কি'ৰ প্ৰকাশ বন্ধ কৰাৰ বাবে " +#~ "মচি পেলাওক।" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "সুসংগত কৰাৰ উদ্দেশ্যে %d-টি চাবি নিৰ্বাচন কৰা হৈছে ।" -msgstr[1] "সুসংগত কৰাৰ উদ্দেশ্যে %d-টি চাবি নিৰ্বাচন কৰা হৈছে ।" +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "" +#~ "সন্ধানৰ বাবে ব্যবহৃত সৰ্বশেষ কি চাৰ্ভাৰ অথবা সকল কি চাৰ্ভাৰ সন্ধানৰ বাবে ৰিক্ত " +#~ "ৰাখুন।" -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "চাবি সুসংগতি" +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "কি' চাৰ্ভাৰ সন্ধানৰ বাবে সৰ্বশেষ ব্যবহৃত বিন্যাস।" -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "চাবি সুসংগতি..." +# +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "সুনিৰ্দিষ্ট কৰ্ম, মূলত স্বাক্ষৰ কৰাৰ বাবে ব্যবহাৰযোগ্য অবিকল্পিত-কি ইয়াৰ দ্বাৰা " +#~ "নিৰ্ধাৰিত হ'ব।" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "চাবি সুসংগত কৰক" +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "কি' চাৰ্ভাৰ পৰা স্বচালিতৰূপে কি প্ৰাপ্ত কৰা হ'ব কি না।" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "পৰিবৰ্তিত কি'সমূহ অবিকল্পিত কি চাৰ্ভাৰৰ সৈতে সংমিহলি কৰা হ'ব কি না।" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." +# +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "অবিকল্পিত-কি দ্বাৰা সৰ্বদা এনক্ৰিপ্ট কৰা হ'ব কি না" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "চাবি সেৱক (_K)" +# +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "ASCII Armor ব্যবহাৰ কৰা হ'ব কি না" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "সুসংগত কৰক (_S)" +#~ msgid "Web Password" +#~ msgstr "ৱেব পাছৱাৰ্ড" -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "এই এপ্লিকেশনৰ সংস্কৰণ সংখ্যা" +#~ msgid "Couldn't set application access." +#~ msgstr "এপ্লিকেচনৰ সংযোগ স্থাপন সম্ভব নহয়।" -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144 -msgid "Encryption Key Manager" -msgstr "এনক্ৰিপশন-চাবি পৰিচালন ব্যবস্থা" +#~ msgid "Path:" +#~ msgstr "পথ: " -#: ../src/seahorse-viewer.c:120 -msgid "Contributions:" -msgstr "Contributions:" +#~ msgid "Permissions:" +#~ msgstr "অনুমতি: " # -#: ../src/seahorse-viewer.c:146 -msgid "translator-credits" -msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)" +#~ msgid "Applications" +#~ msgstr "এপ্লিকেচন" # -#: ../src/seahorse-viewer.c:149 -msgid "Seahorse Project Homepage" -msgstr "Seahorse প্ৰজেক্টেৰ হোম-পেজ" +#~ msgid "_Read" +#~ msgstr "পড়া (_R)" # -#. Top menu items -#: ../src/seahorse-viewer.c:168 -msgid "_File" -msgstr "ফাইল (_F)" +#~ msgid "_Write" +#~ msgstr "লিখা (_W)" -# -#: ../src/seahorse-viewer.c:169 -msgid "_Edit" -msgstr "সম্পাদনা (_E)" +#~ msgid "Passwords: %s" +#~ msgstr "পাছৱাৰ্ড: %s" -# -#: ../src/seahorse-viewer.c:170 -msgid "_View" -msgstr "প্ৰদৰ্শন (_V)" +#~ msgid "Passwords: %s" +#~ msgstr "পাছৱাৰ্ড:: %s" -# -#: ../src/seahorse-viewer.c:171 -msgid "_Help" -msgstr "সাহায্য (_H)" +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." -# -#: ../src/seahorse-viewer.c:173 -msgid "Prefere_nces" -msgstr "পছন্দ(_n)" +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." -#: ../src/seahorse-viewer.c:174 -msgid "Change preferences for this program" -msgstr "Change preferences for this program" +#~ msgid "Saving item..." +#~ msgstr "সংৰক্ষণ কৰা হৈছে..." -#: ../src/seahorse-viewer.c:177 -msgid "About this program" -msgstr "প্ৰোগ্ৰাম পৰিচিতি" +#~ msgid "Deleting item..." +#~ msgstr "বস্তু মচি ফেলা হৈছে..." + +#~ msgid "Listing password keyrings" +#~ msgstr "পাছৱাৰ্ড কি'ৰিংৰ তালিকা প্ৰস্তুতি" + +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "।" + +#~ msgid "All Keys" +#~ msgstr "সকলো কি" + +#~ msgid "Selected Recipients" +#~ msgstr "নিৰ্বাচিত প্ৰাপক" # -#: ../src/seahorse-viewer.c:178 -msgid "_Contents" -msgstr "বিষয়বস্তু (_C)" +#~ msgid "Search Results" +#~ msgstr "বিচাৰক ফলাফল" -#: ../src/seahorse-viewer.c:179 -msgid "Show Seahorse help" -msgstr "Seahorse সংক্ৰান্ত সহায়তা প্ৰদৰ্শন কৰা হ'ব" +#~ msgid "Search _for:" +#~ msgstr "সন্ধান কৰা হ'ব: (_f)" -#: ../src/seahorse-viewer.c:276 -msgid "Export public key" -msgstr "সাৰ্বজনীন-চাবি এক্সপোৰ্ট কৰক" +#~ msgid "None (Don't Sign)" +#~ msgstr "শূণ্য (স্বাক্ষৰ কৰা নহব)" -#: ../src/seahorse-viewer.c:296 -msgid "Exporting keys" -msgstr "চাবি এক্সপোৰ্ট কৰা হচ্ছে" +#~ msgid "Sign this message as %s" +#~ msgstr "%s ৰূপে বাৰ্তা স্বাক্ষৰ কৰা হ'ব" -#: ../src/seahorse-viewer.c:321 -msgid "Couldn't retrieve data from key server" -msgstr "চাবিসেৱক থেকে তথ্য উদ্ধাৰ কৰিবলৈ ব্যৰ্থ" +#~ msgid "_Sign message as:" +#~ msgstr "বাৰ্তা স্বাক্ষৰৰ বাবে ব্যবহৃত হ'ব: (_S)" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:340 -msgid "Copied keys" -msgstr "চাবি কপি কৰা হৈছে" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "বৈধ .desktop ফাইল নহয় " -#: ../src/seahorse-viewer.c:360 -msgid "Retrieving keys" -msgstr "চাবি উদ্ধাৰ কৰা হচ্ছে" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "ডেস্কটপ ফাইলৰ অজ্ঞাত সংস্কৰণ '%s'" -#: ../src/seahorse-viewer.c:375 -msgid "Couldn't delete." -msgstr "আঁতৰাবলৈ ব্যৰ্থ ।" +#~ msgid "Starting %s" +#~ msgstr "%s আৰম্ভ কৰা হৈছে" -#: ../src/seahorse-viewer.c:409 -msgid "Deleting..." -msgstr "মুছে ফেলা হচ্ছে..." +#~ msgid "Application does not accept documents on command line" +#~ msgstr "এই এপ্লিকেচন দ্বাৰা পাছৱাৰ্ড-শাৰীেৰ মাধ্যমে ফাইল গ্ৰহণ কৰা নহয়" -#: ../src/seahorse-viewer.c:435 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s is a private key. Are you sure you want to proceed?" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "প্ৰাৰম্ভকালীন বিকল্প পৰিচিত নহয় : %d" -#: ../src/seahorse-viewer.c:483 -msgid "Importing keys from key servers" -msgstr "চাবি সেৱক থেকে চাবি ইম্পোৰ্ট কৰাৰ প্ৰণালী" +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "'Type=Link' ডেস্কটপ এনট্ৰিৰ ক্ষেত্ৰত ডকুমেন্টেৰ URI উল্লেখ কৰা যাব না" -#: ../src/seahorse-viewer.c:509 -msgid "Show properties" -msgstr "বৈশিষ্ট্য প্ৰদৰ্শন কৰা হ'ব" +#~ msgid "Not a launchable item" +#~ msgstr "প্ৰাৰম্ভ কৰাৰ যোগ্য বস্তু নহয় " # -#: ../src/seahorse-viewer.c:510 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "মুছে ফেলুন (_D)" +#~ msgid "Disable connection to session manager" +#~ msgstr "অধিবেশন পৰিচালন ব্যৱস্থাৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হ'ব" -#: ../src/seahorse-viewer.c:511 -msgid "Delete selected items" -msgstr "নিৰ্বাচিত সামগ্ৰী মুছে ফেলুন" +# +#~ msgid "Specify file containing saved configuration" +#~ msgstr "সংৰক্ষিত বিন্যাস সহ ফাইল চিহ্নিত কৰক" -#: ../src/seahorse-viewer.c:515 -msgid "E_xport..." -msgstr "এক্সপোৰ্ট কৰক...(_x)" +# +#~ msgid "FILE" +#~ msgstr "ফাইল: [1]" -#: ../src/seahorse-viewer.c:516 -msgid "Export to a file" -msgstr "ফাইলেৰ মধ্যে এক্সপোৰ্ট কৰক" +# +#~ msgid "Specify session management ID" +#~ msgstr "অধিবেশন ব্যৱস্থাপনাৰ ID উল্লেখ কৰক" -#: ../src/seahorse-viewer.c:518 -msgid "Copy to the clipboard" -msgstr "ক্লিপ-বোৰ্ডে কপি কৰক" +# +#~ msgid "Session management options:" +#~ msgstr "অধিবেশন ব্যৱস্থাপনা সংক্ৰান্ত বিকল্প:" -#: ../src/seahorse-viewer.c:523 -msgid "Import selected keys to local key ring" -msgstr "নিৰ্বাচিত চাবিগুলি স্থানীয় চাবিৰিংয়েৰ মধ্যে ইম্পোৰ্ট কৰক" +# +#~ msgid "Show session management options" +#~ msgstr "অধিবেশন ব্যৱস্থাপনা সংক্ৰান্ত বিকল্প প্ৰদৰ্শন কৰা হ'ব" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "সিকিউৰ শেল পৰিচয়-পংক্তি লিখক:" +# +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "কি' ইমপোৰ্ট কৰা হৈছে" +#~ msgstr[1] "কি' ইমপোৰ্ট কৰা হৈছে" -#: ../ssh/seahorse-ssh-commands.c:85 -msgid "Configure Key for _Secure Shell..." -msgstr "সিকিউৰ শেলেৰ বাবে চাবি কনফিগাৰ কৰক...(_S)" +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "%i কি ইমপোৰ্ট কৰা হৈছে" +#~ msgstr[1] "%i কি ইমপোৰ্ট কৰা হৈছে" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "চিহ্নিত বস্তুৰ বাবে কি ইমপোৰ্ট কৰা হৈছে" +#~ msgstr[1] "চিহ্নিত বস্তুৰ বাবে কি ইমপোৰ্ট কৰা হৈছে" -#: ../ssh/seahorse-ssh-commands.c:115 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে '%s'-ৰ সিকিউৰ শেল চাবি আঁতৰাবলৈ ইচ্ছুক নেকি ?" +# +#~ msgid "Notification Messages" +#~ msgstr "সূচনামূলক বাৰ্তা" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "আপুনি চাবি নিশ্চিতৰূপে %d-টি সিকিউৰ শেল চাবি আঁতৰাবলৈ ইচ্ছুক নেকি ?" +#~ msgid "Symmetric Key" +#~ msgstr "Symmetric Key" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "সিকিউৰ শেল কি" +#~ msgid "Credentials" +#~ msgstr "Credentials" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "অন্যান্য কম্পিউটাৰেৰ প্ৰবেশ কৰিবলৈ ব্যবহৃত (উদাহৰণ: টাৰ্মিনালেৰ মাধ্যমে)" +# +#~ msgid "Identity" +#~ msgstr "পৰিচয়" -#: ../ssh/seahorse-ssh-generate.c:90 -msgid "Couldn't generate Secure Shell key" -msgstr "সিকিউৰ শেল চাবি নিৰ্মাণ কৰিবলৈ ব্যৰ্থ" +# +#~ msgid "Progress Title" +#~ msgstr "প্ৰগতিসূচক শিৰোনাম" -#: ../ssh/seahorse-ssh-generate.c:213 -msgid "Creating Secure Shell Key" -msgstr "সিকিউৰ শেল চাবি নিৰ্মাণ কৰা হচ্ছে" +# +#~ msgid "Couldn't run file-roller" +#~ msgstr "file-roller সঞ্চালন কৰিবলৈ ব্যৰ্থ" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Use your email address, and any other reminder you need about what this " -"key is for." +# +#~ msgid "Couldn't package files" +#~ msgstr "ফাইল প্যাকেজ কৰিবলৈ ব্যৰ্থ" -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +# +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "file-rollerৰ কৰ্ম সাফল্যিৰ সৈতে সমাপ্ত নহয়" -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +# +#~ msgid "Archive files" +#~ msgstr "আৰ্কাইভ ফাইল" -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +# +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "এই নামৰ এটা ফাইল বৰ্তমান উপস্থিত আছে।\n" +#~ "\n" +#~ "এই ফাইলটিৰ পৰিবৰ্তে নতুন ফাইলটি স্থাপন কৰা হ'ব কি?" -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" -msgstr "নতুন সিকিউৰ শেল কি" +# +#~ msgid "_Replace" +#~ msgstr "প্ৰতিস্থাপন (_R)" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "নিৰ্মাণ আৰু প্ৰস্তুত কৰক (_C)" +#~ msgid "Loading Keys..." +#~ msgstr "কি' ল'ড কৰা হৈছে..." -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "অকল চাবি নিৰ্মাণ কৰক (_J)" +#~ msgid "Uploading keys..." +#~ msgstr "কি' আপল'ড কৰা হৈছে..." -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "চাবিৰ বিবৰণ: (_K)" +#~ msgid "Retrieving keys..." +#~ msgstr "কি' পুনৰুদ্ধাৰ কৰা হৈছে..." -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(সিকিউৰ শেল চাবি পাঠযোগ্য নয়)" +#~ msgid "Searching for keys on: %s" +#~ msgstr "চিহ্নিত স্থানে কি সন্ধান কৰা হৈছে: %s" -# -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "অবৈধ" +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "'%s' সহ কি সন্ধান কৰা হ'ব..." -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "গোপনীয় সিকিউৰ শেল কি" +#~ msgid "Searching for key id '%s'..." +#~ msgstr "কিid '%s' সন্ধান কৰক..." -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "সাৰ্বজনীন সিকিউৰ শেল কি" +#~ msgid "Retrieving remote keys..." +#~ msgstr "দূৰবৰ্তী-কি উদ্ধাৰ কৰা হৈছে..." -#: ../ssh/seahorse-ssh-key-properties.c:71 -msgid "Couldn't rename key." -msgstr "চাবিৰ নাম পৰিবৰ্তন কৰা নাযায় ।" +#~ msgid "Sending keys to key server..." +#~ msgstr "কি' চাৰ্ভাৰ কি পাঠানো হৈছে..." -#: ../ssh/seahorse-ssh-key-properties.c:112 -msgid "Couldn't change authorization for key." -msgstr "চাবিৰ অনুমতি পৰিবৰ্তন কৰা নাযায়" +#~ msgid "_Sign Key..." +#~ msgstr "কি' স্বাক্ষৰ কৰক...(_S)" -#: ../ssh/seahorse-ssh-key-properties.c:127 -msgid "Couldn't change passphrase for key." -msgstr "চাবিৰ পৰিচয়-পংক্তি পৰিবৰ্তন কৰা নাযায় ।" +#~ msgid "Sign public key" +#~ msgstr "সাৰ্বজনীন-কি স্বাক্ষৰ কৰক" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "এলগোৰিদম:" +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "আপুনি কি নিশ্চিতৰূপে %d কি আৰু পৰিচয় স্থায়ীভাবে আঁতৰাবলৈ ইচ্ছুক?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "পৰিচয়কাৰী:" +#~ msgid "New PGP Key" +#~ msgstr "নতুন PGP-কি" -# -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "অৱস্থান:" +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "\"%s\"এ কি এক্সপোৰ্ট কৰিবলৈ ব্যৰ্থ" -# -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "নাম" +#~ msgid "Export Complete Key" +#~ msgstr "সম্পূৰ্ণ কি এক্সপোৰ্ট কৰক" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "ক্ষমতা:" +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "আপুনি কি নিশ্চিতৰূপে '%s' প্ৰমাণপত্ৰ আঁতৰাবলৈ ইচ্ছুক?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "বিশ্বাসেৰ মাত্ৰা" +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "আপুনি কি নিশ্চিতৰূপে '%d' প্ৰমাণপত্ৰ আঁতৰাবলৈ ইচ্ছুক?" +#~ msgstr[1] "আপুনি কি নিশ্চিতৰূপে %d প্ৰমাণপত্ৰ আঁতৰাবলৈ ইচ্ছুক?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "এটি অকল '%s' একাউন্টৰ ক্ষেত্ৰত প্ৰযোজ্য ।" +#~ msgid "Create New ..." +#~ msgstr "নতুন সৃষ্টি কৰক..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "সম্পূৰ্ণ চাবি এক্সপোৰ্ট কৰক (_x)" +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "নিৰ্বাচিত %d কি" +#~ msgstr[1] "নিৰ্বাচিত %d কি" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "The owner of this key is _authorized to connect to this computer" +#~ msgid "Importing keys" +#~ msgstr "কি' ইমপোৰ্ট কৰা হৈছে" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "অন্যান্য কম্পিউটাৰেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যবহৃত ।" +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "অপৰিচিত ধৰণৰ কি অথবা তাৰিখৰ বিন্যাস বৈধ নহয়" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH আদেশ অপ্ৰত্যাশিতভাবে বন্ধ কৰা হৈছে ।" +#~ msgid "T_ypes" +#~ msgstr "ধৰণ (_y)" -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 -msgid "The SSH command failed." -msgstr "SSH আদেশ বিফল ।" +#~ msgid "Show type column" +#~ msgstr "ধৰণৰ কলাম প্ৰদৰ্শন কৰা হ'ব" -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "সিকিউৰ শেল কি" +#~ msgid "_Expiry" +#~ msgstr "মেয়াদ পূৰ্তী (_E)" -# -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "পৰিচয়-পংক্তি:" +#~ msgid "Show expiry column" +#~ msgstr "অৱসানৰ কলাম প্ৰদৰ্শন কৰা হ'ব" -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 -msgid "Remote Host Password" -msgstr "দূৰবৰ্তী হোস্টেৰ গুপ্তশব্দ" +#~ msgid "_Trust" +#~ msgstr "ভৰষাৰ মাত্ৰা (_T)" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "পুৰোনো চাবিৰ পৰিচয়-পংক্তি" +#~ msgid "Show owner trust column" +#~ msgstr "ব্যবহাৰকাৰীৰ ভৰষাৰ মাত্ৰা চিহ্নকাৰী কলাম প্ৰদৰ্শন কৰা হ'ব" -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "পুৰোনো পৰিচয়-পংক্তি লিখক: %s" +#~ msgid "_Validity" +#~ msgstr "বৈধতা (_V)" -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "নতুন চাবিৰ পৰিচয়-পংক্তি" +#~ msgid "Show validity column" +#~ msgstr "বৈধতাৰ কলাম প্ৰদৰ্শন কৰা হ'ব" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "নতুন পৰিচয়-পংক্তি লিখক: %s" +#~ msgid "Other _Keys" +#~ msgstr "অন্য কি (_K)" -#: ../ssh/seahorse-ssh-operation.c:864 -msgid "Enter Key Passphrase" -msgstr "চাবিৰ পৰিচয়-পংক্তি লিখক" +#~ msgid "Validity" +#~ msgstr "বৈধতা" -#: ../ssh/seahorse-ssh-operation.c:931 -msgid "Passphrase for New Secure Shell Key" -msgstr "নতুন সিকিউৰ শেল চাবিৰ পৰিচয়-পংক্তি লিখক" +#~ msgid "Expiration Date" +#~ msgstr "অৱসানৰ তাৰিখ" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "নতুন সিকিউৰ শেল চাবিৰ পৰিচয়-পংক্তি লিখক ।" +# +#~ msgid "_Expand All" +#~ msgstr "সমস্ত প্ৰসাৰণ কৰা হ'ব (_E)" -#: ../ssh/seahorse-ssh-operation.c:1013 -#, c-format -msgid "Importing key: %s" -msgstr "চাবি ইম্পোৰ্ট কৰা হচ্ছে: %s" +#~ msgid "Expand all listings" +#~ msgstr "সকল তালিকা প্ৰসাৰিত কৰক" -#: ../ssh/seahorse-ssh-operation.c:1015 -msgid "Importing key. Enter passphrase" -msgstr "চাবি ইম্পোৰ্ট কৰা হচ্ছে । পৰিচয়-পংক্তি লিখক ।" +# +#~ msgid "_Collapse All" +#~ msgstr "সমস্ত গুটিয়ে ফেলা হ'ব (_C)" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." -msgstr "এই চাবিৰ বাবে কোনো গোপনীয় চাবিৰ ফাইল উপস্থিত নেই ।" +#~ msgid "Collapse all listings" +#~ msgstr "সকল তালিকা সংকুচিত কৰক" -#: ../ssh/seahorse-ssh-upload.c:45 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "দূৰবৰ্তী কম্পিউটাৰেৰ মধ্যে সিকিউৰ শেল চাবি কনফিগাৰ কৰিবলৈ ব্যৰ্থ ।" +#~ msgid "Synchronizing keys" +#~ msgstr "কি' সুসংগতি" -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 -msgid "Configuring Secure Shell Keys..." -msgstr "সিকিউৰ শেল চাবি কনফিগাৰ কৰা হচ্ছে..." +#~ msgid "Export public key" +#~ msgstr "সাৰ্বজনীন-কি এক্সপোৰ্ট কৰক" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "উদাহৰণ: fileserver.example.com:port" +#~ msgid "Exporting keys" +#~ msgstr "কি' এক্সপোৰ্ট কৰা হৈছে" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "SSH সংযোগেৰ বাবে কম্পিউটাৰ প্ৰস্তুত কৰক" +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "কি' চাৰ্ভাৰ পৰা তথ্য উদ্ধাৰ কৰিবলৈ ব্যৰ্থ" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." +#~ msgid "Deleting..." +#~ msgstr "মচি ফেলা হৈছে..." -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "কম্পিউটাৰেৰ নাম: (_C)" +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s is a private key. Are you sure you want to proceed?" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "লগ-ইন নাম: (_L)" +# +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "মচি পেলাওক (_D)" -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "প্ৰস্তুত কৰক(_S)" +#~ msgid "_Key Description:" +#~ msgstr "কি'ৰ বিবৰণ: (_K)" + +# +#~ msgid "Invalid" +#~ msgstr "অবৈধ" + +#~ msgid "Private Secure Shell Key" +#~ msgstr "গোপনীয় সুৰক্ষিত শ্বেল কি" + +#~ msgid "Public Secure Shell Key" +#~ msgstr "সাৰ্বজনীন সুৰক্ষিত শ্বেল কি" + +# +#~ msgid "Passphrase:" +#~ msgstr "পাচফ্ৰেইছ:" + +#~ msgid "Enter a passphrase for your new Secure Shell key." +#~ msgstr "নতুন সুৰক্ষিত শ্বেল কি'ৰ পাচফ্ৰেইছ লিখক।" #~ msgid "Seahorse Daemon" -#~ msgstr "Seahorse ডেমন" +#~ msgstr "Seahorse ডিমন" #~ msgid "Couldn't share keys" -#~ msgstr "চাবি শেয়াৰ কৰিবলৈ ব্যৰ্থ" +#~ msgstr "কি' অংশীদাৰী কৰিবলৈ ব্যৰ্থ" #~ msgid "Can't publish discovery information on the network." -#~ msgstr "নেটৱৰ্ক আবিষ্কাৰ তথ্য প্ৰদান কৰা সম্ভব নহয় ।" +#~ msgstr "নেটৱাৰ্ক আবিষ্কাৰ তথ্য প্ৰদান কৰা সম্ভব নহয়।" #~ msgid "%s's encryption keys" -#~ msgstr "%s-ৰ এনক্ৰিপশন-কি" +#~ msgstr "%sৰ এনক্ৰিপশন-কি" #~ msgid "Key Sharing" -#~ msgstr "চাবিৰ যৌথ ব্যবহাৰ" +#~ msgstr "কি'ৰ যৌথ ব্যবহাৰ" #~ msgid "" #~ "Sharing your keys allows other people on your network to use the keys " @@ -3171,10 +3279,10 @@ #~ "Note: Your personal keys will not be compromised." #~ msgid "_Share my keys with others on my network" -#~ msgstr "নেটৱৰ্কেৰ অন্যান্য ব্যবহাৰকাৰীৰ সৈতে আমাৰ চাবিগুলি বিনিময় কৰা হ'ব (_S)" +#~ msgstr "নেটৱাৰ্কৰ অন্য ব্যবহাৰকাৰীৰ সৈতে আমাৰ কি'সমূহ বিনিময় কৰা হ'ব (_S)" #~ msgid "X keys are selected for synchronizing" -#~ msgstr "সুসংগতিৰ উদ্দেশ্যে X-টি চাবি নিৰ্বাচন কৰা হৈছে" +#~ msgstr "সুসংগতিৰ বাবে X কি নিৰ্বাচন কৰা হৈছে" #~ msgid "/home/nate/.ssh/blah_rsa" #~ msgstr "/home/nate/.ssh/blah_rsa" @@ -3183,7 +3291,7 @@ #~ msgstr "00:00:00:00:00" #~ msgid "Create a PGP Key" -#~ msgstr "এটা PGP-চাবি নিৰ্মাণ কৰক" +#~ msgstr "এটা PGP-কি সৃষ্টি কৰক" #~ msgid "" #~ "Unknown\n" @@ -3212,7 +3320,7 @@ #~ "Ultimately" #~ msgid "_Trusted Keys" -#~ msgstr "চাবি লোড কৰিবলৈ বিফল" +#~ msgstr "কি' ল'ড কৰিবলৈ বিফল" #~ msgid "" #~ "One or more of the deleted keys are private keys. Are you sure you want " diff -Nru seahorse-3.2.2/po/be.po seahorse-3.6.3/po/be.po --- seahorse-3.2.2/po/be.po 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/po/be.po 2012-08-21 12:23:18.000000000 +0200 @@ -0,0 +1,2579 @@ +# Rosetta Contributors and Canonical Ltd, 2010. +# Yuri Matsuk , 2011. +# Olya Matsuk , 2011, 2012. +# Kasia Bondarava , 2012. +msgid "" +msgstr "" +"Project-Id-Version: seahorse master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-07-15 10:42+0300\n" +"Last-Translator: Kasia Bondarava \n" +"Language-Team: Belarusian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" +"Language: be\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" + +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "Новая вязка парольных ключоў" + +#: ../gkr/seahorse-add-keyring.xml.h:2 +msgid "" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "" +"Абярыце назву для новай вязкі ключоў. Пазней спатрэбіцца пароль для " +"разблакіравання." + +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Назва новай вязкі ключоў:" + +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "Назва хоста ці адрас сервера." + +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Новая вязка парольных ключоў" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Выкарыстоўваецца для захавання пароляў праграм і сеткавых пароляў" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Новы пароль..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Бяспечна захоўвае паролі і сакрэты." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Вязка парольных ключоў" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Захаваны пароль" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Не ўдалося наставіць прадвызначаную вязку ключоў" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Не ўдалося змяніць пароль да вязкі ключоў" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Зрабіць прадвызначанай" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Праграмы звычайна захоўваюць новыя паролі ў прадвызначанай вязцы ключоў." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Змяніць _пароль" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Змяніць пароль, патрэбны для разблакіравання вязкі ключоў з паролямі" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Не ўдалося дадаць элемент" + +#: ../gkr/seahorse-gkr-add-item.xml.h:1 +msgid "Add Password" +msgstr "Даданне пароля" + +#: ../gkr/seahorse-gkr-add-item.xml.h:2 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 +msgid "_Description:" +msgstr "_Апісанне:" + +#: ../gkr/seahorse-gkr-add-item.xml.h:3 +msgid "_Password:" +msgstr "_Пароль:" + +#: ../gkr/seahorse-gkr-add-item.xml.h:4 +msgid "_Show Password" +msgstr "_Паказаць пароль" + +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Вязка ключоў:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Не ўдалося дадаць вязку ключоў" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Паролі" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Захаваныя асабістыя паролі, мандаты і сакрэты" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Пароль камунікацыйнага конта для " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Пароль ці сакрэт" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Сеткавы пароль" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Захаваная нататка" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Пароль да вязкі ключоў" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Пароль да ключа шыфравання" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Пароль да сховішча ключоў" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Пароль да Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Пароль да сеткавых контаў Gnome" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Пароль да Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Пароль для абмену імгненнымі паведамленнямі" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Сакрэт Сеткавага кіраўніка" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 +#, c-format +msgid "Are you sure you want to delete the password '%s'?" +msgstr "Сапраўды выдаліць пароль \"%s\"?" + +#: ../gkr/seahorse-gkr-item-deleter.c:83 +#, c-format +msgid "Are you sure you want to delete %d password?" +msgid_plural "Are you sure you want to delete %d passwords?" +msgstr[0] "Сапраўды выдаліць %d пароль?" +msgstr[1] "Сапраўды выдаліць %d паролі?" +msgstr[2] "Сапраўды выдаліць %d пароляў?" + +#: ../gkr/seahorse-gkr-item-properties.c:66 +msgid "Access a network share or resource" +msgstr "Доступ да сеткавых рэсурсаў" + +#: ../gkr/seahorse-gkr-item-properties.c:69 +msgid "Access a website" +msgstr "Доступ да сеціўнай пляцоўкі" + +#: ../gkr/seahorse-gkr-item-properties.c:72 +msgid "Unlocks a PGP key" +msgstr "Разблакіруе ключ PGP" + +#: ../gkr/seahorse-gkr-item-properties.c:75 +msgid "Unlocks a Secure Shell key" +msgstr "Разблакіруе ключ SSH" + +#: ../gkr/seahorse-gkr-item-properties.c:78 +msgid "Saved password or login" +msgstr "Захаваны пароль або імя для ўваходу" + +#: ../gkr/seahorse-gkr-item-properties.c:102 +msgid "Network Credentials" +msgstr "Сеткавыя мандаты" + +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "Пароль" + +#: ../gkr/seahorse-gkr-item-properties.c:215 +msgid "Couldn't change password." +msgstr "Не ўдалося змяніць пароль." + +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 +msgid "Updating password" +msgstr "Абнаўленне пароля" + +#: ../gkr/seahorse-gkr-item-properties.c:344 +msgid "Couldn't set description." +msgstr "Не ўдалося акрэсліць апісанне." + +#: ../gkr/seahorse-gkr-item-properties.xml.h:1 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Уласцівасці ключа" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 +msgid "Use:" +msgstr "Выкарыстанне:" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:5 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Тып:" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:6 +msgid "Server:" +msgstr "Сервер:" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Імя для ўваходу:" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +msgid "Show pass_word" +msgstr "Паказаць п_ароль" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:9 +msgid "Password:" +msgstr "Пароль:" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Ключ" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Тэхнічныя падрабязнасці:" + +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Падрабязнасці" + +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Вязка ключоў, якая аўтаматычна разблакіруецца пры уваходзе" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Вязка ключоў для захавання пароляў" + +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "Сапраўды выдаліць вязку парольных ключоў \"%s\"?" + +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Я разумею, што ўсе элементы будуць незваротна выдалены." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Уласцівасці вязкі ключоў" + +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Назва:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "Дата стварэння:" + +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "Вязка ключоў" + +#: ../libegg/egg-datetime.c:317 +msgid "Display flags" +msgstr "Паказваць сцяжкі" + +#: ../libegg/egg-datetime.c:318 +msgid "Displayed date and/or time properties" +msgstr "Уласцівасці паказу даты і часу" + +#: ../libegg/egg-datetime.c:323 +msgid "Lazy mode" +msgstr "Лянотны рэжым" + +#: ../libegg/egg-datetime.c:324 +msgid "Lazy mode doesn't normalize entered date and time values" +msgstr "Лянотны рэжым не нармалізуе ўведзеныя значэнні даты і часу" + +#: ../libegg/egg-datetime.c:329 +msgid "Year" +msgstr "Год" + +#: ../libegg/egg-datetime.c:330 +msgid "Displayed year" +msgstr "Паказаны год" + +#: ../libegg/egg-datetime.c:335 +msgid "Month" +msgstr "Месяц" + +#: ../libegg/egg-datetime.c:336 +msgid "Displayed month" +msgstr "Паказаны месяц" + +#: ../libegg/egg-datetime.c:341 +msgid "Day" +msgstr "Дзень" + +#: ../libegg/egg-datetime.c:342 +msgid "Displayed day of month" +msgstr "Паказаны дзень месяца" + +#: ../libegg/egg-datetime.c:347 +msgid "Hour" +msgstr "Гадзіна" + +#: ../libegg/egg-datetime.c:348 +msgid "Displayed hour" +msgstr "Паказаная гадзіна" + +#: ../libegg/egg-datetime.c:353 +msgid "Minute" +msgstr "Хвіліна" + +#: ../libegg/egg-datetime.c:354 +msgid "Displayed minute" +msgstr "Паказаная хвіліна" + +#: ../libegg/egg-datetime.c:359 +msgid "Second" +msgstr "Секунда" + +#: ../libegg/egg-datetime.c:360 +msgid "Displayed second" +msgstr "Паказаная секунда" + +#: ../libegg/egg-datetime.c:365 +msgid "Lower limit year" +msgstr "Год ніжняй граніцы" + +#: ../libegg/egg-datetime.c:366 +msgid "Year part of the lower date limit" +msgstr "Год з ніжняй граніцы даты" + +#: ../libegg/egg-datetime.c:371 +msgid "Upper limit year" +msgstr "Год верхняй граніцы" + +#: ../libegg/egg-datetime.c:372 +msgid "Year part of the upper date limit" +msgstr "Год з верхняй граніцы даты" + +#: ../libegg/egg-datetime.c:377 +msgid "Lower limit month" +msgstr "Месяц ніжняй граніцы" + +#: ../libegg/egg-datetime.c:378 +msgid "Month part of the lower date limit" +msgstr "Месяц з ніжняй граніцы даты" + +#: ../libegg/egg-datetime.c:383 +msgid "Upper limit month" +msgstr "Месяц верхняй граніцы" + +#: ../libegg/egg-datetime.c:384 +msgid "Month part of the upper date limit" +msgstr "Месяц з верхняй граніцы даты" + +#: ../libegg/egg-datetime.c:389 +msgid "Lower limit day" +msgstr "Дзень ніжняй граніцы" + +#: ../libegg/egg-datetime.c:390 +msgid "Day of month part of the lower date limit" +msgstr "Дзень месяца з ніжняй граніцы даты" + +#: ../libegg/egg-datetime.c:395 +msgid "Upper limit day" +msgstr "Дзень верхняй граніцы" + +#: ../libegg/egg-datetime.c:396 +msgid "Day of month part of the upper date limit" +msgstr "Дзень месяца з верхняй граніцы даты" + +#: ../libegg/egg-datetime.c:401 +msgid "Lower limit hour" +msgstr "Гадзіна ніжняй граніцы" + +#: ../libegg/egg-datetime.c:402 +msgid "Hour part of the lower time limit" +msgstr "Гадзіна з ніжняй граніцы часу" + +#: ../libegg/egg-datetime.c:407 +msgid "Upper limit hour" +msgstr "Гадзіна верхняй граніцы" + +#: ../libegg/egg-datetime.c:408 +msgid "Hour part of the upper time limit" +msgstr "Гадзіна з верхняй граніцы часу" + +#: ../libegg/egg-datetime.c:413 +msgid "Lower limit minute" +msgstr "Хвіліна ніжняй граніцы" + +#: ../libegg/egg-datetime.c:414 +msgid "Minute part of the lower time limit" +msgstr "Хвіліна з ніжняй граніцы часу" + +#: ../libegg/egg-datetime.c:419 +msgid "Upper limit minute" +msgstr "Хвіліна верхняй граніцы" + +#: ../libegg/egg-datetime.c:420 +msgid "Minute part of the upper time limit" +msgstr "Хвіліна з верхняй граніцы часу" + +#: ../libegg/egg-datetime.c:425 +msgid "Lower limit second" +msgstr "Секунда ніжняй граніцы" + +#: ../libegg/egg-datetime.c:426 +msgid "Second part of the lower time limit" +msgstr "Секунда з ніжняй граніцы часу" + +#: ../libegg/egg-datetime.c:431 +msgid "Upper limit second" +msgstr "Секунда верхняй граніцы" + +#: ../libegg/egg-datetime.c:432 +msgid "Second part of the upper time limit" +msgstr "Секунда з верхняй граніцы часу" + +#. Translate to calendar:week_start:1 if you want Monday to be the +#. * first day of the week; otherwise translate to calendar:week_start:0. +#. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 +#. * or calendar:week_start:0 it will not work. +#. +#: ../libegg/egg-datetime.c:474 +msgid "calendar:week_start:0" +msgstr "calendar:week_start:1" + +#: ../libegg/egg-datetime.c:496 +msgid "Date" +msgstr "Дата" + +#: ../libegg/egg-datetime.c:496 +msgid "Enter the date directly" +msgstr "Увядзіце дату" + +#: ../libegg/egg-datetime.c:503 +msgid "Select Date" +msgstr "Абярыце дату" + +#: ../libegg/egg-datetime.c:503 +msgid "Select the date from a calendar" +msgstr "Абярыце дату з календара" + +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 +msgid "Time" +msgstr "Час" + +#: ../libegg/egg-datetime.c:521 +msgid "Enter the time directly" +msgstr "Увядзіце час" + +#: ../libegg/egg-datetime.c:528 +msgid "Select Time" +msgstr "Абярыце час" + +#: ../libegg/egg-datetime.c:528 +msgid "Select the time from a list" +msgstr "Абярыце час са спіса" + +#. Translators: set this to anything else if you want to use a +#. * 24 hour clock. +#. +#: ../libegg/egg-datetime.c:793 +msgid "24hr: no" +msgstr "24hr: yes" + +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 +msgid "AM" +msgstr "AM" + +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 +msgid "PM" +msgstr "PM" + +#. Translators: This is hh:mm:ss AM/PM. +#: ../libegg/egg-datetime.c:807 +#, c-format +msgid "%02d:%02d:%02d %s" +msgstr "%02d:%02d:%02d %s" + +#. Translators: This is hh:mm AM/PM. +#: ../libegg/egg-datetime.c:810 +#, c-format +msgid "%02d:%02d %s" +msgstr "%02d:%02d %s" + +#. Translators: This is hh:mm:ss. +#: ../libegg/egg-datetime.c:814 +#, c-format +msgid "%02d:%02d:%02d" +msgstr "%02d:%02d:%02d" + +#. Translators: This is hh:mm. +#: ../libegg/egg-datetime.c:817 +#, c-format +msgid "%02d:%02d" +msgstr "%02d:%02d" + +#. TODO: should handle other display modes as well... +#. Translators: This is YYYY-MM-DD +#: ../libegg/egg-datetime.c:1176 +#, c-format +msgid "%04d-%02d-%02d" +msgstr "%3$02d-%2$02d-%1$04d" + +#. Translators: This is hh:mm:ss. +#: ../libegg/egg-datetime.c:1241 +#, c-format +msgid "%u:%u:%u" +msgstr "%u:%u:%u" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "пачатковы часовы элемент" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "Новы сервер ключоў" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "Тып сервера ключоў:" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Хост:" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "Порт для доступу да сервера." + +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Версія гэтай праграмы" + +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Сістэмныя настройкі" + +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Удзельнікі:" + +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Паролі і ключы" + +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Alexander Vlasov https://launchpad.net/~sachavav\n" +"Iryna Nikanchuk https://launchpad.net/~unetriste-deactivatedaccount\n" +"Yuri Matsuk \n" +"Kasia Bondarava" + +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Старонка праекта Seahorse" + +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Немагчыма выдаліць" + +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Не ўдалося экспартаваць ключы" + +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Не ўдалося экспартаваць даныя" + +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Файл" + +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Экспартаваць..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Экспартаваць у файл" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Праўка" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Скапіраваць у буфер абмену" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Выдаліць" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Выдаліць вылучаныя элементы" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Паказаць уласцівасці гэтага элемента" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Паказаць уласцівасці гэтай вязкі ключоў" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Настройкі" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Змяніць настройкі гэтай праграмы" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Від" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Дапамога" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Аб гэтай праграме" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Змест" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Паказаць даведку Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Экспартаваць" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Увядзіце PIN-код ці пароль для: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Пароль:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Пацвярджэнне:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Хібны адрас сервера ключоў." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Для дапамогі звярніцеся да свайго сістэмнага адміністратара ці " +"адміністратара сервера ключоў." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL-адрас" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Уласны" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Нічога: не публікаваць ключоў" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Настройкі" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Шукаць ключы на:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Публікаваць ключы на:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Аўтаматычна атрымліваць _ключы з сервераў" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Аўтаматычна сінхранізаваць _мадыфікаваныя ключы з серверамі" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Серверы ключоў" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d.%m.%Y" + +#: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 +msgid "Unknown" +msgstr "Невядома" + +#: ../libseahorse/seahorse-validity.c:42 +#: ../pgp/seahorse-pgp-key-properties.c:1260 +msgctxt "Validity" +msgid "Never" +msgstr "Ніколі" + +#: ../libseahorse/seahorse-validity.c:44 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 +msgid "Marginal" +msgstr "Абмежавана" + +#: ../libseahorse/seahorse-validity.c:46 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 +msgid "Full" +msgstr "Поўнасцю" + +#: ../libseahorse/seahorse-validity.c:48 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 +msgid "Ultimate" +msgstr "Абсалютна" + +#: ../libseahorse/seahorse-validity.c:50 +#: ../pgp/seahorse-pgp-key-properties.c:1469 +msgid "Disabled" +msgstr "Выключана" + +#: ../libseahorse/seahorse-validity.c:52 +#: ../pgp/seahorse-pgp-key-properties.c:1465 +msgid "Revoked" +msgstr "Адклікана" + +#: ../libseahorse/seahorse-widget.c:460 +#, c-format +msgid "Could not display help: %s" +msgstr "Не ўдалося паказаць даведку: %s" + +#: ../pgp/seahorse-add-subkey.xml.h:1 +msgid "Never E_xpires" +msgstr "_Ніколі не састарэе" + +#: ../pgp/seahorse-add-subkey.xml.h:2 +msgid "If key never expires" +msgstr "Калі ключ ніколі не састарэе" + +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Тып ключа:" + +#: ../pgp/seahorse-add-subkey.xml.h:4 +msgid "Key _Length:" +msgstr "_Даўжыня ключа:" + +#: ../pgp/seahorse-add-subkey.xml.h:5 +msgid "Expiration Date:" +msgstr "Тэрмін прыдатнасці:" + +#: ../pgp/seahorse-add-subkey.xml.h:6 +msgid "Length of Key" +msgstr "Даўжыня ключа" + +#: ../pgp/seahorse-add-subkey.xml.h:7 +msgid "Generate a new subkey" +msgstr "Згенераваць новы падключ" + +#: ../pgp/seahorse-add-uid.xml.h:1 +msgid "Add User ID" +msgstr "Дадаць ID карыстальніка" + +#: ../pgp/seahorse-add-uid.xml.h:2 +msgid "Must be at least 5 characters long" +msgstr "Пароль мусіць складацца прынамсі з пяці знакаў" + +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Неабавязковы адрас электроннай пошты" + +#: ../pgp/seahorse-add-uid.xml.h:4 +msgid "Optional comment describing key" +msgstr "Неабавязковы каментарый, які апісвае ключ" + +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Поўнае і_мя:" + +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 +msgid "_Email Address:" +msgstr "_Адрас электроннай пошты:" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Каментарый да ключа:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Стварыць новы ID карыстальніка" + +#: ../pgp/seahorse-expires.xml.h:1 +msgid "_Never expires" +msgstr "_Ніколі не састарэе" + +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 +msgid "Revoke key" +msgstr "Адклікаць ключ" + +#: ../pgp/seahorse-expires.xml.h:3 +msgid "C_hange" +msgstr "_Змяніць" + +#: ../pgp/seahorse-gpgme-add-subkey.c:162 +msgid "Couldn't add subkey" +msgstr "Не ўдалося дадаць падключ" + +#: ../pgp/seahorse-gpgme-add-subkey.c:181 +#, c-format +msgid "Add subkey to %s" +msgstr "Дадаць падключ да %s" + +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 +msgid "DSA (sign only)" +msgstr "DSA (толькі подпіс)" + +#: ../pgp/seahorse-gpgme-add-subkey.c:205 +msgid "ElGamal (encrypt only)" +msgstr "ElGamal (толькі шыфраванне)" + +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 +msgid "RSA (sign only)" +msgstr "RSA (толькі подпіс)" + +#: ../pgp/seahorse-gpgme-add-subkey.c:217 +msgid "RSA (encrypt only)" +msgstr "RSA (толькі шыфраванне)" + +#: ../pgp/seahorse-gpgme-add-uid.c:100 +msgid "Couldn't add user id" +msgstr "Не ўдалося дадаць ID карыстальніка" + +#: ../pgp/seahorse-gpgme-add-uid.c:122 +#, c-format +msgid "Add user ID to %s" +msgstr "Дадаць ID карыстальніка да %s" + +#: ../pgp/seahorse-gpgme.c:69 +msgid "Decryption failed. You probably do not have the decryption key." +msgstr "Памылка расшыфравання. Магчыма, у вас няма адпаведнага ключа." + +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Аперацыя была скасавана" + +#: ../pgp/seahorse-gpgme-expires.c:65 +msgid "Invalid expiry date" +msgstr "Хібная дата тэрміну прыдатнасці" + +#: ../pgp/seahorse-gpgme-expires.c:66 +msgid "The expiry date must be in the future" +msgstr "Дата тэрміну прыдатнасці мусіць быць у будучыні" + +#: ../pgp/seahorse-gpgme-expires.c:79 +msgid "Couldn't change expiry date" +msgstr "Не ўдалося змяніць дату тэрміну прыдатнасці" + +#: ../pgp/seahorse-gpgme-expires.c:140 +#, c-format +msgid "Expiry: %s" +msgstr "Тэрмін прадатнасці: %s" + +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Некалькі ключоў" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Даныя ключа" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Абароненыя ключы PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Ключы PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 +msgid "PGP Key" +msgstr "Ключ PGP" + +#: ../pgp/seahorse-gpgme-generate.c:96 +msgid "Used to encrypt email and files" +msgstr "Для шыфравання электронных лістоў і файлаў" + +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 +msgid "RSA" +msgstr "RSA" + +#: ../pgp/seahorse-gpgme-generate.c:133 +msgid "DSA Elgamal" +msgstr "DSA Elgamal" + +#: ../pgp/seahorse-gpgme-generate.c:182 +msgid "Couldn't generate PGP key" +msgstr "Не ўдалося згенераваць ключ PGP" + +#: ../pgp/seahorse-gpgme-generate.c:214 +msgid "Passphrase for New PGP Key" +msgstr "Парольная фраза для новага ключа PGP" + +#: ../pgp/seahorse-gpgme-generate.c:215 +msgid "Enter the passphrase for your new key twice." +msgstr "Двойчы ўвядзіце парольную фразу для вашага новага ключа." + +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Пры стварэнні ключа трэба згенераваць шмат выпадковых даных,\n" +"і для гэтага патрабуецца ваша дапамога. Калі ласка, выконвайце\n" +"разнастайныя дзеянні, напрыклад, уводзьце тэкст з клавіятуры,\n" +"варушыце мыш, карыстайцеся праграмамі. Такая актыўнасць дасць\n" +"сістэме дастатковую колькасць выпадковых даных." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 +msgid "Generating key" +msgstr "Генерацыя ключа" + +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Сапраўды незваротна выдаліць %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Сапраўды незваротна выдаліць %d ключ?" +msgstr[1] "Сапраўды незваротна выдаліць %d ключы?" +msgstr[2] "Сапраўды незваротна выдаліць %d ключоў?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +msgid "Wrong password" +msgstr "Няправільны пароль" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +msgid "This was the third time you entered a wrong password. Please try again." +msgstr "Вы тройчы ўвялі няправільны пароль. Паспрабуйце яшчэ раз." + +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Няправільная парольная фраза." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Увядзіце новую парольную фразу для \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Увядзіце парольную фразу для \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Увядзіце новую парольную фразу" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Увядзіце парольную фразу" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Парольная фраза" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Загружаны %d ключ" +msgstr[1] "Загружаны %d ключы" +msgstr[2] "Загружана %d ключоў" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Няправільныя даныя ключа (адсутнічаюць UID-ідэнтыфікатары). Прычынай можа " +"быць камп'ютар з датай, настаўленай у будучыні, альбо адсутнасць самаподпісу." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Ключы GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: прадвызначаны каталог вязкі ключоў" + +#: ../pgp/seahorse-gpgme-photos.c:73 +#, c-format +msgid "" +"The photo is too large\n" +"The recommended size for a photo on your key is %d x %d pixels." +msgstr "" +"Фотаздымак надта вялікі\n" +"Рэкамендаваны памер фотаздымка для вашага ключа - %d x %d пікселаў." + +#: ../pgp/seahorse-gpgme-photos.c:78 +msgid "_Don't Resize" +msgstr "_Не змяняць памер" + +#: ../pgp/seahorse-gpgme-photos.c:79 +msgid "_Resize" +msgstr "_Змяніць памер" + +#: ../pgp/seahorse-gpgme-photos.c:128 +#, c-format +msgid "" +"This is not a image file, or an unrecognized kind of image file. Try to use " +"a JPEG image." +msgstr "" +"Гэта не выява або невядомы тып выявы. Паспрабуйце ўжыць выяву ў фармаце JPEG." + +#: ../pgp/seahorse-gpgme-photos.c:224 +msgid "All image files" +msgstr "Усе файлы выяў" + +#: ../pgp/seahorse-gpgme-photos.c:237 +msgid "All JPEG files" +msgstr "Усе JPEG-файлы" + +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Усе файлы" + +#: ../pgp/seahorse-gpgme-photos.c:263 +msgid "Choose Photo to Add to Key" +msgstr "Абярыце фотаздымак, які трэба дадаць да ключа" + +#: ../pgp/seahorse-gpgme-photos.c:285 +msgid "Couldn't prepare photo" +msgstr "Не ўдалося падрыхтаваць фотаздымак" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 +msgid "Couldn't add photo" +msgstr "Не ўдалося дадаць фотаздымак" + +#: ../pgp/seahorse-gpgme-photos.c:296 +msgid "The file could not be loaded. It may be in an invalid format" +msgstr "Не ўдалося загрузіць файл. Магчыма, ён мае хібны фармат." + +#: ../pgp/seahorse-gpgme-photos.c:322 +msgid "Are you sure you want to remove the current photo from your key?" +msgstr "Сапраўды выдаліць бягучы фотаздымак з вашага ключа?" + +#: ../pgp/seahorse-gpgme-photos.c:335 +msgid "Couldn't delete photo" +msgstr "Не ўдалося выдаліць фотаздымак" + +#: ../pgp/seahorse-gpgme-revoke.c:75 +msgid "Couldn't revoke subkey" +msgstr "Не ўдалося адклікаць падключ" + +#: ../pgp/seahorse-gpgme-revoke.c:96 +#, c-format +msgid "Revoke: %s" +msgstr "Адклікаць: %s" + +#: ../pgp/seahorse-gpgme-revoke.c:107 +msgid "No reason" +msgstr "Без прычыны" + +#: ../pgp/seahorse-gpgme-revoke.c:108 +msgid "No reason for revoking key" +msgstr "Няма прычыны для адклікання ключа" + +#: ../pgp/seahorse-gpgme-revoke.c:114 +msgid "Compromised" +msgstr "Скампраметаваны" + +#: ../pgp/seahorse-gpgme-revoke.c:115 +msgid "Key has been compromised" +msgstr "Ключ быў скампраметаваны" + +#: ../pgp/seahorse-gpgme-revoke.c:121 +msgid "Superseded" +msgstr "Заменены" + +#: ../pgp/seahorse-gpgme-revoke.c:122 +msgid "Key has been superseded" +msgstr "Ключ быў заменены" + +#: ../pgp/seahorse-gpgme-revoke.c:128 +msgid "Not Used" +msgstr "Не выкарыстоўваецца" + +#: ../pgp/seahorse-gpgme-revoke.c:129 +msgid "Key is no longer used" +msgstr "Ключ больш не выкарыстоўваецца" + +#: ../pgp/seahorse-gpgme-revoke.c:166 +#, c-format +msgid "" +"You are about to add %s as a revoker for %s. This operation cannot be " +"undone! Are you sure you want to continue?" +msgstr "" +"Вы збіраецеся адклікаць %2$s, дадаўшы %1$s. Гэтую аперацыю нельга ануляваць! " +"Ці вы сапраўды хочаце працягнуць?" + +#: ../pgp/seahorse-gpgme-revoke.c:178 +msgid "Couldn't add revoker" +msgstr "Не ўдалося дадаць ключ для адклікання" + +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Я разумею, што гэты сакрэтны ключ будзе незваротна выдалены." + +#: ../pgp/seahorse-gpgme-sign.c:100 +#, c-format +msgid "" +"This key was already signed by\n" +"\"%s\"" +msgstr "" +"Гэты ключ ужо быў падпісаны\n" +"\"%s\"" + +#: ../pgp/seahorse-gpgme-sign.c:105 +msgid "Couldn't sign key" +msgstr "Не ўдалося падпісаць ключ" + +#. TODO: We should be giving an error message that allows them to +#. generate or import a key +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 +msgid "No keys usable for signing" +msgstr "Няма ключоў, прыдатных для падпісання" + +#: ../pgp/seahorse-gpgme-sign.c:165 +msgid "" +"You have no personal PGP keys that can be used to indicate your trust of " +"this key." +msgstr "" +"У вас няма асабістых ключоў PGP, якія вы маглі б выкарыстаць, каб " +"пацвердзіць давер да гэтага ключа." + +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" + +#: ../pgp/seahorse-hkp-source.c:604 +#, c-format +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Крытэрый пошуку не быў дастаткова акрэслены. Сервер \"%s\" знайшоў надта " +"шмат ключоў." + +#: ../pgp/seahorse-hkp-source.c:607 +#, c-format +msgid "Couldn't communicate with server '%s': %s" +msgstr "Не ўдалося звязацца з серверам \"%s\": %s" + +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP-сервер ключоў" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Не ўдалося імпартаваць ключы" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Імпартаванне ключоў з сервераў" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Аддалена" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Закрыць гэта акно" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Шукаць аддаленыя ключы..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Шукаць ключы на серверы" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "І_мпартаваць" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Імпартаваць вылучаныя ключы ў мясцовую вязку ключоў" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Аддаленыя ключы" + +#: ../pgp/seahorse-keyserver-results.c:288 +#, c-format +msgid "Remote Keys Containing '%s'" +msgstr "Аддаленыя ключы, якія змяшчаюць \"%s\"" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Не ўдалося выканаць пошук ключоў." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Пошук аддаленых ключоў" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "" +"Пошук ключоў іншых карыстальнікаў у Інтэрнэце. Пазней гэтыя ключы можна " +"імпартаваць у вашую мясцовую вязку ключоў." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Шукаць ключы, якія змяшчаюць: " + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Серверы ключоў:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Апублікаваныя паблізу ключы:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Месца для пошуку:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Пошук" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Не ўдалося апублікаваць ключы на серверы" + +#: ../pgp/seahorse-keyserver-sync.c:76 +#, c-format +msgid "Couldn't retrieve keys from server: %s" +msgstr "Не ўдалося атрымаць ключы з сервера: %s" + +#: ../pgp/seahorse-keyserver-sync.c:160 +#, c-format +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d ключ вылучаны для сінхранізацыі" +msgstr[1] "%d ключы вылучаны для сінхранізацыі" +msgstr[2] "%d ключоў вылучаны для сінхранізацыі" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Сінхранізацыя ключоў..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Сінхранізацыя ключоў" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Ключы з вашай вязкі будуць апублікаваны на серверы і стануць даступнымі для " +"іншых карыстальнікаў. Вы будзеце атрымліваць змены, якія зроблены іншымі " +"карыстальнікамі пасля таго, як вы атрымалі іх ключы." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Вы будзеце атрымліваць змены, якія зроблены іншымі карыстальнікамі пасля " +"таго, як вы атрымалі іх ключы. Вы не абралі сервер ключоў для публікацыі, " +"таму вашы ключы не будуць даступнымі для іншых карыстальнікаў." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Серверы ключоў" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "Сін_хранізаваць" + +#: ../pgp/seahorse-ldap-source.c:441 +#, c-format +msgid "Couldn't communicate with '%s': %s" +msgstr "Не ўдалося звязацца з \"%s\": %s" + +#: ../pgp/seahorse-ldap-source.c:652 +#, c-format +msgid "Connecting to: %s" +msgstr "Злучэнне з: %s" + +#: ../pgp/seahorse-ldap-source.c:658 +#, c-format +msgid "Couldn't resolve address: %s" +msgstr "Не ўдалося вызначыць адрас: %s" + +#: ../pgp/seahorse-ldap-source.c:702 +#, c-format +msgid "Resolving server address: %s" +msgstr "Вызначэнне адрасу сервера: %s" + +#: ../pgp/seahorse-ldap-source.c:1447 +msgid "LDAP Key Server" +msgstr "LDAP-сервер ключоў" + +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Сінхранізаваць і апублікаваць ключы..." + +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Апублікаваць і сінхранізаваць вашы ключы з апублікаванымі на серверах." + +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Ключы PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Ключы PGP ужываюцца для шыфравання электронных лістоў ці файлаў" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "С_тварыць" + +#: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Згенераваць новы ключ" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "" +"Ключ PGP дазваляе шыфраваць электронныя лісты ці файлы для іншых людзей." + +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Каментарый:" + +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Ні_колі не састарэе" + +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 +msgid "Encryption _Type:" +msgstr "Тып _шыфравання:" + +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 +msgid "Key _Strength (bits):" +msgstr "_Трываласць ключа (бітаў):" + +#: ../pgp/seahorse-pgp-generate.xml.h:11 +msgid "E_xpiration Date:" +msgstr "Т_эрмін прыдатнасці:" + +#: ../pgp/seahorse-pgp-generate.xml.h:12 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Прасунутыя параметры ключа" + +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Асабісты ключ PGP" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Ключ PGP" + +#: ../pgp/seahorse-pgp-key-properties.c:325 +msgid "Couldn't change primary user ID" +msgstr "Не ўдалося змяніць асноўны ID карыстальніка" + +#: ../pgp/seahorse-pgp-key-properties.c:344 +#, c-format +msgid "Are you sure you want to permanently delete the '%s' user ID?" +msgstr "Сапраўды незваротна выдаліць ID карыстальніка \"%s\"?" + +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Не ўдалося выдаліць ID карыстальніка" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 +msgid "[Unknown]" +msgstr "[Невядома]" + +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 +msgid "Name/Email" +msgstr "Імя/Адрас электроннай пошты" + +#: ../pgp/seahorse-pgp-key-properties.c:545 +msgid "Signature ID" +msgstr "Ідэнтыфікатар подпісу" + +#: ../pgp/seahorse-pgp-key-properties.c:678 +msgid "Couldn't change primary photo" +msgstr "Не ўдалося змяніць асноўны фотаздымак" + +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 +msgid "(unknown)" +msgstr "(невядома)" + +#: ../pgp/seahorse-pgp-key-properties.c:915 +#, c-format +msgid "This key expired on: %s" +msgstr "Тэрмін прыдатнасці ключа: %s" + +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "Назва" + +#: ../pgp/seahorse-pgp-key-properties.c:1091 +#, c-format +msgid "Are you sure you want to permanently delete subkey %d of %s?" +msgstr "Сапраўды незваротна выдаліць падключ %d з %s?" + +#: ../pgp/seahorse-pgp-key-properties.c:1100 +msgid "Couldn't delete subkey" +msgstr "Не ўдалося выдаліць падключ" + +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 +msgid "Unable to change trust" +msgstr "Не ўдалося змяніць узровень даверу" + +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Не ўдалося экспартаваць ключ" + +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 +msgctxt "Expires" +msgid "Never" +msgstr "Ніколі" + +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "ID" + +#: ../pgp/seahorse-pgp-key-properties.c:1435 +msgid "Type" +msgstr "Тып" + +#: ../pgp/seahorse-pgp-key-properties.c:1438 +msgid "Created" +msgstr "Дата стварэння" + +#: ../pgp/seahorse-pgp-key-properties.c:1441 +msgid "Expires" +msgstr "Тэрмін прыдатнасці" + +#: ../pgp/seahorse-pgp-key-properties.c:1444 +msgid "Status" +msgstr "Стан" + +#: ../pgp/seahorse-pgp-key-properties.c:1447 +msgid "Strength" +msgstr "Трываласць" + +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Састарэлы" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 +msgid "Good" +msgstr "Добры" + +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "ID ключа" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Ніколі" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Гэты ключ быў адкліканы" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Уласнік ключа адклікаў яго. Ім больш нельга карыстацца." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Тэрмін прыдатнасці гэтага ключа вычарпаны" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 +msgid "Add a photo to this key" +msgstr "Дадаць фотаздымак да гэтага ключа" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 +msgid "Remove this photo from this key" +msgstr "Выдаліць фотаздымак з гэтага ключа" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 +msgid "Make this photo the primary photo" +msgstr "Зрабіць гэты фотаздымак асноўным" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Перайсці да папярэдняга фотаздымка" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Перайсці да наступнага фотаздымка" + +#. A photograph +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Фотаздымак " + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID ключа:" + +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Назва:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Электронны адрас:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Каментарый:" + +#. To translators: This is the noun not the verb. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Выкарыстанне:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Тып:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 +msgid "Decrypt files and email sent to you." +msgstr "Для расшыфравання файлаў і электронных лістоў, высланых вам." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Прыватны ключ PGP" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Змяніць _парольную фразу" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Уласнік" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 +msgid "Key Names and Signatures" +msgstr "Назвы і подпісы ключа" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Асноўны" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +msgid "Sign" +msgstr "Падпісаць" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Выдаліць" + +#. Add another name to the PGP key. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 +msgid "_Add Name" +msgstr "_Дадаць назву" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 +msgid "Revoke" +msgstr "Адклікаць" + +#. List of names and signatures on the PGP key. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 +msgid "Names and Signatures" +msgstr "Назвы і подпісы" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID ключа:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Трываласць:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 +msgid "Technical Details" +msgstr "Тэхнічныя падрабязнасці" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 +msgid "Fingerprint" +msgstr "Адбітак" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Тэрмін прыдатнасці:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Даты" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Змяніць узровень да_веру да ўласніка:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 +msgid "_Export Complete Key:" +msgstr "_Экспартаваць поўны ключ:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +msgid "Actions" +msgstr "Дзеянні" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Дадаць" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Тэрмін прыдатнасці" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Падключы" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Абмежавана" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 +msgid "Fully" +msgstr "Поўнасцю" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 +msgid "Ultimately" +msgstr "Абсалютна" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +msgid "Encrypt files and email to the key's owner" +msgstr "Для шыфравання файлаў і электронных лістоў для ўласніка ключа" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Адкрыты ключ PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +msgid "_Other Names:" +msgstr "І_ншыя назвы:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Ваш узровень даверу да гэтага ключа" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Ваш узровень даверу вызначаны ўручную ў картцы Падрабязнасці." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#, no-c-format +msgid "I trust signatures from '%s' on other keys" +msgstr "Я давяраю подпісам \"%s\" на іншых ключах" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 +#, no-c-format +msgid "" +"If you believe that the person that owns this key is '%s', sign this " +"key:" +msgstr "" +"Калі вы верыце, што ўласнік гэтага ключа - гэта \"%s\", падпішыце " +"гэты ключ:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Падпісаць гэты ключ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 +#, no-c-format +msgid "" +"If you no longer trust that '%s' owns this key, revoke your signature:" +msgstr "" +"Калі вы больш не верыце, што гэтым ключом валодае \"%s\", адклікайце " +"свой подпіс:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "_Адклікаць подпіс" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Людзі, якія падпісалі гэты ключ:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Паказваць _толькі подпісы людзей, якім я давяраю" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 +msgid "Trust" +msgstr "Давер" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Адбітак:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 +msgid "Dates:" +msgstr "Даты:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Узровень даверу:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Вы давяраеце ўласніку:" + +#: ../pgp/seahorse-pgp-subkey.c:371 +#, c-format +msgid "Subkey %d of %s" +msgstr "Падключ %d з %s" + +#: ../pgp/seahorse-revoke.xml.h:1 +msgid "Reason for revoking the key" +msgstr "Прычына адклікання ключа" + +#: ../pgp/seahorse-revoke.xml.h:2 +msgid "_Reason:" +msgstr "_Прычына:" + +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Неабавязковае апісанне адклікання" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Адклікаць" + +#: ../pgp/seahorse-signer.c:63 +msgid "" +"You have no personal PGP keys that can be used to sign a document or message." +msgstr "" +"У вас няма асабістых ключоў PGP, якія вы маглі б выкарыстаць для подпісу " +"дакумента ці паведамлення." + +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Падпісаць паведамленне з дапамогай ключа:" + +#: ../pgp/seahorse-sign.xml.h:1 +msgid "Sign Key" +msgstr "Падпісанне ключа" + +#: ../pgp/seahorse-sign.xml.h:2 +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"Сваім подпісам вы пацвярджаеце сваю ўпэўненасць у тым, што гэты ключ " +"належыць:" + +#: ../pgp/seahorse-sign.xml.h:3 +msgid "Key Name" +msgstr "Назва ключа" + +#: ../pgp/seahorse-sign.xml.h:4 +msgid "How carefully have you checked this key?" +msgstr "Наколькі рупліва вы праверылі гэты ключ?" + +#: ../pgp/seahorse-sign.xml.h:5 +msgid "_Not at all" +msgstr "_Зусім не правяраў" + +#: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Няўважліва" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Вельмі рупліва" + +#: ../pgp/seahorse-sign.xml.h:8 +msgid "" +"Not at all: means you believe the key is owned by the person who " +"claims to own it, but you could not or did not verify this to be a fact." +msgstr "" +"Зусім не правяраў: вы верыце, што гэты ключ належыць асобе, якая " +"прадставілася яго ўласнікам, але вы не можаце праверыць ці не правяралі " +"сапраўднасць гэтага факта." + +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Няўважліва: вы няўважліва праверылі, што гэты ключ належыць асобе, " +"якая прадставілася яго ўласнікам. Напрыклад, вы можаце прачытаць адбітак " +"ключа ўласніку па тэлефоне." + +#: ../pgp/seahorse-sign.xml.h:10 +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "" +"Вельмі рупліва: Абярыце гэты параметр, толькі калі вы цалкам " +"упэўнены, што гэты ключ сапраўдны." + +#: ../pgp/seahorse-sign.xml.h:11 +msgid "" +"You could use a hard to forge photo identification (such as a passport) to " +"personally check that the name on the key is correct. You should have also " +"used email to check that the email address belongs to the owner." +msgstr "" +"Вы можаце выкарыстаць цяжкі для падробкі фотаздымак для ідэнтыфікацыі (як у " +"пашпарце), каб асабіста праверыць, што назва ключа беспамылковая. Таксама вы " +"можаце выкарыстаць адрас электроннай пошты, каб праверыць, што адрас " +"сапраўды належыць уласніку." + +#: ../pgp/seahorse-sign.xml.h:12 +msgid "How others will see this signature:" +msgstr "Як гэты подпіс будзе выглядаць для іншых:" + +#: ../pgp/seahorse-sign.xml.h:13 +msgid "_Others may not see this signature" +msgstr "І_ншыя не могуць бачыць гэты подпіс" + +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Я магу _адклікаць гэты подпіс пазней." + +#: ../pgp/seahorse-sign.xml.h:15 +msgid "Sign key as:" +msgstr "Падпісаць ключ як:" + +#: ../pgp/seahorse-sign.xml.h:16 +msgid "_Signer:" +msgstr "_Падпісант:" + +#: ../pgp/seahorse-sign.xml.h:17 +msgid "_Sign" +msgstr "_Падпісаць" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Экспартаванне даных" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Атрыманне даных" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Імпартаванне даных" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Высыланне даных" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Недаступна" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Асабісты сертыфікат і ключ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Асабісты сертыфікат" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Сертыфікат" + +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Сертыфікаты (кадаванне: DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Сертыфікаты" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509-сертыфікаты і звязаныя ключы" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Сапраўды незваротна выдаліць %d сертыфікат?" +msgstr[1] "Сапраўды незваротна выдаліць %d сертыфікаты?" +msgstr[2] "Сапраўды незваротна выдаліць %d сертыфікатаў?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Не ўдалося згенераваць закрыты ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Стварыць" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Закрыты ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Для запыту сертыфіката" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Стварыць новы закрыты ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Цэтлік:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Захавана ў:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Я разумею, што гэты ключ будзе незваротна выдалены." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Без назвы" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Не ўдалося экспартаваць сертыфікат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Не ўдалося выдаліць" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Экспартаваць" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Экспартаваць сертыфікат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Выдаліць гэты сертыфікат ці ключ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "_Запытаць сертыфікат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Стварыць файл запыту сертыфіката для гэтага ключа" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Не ўдалося захаваць запыт сертыфіката" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Захаваць запыт сертыфіката" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Запыт сертыфіката" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Закадаваны запыт (PEM)" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Не ўдалося стварыць запыт сертыфіката" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Стварэнне файла запыту сертыфіката." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Агульная назва (CN) змешчаная ў запыце сертыфіката." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Назва (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Закрыты ключ без назвы" + +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Змяненне парольнай фразы" + +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "_Новая парольная фраза:" + +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Пацвердзіце новую парольную фразу" + +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Пац_вярджэнне парольнай фразы:" + +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Кіраванне паролямі і ключамі шыфравання" + +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Працягнуць" + +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Абярыце тып новага элемента:" + +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Не ўдалося імпартаваць" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Імпартаваць" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Даныя для імпартавання:" + +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Імпартаваць ключ" + +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Усе файлы ключоў" + +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Перацягнуты тэкст" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Тэкст з буфера абмену" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Новы" + +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Закрыць гэту праграму" + +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Новы..." + +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Стварыць новы ключ або элемент" + +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Стварыць новы ключ або элемент" + +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "І_мпартаваць..." + +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Імпартаваць з файла" + +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Імпартаваць з буфера абмену" + +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Па _вязках ключоў" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Паказаць бакавую паліцу з пералікам вязак ключоў" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Паказваць _асабістае" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Паказваць толькі асабістыя ключы, сертыфікаты і паролі" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Паказваць _праверанае" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Паказваць толькі правераныя ключы, сертыфікаты і паролі" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Паказваць у_сё" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Паказваць усе ключы, сертыфікаты і паролі" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Фільтр" + +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Пачатковыя параметры:" + +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Згенераваць новы асабісты ключ: " + +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Імпартаваць наяўныя ключы з файла:" + +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Каб пачаць шыфраванне, вам спатрэбяцца ключы." + +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Не ўдалося заблакіраваць" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Не ўдалося разблакіраваць" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Заблакіраваць" + +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Разблакіраваць" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Уласцівасці" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "_Настроіць ключ для SSH..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Паслаць адкрыты ключ SSH на іншы камп'ютар і дазволіць уваход пры дапамозе " +"гэтага ключа." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Увядзіце парольную фразу да SSH:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Старая парольная фраза ключа" + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "Увядзіце старую парольную фразу для: %s" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Новая парольная фраза ключа" + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "Увядзіце новую парольную фразу для: %s" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Увядзіце новую парольную фразу яшчэ раз: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "SSH" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Ключы для бяспечнага злучэння з іншымі камп'ютарамі" + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "Сапраўды выдаліць ключ SSH \"%s\"?" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Сапраўды выдаліць %d ключ SSH?" +msgstr[1] "Сапраўды выдаліць %d ключы SSH?" +msgstr[2] "Сапраўды выдаліць %d ключоў SSH?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ключ SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Сакрэтныя ключы SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Адкрытыя ключы SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Для гэтага ключа няма даступнага файла адкрытага ключа." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "Ключ SSH" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "Для доступу да іншых камп'ютараў (напрыклад, праз тэрмінал)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "Не ўдалося згенераваць ключ SSH" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "Стварэнне ключа SSH" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Новы ключ SSH" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Проста стварыць ключ" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_Стварыць і наладзіць" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "Ключ SSH дазваляе вам бяспечна злучацца з іншымі камп'ютарамі." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Адрас вашай электроннай пошты ці напамін пра тое, для чаго прызначаны " +"гэты ключ." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Калі ёсць камп'ютар, для якога вы хочаце выкарыстоўваць гэты ключ, вы можаце " +"наладзіць яго, каб ён пазнаваў гэты ключ." + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Нечытальны ключ SSH)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Асабісты ключ SSH" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Ключ SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "Не ўдалося пераназваць ключ." + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "Не ўдалося змяніць упаўнаважанне для ключа." + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "Не ўдалося змяніць парольную фразу для ключа." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "Ідэнтыфікатар:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "Назва:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Для злучэння з іншымі камп'ютарамі." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "Давер" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "_Уласнік гэтага ключа ўпаўнаважаны для злучэння з гэтым камп'ютарам" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "Толькі для конта %s." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "Алгарытм:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Трываласць:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Месцазнаходжанне:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "_Экспартаваць поўны ключ" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "Загад SSH нечакана спынены." + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "Памылка загаду SSH." + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "Пароль да аддаленага хоста" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "Увядзіце парольную фразу для ключа" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "Парольная фраза для новага ключа SSH" + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "Імпартаванне ключа: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "Імпартаванне ключа. Увядзіце парольную фразу." + +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Ключы OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "Для гэтага ключа няма даступнага файла закрытага ключа." + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "Не ўдалося настроіць канфігурацыю ключоў SSH на аддаленым камп'ютары." + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "Настройка канфігурацыі ключоў SSH..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "Наладзіць камп'ютар для злучэння праз SSH" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"Каб выкарыстоўваць ваш ключ SSH з іншым камп'ютарам, які выкарыстоўвае SSH, " +"вы павінны мець конт для ўваходу на гэты камп'ютар." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "напрыклад: fileserver.example.com:порт" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "Назва _камп'ютара:" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "І_мя для ўваходу:" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "_Наладзіць" + diff -Nru seahorse-3.2.2/po/bg.po seahorse-3.6.3/po/bg.po --- seahorse-3.2.2/po/bg.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/bg.po 2012-08-21 12:23:18.000000000 +0200 @@ -1,34 +1,30 @@ # Bulgarian translation of seahorse po-file. -# Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Copyright (C) 2011 Krasimir Chonov . # This file is distributed under the same license as the seahorse package. # Iassen Pramatarov , 2005. -# Alexander Shopov , 2005, 2007, 2008, 2009, 2010, 2011. +# Alexander Shopov , 2005, 2007, 2008, 2009, 2010, 2011, 2012. # Krasimir Chonov , 2011. # msgid "" msgstr "" "Project-Id-Version: seahorse master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 20:16+0300\n" -"PO-Revision-Date: 2011-09-17 20:16+0300\n" -"Last-Translator: Krasimir Chonov \n" +"POT-Creation-Date: 2012-07-04 07:38+0300\n" +"PO-Revision-Date: 2012-07-04 07:38+0300\n" +"Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\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" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Добавяне на ключодържател" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Име на нов ключодържател:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -36,305 +32,293 @@ "Изберете име на новия ключодържател. Ще бъдете запитани за парола за " "отключването му." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Име на нов ключодържател:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Името на хоста или адреса на сървъра с ключове." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Неуспешно добавяне на ключодържател" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Ключодържател за нови пароли" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Използва се за съхраняване на паролите за програмите и мрежата" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Нова парола…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Защитено съхраняване на парола или ключ." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Парола за ключодържателя" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Съхранена парола" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Неуспешно задаване на стандартния ключодържател" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Неуспешна промяна на паролата на ключодържателя" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Задаване като стандартният" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Обикновено приложенията съхраняват паролите в този ключодържател." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "_Смяна на паролата" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Смяна на паролата за отключване на ключодържателя" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Неуспешно прикачане" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Добавяне на парола" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Описание:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Ключодържател:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Парола:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Показване на парола" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Неуспешно изтриване на обект" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Ключодържател:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Неуспешно добавяне на ключодържател" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Пароли" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Запазени лични пароли, удостоверения за самоличност и ключове" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Парола за мрежа за мигновени съобщения: " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Парола или ключ" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Парола за мрежата" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Съхранена бележка" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Парола за ключодържател" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Парола за ключ за шифриране" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Парола за съхранените ключове" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Парола за Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Парола за регистрация в GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Парола за Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Парола за мигновени съобщения" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Ключ за Network Manager" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Сигурни ли сте, че искате да изтриете паролата — „%s“?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "Сигурни ли сте, че искате окончателно да изтриете %d парола?" -msgstr[1] "Сигурни ли сте, че искате окончателно да изтриете %d пароли?" +msgstr[0] "Сигурни ли сте, че искате да изтриете %d парола?" +msgstr[1] "Сигурни ли сте, че искате да изтриете %d пароли?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Изтриване на обект" -msgstr[1] "Изтриване на обекти" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Достъп до ресурс споделен по мрежата" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Достъп до уеб сайт" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Отключване на ключ за PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Отключване на ключ за SSH" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Запазени пароли и имена" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Мрежово удостоверяване на самоличност" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Парола" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Неуспешна промяна на паролата." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Обновяване на паролата" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Неуспешно задаване на описание." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Парола:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Технически детайли:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Подробности" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Настройки на ключа" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Ключ" +msgid "Use:" +msgstr "Употреба:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Настройки на ключа" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Вид:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Потребителско име:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Сървър:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Потребителско име:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "_Показване на пароли" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Вид:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Употреба:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Пароли: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Пароли: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Парола за ключодържателя" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Ползва се за съхраняване на паролите за програмите и мрежата:" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Съхранена парола" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Защитено съхраняване на парола или ключ." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Неуспешно отключване на ключодържател" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Неуспешно заключване на ключодържател" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Неуспешно задаване на стандартния ключодържател" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Неуспешна промяна на паролата на ключодържателя" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Заключване" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Заключване на ключодържателя с паролите. За да го отключите, ще ви трябва " -"главната парола." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Отключване" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Отключване на ключодържателя с паролите чрез главната парола. Той ще е готов " -"да се ползва след това." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Задаване да е стандартния" +msgid "Password:" +msgstr "Парола:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Обикновено приложенията съхраняват паролите в този ключодържател." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Ключ" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "_Смяна на паролата" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Технически детайли:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Смяна на паролата за отключване на ключодържателя" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Подробности" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Неуспешно изтриване на ключодържателя" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Ключодържател, който автоматично се отключва при влизане в системата" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Ключодържател за пароли" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Сигурни ли сте, че искате да изтриете ключодържателя „%s“?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Изтриване на ключодържател" -msgstr[1] "Изтриване на ключодържатели" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Ясно ми е, че всичко в него ще бъде окончателно изтрито." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Настройки на ключодържателя" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Име:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Създаден:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Ключодържател" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Настройки на ключодържателя" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Име:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Задачата беше отказана" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Достъпът до ключодържателя бе отказан" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Програмата-демон gnome-keyring не е стартирана" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Ключодържателят вече е отключен" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Не съществува такъв ключодържател" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Неуспешна връзка към програмата за ключодържатели" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Обектът вече съществува" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Вътрешна грешка при достъпа до gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Показани флагове" @@ -591,268 +575,332 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "първоначален, временен обект" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Добавяне на сървър с ключове" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Хост:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Вид на сървъра с ключове:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Хост:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Порт за свързване към сървъра." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "първоначален, временен обект" +msgid "The port to access the server on." +msgstr "Порт за свързване към сървъра." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Парола" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Версията на програмата" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Парола:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "— системни настройки" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Потвърждаване:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Сътрудници:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Неправилен адрес на сървър с ключове." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Пароли и ключове" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"За помощ се обърнете към вашия системен администратор или администратора на " -"сървъра с ключове." +"Ясен Праматаров \n" +"Александър Шопов \n" +"\n" +"Проектът за превод на GNOME има нужда от подкрепа.\n" +"Научете повече за нас на http://gnome.cult." +"bg\n" +"Докладвайте за грешки на http://gnome." +"cult.bg/bugs" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "Адрес" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Страница на проекта Seahorse" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Потребителски" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Неуспешно изтриване" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "няма — ключовете няма да се публикуват" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Неуспешно изнасяне на ключове" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "_Автоматично получаване на ключовете от сървърите за ключове" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Неуспешно изнасяне на данни" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Автоматично _сверяване на променените ключове със сървърите за ключове" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Файл" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Сървъри с ключове" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Изнасяне…" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Настройки" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Изнасяне към файл" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Търсене на ключове чрез:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Редактиране" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "П_убликуване на ключове към:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Изнасяне към буфера за обмен" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Получаване на данни" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Изтриване" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Изнасяне на данни" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Изтриване на избраните обекти" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Внасяне на данни" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Показване на настройките на обекта" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Показване на настройките на ключодържателя" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Изпращане на данни" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Настройки" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Недостъпен" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Промяна на настройките на програмата" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d.%m.%Y г." +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Изглед" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Данни за ключ" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Помо_щ" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Множество ключове" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Относно тази програма" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Всички файлове с ключове" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Ръководство" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Всички файлове" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Показване на ръководството на Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Изнасяне" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Въведете ПИН или парола за: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Парола:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Потвърждаване:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Всички архиви" +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Неправилен адрес на сървър с ключове." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"Съществува файл с такова име.\n" -"\n" -"Искате ли да го замените?" +"За помощ се обърнете към вашия системен администратор или администратора на " +"сървъра с ключове." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "Адрес" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Потребителски" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "няма — ключовете няма да се публикуват" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Настройки" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Търсене на ключове чрез:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "П_убликуване на ключове към:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "_Автоматично получаване на ключовете от сървърите за ключове" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Автоматично _сверяване на променените ключове със сървърите за ключове" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Сървъри с ключове" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Замяна" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%3$d.%2$m.%1$Y г." #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Неизвестно" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Никога" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "донякъде" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "пълно" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "най-пълно" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Изключена" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Анулиран" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Помощта не може да бъде показана: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Дата на изтичане:" +msgid "Never E_xpires" +msgstr "_Никога не изтича" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Създаване на нов подключ" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Ако ключът никога не изтича" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Вид на ключа:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Дължина на ключа:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Вид на ключа:" +msgid "Expiration Date:" +msgstr "Дата на изтичане:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Дължина на ключа" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "_Никога не изтича" +msgid "Generate a new subkey" +msgstr "Създаване на нов подключ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Добавяне на идентификатор на потребител" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Създаване на нов идентификатор на потребител" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Пълно име:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Ко_ментар към ключа:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Трябва да бъде с дължина поне 5 знака" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Незадължителен адрес на е-поща" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Незадължително описание на ключа" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Незадължителен адрес на е-поща" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Пълно име:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Адрес на е-поща:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Ко_ментар към ключа:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Създаване на нов идентификатор на потребител" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Промяна" +msgid "_Never expires" +msgstr "_Не изтича никога" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Анулиране на ключ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Не изтича никога" +msgid "C_hange" +msgstr "_Промяна" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -863,7 +911,7 @@ msgid "Add subkey to %s" msgstr "Добавяне на подключ към %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (само подписване)" @@ -871,7 +919,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (само шифриране)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (само подписване)" @@ -892,6 +940,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Неуспешно дешифриране. Вероятно не притежавате ключа за дешифриране." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Задачата беше отказана" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Грешна дата на изтичане" @@ -909,46 +962,146 @@ msgid "Expiry: %s" msgstr "Изтичане: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Множество ключове" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Данни за ключ" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Ключове за PGP в ASCII" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Ключове за PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Ключ за PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Използва се за шифриране на поща и файлове" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Неуспешно създаване на ключ за PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Парола за новия ключ за PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Въведете двукратно паролата за новия си ключ." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"При създаването на ключ трябва да се генерират множество\n" +"случайни данни. Можете да помогнете за това. Добра идея е\n" +"да извършвате действия като да пишете на клавиатурата, да\n" +"местите мишката, да използвате програмите. Това предоставя на\n" +"системата случайни събития, които са необходими за процеса." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Създаване на ключ" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Сигурни ли сте, че искате окончателно да изтриете „%s“?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Сигурни ли сте, че искате окончателно да изтриете %d ключ?" +msgstr[1] "Сигурни ли сте, че искате окончателно да изтриете %d ключа?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Грешна парола" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Трети пореден път въвеждате неправилна парола. Пробвайте отново." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Неправилна парола." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Въведете нова парола за „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Въведете парола за „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Въведете нова парола" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Въведете парола" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Парола" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Зареден е %d ключ" +msgstr[1] "Заредени са %d ключа" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Грешни данни за ключ (липсва потребителски идентификатор). Може да се дължи " +"на компютър със системна дата в бъдещето или липсващ собствен подпис." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Ключове за GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: стандартна папка за ключодържатели" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -982,27 +1135,31 @@ msgid "All JPEG files" msgstr "Всички файлове, формат JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Всички файлове" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Изберете изображение, което да прикачите към ключа" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Неуспешно подготвяне на изображение" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Неуспешно прикачане на изображение" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Файлът не бе зареден. Може да е в грешен формат" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Сигурни ли сте, че искате да изтриете изображението от ключа си?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Неуспешно изтриване на изображение" @@ -1060,7 +1217,11 @@ msgid "Couldn't add revoker" msgstr "Неуспешно добавяне на анулиращ" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Ясно ми е, че този ключ ще бъде окончателно изтрит." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1075,11 +1236,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Няма ключове, които стават за подпис" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1087,513 +1248,574 @@ "Нямате лични ключове за PGP, които да могат да се използват, за да укажете " "доверието си към този ключ." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Неправилна парола." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Въведете нова парола за „%s“" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Търсеното не е било достатъчно специфично. Сървърът „%s“ съдържа прекалено " +"много съвпадащи ключове." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Въведете парола за „%s“" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Неуспешна връзка към сървъра „%s“: %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Въведете нова парола" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Сървър с ключове по HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Въведете парола" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Ключовете не могат да бъдат внесени" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Внасяне на ключове от сървъри с ключове" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_SSH" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Затваряне на този прозорец" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Търсене на отдалечени ключове…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Търсене на ключове в сървър с ключове" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Внасяне" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Внасяне на избраните ключове в локалния ключодържател" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Отдалечени ключове" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Зареден е %d ключ" -msgstr[1] "Заредени са %d ключа" +msgid "Remote Keys Containing '%s'" +msgstr "Отдалечени ключове, съдържащи „%s“" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Неуспешно търсене за ключове." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Откриване на отдалечени ключове" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Грешни данни за ключ (липсва потребителски идентификатор). Може да се дължи " -"на компютър със системна дата в бъдещето или липсващ собствен подпис." +"Ще се търсят чужди ключове по Интернет. След това ще можете да ги внесете в " +"ключодържателя си." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Търсене на ключове, съдържащи: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Сървър с ключове по HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Сървъри с ключове:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Споделени ключове наблизо:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Къде да се търси:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Търсене на" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Неуспешно публикуване на ключовете до сървъра" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Търсеното не е било достатъчно специфично. Сървърът „%s“ съдържа прекалено " -"много съвпадащи ключове." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Неуспешно получаване на ключовете от сървър: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Неуспешна връзка към сървъра „%s“: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "За сверяване е избран %d ключ" +msgstr[1] "За сверяване са избрани %d ключа" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Сверяване на ключове…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Сверяване" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Публикуване на ключовете от ключодържателя ви, за да са достъпни за другите " +"хора. Ще получите и промените, които са правени по чуждите ключове откакто " +"сте ги получили." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Ще получите промените, които са правени по чуждите ключове откакто сте ги " +"получили. Не сте избрали сървър за публикуване и вашите ключове няма да са " +"достъпни за другите хора." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Сървъри с ключове" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Сверяване" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Неуспешна връзка към „%s“: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Свързване с %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Неуспешно откриване на адреса: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Откриване на адреса на сървър: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Сървър с ключове по LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Подписване на ключ…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Подписване на публичен ключ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Сигурни ли сте, че искате окончателно да изтриете „%s“?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" -"Сигурни ли сте, че искате окончателно да изтриете %d ключа и идентификатори?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Сигурни ли сте, че искате окончателно да изтриете %d ключа?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Сигурни ли сте, че искате окончателно да изтриете %d идентификатори?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Сверяване/публикуване на ключове…" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Неуспешно изтриване на идентификатора на потребител" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Публикуване/сверяване на вашите ключове с тези на сървър." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Неуспешно изтриване на личен ключ" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Неуспешно изтриване на публичен ключ" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Ключове за PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Ключовете за PGP се използват за шифриране на поща и файлове" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Допълнителни настройки на ключ" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Създаване" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "" -"Ключ за PGP ви позволява да шифрирате е-пощата или файловете до други хора." +msgid "Generate a new key" +msgstr "Създаване на нов ключ" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Тук — алгоритми" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "" +"Ключът за PGP ви позволява да шифрирате е-пощата или файловете до други хора." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Създаване" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Коментар:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Дата на _изтичане:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Никога не изтича" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Вид шифриране:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Създаване на нов ключ" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Си_ла на ключа (битове):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Никога не изтича" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Нов ключ за PGP" +msgid "E_xpiration Date:" +msgstr "Дата на _изтичане:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Коментар:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Допълнителни настройки на ключ" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Изтекъл" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Личен ключ за PGP" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Ключ за PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Неуспешна промяна на основния идентификатор на потребител" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Сигурни ли сте, че искате окончателно да изтриете идентификатора на " "потребител „%s“?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Неуспешно изтриване на идентификатора на потребител" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Неизвестно]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Име/е-поща" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Идентификатор на подпис" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Неуспешна промяна на основното изображение" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(неизвестно)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Този ключ изтече на: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Име" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Сигурни ли сте, че искате окончателно да изтриете %d подключ на „%s“?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Неуспешно изтриване на подключ" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Доверието не може да се промени" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Неуспешно изнасяне на ключ към „%s“" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Изнасяне на пълен ключ" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Неуспешно изнасяне на ключ." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Неуспешно изнасяне на ключ" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Никога" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ИДЕНТИФИКАТОР" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Вид" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Създаден" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Изтича на" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Състояние:" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Сила" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Изтекъл" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Добро" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Идентификатор" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Действия" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Коментар:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Дати" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Е-поща" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Извадка" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Идентификатор на ключ:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Никога" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Имена на ключовете и подписи" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Този ключ е бил анулиран" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Изображение " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"Притежателят на ключа го е анулирал. Ключът повече не може да бъде ползван." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Технически детайли" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Този ключ е изтекъл" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Този ключ е бил анулиран" +msgid "Add a photo to this key" +msgstr "Прикачане на изображение към този ключ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Този ключ е изтекъл" +msgid "Remove this photo from this key" +msgstr "Изтриване на изображението от ключа" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Вид:" +msgid "Make this photo the primary photo" +msgstr "Това изображение да е основното" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Употреба:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Към предишното изображение" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "По_дключове" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Към следващото изображение" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Прикачане" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Изображение " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Прикачане на изображение към този ключ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Идентификатор на ключ:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Смяна на _паролата" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Име:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Дешифриране на файловете и е-пощата, които ви пращат." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Е-поща" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Изтриване" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Коментар:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Изтичане" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Употреба:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Изтича на:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Вид:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Изнасяне" +msgid "Decrypt files and email sent to you." +msgstr "Дешифриране на файловете и е-пощата, които ви пращат." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Частен ключ за PGP" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Към следващото изображение" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Смяна на _паролата" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Към предишното изображение" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Притежател" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Идентификатор на ключ:" +msgid "Key Names and Signatures" +msgstr "Имена на ключовете и подписи" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Основно" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Това изображение да е основното" +msgid "Sign" +msgstr "Подписване" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Имена и подписи" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Изтриване" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Никога" +msgid "_Add Name" +msgstr "_Добавяне на име" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "_Преодоляване на доверието на притежателя" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Притежател" +msgid "Revoke" +msgstr "Анулиране" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Основно" +msgid "Names and Signatures" +msgstr "Имена и подписи" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Частен ключ за PGP" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Идентификатор на ключ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Изтриване на изображението от ключа" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Анулиране" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Сила:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Подписване" +msgid "Technical Details" +msgstr "Технически детайли" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Сила:" +msgid "Fingerprint" +msgstr "Извадка" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" -"Притежателят на ключа го е анулирал. Ключът повече не може да бъде ползван." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Изтича на:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Добавяне на име" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Дати" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "_Преодоляване на доверието на притежателя" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Изнасяне на пълен ключ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Име:" +msgid "Actions" +msgstr "Действия" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Дати:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Прикачане" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Изтичане" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "По_дключове" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Донякъде" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Извадка:" +msgid "Fully" +msgstr "Пълно" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Указване на доверие" +msgid "Ultimately" +msgstr "Най-пълно" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Доверието ви в този ключ" +msgid "Encrypt files and email to the key's owner" +msgstr "Шифриране на файлове и е-поща до притежателя на ключа" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Публичен ключ за PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Други имена:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Хората, които са подписали този ключ:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Шифриране на файлове и е-поща до притежателя на ключа" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Доверието ви в този ключ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Пълно" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Доверието се указва ръчно в подпрозореца Подробности." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Имам доверие на подписаните от „%s“ други ключове" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1601,7 +1823,11 @@ msgstr "" "Ако вярвате, че човекът притежаващ този ключ е „%s“, подпишете ключа:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "Подписване на _този ключ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1609,43 +1835,38 @@ "Ако вече не вярвате, че човекът притежаващ този ключ е „%s“, анулирайте подписа си:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Донякъде" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Публичен ключ за PGP" +msgid "_Revoke Signature" +msgstr "_Анулиране на подпис" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Хората, които са подписали този ключ:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Да се показват подписите _само на хората, на които се доверявам" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Доверие" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Най-пълно" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Имам _доверие на притежателя:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Доверието се указва ръчно в подпрозореца Подробности." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Извадка:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Да се показват подписите _само на хората, на които се доверявам" +msgid "Dates:" +msgstr "Дати:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Анулиране на подпис" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Указване на доверие" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "Подписване на _този ключ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Имам _доверие на притежателя:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1653,55 +1874,61 @@ msgstr "Подключ %d от %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Незадължително описание на причината за анулирането" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Ан_улиране" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Причина за анулиране на ключа" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Причина:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Незадължително описание на причината за анулирането" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Ан_улиране" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Не притежавате лични ключове за PGP, които стават за подписване на документи " "или съобщения." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Подписване на файл с _ключа:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Колко внимателно сте проверили този ключ?" +msgid "Sign Key" +msgstr "Подписване на ключ" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Как другите ще видят този подпис:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Подписвайки този ключ, вие указвате доверие, че той принадлежи на:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Подписване на ключа като:" +msgid "Key Name" +msgstr "Име на ключа" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Небрежно: означава, че сте извършили небрежна проверка, че ключът се " -"притежава от човека, който твърди това. Например можете да прочетете на " -"притежателя отпечатъка на ключа по телефона." +msgid "How carefully have you checked this key?" +msgstr "Колко внимателно сте проверили този ключ?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Име на ключа" +msgid "_Not at all" +msgstr "_Въобще не" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Небрежно" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Много внимателно" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1709,7 +1936,17 @@ "Въобще не: означава, че вярвате, че ключът се притежава от човека, " "който твърди това, но не сте се уверили, че това е така." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Небрежно: означава, че сте извършили небрежна проверка, че ключът се " +"притежава от човека, който твърди това. Например можете да прочетете на " +"притежателя отпечатъка на ключа по телефона." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1717,18 +1954,6 @@ "С голямо внимание: изберете това, само ако сте напълно сигурни, че " "този ключ е автентичен." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Подписвайки този ключ, вие указвате доверие, че той принадлежи на:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Мога да _анулирам този подпис на по-късен етап." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Подписване на ключ" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1741,482 +1966,355 @@ "че адресът е на притежателя." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Небрежно" +msgid "How others will see this signature:" +msgstr "Как другите ще видят този подпис:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Въобще не" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "Другите да _не могат да видят този подпис" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Мога да _анулирам този подпис на по-късен етап." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Подписване" +msgid "Sign key as:" +msgstr "Подписване на ключа като:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Подписал:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Много внимателно" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Подписване на файл с _ключа:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Сертификат" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Неуспешно изтриване" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Сигурни ли сте, че искате да изтриете сертификата — „%s“?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Сигурни ли сте, че искате окончателно да изтриете %d сертификат?" -msgstr[1] "Сигурни ли сте, че искате окончателно да изтриете %d сертификата?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Изтриване" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Смяна на паролата" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Потвърждаване на паролата:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Потвърждаване на новата парола" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Нова _парола:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Управление на паролите и ключовете за шифриране" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Пароли и ключове" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Избор на вида обект, който искате да създадете:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Продължаване" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "_Създаване на нов…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Избран е %d ключ" -msgstr[1] "Избрани са %d ключа" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Ключовете не могат да бъдат внесени" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Внесени ключове" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Внасяне на ключове" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Внасяне на ключ" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Неразпознат вид ключ или данни в грешен формат" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Внасяне на ключове" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_SSH" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Спиране на тази програма" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Нов…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Създаване на нов ключ или обект" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Внасяне…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Внасяне от файл" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Внасяне от буфера за обмен" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Търсене на отдалечени ключове…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Търсене на ключове в сървър с ключове" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Сверяване/публикуване на ключове…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Публикуване/сверяване на вашите ключове с тези на сървър." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Вид" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Показване колоната за вида" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "Дата на _изтичане" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Показване колоната за изтичане" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Доверие" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Показване колоната за доверие на притежателя" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "В_алидност" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Показване колоната за валидност" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Филтър:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Първоначални настройки:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Създаване на нов ключ:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Внасяне на налични ключове от файл:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Лични ключове" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_Други ключове" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Трябват ви ключове, за да шифрирате." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Внасяне" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Пароли" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Неуспешно изнасяне на ключове" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Валидност" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Дата на изтичане" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Затваряне на този прозорец" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "Разширяване на _всички" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Разширяване на всички списъци" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Свиване на всички" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Свиване на всички списъци" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Отдалечени ключове" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Отдалечени ключове, съдържащи „%s“" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Сървъри с ключове:" +msgid "_Sign" +msgstr "_Подписване" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Споделени ключове наблизо:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Изнасяне на данни" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Откриване на отдалечени ключове" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Получаване на данни" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Ще се търсят чужди ключове по Интернет. След това ще можете да ги внесете в " -"ключодържателя си." +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Внасяне на данни" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Къде да се търси:" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Изпращане на данни" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Търсене на" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Недостъпен" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Търсене на ключове, съдържащи: " +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Личен сертификат и ключ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Личен сертификат" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Неуспешно публикуване на ключовете до сървъра" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Сертификат" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Неуспешно получаване на ключовете от сървър: %s" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Сертификати (формат DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Сертификати" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Сертификати за X.509 и прилежащите ключове" -#: ../src/seahorse-keyserver-sync.c:161 +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 #, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "За сверяване е избран %d ключ" -msgstr[1] "За сверяване са избрани %d ключа" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Сверяване на ключове…" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Сигурни ли сте, че искате окончателно да изтриете %d сертификат?" +msgstr[1] "Сигурни ли сте, че искате окончателно да изтриете %d сертификати?" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Сверяване" +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Неуспешно създаване на частен ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Създаване" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Частен ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Използва се за заявка на сертификат" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Създаване на нов частен ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Етикет:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Съхранен в:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Ясно ми е, че този ключ ще бъде окончателно изтрит." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Без име" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Неуспешно изнасяне на сертификат" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Публикуване на ключовете от ключодържателя ви, за да са достъпни за другите " -"хора. Ще получите и промените, които са правени по чуждите ключове откакто " -"сте ги получили." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Неуспешно изтриване" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Ще получите промените, които са правени по чуждите ключове откакто сте ги " -"получили. Не сте избрали сървър за публикуване и вашите ключове няма да са " -"достъпни за другите хора." +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Изнасяне" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Изнасяне на сертификата" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Изтриване на сертификата или ключа" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "_Заявка за сертификат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Заявка за сертификат за този ключ" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Неуспешно запазване на заявка за сертификат" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Запазване на заявка за сертификат" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Заявка за сертификат" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Заявка шифрирана с PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Неуспешно създаване на заявка за сертификат" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Създаване на файл със заявка за сертификат." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Общото име (CN) в заявката за сертификат." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Име (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Ненаименован частен ключ" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Сървъри с ключове" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Смяна на паролата" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Сверяване" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Нова _парола:" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Версията на програмата" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Потвърждаване на новата парола" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Сътрудници:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "_Потвърждаване на паролата:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Ясен Праматаров \n" -"Александър Шопов \n" -"\n" -"Проектът за превод на GNOME има нужда от подкрепа.\n" -"Научете повече за нас на http://gnome.cult.bg\n" -"Докладвайте за грешки на http://gnome.cult.bg/bugs" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Управление на паролите и ключовете за шифриране" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Страница на проекта Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Продължаване" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Файл" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Избор на вида обект, който искате да създадете:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Редактиране" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Неуспешно внасяне" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Внасяне" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Данни за внасяне:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Изглед" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Внасяне на ключ" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Помо_щ" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Всички файлове с ключове" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Настройки" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Поставен текст" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Текст от буфера за обмен" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Нов" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Промяна на настройките на програмата" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Спиране на тази програма" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Относно тази програма" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Нов…" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Ръководство" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Създаване на нов ключ или обект" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Показване на ръководството на Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Добавяне на нов ключ или обект" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Изнасяне на публичен ключ" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Внасяне…" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Изнасяне на ключове" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Внасяне от файл" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Данните не бяха получени от сървъра с ключове" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Внасяне от буфера за обмен" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Копирани ключове" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "По _ключодържател" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Странична лента с ключодържателите" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Показване на _личните" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Показване само на личните ключове, сертификати и пароли" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Показване на _доверените" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Показване само на доверените ключове, сертификати и пароли" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Показване на _всички" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Показване на всички ключове, сертификати и пароли" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Филтър" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Получаване на ключове" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Първоначални настройки:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s e частен ключ. Сигурни ли сте, че искате да продължите?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Създаване на нов ключ:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Внасяне на ключове от сървъри с ключове" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Внасяне на налични ключове от файл:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Показване на настройките" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Трябват ви ключове, за да шифрирате." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Изтриване" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Неуспешно заключване" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Неуспешно отключване" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Изтриване на избраните обекти" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Заключване" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_Изнасяне…" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Отключване" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Изнасяне към файл" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Настройки" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Изнасяне към буфера за обмен" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "На_стройване на ключовете за SSH…" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Внасяне на избраните ключове в локалния ключодържател" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Изпращане на ключа за SSH до друга машина и позволяване на влизането чрез " +"същия ключ." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2245,176 +2343,199 @@ msgid "Enter the new passphrase again: %s" msgstr "Отново въведете новата парола за: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "На_стройване на ключовете за SSH…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Изпращане на ключа за SSH до друга машина и позволяване на влизането чрез " -"същия ключ." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "SSH" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Ключове за сигурна връзка към други компютри" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Сигурни ли сте, че искате да изтриете ключа за SSH — „%s“?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Сигурни ли сте, че искате да изтриете %d ключа за SSH?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Сигурни ли сте, че искате да изтриете %d ключ за SSH?" +msgstr[1] "Сигурни ли сте, че искате да изтриете %d ключа за SSH?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ключ за SSH" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Неуспешно изтриване на ключ" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Частни ключове за SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Публични ключове за SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "За тази ключ липсва публичен." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Ключ за SSH" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Използва се за достъп до други компютри (напр. чрез терминал)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Неуспешно създаване на ключ за SSH" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Създаване на ключ за SSH" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Нов ключ за SSH" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Ползвайте адреса на е-пощата си или нещо друго, което да ви напомня за " -"какво е този ключ." +msgid "_Just Create Key" +msgstr "_Просто създаване на ключ" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Създаване и настройка" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" "Ключът за SSH (сигурна обвивка) ви дава възможност да се свързвате сигурно " -"към доверени компютри чрез SSH, без да въвеждате парола за всеки от тях." +"към други компютри чрез SSH." -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"В момента можете да настроите компютър, който искате да използвате с този " -"ключ." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Нов ключ за SSH" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Създаване и настройка" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Просто създаване на ключ" +"Адресът ви за е-поща или друга информация, която да ви напомня за какво е " +"този ключ." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Описание на ключа:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "Можете да настроите компютър да разпознава този ключ, ако желаете." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Ключът за SSH не може да бъде прочетен)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Личен ключ за SSH" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Ключ за SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Неуспешно преименуване на ключ." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Неуспешна промяна на упълномощаването за ключа." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Неуспешна промяна на паролата за ключа." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Алгоритъм:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Идентификатор:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Място:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Име:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Сила:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Използва се за връзка към други компютри." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Доверие" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Притежателят на този ключ е _упълномощен да се свърже с този компютър" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Това се отнася само до потребителя „%s“." +msgid "This only applies to the %s account." +msgstr "Това се отнася само до потребителя %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_Изнасяне на пълен ключ" +msgid "Algorithm:" +msgstr "Алгоритъм:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Притежателят на този ключ е _упълномощен да се свърже с този компютър" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Сила:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Място:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Използва се за връзка към други компютри." +msgid "E_xport Complete Key" +msgstr "_Изнасяне на пълен ключ" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Командата за SSH завърши неочаквано." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Командата за SSH бе неуспешна." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Парола за отдалечения компютър" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Въведете паролата за ключа" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Парола за новия ключ за SSH" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Внасяне на ключа: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Внасяне на ключ. Въведете парола" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Ключове за OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "За тази ключ липсва частен." @@ -2427,14 +2548,10 @@ msgstr "Настройване на ключовете за SSH…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "напр: файлов-сървър.нейде.com:порт" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Настройване на компютър за връзка по SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2442,6 +2559,10 @@ "За да използвате ключа си за SSH с друг компютър, трябва да имате достъп до " "другата машина — валидно потребителско име." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "напр: файлов-сървър.нейде.com:порт" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Име на _компютъра:" diff -Nru seahorse-3.2.2/po/ca.po seahorse-3.6.3/po/ca.po --- seahorse-3.2.2/po/ca.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/ca.po 2012-09-25 14:50:51.000000000 +0200 @@ -3,20 +3,22 @@ # This file is distributed under the same license as the Seahorse package. # Josep Monés i Teixidor , 2003. # Josep Puigdemont i Casamajó , 2005, 2006, 2007. -# Gil Forcada , 2007, 2008, 2009, 2010, 2011. +# Gil Forcada , 2007, 2008, 2009, 2010, 2011, 2012. +# Jordi Serratosa , 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-19 15:07+0200\n" -"PO-Revision-Date: 2011-09-15 22:20+0100\n" -"Last-Translator: Pau Iranzo \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-27 19:13+0000\n" +"PO-Revision-Date: 2012-08-30 01:19+0200\n" +"Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../gkr/seahorse-add-keyring.xml.h:1 @@ -24,10 +26,6 @@ msgstr "Afegeix un anell de claus de contrasenyes" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nom de l'anell de claus nou:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -35,15 +33,71 @@ "Trieu un nom per a l'anell de claus nou. Se us demanarà una contrasenya per " "desblocar-lo." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nom de l'anell de claus nou:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "El nom o l'adreça del servidor." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "No s'ha pogut afegir l'anell de claus" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Anell de claus de contrasenyes nou" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "S'utilitza per emmagatzemar les contrasenyes d'aplicacions i de xarxes" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Contrasenya nova..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Emmagatzema de forma segura una contrasenya o un secret." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Anell de claus de contrasenyes" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Contrasenya desada" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "No s'ha pogut establir l'anell de claus predeterminat" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "No s'ha pogut canviar la contrasenya de l'anell de claus" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Estableix-lo com a predeterminat" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Les aplicacions normalment emmagatzemen les contrasenyes en l'anell de claus " +"predeterminat." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Canvia la _contrasenya" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "" +"Canvia la contrasenya de desblocat de l'anell de claus d'emmagatzematge de " +"contrasenyes" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "No s'ha pogut afegir l'element" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" @@ -51,295 +105,228 @@ # #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Descripció:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Anell de claus:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Contrasenya:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Mostra la contrasen_ya" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "No s'ha pogut suprimir l'element" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Anell de claus:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "No s'ha pogut afegir l'anell de claus" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Contrasenyes" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Contrasenyes, credencials i secrets personals emmagatzemats" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Contrasenya pel compte de missatgeria instantània " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Contrasenya o secret" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Contrasenya de xarxa" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Nota desada" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Contrasenya de l'anell de claus" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Contrasenya de la clau d'encriptació" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Contrasenya del magatzem de claus" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Contrasenya del Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Contrasenya dels comptes en línia del GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Contrasenya del Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Contrasenya de la missatgeria instantània" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Secret del gestor de xarxa" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Segur que voleu suprimir la contrasenya «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Segur que voleu suprimir %d contrasenya?" msgstr[1] "Segur que voleu suprimir %d contrasenyes?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "S'està suprimint l'element" -msgstr[1] "S'estan suprimint els elements" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Accedeix a un recurs compartit de xarxa" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Accedeix a un lloc web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Desbloca una clau PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Desbloca una clau d'intèrpret d'ordres segur" # FIXME -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Contrasenya desada o entrada" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Credencials de xarxa" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Contrasenya" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "No s'ha pogut canviar la contrasenya." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "S'està actualitzant la contrasenya" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "No s'ha pogut establir la descripció." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Contrasenya:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Detalls tècnics:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalls" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Propietats de la clau" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Clau" +msgid "Use:" +msgstr "Ús:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Propietats de la clau" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipus:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Nom d'usuari:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Servidor:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Nom d'usuari:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Mostra la contrasen_ya" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipus:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Ús:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Contrasenya: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Contrasenyes: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Anell de claus de contrasenyes" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "S'utilitza per emmagatzemar les contrasenyes d'aplicacions i de xarxes" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Contrasenya desada" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Emmagatzema de forma segura una contrasenya o un secret." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "No s'ha pogut desblocar l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "No s'ha pogut blocar l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "No s'ha pogut establir l'anell de claus predeterminat" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "No s'ha pogut canviar la contrasenya de l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Bloca" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Bloca l'anell de claus d'emmagatzematge de contrasenyes de manera que faci " -"falta una contrasenya mestra per desblocar-lo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Desbloca" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Desbloca l'anell de claus d'emmagatzematge de contrasenyes amb una " -"contrasenya mestra de manera que estigui disponible per utilitzar-se." +msgid "Password:" +msgstr "Contrasenya:" -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Estableix-lo com a predeterminat" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Clau" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Les aplicacions normalment emmagatzemen les contrasenyes en l'anell de claus " -"predeterminat." +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Detalls tècnics:" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Canvia la _contrasenya" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalls" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" msgstr "" -"Canvia la contrasenya de desblocat de l'anell de claus d'emmagatzematge de " -"contrasenyes" +"Un anell de claus que es desbloqueja automàticament en iniciar la sessió" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "No s'ha pogut suprimir l'anell de claus" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Un anell de claus que s'utilitza per desar-hi contrasenyes" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Segur que voleu suprimir l'anell de claus de contrasenyes «%s»?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "S'està suprimint l'anell de claus" -msgstr[1] "S'estan suprimint els anells de claus" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Entenc que se suprimiran permanentment tots els elements." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Propietats de l'anell de claus" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nom:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Creada:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Anell de claus" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Propietats de l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nom:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "S'ha cancel·lat l'operació" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "S'ha denegat l'accés a l'anell de claus" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "El dimoni de l'anell de claus del GNOME no s'està executant" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Ja s'ha desblocat l'anell de claus" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Aquest anell de claus no existeix" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "No s'ha pogut comunicar amb el dimoni de l'anell de claus" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "L'element ja existeix" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "S'ha produït un error intern en accedir a l'anell de claus del GNOME" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Mostra els senyaladors" @@ -596,226 +583,283 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "element temporal inicial" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Afegeix un servidor de claus" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Ordinador:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Tipus de servidor de claus:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Ordinador:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "El port des d'on accedir al servidor." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "element temporal inicial" +msgid "The port to access the server on." +msgstr "El port des d'on accedir al servidor." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Contrasenya" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versió de l'aplicació" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Contrasenya:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Paràmetres del sistema" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirmeu:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Col·laboracions:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "No és una adreça de servidor de claus vàlida." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Contrasenyes i claus" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Si us cal ajuda contacteu el vostre administrador de sistemes o " -"l'administrador del servidor de claus." - -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +"Josep Monés i Teixidor \n" +"Josep Puigdemont i Casamajó " -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Personalitzat" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Pàgina inicial del projecte Seahorse" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Cap: No publiquis les claus" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "No es pot suprimir" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Obtén les claus automàticament dels _servidors de claus" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "No s'han pogut exportar les claus" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "" -"Sincronitza automàticament les claus _modificades amb els servidors de claus" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "No s'han pogut exportar les dades" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Servidors de claus" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Fitxer" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xporta..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exporta a un fitxer" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Edita" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Copia-ho al porta-retalls" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Suprimeix" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Suprimeix els elements seleccionats" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Mostra les propietats de l'element" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Mostra les propietats de l'anell de claus" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Preferè_ncies" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Canvia les preferències per a aquest programa" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Visualitza" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "A_juda" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Quant a aquest programa" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Contingut" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Mostra l'ajuda del Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exporta" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Introduïu el PIN o la contrasenya per: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Contrasenya:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Confirmeu:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "No és una adreça de servidor de claus vàlida." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Si us cal ajuda contacteu el vostre administrador de sistemes o " +"l'administrador del servidor de claus." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Personalitzat" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Cap: No publiquis les claus" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Preferències" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Cerca les claus a través de:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Publica les claus a:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "S'estan recuperant les dades" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "S'estan exportant les dades" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "S'estan important les dades" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Obtén les claus automàticament dels _servidors de claus" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "S'està enviant les dades" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"Sincronitza automàticament les claus _modificades amb els servidors de claus" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "No disponible" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Servidors de claus" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d-%m-%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Dades de la clau" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Diverses claus" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Tots els fitxers de claus" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Tots els fitxers" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arxius" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Ja existeix un fitxer amb aquest nom.\n" -"\n" -"Voleu reemplaçar-lo per un fitxer nou?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Reemplaça" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Desconegut" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Mai" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginal" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Completa" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Absoluta" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Inhabilitada" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revocada" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "No s'ha pogut mostrar l'ajuda: %s" +# #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Data de venciment:" +msgid "Never E_xpires" +msgstr "_No venç mai" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Genera una subclau nova" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Si la clau no venç mai" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipus de clau:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Longitud de la clau:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipus de clau:" +msgid "Expiration Date:" +msgstr "Data de venciment:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Longitud de la clau" -# #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "_No venç mai" +msgid "Generate a new subkey" +msgstr "Genera una subclau nova" # #: ../pgp/seahorse-add-uid.xml.h:1 @@ -823,44 +867,45 @@ msgstr "Afegeix un identificador d'usuari" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Crea l'identificador d'usuari nou" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nom complet:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Comentari de la clau:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Ha de tenir almenys 5 caràcters de longitud" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Adreça electrònica opcional" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Comentari descriptiu opcional de la clau" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Adreça de correu opcional" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nom complet:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" -msgstr "_Adreça de correu:" +msgstr "_Adreça electrònica:" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Comentari de la clau:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Crea l'identificador d'usuari nou" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Can_via" +msgid "_Never expires" +msgstr "_No venç mai" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revoca la clau" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_No venç mai" +msgid "C_hange" +msgstr "Can_via" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -871,7 +916,7 @@ msgid "Add subkey to %s" msgstr "Afegeix una subclau a %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (només signatura)" @@ -879,7 +924,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (només encriptació)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (només signatura)" @@ -903,6 +948,11 @@ msgstr "" "No s'ha pogut desencriptar. Possiblement no teniu la clau de desencriptació." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "S'ha cancel·lat l'operació" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "La data de venciment no és vàlida" @@ -920,47 +970,149 @@ msgid "Expiry: %s" msgstr "Venciment: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Diverses claus" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Dades de la clau" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Claus PGP amb armadura" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Claus PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Clau PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Emprades per l'encriptació de correus i de fitxers" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "No s'ha pogut generar la clau PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Contrasenya per a la clau PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Introduïu dues vegades la contrasenya per a la clau nova." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Quan es crea una clau, s'han de generar moltes\n" +"dades aleatòries, i fa falta l'usuari per\n" +"aconseguir-ho. Per ajudar a crear aquestes dades\n" +"aleatòries, feu altres tasques, com ara: escriure\n" +"amb el teclat, moure el ratolí o utilitzar altres\n" +"aplicacions. Amb això permetreu que el sistema tingui\n" +"les dades aleatòries que necessita." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "S'està generant la clau" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Segur que voleu suprimir permanentment %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Segur que voleu suprimir permanentment %d clau?" +msgstr[1] "Segur que voleu suprimir permanentment %d claus?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "La contrasenya és incorrecta" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Heu introduït malament la contrasenya per tercera vegada, torneu-ho a provar." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Contrasenya equivocada." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Introduïu una contrasenya nova per a «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Introduïu la contrasenya per a «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Introduïu una contrasenya nova" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Introduïu la contrasenya" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Contrasenya" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "S'ha carregat %d clau" +msgstr[1] "S'han carregat %d claus" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Les dades de la clau no són vàlides (hi manquen els UID). Pot ser que sigui " +"perquè un ordinador té la data al futur, o que manqui una autosignatura." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Claus GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: directori per defecte de l'anell de claus" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -995,28 +1147,32 @@ msgid "All JPEG files" msgstr "Tots els fitxers JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Tots els fitxers" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Trieu la fotografia per afegir a la clau" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "No s'ha pogut preparar la fotografia" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "No s'ha pogut afegir la fotografia" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "No s'ha pogut carregar el fitxer, pot ser que estigui en un format no vàlid." -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Segur que voleu suprimir la fotografia actual de la vostra clau?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "No s'ha pogut suprimir la fotografia" @@ -1074,7 +1230,11 @@ msgid "Couldn't add revoker" msgstr "No s'ha pogut afegir el revocador" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Entenc que se suprimirà permanentment el secret." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1089,532 +1249,601 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "No hi ha claus que es puguin fer servir per signar" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "" -"No teniu cap clau PGP que es pugui emprar per a indicar que confieu en " -"aquesta clau." +"No teniu cap clau PGP que es pugui emprar per indicar que confieu en aquesta " +"clau." + +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:86 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Wrong passphrase." -msgstr "Contrasenya equivocada." +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"La cerca no ha estat prou específica. El servidor «%s» ha trobat massa claus." -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Introduïu una contrasenya nova per a «%s»" +msgid "Couldn't communicate with server '%s': %s" +msgstr "No s'ha pogut comunicar amb el servidor «%s»: %s" -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Introduïu la contrasenya per a «%s»" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Servidors de claus HTTP" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Introduïu una contrasenya nova" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "No s'han pogut importar les claus" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Introduïu la contrasenya" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "S'estan important claus dels servidors de claus" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remot" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Tanca aquesta finestra" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Cerca claus remotes..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Cerca claus en un servidor de claus" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importa" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importa les claus seleccionades a l'anell de claus local" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Claus remotes" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "S'ha carregat %d clau" -msgstr[1] "S'han carregat %d claus" +msgid "Remote Keys Containing '%s'" +msgstr "Claus remotes que contenen «%s»" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Ha fallat la cerca de claus." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Cerca claus remotes" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Les dades de la clau no són vàlides (hi manquen els UID). Pot ser que sigui " -"perquè un ordinador té la data al futur, o que manqui una autosignatura." +"Això cercarà claus d'altres persones a Internet. Aquestes claus es poden " +"importar més tard al vostre anell de claus local." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "Ce_rca claus que continguin: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Servidors de claus HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Servidors de claus:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Claus compartides prop meu:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "On cercar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Cerca" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "No s'han pogut publicar les claus al servidor" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"La cerca no ha estat prou específica. El servidor «%s» ha trobat massa claus." +msgid "Couldn't retrieve keys from server: %s" +msgstr "No s'han pogut recuperar les claus del servidor: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "No s'ha pogut comunicar amb el servidor «%s»: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "S'ha seleccionat %d clau per sincronitzar" +msgstr[1] "S'han seleccionat %d claus per sincronitzar" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "S'estan sincronitzant les claus..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronitza les claus" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Això publicarà les claus del vostre anell de claus de manera que estiguin " +"disponibles per a d'altres persones. També podreu obtenir els canvis que " +"d'altres hagin fet des de la darrera vegada que veu rebre les seves claus." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Això recuperarà els canvis que d'altres hagin fet des de la darrera vegada " +"que veu rebre les seves claus. Atès que no s'ha seleccionat cap servidor on " +"publicar les vostres claus, no estaran disponibles a altres persones." -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Servidors de claus" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronitza" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "No s'ha pogut comunicar amb «%s»: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "S'està connectant a: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "No s'ha pogut resoldre l'adreça: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "S'està resolent l'adreça del servidor: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Servidor de claus LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Si_gna la clau..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Signa la clau pública" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Segur que voleu suprimir permanentment %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Segur que voleu suprimir permanentment %d claus i identitats?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Segur que voleu suprimir permanentment %d claus?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Segur que voleu suprimir permanentment %d identitats?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronitza i publica les claus..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "No s'ha pogut suprimir l'identificador d'usuari" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "" +"Publiqueu o sincronitzeu les vostres claus amb les que hi hagi en línia." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "No s'ha pogut suprimir la clau privada" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "No s'ha pogut suprimir la clau pública" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Claus PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Les claus PGP serveixen per l'encriptació de correus i fitxers" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opcions _avançades de la clau" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_rea" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Genera una clau nova" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Una clau PGP us permet encriptar correus o fitxers per a altres persones." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algorismes aquí" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_rea" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "C_omentari:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Data de venciment:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "No venç _mai" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Tipus d'_encriptació:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Genera una clau nova" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Força de la clau (en bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "No venç _mai" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Clau PGP nova" +msgid "E_xpiration Date:" +msgstr "_Data de venciment:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "C_omentari:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opcions _avançades de la clau" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Ha vençut" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Clau PGP personal" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Clau PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "No s'ha pogut canviar l'identificador primari de l'usuari" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Segur que voleu suprimir permanentment l'identificador d'usuari «%s»?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "No s'ha pogut suprimir l'identificador d'usuari" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Desconegut]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nom/adreça electrònica" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Identificador de la signatura" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "No s'ha pogut canviar la fotografia primària" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(desconegut)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Aquesta clau va vèncer el: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nom" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Segur que voleu suprimir permanentment la subclau %d de %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "No s'ha pogut suprimir la subclau" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "No s'ha pogut canviar la confiança" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "No s'ha pogut exportar la clau a «%s»" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exporta la clau sencera" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "No s'ha pogut exportar la clau." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "No s'ha pogut exportar la clau" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Mai" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipus" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Creada" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Venç" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Estat" # FIXME FIXME FIXME (josep) -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Força" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Ha vençut" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Correcte" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID de la clau" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Accions" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Comentari:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Dates" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Adreça electrònica:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Empremta digital" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Identificador de la clau:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Mai" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Noms de claus i signatures:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Aquesta clau ha estat revocada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotografia " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "El propietari de la clau l'ha revocada, no es pot fer servir més." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Detalls tècnics" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Aquesta clau ha vençut" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Aquesta clau ha estat revocada" +msgid "Add a photo to this key" +msgstr "Afegeix una fotografia a aquesta clau" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Aquesta clau ha vençut" +msgid "Remove this photo from this key" +msgstr "Suprimeix aquesta foto d'aquesta clau" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipus:" +msgid "Make this photo the primary photo" +msgstr "Fes que aquesta foto sigui la primària" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Vés a la foto anterior" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Utilització:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Subclaus" +msgid "Go to next photo" +msgstr "Vés a la foto següent" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Afegeix" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotografia " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Afegeix una fotografia a aquesta clau" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Identificador de la clau:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Canvia la contrasen_ya" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nom:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Desencripteu fitxers i correus que us enviïn." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Adreça electrònica:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Suprimeix" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Comentari:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Venç" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Utilització:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Venç:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipus:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exporta" +msgid "Decrypt files and email sent to you." +msgstr "Desencripteu fitxers i correus que us enviïn." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Clau PGP privada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Vés a la foto següent" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Canvia la contrasen_ya" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Vés a la foto anterior" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Propietari" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Identificador de la clau:" +msgid "Key Names and Signatures" +msgstr "Noms de claus i signatures:" + +# La clau o la foto (josep) +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primària" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Fes que aquesta foto sigui la primària" +msgid "Sign" +msgstr "Signa" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Noms i signatures" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Suprimeix" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Mai" +msgid "_Add Name" +msgstr "_Afegeix un nom" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "_Canvia la confiança en el propietari:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Propietari" +msgid "Revoke" +msgstr "Revoca" -# La clau o la foto (josep) +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primària" +msgid "Names and Signatures" +msgstr "Noms i signatures" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Clau PGP privada" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Identificador de la clau:" +# FIXME FIXME FIXME (josep) #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Suprimeix aquesta foto d'aquesta clau" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Revoca" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Força:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Signa" +msgid "Technical Details" +msgstr "Detalls tècnics" -# FIXME FIXME FIXME (josep) #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Força:" +msgid "Fingerprint" +msgstr "Empremta digital" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "El propietari de la clau l'ha revocada, no es pot fer servir més." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Venç:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Afegeix un nom" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Dates" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "_Canvia la confiança en el propietari:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Exporta la clau sencera:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nom:" +msgid "Actions" +msgstr "Accions" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Dates:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Afegeix" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Venç" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Subclaus" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginal" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Empremta digital:" +msgid "Fully" +msgstr "Completa" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indiqueu la confiança:" +msgid "Ultimately" +msgstr "Absoluta" +# FIXME: "Xifra els fitxers i envia'ls per correu electrònic al " +# "propietari de la clau" ? (David) #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "La confiança que teniu en aquesta clau" +msgid "Encrypt files and email to the key's owner" +msgstr "Encripta fitxers i correus al propietari de la clau" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Clau PGP pública" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Altres noms:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Persones que han signat aquesta clau:" - -# FIXME: "Xifra els fitxers i envia'ls per correu electrònic al " -# "propietari de la clau" ? (David) -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Encripta fitxers i correus al propietari de la clau " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "La confiança que teniu en aquesta clau" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Completa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "" +"La confiança que hi teniu s'especifica manualment a la pestanya de " +"Detalls." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Confio en les signatures de «%s» a altres claus" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "Si creieu que el propietari d'aquesta clau és «%s», signeu-la:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Signa aquesta clau" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1622,45 +1851,38 @@ "Si ja no creieu que el propietari d'aquesta clau és «%s», revoqueu la " "vostra signatura:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginal" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Clau PGP pública" +msgid "_Revoke Signature" +msgstr "_Revoca la signatura" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Persones que han signat aquesta clau:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Mostra només signatures de gent en qui confiï" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Confiança" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Absoluta" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Confieu en el _propietari:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "" -"La confiança que hi teniu s'especifica manualment a la pestanya de " -"Detalls." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Empremta digital:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Mostra només signatures de gent en qui confiï" +msgid "Dates:" +msgstr "Dates:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Revoca la signatura" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indiqueu la confiança:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Signa aquesta clau" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Confieu en el _propietari:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1668,56 +1890,62 @@ msgstr "Subclau %d de %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Descripció opcional per a la revocació" +msgid "Reason for revoking the key" +msgstr "Motiu pel qual es revoca la clau" -# #: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_voca" +msgid "_Reason:" +msgstr "_Motiu:" -#: ../pgp/seahorse-revoke.xml.h:3 -msgid "Reason for revoking the key" -msgstr "Motiu pel qual es revoca la clau" +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Descripció opcional per a la revocació" +# #: ../pgp/seahorse-revoke.xml.h:6 -msgid "_Reason:" -msgstr "_Motiu:" +msgid "Re_voke" +msgstr "Re_voca" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "No teniu claus PGP personals que es puguin emprar per signar cap document o " "missatge." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Signa el fitxer amb la clau:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Amb quin deteniment heu comprovat aquesta clau?" +msgid "Sign Key" +msgstr "Signa la clau" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "La manera en què altres veuran aquesta signatura:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "En signar esteu indicant que confieu que aquesta clau pertany a:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Signa la clau com a:" +msgid "Key Name" +msgstr "Nom de la clau" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Casualment: vol dir que heu fet una verificació per sobre que la clau " -"és de la persona que diu ser-ne la propietària. Per exemple, heu llegit " -"l'empremta digital de la clau a aquesta persona per telèfon. " +msgid "How carefully have you checked this key?" +msgstr "Amb quin deteniment heu comprovat aquesta clau?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nom de la clau" +msgid "_Not at all" +msgstr "_De cap manera" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Casualment" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "Amb _molt deteniment" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1725,7 +1953,17 @@ "De cap manera: vol dir que creieu que la clau és propietat de la " "persona que diu ser-ne la propietària, però que no heu pogut verificar-ho." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Casualment: vol dir que heu fet una verificació per sobre que la clau " +"és de la persona que diu ser-ne la propietària. Per exemple, podeu dir-li " +"per telèfon l'empremta digital de la clau." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1733,18 +1971,6 @@ "Amb molt deteniment: seleccioneu aquesta opció només si esteu " "absolutament segur que aquesta clau és genuïna." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "En signar esteu indicant que confieu que aquesta clau pertany a:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Puc _revocar aquesta clau més endavant." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Signa la clau" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1757,482 +1983,357 @@ "seu propietari." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Casualment" +msgid "How others will see this signature:" +msgstr "La manera en què altres veuran aquesta signatura:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_De cap manera" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Altres no poden veure aquesta fotografia" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Puc _revocar aquesta clau més endavant." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Signa" +msgid "Sign key as:" +msgstr "Signa la clau com a:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Signant:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "Amb _molt deteniment" +msgid "_Sign" +msgstr "_Signa" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Signa el fitxer amb la clau:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "S'estan exportant les dades" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "S'estan recuperant les dades" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "S'estan important les dades" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "S'estan enviant les dades" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "No disponible" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Certificat i clau personals" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificat personal" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certificat" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificats (codificats amb DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificats" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificats X.509 i claus relacionades" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Segur que voleu suprimir permanentment %d certificat?" +msgstr[1] "Segur que voleu suprimir permanentment %d certificats?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "No s'ha pogut generar la clau privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Crea" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Clau privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "S'utilitza per sol·licitar un certificat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Crea una clau privada nova" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etiqueta:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Emmagatzemada a:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Entenc que se suprimirà permanentment la contrasenya." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Sense nom" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "No s'ha pogut exportar el certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "No s'ha pogut suprimir" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Segur que voleu suprimir el certificat «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Segur que voleu suprimir %d certificat?" -msgstr[1] "Segur que voleu suprimir %d certificats?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "S'està suprimint" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exporta" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exporta el certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Suprimeix el certificat o la clau" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Sol·licita un _certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Crea un fitxer de sol·licitud de certificat per aquesta clau" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "No s'ha pogut desar la sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Desa la sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Sol·licitud codificada amb PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "No s'ha pogut crear la sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Crea un fitxer de sol·licitud de certificat." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "El nom comú (CN) de la sol·licitud de certificat." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nom (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Clau privada sense nom" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Canvia la contrasenya" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firmeu la contrasenya:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Con_firmeu la contrasenya nova" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" -msgstr "Contrasen_ya nova:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Gestioneu les contrasenyes i claus d'encriptació" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Contrasenyes i claus" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Seleccioneu el tipus d'element que vulgueu crear:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "C_ontinua" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Crea una nova..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "S'ha seleccionat %d clau" -msgstr[1] "S'han seleccionat %d claus" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "No s'han pogut importar les claus" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Claus importades" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "S'estan important les claus" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importa clau" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "" -"No s'ha reconegut el tipus de clau, o el format de les dades no és vàlid" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "S'estan important les claus" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remot" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Surt d'aquest programa" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nova..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Crea una clau o un element nou" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importa..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importa des d'un fitxer" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importa des del porta-retalls" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Cerca claus remotes..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Cerca claus en un servidor de claus" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronitza i publica les claus..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "" -"Publiqueu o sincronitzeu les vostres claus amb les que hi hagi en línia." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Tipus" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Mostra la columna tipus" - -# -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "V_enciment" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Mostra la columna de venciment de la clau" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Confiança" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Mostra la columna de confiança" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validesa" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Mostra la columna de la validesa" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Fitxer:" - -# FIXME (josep) -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opcions de la primera vegada:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Genereu una clau per a vós mateix: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importa les claus existents des d'un fitxer:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Les meves claus _personals" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Altres _claus" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Per poder començar a encriptar us caldran claus." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importa" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "Contrasen_ya" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "No s'han pogut exportar les claus" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validesa" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Data de venciment" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Tanca aquesta finestra" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Expandeix-ho tot" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Expandeix tots els llistats" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Redueix-ho tot" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Redueix tots els llistats" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Claus remotes" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Claus remotes que contenen «%s»" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servidors de claus:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Claus compartides prop meu:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Cerca claus remotes" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Això cercarà claus d'altres persones a Internet. Aquestes claus es poden " -"importar més tard al vostre anell de claus local." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "On cercar:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Cerca" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Ce_rca claus que continguin: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "No s'han pogut publicar les claus al servidor" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "No s'han pogut recuperar les claus del servidor: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "S'ha seleccionat %d clau per sincronitzar" -msgstr[1] "S'han seleccionat %d claus per sincronitzar" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "S'estan sincronitzant les claus..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronitza les claus" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Això publicarà les claus del vostre anell de claus de manera que estiguin " -"disponibles per a d'altres persones. També podreu obtenir els canvis que " -"d'altres hagin fet des de la darrera vegada que veu rebre les seves claus." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Això recuperarà els canvis que d'altres hagin fet des de la darrera vegada " -"que veu rebre les seves claus. Atès que no s'ha seleccionat cap servidor on " -"publicar les vostres claus, no estaran disponibles a altres persones." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Servidors de claus" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronitza" +msgstr "Contrasen_ya nova:" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versió de l'aplicació" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Con_firmeu la contrasenya nova" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Col·laboracions:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Con_firmeu la contrasenya:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Josep Monés i Teixidor \n" -"Josep Puigdemont i Casamajó " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Gestioneu les contrasenyes i claus d'encriptació" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Pàgina inicial del projecte Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continua" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fitxer" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Seleccioneu el tipus d'element que vulgueu crear:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Edita" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Ha fallat la importació" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importa" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Dades a importar:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Visualitza" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importa clau" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "A_juda" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Tots els fitxers de claus" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Preferè_ncies" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Text deixat anar" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Text del porta-retalls" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nova" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Canvia les preferències per a aquest programa" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Surt d'aquest programa" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Quant a aquest programa" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nova..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Contingut" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Crea una clau o un element nou" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Mostra l'ajuda del Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Afegeix una clau o un element nou" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exporta una clau pública" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importa..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "S'estan exportant les claus" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importa des d'un fitxer" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "No s'han pogut recuperar dades del servidor de claus" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importa des del porta-retalls" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Claus copiades" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Per _anell de claus" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Mostra la barra lateral amb el llistat d'anells de claus" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Mostra les _personals" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Mostra només les claus, els certificats i les contrasenyes personals" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Mostra les de _confiança" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "" +"Mostra només les claus, els certificats i les contrasenyes de confiança" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Mostra _qualsevol" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Mostra totes les claus, els certificats i les contrasenyes" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtre" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "S'estan recuperant les claus" +# FIXME (josep) +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opcions de la primera vegada:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s és una clau privada. Segur que voleu continuar?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Genereu una clau per a vós mateix: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "S'estan important claus dels servidors de claus" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importa les claus existents des d'un fitxer:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Mostra les propietats" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Per poder començar a encriptar us caldran claus." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Suprimeix" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "No s'ha pogut blocar" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "No s'ha pogut desblocar" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Suprimeix els elements seleccionats" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Bloca" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xporta..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Desbloca" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exporta a un fitxer" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propietats" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copia-ho al porta-retalls" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configura la clau per a l'intèrpret d'ordres _segur..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importa les claus seleccionades a l'anell de claus local" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Envia la clau pública de l'intèrpret d'ordres segur a un altre ordinador, i " +"habilita connexions que emprin aquesta clau." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2261,179 +2362,203 @@ msgid "Enter the new passphrase again: %s" msgstr "Introduïu un altre cop la contrasenya nova de: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configura la clau per a l'intèrpret d'ordres _segur..." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Intèrpret d'ordres segur" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" msgstr "" -"Envia la clau pública de l'intèrpret d'ordres segur a un altre ordinador, i " -"habilita connexions que emprin aquesta clau." +"Claus que s'utilitzen per connectar-se de forma segura a altres ordinadors" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Segur que voleu suprimir la clau de l'intèrpret d'ordres segur «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Segur que voleu suprimir %d claus d'intèrpret d'ordres segur?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "No s'ha pogut suprimir la clau" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Segur que voleu suprimir %d clau d'intèrpret d'ordres segur?" +msgstr[1] "Segur que voleu suprimir %d claus d'intèrpret d'ordres segur?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Clau SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Claus SSH privades" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Claus SSH públiques" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "No hi ha disponible cap fitxer de clau pública per aquesta clau." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Clau d'intèrpret d'ordres segur" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Emprades per accedir a ordinadors (p. ex.: via un terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "No s'ha pogut generar la clau per a l'intèrpret d'ordres segur" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "S'està creant la clau per a l'intèrpret d'ordres segur" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Clau nova d'intèrpret d'ordres segur" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Empreu la vostra adreça de correu i qualsevol altre recordatori que us " -"calgui per recordar per a què és aquesta clau." +msgid "_Just Create Key" +msgstr "_Només crea la clau" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Crea i configura" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" "Una clau d'intèrpret d'ordres segur (SSH) us permet connectar de manera " -"segura a ordinadors emprant SSH sense haver d'introduir diferents " -"contrasenyes per a cada un d'ells." +"segura a altres ordinadors." -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"Si ja sabeu el nom d'algun ordinador amb el qual vulgueu emprar aquesta " -"clau, podeu configurar-lo ara per tal que reconegui aquesta clau. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Clau nova d'intèrpret d'ordres segur" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Crea i configura" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Només crea la clau" +"La vostra adreça electrònica o qualsevol altre text que us recordi per a " +"què és aquesta clau." -# #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Descripció de la clau:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Si ja sabeu algun ordinador amb el qual vulgueu emprar aquesta clau, podeu " +"configurar-lo per tal que reconegui la clau nova." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(No és possible llegir la clau de l'intèrpret d'ordres segur)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Clau SSH personal" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Clau SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "No s'ha pogut canviar el nom a la clau." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "No s'ha pogut canviar l'autorització de la clau." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "No s'ha pogut canviar la contrasenya de la clau." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algorisme:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identificador:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Ubicació:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nom:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Força:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Emprades per connectar a altres ordinadors." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Confiança" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"S'_autoritza al propietari d'aquesta clau a connectar-se a aquest ordinador" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Això només és aplicable al compte «%s»." +msgid "This only applies to the %s account." +msgstr "Això només és aplicable al compte %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xporta la clau completa" +msgid "Algorithm:" +msgstr "Algorisme:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"S'_autoritza al propietari d'aquesta clau a connectar-se a aquest ordinador" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Força:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Ubicació:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Emprades per connectar a altres ordinadors." +msgid "E_xport Complete Key" +msgstr "E_xporta la clau completa" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "L'ordre SSH ha acabat inesperadament." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Ha fallat l'ordre SSH." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Contrasenya de l'ordinador remot" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Introduïu la contrasenya de la clau" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Contrasenya per a la clau nova de l'intèrpret d'ordres segur" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "S'està important la clau: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "S'està important la clau. Introduïu la contrasenya" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Claus d'OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "No hi ha disponible cap fitxer de clau privada per aquesta clau." @@ -2447,16 +2572,11 @@ msgid "Configuring Secure Shell Keys..." msgstr "S'estan configurant les claus de l'intèrpret d'ordres segur..." -# Nota: s'hi ha de deixar "example.com" (RFC 2606) (josep) #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "p. ex.: servidorfitxers.exemple.cat:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configura l'ordinador per a connexions SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2464,6 +2584,11 @@ "Per utilitzar la clau d'intèrpret d'ordres segur en un altre ordinador que " "faci servir l'SSH cal que tingueu un compte d'usuari en aquell ordinador." +# Nota: s'hi ha de deixar "example.com" (RFC 2606) (josep) +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "p. ex.: servidorfitxers.exemple.cat:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Nom de l'_ordinador:" @@ -2476,11 +2601,200 @@ msgid "_Set Up" msgstr "_Configuració" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "Anell de claus de l'entrada" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "S'ha denegat l'accés a l'anell de claus" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "El dimoni de l'anell de claus del GNOME no s'està executant" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Ja s'ha desblocat l'anell de claus" -#~ msgid "Secure Shell key" -#~ msgstr "Clau d'intèrpret d'ordres segur" +#~ msgid "No such key ring exists" +#~ msgstr "Aquest anell de claus no existeix" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "No s'ha pogut comunicar amb el dimoni de l'anell de claus" + +#~ msgid "The item already exists" +#~ msgstr "L'element ja existeix" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "" +#~ "S'ha produït un error intern en accedir a l'anell de claus del GNOME" + +#~ msgid "Algorithms here" +#~ msgstr "Algorismes aquí" + +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "Segur que voleu suprimir %d claus d'intèrpret d'ordres segur?" + +#~ msgid "Name:" +#~ msgstr "Nom:" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "S'està suprimint l'element" +#~ msgstr[1] "S'estan suprimint els elements" + +#~ msgid "Passwords: %s" +#~ msgstr "Contrasenya: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Contrasenyes: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Bloca l'anell de claus d'emmagatzematge de contrasenyes de manera que " +#~ "faci falta una contrasenya mestra per desblocar-lo." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Desbloca l'anell de claus d'emmagatzematge de contrasenyes amb una " +#~ "contrasenya mestra de manera que estigui disponible per utilitzar-se." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "No s'ha pogut suprimir l'anell de claus" + +#~ msgid "Archive files" +#~ msgstr "Arxius" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Ja existeix un fitxer amb aquest nom.\n" +#~ "\n" +#~ "Voleu reemplaçar-lo per un fitxer nou?" + +#~ msgid "_Replace" +#~ msgstr "_Reemplaça" + +#~ msgid "_Sign Key..." +#~ msgstr "Si_gna la clau..." + +#~ msgid "Sign public key" +#~ msgstr "Signa la clau pública" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "Segur que voleu suprimir permanentment %d claus i identitats?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "No s'ha pogut suprimir la clau pública" + +#~ msgid "New PGP Key" +#~ msgstr "Clau PGP nova" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "No s'ha pogut exportar la clau a «%s»" + +#~ msgid "Export Complete Key" +#~ msgstr "Exporta la clau sencera" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Segur que voleu suprimir el certificat «%s»?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Segur que voleu suprimir %d certificat?" +#~ msgstr[1] "Segur que voleu suprimir %d certificats?" + +#~ msgid "Deleting" +#~ msgstr "S'està suprimint" + +#~ msgid "Create New ..." +#~ msgstr "Crea una nova..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "S'ha seleccionat %d clau" +#~ msgstr[1] "S'han seleccionat %d claus" + +#~ msgid "Importing keys" +#~ msgstr "S'estan important les claus" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "" +#~ "No s'ha reconegut el tipus de clau, o el format de les dades no és vàlid" + +#~ msgid "Importing Keys" +#~ msgstr "S'estan important les claus" + +#~ msgid "T_ypes" +#~ msgstr "_Tipus" + +#~ msgid "Show type column" +#~ msgstr "Mostra la columna tipus" + +# +#~ msgid "_Expiry" +#~ msgstr "V_enciment" + +#~ msgid "Show expiry column" +#~ msgstr "Mostra la columna de venciment de la clau" + +#~ msgid "_Trust" +#~ msgstr "_Confiança" + +#~ msgid "Show owner trust column" +#~ msgstr "Mostra la columna de confiança" + +#~ msgid "_Validity" +#~ msgstr "_Validesa" + +#~ msgid "Show validity column" +#~ msgstr "Mostra la columna de la validesa" + +#~ msgid "Other _Keys" +#~ msgstr "Altres _claus" + +#~ msgid "Validity" +#~ msgstr "Validesa" + +#~ msgid "Expiration Date" +#~ msgstr "Data de venciment" + +#~ msgid "_Expand All" +#~ msgstr "_Expandeix-ho tot" + +#~ msgid "Expand all listings" +#~ msgstr "Expandeix tots els llistats" + +#~ msgid "_Collapse All" +#~ msgstr "_Redueix-ho tot" + +#~ msgid "Collapse all listings" +#~ msgstr "Redueix tots els llistats" + +#~ msgid "Export public key" +#~ msgstr "Exporta una clau pública" + +#~ msgid "Exporting keys" +#~ msgstr "S'estan exportant les claus" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "No s'han pogut recuperar dades del servidor de claus" + +#~ msgid "Retrieving keys" +#~ msgstr "S'estan recuperant les claus" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s és una clau privada. Segur que voleu continuar?" + +#~ msgid "Couldn't delete key" +#~ msgstr "No s'ha pogut suprimir la clau" + +# +#~ msgid "_Key Description:" +#~ msgstr "_Descripció de la clau:" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "" @@ -2490,29 +2804,14 @@ #~ msgid "Web Password" #~ msgstr "Contrasenya web" -#~ msgid "Network Password" -#~ msgstr "Contrasenya de xarxa" - #~ msgid "Deleting items" #~ msgstr "S'estan suprimint els elements" -#~ msgid "Deleting keyrings" -#~ msgstr "S'estan suprimint els anells de claus" - #~ msgid "Symmetric Key" #~ msgstr "Clau simètrica" -#~ msgid "Public Key" -#~ msgstr "Clau pública" - -#~ msgid "Private Key" -#~ msgstr "Clau privada" - #~ msgid "Credentials" #~ msgstr "Credencials" #~ msgid "Identity" #~ msgstr "Identitat" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Gestor de claus d'encriptació" diff -Nru seahorse-3.2.2/po/ca@valencia.po seahorse-3.6.3/po/ca@valencia.po --- seahorse-3.2.2/po/ca@valencia.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/ca@valencia.po 2012-09-25 14:50:51.000000000 +0200 @@ -3,20 +3,21 @@ # This file is distributed under the same license as the Seahorse package. # Josep Monés i Teixidor , 2003. # Josep Puigdemont i Casamajó , 2005, 2006, 2007. -# Gil Forcada , 2007, 2008, 2009, 2010, 2011. +# Gil Forcada , 2007, 2008, 2009, 2010, 2011, 2012. +# Jordi Serratosa , 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-26 14:15+0200\n" -"PO-Revision-Date: 2011-09-15 22:20+0100\n" -"Last-Translator: Pau Iranzo \n" +"POT-Creation-Date: 2012-09-21 20:02+0200\n" +"PO-Revision-Date: 2012-08-30 01:19+0200\n" +"Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" "Language: ca-XV\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../gkr/seahorse-add-keyring.xml.h:1 @@ -24,10 +25,6 @@ msgstr "Afig un anell de claus de contrasenyes" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nom de l'anell de claus nou:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -35,15 +32,71 @@ "Trieu un nom per a l'anell de claus nou. Se vos demanarà una contrasenya per " "desblocar-lo." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nom de l'anell de claus nou:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "El nom o l'adreça del servidor." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "No s'ha pogut afegir l'anell de claus" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Anell de claus de contrasenyes nou" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "S'utilitza per emmagatzemar les contrasenyes d'aplicacions i de xarxes" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Contrasenya nova..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Emmagatzema de forma segura una contrasenya o un secret." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Anell de claus de contrasenyes" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Contrasenya alçada" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "No s'ha pogut establir l'anell de claus predeterminat" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "No s'ha pogut canviar la contrasenya de l'anell de claus" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Estableix-lo com a predeterminat" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Les aplicacions normalment emmagatzemen les contrasenyes en l'anell de claus " +"predeterminat." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Canvia la _contrasenya" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "" +"Canvia la contrasenya de desblocat de l'anell de claus d'emmagatzematge de " +"contrasenyes" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "No s'ha pogut afegir l'element" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" @@ -51,295 +104,228 @@ # #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Descripció:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Anell de claus:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Contrasenya:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Mostra la contrasen_ya" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "No s'ha pogut suprimir l'element" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Anell de claus:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "No s'ha pogut afegir l'anell de claus" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Contrasenyes" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Contrasenyes, credencials i secrets personals emmagatzemats" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Contrasenya pel compte de missatgeria instantània " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Contrasenya o secret" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Contrasenya de xarxa" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Nota alçada" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Contrasenya de l'anell de claus" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Contrasenya de la clau d'encriptació" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Contrasenya del magatzem de claus" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Contrasenya del Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Contrasenya dels comptes en línia del GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Contrasenya del Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Contrasenya de la missatgeria instantània" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Secret del gestor de xarxa" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Segur que voleu suprimir la contrasenya «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Segur que voleu suprimir %d contrasenya?" msgstr[1] "Segur que voleu suprimir %d contrasenyes?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "S'està suprimint l'element" -msgstr[1] "S'estan suprimint els elements" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Accedeix a un recurs compartit de xarxa" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Accedeix a un lloc web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Desbloca una clau PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Desbloca una clau d'intèrpret d'ordes segur" # FIXME -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Contrasenya alçada o entrada" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Credencials de xarxa" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Contrasenya" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "No s'ha pogut canviar la contrasenya." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "S'està actualitzant la contrasenya" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "No s'ha pogut establir la descripció." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Contrasenya:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Detalls tècnics:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalls" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Propietats de la clau" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Clau" +msgid "Use:" +msgstr "Ús:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Propietats de la clau" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipus:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Nom d'usuari:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Servidor:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Nom d'usuari:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Mostra la contrasen_ya" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipus:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Ús:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Contrasenya: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Contrasenyes: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Anell de claus de contrasenyes" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "S'utilitza per emmagatzemar les contrasenyes d'aplicacions i de xarxes" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Contrasenya alçada" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Emmagatzema de forma segura una contrasenya o un secret." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "No s'ha pogut desblocar l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "No s'ha pogut blocar l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "No s'ha pogut establir l'anell de claus predeterminat" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "No s'ha pogut canviar la contrasenya de l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Bloca" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Bloca l'anell de claus d'emmagatzematge de contrasenyes de manera que faça " -"falta una contrasenya mestra per desblocar-lo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Desbloca" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Desbloca l'anell de claus d'emmagatzematge de contrasenyes amb una " -"contrasenya mestra de manera que estiga disponible per utilitzar-se." +msgid "Password:" +msgstr "Contrasenya:" -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Estableix-lo com a predeterminat" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Clau" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Les aplicacions normalment emmagatzemen les contrasenyes en l'anell de claus " -"predeterminat." +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Detalls tècnics:" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Canvia la _contrasenya" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalls" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" msgstr "" -"Canvia la contrasenya de desblocat de l'anell de claus d'emmagatzematge de " -"contrasenyes" +"Un anell de claus que es desbloqueja automàticament en iniciar la sessió" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "No s'ha pogut suprimir l'anell de claus" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Un anell de claus que s'utilitza per alçar-hi contrasenyes" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Segur que voleu suprimir l'anell de claus de contrasenyes «%s»?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "S'està suprimint l'anell de claus" -msgstr[1] "S'estan suprimint els anells de claus" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Entenc que se suprimiran permanentment tots els elements." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Propietats de l'anell de claus" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nom:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Creada:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Anell de claus" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Propietats de l'anell de claus" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nom:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "S'ha cancel·lat l'operació" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "S'ha denegat l'accés a l'anell de claus" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "El dimoni de l'anell de claus del GNOME no s'està executant" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Ja s'ha desblocat l'anell de claus" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Este anell de claus no existeix" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "No s'ha pogut comunicar amb el dimoni de l'anell de claus" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "L'element ja existeix" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "S'ha produït un error intern en accedir a l'anell de claus del GNOME" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Mostra els senyaladors" @@ -596,226 +582,283 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "element temporal inicial" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Afig un servidor de claus" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Ordinador:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Tipus de servidor de claus:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Ordinador:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "El port des d'on accedir al servidor." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "element temporal inicial" +msgid "The port to access the server on." +msgstr "El port des d'on accedir al servidor." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Contrasenya" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versió de l'aplicació" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Contrasenya:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Paràmetres del sistema" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirmeu:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Col·laboracions:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "No és una adreça de servidor de claus vàlida." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Contrasenyes i claus" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Si vos cal ajuda contacteu el vostre administrador de sistemes o " -"l'administrador del servidor de claus." - -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +"Josep Monés i Teixidor \n" +"Josep Puigdemont i Casamajó " -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Personalitzat" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Pàgina inicial del projecte Seahorse" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Cap: No publiques les claus" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "No es pot suprimir" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Obtén les claus automàticament dels _servidors de claus" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "No s'han pogut exportar les claus" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "" -"Sincronitza automàticament les claus _modificades amb els servidors de claus" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "No s'han pogut exportar les dades" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Servidors de claus" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Fitxer" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xporta..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exporta a un fitxer" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Edita" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Copia-ho al porta-retalls" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Suprimeix" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Suprimeix els elements seleccionats" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Mostra les propietats de l'element" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Mostra les propietats de l'anell de claus" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Preferè_ncies" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Canvia les preferències per a este programa" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Visualitza" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "A_juda" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Quant a este programa" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Contingut" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Mostra l'ajuda del Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exporta" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Introduïu el PIN o la contrasenya per: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Contrasenya:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Confirmeu:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "No és una adreça de servidor de claus vàlida." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Si vos cal ajuda contacteu el vostre administrador de sistemes o " +"l'administrador del servidor de claus." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Personalitzat" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Cap: No publiques les claus" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Preferències" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Cerca les claus a través de:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Publica les claus a:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "S'estan recuperant les dades" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "S'estan exportant les dades" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "S'estan important les dades" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Obtén les claus automàticament dels _servidors de claus" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "S'està enviant les dades" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"Sincronitza automàticament les claus _modificades amb els servidors de claus" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "No disponible" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Servidors de claus" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d-%m-%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Dades de la clau" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Diverses claus" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Tots els fitxers de claus" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Tots els fitxers" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arxius" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Ja existeix un fitxer amb este nom.\n" -"\n" -"Voleu reemplaçar-lo per un fitxer nou?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Reemplaça" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Desconegut" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Mai" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginal" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Completa" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Absoluta" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Inhabilitada" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revocada" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "No s'ha pogut mostrar l'ajuda: %s" +# #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Data de venciment:" +msgid "Never E_xpires" +msgstr "_No venç mai" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Genera una subclau nova" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Si la clau no venç mai" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipus de clau:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Longitud de la clau:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipus de clau:" +msgid "Expiration Date:" +msgstr "Data de venciment:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Longitud de la clau" -# #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "_No venç mai" +msgid "Generate a new subkey" +msgstr "Genera una subclau nova" # #: ../pgp/seahorse-add-uid.xml.h:1 @@ -823,44 +866,45 @@ msgstr "Afig un identificador d'usuari" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Crea l'identificador d'usuari nou" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nom complet:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Comentari de la clau:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Ha de tindre almenys 5 caràcters de longitud" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Adreça electrònica opcional" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Comentari descriptiu opcional de la clau" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Adreça de correu opcional" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nom complet:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" -msgstr "_Adreça de correu:" +msgstr "_Adreça electrònica:" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Comentari de la clau:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Crea l'identificador d'usuari nou" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Can_via" +msgid "_Never expires" +msgstr "_No venç mai" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revoca la clau" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_No venç mai" +msgid "C_hange" +msgstr "Can_via" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -871,7 +915,7 @@ msgid "Add subkey to %s" msgstr "Afig una subclau a %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (només signatura)" @@ -879,7 +923,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (només encriptació)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (només signatura)" @@ -903,6 +947,11 @@ msgstr "" "No s'ha pogut desencriptar. Possiblement no teniu la clau de desencriptació." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "S'ha cancel·lat l'operació" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "La data de venciment no és vàlida" @@ -920,47 +969,149 @@ msgid "Expiry: %s" msgstr "Venciment: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Diverses claus" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Dades de la clau" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Claus PGP amb armadura" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Claus PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Clau PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Emprades per l'encriptació de correus i de fitxers" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "No s'ha pogut generar la clau PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Contrasenya per a la clau PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Introduïu dues vegades la contrasenya per a la clau nova." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Quan es crea una clau, s'han de generar moltes\n" +"dades aleatòries, i fa falta l'usuari per\n" +"aconseguir-ho. Per ajudar a crear estes dades\n" +"aleatòries, feu altres tasques, com ara: escriure\n" +"amb el teclat, moure el ratolí o utilitzar altres\n" +"aplicacions. Amb això permetreu que el sistema tinga\n" +"les dades aleatòries que necessita." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "S'està generant la clau" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Segur que voleu suprimir permanentment %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Segur que voleu suprimir permanentment %d clau?" +msgstr[1] "Segur que voleu suprimir permanentment %d claus?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "La contrasenya és incorrecta" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Heu introduït malament la contrasenya per tercera vegada, torneu-ho a provar." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Contrasenya equivocada." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Introduïu una contrasenya nova per a «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Introduïu la contrasenya per a «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Introduïu una contrasenya nova" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Introduïu la contrasenya" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Contrasenya" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "S'ha carregat %d clau" +msgstr[1] "S'han carregat %d claus" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Les dades de la clau no són vàlides (hi manquen els UID). Pot ser que siga " +"perquè un ordinador té la data al futur, o que manque una autosignatura." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Claus GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: directori per defecte de l'anell de claus" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -995,28 +1146,32 @@ msgid "All JPEG files" msgstr "Tots els fitxers JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Tots els fitxers" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Trieu la fotografia per afegir a la clau" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "No s'ha pogut preparar la fotografia" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "No s'ha pogut afegir la fotografia" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "No s'ha pogut carregar el fitxer, pot ser que estiga en un format no vàlid." -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Segur que voleu suprimir la fotografia actual de la vostra clau?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "No s'ha pogut suprimir la fotografia" @@ -1074,7 +1229,11 @@ msgid "Couldn't add revoker" msgstr "No s'ha pogut afegir el revocador" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Entenc que se suprimirà permanentment el secret." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1089,532 +1248,601 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "No hi ha claus que es puguen fer servir per signar" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "" -"No teniu cap clau PGP que es puga emprar per a indicar que confieu en esta " +"No teniu cap clau PGP que es puga emprar per indicar que confieu en esta " "clau." -#: ../pgp/seahorse-gpgme-source.c:86 +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" + +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Wrong passphrase." -msgstr "Contrasenya equivocada." +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"La cerca no ha estat prou específica. El servidor «%s» ha trobat massa claus." -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Introduïu una contrasenya nova per a «%s»" +msgid "Couldn't communicate with server '%s': %s" +msgstr "No s'ha pogut comunicar amb el servidor «%s»: %s" -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Introduïu la contrasenya per a «%s»" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Servidors de claus HTTP" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Introduïu una contrasenya nova" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "No s'han pogut importar les claus" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Introduïu la contrasenya" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "S'estan important claus dels servidors de claus" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remot" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Tanca esta finestra" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Cerca claus remotes..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Cerca claus en un servidor de claus" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importa" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importa les claus seleccionades a l'anell de claus local" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Claus remotes" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "S'ha carregat %d clau" -msgstr[1] "S'han carregat %d claus" +msgid "Remote Keys Containing '%s'" +msgstr "Claus remotes que contenen «%s»" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Ha fallat la cerca de claus." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Cerca claus remotes" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Les dades de la clau no són vàlides (hi manquen els UID). Pot ser que siga " -"perquè un ordinador té la data al futur, o que manque una autosignatura." +"Això cercarà claus d'altres persones a Internet. Estes claus es poden " +"importar més tard al vostre anell de claus local." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "Ce_rca claus que continguen: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Servidors de claus HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Servidors de claus:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Claus compartides prop meu:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "On cercar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Cerca" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "No s'han pogut publicar les claus al servidor" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"La cerca no ha estat prou específica. El servidor «%s» ha trobat massa claus." +msgid "Couldn't retrieve keys from server: %s" +msgstr "No s'han pogut recuperar les claus del servidor: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "No s'ha pogut comunicar amb el servidor «%s»: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "S'ha seleccionat %d clau per sincronitzar" +msgstr[1] "S'han seleccionat %d claus per sincronitzar" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "S'estan sincronitzant les claus..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronitza les claus" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Això publicarà les claus del vostre anell de claus de manera que estiguen " +"disponibles per a d'altres persones. També podreu obtindre els canvis que " +"d'altres hagen fet des de la darrera vegada que veu rebre les seues claus." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Això recuperarà els canvis que d'altres hagen fet des de la darrera vegada " +"que veu rebre les seues claus. Atès que no s'ha seleccionat cap servidor on " +"publicar les vostres claus, no estaran disponibles a altres persones." -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Servidors de claus" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronitza" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "No s'ha pogut comunicar amb «%s»: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "S'està connectant a: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "No s'ha pogut resoldre l'adreça: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "S'està resolent l'adreça del servidor: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Servidor de claus LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Si_gna la clau..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Signa la clau pública" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Segur que voleu suprimir permanentment %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Segur que voleu suprimir permanentment %d claus i identitats?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Segur que voleu suprimir permanentment %d claus?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Segur que voleu suprimir permanentment %d identitats?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronitza i publica les claus..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "No s'ha pogut suprimir l'identificador d'usuari" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "" +"Publiqueu o sincronitzeu les vostres claus amb les que hi haja en línia." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "No s'ha pogut suprimir la clau privada" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "No s'ha pogut suprimir la clau pública" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Claus PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Les claus PGP serveixen per l'encriptació de correus i fitxers" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opcions _avançades de la clau" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_rea" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Genera una clau nova" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Una clau PGP vos permet encriptar correus o fitxers per a altres persones." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algorismes ací" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_rea" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "C_omentari:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Data de venciment:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "No venç _mai" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Tipus d'_encriptació:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Genera una clau nova" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Força de la clau (en bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "No venç _mai" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Clau PGP nova" +msgid "E_xpiration Date:" +msgstr "_Data de venciment:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "C_omentari:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opcions _avançades de la clau" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Ha vençut" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Clau PGP personal" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Clau PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "No s'ha pogut canviar l'identificador primari de l'usuari" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Segur que voleu suprimir permanentment l'identificador d'usuari «%s»?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "No s'ha pogut suprimir l'identificador d'usuari" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Desconegut]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nom/adreça electrònica" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Identificador de la signatura" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "No s'ha pogut canviar la fotografia primària" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(desconegut)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Esta clau va vèncer el: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nom" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Segur que voleu suprimir permanentment la subclau %d de %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "No s'ha pogut suprimir la subclau" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "No s'ha pogut canviar la confiança" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "No s'ha pogut exportar la clau a «%s»" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exporta la clau sencera" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "No s'ha pogut exportar la clau." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "No s'ha pogut exportar la clau" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Mai" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipus" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Creada" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Venç" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Estat" # FIXME FIXME FIXME (josep) -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Força" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Ha vençut" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Correcte" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID de la clau" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Accions" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Comentari:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Dates" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Adreça electrònica:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Empremta digital" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Identificador de la clau:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Mai" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Noms de claus i signatures:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Esta clau ha estat revocada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotografia " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "El propietari de la clau l'ha revocada, no es pot fer servir més." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Detalls tècnics" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Esta clau ha vençut" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Esta clau ha estat revocada" +msgid "Add a photo to this key" +msgstr "Afig una fotografia a esta clau" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Esta clau ha vençut" +msgid "Remove this photo from this key" +msgstr "Suprimeix esta foto d'esta clau" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipus:" +msgid "Make this photo the primary photo" +msgstr "Fes que esta foto siga la primària" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Vés a la foto anterior" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Utilització:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Subclaus" +msgid "Go to next photo" +msgstr "Vés a la foto següent" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Afig" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotografia " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Afig una fotografia a esta clau" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Identificador de la clau:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Canvia la contrasen_ya" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nom:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Desencripteu fitxers i correus que vos envien." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Adreça electrònica:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Suprimeix" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Comentari:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Venç" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Utilització:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Venç:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipus:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exporta" +msgid "Decrypt files and email sent to you." +msgstr "Desencripteu fitxers i correus que vos envien." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Clau PGP privada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Vés a la foto següent" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Canvia la contrasen_ya" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Vés a la foto anterior" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Propietari" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Identificador de la clau:" +msgid "Key Names and Signatures" +msgstr "Noms de claus i signatures:" + +# La clau o la foto (josep) +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primària" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Fes que esta foto siga la primària" +msgid "Sign" +msgstr "Signa" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Noms i signatures" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Suprimeix" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Mai" +msgid "_Add Name" +msgstr "_Afig un nom" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "_Canvia la confiança en el propietari:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Propietari" +msgid "Revoke" +msgstr "Revoca" -# La clau o la foto (josep) +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primària" +msgid "Names and Signatures" +msgstr "Noms i signatures" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Clau PGP privada" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Identificador de la clau:" +# FIXME FIXME FIXME (josep) #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Suprimeix esta foto d'esta clau" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Revoca" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Força:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Signa" +msgid "Technical Details" +msgstr "Detalls tècnics" -# FIXME FIXME FIXME (josep) #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Força:" +msgid "Fingerprint" +msgstr "Empremta digital" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "El propietari de la clau l'ha revocada, no es pot fer servir més." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Venç:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Afig un nom" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Dates" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "_Canvia la confiança en el propietari:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Exporta la clau sencera:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nom:" +msgid "Actions" +msgstr "Accions" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Dates:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Afig" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Venç" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Subclaus" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginal" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Empremta digital:" +msgid "Fully" +msgstr "Completa" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indiqueu la confiança:" +msgid "Ultimately" +msgstr "Absoluta" +# FIXME: "Xifra els fitxers i envia'ls per correu electrònic al " +# "propietari de la clau" ? (David) #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "La confiança que teniu en esta clau" +msgid "Encrypt files and email to the key's owner" +msgstr "Encripta fitxers i correus al propietari de la clau" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Clau PGP pública" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Altres noms:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Persones que han signat esta clau:" - -# FIXME: "Xifra els fitxers i envia'ls per correu electrònic al " -# "propietari de la clau" ? (David) -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Encripta fitxers i correus al propietari de la clau " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "La confiança que teniu en esta clau" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Completa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "" +"La confiança que hi teniu s'especifica manualment a la pestanya de " +"Detalls." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Confio en les signatures de «%s» a altres claus" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "Si creieu que el propietari d'esta clau és «%s», signeu-la:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Signa esta clau" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1622,45 +1850,38 @@ "Si ja no creieu que el propietari d'esta clau és «%s», revoqueu la " "vostra signatura:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginal" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Clau PGP pública" +msgid "_Revoke Signature" +msgstr "_Revoca la signatura" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Persones que han signat esta clau:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Mostra només signatures de gent en qui confie" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Confiança" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Absoluta" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Confieu en el _propietari:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "" -"La confiança que hi teniu s'especifica manualment a la pestanya de " -"Detalls." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Empremta digital:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Mostra només signatures de gent en qui confie" +msgid "Dates:" +msgstr "Dates:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Revoca la signatura" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indiqueu la confiança:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Signa esta clau" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Confieu en el _propietari:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1668,56 +1889,62 @@ msgstr "Subclau %d de %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Descripció opcional per a la revocació" +msgid "Reason for revoking the key" +msgstr "Motiu pel qual es revoca la clau" -# #: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_voca" +msgid "_Reason:" +msgstr "_Motiu:" -#: ../pgp/seahorse-revoke.xml.h:3 -msgid "Reason for revoking the key" -msgstr "Motiu pel qual es revoca la clau" +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Descripció opcional per a la revocació" +# #: ../pgp/seahorse-revoke.xml.h:6 -msgid "_Reason:" -msgstr "_Motiu:" +msgid "Re_voke" +msgstr "Re_voca" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "No teniu claus PGP personals que es puguen emprar per signar cap document o " "missatge." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Signa el fitxer amb la clau:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Amb quin deteniment heu comprovat esta clau?" +msgid "Sign Key" +msgstr "Signa la clau" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "La manera en què altres veuran esta signatura:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "En signar esteu indicant que confieu que esta clau pertany a:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Signa la clau com a:" +msgid "Key Name" +msgstr "Nom de la clau" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Casualment: vol dir que heu fet una verificació per sobre que la clau " -"és de la persona que diu ser-ne la propietària. Per exemple, heu llegit " -"l'empremta digital de la clau a esta persona per telèfon. " +msgid "How carefully have you checked this key?" +msgstr "Amb quin deteniment heu comprovat esta clau?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nom de la clau" +msgid "_Not at all" +msgstr "_De cap manera" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Casualment" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "Amb _molt deteniment" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1725,7 +1952,17 @@ "De cap manera: vol dir que creieu que la clau és propietat de la " "persona que diu ser-ne la propietària, però que no heu pogut verificar-ho." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Casualment: vol dir que heu fet una verificació per sobre que la clau " +"és de la persona que diu ser-ne la propietària. Per exemple, podeu dir-li " +"per telèfon l'empremta digital de la clau." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1733,18 +1970,6 @@ "Amb molt deteniment: seleccioneu esta opció només si esteu " "absolutament segur que esta clau és genuïna." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "En signar esteu indicant que confieu que esta clau pertany a:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Puc _revocar esta clau més avant." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Signa la clau" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1757,482 +1982,357 @@ "seu propietari." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Casualment" +msgid "How others will see this signature:" +msgstr "La manera en què altres veuran esta signatura:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_De cap manera" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Altres no poden veure esta fotografia" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Puc _revocar esta clau més avant." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Signa" +msgid "Sign key as:" +msgstr "Signa la clau com a:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Signant:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "Amb _molt deteniment" +msgid "_Sign" +msgstr "_Signa" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Signa el fitxer amb la clau:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "S'estan exportant les dades" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "S'estan recuperant les dades" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "S'estan important les dades" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "S'estan enviant les dades" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "No disponible" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Certificat i clau personals" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificat personal" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certificat" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificats (codificats amb DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificats" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificats X.509 i claus relacionades" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Segur que voleu suprimir permanentment %d certificat?" +msgstr[1] "Segur que voleu suprimir permanentment %d certificats?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "No s'ha pogut generar la clau privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Crea" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Clau privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "S'utilitza per sol·licitar un certificat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Crea una clau privada nova" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etiqueta:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Emmagatzemada a:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Entenc que se suprimirà permanentment la contrasenya." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Sense nom" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "No s'ha pogut exportar el certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "No s'ha pogut suprimir" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Segur que voleu suprimir el certificat «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Segur que voleu suprimir %d certificat?" -msgstr[1] "Segur que voleu suprimir %d certificats?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "S'està suprimint" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exporta" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exporta el certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Suprimeix el certificat o la clau" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Sol·licita un _certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Crea un fitxer de sol·licitud de certificat per esta clau" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "No s'ha pogut alçar la sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Alça la sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Sol·licitud codificada amb PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "No s'ha pogut crear la sol·licitud de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Crea un fitxer de sol·licitud de certificat." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "El nom comú (CN) de la sol·licitud de certificat." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nom (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Clau privada sense nom" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Canvia la contrasenya" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firmeu la contrasenya:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Con_firmeu la contrasenya nova" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Contrasen_ya nova:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Gestioneu les contrasenyes i claus d'encriptació" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Contrasenyes i claus" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Seleccioneu el tipus d'element que vulgueu crear:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "C_ontinua" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Crea una nova..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "S'ha seleccionat %d clau" -msgstr[1] "S'han seleccionat %d claus" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "No s'han pogut importar les claus" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Claus importades" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "S'estan important les claus" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importa clau" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "" -"No s'ha reconegut el tipus de clau, o el format de les dades no és vàlid" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "S'estan important les claus" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remot" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Ix d'este programa" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nova..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Crea una clau o un element nou" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importa..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importa des d'un fitxer" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importa des del porta-retalls" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Cerca claus remotes..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Cerca claus en un servidor de claus" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronitza i publica les claus..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "" -"Publiqueu o sincronitzeu les vostres claus amb les que hi haja en línia." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Tipus" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Mostra la columna tipus" - -# -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "V_enciment" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Mostra la columna de venciment de la clau" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Confiança" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Mostra la columna de confiança" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validesa" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Mostra la columna de la validesa" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Fitxer:" - -# FIXME (josep) -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opcions de la primera vegada:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Genereu una clau per a vós mateix: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importa les claus existents des d'un fitxer:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Les meues claus _personals" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Altres _claus" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Per poder començar a encriptar vos caldran claus." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importa" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "Contrasen_ya" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "No s'han pogut exportar les claus" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validesa" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Data de venciment" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Tanca esta finestra" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Expandeix-ho tot" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Expandeix tots els llistats" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Redueix-ho tot" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Redueix tots els llistats" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Claus remotes" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Claus remotes que contenen «%s»" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servidors de claus:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Claus compartides prop meu:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Cerca claus remotes" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Això cercarà claus d'altres persones a Internet. Estes claus es poden " -"importar més tard al vostre anell de claus local." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "On cercar:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Cerca" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Ce_rca claus que continguen: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "No s'han pogut publicar les claus al servidor" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "No s'han pogut recuperar les claus del servidor: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "S'ha seleccionat %d clau per sincronitzar" -msgstr[1] "S'han seleccionat %d claus per sincronitzar" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "S'estan sincronitzant les claus..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronitza les claus" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Això publicarà les claus del vostre anell de claus de manera que estiguen " -"disponibles per a d'altres persones. També podreu obtindre els canvis que " -"d'altres hagen fet des de la darrera vegada que veu rebre les seues claus." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Això recuperarà els canvis que d'altres hagen fet des de la darrera vegada " -"que veu rebre les seues claus. Atès que no s'ha seleccionat cap servidor on " -"publicar les vostres claus, no estaran disponibles a altres persones." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Servidors de claus" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronitza" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Contrasen_ya nova:" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versió de l'aplicació" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Con_firmeu la contrasenya nova" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Col·laboracions:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Con_firmeu la contrasenya:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Josep Monés i Teixidor \n" -"Josep Puigdemont i Casamajó " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Gestioneu les contrasenyes i claus d'encriptació" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Pàgina inicial del projecte Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continua" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fitxer" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Seleccioneu el tipus d'element que vulgueu crear:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Edita" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Ha fallat la importació" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importa" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Dades a importar:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Visualitza" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importa clau" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "A_juda" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Tots els fitxers de claus" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Preferè_ncies" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Text deixat anar" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Text del porta-retalls" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nova" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Canvia les preferències per a este programa" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Ix d'este programa" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Quant a este programa" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nova..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Contingut" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Crea una clau o un element nou" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Mostra l'ajuda del Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Afig una clau o un element nou" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exporta una clau pública" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importa..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "S'estan exportant les claus" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importa des d'un fitxer" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "No s'han pogut recuperar dades del servidor de claus" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importa des del porta-retalls" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Claus copiades" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Per _anell de claus" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Mostra la barra lateral amb el llistat d'anells de claus" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Mostra les _personals" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Mostra només les claus, els certificats i les contrasenyes personals" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Mostra les de _confiança" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "" +"Mostra només les claus, els certificats i les contrasenyes de confiança" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Mostra _qualsevol" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Mostra totes les claus, els certificats i les contrasenyes" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtre" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "S'estan recuperant les claus" +# FIXME (josep) +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opcions de la primera vegada:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s és una clau privada. Segur que voleu continuar?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Genereu una clau per a vós mateix: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "S'estan important claus dels servidors de claus" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importa les claus existents des d'un fitxer:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Mostra les propietats" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Per poder començar a encriptar vos caldran claus." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Suprimeix" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "No s'ha pogut blocar" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "No s'ha pogut desblocar" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Suprimeix els elements seleccionats" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Bloca" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xporta..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Desbloca" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exporta a un fitxer" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propietats" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copia-ho al porta-retalls" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configura la clau per a l'intèrpret d'ordes _segur..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importa les claus seleccionades a l'anell de claus local" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Envia la clau pública de l'intèrpret d'ordes segur a un altre ordinador, i " +"habilita connexions que emprin esta clau." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2261,178 +2361,202 @@ msgid "Enter the new passphrase again: %s" msgstr "Introduïu un altre cop la contrasenya nova de: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configura la clau per a l'intèrpret d'ordes _segur..." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Intèrpret d'ordes segur" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" msgstr "" -"Envia la clau pública de l'intèrpret d'ordes segur a un altre ordinador, i " -"habilita connexions que emprin esta clau." +"Claus que s'utilitzen per connectar-se de forma segura a altres ordinadors" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Segur que voleu suprimir la clau de l'intèrpret d'ordes segur «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Segur que voleu suprimir %d claus d'intèrpret d'ordes segur?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "No s'ha pogut suprimir la clau" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Segur que voleu suprimir %d clau d'intèrpret d'ordes segur?" +msgstr[1] "Segur que voleu suprimir %d claus d'intèrpret d'ordes segur?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Clau SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Claus SSH privades" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Claus SSH públiques" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "No hi ha disponible cap fitxer de clau pública per esta clau." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Clau d'intèrpret d'ordes segur" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Emprades per accedir a ordinadors (p. ex.: via un terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "No s'ha pogut generar la clau per a l'intèrpret d'ordes segur" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "S'està creant la clau per a l'intèrpret d'ordes segur" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Clau nova d'intèrpret d'ordes segur" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Empreu la vostra adreça de correu i qualsevol altre recordatori que vos " -"calga per recordar per a què és esta clau." +msgid "_Just Create Key" +msgstr "_Només crea la clau" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Crea i configura" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" "Una clau d'intèrpret d'ordes segur (SSH) vos permet connectar de manera " -"segura a ordinadors emprant SSH sense haver d'introduir diferents " -"contrasenyes per a cada un d'ells." +"segura a altres ordinadors." -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"Si ja sabeu el nom d'algun ordinador amb el qual vulgueu emprar esta clau, " -"podeu configurar-lo ara per tal que reconegui esta clau. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Clau nova d'intèrpret d'ordes segur" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Crea i configura" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Només crea la clau" +"La vostra adreça electrònica o qualsevol altre text que vos recorde per a " +"què és esta clau." -# #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Descripció de la clau:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Si ja sabeu algun ordinador amb el qual vulgueu emprar esta clau, podeu " +"configurar-lo per tal que reconegui la clau nova." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(No és possible llegir la clau de l'intèrpret d'ordes segur)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Clau SSH personal" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Clau SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "No s'ha pogut canviar el nom a la clau." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "No s'ha pogut canviar l'autorització de la clau." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "No s'ha pogut canviar la contrasenya de la clau." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algorisme:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identificador:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Ubicació:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nom:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Força:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Emprades per connectar a altres ordinadors." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Confiança" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "S'_autoritza al propietari d'esta clau a connectar-se a este ordinador" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Això només és aplicable al compte «%s»." +msgid "This only applies to the %s account." +msgstr "Això només és aplicable al compte %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xporta la clau completa" +msgid "Algorithm:" +msgstr "Algorisme:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "S'_autoritza al propietari d'esta clau a connectar-se a este ordinador" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Força:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Ubicació:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Emprades per connectar a altres ordinadors." +msgid "E_xport Complete Key" +msgstr "E_xporta la clau completa" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "L'orde SSH ha acabat inesperadament." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Ha fallat l'orde SSH." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Contrasenya de l'ordinador remot" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Introduïu la contrasenya de la clau" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Contrasenya per a la clau nova de l'intèrpret d'ordes segur" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "S'està important la clau: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "S'està important la clau. Introduïu la contrasenya" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Claus d'OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "No hi ha disponible cap fitxer de clau privada per esta clau." @@ -2446,16 +2570,11 @@ msgid "Configuring Secure Shell Keys..." msgstr "S'estan configurant les claus de l'intèrpret d'ordes segur..." -# Nota: s'hi ha de deixar "example.com" (RFC 2606) (josep) #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "p. ex.: servidorfitxers.exemple.cat:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configura l'ordinador per a connexions SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2463,6 +2582,11 @@ "Per utilitzar la clau d'intèrpret d'ordes segur en un altre ordinador que " "faça servir l'SSH cal que tingueu un compte d'usuari en aquell ordinador." +# Nota: s'hi ha de deixar "example.com" (RFC 2606) (josep) +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "p. ex.: servidorfitxers.exemple.cat:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Nom de l'_ordinador:" @@ -2475,11 +2599,200 @@ msgid "_Set Up" msgstr "_Configuració" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "Anell de claus de l'entrada" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "S'ha denegat l'accés a l'anell de claus" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "El dimoni de l'anell de claus del GNOME no s'està executant" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Ja s'ha desblocat l'anell de claus" -#~ msgid "Secure Shell key" -#~ msgstr "Clau d'intèrpret d'ordres segur" +#~ msgid "No such key ring exists" +#~ msgstr "Aquest anell de claus no existeix" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "No s'ha pogut comunicar amb el dimoni de l'anell de claus" + +#~ msgid "The item already exists" +#~ msgstr "L'element ja existeix" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "" +#~ "S'ha produït un error intern en accedir a l'anell de claus del GNOME" + +#~ msgid "Algorithms here" +#~ msgstr "Algorismes aquí" + +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "Segur que voleu suprimir %d claus d'intèrpret d'ordres segur?" + +#~ msgid "Name:" +#~ msgstr "Nom:" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "S'està suprimint l'element" +#~ msgstr[1] "S'estan suprimint els elements" + +#~ msgid "Passwords: %s" +#~ msgstr "Contrasenya: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Contrasenyes: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Bloca l'anell de claus d'emmagatzematge de contrasenyes de manera que " +#~ "faci falta una contrasenya mestra per desblocar-lo." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Desbloca l'anell de claus d'emmagatzematge de contrasenyes amb una " +#~ "contrasenya mestra de manera que estigui disponible per utilitzar-se." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "No s'ha pogut suprimir l'anell de claus" + +#~ msgid "Archive files" +#~ msgstr "Arxius" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Ja existeix un fitxer amb aquest nom.\n" +#~ "\n" +#~ "Voleu reemplaçar-lo per un fitxer nou?" + +#~ msgid "_Replace" +#~ msgstr "_Reemplaça" + +#~ msgid "_Sign Key..." +#~ msgstr "Si_gna la clau..." + +#~ msgid "Sign public key" +#~ msgstr "Signa la clau pública" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "Segur que voleu suprimir permanentment %d claus i identitats?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "No s'ha pogut suprimir la clau pública" + +#~ msgid "New PGP Key" +#~ msgstr "Clau PGP nova" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "No s'ha pogut exportar la clau a «%s»" + +#~ msgid "Export Complete Key" +#~ msgstr "Exporta la clau sencera" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Segur que voleu suprimir el certificat «%s»?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Segur que voleu suprimir %d certificat?" +#~ msgstr[1] "Segur que voleu suprimir %d certificats?" + +#~ msgid "Deleting" +#~ msgstr "S'està suprimint" + +#~ msgid "Create New ..." +#~ msgstr "Crea una nova..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "S'ha seleccionat %d clau" +#~ msgstr[1] "S'han seleccionat %d claus" + +#~ msgid "Importing keys" +#~ msgstr "S'estan important les claus" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "" +#~ "No s'ha reconegut el tipus de clau, o el format de les dades no és vàlid" + +#~ msgid "Importing Keys" +#~ msgstr "S'estan important les claus" + +#~ msgid "T_ypes" +#~ msgstr "_Tipus" + +#~ msgid "Show type column" +#~ msgstr "Mostra la columna tipus" + +# +#~ msgid "_Expiry" +#~ msgstr "V_enciment" + +#~ msgid "Show expiry column" +#~ msgstr "Mostra la columna de venciment de la clau" + +#~ msgid "_Trust" +#~ msgstr "_Confiança" + +#~ msgid "Show owner trust column" +#~ msgstr "Mostra la columna de confiança" + +#~ msgid "_Validity" +#~ msgstr "_Validesa" + +#~ msgid "Show validity column" +#~ msgstr "Mostra la columna de la validesa" + +#~ msgid "Other _Keys" +#~ msgstr "Altres _claus" + +#~ msgid "Validity" +#~ msgstr "Validesa" + +#~ msgid "Expiration Date" +#~ msgstr "Data de venciment" + +#~ msgid "_Expand All" +#~ msgstr "_Expandeix-ho tot" + +#~ msgid "Expand all listings" +#~ msgstr "Expandeix tots els llistats" + +#~ msgid "_Collapse All" +#~ msgstr "_Redueix-ho tot" + +#~ msgid "Collapse all listings" +#~ msgstr "Redueix tots els llistats" + +#~ msgid "Export public key" +#~ msgstr "Exporta una clau pública" + +#~ msgid "Exporting keys" +#~ msgstr "S'estan exportant les claus" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "No s'han pogut recuperar dades del servidor de claus" + +#~ msgid "Retrieving keys" +#~ msgstr "S'estan recuperant les claus" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s és una clau privada. Segur que voleu continuar?" + +#~ msgid "Couldn't delete key" +#~ msgstr "No s'ha pogut suprimir la clau" + +# +#~ msgid "_Key Description:" +#~ msgstr "_Descripció de la clau:" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "" @@ -2489,29 +2802,14 @@ #~ msgid "Web Password" #~ msgstr "Contrasenya web" -#~ msgid "Network Password" -#~ msgstr "Contrasenya de xarxa" - #~ msgid "Deleting items" #~ msgstr "S'estan suprimint els elements" -#~ msgid "Deleting keyrings" -#~ msgstr "S'estan suprimint els anells de claus" - #~ msgid "Symmetric Key" #~ msgstr "Clau simètrica" -#~ msgid "Public Key" -#~ msgstr "Clau pública" - -#~ msgid "Private Key" -#~ msgstr "Clau privada" - #~ msgid "Credentials" #~ msgstr "Credencials" #~ msgid "Identity" #~ msgstr "Identitat" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Gestor de claus d'encriptació" diff -Nru seahorse-3.2.2/po/cs.po seahorse-3.6.3/po/cs.po --- seahorse-3.2.2/po/cs.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/cs.po 2012-09-18 13:10:35.000000000 +0200 @@ -1,90 +1,196 @@ # Czech translation of seahorse. -# Copyright (C) 1996, 2003, 2008 the author(s) of seahorse. +# Copyright (C) 1996, 2003, 2008, 2011 the author(s) of seahorse. # Copyright (C) 2004, 2005 Miloslav Trmac . # This file is distributed under the same license as the seahorse package. # # Petr Domansky , 2000. # Michal Bukovjan , 2003. -# Miloslav Trmac , 2003 – 2005. +# Miloslav Trmac , 2003, 2004, 2005. +# Vitezslav Kotrla , 2008. # Petr Kovar , 2008. # Lucas Lommer , 2008. -# Vitezslav Kotrla , 2007 – 2009. -# Marek Černocký , 2010, 2011. +# Marketa Nykrynova , 2011, 2012. +# Marek Černocký , 2012. # msgid "" msgstr "" -"Project-Id-Version: seahorse.master\n" +"Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-24 23:36+0000\n" -"PO-Revision-Date: 2011-09-25 01:38+0200\n" +"POT-Creation-Date: 2012-08-17 10:17+0000\n" +"PO-Revision-Date: 2012-09-07 09:51+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Virtaal 0.7.0\n" +"X-Project-Style: gnome\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Přidat klíčenku hesel" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Název nové klíčenky:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "" "Zvolte prosím název nové klíčenky. Bude třeba zadat heslo pro odemčení." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Název nové klíčenky:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Název nebo adresa serveru." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Nelze přidat klíčenku" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Nová klíčenka hesel" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Používá se pro ukládání aplikačních a síťových hesel" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nové heslo…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Bezpečně uložit heslo." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Klíčenka hesel" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Uložené heslo" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Nebylo možné nastavit výchozí klíčenku" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Nebylo možno změnit heslo klíčenky" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Nastavit jako výchozí" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Aplikace obvykle ukládají nová hesla do výchozí klíčenky." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Změnit _heslo" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Změnit heslo pro odemknutí klíčenky" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Nebylo možno přidat fotografii" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Přidat heslo" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Popis:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Klíčenka:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Heslo:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" -msgstr "Ukázat he_slo" +msgstr "_Zobrazit heslo" + +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Klíčenka:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Nebylo možno přidat klíčenku" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Hesla" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Uložená osobní hesla a přístupové údaje" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Heslo k účtu IM" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Heslo" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Nelze odstranit položku" +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Síťové heslo" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Uložená poznámka" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Heslo klíčenky" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Heslo k zašifrování klíče" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Heslo k úložišti klíčů" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Heslo pro Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Heslo pro Gnome Online Accounts" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Heslo pro Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Heslo komunikátoru" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Hesla pro síťová připojení" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" -msgstr "Chcete opravdu odstranit heslo „%s“?" +msgstr "Chcete opravdu smazat heslo „%s“?" -# This couldn't be translated well, plural forms should be used here -# See GNOMEBUG #552991 -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -92,265 +198,143 @@ msgstr[1] "Opravdu chcete smazat %d hesla?" msgstr[2] "Opravdu chcete smazat %d hesel?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Odstraňování položky" -msgstr[1] "Odstraňování položek" -msgstr[2] "Odstraňování položek" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Přístup k síťovému sdílenému prostředku" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Přístup k webu" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Odemkne klíč PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Odemkne klíč SSH" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Uložené heslo nebo přihlašovací jméno" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Přihlašovací údaje pro síť" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Heslo" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Nebylo možné změnit heslo." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" -msgstr "Aktualizace hesel" +msgstr "Aktualizace hesla" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Nebylo možné nastavit popis." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Heslo:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Technické detaily:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detaily" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Vlastnosti klíče" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Klíč" +msgid "Use:" +msgstr "Použití:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Vlastnosti klíče" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Typ:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Přihlašovací jméno:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Přihlášení:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" -msgstr "Ukázat h_eslo" +msgstr "Zobrazit _heslo" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Typ:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Použití:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Hesla: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Hesla: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Klíčenka hesel" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Používá se pro ukládání aplikačních a síťových hesel" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Uložené heslo" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Bezpečně uložit heslo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Nebylo možné odemknout klíčenku" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Nebylo možné zamknout klíčenku" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Nebylo možné nastavit výchozí klíčenku" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Nelze změnit heslo klíčenky" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Zamknout" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "Zamknout klíčenku, k odemčení bude třeba zadat hlavní heslo" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Odemknout" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Aby bylo možné zamčenou klíčenku používat, je třeba odemknout ji použitím " -"hlavního hesla." +msgid "Password:" +msgstr "Heslo:" -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "Na_stavit jako výchozí" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Klíč" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Aplikace obvykle ukládají nová hesla do výchozí klíčenky" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Technické detaily:" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "_Změnit heslo" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Podrobnosti" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Změnit heslo pro odemknutí klíčenky" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Klíčenka se automaticky odemkne při přihlášení" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Nelze odstranit klíčenku" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Klíčenka slouží k ukládání hesel" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "Chcete opravdu odstranit klíčenku „%s“?" - -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Odstraňování klíčenky" -msgstr[1] "Odstraňování klíčenek" -msgstr[2] "Odstraňování klíčenek" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "Created:" -msgstr "Vytvořen:" +msgstr "Chcete opravdu smazat klíčenku „%s“?" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "Klíčenka" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Chápu, že všechny položky budou trvale smazány." -#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../gkr/seahorse-gkr-keyring.xml.h:1 msgid "Keyring Properties" msgstr "Vlastnosti klíčenky" -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "Jmé_no:" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Jméno:" -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Operace byla zrušena" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "Vytvořeno:" -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Přístup ke klíčence byl odepřen" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Proces gnome-keyring neběží" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Klíčenka už byla odemčena" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Taková klíčenka neexistuje" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Nelze se spojit s démonem klíčenky" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Položka už existuje" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Při přístupu k procesu gnome-keyring došlo k vnitřní chybě" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "Klíčenka" #: ../libegg/egg-datetime.c:317 msgid "Display flags" -msgstr "Zobrazení částí" +msgstr "Zobrazovat příznaky" #: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" -msgstr "Vlastnosti zobrazení data a času" +msgstr "Zobrazeny vlastnosti data a/nebo času" #: ../libegg/egg-datetime.c:323 msgid "Lazy mode" @@ -366,7 +350,7 @@ #: ../libegg/egg-datetime.c:330 msgid "Displayed year" -msgstr "Zobrazení roku" +msgstr "Zobrazovaný rok" #: ../libegg/egg-datetime.c:335 msgid "Month" @@ -374,7 +358,7 @@ #: ../libegg/egg-datetime.c:336 msgid "Displayed month" -msgstr "Zobrazení měsíce" +msgstr "Zobrazovaný měsíc" #: ../libegg/egg-datetime.c:341 msgid "Day" @@ -382,7 +366,7 @@ #: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" -msgstr "Zobrazení dne v měsíci" +msgstr "Zobrazovaný den v měsíci" #: ../libegg/egg-datetime.c:347 msgid "Hour" @@ -390,7 +374,7 @@ #: ../libegg/egg-datetime.c:348 msgid "Displayed hour" -msgstr "Zobrazení hodiny" +msgstr "Zobrazovaná hodina" #: ../libegg/egg-datetime.c:353 msgid "Minute" @@ -398,7 +382,7 @@ #: ../libegg/egg-datetime.c:354 msgid "Displayed minute" -msgstr "Zobrazení minuty" +msgstr "Zobrazovaná minuta" #: ../libegg/egg-datetime.c:359 msgid "Second" @@ -406,103 +390,103 @@ #: ../libegg/egg-datetime.c:360 msgid "Displayed second" -msgstr "Zobrazení sekundy" +msgstr "Zobrazovaná sekunda" #: ../libegg/egg-datetime.c:365 msgid "Lower limit year" -msgstr "Dolní limit (rok)" +msgstr "Rok spodní meze" #: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" -msgstr "Dolní limit pro roky" +msgstr "Rok jako součást spodní meze" #: ../libegg/egg-datetime.c:371 msgid "Upper limit year" -msgstr "Horní limit (rok)" +msgstr "Rok horní meze" #: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" -msgstr "Horní limit pro roky" +msgstr "Rok jako součást horní meze" #: ../libegg/egg-datetime.c:377 msgid "Lower limit month" -msgstr "Dolní limit (měsíc)" +msgstr "Měsíc spodní meze" #: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" -msgstr "Dolní limit pro měsíce" +msgstr "Měsíc jako součást spodní meze" #: ../libegg/egg-datetime.c:383 msgid "Upper limit month" -msgstr "Horní limit (měsíc)" +msgstr "Měsíc horní meze" #: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" -msgstr "Horní limit pro měsíce" +msgstr "Měsíc jako součást horní meze" #: ../libegg/egg-datetime.c:389 msgid "Lower limit day" -msgstr "Dolní limit (den)" +msgstr "Den spodní meze" #: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" -msgstr "Dolní limit pro dny" +msgstr "Den v měsíci jako součást spodní meze" #: ../libegg/egg-datetime.c:395 msgid "Upper limit day" -msgstr "Horní limit (den)" +msgstr "Den horní meze" #: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" -msgstr "Horní limit pro dny" +msgstr "Den v měsíci jako součást horní meze " #: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" -msgstr "Dolní limit (hodina)" +msgstr "Hodina spodní meze" #: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" -msgstr "Dolní limit pro hodiny" +msgstr "Hodina jako součást spodní meze" #: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" -msgstr "Horní limit (hodina)" +msgstr "Hodina horní meze" #: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" -msgstr "Horní limit pro hodiny" +msgstr "Hodina jako součást horní meze" #: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" -msgstr "Dolní limit (minuta)" +msgstr "Minuta spodní meze" #: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" -msgstr "Dolní limit pro minuty" +msgstr "Minuta jako součást spodní meze" #: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" -msgstr "Horní limit (minuta)" +msgstr "Minuta horní meze" #: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" -msgstr "Horní limit pro minuty" +msgstr "Minuta jako součást horní meze" #: ../libegg/egg-datetime.c:425 msgid "Lower limit second" -msgstr "Dolní limit (sekunda)" +msgstr "Sekunda spodní meze" #: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" -msgstr "Dolní limit pro sekundy" +msgstr "Sekunda jako součást spodní meze" #: ../libegg/egg-datetime.c:431 msgid "Upper limit second" -msgstr "Horní limit (sekunda)" +msgstr "Sekunda horní meze" #: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" -msgstr "Horní limit pro sekundy" +msgstr "Sekunda jako součást horní meze" #. Translate to calendar:week_start:1 if you want Monday to be the #. * first day of the week; otherwise translate to calendar:week_start:0. @@ -519,7 +503,7 @@ #: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" -msgstr "Zadejte datum ručně" +msgstr "Zadat datum přímo" #: ../libegg/egg-datetime.c:503 msgid "Select Date" @@ -527,7 +511,7 @@ #: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" -msgstr "Vyberte datum z kalendáře" +msgstr "Zvolit datum z kalendáře" #: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" @@ -535,7 +519,7 @@ #: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" -msgstr "Zadejte čas ručně" +msgstr "Zadat čas přímo" #: ../libegg/egg-datetime.c:528 msgid "Select Time" @@ -543,7 +527,7 @@ #: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" -msgstr "Vyberte čas ze seznamu" +msgstr "Zvolit čas ze seznamu" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. @@ -555,12 +539,12 @@ #: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 #: ../libegg/egg-datetime.c:1264 msgid "AM" -msgstr "dop" +msgstr "dop." #: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 #: ../libegg/egg-datetime.c:1268 msgid "PM" -msgstr "odp" +msgstr "odp." #. Translators: This is hh:mm:ss AM/PM. #: ../libegg/egg-datetime.c:807 @@ -600,277 +584,340 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "počáteční dočasná položka" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Přidat server klíčů" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Počítač:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Typ serveru klíčů:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Host:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Port, na kterém se má přistupovat k serveru." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "počáteční dočasná položka" +msgid "The port to access the server on." +msgstr "Port, na kterém se má přistupovat k serveru." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Heslo" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Verze této aplikace" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Heslo:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "– Systémová nastavení" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Potvrďte:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Přispěli:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Chybná adresa serveru klíčů." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Hesla a klíče" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "Požádejte o pomoc správce systému nebo správce serveru klíčů." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Petr Domanský \n" +"Michal Bukovjan \n" +"Miloslav Trmač \n" +"Vítězslav Kotrla \n" +"Petr Kovář \n" +"Lucas Lommer \n" +"Markéta Nykrýnová " -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Domovská stránka projektu Seahorse" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Vlastní" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Nelze smazat" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Žádný: nezveřejňovat klíče" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Nelze exportovat klíče" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Automaticky _získat klíče ze serverů klíčů" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Nelze exportovat data" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Automaticky _synchronizovat změněné klíče se servery klíčů" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Soubor" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Servery klíčů" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xportovat…" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Nastavení" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exportovat do souboru" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Hledat klíče pomocí:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Upravit" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "Z_veřejňovat klíče na:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Zkopírovat do schránky" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Získávání dat" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Smazat" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Export dat" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Smazat vybrané položky" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Import dat" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Zobrazit vlastnosti této položky" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Zobrazit vlastnosti této klíčenky" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Odesílání dat" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Předvolby" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Není k dispozici" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Změnit nastavení tohoto programu" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d.%m.%Y" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Zobrazit" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Data klíče" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Nápověda" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Více klíčů" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "O této aplikaci" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Všechny soubory klíčů" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Obsah" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Všechny soubory" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Zobrazit nápovědu" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exportovat" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Zadejte PIN nebo heslo pro: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Heslo:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Potvrzení:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Soubory archivů" +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Chybná adresa serveru klíčů." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Již existuje soubor s tímto názvem.\n" -"\n" -"Chcete jej nahradit novým souborem?" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "Požádejte o pomoc správce systému nebo správce serveru klíčů." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "Adresa URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Uživatelský" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Žádný: Nezveřejňovat klíče" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Předvolby" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Hledat klíče pomocí:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "Z_veřejňovat klíče na:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Automaticky _získat klíče ze serverů klíčů" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Automaticky _synchronizovat změněné klíče se servery klíčů" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Servery klíčů" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "Na_hradit" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d.%m.%Y" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" -msgstr "Neznámo" +msgstr "Neznámý" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nikdy" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" -msgstr "Částečná důvěra" +msgstr "Okrajový" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" -msgstr "Plná důvěra" +msgstr "Úplný" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" -msgstr "Bezmezná důvěra" +msgstr "Maximálně" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Zakázáno" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Odvolaný" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" -msgstr "Nelze zobrazit nápovědu: %s" +msgstr "Nebylo možno zobrazit nápovědu: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Datum vypršení platnosti:" +msgid "Never E_xpires" +msgstr "Nikdy ne_vyprší" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Vygenerovat nový podklíč" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Pokud klíč nikdy nevyprší" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Typ klíče:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Dé_lka klíče:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Typ klíče:" +msgid "Expiration Date:" +msgstr "Datum vypršení platnosti:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Délka klíče" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nikdy ne_vyprší" +msgid "Generate a new subkey" +msgstr "Vygenerovat nový podklíč" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Přidat ID uživatele" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Vytvořit nové ID uživatele" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Celé jmé_no:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Komentář klíče:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Musí být alespoň 5 znaků dlouhé" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Nepovinná e-mailová adresa" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Nepovinná poznámka popisující klíč" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Nepovinná e-mailová adresa" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Celé _jméno:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" -msgstr "_E-mail:" +msgstr "_E-mailová adresa:" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Komentář klíče:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Vytvořit nové ID uživatele" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Změnit" +msgid "_Never expires" +msgstr "_Nevyprší nikdy" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Odvolat klíč" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Nevyprší nikdy" +msgid "C_hange" +msgstr "_Změnit" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" -msgstr "Nelze přidat podklíč" +msgstr "Nebylo možno přidat podklíč" #: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "Přidat podklíč k %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (jen pro podpis)" @@ -878,7 +925,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (jen pro zašifrování)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (jen pro podpis)" @@ -888,7 +935,7 @@ #: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" -msgstr "Nelze přidat ID uživatele" +msgstr "Nebylo možno přidat id uživatele" #: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format @@ -899,6 +946,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Dešifrování selhalo. Pravděpodobně nemáte dešifrovací klíč." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Operace byla zrušena" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Neplatné datum vypršení" @@ -909,54 +961,156 @@ #: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" -msgstr "Nelze změnit datum vypršení" +msgstr "Nebylo možno změnit datum vypršení" #: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "Vypršení: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Více klíčů" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Data klíče" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Armored klíče PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Klíče PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Klíč PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Pro šifrování souborů a elektronické pošty" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA/ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" -msgstr "Nelze vygenerovat klíč PGP" +msgstr "Nebylo možno vygenerovat klíč PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Heslo pro nový klíč PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Zadejte dvakrát heslo ke svému novému klíči." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Když se vytváří klíč je nutné vygenerovat hromadu\n" +"náhodných dat a k tomu je potřeba vaše pomoc. Dobrý\n" +"postup je provádět nějaké jiné činnosti, jako psát\n" +"na klávesnici, hýbat myši, používat aplikace. Tím\n" +"se systému dodávají náhodná data, která potřebuje." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Vytváření klíče" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Opravdu chcete trvale smazat %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Opravdu chcete trvale smazat %d klíč?" +msgstr[1] "Opravdu chcete trvale smazat %d klíče?" +msgstr[2] "Opravdu chcete trvale smazat %d klíčů?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" -msgstr "Nesprávné heslo" +msgstr "Špatné heslo" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Toto je potřetí, co jste zadali nesprávné heslo. Zkuste to prosím znovu." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Špatné heslo." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Zadejte nové heslo pro „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Zadejte heslo pro „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Zadejte nové heslo" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Zadejte heslo" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Heslo" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Načten %d klíč" +msgstr[1] "Načteny %d klíče" +msgstr[2] "Načteno %d klíčů" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Neplatná data klíče (chybějí UID). Může to být tím, že chybí vlastní podpis, " +"nebo je datum v počítači nastaveno do budoucnosti." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Klíče GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: výchozí adresář klíčenky" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -991,33 +1145,37 @@ msgid "All JPEG files" msgstr "Všechny soubory JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Všechny soubor" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Vyberte fotografii pro přidání ke klíči" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" -msgstr "Nelze připravit fotografii" +msgstr "Nebylo možně připravit fotografii" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" -msgstr "Nelze přidat fotografii" +msgstr "Nebylo možno přidat fotografii" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Soubor nemohl být načten. Možná je v neplatném formátu" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Opravdu chcete odstranit zvolenou fotografii ze svého klíče?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" -msgstr "Nebylo možné odstranit fotografii" +msgstr "Nebylo možné smazat fotografii" #: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" -msgstr "Nelze odvolat podklíč" +msgstr "Nebylo možno odvolat podklíč" #: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format @@ -1026,7 +1184,7 @@ #: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" -msgstr "Bez důvodu" +msgstr "Žádný důvod" #: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" @@ -1067,28 +1225,32 @@ #: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" -msgstr "Nelze přidat odvolání" +msgstr "Nebylo možno přidat odvolání" + +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Chápu, že tento klíč bude trvale smazán." -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" "\"%s\"" msgstr "" -"Tento klíč již podepsal\n" +"Tento klíč byl již podepsán\n" "„%s“" #: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" -msgstr "Nelze podepsat klíč" +msgstr "Nebylo možno podepsat klíč" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Žádný klíč pro podpis není k dispozici" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1096,510 +1258,572 @@ "Nemáte žádný osobní klíč PGP, který by bylo možno použít pro určení důvěry " "tomuto klíči." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Špatné heslo." - -#: ../pgp/seahorse-gpgme-source.c:90 -#, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Zadejte nové heslo pro „%s“" - -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Zadejte heslo pro „%s“" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Zadejte nové heslo" - -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Zadejte heslo" - -#: ../pgp/seahorse-gpgme-source.c:328 -#, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Načten %d klíč" -msgstr[1] "Načteny %d klíče" -msgstr[2] "Načteno %d klíčů" - -#: ../pgp/seahorse-gpgme-source.c:649 -msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "" -"Neplatná data klíče (chybějí UID). Může to být tím, že chybí vlastní podpis, " -"nebo je datum v počítači nastaveno do budoucnosti." - #: ../pgp/seahorse-gpgme-subkey.c:199 msgid "ElGamal" msgstr "ElGamal" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Servery klíčů HTTP" - -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format msgid "Search was not specific enough. Server '%s' found too many keys." msgstr "" "Zadání nebylo dostatečně přesné. Server „%s“ nalezl příliš mnoho klíčů." -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format msgid "Couldn't communicate with server '%s': %s" -msgstr "Nelze se spojit s „%s“: %s" +msgstr "Nelze komunikovat se serverem „%s“: %s" -#: ../pgp/seahorse-ldap-source.c:440 -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "Nelze komunikovat s „%s“: %s" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Servery klíčů HTTP" -#: ../pgp/seahorse-ldap-source.c:651 -#, c-format -msgid "Connecting to: %s" -msgstr "Probíhá připojování k: %s" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Nebylo možno importovat klíče" -#: ../pgp/seahorse-ldap-source.c:657 -#, c-format -msgid "Couldn't resolve address: %s" -msgstr "Nelze rozlišit adresu %s" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Import klíčů ze serveru" -#: ../pgp/seahorse-ldap-source.c:701 +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Vzdálené" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Zavřít toto okno" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Hledat vzdálené klíče…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Hledat klíče na serveru klíčů" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importovat" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importovat vybrané klíče do místní klíčenky" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Vzdálené klíče" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Resolving server address: %s" -msgstr "Zjišťuje se adresa serveru: %s" +msgid "Remote Keys Containing '%s'" +msgstr "Vzdálené klíče obsahující „%s“" -#: ../pgp/seahorse-ldap-source.c:781 -msgid "LDAP Key Server" -msgstr "Servery klíčů LDAP" +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Hledání klíčů se nezdařilo." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Hledat vzdálené klíče" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "" +"Hledání klíčů jiných osob na Internetu. Tyto klíče je potom možno vložit do " +"své místní klíčenky." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Hledat klíče obsahující: " + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Servery klíčů:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Sdílené klíče v mé blízkosti:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Kde hledat:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Hledat" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Podep_sat klíč…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Podepsat veřejný klíč" +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Nelze zveřejnit klíče na serveru" -#: ../pgp/seahorse-pgp-commands.c:174 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Opravdu chcete navždy odstranit %s?" +msgid "Couldn't retrieve keys from server: %s" +msgstr "Nebylo možno získat klíče ze serveru: %s" + +#: ../pgp/seahorse-keyserver-sync.c:160 +#, c-format +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "Pro synchronizaci je vybrán %d klíč" +msgstr[1] "Pro synchronizaci jsou vybrány %d klíče" +msgstr[2] "Pro synchronizaci je vybrány %d klíčů" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synchronizují se klíče…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Synchronizovat klíče" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Tato akce zveřejní klíče ve vaší klíčence, aby je mohli používat i ostatní. " +"Také získáte změny, které druzí provedli od té doby, co jste přijali jejich " +"klíče." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Tato akce získá všechny změny klíčů, které ostatní provedli od doby, kdy " +"jste jejich klíče získali. Ke zveřejnění nebyl zvolen server klíčů, takže " +"vaše klíče ostatním zpřístupněny nebudou." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Servery klíčů" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Synchronizovat" -#: ../pgp/seahorse-pgp-commands.c:179 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Chcete opravdu navždy smazat klíče a identity %d?" +msgid "Couldn't communicate with '%s': %s" +msgstr "Nelze komunikovat s „%s“: %s" -#: ../pgp/seahorse-pgp-commands.c:181 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Chcete opravdu navždy smazat klíče %d?" +msgid "Connecting to: %s" +msgstr "Připojuje se k: %s" -#: ../pgp/seahorse-pgp-commands.c:183 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Chcete opravdu navždy smazat identity %d?" +msgid "Couldn't resolve address: %s" +msgstr "Nelze rozlišit adresu %s" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Nelze smazat ID uživatele" +#: ../pgp/seahorse-ldap-source.c:702 +#, c-format +msgid "Resolving server address: %s" +msgstr "Zjišťuje se adresa serveru: %s" + +#: ../pgp/seahorse-ldap-source.c:1447 +msgid "LDAP Key Server" +msgstr "Servery klíčů LDAP" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Nelze smazat soukromý klíč" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Nelze smazat veřejný klíč" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Synchronizovat a zveřejnit klíče…" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Pokročilé možnosti" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Zveřejnit a/nebo synchronizovat vaše klíče s klíči online." + +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Klíče PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Klíče PGP jsou pro zašifrování elektronické pošty nebo souborů" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Vytvořit" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Vygenerovat nový klíč" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Klíč PGP umožňuje zašifrovat soubory nebo elektronickou poštu (vždy pro " "konkrétního příjemce)." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmy" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Vytvořit" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Poznámka:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Datum _vypršení platnosti:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Nikdy ne_vyprší" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Typ šifrování:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Vygenerovat nový klíč" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Délka klíče (v bitech):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Nikdy ne_vyprší" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nový klíč PGP" +msgid "E_xpiration Date:" +msgstr "Datum _vypršení platnosti:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Poznámka:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Pokročilé možnosti" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Vypršel" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Osobní klíč PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Klíč PGP" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" -msgstr "Nelze změnit primární ID uživatele" +msgstr "Nebylo možno změnit primární ID uživatele" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" -msgstr "Opravdu že chcete navždy odstranit ID uživatele „%s“?" +msgstr "Opravdu chcete trvale smazat ID uživatele „%s“?" + +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Nelze smazat ID uživatele" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Neznámý]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Jméno / E-mail" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID podpisu" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" -msgstr "Nelze změnit primární fotografii" +msgstr "Nebylo možno změnit primární fotografii" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(neznámý)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Tento klíč vyprší dne: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" -msgstr "Jméno" +msgstr "Název" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" -msgstr "Opravdu chcete navždy odstranit podklíč %d z %s?" +msgstr "Opravdu chcete trvale smazat podklíč %d z %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" -msgstr "Nelze smazat podklíč" +msgstr "Nebylo možno smazat podklíč" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" -msgstr "Nelze změnit stav důvěry" - -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Nelze exportovat klíč do „%s“" +msgstr "Nebylo možno změnit stav důvěry" -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exportovat celý klíč" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Klíč nelze exportovat." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Nelze exportovat klíč" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nikdy" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Typ" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" -msgstr "Vytvořen" +msgstr "Vytvořeno" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Vyprší" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Stav" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Síla" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Platnost vypršela" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "V pořádku" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" -msgstr "ID klíče" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Akce" +msgstr "Klíč ID" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Poznámka:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Data" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-mail:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Otisk klíče" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID klíče:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nikdy" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Jména klíčů a podpisy" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Tento klíč byl odvolán" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotografie" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Vlastník klíče jej odvolat. Klíč je nyní nepoužitelný." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Technické detaily" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Platnost tohoto klíče vypršela" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Tento klíč byl odvolán" +msgid "Add a photo to this key" +msgstr "Přidat ke klíči fotografii" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Platnost tohoto klíče vypršela" +msgid "Remove this photo from this key" +msgstr "Odstranit z klíče tuto fotografii" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Typ:" +msgid "Make this photo the primary photo" +msgstr "Nastavit jako primární fotografii" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Použití:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Předchozí fotografie" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Podklíče" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Další fotografie" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Přidat" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotografie" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Přidat ke klíči fotografii" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Klíče ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Změnit _heslo" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Jméno:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Dešifrovat soubory a příchozí poštu." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-mail:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Smazat" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Komentář:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Vypršet" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Použití:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Vyprší:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Typ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exportovat" +msgid "Decrypt files and email sent to you." +msgstr "Dešifrovat soubory a příchozí poštu." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Soukromý klíč PGP" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Další fotografie" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Změnit heslo" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Předchozí fotografie" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Vlastník" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ID klíče:" +msgid "Key Names and Signatures" +msgstr "Jména klíčů a podpisy" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primární" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Nastavit jako primární fotografii" +msgid "Sign" +msgstr "Podepsat" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Jména a podpisy" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Smazat" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nikdy" +msgid "_Add Name" +msgstr "_Přidat jméno" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "_Potlačit důvěru vlastníka:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Vlastník" +msgid "Revoke" +msgstr "Odvolat" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primární" +msgid "Names and Signatures" +msgstr "Jména a podpisy" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Soukromý klíč PGP" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Klíč ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Odstranit z klíče tuto fotografii" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Odvolat" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Síla:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Podepsat" +msgid "Technical Details" +msgstr "Technické detaily" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Síla:" +msgid "Fingerprint" +msgstr "Otisk klíče" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Vlastník klíče jej odvolat. Klíč je nyní nepoužitelný." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Vyprší:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Přidat jméno" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Data" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "_Potlačit důvěru vlastníka:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Exportovat celý klíč:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Název:" +msgid "Actions" +msgstr "Činnosti" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datum:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Přidat" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Vypršení" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Podklíče" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Nepatrně" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Otisk klíče:" +msgid "Fully" +msgstr "Plně" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Stav důvěry:" +msgid "Ultimately" +msgstr "Zcela" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Jak moc důvěřujete tomuto klíči" +msgid "Encrypt files and email to the key's owner" +msgstr "Šifrování souborů a elektronické pošty pro vlastníka tohoto klíče " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Veřejný klíč PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Jiná jména:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Osoby, které podepsaly tento klíč:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Šifrování souborů a elektronické pošty pro vlastníka tohoto klíče " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Jak moc důvěřujete tomuto klíči" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Plně" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Úroveň vaší důvěry je ručně zadána v záložce Podrobnosti." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Důvěřuji podpisům, kterými „%s“ opatřuje jiné klíče" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1608,51 +1832,50 @@ "Pokud věříte, že osoba vlastnící tento klíč je „%s“, můžete tento klíč " "podepsat:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Podepsat klíč" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" -"Pokud nadále nevěříte, že „%s“ tento klíč vlastní, můžete odvolat " -"svůj podpis:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Nepatrně" +"Pokud nadále nevěříte, že osoba „%s“ tento klíč vlastní, můžete odvolat svůj podpis:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Veřejný klíč PGP" +msgid "_Revoke Signature" +msgstr "_Odvolat podpis" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Osoby, které podepsaly tento klíč:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Zobrazit _pouze podpisy osob, kterým důvěřuji" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Důvěra" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Zcela" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "_Důvěra tomuto vlastníkovi:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Úroveň vaší důvěry je ručně zadána v záložce Podrobnosti." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Otisk klíče:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Zobrazit _pouze podpisy osob, kterým důvěřuji" +msgid "Dates:" +msgstr "Datum:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Odvolat podpis" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Stav důvěry:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Podepsat klíč" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Důvěra tomuto vlastníkovi:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1660,56 +1883,61 @@ msgstr "Podklíč %d z %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Nepovinný popis odvolání" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Odvolat" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Důvod odvolání klíče" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Důvod:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Nepovinný popis odvolání" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Odvolat" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Nemáte žádný osobní klíč PGP, který by bylo možno použít k podpisu dokumentu " "nebo zprávy." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Podepsat zprávu klíčem:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Jak pečlivě byl tento klíč ověřen?" +msgid "Sign Key" +msgstr "Podepsat klíč" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Jak ostatní uvidí tento podpis:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Svým podpisem vyjadřujete svoji důvěru, že vlastníkem tohoto klíče je:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Podepsat klíč jako:" +msgid "Key Name" +msgstr "Název klíče" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Zběžně: Znamená to, že bylo provedeno pouze nahodilé ověření toho,že " -"je klíč skutečně vlastněn osobou, která se za jeho vlastníka prohlašuje. " -"Můžete například ověřit otisk klíče tak, že ho domnělému vlastníkovi řeknete " -"po telefonu." +msgid "How carefully have you checked this key?" +msgstr "Jak pečlivě byl tento klíč ověřen?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Název klíče" +msgid "_Not at all" +msgstr "_Vůbec" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Zběžně" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Velmi pečlivě" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1718,7 +1946,18 @@ "jeho vlastníka prohlašuje. Tato skutečnost ovšem nebyla (nebo nemohla být) " "nikterak ověřena." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Zběžně: Znamená to, že bylo provedeno pouze nahodilé ověření toho,že " +"je klíč skutečně vlastněn osobou, která se za jeho vlastníka prohlašuje. " +"Můžete například ověřit otisk klíče tak, že ho domnělému vlastníkovi řeknete " +"po telefonu." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1726,18 +1965,6 @@ "Velmi pečlivě: Tuto možnost vyberte pouze tehdy, pokud máte naprostou " "a nezpochybnitelnou jistotu o původu klíče." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Svým podpisem vyjadřujete svoji důvěru, že vlastníkem tohoto klíče je:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Tento podpis _může být později odvolán." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Podepsat klíč" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1749,486 +1976,355 @@ "je vhodné ověřit zasláním e-mailu vlastníkovi." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Zběžně" +msgid "How others will see this signature:" +msgstr "Jak ostatní uvidí tento podpis:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Vůbec" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Ostatní nesmí vidět tento podpis" -#: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "Podep_sat" - -#: ../pgp/seahorse-sign.xml.h:16 -msgid "_Signer:" -msgstr "_Autor podpisu:" - -#: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Velmi pečlivě" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Podepsat zprávu klíčem:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Certifikát" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Nelze odstranit." - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Opravdu chcete odstranit certifikát „%s“?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Opravdu chcete smazat %d certifikát?" -msgstr[1] "Opravdu chcete smazat %d certifikáty?" -msgstr[2] "Opravdu chcete smazat %d certifikátů?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Odstraňování" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Změnit heslo" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "P_otvrdit heslo:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Potvrdit nové heslo" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Nové _heslo:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Spravovat svá hesla a šifrovací klíče" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Hesla a klíče" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "Zvo_lte druh položky, kterou chcete vytvořit:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "P_okračovat" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Vytvořit nový…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Vybrán %d klíč" -msgstr[1] "Vybrány %d klíče" -msgstr[2] "Vybráno %d klíčů" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Nelze importovat klíče" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importované klíče" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importují se klíče" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importovat klíč" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Nerozpoznaný typ klíče, nebo neplatný formát dat" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Import klíčů" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Vzdálené" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Ukončit program" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nový…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Vytvořit nový klíč nebo položku" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importovat…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importovat ze souboru" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importovat ze schránky" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Hledat vzdálené klíče…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Hledat klíče na serveru klíčů" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Synchronizovat a zveřejnit klíče…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Zveřejnit a/nebo synchronizovat vaše klíče s klíči online." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_ypy" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Ukázat sloupec typ" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "Datu_m vypršení" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Zobrazovat sloupec vypršení" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Důvěru" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Zobrazovat sloupec důvěry" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Platnost" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Zobrazovat sloupec platnosti" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtr:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Možnosti při prvním použití:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Vygenerovat nový klíč: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importovat existující klíče ze souboru:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Mo_je osobní klíče" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Další _klíče" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Abyste mohli začít používat šifrování, budete potřebovat klíče." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importovat" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Hesla" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Nelze exportovat klíče" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Platnost" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Datum vypršení" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Zavřít toto okno" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Rozbalit vše" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Rozbalit všechny výpisy" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Sbalit vše" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Sbalit všechny výpisy" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Vzdálené klíče" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Vzdálené klíče obsahující „%s“" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servery klíčů:" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Tento podpis _může být později odvolán." -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Sdílené klíče v mé blízkosti:" +#: ../pgp/seahorse-sign.xml.h:15 +msgid "Sign key as:" +msgstr "Podepsat klíč jako:" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Hledat vzdálené klíče" +#: ../pgp/seahorse-sign.xml.h:16 +msgid "_Signer:" +msgstr "_Autor podpisu:" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Hledání klíčů jiných osob na Internetu. Tyto klíče je potom možno vložit do " -"své místní klíčenky." +#: ../pgp/seahorse-sign.xml.h:17 +msgid "_Sign" +msgstr "_Podepsat" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Kde hledat:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Export dat" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Hledat" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Získávání dat" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Hledat klíče obsahující: " +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Import dat" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Nelze zveřejnit klíče na serveru" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Posílání dat" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Nelze získat klíče ze serveru: %s" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Nedostupné" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "Pro synchronizaci je vybrán %d klíč" -msgstr[1] "Pro synchronizaci jsou vybrány %d klíče" -msgstr[2] "Pro synchronizaci je vybráno %d klíčů" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Osobní certifikát a klíč" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Osobní certifikát" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Synchronizují se klíče…" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Certifikát" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Synchronizovat klíče" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certifikáty (DER kódování)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certifikáty" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 certifikáty a příslušné klíče" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Chcete opravdu trvale smazat %d certifikát?" +msgstr[1] "Chcete opravdu trvale smazat %d certifikáty?" +msgstr[2] "Chcete opravdu trvale smazat %d certifikátů?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Nebylo možno vygenerovat osobní klíč" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Vytvořit" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Osobní klíč" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Použít k žádosti o certifikát" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Vytvořit nový osobní klíč" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Popisek:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Uložené jako:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Chápu, že tento klíč bude trvale smazán." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Nepojmenované" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Selhal export certifikátu" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Tato akce zveřejní klíče ve vaší klíčence, aby je mohli používat i ostatní. " -"Také získáte změny, které druzí provedli od té doby, co jste přijali jejich " -"klíče." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Nelze smazat" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Tato akce získá všechny změny klíčů, které ostatní provedli od doby, kdy " -"jste jejich klíče získali. Ke zveřejnění nebyl zvolen server klíčů, takže " -"vaše klíče ostatním zpřístupněny nebudou." +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Export" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exportovat certifikát" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Smazat tento certifikát nebo klíč" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Zažádat o certifikát" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Vytvořit požadavek na certifikát pro tento klíč" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Nebylo možné uložit požadavek na certifikát" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Uložit požadavek na certifikát" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Požadavek na certifikát" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Žádost ve formátu PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Nebylo možné vytvořit požadavek na certifikát" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Vytvořit požadavek na cetifikát." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Jméno (CN) použité v žádosti o certifikát." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Jméno (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Nepojmenovaný soukromý klíč" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Servery klíčů" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Změnit heslo" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Synchronizovat" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Nové _heslo:" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Verze této aplikace" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Potvrdit nové heslo" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Přispěli:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "P_otvrdit heslo:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Petr Domanský \n" -"Michal Bukovjan \n" -"Miloslav Trmač \n" -"Petr Kovář \n" -"Lucas Lommer \n" -"Vítězslav Kotrla \n" -"Marek Černocký " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Spravovat svá hesla a šifrovací klíče" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Domovská stránka projektu Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Pokračovat" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Soubor" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "Zvo_lte druh položky, kterou chcete vytvořit:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Upravit" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Import selhal" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Import" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Údaje, které mají být importovány:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Zobrazit" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importovat klíč" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Nápověda" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Všechny soubory klíčů" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Nastavení" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Zkopírovaný text" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Text ze schránky" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nový" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Změnit nastavení tohoto programu" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Ukončit program" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "O této aplikaci" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nový…" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Obsah" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Vytvořit nový klíč nebo položku" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Ukázat nápovědu" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Přidat nový klíč nebo položku" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exportovat veřejný klíč" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importovat…" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Exportují se klíče" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importovat ze souboru" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Nelze získat data ze serveru klíčů" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importovat ze schránky" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Zkopírované klíče" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Podle _klíčenky" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Zobrazit postranní panel se seznamem klíčenek" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Zobrazit _osobní" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Zobrazit pouze osobní klíče, certifikáty a hesla" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Zobrazit _důvěryhodné" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Zobrazit pouze důvěryhodné klíče, certifikáty a hesla" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Zobrazit _všechny" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Zobrazit všechny klíče, certifikáty a hesla" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtr" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Stahují se klíče" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Možnosti při prvním použití:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s je soukromý klíč. Opravdu chcete pokračovat?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Vygenerovat nový klíč: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Import klíčů ze serveru" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importovat existující klíče ze souboru:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Ukázat vlastnosti" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Abyste mohli začít používat šifrování, budete potřebovat klíče." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Smazat" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Nelze zamknout" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Nelze odemknout" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Smazat vybrané položky" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Zamknout" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xportovat…" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Odemknout" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exportovat do souboru" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Vlastnosti" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopírovat do schránky" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Nastavit klíče pro _SSH…" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importovat vybrané klíče do místní klíčenky" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Poslat veřejný SSH klíč na jiný počítač a povolit přihlášení tímto klíčem." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2254,207 +2350,228 @@ #: ../ssh/seahorse-ssh-askpass.c:93 #, c-format -#| msgid "Enter the new passphrase for: %s" msgid "Enter the new passphrase again: %s" msgstr "Zadejte znovu nové heslo pro: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Nastavit klíč pro _SSH…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Poslat veřejný klíč SSH na jiný počítač a povolit přihlášení tímto klíčem." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Klíče používané k bezpečnému připojení k jiným počítačům" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Chcete opravdu odstranit klíč k SSH „%s“?" +msgstr "Chcete opravdu smazat klíč SSH „%s“?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Chcete opravdu smazat „%d“ klíče k SSH?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Chcete opravdu smazat %d klíč SSH?" +msgstr[1] "Chcete opravdu smazat %d klíče SSH?" +msgstr[2] "Chcete opravdu smazat %d klíčů SSH?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Klíč SSH" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Nelze smazat klíč" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Soukromé klíče SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Veřejné klíče SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Pro tento klíč není k dispozici žádný soubor s veřejným klíčem." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Klíč SSH" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Pro přístup k jiným počítačům (např. terminálem)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" -msgstr "Nelze vytvořit klíč SSH" +msgstr "Nebylo možno vytvořit klíč SSH" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Vytvoření klíče SSH" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Použijte svoji adresu elektronické pošty a podle potřeby jakoukoliv další " -"poznámku pro označení účelu tohoto klíče." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Klíč SSH (Secure Shell) umožňuje vzdálené zabezpečené připojení k " -"důvěryhodným počítačům pomocí SSH bez nutnosti zadávat pro každý počítač " -"zvláštní heslo." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Pokud již existuje počítač, pro který chcete tento klíč použít, můžete jej " -"nyní pro použití tohoto klíče nastavit. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Nový klíč SSH" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Pouze vytvořit klíč" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Vytvořit a nastavit" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Pouze vytvořit klíč" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "SSH klíč vám umožní bezpečně se připojit na jiné počítače." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Vaše e-mailová adresa nebo jiné použití klíče." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Popis klíče:" +msgid "DSA" +msgstr "DSA" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Pokud existuje počítač, pro který chcete tento klíč použít, můžete jej pro " +"použití tohoto klíče nastavit." + +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" -msgstr "(Nečitelný klíč SSH)" +msgstr "(Nečitelný SSH klíč)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Osobní klíč SSH" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Klíč SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." -msgstr "Nelze přejmenovat klíč." +msgstr "Nebylo možno přejmenovat klíč." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." -msgstr "Nelze změnit autorizaci pro klíč." +msgstr "Nebylo možno změnit autorizaci klíče." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." -msgstr "Nelze změnit heslo klíče." - -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmus:" +msgstr "Nebylo možno změnit heslo klíče." -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identifikátor:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Umístění:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" -msgstr "Jméno:" +msgstr "Název:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Síla:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Pro připojení k jiným počítačům." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Důvěra" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Vlastník tohoto klíče je autorizován pro připojení k to_muto počítači" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Platí pouze pro účet „%s“." +msgid "This only applies to the %s account." +msgstr "Platí pouze pro účet %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xportovat celý klíč" +msgid "Algorithm:" +msgstr "Algoritmus:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Vlastník tohoto klíče je autorizován pro připojení k to_muto počítači" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Síla:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Umístění:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Pro připojení k jiným počítačům." +msgid "E_xport Complete Key" +msgstr "E_xportovat celý klíč" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Příkaz SSH neočekávaně skončil." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Příkaz SSH selhal." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Odstranit heslo počítače" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" -msgstr "Zadejte heslo" +msgstr "Zadejte heslo pro klíč" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Heslo pro nový klíč SSH" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Import klíče: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Import klíče. Zadejte heslo" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Klíče OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Pro tento klíč není k dispozici žádný soubor se soukromým klíčem." #: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "Na vzdáleném počítači nebylo možno nastavit klíč SSH." +msgstr "Na vzdáleném počítači nebylo možno nastavit SSH klíče." #: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." msgstr "Nastavují se klíče SSH…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "např.: fileserver.neco.cz:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Nastavit počítač pro připojení pomocí SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." msgstr "" -"Aby bylo možné pro připojení ke vzdálenému počítači použít klíč SSH, musí " +"Aby bylo možné pro připojení ke vzdálenému počítači použít SSH klíč, musí " "takový počítač používat SSH a také na něm musíte mít uživatelský účet." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "např.: fileserver.neco.cz:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Název _počítače:" @@ -2466,12 +2583,3 @@ #: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" msgstr "_Nastavit" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Secure Shell key" -#~ msgstr "Klíč SSH" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "Zadejte heslo pro svůj nový klíč SSH." diff -Nru seahorse-3.2.2/po/da.po seahorse-3.6.3/po/da.po --- seahorse-3.2.2/po/da.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/da.po 2012-09-18 13:10:35.000000000 +0200 @@ -1,14 +1,13 @@ # Seahorse, GNOME frontend for GnuPG in Danish. -# Copyright (C) 2000-2011 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # Birger Langkjer , 2000. -# Ask Hjorth Larsen , 2008, 09, 10, 11. -# flemming christensen , 2011. -# Konventioner +# Ask Hjorth Larsen , 2008, 09, 10, 11, 12. +# flemming christensen , 2011, 2012. # +# Konventioner# # Passphrase -> adgangsfrase # Password -> adgangskode -# Cache -> cache. -# +# Cache -> cache.# # Dette er måske ikke den mest elegante løsning, men på dansk findes der ikke et ord af tilsvarende længde der passer godt. Mellemlagring eller hurtigbuffer fra ordlisten er uegnede da de tydeligvis refererer til CPU-cache. # # ASCII armor -> ASCII-panser @@ -16,30 +15,27 @@ # verify -> verificere # sign -> underskrive # signature -> underskrift -# +# remote -> ekstern +# # msgid "" msgstr "" "Project-Id-Version: Seahorse 0.3.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-21 18:12+0200\n" -"PO-Revision-Date: 2011-09-20 22:31+0200\n" +"POT-Creation-Date: 2012-09-15 23:31+0200\n" +"PO-Revision-Date: 2012-09-14 07:52+0200\n" "Last-Translator: flemming christensen \n" -"Language-Team: Danish \n" +"Language-Team: Dansk \n" "Language: da\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" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Tilføj adgangskode-nøglering" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Navn til ny nøglering:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -47,307 +43,296 @@ "Vælg venligst et navn til den nye nøglering. Du vil blive spurgt om en " "adgangskode til oplåsning." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Navn til ny nøglering:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Værtsnavn eller adresser for serveren." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Kunne ikke tilføje nøglering" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Ny adgangskode-nøglering" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Bruges til at lagre program- og netværksadgangskoder" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Ny adgangskode..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Gem en adgangskode eller hemmelighed sikkert." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Adgangskode-nøglering" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Gemt adgangskode" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Kunne ikke indstille standardnøglering" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Kunne ikke ændre nøgleringens adgangskode" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Sæt som forvalg" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Programmer lagrer normalt nye adgangskoder i standardnøgleringen." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Skift _adgangskode" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "" +"Skift adgangskoden, der bruges til at låse nøgleringen til lagring af " +"adgangskoder op" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Kunne ikke tilføje element" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Tilføj adgangskode" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Beskrivelse:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Nøglering:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Adgangskode:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Vis adgangskode" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Kunne ikke slette element." +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Nøglering:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Kunne ikke tilføje nøglering" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Adgangskoder" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Gemte personliger adgangskoder, akkreditiver og hemmeligheder" + +# Grrr, findes ikke i empathy +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "IM-kontoadgangskode for " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Adgangskode eller hemmelighed" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Netværksadgangskode" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Gemt note" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Adgangskode til nøglering" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Adgangskode til krypteringsnøgle" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Adgangskode til nøglelager" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Adgangskode til Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Adgangskode til Gnome Online Accounts" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Adgangskode til Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Adgangskode til samtaleklienter" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Hemmelighed for Netværkshåndtering" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Er du sikker på at du vil slette adgangskoden \"%s\"?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Er du sikker på at du vil slette %d adgangskode?" msgstr[1] "Er du sikker på at du vil slette %d adgangskoder?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Sletter element" -msgstr[1] "Sletter elementer" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Få adgang til en netværksdeling eller ressource" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Få adgang til en hjemmeside" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Låser en PGP-nøgle op" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Låser en SSH-nøgle op" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Gemt adgangskode eller brugernavn" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Netværksakkreditiver" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Adgangskode" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Kunne ikke ændre adgangskode." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Opdaterer adgangskode" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Kunne ikke anføre beskrivelse." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Adgangskode:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Tekniske detaljer:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detaljer" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Nøgleegenskaber" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Nøgle" +msgid "Use:" +msgstr "Brug:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Nøgleegenskaber" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Type:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Logind:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Logind:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Vis kode_ord" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Type:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Brug:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Adgangskoder: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Adgangskoder: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Adgangskode-nøglering" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Bruges til at lagre program- og netværksadgangskoder" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Gemt adgangskode" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Gem en adgangskode eller hemmelighed sikkert." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Kunne ikke låse nøglering op" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Kunne ikke låse nøglering" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Kunne ikke indstille standardnøglering" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Kunne ikke ændre nøgleringens adgangskode" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Lås" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Lås nøgleringen til lagring af adgangskoder, således at en hovedadgangskode " -"kræves for at låse den op." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Lås op" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Lås nøgleringen til lagring af adgangskoder op med en hovedadgangskode, " -"således at den er klar til brug." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Sæt som forvalg" +msgid "Password:" +msgstr "Adgangskode:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Programmer lagrer normalt nye adgangskoder i standardnøgleringen." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Nøgle" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Skift _adgangskode" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Tekniske detaljer:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "" -"Skift adgangskoden, der bruges til at låse nøgleringen til lagring af " -"adgangskoder op" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detaljer" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Kunne ikke slette nøglering" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "En nøglering, der automatisk låses op ved logind" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "En nøglering, der bruges til at lagre adgangskoder" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Er du sikker på at du vil slette adgangskodenøgleringen \"%s\"?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Sletter nøglering" -msgstr[1] "Sletter nøgleringe" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Jeg forstår at alle elementer vil blive slettet permanent." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Egenskaber for nøglering" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Navn:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Oprettet:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Nøglering" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Egenskaber for nøglering" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Navn:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Handlingen blev annulleret" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Adgang til nøgleringen blev nægtet" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Dæmonen gnome-keyring kører ikke" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Nøgleringen er allerede blevet låst op" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Ingen sådan nøglering findes" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Kunne ikke kommunikere med nøgleringsdæmon" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Objektet findes allerede" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Intern fejl i adgang til gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Vis flag" @@ -603,273 +588,334 @@ msgid "%u:%u:%u" msgstr "%u:%u:%u" -# Hvorfor skal vi dog oversætte tegnet : ? +# Mærkeligt. #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "indledningsvis midlertidigt objekt" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Tilføj nøgleserver" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Vært:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Nøgleservertype:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Vært:" + +# Hvorfor skal vi dog oversætte tegnet : ? #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Porten der benyttes til at forbinde til serveren." +msgid ":" +msgstr ":" -# Mærkeligt. #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "indledningsvis midlertidigt objekt" +msgid "The port to access the server on." +msgstr "Porten der benyttes til at forbinde til serveren." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Adgangsfrase" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Version af dette program" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Adgangskode:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Systemindstillinger" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Bekræft:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Bidrag:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Ugyldig nøgleserver-adresse." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Kodeord og nøgler" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Kontakt din systemadministrator eller nøgleserverens administrator for hjælp." +"Ask Hjorth Larsen\n" +"Birger Langkjer\n" +"\n" +"Dansk-gruppen \"\n" +"Mere info: http://www.dansk-gruppen.dk" -# hvis det skal oversættes til andet end URL, så er det relevant hvorvidt oversættelsen skal begynde med stort eller småt -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse projekthjemmeside" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Tilpasset" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Kan ikke slette" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Ingen: Offentliggør ikke nøgler" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Kunne ikke eksportere nøgler" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Hent automatisk nøgler fra _nøgleservere" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Kunne ikke eksportere data" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Synkronisér automatisk æ_ndrede nøgler med nøgleservere" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Fil" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Nøgleservere" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_ksportér..." -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Indstillinger" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Eksportér til en fil" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Find nøgler via:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Redigér" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Offentliggør nøgler til:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopiér til udklipsholderen" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Henter data" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Slet" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Eksporterer data" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Slet markerede elementer" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importerer data" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Vis dette elements egenskaber" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Vis denne nøglerings egenskaber" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Sender data" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Indstillinger" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Utilgængelig" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Ændr indstillinger for dette program" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d/%m %Y" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Vis" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Nøgledata" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Hjælp" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Adskillige nøgler" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Om dette program" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Alle nøglefiler" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Indhold" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Alle filer" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Vis Seahorse-hjælp" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Eksportér" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Indtast PIN eller adgangskode til: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Adgangskode:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Bekræft:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arkivfiler" +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Ugyldig nøgleserver-adresse." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"En fil med dette navn findes allerede.\n" -"\n" -"Vil du erstatte den med en ny fil?" +"Kontakt din systemadministrator eller nøgleserverens administrator for hjælp." + +# hvis det skal oversættes til andet end URL, så er det relevant hvorvidt oversættelsen skal begynde med stort eller småt +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Tilpasset" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Ingen: Offentliggør ikke nøgler" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Indstillinger" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Find nøgler via:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Offentliggør nøgler til:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Hent automatisk nøgler fra _nøgleservere" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Synkronisér automatisk æ_ndrede nøgler med nøgleservere" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Nøgleservere" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Erstat" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d/%m %Y" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Ukendt" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Aldrig" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Underordnet" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Fuld" # "This level of trust should only be assigned to your own keys", står der i dokumentationen, så ultimativ må være en nogenlunde oversættelse #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Ultimativ" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Deaktiveret" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Tilbagekaldt" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Kunne ikke vise hjælp: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Udløbsdato:" +msgid "Never E_xpires" +msgstr "Udløber _aldrig" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Opret en ny undernøgle" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Om nøglen aldrig udløber" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Nøgle_type:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Nøgle_længde:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Nøgle_type:" +msgid "Expiration Date:" +msgstr "Udløbsdato:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Nøglelængde" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Udløber _aldrig" +msgid "Generate a new subkey" +msgstr "Opret en ny undernøgle" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Tilføj bruger-ID" -#: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Opret den nye bruger-ID" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Fuldt _navn:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Nøglekommentar:" - # denne formulering undgår "lang vs. langt"-diskussionen -#: ../pgp/seahorse-add-uid.xml.h:5 +#: ../pgp/seahorse-add-uid.xml.h:2 msgid "Must be at least 5 characters long" msgstr "Skal indeholde mindst 5 tegn" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Valgfri e-postadresse" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Valgfri nøglebeskrivelse" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Valgfri e-postadresse" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Fuldt _navn:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_E-postadresse:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Nøglekommentar:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Opret den nye bruger-ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Ændr" +msgid "_Never expires" +msgstr "Udløber _aldrig" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Tilbagekald nøgle" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "Udløber _aldrig" +msgid "C_hange" +msgstr "_Ændr" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -880,7 +926,7 @@ msgid "Add subkey to %s" msgstr "Føj undernøgle til %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (underskriv kun)" @@ -888,7 +934,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (kryptér kun)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (underskriv kun)" @@ -909,6 +955,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Dekryptering slog fejl. Du har sandsynligvis ikke dekrypteringsnøglen." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Handlingen blev annulleret" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Ugyldig udløbsdato" @@ -926,48 +977,148 @@ msgid "Expiry: %s" msgstr "Udløb: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Adskillige nøgler" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Nøgledata" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Pansrede PGP-nøgler" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP-nøgler" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP-nøgle" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Bruges til at kryptere e-post og filer" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Kunne ikke generere PGP-nøgle" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Adgangsfrase til ny PGP-nøgle" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Skriv adgangsfrasen til din nye nøgle to gange." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Når der skal oprettes en nøgle skal der genereres \n" +"mange tilfældige data, og her skal du hjælpe. Det\n" +"er en god ide at udføre andre handlinger som at bruge\n" +"tastaturet, bevæge musen elle bruge programmer.\n" +"Dette giver systemet de nødvendige tilfældige data." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Genererer nøgle" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Er du sikker på at du vil slette %s permanent?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Er du sikker på at du vil slette %d nøgle permanent?" +msgstr[1] "Er du sikker på at du vil slette %d nøgler permanent?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Forkert adgangskode" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Dette var tredje gang, du indtastede en forkert adgangskode. Prøv venligst " "igen." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Forkert adgangsfrase." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Skriv ny adgangsfrase til \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Skriv adgangsfrase til \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Skriv ny adgangsfrase" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Skriv adgangsfrase" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Adgangsfrase" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Indlæste %d nøgle" +msgstr[1] "Indlæste %d nøgler" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Ugyldige nøgledata (manglende UID'er). Dette kan skyldes at en computer har " +"dato indstillet til fremtiden eller en manglende egenunderskrift." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG-nøgler" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: standardnøgleringskatalog" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1003,27 +1154,31 @@ msgid "All JPEG files" msgstr "Alle JPEG-filer" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Alle filer" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Vælg billede til nøglen" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Kunne ikke klargøre billede" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Kunne ikke tilføje billede" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Filen kunne ikke indlæses. Måske benytter den et ugyldigt format" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Er du sikker på at du vil fjerne det nuværende billede fra din nøgle?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Kunne ikke slette billede" @@ -1081,7 +1236,11 @@ msgid "Couldn't add revoker" msgstr "Kunne ikke tilføje tilbagekalder" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Jeg forstår at denne hemmelige nøgle vil blive slettet permanent." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1096,11 +1255,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Ingen brugbare nøgler til underskrift" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1108,512 +1267,575 @@ "Du har ingen personlige PGP-nøgler der kan bruges til at angive din tillid " "til denne nøgle." -#: ../pgp/seahorse-gpgme-source.c:86 +# Hvorfor er dette markeret til oversættelse? Velsagtens noget med fremmede alfabeter. Men selv på japansk eller kyrillisk ser man da ikke den slags oversat... +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" + +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Wrong passphrase." -msgstr "Forkert adgangsfrase." +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Søgningen var ikke tilstrækkeligt specifik. Serveren \"%s\" fandt for mange " +"nøgler." -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Skriv ny adgangsfrase til \"%s\"" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Kunne ikke kommunikere med serveren \"%s\": %s" -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Skriv adgangsfrase til \"%s\"" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP-nøgleserver" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Skriv ny adgangsfrase" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Kunne ikke importere nøgler" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Skriv adgangsfrase" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importerer nøgler fra nøgleservere" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Fjern" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Luk dette vindue" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Find fjerne nøgler..." -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Søg efter nøgler på en nøgleserver" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importér" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importér markerede nøgler til lokal nøglering" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Fjerne nøgler" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d nøgle indlæst" -msgstr[1] "%d nøgler indlæst" +msgid "Remote Keys Containing '%s'" +msgstr "Eksterne nøgler indeholdende \"%s\"" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Søgningen efter nøgler mislykkedes." -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Find eksterne nøgler" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Ugyldige nøgledata (manglende UID'er). Dette kan skyldes at en computer har " -"dato indstillet til fremtiden eller en manglende egenunderskrift." +"Dette vil finde andres nøgler på Internet. Disse nøgler kan så importeres " +"til din lokale nøglering." -# Hvorfor er dette markeret til oversættelse? Velsagtens noget med fremmede alfabeter. Men selv på japansk eller kyrillisk ser man da ikke den slags oversat... -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Søg efter nøgler indeholdende: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP-nøgleserver" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Nøgleservere:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Delte nøgler nær mig:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Sted for søgning:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Søg" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Kunne ikke offentliggøre nøgler til serveren" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Søgningen var ikke tilstrækkeligt specifik. Serveren \"%s\" fandt for mange " -"nøgler." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Kunne ikke hente nøgler fra serveren: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Kunne ikke kommunikere med serveren \"%s\": %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d nøgle markeret til synkronisering" +msgstr[1] "%d nøgler markeret til synkronisering" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synkroniserer nøgler..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Synkronisér nøgler" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Dette vil offentliggøre nøglerne i din nøglering så de er tilgængelige for " +"andre. Du vil også modtage de ændringer som andre har foretaget siden du " +"modtog deres nøgler." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Dette vil hente de ændringer som andre har foretaget siden du modtog deres " +"nøgler. Ingen nøgleserver er valgt til offentliggørelse, så dine nøgler vil " +"ikke blive offentliggjort for andre." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Nøgleservere" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Synkronisér" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Kunne ikke kommunikere med \"%s\": %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Forbinder til: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Kunne ikke finde adressen: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Finder serveradresse: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP-nøgleserver" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Underskriv nøgle..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Underskriv offentlig nøgle" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Er du sikker på at du vil slette %s permanent?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Er du sikker på at du vil slette %d nøgler og identiteter permanent?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Er du sikker på at du vil slette %d nøgler permanent?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Er du sikker på at du vil slette %d identiteter permanent?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "S_ynkronisér og offentliggør nøgler..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Kunne ikke slette bruger-ID" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Offentliggør og/eller synkronisér dine nøgler med andre på nettet." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Kunne ikke slette privat nøgle" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Kunne ikke slette offentlig nøgle" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP-nøgler" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP-nøgler bruges til at kryptere e-post eller filer" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Avancerede nøgleindstillinger" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Opret" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Generér en ny nøgle" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "En PGP-nøgle tillader dig at kryptere e-post eller filer til andre mennesker." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmer her" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Opret" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Kommentar:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Udløbsdato:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Udløber _aldrig" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Krypterings_type:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Generér en ny nøgle" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Nøgle_styrke (bit):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Udløber _aldrig" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Ny PGP-nøgle" +msgid "E_xpiration Date:" +msgstr "_Udløbsdato:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Kommentar:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Avancerede nøgleindstillinger" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Udløbet" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Personlig PGP-nøgle" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP-nøgle" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Kunne ikke ændre primær bruger-ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Er du sikker på at du vil slette bruger-ID'en \"%s\" permanent?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Kunne ikke slette bruger-ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Ukendt]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Navn/e-postadresse" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Underskrifts-ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Kunne ikke ændre primært billede" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(ukendt)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Denne nøgle udløb den: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Navn" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Er du sikker på at du vil slette undernøgle %d af %s permanent?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Kunne ikke slette undernøgle" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Kunne ikke ændre tillidsindstilling" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Kunne ikke eksportere nøgle til \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Eksportér fuldstændig nøgle" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Kunne ikke eksportere nøgle." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Kunne ikke eksportere nøgle" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Aldrig" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Type" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Oprettet" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Udløber" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Status" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Styrke" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Udløbet" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "God" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Nøgle-ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Handlinger" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Kommentar:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datoer" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-post:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Fingeraftryk" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Nøgle-ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Aldrig" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nøglenavne og underskrifter" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Denne nøgle er blevet tilbagekaldt" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Billede " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"Nøglen er blevet tilbagekaldt af dens ejer. Den kan ikke længere bruges." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Tekniske detaljer" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Denne nøgle er udløbet" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Denne nøgle er blevet tilbagekaldt" +msgid "Add a photo to this key" +msgstr "Føj et billede til denne nøgle" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Denne nøgle er udløbet" +msgid "Remove this photo from this key" +msgstr "Fjern dette billede fra denne nøgle" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Type:" +msgid "Make this photo the primary photo" +msgstr "Gør dette til hovedbilledet" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Gå til forrige billede" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Brug:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Undernøgler" +msgid "Go to next photo" +msgstr "Gå til næste billede" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Tilføj" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Billede " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Føj et billede til denne nøgle" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Nøgle-ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Skift _adgangsfrase" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Navn:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Dekryptér filer og e-post sendt til dig." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-post:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Slet" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Kommentar:" -# Bøjning ... ? +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Udløb" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Brug:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Udløber:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Type:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Eksportér" +msgid "Decrypt files and email sent to you." +msgstr "Dekryptér filer og e-post sendt til dig." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Privat PGP-nøgle" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Gå til næste billede" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Skift _adgangsfrase" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Gå til forrige billede" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Ejer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Nøgle-ID:" +msgid "Key Names and Signatures" +msgstr "Nøglenavne og underskrifter" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primær" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Gør dette til hovedbilledet" +msgid "Sign" +msgstr "Underskriv" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Navne og underskrifter" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Slet" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Aldrig" +msgid "_Add Name" +msgstr "_Tilføj navn" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Underkend ejers _tillid:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Ejer" +msgid "Revoke" +msgstr "Tilbagekald" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primær" +msgid "Names and Signatures" +msgstr "Navne og underskrifter" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Privat PGP-nøgle" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Nøgle-ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Fjern dette billede fra denne nøgle" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Tilbagekald" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Styrke:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Underskriv" +msgid "Technical Details" +msgstr "Tekniske detaljer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Styrke:" +msgid "Fingerprint" +msgstr "Fingeraftryk" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" -"Nøglen er blevet tilbagekaldt af dens ejer. Den kan ikke længere bruges." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Udløber:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Tilføj navn" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datoer" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Underkend ejers _tillid:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Eksportér fuldstændig nøgle:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Navn:" +msgid "Actions" +msgstr "Handlinger" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datoer:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Tilføj" + +# Bøjning ... ? +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Udløb" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Undernøgler" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Underordnet" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Fingeraftryk:" +msgid "Fully" +msgstr "Fuldt" +# "This level of trust should only be assigned to your own keys", står der i dokumentationen, så ultimativ må være en nogenlunde oversættelse #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Angiv tillid:" +msgid "Ultimately" +msgstr "Ultimativt" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Din tillid til denne nøgle" +msgid "Encrypt files and email to the key's owner" +msgstr "Kryptér filer og e-post til nøglens ejer" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Offentlig PGP-nøgle" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Andre navne:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Personer som har underskrevet denne nøgle:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Kryptér filer og e-post til nøglens ejer " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Din tillid til denne nøgle" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Fuldt" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Din tillid angives manuelt på Detaljer-fanebladet." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Jeg stoler på underskrifter fra \"%s\" på andre nøgler" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1622,7 +1844,11 @@ "Hvis du tror at personen \"%s\" er denne nøgles ejer, så underskriv " "denne nøgle:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Underskriv denne nøgle" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1630,44 +1856,38 @@ "Hvis du ikke længere stoler på at \"%s\" ejer denne nøgle, så " "tilbagekald din underskrift:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Underordnet" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Offentlig PGP-nøgle" +msgid "_Revoke Signature" +msgstr "_Tilbagekald underskrift" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Personer som har underskrevet denne nøgle:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Vis _kun underskrifter fra personer jeg stoler på" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Tillid" -# "This level of trust should only be assigned to your own keys", står der i dokumentationen, så ultimativ må være en nogenlunde oversættelse -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Ultimativt" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Du _stoler på ejeren:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Din tillid angives manuelt på Detaljer-fanebladet." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Fingeraftryk:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Vis _kun underskrifter fra personer jeg stoler på" +msgid "Dates:" +msgstr "Datoer:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Tilbagekald underskrift" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Angiv tillid:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Underskriv denne nøgle" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Du _stoler på ejeren:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1675,55 +1895,61 @@ msgstr "Undernøgle %d af %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Valgfri beskrivelse af tilbagekaldelse" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Tilbage_kald" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Grund for tilbagekaldelse af nøglen" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Grund:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Valgfri beskrivelse af tilbagekaldelse" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Tilbage_kald" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Du har ingen personlige PGP-nøgler der kan bruges til at underskrive et " "dokument eller en meddelelse." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Underskriv meddelelse med nøgle:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Hvor grundigt har du kontrolleret denne nøgle?" +msgid "Sign Key" +msgstr "Underskriv nøgle" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Hvordan andre vil se denne underskrift:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Ved underskrift udtrykker du din tillid til at denne nøgle tilhører:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Underskriv nøgle som:" +msgid "Key Name" +msgstr "Nøglenavn" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Uformelt: betyder at du har foretaget en uformel verificering af at " -"nøglen ejes af personen der påstår at eje den. For eksempel kunne du oplæse " -"nøglens fingeraftryk til ejeren over telefon. " +msgid "How carefully have you checked this key?" +msgstr "Hvor grundigt har du kontrolleret denne nøgle?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nøglenavn" +msgid "_Not at all" +msgstr "_Overhovedet ikke" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Uformelt" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Meget omhyggeligt" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1732,7 +1958,17 @@ "påstår at eje den, men du ikke kunne eller af anden årsag ikke har " "verificere udsagnet." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Uformelt: betyder at du har foretaget en uformel verificering af at " +"nøglen ejes af personen der påstår at eje den. For eksempel kunne du oplæse " +"nøglens fingeraftryk til ejeren over telefon." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1740,18 +1976,6 @@ "Meget omhyggeligt: Vælg kun denne hvis du er absolut sikker på at " "denne nøgle er ægte." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Ved underskrift udtrykker du din tillid til at denne nøgle tilhører:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Jeg kan _tilbagekalde denne underskrift på et senere tidspunkt." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Underskriv nøgle" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1763,483 +1987,356 @@ "også have brugt e-post til at kontrollere at e-postadressen tilhører ejeren." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Uformelt" +msgid "How others will see this signature:" +msgstr "Hvordan andre vil se denne underskrift:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Overhovedet ikke" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Andre må ikke se denne underskrift" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Jeg kan _tilbagekalde denne underskrift på et senere tidspunkt." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Underskriv" +msgid "Sign key as:" +msgstr "Underskriv nøgle som:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Underskriver:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Meget omhyggeligt" +msgid "_Sign" +msgstr "_Underskriv" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Underskriv meddelelse med nøgle:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Eksporterer data" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Henter data" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importerer data" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Sender data" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Utilgængelig" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Personligt certifikat og nøgle" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Personligt certifikat" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certifikat" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certifikater (DER-kodet)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certifikater" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509-certifikater og relaterede nøgler" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Er du sikker på at du vil slette %d certifikat permanent?" +msgstr[1] "Er du sikker på at du vil slette %d certifikater permanent?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Kunne ikke generere privat nøgle" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Opret" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Privat nøgle" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Bruges til at forespørge om et certifikat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Opret en ny privat nøgle" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Mærkat:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Gemt i:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Jeg forstår at denne nøgle vil blive slettet permanent." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Unavngivet" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Kunne ikke eksportere certifikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Kunne ikke slette" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Er du sikker på at du vil slette certifikatet \"%s\"?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Er du sikker på at du vil slette %d certifikat?" -msgstr[1] "Er du sikker på at du vil slette %d certifikater?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Sletter" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Eksportér" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Eksportér certifikatet" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Slet dette certifikat eller denne nøgle" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Forespørg om _certifikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Opret en certifikatforespørgselsfil for denne nøgle" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Kunne ikke gemme certifikatforespørgsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Gem certifikatforespørgsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Certifikatforespørgsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM-kodet forespørgsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Kunne ikke oprette certifikatforespørgsel" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Opret en certifikatforespørgselsfil." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Det fælles navn (CN) placeret i certifikatforespørgslen." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Navn (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Unavngivet privat nøgle" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Ændr adgangsfrase" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Bekræft adgangsfrase:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Bekræft ny adgangsfrase" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "Ny _adgangsfrase:" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Håndtér dine kodeord og krypteringsnøgler" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Kodeord og nøgler" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Vælg typen af element, du vil oprette:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Fortsæt" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Opret ny ..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Markerede %d nøgle" -msgstr[1] "Markerede %d nøgler" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Kunne ikke importere nøgler" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importerede nøgler" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importerer nøgler" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importér nøgle" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Ukendt nøgletype eller ugyldigt dataformat" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importerer nøgler" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Fjern" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Luk dette program" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Ny..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Opret ny nøgle eller element" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importér..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importér fra en fil" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importér fra udklipsholderen" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Find fjerne nøgler..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Søg efter nøgler på en nøgleserver" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "S_ynkronisér og offentliggør nøgler..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Offentliggør og/eller synkronisér dine nøgler med andre på nettet." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_yper" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Vis typekolonnen" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Udløb" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Vis udløbskolonnen" - -# verb. vs. subst. -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Tillid" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Vis ejertillids-kolonnen" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Gyldighed" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Vis gyldighedskolonnen" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filter:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Førstegangsindstillinger:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Generér en ny nøgle til dig selv: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importér eksisterende nøgler fra en fil:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Mine _personlige nøgler" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Andre _nøgler" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "For at kunne benytte kryptering har du brug for nøgler." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importér" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Kodeord" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Kunne ikke eksportere nøgler" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Gyldighed" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Udløbsdato" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Luk dette vindue" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Udfold alle" - -# Gad vide hvad dette refererer til. -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Udfold alle kataloger" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Sammenfold alle" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Sammenfold alle kataloger" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Fjerne nøgler" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Fjerne nøgler indeholdende \"%s\"" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Nøgleservere:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Delte nøgler nær mig:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Find fjerne nøgler" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Dette vil finde andres nøgler på Internet. Disse nøgler kan så importeres " -"til din lokale nøglering." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Sted for søgning:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Søg" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Søg efter nøgler indeholdende: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Kunne ikke offentliggøre nøgler til serveren" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Kunne ikke hente nøgler fra serveren: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d nøgle markeret til synkronisering" -msgstr[1] "%d nøgler markeret til synkronisering" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Synkroniserer nøgler..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Synkronisér nøgler" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Dette vil offentliggøre nøglerne i din nøglering så de er tilgængelige for " -"andre. Du vil også modtage de ændringer som andre har foretaget siden du " -"modtog deres nøgler." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Dette vil hente de ændringer som andre har foretaget siden du modtog deres " -"nøgler. Ingen nøgleserver er valgt til offentliggørelse, så dine nøgler vil " -"ikke blive offentliggjort for andre." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Nøgleservere" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Synkronisér" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Version af dette program" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Bekræft ny adgangsfrase" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Bidrag:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "_Bekræft adgangsfrase:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Ask Hjorth Larsen\n" -"Birger Langkjer\n" -"\n" -"Dansk-gruppen \"\n" -"Mere info: http://www.dansk-gruppen.dk" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Håndtér dine kodeord og krypteringsnøgler" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse projekthjemmeside" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Fortsæt" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fil" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Vælg typen af element, du vil oprette:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Redigér" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Import mislykkedes" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importér" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Data til import:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Vis" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importér nøgle" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Hjælp" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Alle nøglefiler" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Indstillinger" +# ? +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Droppet tekst" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Tekst i udklipsholder" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Ny" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Ændr indstillinger for dette program" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Luk dette program" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Om dette program" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Ny..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Indhold" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Opret ny nøgle eller element" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Vis Seahorse-hjælp" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Tilføj ny nøgle eller nyt element" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Eksportér offentlig nøgle" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importér..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Eksporterer nøgler" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importér fra en fil" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Kunne ikke hente data fra nøgleserveren" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importér fra udklipsholderen" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Kopierede nøgler" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Efter _nøglering" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Vis sidebjælke med nøgleringsoversigt" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Vis _personlige" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Vis kun personlige nøgler, certifikater og adgangskoder" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Vis _betroede" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Vis kun betroede nøgler, certifikater og adgangskoder" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Vis _alle" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Vis alle nøgler, certifikater og adgangskoder" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filter" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Henter nøgler" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Førstegangsindstillinger:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s er en privat nøgle. Er du sikker på at du vil fortsætte?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Generér en ny nøgle til dig selv: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importerer nøgler fra nøgleservere" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importér eksisterende nøgler fra en fil:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Vis egenskaber" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "For at kunne benytte kryptering har du brug for nøgler." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Slet" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Kunne ikke låse" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Kunne ikke låse op" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Slet markerede elementer" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Lås" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_ksportér..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Lås op" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Eksportér til en fil" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Egenskaber" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopiér til udklipsholderen" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Konfigurér nøgle til _Secure Shell..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importér markerede nøgler til lokal nøglering" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Send offentlig SSH-nøgle til en anden maskine og tillad indlogning ved hjælp " +"af den nøgle." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2268,200 +2365,221 @@ msgid "Enter the new passphrase again: %s" msgstr "Skriv den nye adgangsfrase igen: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Konfigurér nøgle til _Secure Shell..." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" msgstr "" -"Send offentlig SSH-nøgle til en anden maskine og tillad indlogning ved hjælp " -"af den nøgle." +"Nøgler, der bruges til at etablere sikre forbindelser til andre computere" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Er du sikker på at du vil slette ssh-nøglen \"%s\"?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Er du sikker på at du vil slette %d ssh-nøgler?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Er du sikker på at du vil slette %d ssh-nøgle?" +msgstr[1] "Er du sikker på at du vil slette %d ssh-nøgler?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ssh-nøgle" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Hemmelige SSH-nøgler" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Offentlige SSH-nøgler" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Der er ingen tilgængelig offentlig nøglefil for denne nøgle." -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Kunne ikke slette nøgle" - -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "SSH-nøgle" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Bruges til at forbinde til andre computere (f.eks. via en terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Kunne ikke generere Secure Shell-nøgle" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Genererer SSH-nøgle" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Brug din e-postadresse og enhver anden påmindelse du har brug for, til at " -"se hvad denne nøgle er beregnet til." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"En Secure Shell- (SSH-) nøgle lader dig forbinde sikkert til computere du " -"har tillid til via SSH, uden at der skal indtastes forskellige kodeord for " -"hver." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Hvis der allerede er en computer du vil bruge denne nøgle med, så kan du " -"sætte den computer op til at genkende din nøgle nu. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Ny SSH-nøgle" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "Opret _kun nøgle" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Opret og konfigurér" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "Opret _kun nøgle" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"En Secure Shell-nøgle (SSH-nøgle) lader dig forbinde sikkert til andre " +"computere." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Din e-post-adresse, eller en påmindelse om hvad nøglen er beregnet til." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Nøglebeskrivelse:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Hvis der er en computer, du vil bruge denne nøgle med, kan du sætte den " +"computer op til at genkende din nye nøgle." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Ulæselig SSH-nøgle)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Personlig SSH-nøgle" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH-nøgle" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Kunne ikke omdøbe nøgle." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Kunne ikke ændre autorisering af nøglen." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Kunne ikke ændre adgangsfrase for nøglen." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritme:" - # Bedre oversættelse af identifier? -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Kendetegn:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Placering:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Navn:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Styrke:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Bruges til at forbinde til andre computere." # Verbum eller substantiv? -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Tillid" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"Ejeren af denne nøgle har _rettigheder til at forbinde til denne computer" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Dette gælder kun for \"%s\"-kontoen." +msgid "This only applies to the %s account." +msgstr "Dette gælder kun for \"%s\"-kontoen." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "Eks_portér fuldstændig nøgle" +msgid "Algorithm:" +msgstr "Algoritme:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"Ejeren af denne nøgle har _rettigheder til at forbinde til denne computer" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Styrke:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Placering:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Bruges til at forbinde til andre computere." +msgid "E_xport Complete Key" +msgstr "Eks_portér fuldstændig nøgle" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH-kommandoen blev uventet afbrudt." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH-kommandoen slog fejl." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" -msgstr "Adgangskode for fjern vært" +msgstr "Adgangskode for ekstern vært" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Skriv nøgleadgangsfrase" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Adgangsfrase til ny SSH-nøgle" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importerer nøgle: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importerer nøgle. Skriv adgangsfrase" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH-nøgler" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Ingen privat nøglefil er tilgængelig for denne nøgle." #: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "Kunne ikke konfigurere SSH-nøgler på den fjerne computer." +msgstr "Kunne ikke konfigurere SSH-nøgler på den eksterne computer." #: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." msgstr "Konfigurerer SSH-nøgler..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "f.eks.: filserver.eksempel.dk:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Konfigurér computeren til SSH-forbindelser" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2469,6 +2587,10 @@ "For at bruge din SSH-nøgle med en anden computer der bruger SSH, skal du " "allerede have en brugerkonto på den computer." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "f.eks.: filserver.eksempel.dk:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Computernavn:" @@ -2481,15 +2603,203 @@ msgid "_Set Up" msgstr "_Konfigurér" +#~ msgid "Login keyring" +#~ msgstr "Logind-nøglering" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Adgang til nøgleringen blev nægtet" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Dæmonen gnome-keyring kører ikke" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Nøgleringen er allerede blevet låst op" + +#~ msgid "No such key ring exists" +#~ msgstr "Ingen sådan nøglering findes" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Kunne ikke kommunikere med nøgleringsdæmon" + +#~ msgid "The item already exists" +#~ msgstr "Objektet findes allerede" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Intern fejl i adgang til gnome-keyring" + +#~ msgid "Algorithms here" +#~ msgstr "Algoritmer her" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Sletter element" +#~ msgstr[1] "Sletter elementer" + +#~ msgid "Passwords: %s" +#~ msgstr "Adgangskoder: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Adgangskoder: %s" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "Kunne ikke låse nøglering" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Lås nøgleringen til lagring af adgangskoder, således at en " +#~ "hovedadgangskode kræves for at låse den op." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Lås nøgleringen til lagring af adgangskoder op med en hovedadgangskode, " +#~ "således at den er klar til brug." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Kunne ikke slette nøglering" + +#~ msgid "Archive files" +#~ msgstr "Arkivfiler" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "En fil med dette navn findes allerede.\n" +#~ "\n" +#~ "Vil du erstatte den med en ny fil?" + +#~ msgid "_Replace" +#~ msgstr "_Erstat" + +#~ msgid "_Sign Key..." +#~ msgstr "_Underskriv nøgle..." + +#~ msgid "Sign public key" +#~ msgstr "Underskriv offentlig nøgle" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Er du sikker på at du vil slette %d nøgler og identiteter permanent?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Kunne ikke slette offentlig nøgle" + +#~ msgid "New PGP Key" +#~ msgstr "Ny PGP-nøgle" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Kunne ikke eksportere nøgle til \"%s\"" + +#~ msgid "Export Complete Key" +#~ msgstr "Eksportér fuldstændig nøgle" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Er du sikker på at du vil slette certifikatet \"%s\"?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Er du sikker på at du vil slette %d certifikat?" +#~ msgstr[1] "Er du sikker på at du vil slette %d certifikater?" + +#~ msgid "Deleting" +#~ msgstr "Sletter" + +#~ msgid "Create New ..." +#~ msgstr "Opret ny ..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Markerede %d nøgle" +#~ msgstr[1] "Markerede %d nøgler" + +#~ msgid "Importing keys" +#~ msgstr "Importerer nøgler" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Ukendt nøgletype eller ugyldigt dataformat" + +#~ msgid "Importing Keys" +#~ msgstr "Importerer nøgler" + +#~ msgid "T_ypes" +#~ msgstr "T_yper" + +#~ msgid "Show type column" +#~ msgstr "Vis typekolonnen" + +#~ msgid "_Expiry" +#~ msgstr "_Udløb" + +#~ msgid "Show expiry column" +#~ msgstr "Vis udløbskolonnen" + +# verb. vs. subst. +#~ msgid "_Trust" +#~ msgstr "_Tillid" + +#~ msgid "Show owner trust column" +#~ msgstr "Vis ejertillids-kolonnen" + +#~ msgid "_Validity" +#~ msgstr "_Gyldighed" + +#~ msgid "Show validity column" +#~ msgstr "Vis gyldighedskolonnen" + +#~ msgid "Other _Keys" +#~ msgstr "Andre _nøgler" + +#~ msgid "Validity" +#~ msgstr "Gyldighed" + +#~ msgid "Expiration Date" +#~ msgstr "Udløbsdato" + +#~ msgid "_Expand All" +#~ msgstr "_Udfold alle" + +# Gad vide hvad dette refererer til. +#~ msgid "Expand all listings" +#~ msgstr "Udfold alle kataloger" + +#~ msgid "_Collapse All" +#~ msgstr "_Sammenfold alle" + +#~ msgid "Collapse all listings" +#~ msgstr "Sammenfold alle kataloger" + +#~ msgid "Export public key" +#~ msgstr "Eksportér offentlig nøgle" + +#~ msgid "Exporting keys" +#~ msgstr "Eksporterer nøgler" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Kunne ikke hente data fra nøgleserveren" + +#~ msgid "Retrieving keys" +#~ msgstr "Henter nøgler" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s er en privat nøgle. Er du sikker på at du vil fortsætte?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Kunne ikke slette nøgle" + +#~ msgid "_Key Description:" +#~ msgstr "_Nøglebeskrivelse:" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "Kør ikke seahorse-daemon som dæmon" #~ msgid "couldn't fork process" #~ msgstr "kunne ikke forgrene proces" -#~ msgid "couldn't create new process group" -#~ msgstr "kunne ikke oprette ny procesgruppe" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Krypteringdæmon (Seahorse)" @@ -2547,9 +2857,6 @@ #~ msgid "Bad Signature" #~ msgstr "Ugyldig underskrift" -#~ msgid "Couldn't verify signature." -#~ msgstr "Kunne ikke verificere underskrift." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Ugyldig eller ukendt underskriver: %s" @@ -2746,9 +3053,6 @@ #~ msgid "Web Password" #~ msgstr "Internetadgangskode" -#~ msgid "Network Password" -#~ msgstr "Netværksadgangskode" - #~ msgid "Couldn't set application access." #~ msgstr "Kunne ikke indstille programadgang." @@ -2867,12 +3171,6 @@ #~ msgid "Symmetric Key" #~ msgstr "Symmetrisk nøgle" -#~ msgid "Public Key" -#~ msgstr "Offentlig nøgle" - -#~ msgid "Private Key" -#~ msgstr "Privat nøgle" - #~ msgid "Credentials" #~ msgstr "Akkreditiver" @@ -2896,9 +3194,6 @@ #~ msgid "Loading Keys..." #~ msgstr "Indlæser nøgler..." -#~ msgid "Searching for keys..." -#~ msgstr "Søger efter nøgler..." - #~ msgid "Uploading keys..." #~ msgstr "Lægger nøgler op..." @@ -2923,12 +3218,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "Synkroniserer nøgler" -#~ msgid "Encryption Key Manager" -#~ msgstr "Krypteringsnøgle-håndtering" - -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "Ugyldig" @@ -2938,9 +3227,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "Offentlig SSH-nøgle" -#~ msgid "Secure Shell key" -#~ msgstr "SSH-nøgle" - #~ msgid "Passphrase:" #~ msgstr "Adgangsfrase:" @@ -3034,18 +3320,12 @@ #~ msgid "_About" #~ msgstr "_Om" -#~ msgid "P_roperties" -#~ msgstr "_Egenskaber" - #~ msgid "_Copy" #~ msgstr "_Kopiér" #~ msgid "Removing item" #~ msgstr "Fjerner objekt" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "Låses automatisk op når brugeren logger ind." - #~ msgid "Couldn't get default password keyring" #~ msgstr "Kunne ikke hente standardkodeords-nøglering" @@ -3100,9 +3380,6 @@ #~ msgid "_Quit" #~ msgstr "_Afslut" -#~ msgid "Create a new personal key" -#~ msgstr "Opret en ny personlig nøgle" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "Importér nøgler til din nøglering fra en fil" @@ -3287,9 +3564,6 @@ #~ msgid "Signing Failed" #~ msgstr "Underskrift mislykkedes" -#~ msgid "Import Failed" -#~ msgstr "Import fejlede" - #~ msgid "Keys were found but not imported." #~ msgstr "Nøgler blev fundet men ikke importeret." @@ -3343,9 +3617,6 @@ #~ msgid "No encrypted or signed text is selected." #~ msgstr "Ingen krypteret eller underskrevet tekst er markeret." -#~ msgid "Decrypted text" -#~ msgstr "Dekrypteret tekst" - #~ msgid "Verified text" #~ msgstr "Verificeret tekst" @@ -3439,9 +3710,6 @@ #~ msgid "Choose Recipients" #~ msgstr "Vælg modtagere" -#~ msgid "Couldn't load keys" -#~ msgstr "Kunne ikke hente nøgler" - #~ msgid "Choose Encrypted File Name for '%s'" #~ msgstr "Vælg krypteret filnavn for \"%s\"" diff -Nru seahorse-3.2.2/po/de.po seahorse-3.6.3/po/de.po --- seahorse-3.2.2/po/de.po 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/de.po 2012-09-18 13:10:35.000000000 +0200 @@ -3,20 +3,21 @@ # Tim Bordemann , 2007. # Henrik Kröger , 2007. # Philipp Kerling , 2008. -# Mario Blättermann , 2008-2011. +# Mario Blättermann , 2008-2012. # Hendrik Richter , 2008. -# Christian Kirbach , 2009, 2010. -# Paul Seyfert , 2011. +# Christian Kirbach , 2009, 2010, 2012. +# Paul Seyfert , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-16 22:22+0100\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2012-09-01 00:33+0000\n" +"PO-Revision-Date: 2012-09-01 11:29+0100\n" +"Last-Translator: Paul Seyfert \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,10 +30,6 @@ msgstr "Passwort-Schlüsselbund hinzufügen" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Name des neuen Schlüsselbunds:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -40,307 +37,297 @@ "Bitte wählen Sie einen Namen für den neuen Schlüsselbund. Sie werden dann " "nach einem Entsperrpasswort gefragt." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Name des neuen Schlüsselbunds:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Rechnername oder Adresse des Servers." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Schüsselbund konnte nicht hinzugefügt werden" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Neuer Passwort-Schüsselbund" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Wird zur Speicherung von Netzwerk- und Anwendungspasswörtern verwendet" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Neues Passwort …" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Ein Passwort oder Geheimnis sicher verwahren." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Passwort-Schüsselbund" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Gespeichertes Passwort" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Das Standard-Schlüsselbund konnte nicht gesetzt werden" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Das Schüsselbund-Passwort konnte nicht geändert werden" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "Zur _Vorgabe machen" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Anwendungen speichern üblicherweise neue Passwörter im Standard-" +"Schlüsselbund." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "_Passwort ändern" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Ändern Sie das Passwort zum Entsperren des Passwort-Schlüsselbundes." + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Eintrag konnte nicht hinzugefügt werden" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Passwort hinzufügen" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Beschreibung:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Schlüsselbund:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Passwort:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Pass_wort zeigen" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Eintrag konnte nicht gelöscht werden" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Schlüsselbund:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Schüsselbund konnte nicht hinzugefügt werden" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Passwörter" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Gespeicherte persönliche Passwörter, Zugangsdaten und Geheimnisse" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Sofortnachrichten-Passwort für" -#: ../gkr/seahorse-gkr-item-commands.c:100 +# CHECK: Grammatik OK? +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Passwort oder Geheimnis" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Netzwerk-Passwort" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Gespeicherte Notiz" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Schüsselbund-Passwort" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Verschlüsselungs-Passwort" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Passwort zum Speichern von Schlüsseln" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Passwort für Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Passwort für GNOME-Online-Konten" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy-Passwort" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Passwort für Sofortnachrichten" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Geheimnis der Netzwerkverwaltung" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Sind Sie sicher, dass Sie das Passwort »%s« löschen wollen?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Sind Sie sicher, dass Sie %d Passwort löschen wollen?" msgstr[1] "Sind Sie sicher, dass Sie %d Passwörter löschen wollen?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Eintrag wird gelöscht" -msgstr[1] "Einträge werden gelöscht" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Zugriff auf eine Netzwerkfreigabe oder Ressource" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Zugriff auf eine Webseite" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Entsperrt einen PGP-Schlüssel" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Entsperrt einen SSH-Schlüssel" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Gespeicherte(s) Passwort oder Benutzerkennung" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Netzwerk-Anmeldedaten" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Passwort" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Das Passwort konnte nicht geändert werden." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Passwort wird aktualisiert" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Die Beschreibung konnte nicht gespeichert werden." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Passwort:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Technische Details:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Details" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Schlüssel-Eigenschaften" -#: ../gkr/seahorse-gkr-item-properties.xml.h:4 ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Schlüssel" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 +msgid "Use:" +msgstr "Verwendung:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Schlüssel-Eigenschaften" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Typ:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Anmeldename:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Anmeldename:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Pass_wort zeigen" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Typ:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Verwendung:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Passwörter: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Passwörter: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Passwort-Schüsselbund" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Wird zur Speicherung von Netzwerk- und Anwendungspasswörtern verwendet" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Gespeichertes Passwort" - -# CHECK: Grammatik OK? -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Ein Passwort oder Geheimnis sicher verwahren." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Schüsselbund konnte nicht entsperrt werden" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Schüsselbund konnte nicht gesperrt werden" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Das Standard-Schlüsselbund konnte nicht gesetzt werden" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Das Schüsselbund-Passwort konnte nicht geändert werden" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Sperren" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Sperren Sie den Passwort-Schlüsselbund mit einem Hauptpasswort, so dass ein " -"Passwort zum Entsperren nötig ist." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Entsperren" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is available " -"for use." -msgstr "" -"Ensperren Sie den Passwort-Schlüsselbund mit einem Hauptpasswort, so dass er " -"verfügbar wird." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "Zur _Vorgabe machen" +msgid "Password:" +msgstr "Passwort:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Anwendungen speichern üblicherweise neue Passwörter im Standard-Schlüsselbund." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Schlüssel" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "_Passwort ändern" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Technische Details:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Ändern Sie das Passwort zum Entsperren des Passwort-Schlüsselbundes." +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Details" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Schlüsselbund konnte nicht gelöscht werden." +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Ein Schlüsselbund, der bei der Anmeldung automatisch entsperrt wird" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Ein Schlüsselbund zum Speichern von Passwörtern" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "" "Sind Sie sicher, dass Sie den Passwort-Schlüsselbund »%s« löschen wollen?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Schlüsselbund wird gelöscht" -msgstr[1] "Schlüsselbünde werden gelöscht" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Mir ist bewusst, dass alle Einträge unwiderruflich gelöscht werden." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Schlüsselbund-Eigenschaften" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Name:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Erzeugt am:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Schlüsselbund" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Schlüsselbund-Eigenschaften" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Name:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Der Vorgang wurde abgebrochen" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Der Zugriff auf den Schlüsselbund wurde verweigert." - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Der Schlüsselbund-Dienst läuft nicht." - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Der Schlüsselbund wurde bereits entsperrt" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Ein solcher Schlüsselbund existiert nicht." - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Kommunikation mit dem Schlüsselbund-Dienst ist gescheitert." - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Der Eintrag existiert bereits." - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Interner Fehler beim Zugriff auf den Gnome-Schlüsselbund." - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Flags anzeigen " @@ -601,268 +588,332 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "initiales zwischengespeichertes Objekt" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Schlüssel-Server hinzufügen" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Rechner:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Typ des Schlüsselservers:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Rechner:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Der Port, über den der Server erreicht werden kann" +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "initiales zwischengespeichertes Objekt" +msgid "The port to access the server on." +msgstr "Der Port, über den der Server erreicht werden kann" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Kennwort" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Version dieser Anwendung" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Passwort:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Systemeinstellungen" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Wiederholung:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Mitwirkende:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Die Adresse des Schlüssel-Servers ist ungültig." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Passwörter und Verschlüsselung" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Für Hilfe kontaktieren Sie den Systemadministrator oder den Administrator des " -"Schlüssel-Servers." +"Christian Meyer \n" +"Martin Bretschneider \n" +"Manuel Borchers \n" +"Henrik Kröger \n" +"Tim Bordemann \n" +"Philipp Kerling \n" +"Mario Blättermann \n" +"Paul Seyfert " -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "Adresse" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse-Projektwebseite" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Benutzerdefiniert" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Löschen ist gescheitert" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Keiner: Schlüssel nicht veröffentlichen" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Schlüssel konnte nicht exportiert werden." -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Schlüssel _automatisch von den Schlüssel-Servern abrufen" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Daten konnten nicht exportiert werden" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "_Veränderte Schlüssel automatisch mit den Schlüssel-Servern abgleichen" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Datei" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Schlüssel-Server" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xportieren …" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "In eine Datei exportieren" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Bearbeiten" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "In die Zwischenablage kopieren" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Löschen" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Ausgewählte Einträge löschen" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Eigenschaften dieses Eintrags anzeigen" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Eigenschaften dieses Schlüsselbunds anzeigen" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Einstellu_ngen" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Programmeinstellungen ändern" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Ansicht" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Hilfe" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Über dieses Programm" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Inhalt" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Hilfe zu Seahorse anzeigen" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exportieren" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Geben Sie die PIN oder das Passwort ein für: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Passwort:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Wiederholung:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Die Adresse des Schlüssel-Servers ist ungültig." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Für Hilfe kontaktieren Sie den Systemadministrator oder den Administrator " +"des Schlüssel-Servers." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "Adresse" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Benutzerdefiniert" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Keiner: Schlüssel nicht veröffentlichen" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Einstellungen" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "Schlüssel _suchen über:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "Schlüssel _veröffentlichen auf:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Daten werden empfangen" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Daten werden exportiert" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Daten werden importiert" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Schlüssel _automatisch von den Schlüssel-Servern abrufen" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Daten werden gesendet" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "_Veränderte Schlüssel automatisch mit den Schlüssel-Servern abgleichen" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Nicht verfügbar" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Schlüssel-Server" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d.%m.%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Schlüsseldaten" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Mehrere Schlüssel" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Schlüsseldateien" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Alle Dateien" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Archivdateien" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Eine Datei mit diesem Namen existiert bereits.\n" -"\n" -"Möchten Sie diese Datei durch eine neue Datei ersetzen?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Ersetzen" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Unbekannt" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nie" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Geringfügig" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Vollkommen" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Absolut" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Deaktiviert" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Widerrufen" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Die Hilfe konnte nicht aufgerufen werden: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Ablaufdatum:" +msgid "Never E_xpires" +msgstr "_Läuft nie ab" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Einen neuen Unterschlüssel erzeugen" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Wenn der Schlüssel nie abläuft" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Schlüssel-_Typ:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Schlüssel_länge:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Schlüssel-_Typ:" +msgid "Expiration Date:" +msgstr "Ablaufdatum:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Länge des Schlüssels" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "_Läuft nie ab" +msgid "Generate a new subkey" +msgstr "Einen neuen Unterschlüssel erzeugen" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Benutzerkennung hinzufügen" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Neue Benutzerkennung anlegen" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Vollständiger _Name:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Ko_mmentar:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Muss mindestens 5 Zeichen umfassen." -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Optionale E-Mail-Adresse" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Optionaler Kommentar, der den Schlüssel beschreibt" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Optionale E-Mail-Adresse" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Vollständiger _Name:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_E-Mail-Adresse:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Ko_mmentar:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Neue Benutzerkennung anlegen" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Ä_ndern" +msgid "_Never expires" +msgstr "Läuft _nie ab" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Schlüssel widerrufen" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "Läuft _nie ab" +msgid "C_hange" +msgstr "Ä_ndern" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -873,7 +924,7 @@ msgid "Add subkey to %s" msgstr "Unterschlüssel zu %s hinzufügen" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (nur signieren)" @@ -881,7 +932,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (nur verschlüsseln)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (nur signieren)" @@ -904,6 +955,11 @@ "Die Entschlüsselung ist gescheitert. Vermutlich fehlt Ihnen der dazugehörige " "Schlüssel." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Der Vorgang wurde abgebrochen" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Ungültiges Ablaufdatum" @@ -921,48 +977,154 @@ msgid "Expiry: %s" msgstr "Ablaufdatum: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Mehrere Schlüssel" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Schlüsseldaten" + +# Gemeint ist wohl hier die Beschränkung ds Schlüsselcodes auf ASCII-Zeichen +# If enabled, it causes PGP to emit ciphertext or keys in ASCII Radix-64 format suitable for transporting through E-mail channels. +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "E-Mail-sichere PGP-Schlüssel" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP-Schlüssel" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP-Schlüssel" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Wird verwendet, um E-Mails und Dateien zu verschlüsseln" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA & ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Der PGP-Schlüssel konnte nicht erzeugt werden" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Kennwort des neuen PGP-Schlüssels" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Geben Sie das Kennwort des neuen Schlüssels zweimal ein." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Beim Erstellen eines neuen Schlüssels müssen viele\n" +"Zufallszahlen erzeugt werden, wofür Ihre Mithilfe\n" +"erforderlich ist. Es ist hilfreich, wenn Sie den Computer\n" +"anderweitig benutzen, z.B. auf der Tastatur tippen, die\n" +"Maus bewegen oder andere Anwendungen benutzen.\n" +"Dies erzeugt die notwendigen Zufallszahlen." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Schlüssel wird erstellt" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Sind Sie sicher, dass Sie »%s« unwiderruflich löschen wollen?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "" +"Sind Sie sicher, dass Sie %d Schlüssel unwiderruflich löschen wollen?" +msgstr[1] "" +"Sind Sie sicher, dass Sie %d Schlüssel unwiderruflich löschen wollen?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Falsches Passwort" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Dies war das dritte Mal, dass Sie ein falsches Passwort eingegeben haben. " "Bitte versuchen Sie es erneut." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Falsches Kennwort" + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Geben Sie ein neues Kennwort für »%s« ein." + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Geben Sie das Kennwort für »%s« ein." + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Geben Sie ein neues Kennwort ein." + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Geben Sie das Kennwort ein." + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Kennwort" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d Schlüssel geladen." +msgstr[1] "%d Schlüssel geladen." + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Ungültige Schlüsseldaten (Benutzerkennungen fehlen). Dies kann auf einen " +"Rechner, dessen Systemdatum in der Zukunft liegt oder auf eine fehlende " +"Selbstsignatur zurückzuführen sein." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG-Schlüssel" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: Vorgegebener Ordner für den Schlüsselbund" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -983,8 +1145,8 @@ #: ../pgp/seahorse-gpgme-photos.c:128 #, c-format msgid "" -"This is not a image file, or an unrecognized kind of image file. Try to use a " -"JPEG image." +"This is not a image file, or an unrecognized kind of image file. Try to use " +"a JPEG image." msgstr "" "Dies ist entweder keine Bilddatei oder eine in einem unbekannten Format. " "Versuchen Sie eine JPEG-Bilddatei zu verwenden." @@ -997,29 +1159,33 @@ msgid "All JPEG files" msgstr "JPEG-Dateien" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Alle Dateien" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Wählen Sie ein Foto aus, um es zum Schlüssel hinzuzufügen." -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Foto konnte nicht vorbereitet werden" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Foto konnte nicht hinzugefügt werden." -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "Die Datei konnte nicht geladen werden. Möglicherweise liegt sie in einem " "ungültigen Format vor." -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Sind Sie sicher, das derzeitige Foto aus dem Schlüssel zu löschen?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Foto konnte nicht gelöscht werden." @@ -1067,8 +1233,8 @@ #: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" -"You are about to add %s as a revoker for %s. This operation cannot be undone! " -"Are you sure you want to continue?" +"You are about to add %s as a revoker for %s. This operation cannot be " +"undone! Are you sure you want to continue?" msgstr "" "Sie sind dabei, %s die Möglichkeit einzuräumen, %s zu widerrufen. Dies kann " "nicht rückgängig gemacht werden. Sind Sie sicher?" @@ -1079,7 +1245,11 @@ "Die Berechtigung, den Schlüssel zu widerrufen, konnte nicht hinzugefügt " "werden." -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Mir ist bewusst, dass dieses Geheimnis unwiderruflich gelöscht wird." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1094,531 +1264,593 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Keine Schlüssel zum Signieren nutzbar" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" -"You have no personal PGP keys that can be used to indicate your trust of this " -"key." +"You have no personal PGP keys that can be used to indicate your trust of " +"this key." msgstr "" "Sie besitzen keine PGP-Schlüssel, die dazu genutzt werden könnten, Ihr " "Vertrauen in diesen Schlüssel anzugeben." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Falsches Kennwort" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Geben Sie ein neues Kennwort für »%s« ein." - -#: ../pgp/seahorse-gpgme-source.c:92 +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Die Eingabe war nicht genau genug. Der Server »%s« hat zu viele Schlüssel " +"gefunden." + +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Geben Sie das Kennwort für »%s« ein." +msgid "Couldn't communicate with server '%s': %s" +msgstr "Verbindung mit Server »%s« gescheitert: %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Geben Sie ein neues Kennwort ein." +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP-Schlüssel-Server" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Geben Sie das Kennwort ein." +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Schlüssel konnten nicht importiert werden." + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Schlüssel vom Schlüssel-Server importieren" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Entfernt" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Fenster schließen" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "Entfernte Schlüssel _suchen …" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Schlüssel über einen Schlüssel-Server suchen" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importieren" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Ausgewählte Schlüssel in den Schlüsselbund importieren" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Entfernte Schlüssel" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d Schlüssel geladen." -msgstr[1] "%d Schlüssel geladen." +msgid "Remote Keys Containing '%s'" +msgstr "Entfernte Schlüssel, die »%s« enthalten" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Die Suche nach Schlüsseln ist fehlgeschlagen. " -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Entfernte Schlüssel suchen" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Ungültige Schlüsseldaten (Benutzerkennungen fehlen). Dies kann auf einen " -"Rechner, dessen Systemdatum in der Zukunft liegt oder auf eine fehlende " -"Selbstsignatur zurückzuführen sein." +"Hier können Sie über das Internet nach fremden Schlüsseln suchen. Diese " +"können anschließend in Ihren Schlüsselbund importiert werden." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Suche nach: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP-Schlüssel-Server" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Schlüssel-Server:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Freigegebene Schlüssel in meiner Nähe:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Suchort: " + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Suche" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Schlüssel konnte nicht zum Server übertragen werden" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Die Eingabe war nicht genau genug. Der Server »%s« hat zu viele Schlüssel " -"gefunden." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Schlüssel konnte nicht vom Server abgerufen werden: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Verbindung mit Server »%s« gescheitert: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d Schlüssel wurde zum Abgleich ausgewählt." +msgstr[1] "%d Schlüssel wurden zum Abgleich ausgewählt." + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Schlüssel werden abgeglichen …" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Schlüssel abgleichen" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Hierdurch werden die Schlüssel in Ihrem Schlüsselbund veröffentlicht, damit " +"andere diese nutzen können. Sie erhalten außerdem alle Veränderungen, die " +"andere vorgenommen haben, seitdem Sie deren Schlüssel erhalten haben. " + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Es werden nun alle Änderungen von fremden Schlüsseln abgerufen. Da Sie " +"keinen Schlüssel-Server für Veröffentlichungen eingestellt haben, werden " +"Ihre eigenen Schlüssel nicht für andere verfügbar gemacht." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Schlüssel-Server" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Abgleichen" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Verbindung mit »%s« fehlgeschlagen: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Verbinden mit: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Adresse konnte nicht aufgelöst werden: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Serveradresse wird aufgelöst: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP-Schlüssel-Server" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Schlüssel _signieren …" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Öffentlichen Schlüssel signieren" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Sind Sie sicher, dass Sie »%s« unwiderruflich löschen wollen?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Schlüssel abgleichen und veröffentlichen …" -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." msgstr "" -"Sind Sie sicher, dass Sie %d Schlüssel und Identitäten unwiderruflich löschen " -"wollen?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Sind Sie sicher, dass Sie %d Schlüssel unwiderruflich löschen wollen?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Sind Sie sicher, dass Sie %d Identitäten unwiderruflich löschen wollen?" +"Veröffentlichen und/oder gleichen Sie Ihre Schlüssel mit den online " +"verfügbaren Schlüsseln ab." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Benutzerkennung konnte nicht gelöscht werden" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP-Schlüssel" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Geheimer Schlüssel konnte nicht gelöscht werden" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Öffentlicher Schlüssel konnte nicht gelöscht werden" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "" +"PGP-Schlüssel werden verwendet, um E-Mails und Dateien zu verschlüsseln" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Erweiterte Optionen" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "E_rstellen" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Einen neuen Schlüssel erzeugen" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Ein PGP-Schlüssel ermöglicht es Ihnen, E-Mails oder Dateien für andere " "Personen zu verschlüsseln." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algorithmus" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "E_rstellen" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Kommentar:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "A_blaufdatum:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Läuft n_ie ab" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Verschlüsselungs-_Typ" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Einen neuen Schlüssel erzeugen" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Schlüssel_länge (bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Läuft n_ie ab" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Neuer PGP-Schlüssel" +msgid "E_xpiration Date:" +msgstr "A_blaufdatum:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Kommentar:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Erweiterte Optionen" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Abgelaufen" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Eigener PGP-Schlüssel" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP-Schlüssel" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Die primäre Benutzerkennung konnte nicht geändert werden." -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Sind Sie sicher, dass Sie die Benutzerkennung »%s« unwiderruflich löschen " "wollen?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Benutzerkennung konnte nicht gelöscht werden" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Unbekannt]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Name / E-Mail" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Signatur-Kennung" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Das primäre Foto konnte nicht geändert werden." -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(unbekannt)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Dieser Schlüssel ist am abgelaufen am: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Name" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "" -"Sind Sie sicher, dass Sie den Unterschlüssel %d von %s unwiderruflich löschen " -"wollen?" +"Sind Sie sicher, dass Sie den Unterschlüssel %d von %s unwiderruflich " +"löschen wollen?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Unterschlüssel konnte nicht gelöscht werden." -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Die Vertrauenseinstellung konnte nicht geändert werden." -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Der Schlüssel konnte nicht zu »%s« exportiert werden." - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Gesamten Schlüssel exportieren" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Schlüssel konnte nicht exportiert werden." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Schlüssel konnte nicht exportiert werden" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nie" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "Kennung" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Typ" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Erzeugt" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Läuft ab" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Status" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Länge" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Abgelaufen" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Gut" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Schlüsselkennung" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Aktionen" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Kommentar:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Daten" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-Mail:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Fingerabdruck" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Schlüsselkennung:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nie" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Schlüsselnamen und Signaturen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Dieser Schlüssel wurde widerrufen." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Foto" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"Der Eigentümer hat seinen Schlüssel widerrufen. Dieser kann nicht mehr " +"verwendet werden." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Technische Details" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Dieser Schlüssel ist abgelaufen." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Dieser Schlüssel wurde widerrufen." +msgid "Add a photo to this key" +msgstr "Ein Foto zum Schlüssel hinzufügen" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Dieser Schlüssel ist abgelaufen." +msgid "Remove this photo from this key" +msgstr "Dieses Foto aus dem Schlüssel entfernen" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Typ:" +msgid "Make this photo the primary photo" +msgstr "Dieses Foto zum primären Foto machen" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Zum vorherigen Foto gehen" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Verwendung:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Unterschlüssel" +msgid "Go to next photo" +msgstr "Zum nächsten Foto gehen" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Hinzufügen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Foto" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Ein Foto zum Schlüssel hinzufügen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Schlüsselkennung:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "_Kennwort ändern" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Name:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Empfangene Dateien und E-Mails entschlüsseln" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-Mail:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Löschen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Kommentar:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Ablaufdatum" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Verwendung:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Läuft ab am:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Typ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exportieren" +msgid "Decrypt files and email sent to you." +msgstr "Empfangene Dateien und E-Mails entschlüsseln" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Geheimer PGP-Schlüssel" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Zum nächsten Foto gehen" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "_Kennwort ändern" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Zum vorherigen Foto gehen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Eigentümer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Schlüsselkennung:" +msgid "Key Names and Signatures" +msgstr "Schlüsselnamen und Signaturen" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primär" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Dieses Foto zum primären Foto machen" +msgid "Sign" +msgstr "Signieren" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Namen und Signaturen" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Löschen" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nie" +msgid "_Add Name" +msgstr "_Name hinzufügen" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "_Vertrauen in Eigentümer:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Eigentümer" +msgid "Revoke" +msgstr "Widerrufen" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primär" +msgid "Names and Signatures" +msgstr "Namen und Signaturen" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Geheimer PGP-Schlüssel" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Schlüsselkennung:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Dieses Foto aus dem Schlüssel entfernen" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Widerrufen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Länge:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Signieren" +msgid "Technical Details" +msgstr "Technische Details" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Länge:" +msgid "Fingerprint" +msgstr "Fingerabdruck" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" -"Der Eigentümer hat seinen Schlüssel widerrufen. Dieser kann nicht mehr " -"verwendet werden." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Läuft ab am:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Name hinzufügen" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Daten" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "_Vertrauen in Eigentümer:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Gesamten Schlüssel exportieren:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Name:" +msgid "Actions" +msgstr "Aktionen" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Daten:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Hinzufügen" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Ablaufdatum" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Unterschlüssel" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Geringfügig" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Fingerabdruck:" +msgid "Fully" +msgstr "Vollkommen" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Angaben zum Vertrauen:" +msgid "Ultimately" +msgstr "Absolut" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Vertrauen in diesen Schlüssel " +msgid "Encrypt files and email to the key's owner" +msgstr "Dateien und E-Mails an den Eigentümer verschlüsseln " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Öffentlicher PGP-Schlüssel" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Andere Namen:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Personen, die diesen Schlüssel signiert haben:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Dateien und E-Mails für den Eigentümer verschlüsseln " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Vertrauen in diesen Schlüssel " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Vollkommen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Ihr Vertrauen ist im Reiter Details von Hand angegeben." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Ich vertraue Signaturen von »%s« auch bei anderen Schlüsseln" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1627,7 +1859,11 @@ "Signieren Sie diesen Schlüssel, falls Sie darauf vertrauen, dass »%s« " "der Besitzer dieses Schlüssels ist:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "Diesen Schlüssel _signieren" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1635,43 +1871,38 @@ "Wenn Sie nicht mehr darauf vertrauen, dass »%s« der Besitzer dieses " "Schlüssels ist, ziehen Sie Ihre Signatur zurück:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Geringfügig" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Öffentlicher PGP-Schlüssel" +msgid "_Revoke Signature" +msgstr "Signatur _widerrufen" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Personen, die diesen Schlüssel signiert haben:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Nur Signaturen von Personen anzeigen, denen ich vertraue" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Vertrauen" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Absolut" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Sie _vertrauen dem Eigentümer:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Ihr Vertrauen ist im Reiter Details von Hand angegeben." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Fingerabdruck:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Nur Signaturen von Personen anzeigen, denen ich vertraue" +msgid "Dates:" +msgstr "Daten:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "Signatur _widerrufen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Angaben zum Vertrauen:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "Diesen Schlüssel _signieren" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Sie _vertrauen dem Eigentümer:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1679,55 +1910,63 @@ msgstr "Unterschlüssel %d von %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Optionale Beschreibung des Widerrufs" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Widerrufen" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Begründung für den Widerruf des Schlüssels" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "Beg_ründung:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Optionale Beschreibung des Widerrufs" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Widerrufen" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Sie haben keine persönlichen Schlüssel, welche zum Signieren eines Dokuments " "oder einer Nachricht verwendet werden könnten." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Nachricht mit Schlüssel signieren:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Wie sorgfältig haben Sie den Schlüssel überprüft?" +msgid "Sign Key" +msgstr "Schlüssel signieren" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Anzeige der Signatur für andere:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"Durch das Signieren bestätigen Sie, dass dieser Schlüssel der\n" +"folgenden Person gehört:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Signiere Schlüssel als:" +msgid "Key Name" +msgstr "Schlüsselname" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the key " -"fingerprint to the owner over the phone. " -msgstr "" -"Mäßig: Sie haben nur mäßig überprüft, ob dieser Schlüssel der Person " -"gehört, die diesen beansprucht. Sie könnten z.B. dem Eigentümer am Telefon " -"den Fingerabdruck des Schlüssels vorgelesen haben." +msgid "How carefully have you checked this key?" +msgstr "Wie sorgfältig haben Sie den Schlüssel überprüft?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Schlüsselname" +msgid "_Not at all" +msgstr "Ü_berhaupt nicht" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Mäßig" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Sehr sorgfältig" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1735,7 +1974,17 @@ "Überhaupt nicht: Sie glauben, dass dieser Schlüssel der angegebenen " "Person gehört, sind sich dabei aber nicht sicher." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Mäßig: Sie haben nur mäßig überprüft, ob dieser Schlüssel der Person " +"gehört, die sich als dessen Besitzer ausgibt. Sie können z.B. dem Eigentümer " +"am Telefon den digitalen Fingerabdruck des Schlüssels vorlesen." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1743,21 +1992,6 @@ "Sehr sorgfältig: Wählen Sie dies nur, wenn Sie sich absolut sicher " "sind, dass dieser Schlüssel authentisch ist." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "" -"Durch das Signieren bestätigen Sie, dass dieser Schlüssel der\n" -"folgenden Person gehört:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "" -"Ich möchte diese Signatur zu einem anderen Zeitpunkt _widerrufen können." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Schlüssel signieren" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1770,488 +2004,357 @@ "gehört." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Mäßig" +msgid "How others will see this signature:" +msgstr "Anzeige der Signatur für andere:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "Ü_berhaupt nicht" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Andere sollen diese Signatur nicht sehen können." +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "" +"Ich möchte diese Signatur zu einem anderen Zeitpunkt _widerrufen können." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Signieren" +msgid "Sign key as:" +msgstr "Signiere Schlüssel als:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Signierer:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Sehr sorgfältig" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Nachricht mit Schlüssel signieren:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Zertifikat" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Löschen ist gescheitert" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Sind Sie sicher, dass Sie das Zertifikat »%s« löschen wollen?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Sind Sie sicher, dass Sie »%d« Zertifikat löschen wollen?" -msgstr[1] "Sind Sie sicher, dass Sie »%d« Zertifikate löschen wollen?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Löschen" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Kennwort ä_ndern" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Kennwort _bestätigen:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Bestätigen Sie das neue Kennwort" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Neues _Kennwort:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Verwalten Sie Ihre Passwörter und Schlüssel" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Passwörter und Verschlüsselung" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Wählen Sie den gewünschten Eintragstyp aus:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Weiter" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Neu erstellen …" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d Schlüssel ausgewählt." -msgstr[1] "%d Schlüssel ausgewählt." - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Schlüssel konnten nicht importiert werden." - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importierte Schlüssel" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Schlüssel werden importiert" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Schlüssel importieren" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Unbekannter Schlüsseltyp oder falsches Datenformat." - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Schlüssel werden importiert" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Entfernt" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Programm beenden" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Neu …" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Einen neuen Schlüssel oder Eintrag erzeugen" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importieren …" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Aus einer Datei importieren" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Aus der Zwischenablage importieren" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "Entfernte Schlüssel _suchen …" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Schlüssel über einen Schlüssel-Server suchen" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Schlüssel abgleichen und veröffentlichen …" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "" -"Veröffentlichen und/oder gleichen Sie Ihre Schlüssel mit den online " -"verfügbaren Schlüsseln ab." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_yp" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Spalte »Typ« anzeigen" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Ablaufdatum" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Spalte »Ablaufdatum« anzeigen" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "Ver_trauen" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Spalte »Vertrauen« anzeigen" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Gültigkeit" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Spalte »Gültigkeit« anzeigen" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filter:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Erstmalige Aktionen:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Einen neuen Schlüssel erzeugen:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Einen Schlüssel aus einer Datei importieren:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Eigene Schlüssel" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_Andere Schlüssel" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "" -"Um mit Verschlüsselung beginnen zu können, benötigen Sie zunächst Schlüssel." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importieren" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Passwörter" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Schlüssel konnte nicht exportiert werden." - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Gültigkeit" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Ablaufdatum" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Fenster schließen" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Alles aufklappen" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Alle Einträge ausklappen" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "Alles _zusammenklappen" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Alle Einträge zusammenklappen" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Entfernte Schlüssel" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Entfernte Schlüssel, die »%s« enthalten" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Schlüssel-Server:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Freigegebene Schlüssel in meiner Nähe:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Entfernte Schlüssel suchen" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Hier können Sie über das Internet nach fremden Schlüsseln suchen. Diese " -"können anschließend in Ihren Schlüsselbund importiert werden." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Suchort: " +msgid "_Sign" +msgstr "_Signieren" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Suche" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Daten werden exportiert" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Suche nach: " +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Daten werden empfangen" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Schlüssel konnte nicht zum Server übertragen werden" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Daten werden importiert" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Schlüssel konnte nicht vom Server abgerufen werden: %s" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Daten werden gesendet" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d Schlüssel wurde zum Abgleich ausgewählt." -msgstr[1] "%d Schlüssel wurden zum Abgleich ausgewählt." +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Nicht verfügbar" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Schlüssel werden abgeglichen …" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Persönliches Zertifikat und Schlüssel" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Persönliches Zertifikat" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Schlüssel abgleichen" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Zertifikat" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received their " -"keys." -msgstr "" -"Hierdurch werden die Schlüssel in Ihrem Schlüsselbund veröffentlicht, damit " -"andere diese nutzen können. Sie erhalten außerdem alle Veränderungen, die " -"andere vorgenommen haben, seitdem Sie deren Schlüssel erhalten haben. " +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Zertifikate (DER-enkodiert)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Zertifikate" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509-Zertifikate und zugehörige Schlüssel" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "" +"Sind Sie sicher, dass Sie %d Zertifikat unwiderruflich löschen wollen?" +msgstr[1] "" +"Sind Sie sicher, dass Sie %d Zertifikate unwiderruflich löschen wollen?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Geheimer Schlüssel konnte nicht erstellt werden" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Erstellen" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Geheimer Schlüssel" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Für eine Zertifikatanfrage verwendet" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Einen neuen geheimen Schlüssel erzeugen" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Bezeichnung:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Gespeichert in:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Mir ist bewusst, dass dieser Schlüssel unwiderruflich gelöscht wird." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Unbenannt" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Zertifikat konnte nicht exportiert werden" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Es werden nun alle Änderungen von fremden Schlüsseln abgerufen. Da Sie keinen " -"Schlüssel-Server für Veröffentlichungen eingestellt haben, werden Ihre " -"eigenen Schlüssel nicht für andere verfügbar gemacht." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Löschen ist gescheitert" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Schlüssel-Server" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exportieren" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Das Zertifikat exportieren" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Dieses Zertifikat oder diesen Schlüssel löschen" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Zertifikat _anfragen" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Eine Zertifikatanfragen-Datei für diesen Schlüssel erstellen" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Zertifikatanfrage konnte nicht gespeichert werden" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Zertifikatanfrage speichern" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Zertifikatanfrage" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM-enkodierte Anfrage" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Zertifikatanfrage konnte nicht erstellt werden" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Eine Datei für eine Zertifikatanfrage erstellen." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Der allgemeine Name (CN) in der Zertifikatanfrage." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Name (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Unbenannter geheimer Schlüssel" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Abgleichen" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Kennwort ä_ndern" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Version dieser Anwendung" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Neues _Kennwort:" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Mitwirkende:" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Bestätigen Sie das neue Kennwort" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Christian Meyer \n" -"Martin Bretschneider \n" -"Manuel Borchers \n" -"Henrik Kröger \n" -"Tim Bordemann \n" -"Philipp Kerling \n" -"Mario Blättermann \n" -"Paul Seyfert " +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Kennwort _bestätigen:" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse-Projektwebseite" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Verwalten Sie Ihre Passwörter und Schlüssel" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Datei" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Weiter" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Bearbeiten" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Wählen Sie den gewünschten Eintragstyp aus:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Ansicht" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Importieren fehlgeschlagen" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importieren" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Zu importierende Daten:" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Hilfe" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Schlüssel importieren" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Einstellu_ngen" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Schlüsseldateien" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Programmeinstellungen ändern" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Eingefügter Text" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Text der Zwischenablage" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Neu" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Über dieses Programm" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Programm beenden" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Inhalt" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Neu …" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Hilfe zu Seahorse anzeigen" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Einen neuen Schlüssel oder Eintrag erzeugen" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Öffentlichen Schlüssel exportieren." +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Einen neuen Schlüssel oder Eintrag hinzufügen" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Schlüssel exportieren" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importieren …" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Es konnten keine Daten vom Schlüssel-Server abgerufen werden." +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Aus einer Datei importieren" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Kopierte Schlüssel" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Aus der Zwischenablage importieren" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Schlüssel empfangen" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Nach _Schlüsselbund" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Schlüsselbünde in der Seitenleiste auflisten" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "_Eigene anzeigen" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Nur persönliche Schlüssel, Zertifikate und Passwörter anzeigen" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Ver_trauenswürdige anzeigen" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Nur vertrauenswürdige Schlüssel, Zertifikate und Passwörter anzeigen" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "_Alle anzeigen" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Alle Schlüssel, Zertifikate und Passwörter anzeigen" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filter" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "" -"%s ist ein privater Schlüssel. Möchten Sie den Schlüssel trotzdem löschen?" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Erstmalige Aktionen:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Schlüssel vom Schlüssel-Server importieren" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Einen neuen Schlüssel erzeugen:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Eigenschaften anzeigen" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Einen Schlüssel aus einer Datei importieren:" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Löschen" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "" +"Um mit Verschlüsselung beginnen zu können, benötigen Sie zunächst Schlüssel." -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Ausgewählte Einträge löschen" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Sperren nicht möglich" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Entsperren nicht möglich" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xportieren …" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Sperren" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "In eine Datei exportieren" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Entsperren" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "In die Zwischenablage kopieren" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Eigenschaften" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Ausgewählte Schlüssel in den Schlüsselbund importieren" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "_SSH-Schlüssel einrichten …" + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "Den SSH-Schlüssel an einen Rechner senden, um sich damit anzumelden." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2280,203 +2383,228 @@ msgid "Enter the new passphrase again: %s" msgstr "Geben Sie das neue Kennwort erneut ein: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "_SSH-Schlüssel einrichten …" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using that " -"key." -msgstr "Den SSH-Schlüssel an einen Rechner senden, um sich damit anzumelden." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Schlüssel zur sicheren Verbindung mit anderen Rechnern" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "" "Sind Sie sicher, dass Sie den SSH-Schlüssel »%s« unwiderruflich löschen " "wollen?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "" "Sind Sie sicher, dass Sie %d SSH-Schlüssel unwiderruflich löschen wollen?" +msgstr[1] "" +"Sind Sie sicher, dass Sie %d SSH-Schlüssel unwiderruflich löschen wollen?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH-Schlüssel" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Schlüssel konnte nicht gelöscht werden" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Geheime SSH-Schlüssel" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Öffentliche SSH-Schlüssel" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Für diesen Schlüssel ist kein öffentlicher Schlüssel verfügbar." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "SSH-Schlüssel" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "" "Wird verwendet, um auf andere Rechner zugreifen zu \n" "können (z.B. über ein Terminal)." -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Der SSH-Schlüssel konnte nicht erzeugt werden." -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "SSH-Schlüssel wird erstellt" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Geben Sie hier Ihre E-Mail-Adresse und alles weitere an, das Ihnen dabei " -"hilft zu erkennen, wofür dieser Schlüssel bestimmt ist." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers using " -"SSH, without entering a different password for each of them." -msgstr "" -"Ein SSH-Schlüssel ermöglicht es Ihnen, sich per SSH auf einem sicheren Weg an " -"Rechnern anzumelden; Passwörter werden dadurch nicht mehr benötigt. " - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Falls es bereits einen Rechner gibt, für den Sie diesen Schlüssel nutzen " -"möchten, können Sie den Rechner jetzt so einrichten, dass er diesen Schlüssel " -"erkennt." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Neuer SSH-Schlüssel" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Lediglich Schlüssel erzeugen" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Erstellen und Einrichten" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Lediglich Schlüssel erzeugen" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Ein SSH-Schlüssel ermöglicht es Ihnen, sich per SSH auf einem sicheren Weg " +"an anderen Rechnern anzumelden." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Ihre E-Mail-Adresse oder ein Erkennungsmerkmal, wofür dieser Schlüssel " +"bestimmt ist." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Schlüssel-Beschreibung:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Falls es bereits einen Rechner gibt, für den Sie diesen Schlüssel nutzen " +"möchten, können Sie den Rechner jetzt so einrichten, dass er Ihren neuen " +"Schlüssel erkennt." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Unlesbarer SSH-Schlüssel)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Eigener SSH-Schlüssel" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH-Schlüssel" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Schlüssel konnte nicht umbenannt werden." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Die Legitimierung für den Schlüssel konnte nicht geändert werden." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Das Kennwort des Schlüssels konnte nicht geändert werden." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algorithmus:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Schlüsselkennung:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Ort:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Name:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Länge:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Wird benutzt, um sich mit anderen Rechnern zu verbinden." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Vertrauen" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"Der Eigentümer dieses Schlüssels ist _autorisiert, sich mit diesem Rechner " +"zu verbinden." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Dies gilt nur für das Benutzerkonto »%s«." +msgid "This only applies to the %s account." +msgstr "Dies gilt nur für das Benutzerkonto %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_Gesamten Schlüssel exportieren" +msgid "Algorithm:" +msgstr "Algorithmus:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"Der Eigentümer dieses Schlüssels ist _autorisiert, sich mit diesem Rechner zu " -"verbinden." +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Länge:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Ort:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Wird benutzt, um sich mit anderen Rechnern zu verbinden." +msgid "E_xport Complete Key" +msgstr "_Gesamten Schlüssel exportieren" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Der SSH-Befehl wurde unerwartet beendet." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Der SSH-Befehl ist gescheitert." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Netzwerk-Passwort" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Geben Sie das Kennwort des Schlüssels ein." -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Kennwort des neuen SSH-Schlüssels" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Schlüssel importieren: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Schlüssel wird importiert. Geben Sie das Kennwort ein." -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH-Schlüssel" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Für diesen Schlüssel ist kein geheimer Schlüssel verfügbar." #: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." msgstr "" -"Der SSH-Schlüssel konnte nicht auf dem entfernten Rechner eingerichtet werden." +"Der SSH-Schlüssel konnte nicht auf dem entfernten Rechner eingerichtet " +"werden." #: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." msgstr "SSH-Schlüssel werden eingerichtet …" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "z.B.: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Einen Rechner für SSH-Verbindungen einrichten" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2484,6 +2612,10 @@ "Um Ihren SSH-Schlüssel für einen anderen Rechner über SSH nutzen zu können, " "müssen Sie bereits über ein Benutzerkonto auf diesem Rechner verfügen." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "z.B.: fileserver.example.com:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Rechnername:" @@ -2496,3 +2628,190 @@ msgid "_Set Up" msgstr "_Einrichten" +#~ msgid "Login keyring" +#~ msgstr "Anmelde-Schlüsselbund" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Der Zugriff auf den Schlüsselbund wurde verweigert." + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Der Schlüsselbund-Dienst läuft nicht." + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Der Schlüsselbund wurde bereits entsperrt" + +#~ msgid "No such key ring exists" +#~ msgstr "Ein solcher Schlüsselbund existiert nicht." + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Kommunikation mit dem Schlüsselbund-Dienst ist gescheitert." + +#~ msgid "The item already exists" +#~ msgstr "Der Eintrag existiert bereits." + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Interner Fehler beim Zugriff auf den Gnome-Schlüsselbund." + +#~ msgid "Algorithms here" +#~ msgstr "Algorithmus" + +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "" +#~ "Sind Sie sicher, dass Sie %d SSH-Schlüssel unwiderruflich löschen wollen?" + +#~ msgid "Name:" +#~ msgstr "Name:" + +#~ msgid "Couldn't unlock keyring" +#~ msgstr "Schüsselbund konnte nicht entsperrt werden" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "Schüsselbund konnte nicht gesperrt werden" + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Schlüsselbund konnte nicht gelöscht werden." + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Sperren Sie den Passwort-Schlüsselbund mit einem Hauptpasswort, so dass " +#~ "ein Passwort zum Entsperren nötig ist." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Ensperren Sie den Passwort-Schlüsselbund mit einem Hauptpasswort, so dass " +#~ "er verfügbar wird." + +#~ msgid "Properties of the keyring." +#~ msgstr "Eigenschaften des Schlüsselbunds." + +#~ msgid "Delete the keyring." +#~ msgstr "Den Schlüsselbund löschen." + +#~ msgid "Lock the password storage keyring." +#~ msgstr "Den Schlüsselbund zum Speichern von Passwörtern sperren." + +#~ msgid "Unlock the password storage keyring." +#~ msgstr "Den Schlüsselbund zum Speichern von Passwörtern entsperren." + +#~ msgid "Properties of the password." +#~ msgstr "Eigenschaften des Passworts." + +#~ msgid "Show the properties of this place" +#~ msgstr "Eigenschaften dieses Ortes anzeigen" + +#~ msgid "_Sign Key..." +#~ msgstr "Schlüssel _signieren …" + +#~ msgid "Sign public key" +#~ msgstr "Öffentlichen Schlüssel signieren" + +#~ msgid "Properties of the key." +#~ msgstr "Eigenschaften des Schlüssels." + +#~ msgid "Lock this token" +#~ msgstr "Dieses Token sperren" + +#~ msgid "Unlock this token" +#~ msgstr "Dieses Token entsperren" + +#~ msgid "Properties of the certificate." +#~ msgstr "Eigenschaften des Zertifikats." + +#~ msgid "P_laces" +#~ msgstr "_Orte" + +#~ msgid "Show places sidebar" +#~ msgstr "Orte-Seitenleiste anzeigen" + +#~ msgid "OpenSSH directory" +#~ msgstr "OpenSSH-Ordner" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Eintrag wird gelöscht" +#~ msgstr[1] "Einträge werden gelöscht" + +#~ msgid "Delete the password." +#~ msgstr "Das Passwort löschen." + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Sind Sie sicher, dass Sie %d Schlüssel und Identitäten unwiderruflich " +#~ "löschen wollen?" + +#~ msgid "Couldn't delete private key" +#~ msgstr "Geheimer Schlüssel konnte nicht gelöscht werden" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Öffentlicher Schlüssel konnte nicht gelöscht werden" + +#~ msgid "Delete the key." +#~ msgstr "Den Schlüssel löschen." + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Sind Sie sicher, dass Sie das Zertifikat »%s« löschen wollen?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Sind Sie sicher, dass Sie »%d« Zertifikat löschen wollen?" +#~ msgstr[1] "Sind Sie sicher, dass Sie »%d« Zertifikate löschen wollen?" + +#~ msgid "Deleting" +#~ msgstr "Löschen" + +#~ msgid "Delete the certificate." +#~ msgstr "Das Zertifikat löschen." + +#~ msgid "Also delete matching private key" +#~ msgstr "Auch den zugehörigen geheimen Schlüssel löschen" + +#~ msgid "Are you sure you want to delete the private key '%s'?" +#~ msgstr "" +#~ "Sind Sie sicher, dass Sie den geheimen Schlüssel »%s« löschen wollen?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Schlüssel konnte nicht gelöscht werden" + +#, fuzzy +#~ msgid "To do Keyring" +#~ msgstr "Schlüsselbund" + +#~ msgid "Archive files" +#~ msgstr "Archivdateien" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Eine Datei mit diesem Namen existiert bereits.\n" +#~ "\n" +#~ "Möchten Sie diese Datei durch eine neue Datei ersetzen?" + +#~ msgid "_Replace" +#~ msgstr "_Ersetzen" + +#~ msgid "Export public key" +#~ msgstr "Öffentlichen Schlüssel exportieren." + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Der Schlüssel konnte nicht zu »%s« exportiert werden." + +#~ msgid "Exporting keys" +#~ msgstr "Schlüssel exportieren" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Es konnten keine Daten vom Schlüssel-Server abgerufen werden." + +#~ msgid "Retrieving keys" +#~ msgstr "Schlüssel empfangen" + +#~ msgid "Export Complete Key" +#~ msgstr "Gesamten Schlüssel exportieren" + +#~ msgid "Couldn't export key." +#~ msgstr "Schlüssel konnte nicht exportiert werden." diff -Nru seahorse-3.2.2/po/el.po seahorse-3.6.3/po/el.po --- seahorse-3.2.2/po/el.po 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/po/el.po 2012-11-09 17:31:41.000000000 +0100 @@ -1,443 +1,192 @@ # Greek translation of Seahorse # Copyright (C) 2007 - 2011, Free Software Foundation, Inc. # This file is distributed under the same license as the Seahorse package. -# -# Kostas Papadimas , 2007. +# Kostas Papadimas , 2007, 2012. # Dimitrios Typaldos , 2007. # Simos Xenitellis , 2008. # Jennie Petoumenou , 2009. # Marios Zindilis , 2011. -# msgid "" msgstr "" "Project-Id-Version: seahorse.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-19 12:51+0200\n" -"PO-Revision-Date: 2011-01-16 22:31+0200\n" -"Last-Translator: Marios Zindilis \n" -"Language-Team: Greek \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-10-15 09:11+0000\n" +"PO-Revision-Date: 2012-10-23 16:55+0200\n" +"Last-Translator: Tom Tryfonidis \n" +"Language-Team: team@gnome.gr\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.6.1\n" -#: ../daemon/seahorse-daemon.c:64 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "Αποφυγή εκτέλεσης του seahorse-daemon ως υπηρεσίας" - -#: ../daemon/seahorse-daemon.c:94 -msgid "couldn't fork process" -msgstr "αδύνατη η δικράνωση διεργασίας" - -#: ../daemon/seahorse-daemon.c:100 -msgid "couldn't create new process group" -msgstr "αδύνατη η δημιουργία νέας ομάδας διεργασίας" - -#: ../daemon/seahorse-daemon.c:250 -msgid "Encryption Daemon (Seahorse)" -msgstr "Υπηρεσία κρυπτογράφησης (Seahorse)" - -#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "Μη έγκυρος ή μη αναγνωρίσιμος τύπος κλειδιού: %s" - -#: ../daemon/seahorse-service.c:234 -#, c-format -msgid "This keytype is not supported: %s" -msgstr "Ο τύπος κλειδιού δεν υποστηρίζεται: %s" - -#: ../daemon/seahorse-service.c:241 -#, c-format -msgid "Support for this feature was not enabled at build time" -msgstr "" -"Δεν ενεργοποιήθηκε η υποστήριξη για το χαρακτηριστικό αυτό κατά τη " -"δημιουργία του εγκαταστάσιμου πακέτου" - -#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180 -#: ../daemon/seahorse-service-keyset.c:223 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "Μη έγκυρο ή μη αναγνωρίσιμο κλειδί: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:204 -#, c-format -msgid "Signed by expired on %s." -msgstr "Υπογράφηκε από έληξε στις %s." - -#: ../daemon/seahorse-service-crypto.c:205 -msgid "Invalid Signature" -msgstr "Μη έγκυρη υπογραφή" - -#: ../daemon/seahorse-service-crypto.c:211 -#, c-format -msgid "Signed by on %s Expired." -msgstr "Υπογράφηκε από στις %s Έληξε." - -#: ../daemon/seahorse-service-crypto.c:212 -msgid "Expired Signature" -msgstr "Ληγμένη υπογραφή" - -#: ../daemon/seahorse-service-crypto.c:218 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "Υπογράφηκε από Ανακαλέστηκε στις %s." - -#: ../daemon/seahorse-service-crypto.c:219 -msgid "Revoked Signature" -msgstr "Υπογραφή που έχει ανακληθεί" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:225 -#, c-format -msgid "Signed by on %s." -msgstr "Υπογράφηκε από στις %s." - -#: ../daemon/seahorse-service-crypto.c:226 -msgid "Good Signature" -msgstr "Καλή υπογραφή" - -#: ../daemon/seahorse-service-crypto.c:231 -msgid "Signing key not in keyring." -msgstr "Κλειδί υπογραφής δε βρίσκεται στη κλειδοθήκη." - -#: ../daemon/seahorse-service-crypto.c:232 -msgid "Unknown Signature" -msgstr "Άγνωστη υπογραφή" - -#: ../daemon/seahorse-service-crypto.c:236 -msgid "Bad or forged signature. The signed data was modified." -msgstr "" -"Κακή ή πλαστογραφημένη υπογραφή. Τα υπογεγραμμένα δεδομένα έχουν " -"τροποποιηθεί." - -#: ../daemon/seahorse-service-crypto.c:237 -msgid "Bad Signature" -msgstr "Κακή υπογραφή" - -#: ../daemon/seahorse-service-crypto.c:245 -msgid "Couldn't verify signature." -msgstr "Αδύνατη η επιβεβαίωση υπογραφής." - -#: ../daemon/seahorse-service-crypto.c:317 -#: ../daemon/seahorse-service-crypto.c:646 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "Μη έγκυρος ή μη αναγνωρίσιμο υπογράφον άτομο: %s" - -#: ../daemon/seahorse-service-crypto.c:324 -#: ../daemon/seahorse-service-crypto.c:653 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "Μη έγκυρο κλειδί για υπογραφή: %s" - -#: ../daemon/seahorse-service-crypto.c:335 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "Μη έγκυρος ή μη αναγνωρίσιμος παραλήπτης: %s" - -#: ../daemon/seahorse-service-crypto.c:343 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "Το κλειδί δεν είναι έγκυρος παραλήπτης για κρυπτογράφηση: %s" - -#: ../daemon/seahorse-service-crypto.c:352 -#, c-format -msgid "No recipients specified" -msgstr "Δεν ορίστηκαν παραλήπτες" - -#: ../daemon/seahorse-service-crypto.c:434 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "Μη έγκυρος τύπος κλειδιού για αποκρυπτογράφηση: %s" - -#: ../daemon/seahorse-service-crypto.c:548 -#: ../daemon/seahorse-service-crypto.c:746 -#, c-format -msgid "Please set clearuri" -msgstr "Παρακαλώ, καθορίστε το clearuri" - -#: ../daemon/seahorse-service-crypto.c:554 -#: ../daemon/seahorse-service-crypto.c:752 -#, c-format -msgid "Please set crypturi" -msgstr "Παρακαλώ καθορίστε το crypturi" - -#: ../daemon/seahorse-service-crypto.c:564 -#, c-format -msgid "Error opening clearuri" -msgstr "Σφάλμα στο άνοιγμα του clearuri" - -#: ../daemon/seahorse-service-crypto.c:641 -#, c-format -msgid "No signer specified" -msgstr "Δεν έχει καθοριστεί υπογράφον άτομο" - -#: ../daemon/seahorse-service-crypto.c:830 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "Μη έγκυρος τύπος κλειδιού για διαπίστωση: %s" - -#: ../daemon/seahorse-service-keyset.c:273 -#, c-format -msgid "Invalid key id: %s" -msgstr "Μη έγκυρη ταυτότητα (ID) κλειδιού: %s" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"Μία λίστα URI εξυπηρετητή κλειδιών προς αναζήτηση για απομακρυσμένα κλειδιά " -"PGP. Σε μεταγενέστερες εκδόσεις μπορεί να περιληφθεί ένα όνομα οθόνης, " -"εισάγοντας ένα κενό διάστημα και κατόπιν το όνομα." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "Αυτόματη ανάκτηση κλειδιών" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "Αυτόματος συγχρονισμός κλειδιών" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "" -"Ελέγχει την εμφάνιση των στηλών λήξης χρόνου για το διαχειριστή κλειδιών." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "" -"Ελέγχει την εμφάνιση της στήλης εμπιστοσύνης για το διαχειριστή κλειδιών." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "Ελέγχει την εμφάνιση της στήλης τύπου για το διαχειριστή κλειδιών." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "" -"Ελέγχει την εμφάνιση της στήλης εγκυρότητας για το διαχειριστή κλειδιών." - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "Ενεργοποίηση κοινής χρήσης DNS-SD" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"Ενεργοποιεί την κοινή χρήση κλειδιών DNS-SD (Apple Bonjour). Το seahorse-" -"daemon πρέπει να εκτελείται και να είναι χτισμένο με HKP και DNS-SD " -"υποστήριξη." - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "Ταυτότητα (ID) προεπιλεγμένου κλειδιού" - -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" -"Αν τεθεί αληθές, τότε αρχεία κρυπτογραφημένα από το seahorse θα " -"κωδικοποιηθούν πρώτα σε μορφή ASCII." +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "Προσθήκη κλειδοθήκης κωδικών" -#: ../data/seahorse.schemas.in.h:12 +#: ../gkr/seahorse-add-keyring.xml.h:2 msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." msgstr "" -"Αν είναι καθορισμένο ως αληθές, τότε το προεπιλεγμένο κλειδί θα " -"περιλαμβάνεται πάντα σε μία κρυπτογραφημένη λίστα παραληπτών." - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "Τελευταίο μοτίβο αναζήτησης εξυπηρετητή κλειδιών" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "Τελευταίοι εξυπηρετητές κλειδιών που χρησιμοποιήθηκαν" - -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "Τελευταίο κλειδί που χρησιμοποιήθηκε για υπογραφή μηνύματος." - -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "Εξυπηρετητές κλειδιών PGP" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "Δημοσίευση κλειδιών σε αυτόν τον εξυπηρετητή κλειδιών." - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "Προβολή στήλης λήξης χρόνου στο διαχειριστή κλειδιών" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "Προβολή στήλης εμπιστοσύνης στο διαχειριστή κλειδιών" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "Προβολή στήλης τύπου στο διαχειριστή κλειδιών" +"Παρακαλώ επιλέξτε ένα όνομα για τη νέα κλειδοθήκη. Θα ερωτηθείτε για κωδικό " +"ξεκλειδώματος." -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "Προβολή στήλης εγκυρότητας στο διαχειριστή κλειδιών" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Νέο όνομα κλειδοθήκης:" -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"Καθορίστε τη στήλη προς ταξινόμηση από το παράθυρο παραληπτών. Οι στήλες " -"είναι:'όνομα', και 'ταυτότητα (ID)'. Εισάγετε ένα '-' μπροστά από το όνομα " -"της στήλης για ταξινόμηση με κατιούσα διάταξη." +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "Όνομα συστήματος ή διεύθυνση εξυπηρετητή." -#: ../data/seahorse.schemas.in.h:23 -msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." -msgstr "" -"Καθορίστε τη στήλη προς ταξινόμηση από το κύριο παράθυρο του διαχειριστή " -"κλειδιών του seahorse. Οι στήλες είναι: 'όνομα', 'ταυτότητα (id)', 'λήξη', " -"'εμπιστοσύνη'. και 'τύπος'. Εισάγετε ένα '-' μπροστά από το όνομα της στήλης " -"για ταξινόμηση με κατιούσα διάταξη." +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Νέα κλειδοθήκη κωδικών" -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "" -"Η ταυτότητα (ID) του τελευταίου απόρρητου κλειδιού που χρησιμοποιήθηκε για " -"υπογραφή μηνύματος." +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Χρησιμοποιείται για την αποθήκευση κωδικών για εφαρμογές και δίκτυα" -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "Η στήλη για ταξινόμηση των αποδεκτών ανά" +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Νέος κωδικός πρόσβασης.." -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "Η στήλη για ταξινόμηση των κλειδιών του seahorse ανά" +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Ασφαλής αποθήκευση ενός κωδικού πρόσβασης ή μυστικού." -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"Ο εξυπηρετητής κλειδιών στον οποίον δημοσιεύτηκαν κλειδιά PGP. Ή κενό για " -"αναβολή δημοσίευσης κλειδιών PGP." +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Κλειδοθήκη κωδικών" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "" -"Ο τελευταίος εξυπηρετητής κλειδιών στον οποίον έγινε αναζήτηση ή κενό για " -"όλους τους άλλους εξυπηρετητές." +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Αποθηκευμένος κωδικός πρόσβασης" -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "" -"Το τελευταίο μοτίβο αναζήτησης που τέθηκε σε αναζήτηση σε έναν εξυπηρετητή " -"κλειδιών." +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Αδύνατος ο καθορισμός προεπιλεγμένης κλειδοθήκης" -#: ../data/seahorse.schemas.in.h:30 -msgid "" -"This specifies the default key to use for certain operations, mainly signing." -msgstr "" -"Αυτό καθορίζει το προεπιλεγμένο κλειδί προς χρήση για ορισμένες λειτουργίες, " -"κυρίως για υπογραφή." +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Αδύνατη η αλλαγή κωδικού της κλειδοθήκης" -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "Αν τα κλειδιά θα πρέπει να λαμβάνονται από εξυπηρετητές κλειδιών." +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Ορισμός ως προεπιλογής" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." msgstr "" -"Αν τα τροποποιημένα κλειδιά θα πρέπει να συγχρονίζονται αυτόματα με τον " -"προεπιλεγμένο εξυπηρετητή κλειδιών." - -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "Αν θα πρέπει να κρυπτογραφείται πάντα το προεπιλεγμένο κλειδί" - -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "Αν θα πρέπει να γίνεται αρχική μετατροπή σε μορφή ASCII" - -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "Προσθήκη κλειδοθήκης κωδικών" - -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Νέο όνομα κλειδοθήκης:" +"Συνήθως, οι εφαρμογές αποθηκεύουν τους νέους κωδικούς στην προεπιλεγμένη " +"κλειδοθήκη." -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"Παρακαλώ επιλέξτε ένα όνομα για τη νέα κλειδοθήκη. Θα ερωτηθείτε για κωδικό " -"ξεκλειδώματος." +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Αλλαγή _κωδικού πρόσβασης" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "Όνομα συστήματος ή διεύθυνση εξυπηρετητή." +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Αλλαγή του κωδικού ξεκλειδώματος της κλειδοθήκης αποθήκευσης κωδικών" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73 -msgid "Couldn't add keyring" -msgstr "Αδύνατη η προσθήκη κλειδοθήκης" +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Αδυναμία προσθήκης αντικειμένου" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" -msgstr "Προσθήκη κωδικού πρόσβασης" +msgstr "Προσθήκη κωδικού" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "Περι_γραφή:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Κλειδοθήκη:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "Κωδικός _πρόσβασης:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Εμφάνιση κωδικού _πρόσβασης" -#: ../gkr/seahorse-gkr-item.c:470 -msgid "Web Password" -msgstr "Κωδικός πρόσβασης ιστού" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Κλειδοθήκη:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Αδύνατη η προσθήκη κλειδοθήκης" -#: ../gkr/seahorse-gkr-item.c:472 -msgid "Network Password" +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Κωδικοί πρόσβασης" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Αποθηκευμένων κωδικών πρόσβασης, πιστοποιητικών και μυστικών" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Κωδικός πρόσβασης για της εφαρμογή αποστολής άμεσων μηνυμάτων" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Κωδικός πρόσβασης ή μυστικό" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" msgstr "Κωδικός πρόσβασης δικτύου" -#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "Κωδικός πρόσβασης" +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Αποθηκευμένη σημείωση" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Κωδικός πρόσβασης κλειδοθήκης" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Κρυπτογράφηση συνθηματικού κλειδιού" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Κωδικός πρόσβασης αποθήκευσης κλειδιού" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Κωδικός πρόσβασης για Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Κωδικός πρόσβασης για τους διαδικτυακούς λογαριασμούς του GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Κωδικός πρόσβασης για Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Κωδικός πρόσβασης της εφαρμογής άμεσων μηνυμάτων" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Μυστικό του Network Manager" -#: ../gkr/seahorse-gkr-item-commands.c:78 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε τον κωδικό πρόσβασης '%s';" -#: ../gkr/seahorse-gkr-item-commands.c:81 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -462,483 +211,279 @@ #: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" -msgstr "Αποθηκευμένος κωδικός ή στοιχεία σύνδεσης" +msgstr "Αποθηκευμένος κωδικός πρόσβασης ή στοιχεία σύνδεσης" #: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Πιστοποιητικά δικτύου" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "Κωδικός πρόσβασης" + +#: ../gkr/seahorse-gkr-item-properties.c:216 msgid "Couldn't change password." msgstr "Αδύνατη η αλλαγή κωδικού πρόσβασης." -#: ../gkr/seahorse-gkr-item-properties.c:350 +#: ../gkr/seahorse-gkr-item-properties.c:263 +#: ../gkr/seahorse-gkr-item-properties.c:385 +msgid "Updating password" +msgstr "Γίνεται ενημέρωση του κωδικού" + +#: ../gkr/seahorse-gkr-item-properties.c:346 msgid "Couldn't set description." msgstr "Αδύνατος ο καθορισμός περιγραφής." -#: ../gkr/seahorse-gkr-item-properties.c:654 -msgid "Couldn't set application access." -msgstr "Αδύνατος ο καθορισμός πρόσβασης της εφαρμογής." - #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Κωδικός:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "Διαδρομή:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "Δικαιώματα:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Ιδιότητες κλειδιού" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Τεχνικές λεπτομέρειες:" +msgid "Use:" +msgstr "Χρήση:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "Εφαρμογές" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Τύπος:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Λεπτομέρειες" +msgid "Server:" +msgstr "Εξυπηρετητής:" #: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Κλειδί" +msgid "Login:" +msgstr "Όνομα ει_σόδου:" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Ιδιότητες κλειδιού" +msgid "Show pass_word" +msgstr "Εμφάνιση _κωδικού" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "Όνομα ει_σόδου:" +msgid "Password:" +msgstr "Κωδικός πρόσβασης:" #: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "Εξυπηρετητής:" +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Κλειδί" #: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "Εμφάνιση _κωδικού" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Τεχνικές λεπτομέρειες:" #: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Type:" -msgstr "Τύπος:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "Χρήση:" - -#. To translators: This is the infinitive not the imperative. This string refers to the ability of an application to delete this secret from its key ring. -#: ../gkr/seahorse-gkr-item-properties.xml.h:16 -msgid "_Delete" -msgstr "_Διαγραφή" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Read" -msgstr "_Ανάγνωση" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:21 -msgid "_Write" -msgstr "_Εγγραφή" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Λεπτομέρειες" -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "Δημιουργία λίστας κωδικών" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Μια κλειδοθήκη που ξεκλειδώνεται αυτόματα κατά την σύνδεση" -#: ../gkr/seahorse-gkr-keyring.c:354 -#, c-format -msgid "Passwords: %s" -msgstr "Κωδικοί: %s" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "" +"Μια κλειδοθήκη που χρησιμοποιείται για την αποθήκευση κωδικών πρόσβασης" -#: ../gkr/seahorse-gkr-keyring.c:355 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format -msgid "Passwords: %s" -msgstr "Κωδικοί: %s" +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "" +"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε την κλειδοθήκη κωδικών '%s';" -#: ../gkr/seahorse-gkr-keyring-commands.c:119 -msgid "Password Keyring" -msgstr "Κλειδοθήκη κωδικών" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Κατανοώ πως όλα τα αντικείμενα θα διαγραφούν οριστικά." -#: ../gkr/seahorse-gkr-keyring-commands.c:120 -msgid "Used to store application and network passwords" -msgstr "Χρησιμοποιείται για την αποθήκευση κωδικών για εφαρμογές και δίκτυα" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Ιδιότητες κλειδοθήκης" -#: ../gkr/seahorse-gkr-keyring-commands.c:121 -msgid "Stored Password" -msgstr "Αποθηκευμέμος κωδικός πρόσβασης" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Όνομα:" -#: ../gkr/seahorse-gkr-keyring-commands.c:122 -msgid "Safely store a password or secret." -msgstr "Ασφαλής αποθήκευση ενός κωδικού πρόσβασης ή μυστικού." - -#: ../gkr/seahorse-gkr-keyring-commands.c:136 -msgid "Couldn't unlock keyring" -msgstr "Αδύνατο το ξεκλείδωμα της κλειδοθήκης" - -#: ../gkr/seahorse-gkr-keyring-commands.c:177 -msgid "Couldn't lock keyring" -msgstr "Αδύνατο το κλείδωμα της κλειδοθήκης" - -#: ../gkr/seahorse-gkr-keyring-commands.c:218 -msgid "Couldn't set default keyring" -msgstr "Αδύνατος ο καθορισμός προεπιλεγμένης κλειδοθήκης" - -#: ../gkr/seahorse-gkr-keyring-commands.c:257 -msgid "Couldn't change keyring password" -msgstr "Αδύνατη η αλλαγή κωδικού της κλειδοθήκης" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "_Lock" -msgstr "_Κλείδωμα" - -#: ../gkr/seahorse-gkr-keyring-commands.c:289 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Κλείδωμα της κλειδοθήκης αποθήκευσης κωδικών. Θα απαιτείται ένας κύριος " -"κωδικός για το ξεκλείδωμα" - -#: ../gkr/seahorse-gkr-keyring-commands.c:290 -msgid "_Unlock" -msgstr "_Ξεκλείδωμα" - -#: ../gkr/seahorse-gkr-keyring-commands.c:291 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Ξεκλείδωμα της κλειδοθήκης αποθήκευσης κωδικών με τον κύριο κωδικό, " -"προκειμένου η κλειδοθήκη να καταστεί διαθέσιμη." - -#: ../gkr/seahorse-gkr-keyring-commands.c:292 -msgid "_Set as default" -msgstr "_Ορισμός ως προεπιλογής" - -#: ../gkr/seahorse-gkr-keyring-commands.c:293 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Συνήθως, οι εφαρμογές αποθηκεύουν τους νέους κωδικούς στην προεπιλεγμένη " -"κλειδοθήκη." - -#: ../gkr/seahorse-gkr-keyring-commands.c:294 -msgid "Change _Password" -msgstr "Αλλαγή _κωδικού" - -#: ../gkr/seahorse-gkr-keyring-commands.c:295 -msgid "Change the unlock password of the password storage keyring" -msgstr "Αλλαγή του κωδικού ξεκλειδώματος της κλειδοθήκης αποθήκευσης κωδικών" - -#: ../gkr/seahorse-gkr-keyring-commands.c:360 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "" -"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε την κλειδοθήκη κωδικών '%s';" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Δημιουργήθηκε:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Κλειδοθήκη" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Ιδιότητες κλειδοθήκης" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "Όν_ομα:" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "Υπήρξε άρνηση για πρόσβαση στη κλειδοθήκη" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "Η υπηρεσία gnome-keyring (διαχειριστή κλειδοθήκης) δεν εκτελείται" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "Η κλειδοθήκη είναι ήδη ξεκλείδωτη" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "Δεν υπάρχει τέτοια κλειδοθήκη" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "Δεν ήταν δυνατή η επικοινωνία με την υπηρεσία κλειδοθήκης" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "Το αντικείμενο υπάρχει ήδη" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "Εσωτερικό σφάλμα με πρόσβαση στο gnome-keyring" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "Αποθήκευση αντικειμένου..." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "Γίνεται διαγραφή..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "Γίνεται διαγραφή της κλειδοθήκης..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "Παράγεται η λίστα κλειδοθηκών κωδικών" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"Δε βρέθηκαν κλειδιά κωδικοποίησης για να εκτελεστεί η λειτουργία που " -"ζητήσατε. Το πρόγραμμα Κωδικοί πρόσβασης και κλειδιά κωδικοποίησης θα " -"ξεκινήσει τώρα ώστε να μπορέσετε είτε να δημιουργήσετε ή να εισάγετε ένα " -"κλειδί." - -#: ../libcryptui/cryptui-key-chooser.c:174 -#: ../libcryptui/cryptui-key-chooser.c:179 -msgid "All Keys" -msgstr "Όλα τα κλειδιά" - -#: ../libcryptui/cryptui-key-chooser.c:175 -#: ../libcryptui/cryptui-key-chooser.c:180 -msgid "Selected Recipients" -msgstr "Επιλεγμένοι παραλήπτες" - -#: ../libcryptui/cryptui-key-chooser.c:176 -#: ../libcryptui/cryptui-key-chooser.c:181 -msgid "Search Results" -msgstr "Αποτελέσματα αναζήτησης" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:192 -msgid "Search _for:" -msgstr "Αναζήτηση _για:" - -#: ../libcryptui/cryptui-key-chooser.c:250 -msgid "None (Don't Sign)" -msgstr "Κανένα (χωρίς υπογραφή)" - -#: ../libcryptui/cryptui-key-chooser.c:263 -#, c-format -msgid "Sign this message as %s" -msgstr "Υπογραφή αυτού του μηνύματος ως %s" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:285 -msgid "_Sign message as:" -msgstr "_Υπογραφή μηνύματος ως:" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:865 -msgid "Name" -msgstr "Όνομα" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1745 -#: ../src/seahorse-key-manager-store.c:877 -msgid "Key ID" -msgstr "Ταυτότητα (ID) κλειδιού" - -#: ../libegg/egg-datetime.c:325 +#: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Εμφάνιση σημαιών" -#: ../libegg/egg-datetime.c:326 +#: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" msgstr "Ιδιότητες " -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "Κατάσταση 'οκνηρίας' (lazy)" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "" "Στην κατάσταση 'οκνηρίας' (lazy) οι τιμές ημερομηνίας και χρόνου που έχουν " "εισαχθεί δεν κανονικοποιούνται" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "Έτος" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "Έτος που εμφανίζεται" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "Μήνας" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "Μήνας που εμφανίζεται" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "Ημέρα" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "Ημέρα του μήνα που εμφανίζεται" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "Ώρα" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "Ώρα που εμφανίζεται" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "Λεπτό" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "Λεπτό που εμφανίζεται" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "Δευτερόλεπτο" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "Δευτερόλεπτο που εμφανίζεται" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "Έτος κατώτερου ορίου" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "Το κομμάτι του έτους για το κατώτερο όριο ημερομηνίας" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "Έτος ανώτερου ορίου" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "Το τμήμα του έτους για το ανώτερο όριο ημερομηνίας" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "Μήνας κατώτερου ορίου" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "Το κομμάτι του μήνα για το κατώτερο όριο ημερομηνίας" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "Μήνας ανώτερου ορίου" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "Το κομμάτι του μήνα για το ανώτερο όριο ημερομηνίας" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "Ημέρα κατώτερου ορίου" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "Το κομμάτι της ημέρας του μήνα για το κατώτερο όριο ημερομηνίας" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "Ημέρα ανώτερου ορίου" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "Το κομμάτι της ημέρας του μήνα για το ανώτερο όριο ημερομηνίας" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "Ώρα κατώτερου ορίου" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "Το κομμάτι της ώρας για το κατώτερο όριο χρόνου" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "Ώρα ανώτερου ορίου" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "Το κομμάτι της ώρας για το ανώτερο όριο χρόνου" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "Λεπτό κατώτερου ορίου" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "Το κομμάτι του λεπτού για το κατώτερο όριο χρόνου" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "Λεπτό ανώτερου ορίου" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "Το κομμάτι του λεπτού για το ανώτερο όριο χρόνου" -#: ../libegg/egg-datetime.c:433 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "Δευτερόλεπτο κατώτερου ορίου" -#: ../libegg/egg-datetime.c:434 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "Το κομμάτι του δευτερολέπτου για το κατώτερο όριο χρόνου" -#: ../libegg/egg-datetime.c:439 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "Δευτερόλεπτο ανώτερου ορίου" -#: ../libegg/egg-datetime.c:440 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "Το κομμάτι του δευτερολέπτου για το ανώτερο όριο χρόνου" @@ -947,253 +492,257 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:482 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:0" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "Ημερομηνία" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "Εισαγωγή της ημερομηνίας απευθείας" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "Επιλογή ημερομηνίας" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "Επιλογή της ημερομηνίας από ημερολόγιο" -#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Χρόνος" -#: ../libegg/egg-datetime.c:529 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "Απευθείας εισαγωγή χρόνου" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "Επιλογή χρόνου" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "Επιλογή χρόνου από λίστα" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:810 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: no" -#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274 -#: ../libegg/egg-datetime.c:1278 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "πμ" -#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275 -#: ../libegg/egg-datetime.c:1282 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "μμ" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:824 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:827 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:831 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:834 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1190 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1255 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Μη έγκυρο αρχείο .desktop" +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "Αρχικό προσωρινό στοιχείο δεδομένων" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Μη αναγνωρίσιμη έκδοση ' %s' αρχείου επιφάνειας εργασίας" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "Προσθήκη εξυπηρετητή κλειδιών" -#: ../libegg/eggdesktopfile.c:968 -#, c-format -msgid "Starting %s" -msgstr "Εκκίνηση του %s" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "Τύπος εξυπηρετητή κλειδιών:" -#: ../libegg/eggdesktopfile.c:1110 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Η εφαρμογή δε δέχεται έγγραφα στη γραμμή εντολών." +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Σύστημα:" -#: ../libegg/eggdesktopfile.c:1178 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Μη αναγνωρίσιμη επιλογή εκκίνησης: %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1383 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "Θύρα πρόσβασης στον εξυπηρετητή." + +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Η έκδοση της εφαρμογής" + +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Ρυθμίσεις συστήματος" + +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Συντελεστές:" + +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Κωδικοί πρόσβασης και κλειδιά κρυπτογράφησης" + +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Δεν είναι δυνατή η μεταφορά του URI του εγγράφου σε καταχώριση 'Type=Link' " -"της επιφάνειας εργασίας" +"Ελληνική μεταφραστική ομάδα GNOME\n" +" Κώστας Παπαδήμας \n" +" Δημήτριος Τυπάλδος \n" +" Νίκος Χαρωνιτάκης \n" +" Σίμος Ξενιτέλλης \n" +" Νίκος Αγιαννιώτης \n" +" Τζένη Πετούμενου \n" +"\n" +"Για περισσότερα δείτε http://www.gnome.gr/" -#: ../libegg/eggdesktopfile.c:1404 -#, c-format -msgid "Not a launchable item" -msgstr "Μη εκκινήσιμο αντικείμενο" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Αρχική σελίδα του Seahorse" -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "Απενεργοποίηση της σύνδεσης με το διαχειριστή συνεδρίας" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Αδυναμία διαγραφής" -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "Ορισμός του αρχείου που περιέχει τις αποθηκευμένες ρυθμίσεις" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:443 +msgid "Couldn't export keys" +msgstr "Αδυναμία εξαγωγής κλειδιών" -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "ΑΡΧΕΙΟ" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Αδυναμία εξαγωγής δεδομένων" -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "Ορισμός της ταυτότητας (ID) διαχείρισης της συνεδρίας" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Αρχείο" -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314 -msgid "ID" -msgstr "ID" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "Ε_ξαγωγή..." -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "Επιλογές διαχείρισης συνεδρίας:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "Εμφάνιση των επιλογών διαχείρισης της συνεδρίας" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Εξαγωγή σε αρχείο" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Επεξεργασία" -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "Προσθήκη εξυπηρετητή κλειδιών" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Αντιγραφή στο πρόχειρο" -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Σύστημα:" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Διαγραφή" -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "Τύπος εξυπηρετητή κλειδιών:" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Διαγραφή επιλεγμένων αντικειμένων" -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Θύρα πρόσβασης στον εξυπηρετητή." +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Προβολή ιδιοτήτων αυτού του αντικειμένου" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Προβολή ιδιοτήτων αυτής της κλειδοθήκης" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "Αρχικό προσωρινό στοιχείο δεδομένων" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Προτι_μήσεις" -#: ../libseahorse/seahorse-notification.c:576 -#: ../libseahorse/seahorse-notification.c:604 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "Το κλειδί εισήχθει" -msgstr[1] "Τα κλειδιά εισήχθησαν" - -#: ../libseahorse/seahorse-notification.c:580 -#: ../libseahorse/seahorse-notification.c:603 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "Εισήχθει %i κλειδί" -msgstr[1] "Εισήχθησαν %i κλειδιά" - -#: ../libseahorse/seahorse-notification.c:582 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "Εισήχθει κλειδί για" -msgstr[1] "Εισήχθησαν κλειδιά για" - -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "Μηνύματα ειδοποίησης" - -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "Συμμετρικό κλειδί" - -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "Δημόσιο κλειδί" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Αλλαγή προτιμήσεων για το συγκεκριμένο πρόγραμμα" -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "Ιδιωτικό κλειδί" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "Προ_βολή" -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "Πιστοποιητικά" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Βοήθεια" -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "Ταυτότητα" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Περί αυτού του προγράμματος" -#: ../libseahorse/seahorse-passphrase.c:200 -msgid "Passphrase" -msgstr "Συνθηματικό" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Περιεχόμενα" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Εμφάνιση βοήθειας Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Εξαγωγή" -#: ../libseahorse/seahorse-passphrase.c:203 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Εισαγωγή PIN ή κωδικού πρόσβασης για: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" -msgstr "Κωδικός:" +msgstr "Κωδικός πρόσβασης:" -#: ../libseahorse/seahorse-passphrase.c:269 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" msgstr "Επιβεβαίωση:" -#: ../libseahorse/seahorse-prefs.c:62 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "Μη έγκυρη διεύθυνση εξυπηρετητή κλειδιών." -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." @@ -1201,325 +750,373 @@ "Για βοήθεια ελάτε σε επαφή με το διαχειριστή του συστήματός σας ή το " "διαχειριστή του εξυπηρετητή κλειδιών." -#: ../libseahorse/seahorse-prefs.c:172 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:352 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" msgstr "Προσαρμοσμένο" -#: ../libseahorse/seahorse-prefs.c:425 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" -msgstr "Κανένα: Μη δημοσίευση κλειδιών" +msgstr "Κανένα: μη δημοσίευση κλειδιών" #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Αυτόματη λήψη κλειδιών από εξυπηρετη_τές κλειδιών." - -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "" -"Αυτόματος συγχρονισμός _τροποποιημένων κλειδιών με εξυπηρετητές κλειδιών" - -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Εξυπηρετητές κλειδιών" - -#: ../libseahorse/seahorse-prefs.xml.h:4 msgid "Preferences" msgstr "Προτιμήσεις" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Εύρεση κλειδιών μέσω:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Δημοσίευση κλειδιών σε:" -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "Τίτλος προόδου" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Αυτόματη λήψη κλειδιών από εξυπηρετη_τές κλειδιών" -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "Μη διαθέσιμο" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"Αυτόματος συγχρονισμός _τροποποιημένων κλειδιών με εξυπηρετητές κλειδιών" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Εξυπηρετητές κλειδιών" -#: ../libseahorse/seahorse-util.c:240 +#: ../libseahorse/seahorse-util.c:210 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:516 -msgid "Key Data" -msgstr "Δεδομένα κλειδιού" - -#: ../libseahorse/seahorse-util.c:518 -msgid "Multiple Keys" -msgstr "Πολλαπλά κλειδιά" - -#: ../libseahorse/seahorse-util.c:774 -msgid "Couldn't run file-roller" -msgstr "Αδυναμία εκτέλεσης file-roller" - -#: ../libseahorse/seahorse-util.c:780 -msgid "Couldn't package files" -msgstr "Αδύνατη η πακετοποίηση αρχείων" - -#: ../libseahorse/seahorse-util.c:781 -msgid "The file-roller process did not complete successfully" -msgstr "Η διεργασία file-roller δεν ολοκληρώθηκε με επιτυχία" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:957 -msgid "All key files" -msgstr "Όλα τα αρχεία κλειδιών" - -#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Όλα τα αρχεία" - -#: ../libseahorse/seahorse-util.c:1009 -msgid "Archive files" -msgstr "Αρχειοθέτηση αρχείων" - -#: ../libseahorse/seahorse-util.c:1079 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Υπάρχει ήδη αρχείο με αυτό το όνομα.\n" -"\n" -"Επιθυμείτε να το αντικαταστήσετε με ένα νέο αρχείο;" - -#: ../libseahorse/seahorse-util.c:1082 -msgid "_Replace" -msgstr "_Αντικατάσταση" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1133 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Άγνωστο" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1139 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Ποτέ" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1146 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Οριακά" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1152 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Πλήρης" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1158 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Μέγιστη" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Μη ενεργό" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1347 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" -msgstr "Ανακαλέστηκε" +msgstr "Ανακλήθηκε" -#: ../libseahorse/seahorse-widget.c:480 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Αδύνατη η προβολή βοήθειας: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Ημερομηνία λήξης:" +msgid "Never E_xpires" +msgstr "Δε λήγει π_οτέ" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Δημιουργία νέου υποκλειδιού" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Αν το κλειδί δε λήγει ποτέ" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Τύ_πος κλειδιού:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Μήκος _κλειδιού:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Τύ_πος κλειδιού:" +msgid "Expiration Date:" +msgstr "Ημερομηνία λήξης:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Μήκος του κλειδιού" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Δε λήγει π_οτέ" +msgid "Generate a new subkey" +msgstr "Δημιουργία νέου υποκλειδιού" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Προσθήκη ταυτότητας (ID) χρήστη" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Δημιουργία νέας ταυτότητας (ID) χρήστη" +msgid "Must be at least 5 characters long" +msgstr "Πρέπει να αποτελείται από τουλάχιστον 5 χαρακτήρες" -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Πλήρες όνομα:" +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Προαιρετική ηλεκτρονική διεύθυνση" #: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Σχό_λιο κλειδιού:" - -#: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "Πρέπει να αποτελείται από τουλάχιστον 5 χαρακτήρες" - -#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Optional comment describing key" msgstr "Προαιρετικό περιγραφικό σχόλιο κλειδιού" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Προαιρετική ηλεκτρονική διεύθυνση" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Πλήρες όνομα:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Ηλεκτρονική διεύθυνση:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Σχό_λιο κλειδιού:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Δημιουργία νέας ταυτότητας (ID) χρήστη" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Α_λλαγή" +msgid "_Never expires" +msgstr "_Δε λήγει ποτέ" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Ανάκληση κλειδιού" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Δε λήγει ποτέ" +msgid "C_hange" +msgstr "Α_λλαγή" -#: ../pgp/seahorse-gpgme-add-subkey.c:147 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "Αδύνατη η προσθήκη υποκλειδιού" -#: ../pgp/seahorse-gpgme-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "Προσθήκη υποκλειδιού στο %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (μόνο υπογραφή)" -#: ../pgp/seahorse-gpgme-add-subkey.c:190 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (μόνο κρυπτογράφηση)" -#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (μόνο υπογραφή)" -#: ../pgp/seahorse-gpgme-add-subkey.c:202 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (μόνο κρυπτογράφηση)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "Αδύνατη η προσθήκη ταυτότητας χρήστη (id)" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "Προσθήκη ταυτότητας (ID) χρήστη στο %s" -#: ../pgp/seahorse-gpgme.c:72 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "" "Η αποκρυπτογράφηση απέτυχε. Προφανώς δε διαθέτετε το κλειδί " "αποκρυπτογράφησης." -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Η λειτουργία ακυρώθηκε" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Μη έγκυρη ημερομηνία λήξης" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "Η ημερομηνία λήξης πρέπει να είναι μελλοντική" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "Αδύνατη η αλλαγή ημερομηνίας λήξης" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "Λήξη: %s" -#: ../pgp/seahorse-gpgme-generate.c:79 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Πολλαπλά κλειδιά" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Δεδομένα κλειδιού" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Θωρακισμένα PGP κλειδιά" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Κλειδιά PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Κλειδί PGP" -#: ../pgp/seahorse-gpgme-generate.c:80 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Για κρυπτογράφηση ηλεκτρονικών μηνυμάτων και αρχείων" -#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:91 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:117 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Αδύνατη η δημιουργία κλειδιού PGP" -#: ../pgp/seahorse-gpgme-generate.c:195 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Συνθηματικό για νέο κλειδί PGP" -#: ../pgp/seahorse-gpgme-generate.c:196 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Εισάγετε το συνθηματικό για το νέο σας κλειδί δυο φορές." -#: ../pgp/seahorse-gpgme-generate.c:205 -msgid "Couldn't generate key" -msgstr "Αδύνατη η δημιουργία κλειδιού" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Όταν δημιουργείτε ένα κλειδί πρέπει να παραχθούν αρκετά\n" +"τυχαία δεδομένα γι' αυτό και χρειαζόμαστε τη βοήθεια σας. Είναι μια καλή\n" +"ιδέα να εκτελέσετε κάποια άλλη ενέργεια όπως να πληκτρολογήσετε\n" +"στο πληκτρολόγιο, να κινήσετε το ποντίκι, χρησιμοποιώντας εφαρμογές.\n" +"Αυτό δίνει στο σύστημα τα τυχαία δεδομένα που χρειάζεται." -#: ../pgp/seahorse-gpgme-generate.c:207 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:459 msgid "Generating key" msgstr "Δημιουργείται κλειδί" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα το %s;" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d κλειδί;" +msgstr[1] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d κλειδιά;" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Λάθος κωδικός πρόσβασης" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Αυτή ήταν η τρίτη φορά που εισάγατε έναν λανθασμένο κωδικό πρόσβασης. " "Παρακαλώ προσπαθήστε ξανά." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Λανθασμένο συνθηματικό." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Εισαγωγή νέου συνθηματικού για '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Εισαγωγή συνθηματικού για '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Εισαγωγή νέου συνθηματικού" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Εισαγωγή συνθηματικού" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Συνθηματικό" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Φορτώθηκε %d κλειδί" +msgstr[1] "Φορτώθηκαν %d κλειδιά" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Άκυρα δεδομένα κλειδιού (απουσία UID). Αυτό μπορεί να συμβαίνει εξαιτίας " +"ενός υπολογιστή με ημερομηνία καθορισμένη σε μελλοντικό χρόνο ή λόγω " +"απουσίας ιδιο-υπογραφής." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Κλειδιά GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: προεπιλεγμένος κατάλογος κλειδιών" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1555,71 +1152,79 @@ msgid "All JPEG files" msgstr "Όλα τα αρχεία JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Όλα τα αρχεία" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Επιλογή φωτογραφίας για προσθήκη στο κλειδί" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +msgid "Couldn't prepare photo" +msgstr "Αδυναμία προετοιμασίας φωτογραφίας" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Αδυναμία προσθήκης φωτογραφίας" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "Το αρχείο δε μπόρεσε να φορτωθεί. Μπορεί να διαθέτει κάποια μη έγκυρη μορφή" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "" "Είστε σίγουροι ότι επιθυμείτε να απομακρύνετε την τρέχουσα φωτογραφία από το " "κλειδί σας;" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Αδυναμία διαγραφής φωτογραφίας" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "Αδύνατη η ανάκληση υποκλειδιού" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "Ανάκληση: %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "Χωρίς αιτιολογία" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "Δεν υπάρχει αιτία για την ανάκληση του κλειδιού" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "Έχει διαρρεύσει" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "Το κλειδί έχει διαρρεύσει" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "Έχει ξεπεραστεί" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "Το κλειδί έχει ξεπεραστεί από κάποιο νεώτερο" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "Εκτός χρήσης" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "Το κλειδί δεν είναι πια σε χρήση" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " @@ -1629,11 +1234,15 @@ "απόσυρσης για το %s. Αυτή η λειτουργία δεν είναι αναστρέψιμη. Είστε σίγουροι " "ότι επιθυμείτε να συνεχίσετε;" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "Αδύνατη η προσθήκη λειτουργού απόσυρσης" -#: ../pgp/seahorse-gpgme-sign.c:99 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Κατανοώ πως αυτό το μυστικό κλειδί θα διαγραφεί οριστικά." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1642,17 +1251,17 @@ "Αυτό το κλειδί ήταν ήδη υπογραμμένο από\n" "«%s»" -#: ../pgp/seahorse-gpgme-sign.c:103 +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "Αδύνατη η υπογραφή κλειδιού" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Δεν υπάρχουν διαθέσιμα κλειδιά για χρήση σε ψηφιακή υπογραφή" -#: ../pgp/seahorse-gpgme-sign.c:158 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1660,555 +1269,582 @@ "Δεν έχετε προσωπικά κλειδιά PGP που μπορούν να χρησιμοποιηθούν για να " "δηλώσετε την εμπιστοσύνη σας για το συγκεκριμένο κλειδί." -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "Λανθασμένο συνθηματικό." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Εισαγωγή νέου συνθηματικού για '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Ανεπαρκώς καθορισμένη αναζήτηση. Ο εξυπηρετητής '%s' βρήκε πάρα πολλά " +"κλειδιά." -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Εισαγωγή συνθηματικού για '%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Αδύνατη η επικοινωνία με τον εξυπηρετητή '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Εισαγωγή νέου συνθηματικού" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Eξυπηρετητής κλειδιών HTTP" -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "Εισαγωγή συνθηματικού" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Αδύνατη η εισαγωγή κλειδιών" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Εισαγωγή κλειδιών από εξυπηρετητές κλειδιών" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Απομακρυσμένο" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Κλείσιμο αυτού του παραθύρου" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Εύρεση απομακρυσμένων κλειδιών..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Αναζήτηση για κλειδιά σε έναν εξυπηρετητή κλειδιών" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "Ε_ισαγωγή" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Εισαγωγή επιλεγμένων κλειδιών στην τοπική κλειδοθήκη" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Απομακρυσμένα κλειδιά" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Φορτώθηκε %d κλειδί" -msgstr[1] "Φορτώθηκαν %d κλειδιά" +msgid "Remote Keys Containing '%s'" +msgstr "Απομακρυσμένα κλειδιά που περιέχουν '%s'" -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "Φόρτωση κλειδιών..." +#: ../pgp/seahorse-keyserver-results.c:486 +msgid "The search for keys failed." +msgstr "Απέτυχε η αναζήτηση για κλειδιά." -#: ../pgp/seahorse-gpgme-source.c:820 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Εύρεση απομακρυσμένων κλειδιών" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Άκυρα δεδομένα κλειδιού (απουσία UID). Αυτό μπορεί να συμβαίνει εξαιτίας " -"ενός υπολογιστή με ημερομηνία καθορισμένη σε μελλοντικό χρόνο ή λόγω " -"απουσίας ιδιο-υπογραφής." +"Θα γίνει αναζήτηση κλειδιών άλλων χρηστών στο διαδίκτυο. Αυτά τα κλειδιά " +"μπορούν να εισαχθούν στην τοπική σας κλειδοθήκη." -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544 -msgid "Importing Keys" -msgstr "Εισαγωγή κλειδιών" - -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "Εξαγωγή κλειδιών" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Αναζήτηση κλειδιών που περιέχουν: " -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Εξυπηρετητές κλειδιών:" -#: ../pgp/seahorse-hkp-source.c:387 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Ανεπαρκώς καθορισμένη αναζήτηση. Ο εξυπηρετητής '%s' βρήκε πάρα πολλά " -"κλειδιά." +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr " Κοινόχρηστα κλειδιά κοντά σε μένα:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Αναζήτηση σε:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "Ανα_ζήτηση" -#: ../pgp/seahorse-hkp-source.c:389 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Αδυναμία δημοσίευσης κλειδιών στον εξυπηρετητή" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Αδύνατη η επικοινωνία με τον εξυπηρετητή '%s': %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "Αδύνατη η λήψη κλειδιών από τον εξυπηρετητή: %s" -#: ../pgp/seahorse-hkp-source.c:671 -msgid "Searching for keys..." -msgstr "Αναζήτηση για κλειδιά..." - -#: ../pgp/seahorse-hkp-source.c:759 -msgid "Uploading keys..." -msgstr "Αποστολή κλειδιών..." - -#: ../pgp/seahorse-hkp-source.c:857 -msgid "Retrieving keys..." -msgstr "Ανάκτηση κλειδιών..." - -#: ../pgp/seahorse-hkp-source.c:987 -#, c-format -msgid "Searching for keys on: %s" -msgstr "Αναζήτηση για κλειδιά στο: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154 -#: ../pgp/seahorse-ldap-source.c:668 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Connecting to: %s" -msgstr "Σύνδεση στο: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d κλειδί είναι επιλεγμένο για συγχρονισμό" +msgstr[1] "%d κλειδιά είναι επιλεγμένα για συγχρονισμό" -#: ../pgp/seahorse-hkp-source.c:1184 -msgid "HTTP Key Server" -msgstr "Eξυπηρετητής κλειδιών HTTP" +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Συγχρονισμός κλειδιών..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Συγχρονισμός κλειδιών" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Θα γίνει δημοσίευση των κλειδιών από κλειδοθήκη σας ώστε να είναι διαθέσιμα " +"και σε άλλους χρήστες. Θα λάβετε επίσης οποιεσδήποτε αλλαγές που έχουν κάνει " +"άλλοι από τη στιγμή που λάβατε τα κλειδιά τους." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Αυτό θα πραγματοποιήσει λήψη οποιωνδήποτε αλλαγών που έχουν κάνει άλλοι από " +"τη στιγμή που λάβατε τα κλειδιά τους. Δεν έχει επιλεγεί κανένας εξυπηρετητής " +"κλειδιών για δημοσίευση, και έτσι τα κλειδιά σας δε θα είναι διαθέσιμα σε " +"άλλους." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Ε_ξυπηρετητές κλειδιών" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Συγχρονισμός" -#: ../pgp/seahorse-ldap-source.c:459 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Αδύνατη η επικοινωνία με '%s': %s" -#: ../pgp/seahorse-ldap-source.c:641 +#: ../pgp/seahorse-ldap-source.c:652 +#, c-format +msgid "Connecting to: %s" +msgstr "Σύνδεση στο: %s" + +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Αδύνατη η ανάλυση διεύθυνσης: %s" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Γίνεται ανάλυση διεύθυνσης εξυπηρετητή: %s" -#: ../pgp/seahorse-ldap-source.c:955 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "Αναζήτηση κλειδιών που περιέχουν '%s'..." - -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "Αναζήτηση της ταυτότητας (ID) κλειδιού '%s'..." - -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "Ανάκτηση απομακρυσμένων κλειδιών..." - -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "Αποστολή κλειδιών στον εξυπηρετητή κλειδιών..." - -#: ../pgp/seahorse-ldap-source.c:1423 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Εξυπηρετητής κλειδιών LDAP" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "Υπογρα_φή κλειδιού..." - -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "Υπογραφή δημοσίου κλειδιού" - -#: ../pgp/seahorse-pgp-commands.c:171 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα το %s;" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Συγχρονισμός και δημοσίευση κλειδιών..." -#: ../pgp/seahorse-pgp-commands.c:176 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" -"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d κλειδιά και " -"αναγνωριστικά;" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Δημοσίευση και/ή συγχρονισμός των κλειδιών σας με εκείνα του δικτύου." -#: ../pgp/seahorse-pgp-commands.c:178 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d κλειδιά;" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Κλειδιά PGP" -#: ../pgp/seahorse-pgp-commands.c:180 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d αναγνωριστικά;" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "" +"Τα κλειδιά PGP είναι για κρυπτογράφηση ηλεκτρονικών μηνυμάτων και αρχείων" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Προχωρημένες επιλογές κλειδιού" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "Δη_μιουργία" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Δημιουργία νέου κλειδιού" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Ένα κλειδί PGP σας δίνει τη δυνατότητα κρυπτογράφησης ηλεκτρονικής " "αλληλογραφίας\n" -"ή αρχεία για άλλους χρήστες." - -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Αλγόριθμοι εδώ" +"ή αρχείων για άλλους χρήστες." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "Δη_μιουργία" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Σχόλιο:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Ημερομηνία λή_ξης:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Δεν λήγει _ποτέ" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Τύπος _κρυπτογράφησης:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Δημιουργία νέου κλειδιού" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "Key _Strength (bits):" -msgstr "_Ισχύς κλειδιού (μπιτ):" - #: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Δεν λήγει _ποτέ" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 +msgid "Key _Strength (bits):" +msgstr "_Ισχύς κλειδιού (bits):" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Νέο κλειδί PGP" +msgid "E_xpiration Date:" +msgstr "Ημερομηνία λή_ξης:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Σχόλιο:" - -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Private PGP Key" -msgstr "Ιδιωτικό κλειδί PGP" - -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Public PGP Key" -msgstr "Δημόσιο κλειδί PGP" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Προχωρημένες επιλογές κλειδιού" -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349 -msgid "Expired" -msgstr "Έληξε" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Προσωπικό κλειδί PGP" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP κλειδί " -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Αδυναμία αλλαγής κύριας ταυτότητας χρήστη " -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα την ταυτότητα (ID) του " "χρήστη '%s';" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "Αδυναμία διαγραφής του αναγνωριστικού (ID) του χρήστη" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1464 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Άγνωστο]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1742 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Όνομα/Ηλ. διεύθυνση" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Ταυτότητα (ID ) υπογραφής" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Αδύνατη η αλλαγή βασικής φωτογραφίας" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(άγνωστο)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Αυτό το κλειδί έληξε: %s" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "Όνομα" + +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε το υποκλειδί %d του %s;" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Αδύνατη η διαγραφή υποκλειδιού" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1427 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Αδύνατη η αλλαγή τύπου εμπιστοσύνης" -#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290 -#: ../ssh/seahorse-ssh-key-properties.c:168 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Αδύνατη η εξαγωγή κλειδιού στο \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1035 -#: ../ssh/seahorse-ssh-key-properties.c:193 -msgid "Export Complete Key" -msgstr "Εξαγωγή πλήρους κλειδιού" - -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:215 -msgid "Couldn't export key." -msgstr "Αδυναμία εξαγωγής κλειδιού." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Αδυναμία εξαγωγής κλειδιού" -#: ../pgp/seahorse-pgp-key-properties.c:1267 -#: ../pgp/seahorse-pgp-key-properties.c:1356 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Ποτέ" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1317 -#: ../src/seahorse-key-manager-store.c:896 +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "ID" + +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Τύπος" -#: ../pgp/seahorse-pgp-key-properties.c:1320 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Δημιουργήθηκε" -#: ../pgp/seahorse-pgp-key-properties.c:1323 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Λήγει" -#: ../pgp/seahorse-pgp-key-properties.c:1326 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Κατάσταση" -#: ../pgp/seahorse-pgp-key-properties.c:1329 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Ισχύς" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Έληξε" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Καλή" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Ενέργειες" +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "Ταυτότητα (ID) κλειδιού" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Σχόλιο:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Ημερομηνίες" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Ηλεκτρονική διεύθυνση:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Αποτύπωμα" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID κλειδιού:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Ποτέ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Ονόματα κλειδιών και υπογραφές" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Αυτό το κλειδί έχει αποσυρθεί" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "Όνομα:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"Ο ιδιοκτήτης του κλειδιού ανακάλεσε το κλειδί. Δε θα μπορεί να είναι πλέον " +"διαθέσιμο προς χρήση." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -msgid "Photo " -msgstr "Φωτογραφία" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Αυτό το κλειδί έχει λήξει" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -msgid "Technical Details" -msgstr "Τεχνικές λεπτομέρειες" +msgid "Add a photo to this key" +msgstr "Προσθήκη μιας φωτογραφίας σε αυτό το κλειδί" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has been revoked" -msgstr "Αυτό το κλειδί έχει αποσυρθεί" +msgid "Remove this photo from this key" +msgstr "Απομάκρυνση της φωτογραφίας από αυτό το κλειδί" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -msgid "This key has expired" -msgstr "Αυτό το κλειδί έχει λήξει" +msgid "Make this photo the primary photo" +msgstr "Καθορισμός της παρούσας φωτογραφίας ως βασικής" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Τύπος: " +msgid "Go to previous photo" +msgstr "Μετάβαση στην προηγούμενη φωτογραφία" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Χρήση:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Μετάβαση στην επόμενη φωτογραφία" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "_Subkeys" -msgstr "_Υποκλειδιά" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Φωτογραφία" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add" -msgstr "Προσθήκη" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -msgid "Add a photo to this key" -msgstr "Προσθήκη μιας φωτογραφίας σε αυτό το κλειδί" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID κλειδιού:" +#. Name of key, usually a persons name #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Αλλαγή _συνθηματικού" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Όνομα:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Ηλεκτρονική διεύθυνση:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Decrypt files and email sent to you." -msgstr "Αποκρυπτογράφηση αρχείων και ηλ. μηνυμάτων που έχετε λάβει." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Σχόλιο:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -msgid "Delete" -msgstr "Διαγραφή" +#. To translators: This is the noun not the verb. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Χρήση:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -msgid "Expire" -msgstr "Λήξη" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Τύπος: " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Expires:" -msgstr "Λήγει:" +msgid "Decrypt files and email sent to you." +msgstr "Αποκρυπτογράφηση αρχείων και ηλ. μηνυμάτων που έχετε λάβει." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 -msgid "Export" -msgstr "Εξαγωγή" +msgid "Private PGP Key" +msgstr "Ιδιωτικό κλειδί PGP" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Αλλαγή _συνθηματικού" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to next photo" -msgstr "Μετάβαση στην επόμενη φωτογραφία" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Ιδιοκτήτης" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -msgid "Go to previous photo" -msgstr "Μετάβαση στην προηγούμενη φωτογραφία" +msgid "Key Names and Signatures" +msgstr "Ονόματα κλειδιών και υπογραφές" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -msgid "Key ID:" -msgstr "Ταυτότητα (ID) κλειδιού:" +msgid "Primary" +msgstr "Πρωτεύον" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +msgid "Sign" +msgstr "Υπογραφή" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 -msgid "Make this photo the primary photo" -msgstr "Καθορισμός της παρούσας φωτογραφίας ως βασικής" +msgid "Delete" +msgstr "Διαγραφή" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -msgid "Names and Signatures" -msgstr "Ονόματα και υπογραφές" +msgid "_Add Name" +msgstr "_Προσθήκη ονόματος" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Never" -msgstr "Ποτέ" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -msgid "Override Owner _Trust:" -msgstr "Τροποποίηση ε_μπιστοσύνης ιδιοκτήτη:" +msgid "Revoke" +msgstr "Ανακάλεσε" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Owner" -msgstr "Ιδιοκτήτης" +msgid "Names and Signatures" +msgstr "Ονόματα και υπογραφές" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Primary" -msgstr "Πρωτεύον" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Ταυτότητα (ID) κλειδιού:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Remove this photo from this key" -msgstr "Απομάκρυνση της φωτογραφίας από αυτό το κλειδί" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Ισχύς:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Revoke" -msgstr "Ανακάλεσε" +msgid "Technical Details" +msgstr "Τεχνικές λεπτομέρειες" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -msgid "Sign" -msgstr "Υπογραφή" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "Strength:" -msgstr "Ισχύς:" +msgid "Fingerprint" +msgstr "Αποτύπωμα" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" -"Ο ιδιοκτήτης του κλειδιού ανακάλεσε το κλειδί. Δε θα μπορεί να είναι πλέον " -"διαθέσιμο προς χρήση." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Λήγει:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 -msgid "_Add Name" -msgstr "_Προσθήκη ονόματος" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Ημερομηνίες" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Τροποποίηση ε_μπιστοσύνης ιδιοκτήτη:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "Ε_ξαγωγή πλήρους κλειδιού:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Ημερομηνίες:" - +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +msgid "Actions" +msgstr "Ενέργειες" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Προσθήκη" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Λήξη" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Υποκλειδιά" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Οριακό" + #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Αποτύπωμα:" +msgid "Fully" +msgstr "Πλήρης" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Καθορισμός εμπιστοσύνης:" +msgid "Ultimately" +msgstr "Τελικό" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "Your trust of this key" -msgstr "Η εμπιστοσύνη σας για το συγκεκριμένο κλειδί" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +msgid "Encrypt files and email to the key's owner" +msgstr "" +"Κρυπτογράφηση αρχείων και μηνύματα ηλεκτρονικής αλληλογραφίας στον ιδιοκτήτη " +"του κλειδιού" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Δημόσιο κλειδί PGP" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "Ά_λλα ονόματα:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_People who have signed this key:" -msgstr "_Χρήστες που έχουν υπογράψει αυτό το κλειδί:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Η εμπιστοσύνη σας για το συγκεκριμένο κλειδί" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Encrypt files and email to the key's owner " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." msgstr "" -"Κρυπτογράφηση αρχείων και ηλεκτρονικής αλληλογραφίας στον ιδιοκτήτη του " -"κλειδιού" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 -msgid "Fully" -msgstr "Πλήρης" +"Η εμπιστοσύνη σας καθορίζεται χειρωνακτικά στην καρτέλα Λεπτομέρειες." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Εμπιστεύομαι τις υπογραφές από '%s' σε άλλα κλειδιά" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -2217,7 +1853,11 @@ "Αν πιστεύετε ότι ο ιδιοκτήτης αυτού του κλειδιού είναι ο '%s', " "υπογράψτε αυτό το κλειδί:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "Υπογρα_φή αυτού του κλειδιού" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -2225,40 +1865,38 @@ "Αν δεν εμπιστεύεστε πλέον ότι ο '%s' είναι ιδιοκτήτης αυτού του κλειδιού, " "ανακαλέστε την υπογραφή σας:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Marginally" -msgstr "Οριακό" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "_Ανάκληση υπογραφής" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -#: ../src/seahorse-key-manager-store.c:890 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Χρήστες που έχουν υπογράψει αυτό το κλειδί:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Να εμφανίζονται _μόνο οι υπογραφές των ανθρώπων που εμπιστεύομαι" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 msgid "Trust" msgstr "Εμπιστοσύνη" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 -msgid "Ultimately" -msgstr "Τελικό" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "You _Trust the Owner:" -msgstr "Έκφραση ε_μπιστοσύνης στον ιδιοκτήτη:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Αποτύπωμα:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "Your trust is manually specified on the Details tab." -msgstr "" -"Η εμπιστοσύνη σας καθορίζεται χειρωνακτικά στην καρτέλα Λεπτομέρειες." - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Only display the signatures of people I trust" -msgstr "Να εμφανίζονται _μόνο οι υπογραφές των ανθρώπων που εμπιστεύομαι" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Revoke Signature" -msgstr "_Ανάκληση υπογραφής" +msgid "Dates:" +msgstr "Ημερομηνίες:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgid "_Sign this Key" -msgstr "Υπογρα_φή αυτού του κλειδιού" +msgid "Indicate Trust:" +msgstr "Καθορισμός εμπιστοσύνης:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Έκφραση ε_μπιστοσύνης στον ιδιοκτήτη:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -2266,56 +1904,61 @@ msgstr "Υποκλειδί %d από %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Προαιρετική περιγραφή απόσυρσης" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Από_συρση" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Αιτία για την ανάκληση του κλειδιού" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "Αι_τία:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Προαιρετική περιγραφή απόσυρσης" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Από_συρση" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Δε διαθέτετε προσωπικά κλειδιά PGP που μπορούν να χρησιμοποιηθούν για " "υπογραφή εγγράφου ή μηνύματος." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Υ_πογραφή μηνύματος με κλειδί:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Πόσο προσεχτικά ελέγξατε αυτό το κλειδί;" +msgid "Sign Key" +msgstr "Υπογραφή κλειδιού" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Πως άλλοι θα βλέπουν αυτήν την υπογραφή:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Με την υπογραφή δηλώνετε ότι εμπιστεύεστε ότι αυτό το κλειδί ανήκει:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr " Υπογραφή κλειδιού ως" +msgid "Key Name" +msgstr "Όνομα κλειδιού" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Πρόχειρα: σημαίνει ότι έχετε κάνει μία πρόχειρη διαπίστωση ότι το " -"κλειδί ανήκει στο άτομο που ισχυρίζεται ότι είναι δικό του. Για παράδειγμα, " -"θα μπορούσατε να διαβάσετε το αποτύπωμα του κλειδιού στον ιδιοκτήτη του μέσω " -"τηλεφώνου. " +msgid "How carefully have you checked this key?" +msgstr "Πόσο προσεχτικά ελέγξατε αυτό το κλειδί;" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Όνομα κλειδιού" +msgid "_Not at all" +msgstr "_Καθόλου" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Πρόχειρα" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Πολύ προσεκτικά" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -2324,7 +1967,18 @@ "ισχυρίζεται ότι είναι δικό του, αλλά δε θα μπορούσατε ή δε διαπιστώσατε αν " "αυτό είναι πραγματικότητα." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Πρόχειρα: σημαίνει ότι έχετε κάνει μία πρόχειρη διαπίστωση ότι το " +"κλειδί ανήκει στο άτομο που ισχυρίζεται ότι είναι δικό του. Για παράδειγμα, " +"θα μπορούσατε να διαβάσετε το αποτύπωμα του κλειδιού στον ιδιοκτήτη του μέσω " +"τηλεφώνου. " + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -2332,18 +1986,6 @@ "Πολύ προσεχτικά Επιλέξτε αυτό μόνο αν είστε απολύτως σίγουρος (-η) " "ότι το κλειδί είναι αυθεντικό." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Με την υπογραφή δηλώνετε ότι εμπιστεύεστε ότι αυτό το κλειδί ανήκει:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Μπορώ να α_ποσύρω αυτήν την υπογραφή σε κάποια αργότερη ημερομηνία." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Υπογραφή κλειδιού" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -2356,194 +1998,314 @@ "διεύθυνση για να διαπιστώσετε ότι αυτή ανήκει στον ιδιοκτήτη." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Πρόχειρα" +msgid "How others will see this signature:" +msgstr "Πως άλλοι θα βλέπουν αυτήν την υπογραφή:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Καθόλου" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "Ά_λλοι να μην δουν αυτό το κλειδί" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Μπορώ να α_ποσύρω αυτήν την υπογραφή σε κάποια αργότερη ημερομηνία." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Υπογραφή" +msgid "Sign key as:" +msgstr " Υπογραφή κλειδιού ως" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Υπογράφων:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Πολύ προσεκτικά" +msgid "_Sign" +msgstr "_Υπογραφή" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Υ_πογραφή μηνύματος με κλειδί:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Εξαγωγή δεδομένων" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Ανάκτηση δεδομένων" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Εισαγωγή δεδομένων" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Αποστολή δεδομένων" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Μη διαθέσιμο" + +#: ../pkcs11/seahorse-certificate.c:434 +msgid "Personal certificate and key" +msgstr "Προσωπικό πιστοποιητικό και κλειδί" + +#: ../pkcs11/seahorse-certificate.c:437 +msgid "Personal certificate" +msgstr "Προσωπικό πιστοποιητικό" + +#: ../pkcs11/seahorse-certificate.c:439 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Πιστοποίηση" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε το πιστοποιητικό '%s';" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Πιστοποιητικά (DER κωδικοποιημένα)" -#: ../pkcs11/seahorse-pkcs11-commands.c:111 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε %d πιστοποιητικό;" -msgstr[1] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε %d πιστοποιητικά;" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Πιστοποιητικά" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 πιστοποιητικά και συναφή κλειδιά" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "" +"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d πιστοποιητικό;" +msgstr[1] "" +"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d πιστοποιητικά;" + +#: ../pkcs11/seahorse-pkcs11-generate.c:114 +msgid "Couldn't generate private key" +msgstr "Αδύνατη η δημιουργία ιδωτικού κλειδιού" + +#: ../pkcs11/seahorse-pkcs11-generate.c:413 +#: ../pkcs11/seahorse-pkcs11-request.c:255 +msgid "Create" +msgstr "Δημιουργία" + +#: ../pkcs11/seahorse-pkcs11-generate.c:506 +#: ../pkcs11/seahorse-private-key.c:178 +msgid "Private key" +msgstr "Ιδιωτικό κλειδί" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +msgid "Used to request a certificate" +msgstr "Χρησιμοποιείται για να ζητήσει ένα πιστοποιητικό" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Δημιουργία νέου ιδιωτικού κλειδιού" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Ετικέτα:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Αποθηκευμένο σε:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Κατανοώ πως αυτό το κλειδί θα διαγραφεί οριστικά." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Ανώνυμο" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Αποτυχία εξαγωγής πιστοποιητικού" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Αδυναμία διαγραφής" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Εξαγωγή" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Εξαγωγή πιστοποιητικού" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Διαγραφή αυτού του πιστοποιητικού ή κλειδιού" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Αίτηση πι_στοποιητικού" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Δημιουργία αίτησης πιστοποιητικού για αυτό το κλειδί" + +#: ../pkcs11/seahorse-pkcs11-request.c:103 +msgid "Couldn't save certificate request" +msgstr "Αδυναμία αποθήκευσης αίτησης πιστοποιητικού" + +#: ../pkcs11/seahorse-pkcs11-request.c:126 +msgid "Save certificate request" +msgstr "Αποθήκευση αίτησης πιστοποιητικού" + +#: ../pkcs11/seahorse-pkcs11-request.c:137 +msgid "Certificate request" +msgstr "Αίτηση πιστοποίησης" + +#: ../pkcs11/seahorse-pkcs11-request.c:145 +msgid "PEM encoded request" +msgstr "Κωδικοποιημένο αίτημα PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:193 +msgid "Couldn't create certificate request" +msgstr "Αδυναμία δημιουργίας αίτησης πιστοποιητικού" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Δημιουργία αίτησης πιστοποίησης" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Το κοινό όνομα (CN) τοποθετείται στην αίτηση πιστοποιητικού." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Όνομα (CN)" + +#: ../pkcs11/seahorse-private-key.c:131 +msgid "Unnamed private key" +msgstr "Ανώνυμο ιδιωτικό κλειδί" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Αλλαγή συνθηματικού" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Επι_βεβαίωση συνθηματικού:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Νέο _συνθηματικό:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Επιβεβαίωση νέου συνθηματικού" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Νέο _συνθηματικό:" +msgid "Con_firm Passphrase:" +msgstr "Επι_βεβαίωση συνθηματικού:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Διαχείριση των κωδικών και των κλειδιών κρυπτογράφησης" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862 -msgid "Passwords and Encryption Keys" -msgstr "Κωδικοί και κλειδιά κρυπτογράφησης" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Συνέχεια" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "" -"_Επιλογή του τύπου αντικειμένου που επιθυμείτε να δημιουργήσετε:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Συνέχεια" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Δημιουργία νέου..." +"_Επιλέξτε τον του τύπου αντικειμένου που επιθυμείτε να δημιουργήσετε:" -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Επιλεγμένο %d κλειδί" -msgstr[1] "Επιλεγμένα %d κλειδιά" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Η εισαγωγή απέτυχε" -#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470 -#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458 -msgid "Couldn't import keys" -msgstr "Αδύνατη η εισαγωγή κλειδιών" +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Εισαγωγή" -#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463 -msgid "Imported keys" -msgstr "Εισηγμένα κλειδιά" - -#: ../src/seahorse-key-manager.c:464 -msgid "Importing keys" -msgstr "Εισαγωγή κλειδιών" +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Δεδομένα προς εισαγωγή:" -#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Εισαγωγή κλειδιού" -#: ../src/seahorse-key-manager.c:533 -msgid "Unrecognized key type, or invalid data format" -msgstr "Μη αναγνωρίσιμος τύπος κλειδιού, ή μη έγκυρη μορφή δεδομένων" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Όλα τα αρχεία κλειδιών" -#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245 -msgid "_Remote" -msgstr "_Απομακρυσμένο" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Παραλειπόμενο κείμενο" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Πρόχειρο κείμενο" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Νέο" -#: ../src/seahorse-key-manager.c:733 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Κλείσιμο προγράμματος" -#: ../src/seahorse-key-manager.c:734 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_Νέο..." -#: ../src/seahorse-key-manager.c:735 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Δημιουργία νέου κλειδιού ή αντικειμένου" -#: ../src/seahorse-key-manager.c:736 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Προσθέστε ένα νέο κλειδί ή αντικείμενο" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "Ε_ισαγωγή..." -#: ../src/seahorse-key-manager.c:737 +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "Εισαγωγή από αρχείο" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "Εισαγωγή από το πρόχειρο" -#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255 -msgid "_Find Remote Keys..." -msgstr "_Εύρεση απομακρυσμένων κλειδιών..." +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Κατά _κλειδοθήκη" -#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256 -msgid "Search for keys on a key server" -msgstr "Αναζήτηση για κλειδιά σε έναν εξυπηρετητή κλειδιών" +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Εμφάνιση της πλευρικής στήλης κλειδοθηκών" -#: ../src/seahorse-key-manager.c:746 -msgid "_Sync and Publish Keys..." -msgstr "_Συγχρονισμός και δημοσίευση κλειδιών..." +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Προβολή _προσωπικά" -#: ../src/seahorse-key-manager.c:747 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Δημοσίευση και/ή συγχρονισμός των κλειδιών σας με εκείνα του δικτύου." +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "" +"Εμφάνισε μόνο τα προσωπικά κλειδιά, τις πιστοποιήσεις και τους κωδικούς " +"πρόσβασης" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Εμφάνισε _αξιόπιστα" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "" +"Εμφάνισε μόνο τα αξιόπιστα κλειδιά, τις πιστοποιήσεις και τους κωδικούς " +"πρόσβασης" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Εμφάνισε _οποιοδήποτε" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Εμφάνισε όλα τα κλειδιά, τις πιστοποιήσεις και τους κωδικούς πρόσβασης" -#: ../src/seahorse-key-manager.c:752 -msgid "T_ypes" -msgstr "_Τύποι" - -#: ../src/seahorse-key-manager.c:752 -msgid "Show type column" -msgstr "Εμφάνιση στήλης τύπου" - -#: ../src/seahorse-key-manager.c:754 -msgid "_Expiry" -msgstr "_Λήξη" - -#: ../src/seahorse-key-manager.c:754 -msgid "Show expiry column" -msgstr "Εμφάνιση στήλης λήξης" - -#: ../src/seahorse-key-manager.c:756 -msgid "_Trust" -msgstr "_Εμπιστοσύνη" - -#: ../src/seahorse-key-manager.c:756 -msgid "Show owner trust column" -msgstr "Εμφάνιση στήλης εμπιστοσύνης ιδιοκτήτη" - -#: ../src/seahorse-key-manager.c:758 -msgid "_Validity" -msgstr "_Εγκυρότητα" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show validity column" -msgstr "Εμφάνιση στήλης εγκυρότητας" - -#: ../src/seahorse-key-manager.c:931 -msgid "Filter:" -msgstr "Φίλτρο:" +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Φίλτρο" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -2553,554 +2315,902 @@ msgid "Generate a new key of your own: " msgstr "Δημιουργία νέου κλειδιού για σας: " -#: ../src/seahorse-key-manager.xml.h:3 +#: ../src/seahorse-key-manager.xml.h:4 msgid "Import existing keys from a file:" msgstr "Εισαγωγή υπαρχόντων κλειδιών από αρχείο:" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Τα _προσωπικά μου κλειδιά" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Για να ξεκινήσετε με κρυπτογράφηση θα χρειαστείτε κλειδιά." + +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Αδυναμία κλειδώματος" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Αδυναμία ξεκλειδώματος" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Κλείδωμα" + +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Ξεκλείδωμα" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Ιδιότητες" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Ρύθμιση κλειδιού για Α_σφαλές Κέλυφος (SSH)..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Αποστολή δημόσιου κλειδιού Secure Shell (SSH) σε άλλο σύστημα, και " +"ενεργοποίηση συνδέσεων με χρήση αυτού του κλειδιού." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Εισάγετε το συνθηματικό σας Secure Shell (SSH):" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Παλιό συνθηματικό κλειδιού" + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "Εισαγωγή παλιού συνθηματικού για: %s" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Νέο συνθηματικό κλειδιού" + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "Εισαγωγή νέου συνθηματικού για: %s" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Εισάγετε ξανά το νέο συνθηματικό: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell (SSH)" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "" +"Τα κλειδιά χρησιμοποιούνται για να συνδέεστε με ασφάλεια σε άλλους " +"υπολογιστές" + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "" +"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε το κλειδί ασφαλούς κελύφους '%s';" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "" +"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε το %d κλειδί ασφαλούς κελύφους;" +msgstr[1] "" +"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε τα %d κλειδιά ασφαλούς κελύφους;" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Κλειδί Ssh" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Μυστικά κλειδιά SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Δημόσια κλειδιά SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Δεν υπάρχει διαθέσιμο δημόσιο αρχείο κλειδιού για αυτό το κλειδί." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "Κλειδί Secure Shell (SSH)" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "Για πρόσβαση σε άλλους υπολογιστές (π.χ. μέσω τερματικού)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "Αδύνατη η δημιουργία κλειδιού Secure Shell (SSH)" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "Δημιουργία κλειδιού Secure Shell" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Νέο κλειδί Secure Shell" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Μόνο δημιουργία κλειδιού" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_Δημιουργία και ρύθμιση" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Τα κλειδιά Secure Shell (SSH) σας επιτρέπουν να συνδέεστε με ασφάλεια σε " +"έμπιστους υπολογιστές μέσω SSH." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Tην ηλεκτρονική σας διεύθυνση, ή οτιδήποτε άλλο χρειάζεστε, για να " +"θυμάστε ποια είναι η λειτουργία αυτού του κλειδιού." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Αν υπάρχει ήδη υπολογιστής με τον οποίον επιθυμείτε να χρησιμοποιήσετε αυτό " +"το κλειδί, μπορείτε τώρα να ρυθμίσετε τον υπολογιστή αυτό ώστε να " +"αναγνωρίζει το κλειδί σας. " + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Μη αναγνώσιμο κλειδί Secure Shell/SSH)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Προσωπικό SSH κλειδί" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Αρχείο SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "Αδύνατη η μετονομασία κλειδιού." + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "Αδύνατη η αλλαγή εξουσιοδότησης για το κλειδί." + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "Αδύνατη η αλλαγή του συνθηματικού για το κλειδί." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "Αναγνωριστικό:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "Όνομα:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Συνήθως σύνδεση σε άλλους υπολογιστές." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "Εμπιστοσύνη" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"Ο κάτοχος αυτού του κλειδιού είναι ε_ξουσιοδοτημένος να συνδέεται σε αυτόν " +"τον υπολογιστή" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "Αυτό εφαρμόζεται μόνο στο λογαριασμό του '%s'." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "Αλγόριθμος:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Ισχύς:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Τοποθεσία:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "Ε_ξαγωγή ολόκληρου κλειδιού" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "Η εντολή SSH τερματίστηκε απρόσμενα." + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "Η εντολή SSH απέτυχε." + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "Κωδικός πρόσβασης απομακρυσμένου συστήματος" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "Εισαγωγή συνθηματικού κλειδιού" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "Συνθηματικό για νέο κλειδί Secure Shell (SSH)" + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "Εισαγωγή κλειδιού: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "Εισαγωγή κλειδιού. Εισάγετε το συνθηματικό σας" + +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Κλειδιά OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "Δεν υπάρχει διαθέσιμο αρχείο προσωπικού κλειδιού για αυτό το κλειδί." + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "" +"Αδύνατη η διαμόρφωση κλειδιών Secure Shell σε απομακρυσμένους υπολογιστές." + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "Γίνεται ρύθμιση των κλειδιών Secure Shell (SSH)..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "Ρύθμιση υπολογιστή για σύνδεση SSH" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"Για να χρησιμοποιήσετε το κλειδί σας Secure Shell (SSH) με άλλον υπολογιστή " +"που χρησιμοποιεί SSH, θα πρέπει να έχετε ήδη έναν λογαριασμό εισόδου σε " +"αυτόν τον υπολογιστή." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "π.χ: fileserver.example.com:port" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "Όνομα _υπολογιστή:" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "Όνομα ει_σόδου:" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "_Ρύθμιση" + +#~ msgid "Login keyring" +#~ msgstr "Σύνδεση κλειδοθήκης" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Υπήρξε άρνηση για πρόσβαση στη κλειδοθήκη" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Η υπηρεσία gnome-keyring (διαχειριστή κλειδοθήκης) δεν εκτελείται" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Η κλειδοθήκη είναι ήδη ξεκλείδωτη" + +#~ msgid "No such key ring exists" +#~ msgstr "Δεν υπάρχει τέτοια κλειδοθήκη" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Δεν ήταν δυνατή η επικοινωνία με την υπηρεσία κλειδοθήκης" + +#~ msgid "The item already exists" +#~ msgstr "Το αντικείμενο υπάρχει ήδη" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Εσωτερικό σφάλμα με πρόσβαση στο gnome-keyring" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "Αποφυγή εκτέλεσης του seahorse-daemon ως υπηρεσίας" + +#~ msgid "couldn't fork process" +#~ msgstr "αδύνατη η δικράνωση διεργασίας" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "Υπηρεσία κρυπτογράφησης (Seahorse)" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "Μη έγκυρος ή μη αναγνωρίσιμος τύπος κλειδιού: %s" + +#~ msgid "This keytype is not supported: %s" +#~ msgstr "Ο τύπος κλειδιού δεν υποστηρίζεται: %s" + +#~ msgid "Support for this feature was not enabled at build time" +#~ msgstr "" +#~ "Δεν ενεργοποιήθηκε η υποστήριξη για το χαρακτηριστικό αυτό κατά τη " +#~ "δημιουργία του εγκαταστάσιμου πακέτου" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "Μη έγκυρο ή μη αναγνωρίσιμο κλειδί: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr "Υπογράφηκε από έληξε στις %s." + +#~ msgid "Invalid Signature" +#~ msgstr "Μη έγκυρη υπογραφή" + +#~ msgid "Signed by on %s Expired." +#~ msgstr "Υπογράφηκε από στις %s Έληξε." + +#~ msgid "Expired Signature" +#~ msgstr "Ληγμένη υπογραφή" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr "Υπογράφηκε από Ανακαλέστηκε στις %s." + +#~ msgid "Revoked Signature" +#~ msgstr "Υπογραφή που έχει ανακληθεί" + +#~ msgid "Signed by on %s." +#~ msgstr "Υπογράφηκε από στις %s." + +#~ msgid "Good Signature" +#~ msgstr "Καλή υπογραφή" + +#~ msgid "Signing key not in keyring." +#~ msgstr "Κλειδί υπογραφής δε βρίσκεται στη κλειδοθήκη." + +#~ msgid "Unknown Signature" +#~ msgstr "Άγνωστη υπογραφή" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "" +#~ "Κακή ή πλαστογραφημένη υπογραφή. Τα υπογεγραμμένα δεδομένα έχουν " +#~ "τροποποιηθεί." + +#~ msgid "Bad Signature" +#~ msgstr "Κακή υπογραφή" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "Μη έγκυρος ή μη αναγνωρίσιμο υπογράφον άτομο: %s" + +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "Μη έγκυρο κλειδί για υπογραφή: %s" + +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "Μη έγκυρος ή μη αναγνωρίσιμος παραλήπτης: %s" + +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "Το κλειδί δεν είναι έγκυρος παραλήπτης για κρυπτογράφηση: %s" + +#~ msgid "No recipients specified" +#~ msgstr "Δεν ορίστηκαν παραλήπτες" + +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "Μη έγκυρος τύπος κλειδιού για αποκρυπτογράφηση: %s" + +#~ msgid "Please set clearuri" +#~ msgstr "Παρακαλώ, καθορίστε το clearuri" + +#~ msgid "Please set crypturi" +#~ msgstr "Παρακαλώ καθορίστε το crypturi" + +#~ msgid "Error opening clearuri" +#~ msgstr "Σφάλμα στο άνοιγμα του clearuri" + +#~ msgid "No signer specified" +#~ msgstr "Δεν έχει καθοριστεί υπογράφον άτομο" + +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "Μη έγκυρος τύπος κλειδιού για διαπίστωση: %s" + +#~ msgid "Invalid key id: %s" +#~ msgstr "Μη έγκυρη ταυτότητα (ID) κλειδιού: %s" + +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "Μία λίστα URI εξυπηρετητή κλειδιών προς αναζήτηση για απομακρυσμένα " +#~ "κλειδιά PGP. Σε μεταγενέστερες εκδόσεις μπορεί να περιληφθεί ένα όνομα " +#~ "οθόνης, εισάγοντας ένα κενό διάστημα και κατόπιν το όνομα." + +#~ msgid "Auto Retrieve Keys" +#~ msgstr "Αυτόματη ανάκτηση κλειδιών" + +#~ msgid "Auto Sync Keys" +#~ msgstr "Αυτόματος συγχρονισμός κλειδιών" + +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "" +#~ "Ελέγχει την εμφάνιση των στηλών λήξης χρόνου για το διαχειριστή κλειδιών." + +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "" +#~ "Ελέγχει την εμφάνιση της στήλης εμπιστοσύνης για το διαχειριστή κλειδιών." + +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "Ελέγχει την εμφάνιση της στήλης τύπου για το διαχειριστή κλειδιών." + +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "" +#~ "Ελέγχει την εμφάνιση της στήλης εγκυρότητας για το διαχειριστή κλειδιών." + +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "Ενεργοποίηση κοινής χρήσης DNS-SD" + +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "Ενεργοποιεί την κοινή χρήση κλειδιών DNS-SD (Apple Bonjour). Το seahorse-" +#~ "daemon πρέπει να εκτελείται και να είναι χτισμένο με HKP και DNS-SD " +#~ "υποστήριξη." + +#~ msgid "ID of the default key" +#~ msgstr "Ταυτότητα (ID) προεπιλεγμένου κλειδιού" + +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "Αν τεθεί αληθές, τότε αρχεία κρυπτογραφημένα από το seahorse θα " +#~ "κωδικοποιηθούν πρώτα σε μορφή ASCII." + +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "Αν είναι καθορισμένο ως αληθές, τότε το προεπιλεγμένο κλειδί θα " +#~ "περιλαμβάνεται πάντα σε μία κρυπτογραφημένη λίστα παραληπτών." + +#~ msgid "Last key server search pattern" +#~ msgstr "Τελευταίο μοτίβο αναζήτησης εξυπηρετητή κλειδιών" + +#~ msgid "Last key servers used" +#~ msgstr "Τελευταίοι εξυπηρετητές κλειδιών που χρησιμοποιήθηκαν" + +#~ msgid "Last key used to sign a message." +#~ msgstr "Τελευταίο κλειδί που χρησιμοποιήθηκε για υπογραφή μηνύματος." -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Άλλα _κλειδιά" +#~ msgid "PGP Key servers" +#~ msgstr "Εξυπηρετητές κλειδιών PGP" -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Για να ξεκινήσετε με κρυπτογράφηση θα χρειαστείτε κλειδιά." +#~ msgid "Publish keys to this key server." +#~ msgstr "Δημοσίευση κλειδιών σε αυτόν τον εξυπηρετητή κλειδιών." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522 -msgid "_Import" -msgstr "Ε_ισαγωγή" +#~ msgid "Show expires column in key manager" +#~ msgstr "Προβολή στήλης λήξης χρόνου στο διαχειριστή κλειδιών" -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "Κω_δικοί" +#~ msgid "Show trust column in key manager" +#~ msgstr "Προβολή στήλης εμπιστοσύνης στο διαχειριστή κλειδιών" -#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256 -msgid "Couldn't export keys" -msgstr "Αδυναμία εξαγωγής κλειδιών" +#~ msgid "Show type column in key manager" +#~ msgstr "Προβολή στήλης τύπου στο διαχειριστή κλειδιών" -#: ../src/seahorse-key-manager-store.c:883 -msgid "Validity" -msgstr "Εγκυρότητα" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:902 -msgid "Expiration Date" -msgstr "Ημερομηνία λήξης" +#~ msgid "Show validity column in key manager" +#~ msgstr "Προβολή στήλης εγκυρότητας στο διαχειριστή κλειδιών" -#: ../src/seahorse-keyserver-results.c:247 -msgid "Close this window" -msgstr "Κλείσιμο αυτού του παραθύρου" +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "Καθορίστε τη στήλη προς ταξινόμηση από το παράθυρο παραληπτών. Οι στήλες " +#~ "είναι:'όνομα', και 'ταυτότητα (ID)'. Εισάγετε ένα '-' μπροστά από το " +#~ "όνομα της στήλης για ταξινόμηση με κατιούσα διάταξη." -#: ../src/seahorse-keyserver-results.c:248 -msgid "_Expand All" -msgstr "Ανάπτυ_ξη όλων" - -#: ../src/seahorse-keyserver-results.c:249 -msgid "Expand all listings" -msgstr "Ανάπτυξη για όλες τις λίστες" - -#: ../src/seahorse-keyserver-results.c:250 -msgid "_Collapse All" -msgstr "_Σύμπτυξη όλων" - -#: ../src/seahorse-keyserver-results.c:251 -msgid "Collapse all listings" -msgstr "Σύμπτυξη όλων των λιστών" +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "Καθορίστε τη στήλη προς ταξινόμηση από το κύριο παράθυρο του διαχειριστή " +#~ "κλειδιών του seahorse. Οι στήλες είναι: 'όνομα', 'ταυτότητα (id)', " +#~ "'λήξη', 'εμπιστοσύνη'. και 'τύπος'. Εισάγετε ένα '-' μπροστά από το όνομα " +#~ "της στήλης για ταξινόμηση με κατιούσα διάταξη." -#: ../src/seahorse-keyserver-results.c:322 -msgid "Remote Keys" -msgstr "Απομακρυσμένα κλειδιά" +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "" +#~ "Η ταυτότητα (ID) του τελευταίου απόρρητου κλειδιού που χρησιμοποιήθηκε " +#~ "για υπογραφή μηνύματος." -#: ../src/seahorse-keyserver-results.c:324 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Απομακρυσμένα κλειδιά που περιέχουν '%s'" +#~ msgid "The column to sort the recipients by" +#~ msgstr "Η στήλη για ταξινόμηση των αποδεκτών ανά" -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Εξυπηρετητές κλειδιών:" +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "Η στήλη για ταξινόμηση των κλειδιών του seahorse ανά" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr " Κοινόχρηστα κλειδιά κοντά σε μένα:" +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "Ο εξυπηρετητής κλειδιών στον οποίον δημοσιεύτηκαν κλειδιά PGP. Ή κενό για " +#~ "αναβολή δημοσίευσης κλειδιών PGP." -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Εύρεση απομακρυσμένων κλειδιών" +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "" +#~ "Ο τελευταίος εξυπηρετητής κλειδιών στον οποίον έγινε αναζήτηση ή κενό για " +#~ "όλους τους άλλους εξυπηρετητές." -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Θα γίνει αναζήτηση κλειδιών άλλων χρηστών στο διαδίκτυο. Αυτά τα κλειδιά " -"μπορούν να εισαχθούν στην τοπική σας κλειδοθήκη." +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "" +#~ "Το τελευταίο μοτίβο αναζήτησης που τέθηκε σε αναζήτηση σε έναν " +#~ "εξυπηρετητή κλειδιών." -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Αναζήτηση σε:" +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "Αυτό καθορίζει το προεπιλεγμένο κλειδί προς χρήση για ορισμένες " +#~ "λειτουργίες, κυρίως για υπογραφή." -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "Ανα_ζήτηση" +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "Αν τα κλειδιά θα πρέπει να λαμβάνονται από εξυπηρετητές κλειδιών." -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Αναζήτηση κλειδιών που περιέχουν: " +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "" +#~ "Αν τα τροποποιημένα κλειδιά θα πρέπει να συγχρονίζονται αυτόματα με τον " +#~ "προεπιλεγμένο εξυπηρετητή κλειδιών." -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "Αδυναμία δημοσίευσης κλειδιών στον εξυπηρετητή" +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "Αν θα πρέπει να κρυπτογραφείται πάντα το προεπιλεγμένο κλειδί" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Αδύνατη η λήψη κλειδιών από τον εξυπηρετητή: %s" +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "Αν θα πρέπει να γίνεται αρχική μετατροπή σε μορφή ASCII" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d κλειδί είναι επιλεγμένο για συγχρονισμό" -msgstr[1] "%d κλειδιά είναι επιλεγμένα για συγχρονισμό" +#~ msgid "Web Password" +#~ msgstr "Κωδικός πρόσβασης ιστού" -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "Συγχρονισμός κλειδιών" +#~ msgid "Couldn't set application access." +#~ msgstr "Αδύνατος ο καθορισμός πρόσβασης της εφαρμογής." -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "Συγχρονισμός κλειδιών..." +#~ msgid "Path:" +#~ msgstr "Διαδρομή:" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Συγχρονισμός κλειδιών" +#~ msgid "Permissions:" +#~ msgstr "Δικαιώματα:" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Θα γίνει δημοσίευση των κλειδιών από κλειδοθήκη σας ώστε να είναι διαθέσιμα " -"και σε άλλους χρήστες. Θα λάβετε επίσης οποιεσδήποτε αλλαγές που έχουν κάνει " -"άλλοι από τη στιγμή που λάβατε τα κλειδιά τους." +#~ msgid "Applications" +#~ msgstr "Εφαρμογές" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Αυτό θα πραγματοποιήσει λήψη οποιωνδήποτε αλλαγών που έχουν κάνει άλλοι από " -"τη στιγμή που λάβατε τα κλειδιά τους. Δεν έχει επιλεγεί κανένας εξυπηρετητής " -"κλειδιών για δημοσίευση, και έτσι τα κλειδιά σας δε θα είναι διαθέσιμα σε " -"άλλους." +#~ msgid "_Read" +#~ msgstr "_Ανάγνωση" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Ε_ξυπηρετητές κλειδιών" +#~ msgid "_Write" +#~ msgstr "_Εγγραφή" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Συγχρονισμός" +#~ msgid "Passwords: %s" +#~ msgstr "Κωδικοί: %s" -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "Η έκδοση της εφαρμογής" +#~ msgid "Passwords: %s" +#~ msgstr "Κωδικοί: %s" -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144 -msgid "Encryption Key Manager" -msgstr "Διαχειριστής κλειδιών κρυπτογράφησης" +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Κλείδωμα της κλειδοθήκης αποθήκευσης κωδικών. Θα απαιτείται ένας κύριος " +#~ "κωδικός για το ξεκλείδωμα" -#: ../src/seahorse-viewer.c:120 -msgid "Contributions:" -msgstr "Συντελεστές:" +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Ξεκλείδωμα της κλειδοθήκης αποθήκευσης κωδικών με τον κύριο κωδικό, " +#~ "προκειμένου η κλειδοθήκη να καταστεί διαθέσιμη." -#: ../src/seahorse-viewer.c:146 -msgid "translator-credits" -msgstr "" -"Ελληνική μεταφραστική ομάδα GNOME\n" -" Κώστας Παπαδήμας \n" -" Δημήτριος Τυπάλδος \n" -" Νίκος Χαρωνιτάκης \n" -" Σίμος Ξενιτέλλης \n" -" Νίκος Αγιαννιώτης \n" -" Τζένη Πετούμενου \n" -"\n" -"Για περισσότερα δείτε http://www.gnome.gr/" +#~ msgid "Saving item..." +#~ msgstr "Αποθήκευση αντικειμένου..." -#: ../src/seahorse-viewer.c:149 -msgid "Seahorse Project Homepage" -msgstr "Αρχική σελίδα του Έργου Seahorse" +#~ msgid "Deleting item..." +#~ msgstr "Γίνεται διαγραφή..." -#. Top menu items -#: ../src/seahorse-viewer.c:168 -msgid "_File" -msgstr "_Αρχείο" +#~ msgid "Listing password keyrings" +#~ msgstr "Παράγεται η λίστα κλειδοθηκών κωδικών" -#: ../src/seahorse-viewer.c:169 -msgid "_Edit" -msgstr "_Επεξεργασία" +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "Δε βρέθηκαν κλειδιά κωδικοποίησης για να εκτελεστεί η λειτουργία που " +#~ "ζητήσατε. Το πρόγραμμα Κωδικοί πρόσβασης και κλειδιά κωδικοποίησης " +#~ "θα ξεκινήσει τώρα ώστε να μπορέσετε είτε να δημιουργήσετε ή να εισάγετε " +#~ "ένα κλειδί." -#: ../src/seahorse-viewer.c:170 -msgid "_View" -msgstr "Προ_βολή" +#~ msgid "All Keys" +#~ msgstr "Όλα τα κλειδιά" -#: ../src/seahorse-viewer.c:171 -msgid "_Help" -msgstr "_Βοήθεια" +#~ msgid "Selected Recipients" +#~ msgstr "Επιλεγμένοι παραλήπτες" -#: ../src/seahorse-viewer.c:173 -msgid "Prefere_nces" -msgstr "Προτι_μήσεις" +#~ msgid "Search Results" +#~ msgstr "Αποτελέσματα αναζήτησης" -#: ../src/seahorse-viewer.c:174 -msgid "Change preferences for this program" -msgstr "Αλλαγή προτιμήσεων για το συγκεκριμένο πρόγραμμα" +#~ msgid "Search _for:" +#~ msgstr "Αναζήτηση _για:" -#: ../src/seahorse-viewer.c:177 -msgid "About this program" -msgstr "Περί αυτού του προγράμματος" +#~ msgid "None (Don't Sign)" +#~ msgstr "Κανένα (χωρίς υπογραφή)" -#: ../src/seahorse-viewer.c:178 -msgid "_Contents" -msgstr "_Περιεχόμενα" +#~ msgid "Sign this message as %s" +#~ msgstr "Υπογραφή αυτού του μηνύματος ως %s" -#: ../src/seahorse-viewer.c:179 -msgid "Show Seahorse help" -msgstr "Εμφάνιση βοήθειας Seahorse" +#~ msgid "_Sign message as:" +#~ msgstr "_Υπογραφή μηνύματος ως:" -#: ../src/seahorse-viewer.c:276 -msgid "Export public key" -msgstr "Εξαγωγή δημόσιου κλειδιού" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Μη έγκυρο αρχείο .desktop" -#: ../src/seahorse-viewer.c:296 -msgid "Exporting keys" -msgstr "Εξαγωγή κλειδιών" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Μη αναγνωρίσιμη έκδοση ' %s' αρχείου επιφάνειας εργασίας" -#: ../src/seahorse-viewer.c:321 -msgid "Couldn't retrieve data from key server" -msgstr "Αδύνατη η ανάληψη δεδομένων από εξυπηρετητή κλειδιών" +#~ msgid "Starting %s" +#~ msgstr "Εκκίνηση του %s" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:340 -msgid "Copied keys" -msgstr "Τα κλειδιά αντιγράφτηκαν" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Η εφαρμογή δε δέχεται έγγραφα στη γραμμή εντολών." -#: ../src/seahorse-viewer.c:360 -msgid "Retrieving keys" -msgstr "Ανάκτηση κλειδιών" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Μη αναγνωρίσιμη επιλογή εκκίνησης: %d" -#: ../src/seahorse-viewer.c:375 -msgid "Couldn't delete." -msgstr "Αδυναμία διαγραφής." +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Δεν είναι δυνατή η μεταφορά του URI του εγγράφου σε καταχώριση " +#~ "'Type=Link' της επιφάνειας εργασίας" -#: ../src/seahorse-viewer.c:409 -msgid "Deleting..." -msgstr "Γίνεται διαγραφή..." +#~ msgid "Not a launchable item" +#~ msgstr "Μη εκκινήσιμο αντικείμενο" -#: ../src/seahorse-viewer.c:435 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "" -"Το %s είναι ένα ιδιωτικό κλειδί. Είστε βέβαιοι ότι επιθυμείτε να συνεχίσετε;" +#~ msgid "Disable connection to session manager" +#~ msgstr "Απενεργοποίηση της σύνδεσης με το διαχειριστή συνεδρίας" -#: ../src/seahorse-viewer.c:483 -msgid "Importing keys from key servers" -msgstr "Εισαγωγή κλειδιών από εξυπηρετητές κλειδιών" +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Ορισμός του αρχείου που περιέχει τις αποθηκευμένες ρυθμίσεις" -#: ../src/seahorse-viewer.c:509 -msgid "Show properties" -msgstr "Προβολή ιδιοτήτων" +#~ msgid "FILE" +#~ msgstr "ΑΡΧΕΙΟ" -#: ../src/seahorse-viewer.c:510 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Διαγραφή" +#~ msgid "Specify session management ID" +#~ msgstr "Ορισμός της ταυτότητας (ID) διαχείρισης της συνεδρίας" -#: ../src/seahorse-viewer.c:511 -msgid "Delete selected items" -msgstr "Διαγραφή επιλεγμένων αντικειμένων" +#~ msgid "Session management options:" +#~ msgstr "Επιλογές διαχείρισης συνεδρίας:" -#: ../src/seahorse-viewer.c:515 -msgid "E_xport..." -msgstr "Ε_ξαγωγή..." +#~ msgid "Show session management options" +#~ msgstr "Εμφάνιση των επιλογών διαχείρισης της συνεδρίας" -#: ../src/seahorse-viewer.c:516 -msgid "Export to a file" -msgstr "Εξαγωγή σε αρχείο" +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "Το κλειδί εισήχθει" +#~ msgstr[1] "Τα κλειδιά εισήχθησαν" -#: ../src/seahorse-viewer.c:518 -msgid "Copy to the clipboard" -msgstr "Αντιγραφή στο πρόχειρο" +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "Εισήχθει %i κλειδί" +#~ msgstr[1] "Εισήχθησαν %i κλειδιά" -#: ../src/seahorse-viewer.c:523 -msgid "Import selected keys to local key ring" -msgstr "Εισαγωγή επιλεγμένων κλειδιών στην τοπική κλειδοθήκη" +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "Εισήχθει κλειδί για" +#~ msgstr[1] "Εισήχθησαν κλειδιά για" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "Εισάγετε το συνθηματικό σας Secure Shell (SSH):" +#~ msgid "Notification Messages" +#~ msgstr "Μηνύματα ειδοποίησης" -#: ../ssh/seahorse-ssh-commands.c:85 -msgid "Configure Key for _Secure Shell..." -msgstr "Ρύθμιση κλειδιού για Α_σφαλές Κέλυφος (SSH)..." +#~ msgid "Symmetric Key" +#~ msgstr "Συμμετρικό κλειδί" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Αποστολή δημόσιου κλειδιού Secure Shell (SSH) σε άλλο σύστημα, και " -"ενεργοποίηση συνδέσεων με χρήση αυτού του κλειδιού." +#~ msgid "Credentials" +#~ msgstr "Πιστοποιητικά" -#: ../ssh/seahorse-ssh-commands.c:115 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "" -"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε το κλειδί ασφαλούς κελύφους '%s';" +#~ msgid "Identity" +#~ msgstr "Ταυτότητα" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "" -"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε τα %d κλειδιά ασφαλούς κελύφους;" +#~ msgid "Progress Title" +#~ msgstr "Τίτλος προόδου" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "Κλειδί Secure Shell (SSH)" +#~ msgid "Couldn't run file-roller" +#~ msgstr "Αδυναμία εκτέλεσης file-roller" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "Για πρόσβαση σε άλλους υπολογιστές (π.χ. μέσω τερματικού)" +#~ msgid "Couldn't package files" +#~ msgstr "Αδύνατη η πακετοποίηση αρχείων" -#: ../ssh/seahorse-ssh-generate.c:90 -msgid "Couldn't generate Secure Shell key" -msgstr "Αδύνατη η δημιουργία κλειδιού Secure Shell (SSH)" +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "Η διεργασία file-roller δεν ολοκληρώθηκε με επιτυχία" -#: ../ssh/seahorse-ssh-generate.c:213 -msgid "Creating Secure Shell Key" -msgstr "Δημιουργία κλειδιού Secure Shell" +#~ msgid "Archive files" +#~ msgstr "Αρχειοθέτηση αρχείων" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Χρησιμοποιήστε την ηλεκτρονική σας διεύθυνση, ή οτιδήποτε άλλο " -"χρειάζεστε, για να θυμάστε ποια είναι η λειτουργία αυτού του κλειδιού." +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Υπάρχει ήδη αρχείο με αυτό το όνομα.\n" +#~ "\n" +#~ "Επιθυμείτε να το αντικαταστήσετε με ένα νέο αρχείο;" -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Τα κλειδιά Secure Shell (SSH) σας επιτρέπουν να συνδέεστε με ασφάλεια σε " -"έμπιστους υπολογιστές μέσω SSH, χωρίς να απαιτείται διαφορετικός κωδικόςγια " -"καθέναν από αυτούς." +#~ msgid "_Replace" +#~ msgstr "_Αντικατάσταση" -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +#~ msgid "Loading Keys..." +#~ msgstr "Φόρτωση κλειδιών..." -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Αν υπάρχει ήδη υπολογιστής με τον οποίον επιθυμείτε να χρησιμοποιήσετε αυτό " -"το κλειδί, μπορείτε τώρα να ρυθμίσετε τον υπολογιστή αυτό ώστε να " -"αναγνωρίζει το κλειδί σας. " +#~ msgid "Uploading keys..." +#~ msgstr "Αποστολή κλειδιών..." -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" -msgstr "Νέο κλειδί Secure Shell" +#~ msgid "Retrieving keys..." +#~ msgstr "Ανάκτηση κλειδιών..." -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "_Δημιουργία και ρύθμιση" +#~ msgid "Searching for keys on: %s" +#~ msgstr "Αναζήτηση για κλειδιά στο: %s" -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "_Μόνο δημιουργία κλειδιού" +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "Αναζήτηση κλειδιών που περιέχουν '%s'..." -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "Περιγραφή _κλειδιού:" +#~ msgid "Searching for key id '%s'..." +#~ msgstr "Αναζήτηση της ταυτότητας (ID) κλειδιού '%s'..." -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(Μη αναγνώσιμο κλειδί Secure Shell/SSH)" +#~ msgid "Retrieving remote keys..." +#~ msgstr "Ανάκτηση απομακρυσμένων κλειδιών..." -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "Μη έγκυρο" - -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "Ιδιωτικό κλειδί Secure Shell (SSH)" - -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "Δημόσιο κλειδί Secure Shell (SSH)" +#~ msgid "Sending keys to key server..." +#~ msgstr "Αποστολή κλειδιών στον εξυπηρετητή κλειδιών..." -#: ../ssh/seahorse-ssh-key-properties.c:71 -msgid "Couldn't rename key." -msgstr "Αδύνατη η μετονομασία κλειδιού." +#~ msgid "_Sign Key..." +#~ msgstr "Υπογρα_φή κλειδιού..." -#: ../ssh/seahorse-ssh-key-properties.c:112 -msgid "Couldn't change authorization for key." -msgstr "Αδύνατη η αλλαγή εξουσιοδότησης για το κλειδί." +#~ msgid "Sign public key" +#~ msgstr "Υπογραφή δημοσίου κλειδιού" -#: ../ssh/seahorse-ssh-key-properties.c:127 -msgid "Couldn't change passphrase for key." -msgstr "Αδύνατη η αλλαγή του συνθηματικού για το κλειδί." +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα %d κλειδιά και " +#~ "αναγνωριστικά;" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Αλγόριθμος:" +#~ msgid "Algorithms here" +#~ msgstr "Αλγόριθμοι εδώ" -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "Αναγνωριστικό:" +#~ msgid "New PGP Key" +#~ msgstr "Νέο κλειδί PGP" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Τοποθεσία:" +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Αδύνατη η εξαγωγή κλειδιού στο \"%s\"" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Ισχύς:" +#~ msgid "Export Complete Key" +#~ msgstr "Εξαγωγή πλήρους κλειδιού" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "Εμπιστοσύνη" +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε το πιστοποιητικό '%s';" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Αυτό εφαρμόζεται μόνο στο λογαριασμό του '%s'." +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε %d πιστοποιητικό;" +#~ msgstr[1] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε %d πιστοποιητικά;" -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "Ε_ξαγωγή ολόκληρου κλειδιού" +#~ msgid "Create New ..." +#~ msgstr "Δημιουργία νέου..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"Ο κάτοχος αυτού του κλειδιού είναι ε_ξουσιοδοτημένος να συνδέεται σε αυτόν " -"τον υπολογιστή" +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Επιλεγμένο %d κλειδί" +#~ msgstr[1] "Επιλεγμένα %d κλειδιά" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Συνήθως σύνδεση σε άλλους υπολογιστές." +#~ msgid "Importing keys" +#~ msgstr "Εισαγωγή κλειδιών" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format -msgid "The SSH command was terminated unexpectedly." -msgstr "Η εντολή SSH τερματίστηκε απρόσμενα." +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Μη αναγνωρίσιμος τύπος κλειδιού, ή μη έγκυρη μορφή δεδομένων" -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 -msgid "The SSH command failed." -msgstr "Η εντολή SSH απέτυχε." +#~ msgid "T_ypes" +#~ msgstr "_Τύποι" -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "Κλειδί Secure Shell" - -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "Συνθηματικό:" +#~ msgid "Show type column" +#~ msgstr "Εμφάνιση στήλης τύπου" -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 -msgid "Remote Host Password" -msgstr "Κωδικός πρόσβασης απομακρυσμένου συστήματος" +#~ msgid "_Expiry" +#~ msgstr "_Λήξη" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "Παλιό συνθηματικό κλειδιού" +#~ msgid "Show expiry column" +#~ msgstr "Εμφάνιση στήλης λήξης" -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "Εισαγωγή παλιού συνθηματικού για: %s" +#~ msgid "_Trust" +#~ msgstr "_Εμπιστοσύνη" -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "Νέο συνθηματικό κλειδιού" +#~ msgid "Show owner trust column" +#~ msgstr "Εμφάνιση στήλης εμπιστοσύνης ιδιοκτήτη" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "Εισαγωγή νέου συνθηματικού για: %s" +#~ msgid "_Validity" +#~ msgstr "_Εγκυρότητα" -#: ../ssh/seahorse-ssh-operation.c:864 -msgid "Enter Key Passphrase" -msgstr "Εισαγωγή συνθηματικού κλειδιού" +#~ msgid "Show validity column" +#~ msgstr "Εμφάνιση στήλης εγκυρότητας" -#: ../ssh/seahorse-ssh-operation.c:931 -msgid "Passphrase for New Secure Shell Key" -msgstr "Συνθηματικό για νέο κλειδί Secure Shell (SSH)" +#~ msgid "Other _Keys" +#~ msgstr "Άλλα _κλειδιά" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "Εισαγωγή συνθηματικού για το νέο σας κλειδί Secure Shell." +#~ msgid "Validity" +#~ msgstr "Εγκυρότητα" -#: ../ssh/seahorse-ssh-operation.c:1013 -#, c-format -msgid "Importing key: %s" -msgstr "Εισαγωγή κλειδιού: %s" +#~ msgid "Expiration Date" +#~ msgstr "Ημερομηνία λήξης" -#: ../ssh/seahorse-ssh-operation.c:1015 -msgid "Importing key. Enter passphrase" -msgstr "Εισαγωγή κλειδιού. Εισάγετε το συνθηματικό σας" +#~ msgid "_Expand All" +#~ msgstr "Ανάπτυ_ξη όλων" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." -msgstr "Δεν υπάρχει διαθέσιμο αρχείο προσωπικού κλειδιού για αυτό το κλειδί." +#~ msgid "Expand all listings" +#~ msgstr "Ανάπτυξη για όλες τις λίστες" -#: ../ssh/seahorse-ssh-upload.c:45 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "" -"Αδύνατη η διαμόρφωση κλειδιών Secure Shell σε απομακρυσμένους υπολογιστές." +#~ msgid "_Collapse All" +#~ msgstr "_Σύμπτυξη όλων" -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 -msgid "Configuring Secure Shell Keys..." -msgstr "Γίνεται ρύθμιση των κλειδιών Secure Shell (SSH)..." +#~ msgid "Collapse all listings" +#~ msgstr "Σύμπτυξη όλων των λιστών" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "π.χ.: fileserver.example.com:port" +#~ msgid "Synchronizing keys" +#~ msgstr "Συγχρονισμός κλειδιών" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "Ρύθμιση υπολογιστή για σύνδεση SSH" +#~ msgid "Export public key" +#~ msgstr "Εξαγωγή δημόσιου κλειδιού" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "" -"Για να χρησιμοποιήσετε το κλειδί σας Secure Shell (SSH) με άλλο υπολογιστή " -"πουχρησιμοποιεί SSH, θα πρέπει να έχετε ήδη ένα λογαριασμό εισόδου σε αυτόν " -"τον υπολογιστή." +#~ msgid "Exporting keys" +#~ msgstr "Εξαγωγή κλειδιών" -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "Όνομα _υπολογιστή:" +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Αδύνατη η ανάληψη δεδομένων από εξυπηρετητή κλειδιών" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "Όνομα ει_σόδου:" +#~ msgid "Deleting..." +#~ msgstr "Γίνεται διαγραφή..." -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "_Ρύθμιση" +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "" +#~ "Το %s είναι ένα ιδιωτικό κλειδί. Είστε βέβαιοι ότι επιθυμείτε να " +#~ "συνεχίσετε;" diff -Nru seahorse-3.2.2/po/en_GB.po seahorse-3.6.3/po/en_GB.po --- seahorse-3.2.2/po/en_GB.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/en_GB.po 2012-09-18 13:10:35.000000000 +0200 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the seahorse package. # Gareth Owen , David Lodge , 2004. # Philip Withnall , 2009, 2010. -# Bruce Cowan , 2010, 2011. +# Bruce Cowan , 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-19 13:22+0100\n" -"PO-Revision-Date: 2011-09-19 13:22+0100\n" +"POT-Creation-Date: 2012-09-05 19:41+0100\n" +"PO-Revision-Date: 2012-09-05 19:41+0100\n" "Last-Translator: Bruce Cowan \n" "Language-Team: British English \n" "Language: en_GB\n" @@ -17,17 +17,14 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1-beta1\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Add Password Keyring" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "New Keyring Name:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -35,305 +32,293 @@ "Please choose a name for the new keyring. You will be prompted for an unlock " "password." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "New Keyring Name:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "The host name or address of the server." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Couldn't add keyring" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "New password keyring" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Used to store application and network passwords" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "New password…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Safely store a password or secret." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Password Keyring" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Stored Password" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Couldn't set default keyring" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Couldn't change keyring password" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Set as default" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Applications usually store new passwords in the default keyring." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Change _Password" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Change the unlock password of the password storage keyring" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Couldn't add item" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Add Password" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Description:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Keyring:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Password:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Show Password" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Couldn't delete item" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Keyring:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Couldn't add keyring" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Passwords" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Stored personal passwords, credentials and secrets" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "IM account password for " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Password or secret" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Network password" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Stored note" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Keyring password" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Encryption key password" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Key storage password" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome password" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Gnome Online Accounts password" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy password" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Instant messaging password" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Network Manager secret" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Are you sure you want to delete the password '%s'?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Are you sure you want to delete %d password?" msgstr[1] "Are you sure you want to delete %d passwords?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Deleting item" -msgstr[1] "Deleting items" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Access a network share or resource" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Access a website" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Unlocks a PGP key" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Unlocks a Secure Shell key" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Saved password or login" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Network Credentials" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Password" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Couldn't change password." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Updating password" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Couldn't set description." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Password:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Technical Details:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Details" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Key Properties" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Key" +msgid "Use:" +msgstr "Use:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Key Properties" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Type:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Login:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Login:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Show pass_word" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Type:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Use:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Passwords: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Passwords: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Password Keyring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Used to store application and network passwords" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Stored Password" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Safely store a password or secret." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Couldn't unlock keyring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Couldn't lock keyring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Couldn't set default keyring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Couldn't change keyring password." - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Lock" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Lock the password storage keyring so a master password is required to unlock " -"it." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Unlock" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Unlock the password storage keyring with a master password so it is " -"available for use." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Set as default" +msgid "Password:" +msgstr "Password:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Applications usually store new passwords in the default keyring." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Key" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Change _Password" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Technical Details:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Change the unlock password of the password storage keyring" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Details" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Couldn't delete keyring" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "A keyring that is automatically unlocked on login" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "A keyring used to store passwords" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Are you sure you want to delete the password keyring '%s'?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Deleting keyring" -msgstr[1] "Deleting keyrings" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "I understand that all items will be permanently deleted." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Keyring Properties" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Name:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Created:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Keyring" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Keyring Properties" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Name:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "The operation was cancelled" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Access to the key ring was denied" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "The gnome-keyring daemon is not running" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "The key ring has already been unlocked" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "No such key ring exists" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Couldn't communicate with key ring daemon" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "The item already exists" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Internal error accessing gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Display flags" @@ -590,268 +575,330 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "initial temporary item" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Add Key Server" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Host:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Key Server Type:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Host:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "The port to access the server on." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "initial temporary item" +msgid "The port to access the server on." +msgstr "The port to access the server on." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Passphrase" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Version of this application" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Password:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- System Settings" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirm:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Contributions:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Not a valid Key Server address." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Passwords and Keys" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"For help contact your system adminstrator or the administrator of the key " -"server." +"Abigail Brady \n" +"Bastien Nocera \n" +"Gareth Owen \n" +"David Lodge \n" +"Philip Withnall \n" +"Bruce Cowan " -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse Project Homepage" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Custom" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Cannot delete" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "None: Don't publish keys" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Couldn't export keys" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Automatically retrieve keys from _key servers" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Couldn't export data" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Automatically synchronise _modified keys with key servers" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_File" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Key Servers" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xport…" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Preferences" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Export to a file" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Find keys via:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Edit" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Publish keys to:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Copy to the clipboard" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Retrieving data" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Delete" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Exporting data" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Delete selected items" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importing data" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Show the properties of this item" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Show the properties of this keyring" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Sending data" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Prefere_nces" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Unavailable" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Change preferences for this program" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_View" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Key Data" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Help" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Multiple Keys" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "About this program" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "All key files" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Contents" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "All files" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Show Seahorse help" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Export" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Enter PIN or password for: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Password:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Confirm:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Archive files" +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Not a valid Key Server address." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Replace" +"For help contact your system adminstrator or the administrator of the key " +"server." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Custom" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "None: Don't publish keys" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Preferences" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Find keys via:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Publish keys to:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Automatically retrieve keys from _key servers" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Automatically synchronise _modified keys with key servers" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Key Servers" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Unknown" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Never" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginal" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Full" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Ultimate" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Disabled" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revoked" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Could not display help: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Expiration Date:" +msgid "Never E_xpires" +msgstr "Never E_xpires" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Generate a new subkey" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "If key never expires" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Key _Type:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Key _Length:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Key _Type:" +msgid "Expiration Date:" +msgstr "Expiration Date:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Length of Key" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Never E_xpires" +msgid "Generate a new subkey" +msgstr "Generate a new subkey" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Add User ID" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Create the new user ID" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Full _Name:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Key Co_mment:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Must be at least 5 characters long" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Optional e-mail address" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Optional comment describing key" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Optional e-mail address" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Full _Name:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_E-mail Address:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Key Co_mment:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Create the new user ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "C_hange" +msgid "_Never expires" +msgstr "_Never expires" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revoke key" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Never expires" +msgid "C_hange" +msgstr "C_hange" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -862,7 +909,7 @@ msgid "Add subkey to %s" msgstr "Add subkey to %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (sign only)" @@ -870,7 +917,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (encrypt only)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (sign only)" @@ -891,6 +938,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Decryption failed. You probably do not have the decryption key." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "The operation was cancelled" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Invalid expiry date" @@ -908,47 +960,147 @@ msgid "Expiry: %s" msgstr "Expiry: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Multiple Keys" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Key Data" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Armoured PGP keys" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP keys" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP Key" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Used to encrypt e-mail and files" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Couldn't generate PGP key" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Passphrase for New PGP Key" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Enter the passphrase for your new key twice." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Generating key" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Are you sure you want to permanently delete %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Are you sure you want to permanently delete %d keys?" +msgstr[1] "Are you sure you want to permanently delete %d keys?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Wrong password" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "This was the third time you entered a wrong password. Please try again." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Wrong passphrase." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Enter new passphrase for '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Enter passphrase for '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Enter new passphrase" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Enter passphrase" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Passphrase" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Loaded %d key" +msgstr[1] "Loaded %d keys" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG keys" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: default keyring directory" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -983,27 +1135,31 @@ msgid "All JPEG files" msgstr "All JPEG files" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "All files" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Choose Photo to Add to Key" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Couldn't prepare photo" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Couldn't add photo" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "The file could not be loaded. It may be in an invalid format" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Are you sure you want to remove the current photo from your key?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Couldn't delete photo" @@ -1061,7 +1217,11 @@ msgid "Couldn't add revoker" msgstr "Couldn't add revoker" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "I understand that this secret key will be permanently deleted." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1076,11 +1236,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "No keys usable for signing" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1088,506 +1248,568 @@ "You have no personal PGP keys that can be used to indicate your trust of " "this key." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Wrong passphrase." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Enter new passphrase for '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "Search was not specific enough. Server '%s' found too many keys." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Enter passphrase for '%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Couldn't communicate with server '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Enter new passphrase" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP Key Server" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Enter passphrase" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Couldn't import keys" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importing keys from key servers" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remote" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Close this window" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Find Remote Keys…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Search for keys on a key server" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Import" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Import selected keys to local key ring" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Remote Keys" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Loaded %d key" -msgstr[1] "Loaded %d keys" +msgid "Remote Keys Containing '%s'" +msgstr "Remote Keys Containing '%s'" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "The search for keys failed." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Find Remote Keys" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Search for keys containing: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP Key Server" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Key Servers:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Shared Keys Near Me:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Where to search:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Search" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Couldn't publish keys to server" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Search was not specific enough. Server '%s' found too many keys." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Couldn't retrieve keys from server: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Couldn't communicate with server '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d key is selected for synchronising" +msgstr[1] "%d keys are selected for synchronising" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synchronising keys…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sync Keys" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Key Servers" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sync" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Couldn't communicate with '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Connecting to: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Couldn't resolve address: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Resolving server address: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP Key Server" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Sign Key…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Sign public key" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Are you sure you want to permanently delete %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Are you sure you want to permanently delete %d keys and identities?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Are you sure you want to permanently delete %d keys?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Are you sure you want to permanently delete %d identities?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sync and Publish Keys…" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Couldn't delete user ID" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publish and/or synchronise your keys with those online." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Couldn't delete private key" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Couldn't delete public key" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP Keys" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP keys are for encrypting e-mail or files" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Advanced key options" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_reate" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "A PGP key allows you to encrypt e-mail or files to other people." +msgid "Generate a new key" +msgstr "Generate a new key" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algorithms here" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "A PGP key allows you to encrypt e-mail or files to other people." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_reate" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Comment:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "E_xpiration Date:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Ne_ver Expires" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Encryption _Type:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Generate a new key" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Key _Strength (bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Ne_ver Expires" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "New PGP Key" +msgid "E_xpiration Date:" +msgstr "E_xpiration Date:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Comment:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Advanced key options" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Expired" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Personal PGP key" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP key" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Couldn't change primary user ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Are you sure you want to permanently delete the '%s' user ID?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Couldn't delete user ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Unknown]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Name/E-mail" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Signature ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Couldn't change primary photo" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(unknown)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "This key expired on: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Name" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Are you sure you want to permanently delete subkey %d of %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Couldn't delete subkey" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Unable to change trust" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Couldn't export key to \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Export Complete Key" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Couldn't export key." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Couldn't export key" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Never" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Type" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Created" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Expires" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Status" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Strength" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Expired" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Good" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Key ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Actions" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Comment:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Dates" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-mail:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Fingerprint" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Key ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Never" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Key Names and Signatures" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "This key has been revoked" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Photo " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "The owner of the key revoked the key. It can no longer be used." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Technical Details" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "This key has expired" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "This key has been revoked" +msgid "Add a photo to this key" +msgstr "Add a photo to this key" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "This key has expired" +msgid "Remove this photo from this key" +msgstr "Remove this photo from this key" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Type:" +msgid "Make this photo the primary photo" +msgstr "Make this photo the primary photo" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Use:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Go to previous photo" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Subkeys" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Go to next photo" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Add" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Photo " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Add a photo to this key" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Change _Passphrase" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Key ID:" + +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Name:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Decrypt files and e-mail sent to you." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-mail:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Delete" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Comment:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Expire" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Use:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Expires:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Type:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Export" +msgid "Decrypt files and email sent to you." +msgstr "Decrypt files and e-mail sent to you." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Private PGP Key" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Go to next photo" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Change _Passphrase" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Go to previous photo" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Owner" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Key ID:" +msgid "Key Names and Signatures" +msgstr "Key Names and Signatures" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primary" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Make this photo the primary photo" +msgid "Sign" +msgstr "Sign" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Names and Signatures" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Delete" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Never" +msgid "_Add Name" +msgstr "_Add Name" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Override Owner _Trust:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Owner" +msgid "Revoke" +msgstr "Revoke" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primary" +msgid "Names and Signatures" +msgstr "Names and Signatures" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Private PGP Key" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Key ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Remove this photo from this key" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Revoke" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Strength:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Sign" +msgid "Technical Details" +msgstr "Technical Details" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Strength:" +msgid "Fingerprint" +msgstr "Fingerprint" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "The owner of the key revoked the key. It can no longer be used." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Expires:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Add Name" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Dates" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Override Owner _Trust:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Export Complete Key:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Name:" +msgid "Actions" +msgstr "Actions" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Dates:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Add" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Expire" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Subkeys" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginally" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Fingerprint:" +msgid "Fully" +msgstr "Fully" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indicate Trust:" +msgid "Ultimately" +msgstr "Ultimately" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Your trust of this key" +msgid "Encrypt files and email to the key's owner" +msgstr "Encrypt files and e-mail to the key's owner" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Public PGP Key" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Other Names:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_People who have signed this key:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Encrypt files and e-mail to the key's owner " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Your trust of this key" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Fully" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Your trust is manually specified on the Details tab." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "I trust signatures from '%s' on other keys" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1596,50 +1818,49 @@ "If you believe that the person that owns this key is '%s', sign this " "key:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Sign this Key" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" "If you no longer trust that '%s' owns this key, revoke your signature:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginally" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Public PGP Key" +msgid "_Revoke Signature" +msgstr "_Revoke Signature" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_People who have signed this key:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Only display the signatures of people I trust" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Trust" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Ultimately" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "You _Trust the Owner:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Your trust is manually specified on the Details tab." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Fingerprint:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Only display the signatures of people I trust" +msgid "Dates:" +msgstr "Dates:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Revoke Signature" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indicate Trust:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Sign this Key" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "You _Trust the Owner:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1647,54 +1868,60 @@ msgstr "Subkey %d of %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Optional description of revocation" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_voke" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Reason for revoking the key" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Reason:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Optional description of revocation" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Re_voke" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "You have no personal PGP keys that can be used to sign a document or message." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Sign message with key:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "How carefully have you checked this key?" +msgid "Sign Key" +msgstr "Sign Key" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "How others will see this signature:" - +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "By signing you indicate your trust that this key belongs to:" + #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Sign key as:" +msgid "Key Name" +msgstr "Key Name" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " +msgid "How carefully have you checked this key?" +msgstr "How carefully have you checked this key?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Key Name" +msgid "_Not at all" +msgstr "_Not at all" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Casually" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Very Carefully" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1702,7 +1929,17 @@ "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1710,18 +1947,6 @@ "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "By signing you indicate your trust that this key belongs to:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "I can _revoke this signature at a later date." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Sign Key" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1733,482 +1958,355 @@ "used e-mail to check that the e-mail address belongs to the owner." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Casually" +msgid "How others will see this signature:" +msgstr "How others will see this signature:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Not at all" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Others may not see this signature" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "I can _revoke this signature at a later date." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Sign" +msgid "Sign key as:" +msgstr "Sign key as:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Signer:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Very Carefully" +msgid "_Sign" +msgstr "_Sign" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Sign message with key:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Exporting data" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Retrieving data" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importing data" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Sending data" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Unavailable" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Personal certificate and key" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Personal certificate" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certificate" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificates (DER encoded)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificates" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 certificates and related keys" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Are you sure you want to permanently delete %d certificate?" +msgstr[1] "Are you sure you want to permanently delete %d certificates?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Couldn't generate private key" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Create" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Private key" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Used to request a certificate" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Create a new private key" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Label:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Stored at:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "I understand that this key will be permanently deleted." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Unnamed" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Failed to export certificate" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Couldn't delete" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Are you sure you want to delete the certificate '%s'?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Are you sure you want to delete %d certificate?" -msgstr[1] "Are you sure you want to delete %d passwords?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Deleting" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Export" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Export the certificate" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Delete this certificate or key" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Request _Certificate" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Create a certificate request file for this key" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Couldn't save certificate request" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Save certificate request" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Certificate request" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM encoded request" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Couldn't create certificate request" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Create a certificate request file." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "The common name (CN) placed in the certificate request." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Name (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Unnamed private key" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Change Passphrase" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firm Passphrase:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Confirm new passphrase" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "New _Passphrase:" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Manage your passwords and encryption keys" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Passwords and Keys" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Select the type of item to create:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "C_ontinue" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Create New…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Selected %d key" -msgstr[1] "Selected %d keys" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Couldn't import keys" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Imported keys" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importing keys" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Import Key" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Unrecognised key type, or invalid data format" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importing Keys" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remote" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Close this program" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_New…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Create a new key or item" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Import…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Import from a file" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Import from the clipboard" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Find Remote Keys…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Search for keys on a key server" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sync and Publish Keys…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publish and/or synchronise your keys with those online." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_ypes" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Show type column" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Expiry" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Show expiry column" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Trust" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Show owner trust column" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validity" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Show validity column" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filter:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "First time options:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Generate a new key of your own: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Import existing keys from a file:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "My _Personal Keys" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Other _Keys" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "To get started with encryption you will need keys." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Import" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Passwords" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Couldn't export keys" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validity" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Expiration Date" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Close this window" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Expand All" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Expand all listings" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Collapse All" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Collapse all listings" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Remote Keys" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Remote Keys Containing '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Key Servers:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Shared Keys Near Me:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Find Remote Keys" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Where to search:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Search" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Search for keys containing: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Couldn't publish keys to server" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Couldn't retrieve keys from server: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d key is selected for synchronising" -msgstr[1] "%d keys are selected for synchronising" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Synchronising keys…" - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sync Keys" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Key Servers" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sync" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Version of this application" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Confirm new passphrase" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Contributions:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Con_firm Passphrase:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Abigail Brady \n" -"Bastien Nocera \n" -"Gareth Owen \n" -"David Lodge \n" -"Philip Withnall \n" -"Bruce Cowan " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Manage your passwords and encryption keys" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse Project Homepage" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continue" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_File" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Select the type of item to create:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Edit" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Import failed" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Import" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Data to be imported:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_View" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Import Key" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Help" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "All key files" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Prefere_nces" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Dropped text" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Clipboard text" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_New" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Change preferences for this program" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Close this program" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "About this program" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_New…" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Contents" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Create a new key or item" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Show Seahorse help" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Add a new key or item" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Export public key" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Import…" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Exporting keys" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Import from a file" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Couldn't retrieve data from key server" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Import from the clipboard" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Copied keys" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "By _keyring" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Show sidebar listing keyrings" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Show _personal" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Only show personal keys, certificates and passwords" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Show _trusted" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Only show trusted keys, certificates and passwords" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Show _any" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Show all keys, certificates and passwords" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filter" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Retrieving keys" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "First time options:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s is a private key. Are you sure you want to proceed?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Generate a new key of your own: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importing keys from key servers" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Import existing keys from a file:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Show properties" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "To get started with encryption you will need keys." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Delete" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Couldn't lock" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Couldn't unlock" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Delete selected items" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Lock" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xport…" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Unlock" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Export to a file" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Properties" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copy to the clipboard" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configure Key for _Secure Shell…" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Import selected keys to local key ring" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2237,176 +2335,197 @@ msgid "Enter the new passphrase again: %s" msgstr "Enter the new passphrase again: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configure Key for _Secure Shell…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Keys used to connect securely to other computers" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Are you sure you want to delete the secure shell key '%s'?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Are you sure you want to delete %d secure shell keys?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Are you sure you want to delete %d secure shell key?" +msgstr[1] "Are you sure you want to delete %d secure shell keys?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH Key" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Secret SSH keys" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Public SSH keys" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "No public key file is available for this key." -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Couldn't delete key" - -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Secure Shell Key" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Used to access other computers (eg: via a terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Couldn't generate Secure Shell key" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Creating Secure Shell Key" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Use your e-mail address, and any other reminder you need about what this " -"key is for." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"If there is already a computer with which you want to use this key, you can " -"set up that computer to recognise your key now. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "New Secure Shell Key" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Just Create Key" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Create and Set Up" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Just Create Key" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "A Secure Shell (SSH) key lets you connect securely to other computers." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Your e-mail address, or a reminder of what this key is for." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Key Description:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognise your new key." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Unreadable Secure Shell Key)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Personal SSH key" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH key" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Couldn't rename key." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Couldn't change authorisation for key." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Couldn't change passphrase for key." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algorithm:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identifier:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Location:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Name:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Strength:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Used to connect to other computers." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Trust" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "The owner of this key is _authorised to connect to this computer" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "This only applies to the '%s' account." +msgid "This only applies to the %s account." +msgstr "This only applies to the %s account." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xport Complete Key" +msgid "Algorithm:" +msgstr "Algorithm:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "The owner of this key is _authorised to connect to this computer" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Strength:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Location:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Used to connect to other computers." +msgid "E_xport Complete Key" +msgstr "E_xport Complete Key" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "The SSH command was terminated unexpectedly." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "The SSH command failed." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Remote Host Password" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Enter Key Passphrase" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Passphrase for New Secure Shell Key" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importing key: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importing key. Enter passphrase" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH keys" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "No private key file is available for this key." @@ -2419,14 +2538,10 @@ msgstr "Configuring Secure Shell Keys…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "e.g.: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Set Up Computer for SSH Connection" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2434,6 +2549,10 @@ "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "e.g.: fileserver.example.com:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Computer Name:" @@ -2446,11 +2565,193 @@ msgid "_Set Up" msgstr "_Set Up" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "Login keyring" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Access to the key ring was denied" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "The gnome-keyring daemon is not running" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "The key ring has already been unlocked" + +#~ msgid "No such key ring exists" +#~ msgstr "No such key ring exists" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Couldn't communicate with key ring daemon" + +#~ msgid "The item already exists" +#~ msgstr "The item already exists" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Internal error accessing gnome-keyring" + +#~ msgid "Algorithms here" +#~ msgstr "Algorithms here" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Deleting item" +#~ msgstr[1] "Deleting items" + +#~ msgid "Passwords: %s" +#~ msgstr "Passwords: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Passwords: %s" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "Couldn't lock keyring" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Couldn't delete keyring" + +#~ msgid "Archive files" +#~ msgstr "Archive files" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" + +#~ msgid "_Replace" +#~ msgstr "_Replace" + +#~ msgid "_Sign Key..." +#~ msgstr "_Sign Key…" + +#~ msgid "Sign public key" +#~ msgstr "Sign public key" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "Are you sure you want to permanently delete %d keys and identities?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Couldn't delete public key" + +#~ msgid "New PGP Key" +#~ msgstr "New PGP Key" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Couldn't export key to \"%s\"" + +#~ msgid "Export Complete Key" +#~ msgstr "Export Complete Key" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Are you sure you want to delete the certificate '%s'?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Are you sure you want to delete %d certificate?" +#~ msgstr[1] "Are you sure you want to delete %d passwords?" + +#~ msgid "Deleting" +#~ msgstr "Deleting" + +#~ msgid "Create New ..." +#~ msgstr "Create New…" + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Selected %d key" +#~ msgstr[1] "Selected %d keys" + +#~ msgid "Importing keys" +#~ msgstr "Importing keys" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Unrecognised key type, or invalid data format" + +#~ msgid "Importing Keys" +#~ msgstr "Importing Keys" + +#~ msgid "T_ypes" +#~ msgstr "T_ypes" + +#~ msgid "Show type column" +#~ msgstr "Show type column" + +#~ msgid "_Expiry" +#~ msgstr "_Expiry" + +#~ msgid "Show expiry column" +#~ msgstr "Show expiry column" + +#~ msgid "_Trust" +#~ msgstr "_Trust" -#~ msgid "Secure Shell key" -#~ msgstr "Secure Shell key" +#~ msgid "Show owner trust column" +#~ msgstr "Show owner trust column" + +#~ msgid "_Validity" +#~ msgstr "_Validity" + +#~ msgid "Show validity column" +#~ msgstr "Show validity column" + +#~ msgid "Other _Keys" +#~ msgstr "Other _Keys" + +#~ msgid "Validity" +#~ msgstr "Validity" + +#~ msgid "Expiration Date" +#~ msgstr "Expiration Date" + +#~ msgid "_Expand All" +#~ msgstr "_Expand All" + +#~ msgid "Expand all listings" +#~ msgstr "Expand all listings" + +#~ msgid "_Collapse All" +#~ msgstr "_Collapse All" + +#~ msgid "Collapse all listings" +#~ msgstr "Collapse all listings" + +#~ msgid "Export public key" +#~ msgstr "Export public key" + +#~ msgid "Exporting keys" +#~ msgstr "Exporting keys" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Couldn't retrieve data from key server" + +#~ msgid "Retrieving keys" +#~ msgstr "Retrieving keys" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s is a private key. Are you sure you want to proceed?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Couldn't delete key" + +#~ msgid "_Key Description:" +#~ msgstr "_Key Description:" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "Enter a passphrase for your new Secure Shell key." @@ -2461,9 +2762,6 @@ #~ msgid "couldn't fork process" #~ msgstr "couldn't fork process" -#~ msgid "couldn't create new process group" -#~ msgstr "couldn't create new process group" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Encryption Daemon (Seahorse)" @@ -2515,9 +2813,6 @@ #~ msgid "Bad Signature" #~ msgstr "Bad Signature" -#~ msgid "Couldn't verify signature." -#~ msgstr "Couldn't verify signature." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Invalid or unrecognised signer: %s" @@ -2707,9 +3002,6 @@ #~ msgid "Web Password" #~ msgstr "Web Password" -#~ msgid "Network Password" -#~ msgstr "Network Password" - #~ msgid "Couldn't set application access." #~ msgstr "Couldn't set application access." @@ -2828,12 +3120,6 @@ #~ msgid "Symmetric Key" #~ msgstr "Symmetric Key" -#~ msgid "Public Key" -#~ msgstr "Public Key" - -#~ msgid "Private Key" -#~ msgstr "Private Key" - #~ msgid "Credentials" #~ msgstr "Credentials" @@ -2882,9 +3168,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "Synchronising keys" -#~ msgid "Encryption Key Manager" -#~ msgstr "Encryption Key Manager" - #~ msgid "Invalid" #~ msgstr "Invalid" @@ -2982,9 +3265,6 @@ #~ msgid "Removing item" #~ msgstr "Removing item" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "Automatically unlocked when user logs in." - #~ msgid "Couldn't get default password keyring" #~ msgstr "Couldn't get default password keyring" @@ -3039,9 +3319,6 @@ #~ msgid "_Quit" #~ msgstr "_Quit" -#~ msgid "Create a new personal key" -#~ msgstr "Create a new personal key" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "Import keys into your key ring from a file" @@ -3066,9 +3343,6 @@ #~ msgid "_About" #~ msgstr "_About" -#~ msgid "P_roperties" -#~ msgstr "P_roperties" - #~ msgid "E_xport Public Key..." #~ msgstr "E_xport Public Key…" @@ -3287,9 +3561,6 @@ #~ msgid "Couldn't set permissions on backup file." #~ msgstr "Couldn't set permissions on backup file." -#~ msgid "Clipboard Text Encryption" -#~ msgstr "Clipboard Text Encryption" - #~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." #~ msgstr "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." @@ -3329,9 +3600,6 @@ #~ msgid "The clipboard could not be Signed." #~ msgstr "The clipboard could not be Signed." -#~ msgid "Import Failed" -#~ msgstr "Import Failed" - #~ msgid "Keys were found but not imported." #~ msgstr "Keys were found but not imported." @@ -3413,9 +3681,6 @@ #~ msgid "No encrypted or signed text is selected." #~ msgstr "No encrypted or signed text is selected." -#~ msgid "Decrypted text" -#~ msgstr "Decrypted text" - #~ msgid "Verified text" #~ msgstr "Verified text" @@ -3509,9 +3774,6 @@ #~ msgid "Choose Recipients" #~ msgstr "Choose Recipients" -#~ msgid "Couldn't load keys" -#~ msgstr "Couldn't load keys" - #~ msgid "Choose Encrypted File Name for '%s'" #~ msgstr "Choose Encrypted File Name for '%s'" @@ -3917,9 +4179,6 @@ #~ msgid "Choose Signing Key" #~ msgstr "Choose Signing Key" -#~ msgid "The ssh command failed." -#~ msgstr "The ssh command failed." - #~ msgid "Key T_ypes" #~ msgstr "Key T_ypes" @@ -4274,9 +4533,6 @@ #~ msgid "Add the default key as a revoker" #~ msgstr "Add the default key as a revoker" -#~ msgid "Create a revocation certificate" -#~ msgstr "Create a revocation certificate" - #~ msgid "Delete key" #~ msgstr "Delete key" @@ -4285,9 +4541,6 @@ #~ msgstr "" #~ "Publish the selected keys online, and sync any changes others have made." -#~ msgid "Sign key" -#~ msgstr "Sign key" - #~ msgid "_Change Passphrase..." #~ msgstr "_Change Passphrase…" diff -Nru seahorse-3.2.2/po/es.po seahorse-3.6.3/po/es.po --- seahorse-3.2.2/po/es.po 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/es.po 2012-11-12 08:32:13.000000000 +0100 @@ -5,23 +5,24 @@ # Seahorse Spanish Translation # Copyright (C) 2002, 2003. # This file is distributed under the same license as the Seahorse package. -# Jorge González , 2007, 2008, 2009, 2010, 2011. # -# Daniel Mustieles , 2011. , 2011. +# Jorge González , 2007, 2008, 2009, 2010, 2011. , 2011. +# Daniel Mustieles , 2011. , 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-15 10:22+0200\n" +"POT-Creation-Date: 2012-08-17 10:17+0000\n" +"PO-Revision-Date: 2012-07-06 12:20+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Gtranslator 2.91.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gkr/seahorse-add-keyring.xml.h:1 @@ -29,10 +30,6 @@ msgstr "Añadir un depósito de contraseñas" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nombre del nuevo depósito:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -40,309 +37,299 @@ "Elija un nombre para el depósito nuevo. Se le preguntará una contraseña de " "desbloqueo." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nombre del nuevo depósito:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "El nombre del equipo o la dirección del servidor." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "No se pudo añadir el depósito" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Contraseña nueva del depósito de contraseñas" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Ubicación para las contraseñas de aplicaciones" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Contraseña nueva…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Almacenar una contraseña o un secreto de forma segura" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Depósitos de contraseñas" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Contraseña almacenada" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "No se pudo establecer el depósito predeterminado" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "No se pudo cambiar la contraseña del depósito" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Establecer como predeterminado" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Generalmente las aplicaciones almacenan contraseñas en el depósito " +"predeterminado." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Cambiar la _contraseña" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "" +"Cambiar la contraseña de desbloqueo del depósito de almacenamiento de " +"contraseñas" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "No se pudo añadir el elemento" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Añadir contraseña" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Descripción:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Depósito de claves:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Contraseña:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Mostrar contraseña" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "No se pudo eliminar el elemento" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Depósito de claves:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "No se pudo añadir el depósito" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Contraseñas" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Contraseñas personales, credenciales y secretos almacenados" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Contraseña para la cuenta de MI " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Contraseña o secreto" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Contraseña de red" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Nota almacenada" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Contraseña del depósito de claves" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Contraseña de la clave de cifrado" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Contraseña del almacén de claves" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Contraseña de Google chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Contraseña de Gnome Online Accounts" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Contraseña de Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Contraseña de la mensajería instantánea" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Secreto del gestor de la red" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" -msgstr "¿Está seguro de que desea eliminar la contraseña «%s»?" +msgstr "¿Está seguro de que quiere eliminar la contraseña «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "¿Está seguro de que desea eliminar %d contraseña?" -msgstr[1] "¿Está seguro de que desea eliminar %d contraseñas?" +msgstr[0] "¿Está seguro de que quiere eliminar %d contraseña?" +msgstr[1] "¿Está seguro de que quiere eliminar %d contraseñas?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Eliminando elemento" -msgstr[1] "Eliminando elementos" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Acceder a un recurso de red o carpeta compartida" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Acceder a un sitio web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Desbloquea una clave PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Desbloquea una clave de shell segura" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Contraseña o usuario guardado" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Credenciales de red" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Contraseña" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "No se puede cambiar la contraseña." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Actualizando contraseña" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "No se pudo establecer la descripción." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Contraseña:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Detalles técnicos:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalles" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Propiedades de la clave" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Clave" +msgid "Use:" +msgstr "Uso:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Propiedades de la clave" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipo:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Usuario:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Servidor:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Usuario:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Mostrar _contraseña" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipo:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Contraseñas: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Contraseñas: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Depósitos de contraseñas" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Ubicación para las contraseñas de aplicaciones" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Contraseña almacenada" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Almacenar una contraseña o un secreto de forma segura" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "No se pudo desbloquear el depósito" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "No se pudo bloquear el depósito" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "No se pudo establecer el deposito predeterminado" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "No se pudo cambiar la contraseóa del depósito" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Bloquear" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Bloquear el depósito de almacenamiento de contraseñas para que se necesite " -"una contraseña maestra para desbloquearlo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Desbloquear" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Desbloquear el depósito de almacenamiento de contraseñas con una contraseña " -"maestra para que esté disponible para su uso." +msgid "Password:" +msgstr "Contraseña:" -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Establecer como predeterminado" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Clave" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Generalmente las aplicaciones almacenan contraseñas en el depósito " -"predeterminado." +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Detalles técnicos:" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Cambiar la _contraseña" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalles" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" msgstr "" -"Cambiar la contraseña de desbloqueo del depósito de almacenamiento de " -"contraseñas" +"Un almacén de contraseñas que se desbloquea automáticamente al iniciar la " +"sesión" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "No se pudo eliminar el depósito" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Un almacén de claves para almacenar contraseñas" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "¿Está seguro de que desea eliminar la contraseña «%s»?" +msgstr "¿Está seguro de que quiere eliminar la contraseña «%s»?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Eliminando depósito de claves" -msgstr[1] "Eliminando depósitos de claves" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Entiendo que todos los elementos se eliminarán permanentemente." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Propiedades del depósito de claves" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nombre:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Creada:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Depósito de claves" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Propiedades del depósito de claves" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nombre:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Se canceló la operación" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Se ha denegado el acceso al deposito de claves" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "El demonio gnome-keyring no está ejecutándose" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "El depósito de claves ya ha sido desbloqueado" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "No existe dicho depósito de claves" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "No se pudo comunicar con el demonio del depósito de claves" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "El elemento ya existe" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Error interno al acceder a gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Mostrar opciones" @@ -599,270 +586,330 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "elemento temporal inicial" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Añadir servidor de claves" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Anfitrión:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "tipo de servidor de claves:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Anfitrión:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "El puerto por el que acceder al servidor." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "elemento temporal inicial" +msgid "The port to access the server on." +msgstr "El puerto por el que acceder al servidor." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Frase de paso" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versión de esta aplicación" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Contraseña:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr ": configuración del sistema" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirmar:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Contribuciones:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "La dirección del servidor de claves no es válida." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Contraseñas y claves" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Para ayuda, contacte con su administrador de sistemas o el administrador del " -"servidor de claves." - -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +"Jorge González , 2007-2010\n" +"Francisco F. Serrador , 2004, 2005, 2006\n" +"Germán Poo-Caamaño , 2003\n" +"José Carlos García Sogo , 2002, 2003" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Personalizado" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Página web de Seahorse" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Ninguno: no publicar claves" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "No se puede eliminar" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Obtener _automáticamente las claves de los servidores de claves" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "No se pudo exportar las claves" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "" -"Sincronizar automáticamente las claves _modificadas con los servidores de " -"claves" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "No se pudieron exportar los datos" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Servidores de claves" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Archivo" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xportar…" + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exportar parte de la clave pública a un archivo" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Editar" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Importar claves desde el portapapeles" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Eliminar" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Eliminar las claves seleccionadas" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Mostrar las propiedades de este elemento" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Mostrar las propiedades de este depósito de claves" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Prefere_ncias" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Cambia las preferencias de este programa" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Ver" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Ay_uda" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Acerca de este programa" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "Índ_ice" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Mostrar ayuda de seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exportar" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Introducir el PIN o la contraseña para: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Contraseña:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Confirmar:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "La dirección del servidor de claves no es válida." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Para ayuda, contacte con su administrador de sistemas o el administrador del " +"servidor de claves." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Personalizado" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Ninguno: no publicar claves" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Preferencias" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Buscar claves vía:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Publicar claves en:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Obteniendo datos" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Exportando datos" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importando datos" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Obtener _automáticamente las claves de los servidores de claves" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Enviando datos" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"Sincronizar automáticamente las claves _modificadas con los servidores de " +"claves" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "No disponible" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Servidores de claves" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d/%m/%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Datos de la clave" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Claves múltiples" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Todos los archivos de claves" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Todos los archivos" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Archivar ficheros" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Ya existe un fichero con este nombre.\n" -"\n" -"¿Quiere reemplazarlo por uno nuevo?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Reemplazar" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Desconocida" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nunca" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginal" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Completa" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Absoluta" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Deshabilitada" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revocada" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "No se pudo mostrar la ayuda: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Fecha de caducidad:" +msgid "Never E_xpires" +msgstr "Nunca _caduca" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Generar una subclave" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Si la clave no caduca nunca" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipo de clave:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Longitud de clave:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipo de clave:" +msgid "Expiration Date:" +msgstr "Fecha de caducidad:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Longitud de la clave" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nunca _caduca" +msgid "Generate a new subkey" +msgstr "Generar una subclave" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Añadir id de usuario" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Crear el nuevo Id de usuario" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nombre completo:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Co_mentario de clave:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Debe ser al menos 5 caracteres de largo" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Dirección de correo opcional" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Comentario opcional de descripción de la clave" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Dirección de correo opcional" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nombre completo:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "Dirección de _correo:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Co_mentario de clave:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Crear el nuevo Id de usuario" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Cambiar" +msgid "_Never expires" +msgstr "_Sin caducidad" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revocar clave" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Sin caducidad" +msgid "C_hange" +msgstr "_Cambiar" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -873,7 +920,7 @@ msgid "Add subkey to %s" msgstr "Añadir subclave a %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (sólo firmar)" @@ -881,7 +928,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (sólo cifrar)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (sólo firmar)" @@ -902,9 +949,14 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Falló el descifrado. Probablemente no tenga la clave de descifrado." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Se canceló la operación" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" -msgstr "Firma inválida" +msgstr "Firma no válida" #: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" @@ -919,48 +971,149 @@ msgid "Expiry: %s" msgstr "Caducidad: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Claves múltiples" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Datos de la clave" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Claves PGP blindadas" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Clave PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Clave PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Usada para cifrar correo y archivos" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "No se pudo generar la clave PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Frase de paso para la nueva clave PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Introduzca la frase de paso para su clave nueva dos veces." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Al crear una clave se deben generar muchos\n" +"datos aleatorios y se necesita su ayuda. Es una\n" +"buena idea realizar otras tareas como escribir\n" +"con el teclado, mover el ratón o usar aplicaciones.\n" +"Esto proporciona al sistema los datos aleatorios\n" +"necesarios." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Generando clave" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "¿Está seguro de que quiere eliminar permanentemente %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "¿Está seguro de que quiere eliminar permanentemente %d clave?" +msgstr[1] "¿Está seguro de que quiere eliminar permanentemente %d claves?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Contraseña errónea" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Es la tercera vez que ha introducido una contraseña errónea. Inténtelo de " "nuevo." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Frase de paso errónea." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Introduzca la frase de paso para «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Introduzca la frase de paso para «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Introduzca la frase de paso nueva" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Introduzca la frase de paso" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Frase de paso" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d clave cargada" +msgstr[1] "%d claves cargadas" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Datos de clave no válidos (faltan UID). Esto puede ser debido a un equipo " +"con una fecha establecida en el futuro o una autofirma faltante." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Claves GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: directorio predeterminado del depósito" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -995,29 +1148,33 @@ msgid "All JPEG files" msgstr "Todos los archivos JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Todos los archivos" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Elija una foto para añadir a la clave" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "No se pudo preparar la foto" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "No se pudo añadir la foto" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" -msgstr "El archivo no se pudo cargar. Quizá esté en un formato inválido" +msgstr "El archivo no se pudo cargar. Quizá esté en un formato no válido" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" -msgstr "¿Está seguro de que desea quitar la foto actual de su clave?" +msgstr "¿Está seguro de que quiere quitar la foto actual de su clave?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" -msgstr "No se pudo borrar la foto" +msgstr "No se pudo eliminar la foto" #: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" @@ -1073,7 +1230,11 @@ msgid "Couldn't add revoker" msgstr "No se pudo añadir revocador" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Entiendo que esta clave secreta se eliminará permanentemente." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1088,11 +1249,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "No hay claves disponibles para firmar" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1100,511 +1261,573 @@ "No tiene ninguna clave PGP personal que se pueda usar para indicar su " "confianza en esta clave." -#: ../pgp/seahorse-gpgme-source.c:86 +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" + +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Wrong passphrase." -msgstr "Frase de paso errónea." +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"La búsqueda no ha sido lo suficientemente específica. El servidor «%s» " +"encontró demasiadas claves." -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Introduzca la frase de paso para «%s»" +msgid "Couldn't communicate with server '%s': %s" +msgstr "No se pudo comunicar con el servidor «%s»: %s" -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Introduzca la frase de paso para «%s»" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Servidor de claves HTTP" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Introduzca la frase de paso nueva" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "No se pudieron importar las claves" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Introduzca la frase de paso" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importando claves desde servidores de claves" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remota" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Cerrar esta ventana" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Buscar claves remotas…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Buscar claves en un servidor de claves" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importar" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importar las claves seleccionadas en el depósito local" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Claves remotas" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d clave cargada" -msgstr[1] "%d claves cargadas" +msgid "Remote Keys Containing '%s'" +msgstr "Claves remotas que contengan «%s»" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Falló al buscar claves" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Buscar claves remotas" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Datos de clave inválidos (faltan UID). Esto puede ser debido a un equipo con " -"una fecha establecida en el futuro o una autofirma faltante." +"Esto buscará claves para otros en Internet. Estas claves pueden importarse " +"en su depósito local de claves." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Buscar claves que contengan: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Servidor de claves HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Servidores de claves:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Claves compartidas cerca de mí:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Dónde buscar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Buscar" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "No se pudieron publicar las claves al servidor" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"La búsqueda no ha sido lo suficientemente específica. El servidor «%s» " -"encontró demasiadas claves." +msgid "Couldn't retrieve keys from server: %s" +msgstr "No se pueden obtener las claves desde el servidor: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "No se pudo comunicar con el servidor «%s»: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d clave está seleccionada para sincronizar" +msgstr[1] "%d claves están seleccionadas para sincronizar" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Sincronizando claves…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronizar claves" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Esto publicará las claves de su depósito de claves así que estarán " +"disponibles para que otros las usen. También obtendrá cualquier cambio que " +"otros hagan desde que recibió sus claves." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Esto obtendrá cualquier cambio que hagan otros desde que recibió sus claves. " +"No se ha elegido ningún servidor de claves para publicar, así que sus claves " +"no estarán disponibles para otros." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Servidores de _claves" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronizar" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "No se pudo comunicar con «%s»: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Conectando con: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "No se puede resolver la dirección; %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Resolviendo la dirección del servidor: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Servidor de claves LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Firmar clave…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Firmar clave pública" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "¿Está seguro de que desea eliminar permanentemente %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" -"¿Está seguro de que desea eliminar permanentemente %d claves e identidades?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "¿Está seguro de que desea eliminar permanentemente %d claves?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "¿Está seguro de que desea eliminar permanentemente %d identidades?" - -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "No se pudo borrar el ID del usuario" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronizar y publicar claves…" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "No se pudo eliminar la clave privada" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publicar y/o sincronizar sus claves con las que estén en línea." -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "No se pudo eliminar la clave pública" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Claves PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Las claves PGP se usan para cifrar correos electrónicos o archivos" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opciones _avanzadas de clave" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Crear" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "Una clave PGP le permite cifrar correo-e o archivos para otra gente." +msgid "Generate a new key" +msgstr "Generar una clave nueva" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmos aquí" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "Una clave PGP le permite cifrar correo-e o archivos para otra gente." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Crear" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Comentario:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Fecha de _caducidad:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Nunca caduca" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Tipo de cifrado:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Generar una clave nueva" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Fortaleza de la clave (bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Nunca caduca" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Clave PGP nueva" +msgid "E_xpiration Date:" +msgstr "Fecha de _caducidad:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Comentario:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opciones _avanzadas de clave" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Caducada" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Clave PGP personal" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Clave PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "No se puede cambiar el ID de usuario primario" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" -"¿Está seguro de que desea eliminar permanentemente el ID de usuario «%s»?" +"¿Está seguro de que quiere eliminar permanentemente el ID de usuario «%s»?" + +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "No se pudo eliminar el ID del usuario" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Desconocido]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nombre/Correo-e" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID de firma" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "No se puede cambiar la foto primaria" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(desconocido)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Esta clave caducó el: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nombre" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "" -"¿Está seguro de que desea eliminar permanentemente la subclave %d de %s?" +"¿Está seguro de que quiere eliminar permanentemente la subclave %d de %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" -msgstr "No se pudo borrar la subclave" +msgstr "No se pudo eliminar la subclave" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Imposible cambiar la confianza" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "No se pudo exportar la clave a «%s»" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exportar la clave completa" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "No se pudo exportar la clave." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "No se pudo exportar la clave" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nunca" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipo" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Creada" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Caduca" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Estado" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Fortaleza" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Caducada" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Buena" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Identificador" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Acciones" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Comentario:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Fechas" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Correo-e:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Huella" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID de clave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nunca" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nombres de clave y firmas" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Esta clave ha sido revocada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Foto" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "El propietario de la clave revocó la clave. No se puede usar más." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Detalles técnicos" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Esta clave ha caducado" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Esta clave ha sido revocada" +msgid "Add a photo to this key" +msgstr "Añadir una foto a esta clave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Esta clave ha caducado" +msgid "Remove this photo from this key" +msgstr "Quitar esta foto de la clave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipo:" +msgid "Make this photo the primary photo" +msgstr "Convertir esta foto en primaria" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Ir a la foto anterior" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Subclaves" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Ir a la foto siguiente" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Añadir" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Foto" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Añadir una foto a esta clave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID de clave" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Cambiar _frase de paso" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nombre:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Descifra archivos y correo enviado a usted." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Correo-e:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Borrar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Comentario:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Expirar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Uso:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Caducidad:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipo:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exportar" +msgid "Decrypt files and email sent to you." +msgstr "Descifra archivos y correo enviado a usted." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Clave PGP privada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Ir a la foto siguiente" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Cambiar _frase de paso" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Ir a la foto anterior" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Propietario" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Id de clave:" +msgid "Key Names and Signatures" +msgstr "Nombres de clave y firmas" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primario" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Convertir esta foto en primaria" +msgid "Sign" +msgstr "Firmar" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nombres y firmas" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Eliminar" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nunca" +msgid "_Add Name" +msgstr "_Añadir nombre" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Predominar confianza del _propietario:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Propietario" +msgid "Revoke" +msgstr "Revocar" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primario" +msgid "Names and Signatures" +msgstr "Nombres y firmas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Clave PGP privada" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Id de clave:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Quitar esta foto de la clave" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Revocar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Fortaleza:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Firmar" +msgid "Technical Details" +msgstr "Detalles técnicos" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Fortaleza:" +msgid "Fingerprint" +msgstr "Huella" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "El propietario de la clave revocó la clave. No se puede usar más." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Caducidad:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Añadir nombre" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Fechas" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Predominar confianza del _propietario:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Exportar la clave completa:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nombre:" +msgid "Actions" +msgstr "Acciones" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Fechas:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Añadir" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Expirar" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Subclaves" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginal" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Huella:" +msgid "Fully" +msgstr "Completamente" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indicar confianza:" +msgid "Ultimately" +msgstr "Últimamente" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Confianza en esta clave" +msgid "Encrypt files and email to the key's owner" +msgstr "Cifra archivos y correo-e para el propietario de clave" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Clave PGP pública" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Otros nombres:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "Gente que ha _firmado esta clave:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Cifra archivos y correo-e para el propietario de clave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Confianza en esta clave" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Completamente" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "" +"Su confianza está especificada manualmente en la pestaña Detalles." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Confío en las firmas de «%s» en otras claves" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1612,52 +1835,50 @@ msgstr "" "Si cree que el propietario de esta clave es «%s», firme esta clave:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Firma esta clave" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" -"Si no confía más en que «%s» sea el propietario de esta clave, revoque " -"su firma:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginal" +"Si no confía más en que «%s» sea el propietario de esta clave, revoque su firma:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Clave PGP pública" +msgid "_Revoke Signature" +msgstr "_Revocar firma" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "Gente que ha _firmado esta clave:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Mostrar _sólo las firmas de la gente en quien confío" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Confianza" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Últimamente" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Usted _confía en el propietario:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "" -"Su confianza está especificada manualmente en la pestaña Detalles." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Huella:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Mostrar _sólo las firmas de la gente en quien confío" +msgid "Dates:" +msgstr "Fechas:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Revocar firma" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indicar confianza:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Firma esta clave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Usted _confía en el propietario:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1665,55 +1886,61 @@ msgstr "Subclave %d de %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Descripción opcional de revocación" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_vocar" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Razón de revocación de la clave" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Razón:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Descripción opcional de revocación" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Re_vocar" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "No tiene claves PGP personales que se puedan usar para firmar un documento o " "mensaje." -#: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "¿Qué cuidado ha puesto en la comprobación de esta clave?" +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Firmar mensaje con la clave:" + +#: ../pgp/seahorse-sign.xml.h:1 +msgid "Sign Key" +msgstr "Firmar clave" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Cómo verán otros la firma:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Firmando indica que confía que esta clave pertenece a:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Firmar clave como:" +msgid "Key Name" +msgstr "Nombre de la clave" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Casualmente: significa que ha hecho una verificación casual manual de " -"que la clave pertenece a la persona que dice poseerla. Por ejemplo, podría " -"leer la huella al propietario por teléfono." +msgid "How carefully have you checked this key?" +msgstr "¿Qué cuidado ha puesto en la comprobación de esta clave?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nombre de la clave" +msgid "_Not at all" +msgstr "_De ninguna manera" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Casualmente" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Muy cuidadosamente" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1722,7 +1949,17 @@ "persona que dice poseerla, pero usted no puede o no verificó que esto sea un " "hecho." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Casualmente: significa que ha hecho una verificación casual de que la " +"clave pertenece a la persona que dice poseerla. Por ejemplo, podría leer la " +"huella dactilar al propietario por teléfono." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1730,18 +1967,6 @@ "Muy cuidadosamente: Seleccione esto sólo si está absolutamente seguro " "de que esta clave es genuina." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Firmando indica que confía que esta clave pertenece a:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Puedo _revocar esta firma en una fecha posterior." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Firmar clave" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1754,480 +1979,356 @@ "dirección de correo-e pertenece al dueño." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Casualmente" +msgid "How others will see this signature:" +msgstr "Cómo verán otros la firma:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_De ninguna manera" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Otros que no vean esta firma" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Puedo _revocar esta firma en una fecha posterior." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Firmar" +msgid "Sign key as:" +msgstr "Firmar clave como:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Firmante:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Muy cuidadosamente" +msgid "_Sign" +msgstr "_Firmar" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Firmar mensaje con la clave:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Exportando datos" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Obteniendo datos" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importando datos" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Enviando datos" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "No disponible" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Certificado personal y clave" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificado personal" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certificado" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificados (codificados con DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificados" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificados X.509 y claves relacionadas" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "¿Está seguro de que quiere eliminar permanentemente %d certificado?" +msgstr[1] "" +"¿Está seguro de que quiere eliminar permanentemente %d certificados?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "No se pudo generar la clave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Crear" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Clave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Usado para solicitar un certificado" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Crear una clave privada nueva" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etiqueta:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Almacenado en:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Entiendo que esta clave se eliminará permanentemente." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Sin nombre" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Falló al exportar el certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "No se pudo eliminar" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "¿Está seguro de que quiere eliminar el certificado «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "¿Está seguro de que quiere eliminar %d certificado?" -msgstr[1] "¿Está seguro de que quiere eliminar %d certificados?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Eliminando" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exportar" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exportar el certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Eliminar este certificado o clave" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Solicitar _certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Crear un archivo de solicitud de certificado para esta clave" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "No se pudo guardar la solucitud de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Guardar la solicitud de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Solucitud de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Solicitud codificada con PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "No se pudo crear la solicitud de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Crear un archivo de solicitud de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "El nombre común (CN) ubicado en la solicitud de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nombre (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Clave privada sin nombre" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Cambiar frase de paso" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firme contraseña:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "_Frase de paso nueva:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Confirmar frase de paso" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "_Frase de paso nueva:" +msgid "Con_firm Passphrase:" +msgstr "Con_firme contraseña:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Administre sus claves y contraseñas de cifrado" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Contraseñas y claves" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continuar" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Seleccione la clase de clave que quiere crear:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Continuar" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Crear clave nueva…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d clave seleccionada" -msgstr[1] "%d claves seleccionadas" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "No se pudieron importar las claves" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Falló la importación" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importar" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Datos que importar:" -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Claves importadas" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importando claves" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Importar clave" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Tipo de clave no reconocido, o formato de datos inválido" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importando claves" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Todos los archivos de claves" -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remota" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Texto soltado" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Texto del portapapeles" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "Nueva" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Cerrar este programa" -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nueva…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Crear una clave o elemento nuevo" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importar…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importar desde un archivo" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importar desde el portapapeles" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Buscar claves remotas…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Buscar claves en un servidor de claves" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronizar y publicar claves…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publicar y/o sincronizar sus claves con las que estén en línea." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Tipos" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Mostrar la columna del tipo" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Caducidad" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Mostrar la columna de caducidad" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "Co_nfianza" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Mostrar la columna de confianza del propietario" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validez" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Mostrar la columna de validez" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtro:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opciones de primera vez:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Generar una clave nueva para usted: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importar claves existentes desde el archivo:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Mis claves personales" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_Otras claves" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Para cifrar necesitará claves." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importar" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "Contrase_ñas" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "No se pudo exportar las claves" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validez" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Fecha de caducidad" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Cerrar esta ventana" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Expandir todo" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Expandir todos los listados" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Contraer todo" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Contraer todos los listados" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Claves remotas" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Claves remotas que contengan «%s»" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servidores de claves:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Claves compartidas cerca de mí:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Buscar claves remotas" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Esto buscará claves para otros en Internet. Estas claves pueden importarse " -"en su depósito local de claves." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Dónde buscar:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Buscar" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Buscar claves que contengan: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "No se pudieron publicar las claves al servidor" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "No se pueden obtener las claves desde el servidor: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d clave está seleccionada para sincronizar" -msgstr[1] "%d claves están seleccionadas para sincronizar" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Sincronizando claves…" - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronizar claves" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Esto publicará las claves de su depósito de claves así que estarán " -"disponibles para que otros las usen. También obtendrá cualquier cambio que " -"otros hagan desde que recibió sus claves." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Esto obtendrá cualquier cambio que hagan otros desde que recibió sus claves. " -"No se ha elegido ningún servidor de claves para publicar, así que sus claves " -"no estarán disponibles para otros." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Servidores de _claves" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronizar" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versión de esta aplicación" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Contribuciones:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Jorge González , 2007-2010\n" -"Francisco F. Serrador , 2004, 2005, 2006\n" -"Germán Poo-Caamaño , 2003\n" -"José Carlos García Sogo , 2002, 2003" - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Página web de Seahorse" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Archivo" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Editar" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Ver" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Ay_uda" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Prefere_ncias" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Cambia las preferencias de este programa" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Acerca de este programa" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nueva…" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "Índ_ice" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Crear una clave o elemento nuevo" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Mostrar ayuda de seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Añadir una clave o un elemento nuevo" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exportar clave pública" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importar…" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Exportando claves" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importar desde un archivo" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "No se puede obtener los datos del servidor de claves" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importar desde el portapapeles" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Claves copiadas" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Por _depósito de claves" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Mostrar la barra lateral listando los depósitos de claves" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Mostrar p_ersonal" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Mostrar sólo las claves, certificados y contraseñas personales" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Mostrar c_onfiados" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Mostrar sólo claves, certificados y contraseñas en las que se confía" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Mostrar cualq_uiera" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Mostrar todas las claves, certificados y contraseñas" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtro" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Obteniendo claves" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opciones de primera vez:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s es una clave privada. ¿Seguro que quiere continuar?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Generar una clave nueva para usted: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importando claves desde servidores de claves" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importar claves existentes desde el archivo:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Mostrar propiedades de la clave" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Para cifrar necesitará claves." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Borrar" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "No se pudo bloquear" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "No se pudo desbloquear" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Borrar las claves seleccionadas" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Bloquear" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xportar…" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Desbloquear" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exportar parte de la clave pública a un archivo" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propiedades" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Importar claves desde el portapapeles" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configurar clave para Shell _segura…" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importar las claves seleccionadas en el depósito local" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Envía la clave pública de shell segura a otra máquina, y activar inicios de " +"sesión usando esa clave." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2253,182 +2354,204 @@ #: ../ssh/seahorse-ssh-askpass.c:93 #, c-format -#| msgid "Enter the new passphrase for: %s" msgid "Enter the new passphrase again: %s" msgstr "Introduzca la frase de paso otra vez: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configurar clave para Shell _segura…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Envía la clave pública de shell segura a otra máquina, y activar inicios de " -"sesión usando esa clave." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Shell segura" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Claves usadas para conectar de manera segura a otros equipos" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "¿Está seguro de que desea eliminar la clave de shell segura «%s»?" +msgstr "¿Está seguro de que quiere eliminar la clave de shell segura «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "¿Está seguro de que desea eliminar las %d claves de shell seguras?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "¿Está seguro de que quiere eliminar %d clave de shell segura?" +msgstr[1] "¿Está seguro de que quiere eliminar %d claves de shell seguras?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Clave SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Claves SSH secretas" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "No se pudo eliminar la clave" +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Claves SSH públicas" -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "No hay ningún archivo de clave pública disponible para esta clave." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Clave de shell segura" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Usada para acceder a otros equipos (ej: a través de un terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "No se pudo generar la clave de shell segura" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Crear la clave de shell segura" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Use su dirección de correo, y cualquier otro recordatorio que necesite " -"para saber para qué es esta clave." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Una clave de Shell Segura (SSH) le permite conectar de forma segura a " -"equipos confiados usando SSH, sin introducir una contraseña diferente para " -"cada uno de ellos." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Si ya hay un equipo con el que quiera usar esta clave, puede configurar ese " -"equipo para que reconozca su clave ahora." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Clave de shell segura nueva" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Tan sólo crear clave" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Crear y configurar" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Tan sólo crear clave" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Una clave de Shell Segura (SSH) le permite conectarse de forma segura a " +"otros equipos." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Su dirección de correo, o un recordatorio de para qué es esta clave." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Descripción de la clave:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Si ya hay un equipo con el que quiera usar esta clave, puede configurar ese " +"equipo para que reconozca su clave nueva." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Clave de shell segura ilegible)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Clave SSH personal" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Clave SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "No se pudo renombrar la clave." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "No se puede cambiar autorización de una clave." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "No se pudo cambiar la frase de paso para la clave." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmo:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identificador:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Ubicación:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" -msgstr "Nombre" +msgstr "Nombre:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Fortaleza:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Usado para conectar a otros equipos." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Confianza" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"El propietario de esta clave está _autorizado para conectar a este equipo" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Esto sólo se aplica a la cuenta «%s»." +msgid "This only applies to the %s account." +msgstr "Esto sólo se aplica a la cuenta «%s»." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xportar la clave completa" +msgid "Algorithm:" +msgstr "Algoritmo:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"El propietario de esta clave está _autorizado para conectar a este equipo" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Fortaleza:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Ubicación:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Usado para conectar a otros equipos." +msgid "E_xport Complete Key" +msgstr "E_xportar la clave completa" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "El comando SSH terminó inesperadamente." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "El comando SSH falló." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Contraseña del equipo remoto" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Introduzca la frase de paso" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Frase de paso para la clave nueva de shell segura" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importando clave: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importando clave: Introduzca la frase de paso" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Claves OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "No existe un archivo de clave privada disponible para esta clave." @@ -2441,14 +2564,10 @@ msgstr "Configurando las claves de shell seguras…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "ej: servidor.ejemplo.com:puerto" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configurar equipo para conexión SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2456,6 +2575,10 @@ "Para usar su clave de shell segura con otro equipo que use SSH debe tener ya " "una cuenta de shell en dicho equipo." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "ej: servidor.ejemplo.com:puerto" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Equipo:" @@ -2468,30 +2591,287 @@ msgid "_Set Up" msgstr "Co_nfigurar" +#~ msgid "Login keyring" +#~ msgstr "Depósito de inicio de sesión" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Se ha denegado el acceso al deposito de claves" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "El demonio gnome-keyring no está ejecutándose" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "El depósito de claves ya ha sido desbloqueado" + +#~ msgid "No such key ring exists" +#~ msgstr "No existe dicho depósito de claves" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "No se pudo comunicar con el demonio del depósito de claves" + +#~ msgid "The item already exists" +#~ msgstr "El elemento ya existe" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Error interno al acceder a gnome-keyring" + +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "¿Está seguro de que desea eliminar las %d claves de shell seguras?" + +#~ msgid "Algorithms here" +#~ msgstr "Algoritmos aquí" + +#~ msgid "OpenSSH directory" +#~ msgstr "Carpeta de OpenSSH" + +#~ msgid "Show the properties of this place" +#~ msgstr "Mostrar las propiedades de este lugar" + +#~ msgid "P_laces" +#~ msgstr "_Lugares" + +#~ msgid "Show places sidebar" +#~ msgstr "Mostrar la barra lateral de lugares" + +#~ msgid "Couldn't unlock keyring" +#~ msgstr "No se pudo desbloquear el depósito" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "No se pudo bloquear el depósito" + +#~ msgid "Couldn't delete keyring" +#~ msgstr "No se pudo eliminar el depósito" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Bloquear el depósito de almacenamiento de contraseñas para que se " +#~ "necesite una contraseña maestra para desbloquearlo." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Desbloquear el depósito de almacenamiento de contraseñas con una " +#~ "contraseña maestra para que esté disponible para su uso." + +#~ msgid "Properties of the keyring." +#~ msgstr "Propiedades del depósito de claves" + +#~ msgid "Delete the keyring." +#~ msgstr "Eliminar el depósito de claves." + +#~ msgid "Lock the password storage keyring." +#~ msgstr "Bloquear el depósito de almacenamiento de contraseñas." + +#~ msgid "Unlock the password storage keyring." +#~ msgstr "Desbloquear el depósito de almacenamiento de contraseñas." + +#~ msgid "Properties of the password." +#~ msgstr "Propiedades de la contraseña." + +#~ msgid "_Sign Key..." +#~ msgstr "_Firmar clave…" + +#~ msgid "Sign public key" +#~ msgstr "Firmar clave pública" + +#~ msgid "Properties of the key." +#~ msgstr "Propiedades de la clave" + +#~ msgid "Lock this token" +#~ msgstr "Bloquear este «token»" + +#~ msgid "Unlock this token" +#~ msgstr "Desbloquear este «token»" + +#~ msgid "Properties of the certificate." +#~ msgstr "Propiedades del certificado" + +#~ msgid "Deleting keyring" +#~ msgid_plural "Deleting keyrings" +#~ msgstr[0] "Eliminando depósito de claves" +#~ msgstr[1] "Eliminando depósitos de claves" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Eliminando elemento" +#~ msgstr[1] "Eliminando elementos" + +#~ msgid "Delete the password." +#~ msgstr "Eliminar la contraseña." + +#~ msgid "Archive files" +#~ msgstr "Archivar ficheros" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Ya existe un fichero con este nombre.\n" +#~ "\n" +#~ "¿Quiere reemplazarlo por uno nuevo?" + +#~ msgid "_Replace" +#~ msgstr "_Reemplazar" + +#~ msgid "Export public key" +#~ msgstr "Exportar clave pública" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "No se pudo exportar la clave a «%s»" + +#~ msgid "Exporting keys" +#~ msgstr "Exportando claves" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "No se puede obtener los datos del servidor de claves" + +#~ msgid "Retrieving keys" +#~ msgstr "Obteniendo claves" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "¿Está seguro de que desea eliminar permanentemente %d claves e " +#~ "identidades?" + +#~ msgid "Couldn't delete private key" +#~ msgstr "No se pudo eliminar la clave privada" + +#~ msgid "Couldn't delete public key" +#~ msgstr "No se pudo eliminar la clave pública" + +#~ msgid "Delete the key." +#~ msgstr "Eliminar la clave" + +#~ msgid "Export Complete Key" +#~ msgstr "Exportar la clave completa" + +#~ msgid "Couldn't export key." +#~ msgstr "No se pudo exportar la clave." + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "¿Está seguro de que quiere eliminar el certificado «%s»?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "¿Está seguro de que quiere eliminar %d certificado?" +#~ msgstr[1] "¿Está seguro de que quiere eliminar %d certificados?" + +#~ msgid "Deleting" +#~ msgstr "Eliminando" + +#~ msgid "Delete the certificate." +#~ msgstr "Eliminar el certificado." + +#~ msgid "Also delete matching private key" +#~ msgstr "Eliminar también la clave privada coincidente" + +#~ msgid "Are you sure you want to delete the private key '%s'?" +#~ msgstr "¿Está seguro de que quiere eliminar la clave privada «%s»?" + +#~ msgid "Couldn't delete key" +#~ msgstr "No se pudo eliminar la clave" + +#~ msgid "Extra _Action" +#~ msgstr "_Acción adicional" + +#~| msgid "Properties of the certificate." +#~ msgid "An extra action on the certificate" +#~ msgstr "Una acción adicional sobre el certificado" + +#~ msgid "Passwords: %s" +#~ msgstr "Contraseñas: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Contraseñas: %s" + +#~ msgid "New PGP Key" +#~ msgstr "Clave PGP nueva" + +#~ msgid "Create New ..." +#~ msgstr "Crear clave nueva…" + +#~ msgid "Importing keys" +#~ msgstr "Importando claves" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Tipo de clave no reconocido, o formato de datos inválido" + +#~ msgid "Importing Keys" +#~ msgstr "Importando claves" + +#~ msgid "T_ypes" +#~ msgstr "_Tipos" + +#~ msgid "Show type column" +#~ msgstr "Mostrar la columna del tipo" + +#~ msgid "_Expiry" +#~ msgstr "_Caducidad" + +#~ msgid "Show expiry column" +#~ msgstr "Mostrar la columna de caducidad" + +#~ msgid "_Trust" +#~ msgstr "Co_nfianza" + +#~ msgid "Show owner trust column" +#~ msgstr "Mostrar la columna de confianza del propietario" + +#~ msgid "_Validity" +#~ msgstr "_Validez" + +#~ msgid "Show validity column" +#~ msgstr "Mostrar la columna de validez" + +#~ msgid "Other _Keys" +#~ msgstr "_Otras claves" + +#~ msgid "_Passwords" +#~ msgstr "Contrase_ñas" + +#~ msgid "Validity" +#~ msgstr "Validez" + +#~ msgid "Expiration Date" +#~ msgstr "Fecha de caducidad" + +#~ msgid "_Expand All" +#~ msgstr "_Expandir todo" + +#~ msgid "Expand all listings" +#~ msgstr "Expandir todos los listados" + +#~ msgid "_Collapse All" +#~ msgstr "_Contraer todo" + +#~ msgid "Collapse all listings" +#~ msgstr "Contraer todos los listados" + +#~ msgid "Copied keys" +#~ msgstr "Claves copiadas" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s es una clave privada. ¿Seguro que quiere continuar?" + +#~ msgid "_Key Description:" +#~ msgstr "_Descripción de la clave:" + #~ msgid "Web Password" #~ msgstr "Contraseña web" -#~ msgid "Network Password" -#~ msgstr "Contraseña de red" - #~ msgid "Symmetric Key" #~ msgstr "Clave simétrica" -#~ msgid "Public Key" -#~ msgstr "Clave pública" - -#~ msgid "Private Key" -#~ msgstr "Clave privada" - #~ msgid "Credentials" #~ msgstr "Credenciales" #~ msgid "Identity" #~ msgstr "Identidad" -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "Inválido" @@ -2501,9 +2881,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "Clave de shell segura pública" -#~ msgid "Secure Shell key" -#~ msgstr "Clave de shell segura" - #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "Introduzca una frase de paso para su clave de shell segura nueva." @@ -2511,22 +2888,12 @@ #~ msgid "Deleting items" #~ msgstr "Eliminado elementos" -#~| msgid "Deleting keyring..." -#~ msgid "Deleting keyrings" -#~ msgstr "Eliminando depósitos de claves" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Administrador de claves de cifrado" - #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "No ejecutar seahorse-daemon como un demonio" #~ msgid "couldn't fork process" #~ msgstr "no se pudo bifurcar el proceso" -#~ msgid "couldn't create new process group" -#~ msgstr "no se pudo crear un grupo de proceso nuevo" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Demonio de cifrado (Seahorse)" @@ -2580,9 +2947,6 @@ #~ msgid "Bad Signature" #~ msgstr "Firma mala" -#~ msgid "Couldn't verify signature." -#~ msgstr "No se pudo verificar la firma." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Firmante inválido o no reconocido: %s" @@ -2713,8 +3077,8 @@ #~ "order." #~ msgstr "" #~ "Especificar la columna por la que ordenar la ventana de destinatarios. " -#~ "Las columnas son: «nombre» e «id». Ponga un «-» en frente del nombre de la " -#~ "columna para ordenarlos en orden descendente." +#~ "Las columnas son: «nombre» e «id». Ponga un «-» en frente del nombre de " +#~ "la columna para ordenarlos en orden descendente." #~ msgid "" #~ "Specify the column to sort the seahorse key manager main window by. " @@ -2723,8 +3087,8 @@ #~ msgstr "" #~ "Especificar la columna por la que ordenar la ventana principal del " #~ "administrador de claves. Las columnas son: «nombre», «id», «validez», " -#~ "«caducidad», «confianza» y «tipo». Ponga un «-» en frente del nombre de la " -#~ "columna para ordenarlos en orden descendente." +#~ "«caducidad», «confianza» y «tipo». Ponga un «-» en frente del nombre de " +#~ "la columna para ordenarlos en orden descendente." #~ msgid "The ID of the last secret key used to sign a message." #~ msgstr "El ID de la última clave secreta usada para firmar un mensaje." @@ -2910,9 +3274,6 @@ #~ msgid "Loading Keys..." #~ msgstr "Cargando claves…" -#~ msgid "Searching for keys..." -#~ msgstr "Buscando claves…" - #~ msgid "Uploading keys..." #~ msgstr "Subiendo claves…" @@ -3023,15 +3384,9 @@ #~ msgid "_About" #~ msgstr "Acerca _de" -#~ msgid "P_roperties" -#~ msgstr "_Propiedades" - #~ msgid "_Copy" #~ msgstr "_Copiar" -#~ msgid "Passwords" -#~ msgstr "Contraseñas" - #~ msgid "Unavailable Key" #~ msgstr "Clave no disponible" @@ -3044,9 +3399,6 @@ #~ msgid "unknown" #~ msgstr "desconocido" -#~ msgid "" -#~ msgstr "" - #~ msgid "Fingerprints" #~ msgstr "Huellas" @@ -3063,9 +3415,6 @@ #~ msgid "Validity" #~ msgstr "Validez" -#~ msgid "Common Name (CN)" -#~ msgstr "Nombre común (CN)" - #~ msgid "Email Recipient Certificate" #~ msgstr "Certificado del destinatario del correo-e" @@ -3090,9 +3439,6 @@ #~ msgid "SHA1 Fingerprint" #~ msgstr "Huella SHA1" -#~ msgid "SSL Client Certificate" -#~ msgstr "Certificado de cliente SSL" - #~ msgid "SSL Server Certificate" #~ msgstr "Certificado de servidor SSL" diff -Nru seahorse-3.2.2/po/et.po seahorse-3.6.3/po/et.po --- seahorse-3.2.2/po/et.po 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/po/et.po 2012-09-25 14:50:51.000000000 +0200 @@ -6,332 +6,139 @@ # # Priit Laes , 2007. # Ivar Smolin , 2007–2011. -# Mattias Põldaru , 2009. +# Mattias Põldaru , 2009, 2012. # msgid "" msgstr "" "Project-Id-Version: Seahorse MASTER\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=seahorse&component=general\n" -"POT-Creation-Date: 2011-01-19 20:34+0000\n" -"PO-Revision-Date: 2011-01-22 10:31+0200\n" -"Last-Translator: Ivar Smolin \n" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-22 19:01+0000\n" +"PO-Revision-Date: 2012-08-21 09:23+0300\n" +"Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian \n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -msgid "Do not run seahorse-daemon as a daemon" -msgstr "Programmi seahorse-daemon käivitamine mitte-deemonina" - -msgid "couldn't fork process" -msgstr "protsessi pole võimalik forkida!" - -msgid "couldn't create new process group" -msgstr "uut protsessigruppi pole võimalik luua" - -msgid "Encryption Daemon (Seahorse)" -msgstr "Krüptimisdeemon (Seahorse)" - -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "Vigane või tundmatu võtmeliik: %s" - -#, c-format -msgid "This keytype is not supported: %s" -msgstr "Seda liiki võtmed pole toetatud: %s" - -#, c-format -msgid "Support for this feature was not enabled at build time" -msgstr "Selle võimaluse tuge ei lülitatud kompileerimisel sisse" - -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "Vigane või tundmatu võti: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#, c-format -msgid "Signed by expired on %s." -msgstr "Allkirjastaja: , aegunud: %s." - -msgid "Invalid Signature" -msgstr "Vigane allkiri" - -#, c-format -msgid "Signed by on %s Expired." -msgstr "Allkirjastanud %s, aegunud." - -msgid "Expired Signature" -msgstr "Aegunud allkiri" - -#, c-format -msgid "Signed by Revoked on %s." -msgstr "Allkirjastaja: , tühistatud: %s." - -msgid "Revoked Signature" -msgstr "Tühistatud allkiri" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" -#. TRANSLATORS: is a custom markup tag, do not translate. -#, c-format -msgid "Signed by on %s." -msgstr "Allkirjastanud %s." - -msgid "Good Signature" -msgstr "Hea allkiri" - -msgid "Signing key not in keyring." -msgstr "Allkirjastamise võti pole võtmerõngas." - -msgid "Unknown Signature" -msgstr "Tundmatu allkiri" - -msgid "Bad or forged signature. The signed data was modified." -msgstr "Halb või võltsitud allkiri. Allkirjastatud andmeid on muudetud." - -msgid "Bad Signature" -msgstr "Halb allkiri" - -msgid "Couldn't verify signature." -msgstr "Allkirja pole võimalik verifitseerida." - -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "Vigane või tundmatu allkirjastaja: %s" - -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "Võti pole allkirjastamiseks sobilik: %s" - -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "Vigane või tundmatu saaja: %s" - -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "Võti pole krüptimiseks sobilik: %s" - -#, c-format -msgid "No recipients specified" -msgstr "Saaja on määramata" - -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "Võtme liik pole lahtikrüptimiseks sobilik: %s" - -#, c-format -msgid "Please set clearuri" -msgstr "Palun määra clearuri" - -#, c-format -msgid "Please set crypturi" -msgstr "Palun määra crypturi" - -#, c-format -msgid "Error opening clearuri" -msgstr "Viga clearuri avamisel" - -#, c-format -msgid "No signer specified" -msgstr "Allkirjastaja on määramata" - -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "Võtme liik pole verifitseerimiseks sobilik: %s" - -#, c-format -msgid "Invalid key id: %s" -msgstr "Vigane võtme ID: %s" - -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"PGP-kaugvõtmete otsimiseks kasutatavate võtmeserverite URI-de nimekiri. " -"Hilisemates versioonides võidakse siia kaasata ka kuvatav nimi, lisades URI-" -"le tühiku ja nime." - -msgid "Auto Retrieve Keys" -msgstr "Võtmete automaatne vastuvõtmine" - -msgid "Auto Sync Keys" -msgstr "Automaatne võtmete sünkroniseerimine" - -msgid "Controls the visibility of the expires column for the key manager." -msgstr "Võtmehalduris aegumise veeru nähtavaloleku määramine." - -msgid "Controls the visibility of the trust column for the key manager." -msgstr "Võtmehalduris usalduse veeru nähtavaloleku määramine." - -msgid "Controls the visibility of the type column for the key manager." -msgstr "Võtmehalduris liigi veeru nähtavaloleku määramine." - -msgid "Controls the visibility of the validity column for the key manager." -msgstr "Võtmehalduris kehtivuse veeru nähtavaloleku määramine." - -msgid "Enable DNS-SD sharing" -msgstr "DNS-SD jagamise lubamine" - -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"DNS-SD (Apple Bonjour) võtmete jagamise lubamine. Selleks peab seahorse-" -"daemon töötama ja deemonil peab olema HKP ja DNS-SD tugi." - -msgid "ID of the default key" -msgstr "Vaikimisi võtme ID" +msgid "Add Password Keyring" +msgstr "Parooli võtmerõnga lisamine" msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." msgstr "" -"Kui märgitud, siis seahorse poolt krüptitud failid väljastatakse ASCII-" -"vormingus, vastasel juhul aga mitte." +"Palun määra uuele võtmerõngale nimi. Lukust lahtivõtmise kohta küsitakse " +"parooli." -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "" -"Kui määratud, siis vaikimisi võti lisatakse alati krüptogrammi vastuvõtjate " -"nimekirjale." +msgid "New Keyring Name:" +msgstr "Uue võtmerõnga nimi:" -msgid "Last key server search pattern" -msgstr "Viimane võtmeserveri otsingumuster" +msgid "The host name or address of the server." +msgstr "Serveri hostinimi või aadress." -msgid "Last key servers used" -msgstr "Viimati kasutatud võtmeserverid" +msgid "New password keyring" +msgstr "Uus paroolide võtmerõngas" -msgid "Last key used to sign a message." -msgstr "Sõnumi allkirjastamiseks viimati kasutatud võti." +msgid "Used to store application and network passwords" +msgstr "Kasutatakse rakenduste ja võrguparoolide salvestamiseks" -msgid "PGP Key servers" -msgstr "PGP võtmeserverid" +msgid "New password..." +msgstr "Uus parool..." -msgid "Publish keys to this key server." -msgstr "Võtmed avalikustatakse selles võtmeserveris." +msgid "Safely store a password or secret." +msgstr "Parooli või saladuse turvaline salvestamine." -msgid "Show expires column in key manager" -msgstr "Aegumisveeru näitamine võtmehalduris" +msgid "Password Keyring" +msgstr "Paroolide võtmerõngas" -msgid "Show trust column in key manager" -msgstr "Usaldusveeru näitamine võtmehalduris" +msgid "Stored Password" +msgstr "Salvestatud parool" -msgid "Show type column in key manager" -msgstr "Võtme liigi veeru näitamine võtmehalduris" +msgid "Couldn't set default keyring" +msgstr "Vaikimisi paroolide võtmerõngast pole võimalik määrata" -msgid "Show validity column in key manager" -msgstr "Kehtivusveeru näitamine võtmehalduris" +msgid "Couldn't change keyring password" +msgstr "Võtmerõnga parooli pole võimalik muuta" -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"Mis veeru järgi vastuvõtjate aknas andmeid sorditakse. Võimalikud väärtused " -"on: 'name' (nimi) ja 'id'. Pööratud järjestuse kasutamiseks tuleb veeru nime " -"algusesse lisada '-'." +msgid "_Set as default" +msgstr "_Määra kui vaikimisi" -msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." +msgid "Applications usually store new passwords in the default keyring." msgstr "" -"Mis veeru järgi seahorse võtmehalduri peaaknas andmeid sorditakse. " -"Võimalikud väärtused on: 'name' (nimi), 'id', 'validity' (kehtivus), " -"'expires' (aegumine), 'trust' (usaldus) ja 'type' (liik). Pööratud " -"järjestuse kasutamiseks tuleb veeru nime algusesse lisada '-'." +"Rakendused salvestavad uued paroolid tavaliselt vaikimisi võtmerõngasse." -msgid "The ID of the last secret key used to sign a message." -msgstr "Sõnumi allkirjastamisel kasutatud viimase salajase võtme ID." +msgid "Change _Password" +msgstr "Muuda _parooli" -msgid "The column to sort the recipients by" -msgstr "Saajate sortimise veerg" +msgid "Change the unlock password of the password storage keyring" +msgstr "Muuda paroolide võtmerõnga hoidla luku parool" -msgid "The column to sort the seahorse keys by" -msgstr "Seahorse võtmete sortimise veerg" +msgid "Couldn't add item" +msgstr "Kirjet pole võimalik lisada" -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"PGP-võtmete avaldamiseks kasutatav võtmeserver. Kui võtmeid ei soovita " -"avadada, siis on see tühi." +msgid "Add Password" +msgstr "Parooli lisamine" -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "" -"Viimane võtmeserver, millest otsingut läbi viidi. Tühi väärtus tähendab " -"kõiki võtmeservereid." +msgid "_Description:" +msgstr "_Kirjeldus:" -msgid "The last search pattern searched for against a key server." -msgstr "Võtmeserverist otsimisel viimati kasutatud muster." +msgid "_Password:" +msgstr "_Parool:" -msgid "" -"This specifies the default key to use for certain operations, mainly signing." -msgstr "" -"Sellega määratakse teatavateks tegevusteks (peamiselt allkirjastamiseks) " -"vaikimisi võti." +msgid "_Show Password" +msgstr "_Parooli näidatakse" -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "Kas võtmeid tuleb võtmeserveritest automaatselt tõmmata või mitte." +msgid "_Keyring:" +msgstr "_Võtmerõngas:" -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." -msgstr "" -"Kas muudetud võtmed tuleb automaatselt võtmeserveriga sünkroniseerida või " -"mitte." +msgid "Couldn't add keyring" +msgstr "Võtmerõngast pole võimalik lisada" -msgid "Whether to always encrypt to default key" -msgstr "Kas vaikimisi võti krüptitakse alati või mitte" +msgid "Passwords" +msgstr "Paroolid" -msgid "Whether to use ASCII Armor" -msgstr "Kas kasutada ASCII-vormingut või mitte" +msgid "Stored personal passwords, credentials and secrets" +msgstr "Salvestatud isiklikud paroolid, võtmed ja saladused" -msgid "Add Password Keyring" -msgstr "Parooli võtmerõnga lisamine" +#. Translators: This should be the same as the string in empathy +msgid "IM account password for " +msgstr "Kiirsuhtluskonto parool:" -msgid "New Keyring Name:" -msgstr "Uue võtmerõnga nimi:" +msgid "Password or secret" +msgstr "Parool või saladus" -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"Palun määra uuele võtmerõngale nimi. Lukust lahtivõtmise kohta küsitakse " -"parooli." +msgid "Network password" +msgstr "Võrguparool" -msgid "The host name or address of the server." -msgstr "Serveri hostinimi või aadress." +msgid "Stored note" +msgstr "Salvestatud märkus" -msgid "Couldn't add keyring" -msgstr "Võtmerõngast pole võimalik lisada" +msgid "Keyring password" +msgstr "Võtmerõnga parool" -msgid "Add Password" -msgstr "Parooli lisamine" +msgid "Encryption key password" +msgstr "Krüptimisvõtme parool" -msgid "_Description:" -msgstr "_Kirjeldus:" +msgid "Key storage password" +msgstr "Võtmete salvestamise parool" -msgid "_Keyring:" -msgstr "_Võtmerõngas:" +msgid "Google Chrome password" +msgstr "Google Chrome'i parool" -msgid "_Password:" -msgstr "_Parool:" +msgid "Gnome Online Accounts password" +msgstr "Gnome'i veebikontode parool" -msgid "_Show Password" -msgstr "_Parooli näidatakse" +msgid "Telepathy password" +msgstr "Telepathy parool" -msgid "Web Password" -msgstr "Veebiparool" +msgid "Instant messaging password" +msgstr "Kiirsõnumivahetuse parool" -msgid "Network Password" -msgstr "Võrguparool" - -msgid "Password" -msgstr "Parool" +msgid "Network Manager secret" +msgstr "Võrguhalduri saladus" #, c-format msgid "Are you sure you want to delete the password '%s'?" @@ -361,228 +168,75 @@ msgid "Network Credentials" msgstr "Võrgutõendid" +msgid "Password" +msgstr "Parool" + msgid "Couldn't change password." msgstr "Parooli pole võimalik muuta." +msgid "Updating password" +msgstr "Parooli uuendamine" + msgid "Couldn't set description." msgstr "Kirjeldust pole võimalik määrata." -msgid "Couldn't set application access." -msgstr "Rakenduse ligipääsu pole võimalik määrata." - -msgid "Password:" -msgstr "Parool:" - -msgid "Path:" -msgstr "Rada:" - -msgid "Permissions:" -msgstr "Pääsuõigused:" - -msgid "Technical Details:" -msgstr "Tehnilised üksikasjad:" - -msgid "Applications" -msgstr "Rakendused" - -msgid "Details" -msgstr "Üksikasjad" - -msgid "Key" -msgstr "Võti" - msgid "Key Properties" msgstr "Võtme omadused" -msgid "Login:" -msgstr "Konto:" - -msgid "Server:" -msgstr "Server:" - -msgid "Show pass_word" -msgstr "_Parooli näidatakse" - -msgid "Type:" -msgstr "Liik:" - #. To translators: This is the noun not the verb. msgid "Use:" msgstr "Kasutus:" -#. To translators: This is the infinitive not the imperative. -msgid "_Read" -msgstr "_Lugemine" - -#. To translators: This is the infinitive not the imperative. -msgid "_Write" -msgstr "_Kirjutamine" - -msgctxt "infinitive" -msgid "_Delete" -msgstr "K_ustutamine" - -msgid "Listing passwords" -msgstr "Paroolide nimekirja kuvamine" - -#, c-format -msgid "Passwords: %s" -msgstr "Paroolid: %s" - -#, c-format -msgid "Passwords: %s" -msgstr "Paroolid: %s" - -msgid "Password Keyring" -msgstr "Paroolide võtmerõngas" - -msgid "Used to store application and network passwords" -msgstr "Kasutatakse rakenduste ja võrguparoolide salvestamiseks" - -msgid "Stored Password" -msgstr "Salvestatud parool" - -msgid "Safely store a password or secret." -msgstr "Parooli või saladuse turvaline salvestamine." - -msgid "Couldn't unlock keyring" -msgstr "Võtmerõngast pole võimalik lukust lahti võtta" - -msgid "Couldn't lock keyring" -msgstr "Võtmerõngast pole võimalik lukustada" +msgid "Type:" +msgstr "Liik:" -msgid "Couldn't set default keyring" -msgstr "Vaikimisi paroolide võtmerõngast pole võimalik määrata" +msgid "Server:" +msgstr "Server:" -msgid "Couldn't change keyring password" -msgstr "Võtmerõnga parooli pole võimalik muuta" +msgid "Login:" +msgstr "Konto:" -msgid "_Lock" -msgstr "_Lukusta" +msgid "Show pass_word" +msgstr "_Parooli näidatakse" -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Lukusta paroolide võtmerõnga hoidla, nii on selle avamiseks vaja ülemparooli." +msgid "Password:" +msgstr "Parool:" -msgid "_Unlock" -msgstr "_Võta lukust lahti" +msgid "Key" +msgstr "Võti" -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Võta paroolide võtmerõnga hoidla ülemparooli abil lukust lahti, et seda " -"saaks kasutada." +msgid "Technical Details:" +msgstr "Tehnilised üksikasjad:" -msgid "_Set as default" -msgstr "_Määra kui vaikimisi" +msgid "Details" +msgstr "Üksikasjad" -msgid "Applications usually store new passwords in the default keyring." +msgid "A keyring that is automatically unlocked on login" msgstr "" -"Rakendused salvestavad uued paroolid tavaliselt vaikimisi võtmerõngasse." +"Võtmerõngas, mis võetakse kasutaja sisselogimisel automaatselt lukust lahti." -msgid "Change _Password" -msgstr "Muuda _parooli" - -msgid "Change the unlock password of the password storage keyring" -msgstr "Muuda paroolide võtmerõnga hoidla luku parool" +msgid "A keyring used to store passwords" +msgstr "Võtmerõngas paroolide salvestamiseks" #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Kas sa soovid paroolide võtmerõnga '%s' kustutada?" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -msgid "Created:" -msgstr "Loodud:" - -msgid "Keyring" -msgstr "Võtmerõngas" +msgid "I understand that all items will be permanently deleted." +msgstr "Ma saan aru, et kõik kirjed kustutatakse jäädavalt." msgid "Keyring Properties" msgstr "Võtmerõnga omadused" -msgid "_Name:" -msgstr "_Nimi:" - -msgid "Access to the key ring was denied" -msgstr "Ligipääs võtmerõngale on keelatud" - -msgid "The gnome-keyring daemon is not running" -msgstr "GNOME võtmerõnga deemon pole käivitatud" +msgid "Name:" +msgstr "Nimi:" -msgid "The key ring has already been unlocked" -msgstr "Võtmerõngas on juba lukust lahti" - -msgid "No such key ring exists" -msgstr "Sellist võtmerõngast pole olemas" - -msgid "Couldn't communicate with key ring daemon" -msgstr "Võtmerõngadeemoniga pole võimalik suhelda" - -msgid "The item already exists" -msgstr "Kirje on juba olemas" - -msgid "Internal error accessing gnome-keyring" -msgstr "Sisemine viga gnome-keyring'iga suhtlemisel" - -msgid "Saving item..." -msgstr "Kirje salvestamine..." - -msgid "Deleting item..." -msgstr "Kirje kustutamine..." - -msgid "Deleting keyring..." -msgstr "Võtmerõnga kustutamine..." - -msgid "Listing password keyrings" -msgstr "Paroolide võtmerõngaste loend" - -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"Krüpteerimisvõtmeid ei leitud, millega sooritada nõutud tegevust. Nüüd " -"käivitatakse rakendus Paroolid ja krüptimisvõtmed ning seal on " -"võimalik importida võti või luua uus." - -msgid "All Keys" -msgstr "Kõik võtmed" - -msgid "Selected Recipients" -msgstr "Valitud adressaadid" - -msgid "Search Results" -msgstr "Otsingutulemused" - -#. Filter Label -msgid "Search _for:" -msgstr "Otsitakse _fraasi:" - -msgid "None (Don't Sign)" -msgstr "Ei allkirjastata" - -#, c-format -msgid "Sign this message as %s" -msgstr "Allkirjasta see sõnum isikuna %s" - -#. Sign Label -msgid "_Sign message as:" -msgstr "_Sõnum allkirjastakse kui:" - -#. TODO: Icons -#. The name column -msgid "Name" -msgstr "Nimi" +#. To translators: This is the noun not the verb. +msgid "Created:" +msgstr "Loodud:" -#. The keyid column -msgid "Key ID" -msgstr "Võtme ID" +msgid "Keyring" +msgstr "Võtmerõngas" msgid "Display flags" msgstr "Kuvamislipud" @@ -780,119 +434,114 @@ msgid "%u:%u:%u" msgstr "%u:%u:%u" -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Fail ei ole sobivas .desktop vormingus" +msgid "initial temporary item" +msgstr "ajutine lähtestamiskirje" -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Töölauafaili tundmatu versioon '%s'" +msgid "Add Key Server" +msgstr "Võtmeserveri lisamine" -#, c-format -msgid "Starting %s" -msgstr "%s käivitamine" +msgid "Key Server Type:" +msgstr "Võtmeserveri liik:" -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Rakendus ei toeta käsurea kaudu dokumentide avamist" +msgid "Host:" +msgstr "Host:" -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Tundmatu käivitusvalik: %d" +msgid ":" +msgstr ":" -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Dokumendi URI-sid pole võimalik 'Liik=Viit' tüüpi töölauakirjetele edastada" +msgid "The port to access the server on." +msgstr "Serveri port, kuhu tuleb ühenduda." -#, c-format -msgid "Not a launchable item" -msgstr "Pole käivitatav kirje" +msgid "Version of this application" +msgstr "Selle rakenduse versioon" -msgid "Disable connection to session manager" -msgstr "Seansihalduriga ühendumise keelamine" +msgid "- System Settings" +msgstr "- süsteemi sätted" -msgid "Specify file containing saved configuration" -msgstr "Salvestatud seadistusi sisaldava faili määramine" +msgid "Contributions:" +msgstr "Kaasaaitajad:" -msgid "FILE" -msgstr "FAIL" +msgid "Passwords and Keys" +msgstr "Paroolid ja võtmed" -msgid "Specify session management ID" -msgstr "Seansihalduse ID määramine" +msgid "translator-credits" +msgstr "" +"Priit Laes , 2007.\n" +"Ivar Smolin , 2007–2011.\n" +"Mattias Põldaru , 2009." -msgid "ID" -msgstr "ID" +msgid "Seahorse Project Homepage" +msgstr "Seahorse projekti koduleht" -msgid "Session management options:" -msgstr "Seansihalduse valikud:" +msgid "Cannot delete" +msgstr "Pole võimalik kustutada" -msgid "Show session management options" -msgstr "Seansihalduse valikute näitamine" +msgid "Couldn't export keys" +msgstr "Võtmeid pole võimalik eksportida" -msgid ":" -msgstr ":" +msgid "Couldn't export data" +msgstr "Andmeid pole võimalik eksportida" -msgid "Add Key Server" -msgstr "Võtmeserveri lisamine" +#. Top menu items +msgid "_File" +msgstr "_Fail" -msgid "Host:" -msgstr "Host:" +msgid "E_xport..." +msgstr "_Ekspordi..." -msgid "Key Server Type:" -msgstr "Võtmeserveri liik:" +msgid "Export to a file" +msgstr "Võtmete eksportimine faili" -msgid "The port to access the server on." -msgstr "Serveri port, kuhu tuleb ühenduda." +msgid "_Edit" +msgstr "_Redaktor" -msgid "initial temporary item" -msgstr "ajutine lähtestamiskirje" +msgid "Copy to the clipboard" +msgstr "Kopeeri lõikepuhvrisse" -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "Võti imporditud" -msgstr[1] "Võtmed imporditud" +msgid "_Delete" +msgstr "_Kustuta" -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "Impoditud %i võti" -msgstr[1] "Impoditud %i võtit" +msgid "Delete selected items" +msgstr "Valitud elementide kustutamine" -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "Võti imporditud" -msgstr[1] "Võtmed imporditud" +msgid "Show the properties of this item" +msgstr "Selle kirje omaduste näitamine" -msgid "Notification Messages" -msgstr "Märguannete sõnumid" +msgid "Show the properties of this keyring" +msgstr "Selle võtmerõnga omaduste näitamine" -msgid "Symmetric Key" -msgstr "Sümmeetriline võti" +msgid "Prefere_nces" +msgstr "_Eelistused" -msgid "Public Key" -msgstr "Avalik võti" +msgid "Change preferences for this program" +msgstr "Programmi eelistuste määramine" -msgid "Private Key" -msgstr "Salajane võti" +msgid "_View" +msgstr "_Vaade" + +msgid "_Help" +msgstr "A_bi" -msgid "Credentials" -msgstr "Tõendid" +msgid "About this program" +msgstr "Programmist lähemalt..." -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -msgid "Identity" -msgstr "Isikuandmed" +msgid "_Contents" +msgstr "_Sisu" + +msgid "Show Seahorse help" +msgstr "Seahorse abiteabe näitamine" + +msgid "Export" +msgstr "Ekspordi" -msgid "Passphrase" -msgstr "Parool" +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Sisesta PIN või parool järgnevale: %s" msgid "Password:" msgstr "Parool:" +#. The second and main entry msgid "Confirm:" msgstr "Kinnitus:" @@ -914,15 +563,6 @@ msgid "None: Don't publish keys" msgstr "Puudub: võtmeid ei avaldata" -msgid "Automatically retrieve keys from _key servers" -msgstr "Võtmese_rveritest võetakse võtmed vastu automaatselt" - -msgid "Automatically synchronize _modified keys with key servers" -msgstr "_Muudetud võtmed sünkroniseeritakse automaatselt võtmeserveritega" - -msgid "Key Servers" -msgstr "Võtmeserverid" - msgid "Preferences" msgstr "Eelistused" @@ -932,53 +572,18 @@ msgid "_Publish keys to:" msgstr "Kuhu võtmed _avalikustatakse:" -msgid "Progress Title" -msgstr "Edenemise pealkiri" +msgid "Automatically retrieve keys from _key servers" +msgstr "Võtmese_rveritest võetakse võtmed vastu automaatselt" + +msgid "Automatically synchronize _modified keys with key servers" +msgstr "_Muudetud võtmed sünkroniseeritakse automaatselt võtmeserveritega" -msgid "Unavailable" -msgstr "Pole saadaval" +msgid "Key Servers" +msgstr "Võtmeserverid" msgid "%Y-%m-%d" msgstr "%d. %m %Y" -msgid "Key Data" -msgstr "Võtme andmed" - -msgid "Multiple Keys" -msgstr "Mitu võtit" - -msgid "Couldn't run file-roller" -msgstr "Käsku file-roller pole võimalik käivitada" - -msgid "Couldn't package files" -msgstr "Faile pole võimalik pakkida" - -msgid "The file-roller process did not complete successfully" -msgstr "file-roller'i protsess ei lõpetanud veatult" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -msgid "All key files" -msgstr "Kõik võtmefailid" - -msgid "All files" -msgstr "Kõik failid" - -msgid "Archive files" -msgstr "Arhiivifailid" - -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Sellise nimega fail on juba olemas.\n" -"\n" -"Kas sa soovid seda asendada uue failiga?" - -msgid "_Replace" -msgstr "_Asenda" - msgid "Unknown" msgstr "Tundmatu" @@ -1005,60 +610,61 @@ msgid "Could not display help: %s" msgstr "Abiteavet pole võimalik kuvada: %s" -msgid "Expiration Date:" -msgstr "Aegumiskuupäev:" - -msgid "Generate a new subkey" -msgstr "Uue alamvõtme genereerimine" +msgid "Never E_xpires" +msgstr "Ei aegu _kunagi" msgid "If key never expires" msgstr "Kui võti ei aegu kunagi" +msgid "Key _Type:" +msgstr "_Võtme liik:" + msgid "Key _Length:" msgstr "Võtme _pikkus:" -msgid "Key _Type:" -msgstr "_Võtme liik:" +msgid "Expiration Date:" +msgstr "Aegumiskuupäev:" msgid "Length of Key" msgstr "Võtme pikkus" -msgid "Never E_xpires" -msgstr "Ei aegu _kunagi" +msgid "Generate a new subkey" +msgstr "Uue alamvõtme genereerimine" msgid "Add User ID" msgstr "Kasutaja ID lisamine" -msgid "Create the new user ID" -msgstr "Uue kasutaja-ID loomine" - -msgid "Full _Name:" -msgstr "_Täisnimi:" - -msgid "Key Co_mment:" -msgstr "Võtme _kommentaar:" - msgid "Must be at least 5 characters long" msgstr "Peab olema vähemalt viie märgi pikkune" +msgid "Optional email address" +msgstr "Valikuline e-posti aadress" + msgid "Optional comment describing key" msgstr "Valikuline kommentaar võtme kirjeldamiseks" -msgid "Optional email address" -msgstr "Valikuline e-posti aadress" +#. Full name of the key, usually the name of the user. +msgid "Full _Name:" +msgstr "_Täisnimi:" msgid "_Email Address:" msgstr "_E-posti aadress:" -msgid "C_hange" -msgstr "_Muuda" +msgid "Key Co_mment:" +msgstr "Võtme _kommentaar:" -msgid "Revoke key" -msgstr "Võtme tühistamine" +msgid "Create the new user ID" +msgstr "Uue kasutaja-ID loomine" msgid "_Never expires" msgstr "_Ei aegu kunagi" +msgid "Revoke key" +msgstr "Võtme tühistamine" + +msgid "C_hange" +msgstr "_Muuda" + msgid "Couldn't add subkey" msgstr "Alamvõtit pole võimalik lisada" @@ -1090,6 +696,9 @@ "Tõrge lahtikrüptimisel. Arvatavasti pole sul lahtkirüptimiseks vajalikku " "võtit." +msgid "The operation was cancelled" +msgstr "Operatsioon katkestati" + msgid "Invalid expiry date" msgstr "Vigane aegumise kuupäev" @@ -1103,6 +712,19 @@ msgid "Expiry: %s" msgstr "Aegumine: %s" +msgid "Multiple Keys" +msgstr "Mitu võtit" + +msgid "Key Data" +msgstr "Võtme andmed" + +# See ASCII-armored on üsna mõttetu termin iseenesest, tähendab lihtsalt, et erimärke ei sisalda ja siis saad rõõmsalt meiliga saata ja puha. Kindlustatud, kaitstud või turvatud PGP võti kõlab natukene liiga kindlad sellise asja kohta. +msgid "Armored PGP keys" +msgstr "Turvatud PGP-võtmed" + +msgid "PGP keys" +msgstr "PGP-võtmed" + msgid "PGP Key" msgstr "PGP-võti" @@ -1124,12 +746,33 @@ msgid "Enter the passphrase for your new key twice." msgstr "Sisesta oma uuele võtmele parool (2 korda)." -msgid "Couldn't generate key" -msgstr "Võtit pole võimalik genereerida" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Võtme loomisel tuleb genereerida palju juhuslikkust\n" +"ning selleks on vajalik sinu abi. Praegu on hea\n" +"teha midagi muud, näiteks liigutada hiir, tippida\n" +"klaviatuuril või kasutada rakendusi. See tagab\n" +"arvutile vajaliku juhuslikkuse." msgid "Generating key" msgstr "Võtme genereerimine" +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Kas sa soovid '%s' jäädavalt kustutada?" + +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Kas soovid kindlasti %d võtme jäädavalt kustutada?" +msgstr[1] "Kas soovid kindlasti %d võtit jäädavalt kustutada?" + msgid "Wrong password" msgstr "Vale parool" @@ -1137,6 +780,47 @@ msgstr "Vale parool sisestati juba kolmandat korda. Palun proovi uuesti." #, c-format +msgid "Wrong passphrase." +msgstr "Vale parool." + +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Sisesta '%s' jaoks uus parool" + +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Sisesta võtme '%s' parool" + +msgid "Enter new passphrase" +msgstr "Uue parooli sisestamine" + +msgid "Enter passphrase" +msgstr "Parooli sisestamine" + +msgid "Passphrase" +msgstr "Parool" + +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Laaditud %d võti" +msgstr[1] "Laaditud %d võtit" + +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Vigased võtme andmed (kasutaja ID-id on puudu). See võib olla põhjustatud " +"sellest, et arvuti kellaaeg on tulevikus või puudub enese poolt loodud " +"allkiri." + +msgid "GnuPG keys" +msgstr "GnuPG võtmed" + +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: vaikimisi võtmerõnga kataloog" + +#, c-format msgid "" "The photo is too large\n" "The recommended size for a photo on your key is %d x %d pixels." @@ -1164,9 +848,15 @@ msgid "All JPEG files" msgstr "Kõik JPEG-failid" +msgid "All files" +msgstr "Kõik failid" + msgid "Choose Photo to Add to Key" msgstr "Võtmele lisatava foto valimine" +msgid "Couldn't prepare photo" +msgstr "Fotot pole võimalik ette valmistada" + msgid "Couldn't add photo" msgstr "Fotot pole võimalik lisada" @@ -1221,6 +911,9 @@ msgid "Couldn't add revoker" msgstr "Tühistajat pole võimalik lisada" +msgid "I understand that this secret key will be permanently deleted." +msgstr "Ma mõistan, et see saladus kustutatakse jäädaval." + #, c-format msgid "" "This key was already signed by\n" @@ -1244,85 +937,132 @@ "Sul pole isiklikke PGP-võtmeid, mida saaks kasutada selle võtme usaldatavuse " "määramiseks." -#, c-format -msgid "Wrong passphrase." -msgstr "Vale parool." +msgid "ElGamal" +msgstr "ElGamal" #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Sisesta '%s' jaoks uus parool" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Otsing polnud piisavalt täpne. Server '%s' tagastas liiga palju võtmeid." #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Sisesta võtme '%s' parool" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Serveriga '%s' pole võimalik suhelda: %s" -msgid "Enter new passphrase" -msgstr "Uue parooli sisestamine" +msgid "HTTP Key Server" +msgstr "HTTP võtmeserver" -msgid "Enter passphrase" -msgstr "Parooli sisestamine" +msgid "Couldn't import keys" +msgstr "Võtmeid pole võimalik importida" + +msgid "Importing keys from key servers" +msgstr "Võtmete importimine serverist" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +msgid "_Remote" +msgstr "_Kaugvalikud" + +msgid "Close this window" +msgstr "Selle akna sulgemine" + +msgid "_Find Remote Keys..." +msgstr "_Otsi võtmeid võrgust..." + +msgid "Search for keys on a key server" +msgstr "Võtmete otsimine võtmeserverist" + +msgid "_Import" +msgstr "_Impordi" + +msgid "Import selected keys to local key ring" +msgstr "Valitud võtmete importimine kohalikku võtmerõngasse" + +msgid "Remote Keys" +msgstr "Kaugvõtmed" -#. TODO: We can use the GPGME progress to make this more accurate #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Laaditud %d võti" -msgstr[1] "Laaditud %d võtit" +msgid "Remote Keys Containing '%s'" +msgstr "Stringi '%s' sisaldavad kaugvõtmed" -msgid "Loading Keys..." -msgstr "Võtmete laadimine..." +msgid "The search for keys failed." +msgstr "Võtmete otsimine nurjus." + +msgid "Find Remote Keys" +msgstr "Kaugvõtmete otsimine" msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Vigased võtme andmed (kasutaja ID-id on puudu). See võib olla põhjustatud " -"sellest, et arvuti kellaaeg on tulevikus või puudub enese poolt loodud " -"allkiri." +"Selle dialoogi abil leitakse Internetist teiste isikute võtmeid. Neid on " +"võimalik kohalikku võtmerõngasse importida." + +msgid "_Search for keys containing: " +msgstr "O_tsitakse järgnevat stringi sisaldavaid võtmeid: " -msgid "Importing Keys" -msgstr "Võtmete importimine" +msgid "Key Servers:" +msgstr "Võtmeserverid:" -msgid "Exporting Keys" -msgstr "Võtmete eksportimine" +msgid "Shared Keys Near Me:" +msgstr "Minu ligiduses avaldatud võtmed:" -msgid "ElGamal" -msgstr "ElGamal" +msgid "Where to search:" +msgstr "Millistest serveritest otsitakse:" + +msgid "_Search" +msgstr "_Otsi" + +msgid "Couldn't publish keys to server" +msgstr "Võtmeid pole võimalik serveris avaldada" + +#, c-format +msgid "Couldn't retrieve keys from server: %s" +msgstr "Võtmeid pole võimalik serverist vastu võtta: %s" + +#, c-format +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "Sünkroniseerimiseks on valitud %d võti" +msgstr[1] "Sünkroniseerimiseks on valitud %d võtit" + +msgid "Synchronizing keys..." +msgstr "Võtmete sünkroniseerimine..." + +msgid "Sync Keys" +msgstr "Võtmete sünkroniseerimine" + +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Käesolevaga avaldatakse sinu võtmerõngas olevad võtmed võtmeserveris " +"kasutamiseks teistele kasutajatele, samuti hangitakse vahepeal teiste " +"kasutajate võtmetes tehtud muudatused." -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." msgstr "" -"Otsing polnud piisavalt täpne. Server '%s' tagastas liiga palju võtmeid." - -#, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Serveriga '%s' pole võimalik suhelda: %s" - -msgid "Searching for keys..." -msgstr "Võtmete otsimine..." +"Käesolevaga hangitakse võtmeserverist vahepeal teiste kasutajate võtmetes " +"tehtud muudatused. Avalikustamiseks pole võtmeserverit valitud, seega pole " +"võimalik sinu võtmeid teistele kättesaadavaks teha." -msgid "Uploading keys..." -msgstr "Võtmete üleslaadimine..." +msgid "_Key Servers" +msgstr "_Võtmeserverid" -msgid "Retrieving keys..." -msgstr "Võtmete vastuvõtmine..." +msgid "_Sync" +msgstr "_Sünkroniseeri" #, c-format -msgid "Searching for keys on: %s" -msgstr "Võtmete otsimine asukohast: %s" +msgid "Couldn't communicate with '%s': %s" +msgstr "Serveriga '%s' pole võimalik suhelda: %s" -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start #, c-format msgid "Connecting to: %s" msgstr "Ühenduse loomine: %s" -msgid "HTTP Key Server" -msgstr "HTTP võtmeserver" - -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "Serveriga '%s' pole võimalik suhelda: %s" - #, c-format msgid "Couldn't resolve address: %s" msgstr "Aadressi pole võimalik lahendada: %s" @@ -1331,86 +1071,53 @@ msgid "Resolving server address: %s" msgstr "Serveri aadressi lahendamine: %s" -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "Stringi '%s' sisaldavate võtmete otsimine..." - -#, c-format -msgid "Searching for key id '%s'..." -msgstr "Võtme id '%s' otsimine..." - -msgid "Retrieving remote keys..." -msgstr "Kaugvõtmete vastuvõtmine..." - -msgid "Sending keys to key server..." -msgstr "Võtmete saamine võtmeserverisse..." - msgid "LDAP Key Server" msgstr "LDAP võtmeserver" -msgid "_Sign Key..." -msgstr "_Allkirjasta võti..." - -msgid "Sign public key" -msgstr "Avaliku võtme allkirjastamine" +msgid "_Sync and Publish Keys..." +msgstr "Sü_nkroniseeri ja avalikusta võtmed..." -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Kas sa soovid '%s' jäädavalt kustutada?" +msgid "Publish and/or synchronize your keys with those online." +msgstr "Sinu võtmete avaldamine ja/või sünkroniseerimine võtmeserveriga." -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Kas sa soovid %d võtit ja identiteeti jäädavalt kustutada?" +msgid "PGP Keys" +msgstr "PGP-võtmed" -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Kas sa soovid %d võtit jäädavalt kustutada?" +msgid "PGP keys are for encrypting email or files" +msgstr "PGP-võtmeid kasutatakse e-posti ja failide krüptimiseks" -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Kas sa soovid %d identiteeti jäädavalt kustutada?" +msgid "C_reate" +msgstr "L_oo" -msgid "_Advanced key options" -msgstr "Võt_me laiendatud valikud" +msgid "Generate a new key" +msgstr "Uue võtme genereerimine" msgid "A PGP key allows you to encrypt email or files to other people." msgstr "PGP-võti võimaldab sul teistele saatmiseks krüptida e-posti või faile." -msgid "Algorithms here" -msgstr "Siia tulevad algoritmid" - -msgid "C_reate" -msgstr "L_oo" +msgid "_Comment:" +msgstr "_Kommentaar:" -msgid "E_xpiration Date:" -msgstr "Ae_gumiskuupäev:" +msgid "Ne_ver Expires" +msgstr "_Ei aegu kunagi" msgid "Encryption _Type:" msgstr "_Krüptimise liik:" -msgid "Generate a new key" -msgstr "Uue võtme genereerimine" - msgid "Key _Strength (bits):" msgstr "Võtme _pikkus (bittides):" -msgid "Ne_ver Expires" -msgstr "_Ei aegu kunagi" - -msgid "New PGP Key" -msgstr "Uus PGP-võti" - -msgid "_Comment:" -msgstr "_Kommentaar:" +msgid "E_xpiration Date:" +msgstr "Ae_gumiskuupäev:" -msgid "Private PGP Key" -msgstr "Salajane PGP-võti" +msgid "_Advanced key options" +msgstr "Võt_me laiendatud valikud" -msgid "Public PGP Key" -msgstr "Avalik PGP-võti" +msgid "Personal PGP key" +msgstr "Isiklik PGP-võti" -msgid "Expired" -msgstr "Aegunud" +msgid "PGP key" +msgstr "PGP-võti" msgid "Couldn't change primary user ID" msgstr "Peamist kasutaja ID-d pole võimalik muuta" @@ -1434,6 +1141,7 @@ msgid "Couldn't change primary photo" msgstr "Peamist fotot pole võimalik muuta" +#. TRANSLATORS: (unknown) expiry date msgid "(unknown)" msgstr "(tundmatu)" @@ -1441,6 +1149,9 @@ msgid "This key expired on: %s" msgstr "See võti aegus: %s" +msgid "Name" +msgstr "Nimi" + #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Kas sa soovid jäädavalt kustutada omaniku %2$s alamvõtme %1$d?" @@ -1451,21 +1162,16 @@ msgid "Unable to change trust" msgstr "Usaldust pole võimalik muuta" -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Võtit pole asukohale \"%s\" võimalik eksportida" - -msgid "Export Complete Key" -msgstr "Võtme täielik eksport" - -msgid "Couldn't export key." -msgstr "Võtit pole võimalik eksportida." +msgid "Couldn't export key" +msgstr "Võtit polnud võimalik eksportida" msgctxt "Expires" msgid "Never" msgstr "Mitte kunagi" -#. The key type column +msgid "ID" +msgstr "ID" + msgid "Type" msgstr "Liik" @@ -1481,151 +1187,162 @@ msgid "Strength" msgstr "Tugevus" +msgid "Expired" +msgstr "Aegunud" + msgid "Good" msgstr "Hea" -msgid "Actions" -msgstr "Tegevused" +msgid "Key ID" +msgstr "Võtme ID" -msgid "Comment:" -msgstr "Kommentaar:" +msgid "Never" +msgstr "Mitte kunagi" -msgid "Dates" -msgstr "Kuupäevad" +msgid "This key has been revoked" +msgstr "See võti on tühistatud" -msgid "Email:" -msgstr "E-post:" +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Selle võtme omanik tühistas võtme. Seda pole võimalik rohkem kasutada." -msgid "Fingerprint" -msgstr "Sõrmejälg" +msgid "This key has expired" +msgstr "See võti on aegunud" -msgid "Key ID:" -msgstr "Võtme ID:" +msgid "Add a photo to this key" +msgstr "Sellele võtmele foto lisamine" -msgid "Key Names and Signatures" -msgstr "Võtme nimed ja allkirjad" +msgid "Remove this photo from this key" +msgstr "Sellelt võtmelt foto eemaldamine" + +msgid "Make this photo the primary photo" +msgstr "Selle foto määramine peamiseks fotoks" + +msgid "Go to previous photo" +msgstr "Eelmisele fotole liikumine" + +msgid "Go to next photo" +msgstr "Järgmisele fotole liikumine" +#. A photograph msgid "Photo " msgstr "Foto " -msgid "Technical Details" -msgstr "Tehnilised üksikasjad" +msgid "Key ID:" +msgstr "Võtme ID:" -msgid "This key has been revoked" -msgstr "See võti on tühistatud" +#. Name of key, usually a persons name +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nimi:" -msgid "This key has expired" -msgstr "See võti on aegunud" +msgid "Email:" +msgstr "E-post:" -msgid "Type:" -msgstr "Liik:" +msgid "Comment:" +msgstr "Kommentaar:" #. To translators: This is the noun not the verb. msgid "Use:" msgstr "Kasutus:" -msgid "_Subkeys" -msgstr "Alam_võtmed" +msgid "Type:" +msgstr "Liik:" -msgid "Add" -msgstr "Lisa" +msgid "Decrypt files and email sent to you." +msgstr "Sinule saadetud e-posti ja failide lahtikrüptimiseks." -msgid "Add a photo to this key" -msgstr "Sellele võtmele foto lisamine" +msgid "Private PGP Key" +msgstr "Salajane PGP-võti" msgid "Change _Passphrase" msgstr "Muuda _parooli" -msgid "Decrypt files and email sent to you." -msgstr "Sinule saadetud e-posti ja failide lahtikrüptimiseks." - -msgid "Delete" -msgstr "Kustuta" - -msgid "Expire" -msgstr "Määra aegumine" +msgid "Owner" +msgstr "Omanik" -msgid "Expires:" -msgstr "Aegub:" +msgid "Key Names and Signatures" +msgstr "Võtme nimed ja allkirjad" -msgid "Export" -msgstr "Ekspordi" +msgid "Primary" +msgstr "Peamine" -msgid "Go to next photo" -msgstr "Järgmisele fotole liikumine" +msgid "Sign" +msgstr "Allkirjasta" -msgid "Go to previous photo" -msgstr "Eelmisele fotole liikumine" +msgid "Delete" +msgstr "Kustuta" -msgid "Key ID:" -msgstr "Võtme ID:" +#. Add another name to the PGP key. +msgid "_Add Name" +msgstr "Lisa _nimi" -msgid "Make this photo the primary photo" -msgstr "Selle foto määramine peamiseks fotoks" +msgid "Revoke" +msgstr "Tühista" +#. List of names and signatures on the PGP key. msgid "Names and Signatures" msgstr "Nimed ja allkirjad" -msgid "Never" -msgstr "Mitte kunagi" +msgid "Key ID:" +msgstr "Võtme ID:" -msgid "Override Owner _Trust:" -msgstr "Omaniku _usalduse asendamine:" +msgid "Strength:" +msgstr "Tugevus:" -msgid "Owner" -msgstr "Omanik" +msgid "Technical Details" +msgstr "Tehnilised üksikasjad" -msgid "Primary" -msgstr "Peamine" +msgid "Fingerprint" +msgstr "Sõrmejälg" -msgid "Remove this photo from this key" -msgstr "Sellelt võtmelt foto eemaldamine" +msgid "Expires:" +msgstr "Aegub:" -msgid "Revoke" -msgstr "Tühista" +msgid "Dates" +msgstr "Kuupäevad" -msgid "Sign" -msgstr "Allkirjasta" +msgid "Override Owner _Trust:" +msgstr "Omaniku _usalduse asendamine:" -msgid "Strength:" -msgstr "Tugevus:" +msgid "_Export Complete Key:" +msgstr "Võtme täielik _eksport:" -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Selle võtme omanik tühistas võtme. Seda pole võimalik rohkem kasutada." +msgid "Actions" +msgstr "Tegevused" -msgid "_Add Name" -msgstr "Lisa _nimi" +msgid "Add" +msgstr "Lisa" -msgid "_Export Complete Key:" -msgstr "Võtme täielik _eksport:" +msgid "Expire" +msgstr "Määra aegumine" -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nimi:" +msgid "_Subkeys" +msgstr "Alam_võtmed" -msgid "Dates:" -msgstr "Kuupäevad:" +msgid "Marginally" +msgstr "Vähesel määral" -msgid "Fingerprint:" -msgstr "Sõrmejälg:" +msgid "Fully" +msgstr "Täielik" -msgid "Indicate Trust:" -msgstr "Usaldusmäär:" +msgid "Ultimately" +msgstr "Ülim" + +msgid "Encrypt files and email to the key's owner" +msgstr "Failide ja e-posti krüptimiseks võtme omaniku jaoks" -msgid "Your trust of this key" -msgstr "Sinu usaldus selle võtme vastu" +msgid "Public PGP Key" +msgstr "Avalik PGP-võti" +#. Names set on the PGP key. msgid "_Other Names:" msgstr "_Teised nimed:" -msgid "_People who have signed this key:" -msgstr "Selle võtme allkirjastanud _inimesed:" - -msgid "Encrypt files and email to the key's owner " -msgstr "Failide ja e-posti krüptimiseks võtme omaniku jaoks" +msgid "Your trust of this key" +msgstr "Sinu usaldus selle võtme vastu" -msgid "Fully" -msgstr "Täielik" +msgid "Your trust is manually specified on the Details tab." +msgstr "Sinu usaldus on käsitsi määratud kaardi Üksikasjad alt." #, no-c-format msgid "I trust signatures from '%s' on other keys" @@ -1638,6 +1355,9 @@ msgstr "" "Kui sa usud, et selle võtme omanik on '%s', siis allkirjasta see võti:" +msgid "_Sign this Key" +msgstr "A_llkirjasta see võti" + #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1645,74 +1365,77 @@ "Kui sa ei usalda kauem, et selle võtme omanik on '%s', siis tühista " "oma allkiri:" -msgid "Marginally" -msgstr "Vähesel määral" +msgid "_Revoke Signature" +msgstr "_Tühista allkiri" -#. Trust column -msgid "Trust" -msgstr "Usaldus" +msgid "_People who have signed this key:" +msgstr "Selle võtme allkirjastanud _inimesed:" -msgid "Ultimately" -msgstr "Ülim" +msgid "_Only display the signatures of people I trust" +msgstr "_Kuvatakse ainult minu poolt usaldatavaid inimesi" -msgid "You _Trust the Owner:" -msgstr "Sinu _usaldus omaniku vastu:" +msgid "Trust" +msgstr "Usaldus" -msgid "Your trust is manually specified on the Details tab." -msgstr "Sinu usaldus on käsitsi määratud kaardi Üksikasjad alt." +msgid "Fingerprint:" +msgstr "Sõrmejälg:" -msgid "_Only display the signatures of people I trust" -msgstr "_Kuvatakse ainult minu poolt usaldatavaid inimesi" +msgid "Dates:" +msgstr "Kuupäevad:" -msgid "_Revoke Signature" -msgstr "_Tühista allkiri" +msgid "Indicate Trust:" +msgstr "Usaldusmäär:" -msgid "_Sign this Key" -msgstr "A_llkirjasta see võti" +msgid "You _Trust the Owner:" +msgstr "Sinu _usaldus omaniku vastu:" #, c-format msgid "Subkey %d of %s" msgstr "Omaniku %2$s %1$d. alamvõti" -msgid "Optional description of revocation" -msgstr "Tühistamise põhjuste võimalik kirjeldus" - -msgid "Re_voke" -msgstr "_Tühista" - msgid "Reason for revoking the key" msgstr "Võtme tühistamise põhjus" msgid "_Reason:" msgstr "_Põhjus:" +msgid "Optional description of revocation" +msgstr "Tühistamise põhjuste võimalik kirjeldus" + +msgid "Re_voke" +msgstr "_Tühista" + msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Sul pole ühtegi isiklikku PGP-võtit, mis sobiks sõnumi või dokumendi " "allkirjastamiseks." -msgid "How carefully have you checked this key?" -msgstr "Kui hoolikalt sa seda võtit kontrollisid?" - -msgid "How others will see this signature:" -msgstr "Kuidas teised seda allkirja peaksid nägema:" +msgid "_Sign message with key:" +msgstr "A_llkirjasta sõnum järgneva võtmega:" -msgid "Sign key as:" -msgstr "Võtmed allkirjastatakse kui:" +msgid "Sign Key" +msgstr "Võtme allkirjastamine" -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " +msgid "By signing you indicate your trust that this key belongs to:" msgstr "" -"Pealiskaudselt tähedab, et sa oled vaid põgusalt kontrollinud, kas " -"võti kuulub isikule, kes väidab selle võtme enesele kuuluvat. Näiteks on " -"võtme omanik telefonitsi kinnitanud võtme sõrmejälje vastavust." +"Allkirjastamisega näitad sa, et usaldad sellele omanikule kuuluvat võtit:" msgid "Key Name" msgstr "Võtme nimi" +msgid "How carefully have you checked this key?" +msgstr "Kui hoolikalt sa seda võtit kontrollisid?" + +msgid "_Not at all" +msgstr "_Mitte üldse" + +msgid "_Casually" +msgstr "_Pealiskaudselt" + +msgid "_Very Carefully" +msgstr "_Väga hoolikalt" + msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1722,22 +1445,21 @@ "asjaolu kontrollida või pole sa lihtsalt seda teinud." msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Pealiskaudselt tähedab, et sa oled vaid põgusalt kontrollinud, kas " +"võti kuulub isikule, kes väidab selle võtme enesele kuuluvat. Näiteks on " +"võtme omanik telefonitsi kinnitanud võtme kuuluvust." + +msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." msgstr "" "Väga hoolikalt - vali see ainult juhul, kui sa oled täiesti kindel, " "et see võti kuulub selle omanikule." -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "" -"Allkirjastamisega näitad sa, et usaldad sellele omanikule kuuluvat võtit:" - -msgid "I can _revoke this signature at a later date." -msgstr "Mul on võimalus hiljem seda allkirja tü_histada." - -msgid "Sign Key" -msgstr "Võtme allkirjastamine" - msgid "" "You could use a hard to forge photo identification (such as a passport) to " "personally check that the name on the key is correct. You should have also " @@ -1747,375 +1469,257 @@ "tõendavat pildiga dokumenti kasutades (näiteks ID-kaart või pass). Samuti " "peaks sa olema kontrollinud, kas e-posti aadress vastab omanikule." -msgid "_Casually" -msgstr "_Pealiskaudselt" - -msgid "_Not at all" -msgstr "_Mitte üldse" +msgid "How others will see this signature:" +msgstr "Kuidas teised seda allkirja peaksid nägema:" msgid "_Others may not see this signature" msgstr "_Teised ei tohi seda allkirja näha" -msgid "_Sign" -msgstr "All_kirjasta" +msgid "I can _revoke this signature at a later date." +msgstr "Mul on võimalus hiljem seda allkirja tü_histada." + +msgid "Sign key as:" +msgstr "Võtmed allkirjastatakse kui:" msgid "_Signer:" msgstr "_Allkirjastaja:" -msgid "_Very Carefully" -msgstr "_Väga hoolikalt" - -msgid "_Sign message with key:" -msgstr "A_llkirjasta sõnum järgneva võtmega:" - -msgid "Certificate" -msgstr "Sertifikaat" +msgid "_Sign" +msgstr "All_kirjasta" -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Kas sa soovid sertifikaadi '%s' kustutada?" +msgid "Exporting data" +msgstr "Andmete eksportimine" -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Kas sa soovid %d sertifikaadi kustutada?" -msgstr[1] "Kas sa soovid %d sertifikaati kustutada?" +msgid "Retrieving data" +msgstr "Andmete vastuvõtmine" -msgid "Change Passphrase" -msgstr "Parooli muutmine" +msgid "Importing data" +msgstr "Andmete importimine" -msgid "Con_firm Passphrase:" -msgstr "Parooli _kinnitus:" +msgid "Sending data" +msgstr "Andmete saatmine" -msgid "Confirm new passphrase" -msgstr "Uue parooli kinnitus" +msgid "Unavailable" +msgstr "Pole saadaval" -msgid "New _Passphrase:" -msgstr "Uus _parool:" +msgid "Personal certificate and key" +msgstr "Isiklik sertifikaat ja võti" -msgid "Manage your passwords and encryption keys" -msgstr "Sinu paroolide ja krüptimisvõtmete haldamine" +msgid "Personal certificate" +msgstr "Isiklik sertifikaat" -msgid "Passwords and Encryption Keys" -msgstr "Paroolid ja krüptimisvõtmed" +msgid "Certificate" +msgstr "Sertifikaat" -msgid "_Select the type of item to create:" -msgstr "_Vali loodava elemendi liik:" +msgid "Certificates (DER encoded)" +msgstr "Sertifikaadid (DER-kodeeringus)" -msgid "C_ontinue" -msgstr "_Jätka" +msgid "Certificates" +msgstr "Sertifikaadid" -msgid "Create New ..." -msgstr "Uue loomine..." +msgid "X.509 certificates and related keys" +msgstr "X.509 sertifikaadid ja seonduvad võtmed" #, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Valitud %d võti" -msgstr[1] "Valitud %d võtit" - -msgid "Couldn't import keys" -msgstr "Võtmeid pole võimalik importida" - -msgid "Imported keys" -msgstr "Imporditud võtmed" - -msgid "Importing keys" -msgstr "Võtmete importimine" - -msgid "Import Key" -msgstr "Võtme importimine" - -msgid "Unrecognized key type, or invalid data format" -msgstr "Tundmatu võtme liik või on andmed vigased" - -msgid "_Remote" -msgstr "_Kaugvalikud" - -msgid "Close this program" -msgstr "Programmi sulgemine" - -msgid "_New..." -msgstr "_Uus..." - -msgid "Create a new key or item" -msgstr "Uue võtme või kirje loomine" - -msgid "_Import..." -msgstr "_Impordi..." - -msgid "Import from a file" -msgstr "Võtmete importimine failist" - -msgid "Import from the clipboard" -msgstr "Võtmete importimine lõikepuhvrist" - -msgid "_Find Remote Keys..." -msgstr "_Otsi võtmeid võrgust..." - -msgid "Search for keys on a key server" -msgstr "Võtmete otsimine võtmeserverist" - -msgid "_Sync and Publish Keys..." -msgstr "Sü_nkroniseeri ja avalikusta võtmed..." - -msgid "Publish and/or synchronize your keys with those online." -msgstr "Sinu võtmete avaldamine ja/või sünkroniseerimine võtmeserveriga." +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Kas sa soovid kindlasti %d sertifikaadi jäädavalt kustutada?" +msgstr[1] "Kas sa soovid kindlasti %d sertifikaati jäädavalt kustutada?" -msgid "T_ypes" -msgstr "_Liigid" +msgid "Couldn't generate private key" +msgstr "Salajast võtit pole võimalik genereerida" -msgid "Show type column" -msgstr "Liigi veeru näitamine" +msgid "Create" +msgstr "Loo" -msgid "_Expiry" -msgstr "_Aegumine" - -msgid "Show expiry column" -msgstr "Aegumise veeru näitamine" - -msgid "_Trust" -msgstr "_Usaldus" - -msgid "Show owner trust column" -msgstr "Omaniku usaldamise veeru näitamine" - -msgid "_Validity" -msgstr "_Kehtivus" - -msgid "Show validity column" -msgstr "Kehtivuse veeru näitamine" - -msgid "Filter:" -msgstr "Filter:" - -msgid "First time options:" -msgstr "Esimese kasutuse valikud:" - -msgid "Generate a new key of your own: " -msgstr "Omale uue võtme loomine:" - -msgid "Import existing keys from a file:" -msgstr "Olemasolevate võtmete importimine failist:" - -msgid "My _Personal Keys" -msgstr "Minu _isiklikud võtmed" +msgid "Private key" +msgstr "Salajane võti" -msgid "Other _Keys" -msgstr "_Teised võtmed" +msgid "Used to request a certificate" +msgstr "Kasutati sertifikaadi pärimiseks" -msgid "To get started with encryption you will need keys." -msgstr "Krüptimise jaoks on sul kõigepealt tarvis võtmeid." +msgid "Create a new private key" +msgstr "Uue salajase võtme loomine" -msgid "_Import" -msgstr "_Impordi" +msgid "Label:" +msgstr "Pealdis:" -msgid "_Passwords" -msgstr "_Paroolid" +msgid "Stored at:" +msgstr "Salvestatud kohas:" -msgid "Couldn't export keys" -msgstr "Võtmeid pole võimalik eksportida" +msgid "I understand that this key will be permanently deleted." +msgstr "Ma mõistan, et see võti kustutatakse jäädavalt." -msgid "Validity" -msgstr "Kehtivus" +msgid "Unnamed" +msgstr "Nimetu" -#. Expiry date column -msgid "Expiration Date" -msgstr "Aegumiskuupäev" +msgid "Failed to export certificate" +msgstr "Sertifikaadi eksportimine nurjus" -msgid "Close this window" -msgstr "Selle akna sulgemine" +msgid "Couldn't delete" +msgstr "Pole võimalik kustutada" -msgid "_Expand All" -msgstr "La_ienda kõik" +msgid "_Export" +msgstr "_Ekspordi" -msgid "Expand all listings" -msgstr "Kõigi nimekirjade avamine" +msgid "Export the certificate" +msgstr "Sertifikaadi eksportimine" -msgid "_Collapse All" -msgstr "A_henda kõik" +msgid "Delete this certificate or key" +msgstr "Selle sertifikaadi või võtme kustutamine" -msgid "Collapse all listings" -msgstr "Kõigi nimekirjade ahendamine" +msgid "Request _Certificate" +msgstr "_Sertifikaadi pärimine" -msgid "Remote Keys" -msgstr "Kaugvõtmed" +msgid "Create a certificate request file for this key" +msgstr "Selle võtme jaoks sertifikaatipäringu loomine" -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Stringi '%s' sisaldavad kaugvõtmed" +msgid "Couldn't save certificate request" +msgstr "Sertifikaadipäringut polnud võimalik salvestada" -msgid "Key Servers:" -msgstr "Võtmeserverid:" +msgid "Save certificate request" +msgstr "Sertifikaadipäringu salvestamine" -msgid "Shared Keys Near Me:" -msgstr "Minu ligiduses avaldatud võtmed:" +msgid "Certificate request" +msgstr "Sertifikaadi päring" -msgid "Find Remote Keys" -msgstr "Kaugvõtmete otsimine" +msgid "PEM encoded request" +msgstr "PEM-kodeeringus päring" -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Selle dialoogi abil leitakse Internetist teiste isikute võtmeid. Neid on " -"võimalik kohalikku võtmerõngasse importida." +msgid "Couldn't create certificate request" +msgstr "Sertifikaadi päringut polnud võimalik luua" -msgid "Where to search:" -msgstr "Millistest serveritest otsitakse:" +msgid "Create a certificate request file." +msgstr "Sertifikaadipäringu faili loomine." -msgid "_Search" -msgstr "_Otsi" +msgid "The common name (CN) placed in the certificate request." +msgstr "Sellesse sertifikaadipäringusse asetatud CN-nimi (common name)." -msgid "_Search for keys containing: " -msgstr "O_tsitakse järgnevat stringi sisaldavaid võtmeid: " +msgid "Name (CN):" +msgstr "Nimi (CN):" -msgid "Couldn't publish keys to server" -msgstr "Võtmeid pole võimalik serveris avaldada" +msgid "Unnamed private key" +msgstr "Nimetu salajane võti" -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Võtmeid pole võimalik serverist vastu võtta: %s" +msgid "Change Passphrase" +msgstr "Parooli muutmine" -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "Sünkroniseerimiseks on valitud %d võti" -msgstr[1] "Sünkroniseerimiseks on valitud %d võtit" +msgid "New _Passphrase:" +msgstr "Uus _parool:" -msgid "Synchronizing keys" -msgstr "Võtmete sünkroniseerimine" +msgid "Confirm new passphrase" +msgstr "Uue parooli kinnitus" -#. Show the progress window if necessary -msgid "Synchronizing keys..." -msgstr "Võtmete sünkroniseerimine..." +msgid "Con_firm Passphrase:" +msgstr "Parooli _kinnitus:" -msgid "Sync Keys" -msgstr "Võtmete sünkroniseerimine" +msgid "Manage your passwords and encryption keys" +msgstr "Sinu paroolide ja krüptimisvõtmete haldamine" -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Käesolevaga avaldatakse sinu võtmerõngas olevad võtmed võtmeserveris " -"kasutamiseks teistele kasutajatele, samuti hangitakse vahepeal teiste " -"kasutajate võtmetes tehtud muudatused." +msgid "Continue" +msgstr "Jätka" -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Käesolevaga hangitakse võtmeserverist vahepeal teiste kasutajate võtmetes " -"tehtud muudatused. Avalikustamiseks pole võtmeserverit valitud, seega pole " -"võimalik sinu võtmeid teistele kättesaadavaks teha." +msgid "_Select the type of item to create:" +msgstr "_Vali loodava elemendi liik:" -msgid "_Key Servers" -msgstr "_Võtmeserverid" +msgid "Import failed" +msgstr "Importimine nurjus" -msgid "_Sync" -msgstr "_Sünkroniseeri" +msgid "Import" +msgstr "Impordi" -msgid "Version of this application" -msgstr "Selle rakenduse versioon" +msgid "Data to be imported:" +msgstr "Imporditavad andmed:" -msgid "Encryption Key Manager" -msgstr "Krüptimisvõtmete haldur" +msgid "Import Key" +msgstr "Võtme importimine" -msgid "Contributions:" -msgstr "Kaasaaitajad:" +msgid "All key files" +msgstr "Kõik võtmefailid" -msgid "translator-credits" -msgstr "" -"Priit Laes , 2007.\n" -"Ivar Smolin , 2007–2011.\n" -"Mattias Põldaru , 2009." +msgid "Dropped text" +msgstr "Siia lohistatud tekst" -msgid "Seahorse Project Homepage" -msgstr "Seahorse projekti koduleht" +msgid "Clipboard text" +msgstr "Lõikepuhvri tekst" -#. Top menu items -msgid "_File" -msgstr "_Fail" +msgid "_New" +msgstr "_Uus" -msgid "_Edit" -msgstr "_Redaktor" +msgid "Close this program" +msgstr "Programmi sulgemine" -msgid "_View" -msgstr "_Vaade" +msgid "_New..." +msgstr "_Uus..." -msgid "_Help" -msgstr "A_bi" +msgid "Create a new key or item" +msgstr "Uue võtme või kirje loomine" -msgid "Prefere_nces" -msgstr "_Eelistused" +msgid "Add a new key or item" +msgstr "Uue võtme või kirje lisamine" -msgid "Change preferences for this program" -msgstr "Programmi eelistuste määramine" +msgid "_Import..." +msgstr "_Impordi..." -msgid "About this program" -msgstr "Programmist lähemalt..." +msgid "Import from a file" +msgstr "Võtmete importimine failist" -msgid "_Contents" -msgstr "_Sisu" +msgid "Import from the clipboard" +msgstr "Võtmete importimine lõikepuhvrist" -msgid "Show Seahorse help" -msgstr "Seahorse abiteabe näitamine" +msgid "By _keyring" +msgstr "_Võtmerõnga järgi" -msgid "Export public key" -msgstr "Avaliku võtme eksportimine" +msgid "Show sidebar listing keyrings" +msgstr "Külgribal võtmerõngaste loetelu kuvamine" -msgid "Exporting keys" -msgstr "Võtmete eksportimine" +msgid "Show _personal" +msgstr "Näidatakse _isiklikke" -msgid "Couldn't retrieve data from key server" -msgstr "Võtit pole võtmeserverist võimalik vastu võtta" +msgid "Only show personal keys, certificates and passwords" +msgstr "Näidatakse ainult isiklikke võtmeid, sertifikaate ja paroole" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -msgid "Copied keys" -msgstr "Kopeeritud võtmed" +msgid "Show _trusted" +msgstr "Näidatakse _usaldusväärseid" -msgid "Retrieving keys" -msgstr "Võtmete vastuvõtmine" +msgid "Only show trusted keys, certificates and passwords" +msgstr "Näidatakse ainult usaldusväärseid võtmeid, sertifikaate ja paroole" -msgid "Couldn't delete." -msgstr "Pole võimalik kustutada." +msgid "Show _any" +msgstr "Näidatakse _kõiki" -msgid "Deleting..." -msgstr "Kustutamine..." +msgid "Show all keys, certificates and passwords" +msgstr "Näidatakse kõiki võtmeid, sertifikaate ja paroole" -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s on salajane võti. Soovid sa jätkata?" +msgid "Filter" +msgstr "Filter" -msgid "Importing keys from key servers" -msgstr "Võtmete importimine serverist" +msgid "First time options:" +msgstr "Esimese kasutuse valikud:" -msgid "Show properties" -msgstr "Omaduste näitamine" +msgid "Generate a new key of your own: " +msgstr "Omale uue võtme loomine:" -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Kustuta" +msgid "Import existing keys from a file:" +msgstr "Olemasolevate võtmete importimine failist:" -msgid "Delete selected items" -msgstr "Valitud elementide kustutamine" +msgid "To get started with encryption you will need keys." +msgstr "Krüptimise jaoks on sul kõigepealt tarvis võtmeid." -msgid "E_xport..." -msgstr "_Ekspordi..." +msgid "Couldn't lock" +msgstr "Pole võimalik lukustada" -msgid "Export to a file" -msgstr "Võtmete eksportimine faili" +msgid "Couldn't unlock" +msgstr "Pole võimalik lukust lahti võtta" -msgid "Copy to the clipboard" -msgstr "Kopeeri lõikepuhvrisse" +msgid "_Lock" +msgstr "_Lukusta" -msgid "Import selected keys to local key ring" -msgstr "Valitud võtmete importimine kohalikku võtmerõngasse" +msgid "_Unlock" +msgstr "_Võta lukust lahti" -msgid "Enter your Secure Shell passphrase:" -msgstr "Sisesta oma Secure Shell'i parool" +msgid "_Properties" +msgstr "_Omadused" msgid "Configure Key for _Secure Shell..." msgstr "_Secure Shell'i võtme seadistamine..." @@ -2127,13 +1731,54 @@ "Secure Shell'i võtme saatmine teise masinasse ja selle võtme abil " "sisselogimise lubamine." +msgid "Enter your Secure Shell passphrase:" +msgstr "Sisesta oma Secure Shell'i parool" + +msgid "Old Key Passphrase" +msgstr "Võtme vana parool" + +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "Sisesta vana parool järgnevale võtmele: %s" + +msgid "New Key Passphrase" +msgstr "Uue võtme parool" + +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "Sisesta uus parool järgnevale võtmele: %s" + +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Sisesta uuesti uus parool: %s" + +msgid "Secure Shell" +msgstr "Secure shell (SSH)" + +msgid "Keys used to connect securely to other computers" +msgstr "Kasutatakse turvaliseks teistesse arvutitesse ühendumiseks" + #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Kas sa soovid SSH-võtme '%s' kustutada?" #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Kas sa soovid %d SSH-võtit kustutada?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Kas sa soovid %d SSH-võtme kustutada?" +msgstr[1] "Kas sa soovid %d SSH-võtit kustutada?" + +msgid "Ssh Key" +msgstr "SSH võti" + +msgid "Secret SSH keys" +msgstr "Salajased SSH võtmed" + +msgid "Public SSH keys" +msgstr "Avalikud SSH võtmed" + +msgid "No public key file is available for this key." +msgstr "Selle võtme jaoks pole ühtegi salajase võtme faili saadaval." msgid "Secure Shell Key" msgstr "Secure shell'i võti" @@ -2147,53 +1792,43 @@ msgid "Creating Secure Shell Key" msgstr "Secure Shell'i võtme loomine" -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Sisesta siia näiteks oma e-posti aadress või mõni muu meeldetuletus, mis " -"aitab võtme otstarvet meeles pidada." +msgid "New Secure Shell Key" +msgstr "Uus Secure Shell'i võti" -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Just Create Key" +msgstr "Loo ainult _võti" + +msgid "_Create and Set Up" +msgstr "L_oo võti ja säti paika" + +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" "Secure Shell'i (SSH) võti võimaldab sul SSH abil turvaliselt ühenduda " -"teistesse arvutitesse ilma, et sa peaksid iga arvuti jaoks parooli sisestama." +"teistesse arvutitesse." + +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Sisesta siia näiteks oma e-posti aadress või mõni muu meeldetuletus, mis " +"aitab võtme otstarvet meeles pidada." msgid "DSA" msgstr "DSA" msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "Kui sa soovid mõnes arvutis seda võtit kasutada, siis on võimalik panna see " -"arvuti sinu võtit ära tundma." - -msgid "New Secure Shell Key" -msgstr "Uus Secure Shell'i võti" - -msgid "_Create and Set Up" -msgstr "L_oo võti ja säti paika" - -msgid "_Just Create Key" -msgstr "Loo ainult _võti" - -msgid "_Key Description:" -msgstr "_Võtme kirjeldus:" +"arvuti sinu uut võtit ära tundma." msgid "(Unreadable Secure Shell Key)" msgstr "(Loetamatu Secure Shell'i võti)" -msgid "Invalid" -msgstr "Vigane" - -msgid "Private Secure Shell Key" -msgstr "Secure Shell'i salajane võti" +msgid "Personal SSH key" +msgstr "Isiklik SSH võti" -msgid "Public Secure Shell Key" -msgstr "Secure Shell'i avalik võti" +msgid "SSH key" +msgstr "SSH võti" msgid "Couldn't rename key." msgstr "Võtit pole võimalik ümber nimetada." @@ -2204,77 +1839,54 @@ msgid "Couldn't change passphrase for key." msgstr "Võtme parooli pole võimalik muuta." -msgid "Algorithm:" -msgstr "Algoritm:" - msgid "Identifier:" msgstr "Identifikaator:" -msgid "Location:" -msgstr "Asukoht:" - +#. Name of key, often a persons name +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nimi:" -msgid "Strength:" -msgstr "Tugevus:" +msgid "Used to connect to other computers." +msgstr "Kasutatakse teistesse arvutitesse ühendumiseks." msgid "Trust" msgstr "Usaldus" +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Selle võtme omanik on _volitatud sellesse arvutisse ühenduma" + #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "See rakendub ainult kontole '%s'." +msgid "This only applies to the %s account." +msgstr "See rakendub ainult kontole %s." -msgid "E_xport Complete Key" -msgstr "_Ekspordi kogu võti" +msgid "Algorithm:" +msgstr "Algoritm:" -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Selle võtme omanik on _volitatud sellesse arvutisse ühenduma" +msgid "Strength:" +msgstr "Tugevus:" -msgid "Used to connect to other computers." -msgstr "Kasutatakse teistesse arvutitesse ühendumiseks." +msgid "Location:" +msgstr "Asukoht:" + +msgid "E_xport Complete Key" +msgstr "_Ekspordi kogu võti" -#, c-format msgid "The SSH command was terminated unexpectedly." msgstr "SSH käsk katkestas ootamatult." msgid "The SSH command failed." msgstr "Tõrge SSH käsu täitmisel." -msgid "Secure Shell key" -msgstr "Secure Shell'i võti" - -msgid "Passphrase:" -msgstr "Parool:" - -#. Just prompt over and over again msgid "Remote Host Password" msgstr "Kaugmasina parool" -msgid "Old Key Passphrase" -msgstr "Võtme vana parool" - -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "Sisesta vana parool järgnevale võtmele: %s" - -msgid "New Key Passphrase" -msgstr "Uue võtme parool" - -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "Sisesta uus parool järgnevale võtmele: %s" - msgid "Enter Key Passphrase" msgstr "Võtme parooli sisestamine" msgid "Passphrase for New Secure Shell Key" msgstr "Parool uuele Secure Shelli võtmele" -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "Sisesta oma Secure Shell'i võtmele parool." - #, c-format msgid "Importing key: %s" msgstr "Võtme importimine: %s" @@ -2282,19 +1894,22 @@ msgid "Importing key. Enter passphrase" msgstr "Võtme importimine. Sisesta parool" +msgid "OpenSSH keys" +msgstr "OpenSSH võtmed" + +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + msgid "No private key file is available for this key." msgstr "Selle võtme jaoks pole salajase võtme faili saadaval." msgid "Couldn't configure Secure Shell keys on remote computer." msgstr "Secure Shell'i võtit pole võimalik võrguarvuti jaoks seadistama." -#. Show the progress window if necessary msgid "Configuring Secure Shell Keys..." msgstr "Secure Shell'i võtmete seadistamine..." -msgid "eg: fileserver.example.com:port" -msgstr "näiteks: failiserver.example.com:port" - msgid "Set Up Computer for SSH Connection" msgstr "SSH ühendusele arvuti määramine" @@ -2305,6 +1920,9 @@ "Secure Shell'i võtme kasutamisel võrguarvutisse SSH-ga\n" "sisselogimiseks peab sul olema selles arvutis konto." +msgid "eg: fileserver.example.com:port" +msgstr "näiteks: failiserver.example.com:port" + msgid "_Computer Name:" msgstr "_Arvuti nimi:" @@ -2313,141 +1931,3 @@ msgid "_Set Up" msgstr "_Määra" - -#~ msgid "Couldn't share keys" -#~ msgstr "Võtmeid pole võimalik jagada" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "Tuvastatud andmeid pole võimalik võrgus avaldada." - -#~ msgid "%s's encryption keys" -#~ msgstr "Kasutaja %s krüptimisvõtmed" - -#~ msgid "Key Sharing" -#~ msgstr "Võtmete jagamine" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "Sinu võtmete jagamine võimaldab teistel Sinu võrgus asuvatel kasutajatel " -#~ "pruukida Sinu poolt kogutud võtmeid. See tähendab, et kasutajatel on " -#~ "automaatselt võimalik krüptida asju Sinu jaoks ja Sinu poolt kogutud " -#~ "võtmete omanike jaoks krüptida ilma, et Sa peaksid neile ise võtmeid " -#~ "saatma.\n" -#~ "\n" -#~ "Märkus: Sinu isiklikud võtmed pole selle tõttu ohustatud." - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "_Minu võtmed on jagatud minu võrgus olevatele kasutajatele" - -#~ msgid "Other _Collected Keys" -#~ msgstr "_Muud kogutud võtmed" - -#~ msgid "_Trusted Keys" -#~ msgstr "_Usaldusväärsed võtmed" - -#~ msgid "Retrieving key" -#~ msgstr "Võtme vastuvõtmine" - -#~ msgid "Removing item" -#~ msgstr "Kirje eemaldamine" - -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "Kasutaja sisselogimisel automaatselt lukust lahti võetud." - -#~ msgid "Couldn't get default password keyring" -#~ msgstr "Vaikimisi parooli võtmerõngast pole võimalik hankida" - -#~ msgid "Couldn't get list of password keyrings" -#~ msgstr "Paroolide võtmerõngaste nimekirja pole võimalik hankida" - -#~ msgid "Couldn't remove keyring" -#~ msgstr "Võtmerõngast pole võimalik eemaldada" - -#~ msgid "Are you sure you want to permanently delete the '%s' keyring?" -#~ msgstr "Kas sa soovid võtmerõnga '%s' jäädavalt kustutada?" - -#~ msgid "Default Keyring" -#~ msgstr "Vaikimisi võtmerõngas" - -#~ msgid "Password Keyrings" -#~ msgstr "Paroolide võtmerõngad" - -#~ msgid "Password and Encryption Settings" -#~ msgstr "Parooli- ja krüptimissätted" - -#~ msgid "_Add Keyring" -#~ msgstr "_Lisa võtmerõngas" - -#~ msgid "_Remove Keyring" -#~ msgstr "_Eemalda võtmerõngas" - -#~ msgid "Unknown Key: %s" -#~ msgstr "Tundmatu võti: %s" - -#~ msgid "Unknown Key" -#~ msgstr "Tundmatu võti" - -#~ msgid "Unavailable Key" -#~ msgstr "Võti pole saadaval" - -#~ msgid "X509 Certificate" -#~ msgstr "X509-sertifikaat" - -#~ msgid "Loading..." -#~ msgstr "Laadimine..." - -#~ msgid "Invalid or unrecognized object." -#~ msgstr "Vigane või tundmatu objekt." - -#~ msgid "Exporting is not yet supported." -#~ msgstr "Eksportimine pole veel toetatud." - -#~ msgid "Expiry for Subkey %d of %s" -#~ msgstr "Omaniku %2$s %1$d. alamvõtme aegumise määramine" - -#~ msgid "_Quit" -#~ msgstr "_Välju" - -#~ msgid "Create a new personal key" -#~ msgstr "Uue isikliku võtme loomine" - -#~ msgid "Import keys into your key ring from a file" -#~ msgstr "Failis olevate võtmete importimine võtmerõngasse" - -#~ msgid "_Close" -#~ msgstr "_Sulge" - -#~ msgid "_Key" -#~ msgstr "Võ_ti" - -#~ msgid "P_roperties" -#~ msgstr "_Omadused" - -#~ msgid "E_xport Public Key..." -#~ msgstr "_Ekspordi avalik võti..." - -#~ msgid "_Copy Public Key" -#~ msgstr "_Kopeeri avalik võti" - -#~ msgid "Copy public part of selected keys to the clipboard" -#~ msgstr "Valitud võtmete avaliku osa kopeerimine lõikepuhvrisse" - -#~ msgid "_Delete Key" -#~ msgstr "Ku_stuta võti" - -#~ msgid "Secure Shell Passphrase" -#~ msgstr "Secure Shell'i parool" - -#~ msgid "Secure Shell Key Passphrase" -#~ msgstr "Secure Shell'i võtme parool" - -#~ msgid "Enter the passphrase for: %s" -#~ msgstr "Parooli sisestamine: %s" - -#~ msgid "Save this passphrase in my keyring" -#~ msgstr "Salvestada selle võtme parool minu võtmerõngasse" diff -Nru seahorse-3.2.2/po/eu.po seahorse-3.6.3/po/eu.po --- seahorse-3.2.2/po/eu.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/eu.po 2012-08-21 12:23:19.000000000 +0200 @@ -2,15 +2,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Iñaki Larrañaga Murgoitio , 2008, 2009, 2010, 2011. +# Iñaki Larrañaga Murgoitio , 2008, 2009, 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: eu_to_be_translate\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-25 13:42+0200\n" -"PO-Revision-Date: 2011-09-25 13:41+0200\n" -"Last-Translator: \n" -"Language-Team: American English \n" +"POT-Creation-Date: 2012-03-07 17:26+0100\n" +"PO-Revision-Date: 2012-03-07 17:06+0100\n" +"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"Language-Team: American English \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,7 +40,57 @@ msgid "The host name or address of the server." msgstr "Zerbitzariaren ostalari-izena edo helbidea." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Pasahitzaren gako sorta berria" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Aplikazio eta sareko pasahitzak gordetzeko erabiltzen da" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Pasahitz berria..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Gorde modu seguruan pasahitz edo ezkutuko bat." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Pasahitzen gako sorta" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Gordetako pasahitza" + +#: ../gkr/seahorse-gkr-actions.c:151 +msgid "Couldn't set default keyring" +msgstr "Ezin izan da gako sorta lehenetsia ezarri" + +#: ../gkr/seahorse-gkr-actions.c:183 +msgid "Couldn't change keyring password" +msgstr "Ezin izan da gako sortaren pasahitza aldatu" + +#: ../gkr/seahorse-gkr-actions.c:209 +msgid "_Set as default" +msgstr "Ezarri _lehenetsi gisa" + +#: ../gkr/seahorse-gkr-actions.c:210 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Normalean aplikazioek pasahitz berriak gako sorta lehenetsian gordetzen " +"dituzte." + +#: ../gkr/seahorse-gkr-actions.c:211 +msgid "Change _Password" +msgstr "Aldatu _pasahitza" + +#: ../gkr/seahorse-gkr-actions.c:212 +msgid "Change the unlock password of the password storage keyring" +msgstr "Aldatu pasahitzak gordetzeko gako sorta desblokeatzeko pasahitza" + +#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:71 msgid "Couldn't add keyring" msgstr "Ezin izan da gako sorta gehitu" @@ -50,6 +100,7 @@ #: ../gkr/seahorse-gkr-add-item.xml.h:2 #: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "_Description:" msgstr "_Azalpena:" @@ -65,66 +116,113 @@ msgid "_Show Password" msgstr "_Erakutsi pasahitza" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Ezin izan da elementua ezabatu." +#: ../gkr/seahorse-gkr-backend.c:99 +msgid "Passwords" +msgstr "Pasahitzak" + +#: ../gkr/seahorse-gkr-backend.c:102 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Gorde pasahitz, kredentzial eta ezkutuko pertsonalak" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:317 +msgid "IM account password for " +msgstr "BM-ko kontuaren pasahitza" + +#: ../gkr/seahorse-gkr-item.c:383 +msgid "Password or secret" +msgstr "Pasahitza edo ezkutukoa" + +#: ../gkr/seahorse-gkr-item.c:384 +msgid "Network password" +msgstr "Sareko pasahitza" + +#: ../gkr/seahorse-gkr-item.c:385 +msgid "Stored note" +msgstr "Gordetako oharra" + +#: ../gkr/seahorse-gkr-item.c:386 +msgid "Keyring password" +msgstr "Gako sortaren pasahitza" + +#: ../gkr/seahorse-gkr-item.c:387 +msgid "Encryption key password" +msgstr "Enkriptatze-gakoaren pasahitza" + +#: ../gkr/seahorse-gkr-item.c:388 +msgid "Key storage password" +msgstr "Gakoen biltegiaren pasahitza" + +#: ../gkr/seahorse-gkr-item.c:389 +msgid "Google Chrome password" +msgstr "Google Chrome-ren pasahitza" + +#: ../gkr/seahorse-gkr-item.c:390 +msgid "Gnome Online Accounts password" +msgstr "GNOMEko lineako kontuen pasahitza" + +#: ../gkr/seahorse-gkr-item.c:391 +msgid "Telepathy password" +msgstr "Telepathy-ren pasahitza" + +#: ../gkr/seahorse-gkr-item.c:392 +msgid "Instant messaging password" +msgstr "Berehalako mezularitzaren pasahitza" + +#: ../gkr/seahorse-gkr-item.c:393 +msgid "Network Manager secret" +msgstr "Sareko kudeatzailearen ezkutukoa" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Ziur zaude '%s' pasahitza ezabatu nahi duzula?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:86 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Ziur zaude pasahitz %d ezabatu nahi duzula?" msgstr[1] "Ziur zaude %d pasahitz ezabatu nahi dituzula?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Elementua ezabatzen" -msgstr[1] "Elementuak ezabatzen" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a network share or resource" msgstr "Atzitu sare partekatua edo baliabidea" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Access a website" msgstr "Atzitu webgunea" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a PGP key" msgstr "PGP gakoa desblokeatzen du" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Unlocks a Secure Shell key" msgstr "Shell seguruaren gakoa desblokeatzen du" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:81 msgid "Saved password or login" msgstr "Gordetako pasahitza edo erabiltzaile-izena" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:105 msgid "Network Credentials" msgstr "Sareko kredentzialak" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:110 msgid "Password" msgstr "Pasahitza" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:210 msgid "Couldn't change password." msgstr "Ezin izan da pasahitza aldatu." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:255 +#: ../gkr/seahorse-gkr-item-properties.c:376 msgid "Updating password" msgstr "Pasahitza eguneratzea" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:336 msgid "Couldn't set description." msgstr "Ezin izan da azalpena ezarri." @@ -181,108 +279,27 @@ msgid "Use:" msgstr "Erabili:" -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Pasahitzak: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Pasahitzak: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Pasahitzen gako sorta" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Aplikazio eta sareko pasahitzak gordetzeko erabiltzen da" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Gordetako pasahitza" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Gorde modu seguruan pasahitz edo ezkutuko bat." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Ezin izan da gako sorta desblokeatu" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Ezin izan da gako sorta blokeatu" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Ezin izan da gako sorta lehenetsia ezarri" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Ezin izan da gako sortaren pasahitza aldatu" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Blokeatu" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Blokeatu pasahitzak gordetzeko gako sorta, horrela pasahitz maisua beharko " -"da desblokeatzeko." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Desblokeatu" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Desblokeatu pasahitzak gordetzeko gako sorta, horrela erabiltzeko " -"erabilgarri egongo da." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "Ezarri _lehenetsi gisa" - -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Normalean aplikazioek pasahitz berriak gako sorta lehenetsian gordetzen " -"dituzte." - -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Aldatu _pasahitza" - -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Aldatu pasahitzak gordetzeko gako sorta desblokeatzeko pasahitza" - -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Ezin izan da gako sorta ezabatu" +#: ../gkr/seahorse-gkr-keyring.c:147 +msgid "Login keyring" +msgstr "Saio-hasierako gako sorta" + +#: ../gkr/seahorse-gkr-keyring.c:676 +msgid "A keyring that is automatically unlocked on login" +msgstr "Saioa hastean automatikoki desblokeatzen den gako sorta" + +#: ../gkr/seahorse-gkr-keyring.c:677 +msgid "A keyring used to store passwords" +msgstr "Pasahitzak gordetzeko erabiltzen den gako sorta" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Ziur zaude pasahitzen '%s' gako sorta ezabatu nahi duzula?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Gako sorta ezabatzen" -msgstr[1] "Gako sortak ezabatzen" +#: ../gkr/seahorse-gkr-keyring-deleter.c:83 +msgid "I understand that all items will be permanently deleted." +msgstr "Ulertzen dut elementu guztiak betirako ezabatuko direla." -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. #. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 @@ -299,39 +316,39 @@ msgstr "Gako sortaren propietateak" #: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Izena:" +msgid "Name:" +msgstr "Izena:" -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 +#: ../gkr/seahorse-gkr-operation.c:54 ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:585 ../ssh/seahorse-ssh-operation.c:194 msgid "The operation was cancelled" msgstr "Eragiketa bertan behera utzi da" -#: ../gkr/seahorse-gkr-operation.c:57 +#: ../gkr/seahorse-gkr-operation.c:59 msgid "Access to the key ring was denied" msgstr "Gako sorta atzitzea ukatu egin da" -#: ../gkr/seahorse-gkr-operation.c:60 +#: ../gkr/seahorse-gkr-operation.c:62 msgid "The gnome-keyring daemon is not running" msgstr "Gnome-ren gako sortaren daemon-a ez dago martxan" -#: ../gkr/seahorse-gkr-operation.c:63 +#: ../gkr/seahorse-gkr-operation.c:65 msgid "The key ring has already been unlocked" msgstr "Gako sorta dagoeneko desblokeatu da" -#: ../gkr/seahorse-gkr-operation.c:66 +#: ../gkr/seahorse-gkr-operation.c:68 msgid "No such key ring exists" msgstr "Ez dago horrelako gako sortarik" -#: ../gkr/seahorse-gkr-operation.c:69 +#: ../gkr/seahorse-gkr-operation.c:71 msgid "Couldn't communicate with key ring daemon" msgstr "Ezin izan da gako sortaren daemon-arekin komunikatu" -#: ../gkr/seahorse-gkr-operation.c:72 +#: ../gkr/seahorse-gkr-operation.c:74 msgid "The item already exists" msgstr "Elementua badago lehendik" -#: ../gkr/seahorse-gkr-operation.c:78 +#: ../gkr/seahorse-gkr-operation.c:80 msgid "Internal error accessing gnome-keyring" msgstr "Barne-errorea gertatu da gnome-ren gako sorta atzitzean" @@ -615,24 +632,126 @@ msgid "initial temporary item" msgstr "hasierako aldi baterako elementua" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Pasaesaldia" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Ekarpenak:" + +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:2 +#: ../src/seahorse-key-manager.c:668 ../src/seahorse-main.c:68 +msgid "Passwords and Keys" +msgstr "Pasahitzak eta gakoak" + +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "Hizkuntza Politikarako Sailburuordetza , 2008." + +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse proiektuaren etxeko orria" + +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Ezin da ezabatu" + +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Ezin izan dira gakoak esportatu" + +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Ezin izan dira datuak esportatu" + +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Fitxategia" + +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_sportatu..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Fitxategi batera esportatzen du" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Editatu" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopiatu arbelean" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Ezabatu" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Hautatutako elementuak ezabatzen ditu" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Erakutsi elementu honen propietateak" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Erakutsi gako sorta honen propietateak" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Hobespenak" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Aldatu programa honen hobespenak" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Ikuspegia" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Laguntza" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Programa honi buruz" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Edukia" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Erakutsi Seahorse-ren laguntza" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 +msgid "Export" +msgstr "Esportatu" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +#: ../libseahorse/seahorse-interaction.c:100 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Idatzi honen PIN edo pasahitza: %s" + +#: ../libseahorse/seahorse-passphrase.c:182 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "Pasahitza:" #. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 +#: ../libseahorse/seahorse-passphrase.c:244 msgid "Confirm:" msgstr "Berretsi:" -#: ../libseahorse/seahorse-prefs.c:68 +#: ../libseahorse/seahorse-prefs.c:66 msgid "Not a valid Key Server address." msgstr "Gako-zerbitzariaren helbidea ez da baliozkoa." -#: ../libseahorse/seahorse-prefs.c:69 +#: ../libseahorse/seahorse-prefs.c:67 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." @@ -640,15 +759,15 @@ "Laguntza eskuratzeko, jarri harremanetan sistema-administratzailearekin edo " "gako-zerbitzariaren administratzailearekin." -#: ../libseahorse/seahorse-prefs.c:183 +#: ../libseahorse/seahorse-prefs.c:180 msgid "URL" msgstr "URLa" -#: ../libseahorse/seahorse-prefs.c:348 +#: ../libseahorse/seahorse-prefs.c:350 msgid "Custom" msgstr "Pertsonalizatuta" -#: ../libseahorse/seahorse-prefs.c:406 +#: ../libseahorse/seahorse-prefs.c:403 msgid "None: Don't publish keys" msgstr "Bat ere ez: ez argitaratu gakorik" @@ -676,109 +795,53 @@ msgid "_Publish keys to:" msgstr "_Argitaratu gakoak hemen:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Datuak eskuratzen" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Datuak esportatzen" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Datuak inportatzen" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Datuak bidaltzen" - -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Ez dago erabilgarri" - -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%3$d-%2$m-%1$Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Gakoaren datuak" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Gako anizkoitzak" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Gako-fitxategi guztiak" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Fitxategi guztiak" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Artxibo-fitxategiak" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Badago lehendik izen hori duen fitxategi bat.\n" -"\n" -"Fitxategi berriarekin ordeztu nahi duzu?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Ordeztu" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-key-properties.c:1248 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Ezezaguna" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1254 msgctxt "Validity" msgid "Never" msgstr "Inoiz ere ez" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 +#: ../pgp/seahorse-pgp-key-properties.c:1261 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 msgid "Marginal" msgstr "Marjinala" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 +#: ../pgp/seahorse-pgp-key-properties.c:1267 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 msgid "Full" msgstr "Osoa" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 +#: ../pgp/seahorse-pgp-key-properties.c:1273 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 msgid "Ultimate" msgstr "Azkena" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1463 msgid "Disabled" msgstr "Desgaituta" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1459 msgid "Revoked" msgstr "Errebokatuta" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:473 #, c-format msgid "Could not display help: %s" msgstr "Ezin izan da laguntza erakutsi: %s" @@ -800,6 +863,7 @@ msgstr "Gakoaren _luzera:" #: ../pgp/seahorse-add-subkey.xml.h:5 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 msgid "Key _Type:" msgstr "Gako _mota:" @@ -839,7 +903,7 @@ msgid "Optional email address" msgstr "Aukerako helbide elektronikoa" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Email Address:" msgstr "_Helbide elektronikoa:" @@ -864,7 +928,7 @@ msgid "Add subkey to %s" msgstr "Gehitu azpigakoa %s(r)i" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (sinatzeko soilik)" @@ -872,7 +936,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (enkriptatzeko soilik)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (sinatzeko soilik)" @@ -911,47 +975,131 @@ msgid "Expiry: %s" msgstr "Iraungitu: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Gako anizkoitzak" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Gakoaren datuak" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "PGP gako blindatuak" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP gakoak" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP gakoa" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Mezu elektronikoak eta fitxategiak enkriptatzeko erabilia" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Ezin izan da PGP gakoa sortu" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "PGP gako berriaren pasaesaldia" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "Idatzi gako berriaren pasaesaldia bi bider." -#: ../pgp/seahorse-gpgme-generate.c:219 +#: ../pgp/seahorse-gpgme-generate.c:223 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Gakoa sortzea" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Ziur zaude %s behin betiko ezabatu nahi duzula?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Ziur zaude gako %d behin betiko ezabatu nahi duzula?" +msgstr[1] "Ziur zaude %d gako behin betiko ezabatu nahi dituzula?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Pasahitza ez da zuzena" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Okerreko pasahitza sartu duzun hirugarren aldia da unekoa. Saiatu berriro." +#: ../pgp/seahorse-gpgme-keyring.c:90 +#, c-format +msgid "Wrong passphrase." +msgstr "Pasaesaldi okerra." + +#: ../pgp/seahorse-gpgme-keyring.c:94 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Idatzi '%s'(r)en pasaesaldi berria" + +#: ../pgp/seahorse-gpgme-keyring.c:96 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Idatzi '%s'(r)en pasaesaldia" + +#: ../pgp/seahorse-gpgme-keyring.c:99 +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Enter new passphrase" +msgstr "Idatzi pasaesaldi berria" + +#: ../pgp/seahorse-gpgme-keyring.c:101 +msgid "Enter passphrase" +msgstr "Idatzi pasaesaldia" + +#: ../pgp/seahorse-gpgme-keyring.c:106 +msgid "Passphrase" +msgstr "Pasaesaldia" + +#: ../pgp/seahorse-gpgme-keyring.c:307 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Gako %d kargatu da" +msgstr[1] "%d gako kargatu dira" + +#: ../pgp/seahorse-gpgme-keyring.c:654 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Gako-datu baliogabeak (UIDak falta dira). Litekeena da ordenagailu baten " +"data etorkizunekoa izatea, edo autosinadura bat falta izatea." + +#: ../pgp/seahorse-gpgme-keyring.c:814 +msgid "GnuPG keys" +msgstr "GnuPG gakoak" + +#: ../pgp/seahorse-gpgme-keyring.c:817 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: gako sortaren direktorio lehenetsia" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -986,28 +1134,32 @@ msgid "All JPEG files" msgstr "JPEG fitxategi guztiak" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:301 +msgid "All files" +msgstr "Fitxategi guztiak" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Aukeratu gakoari gehitzeko argazkia" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Ezin izan da argazkia prestatu" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Ezin izan da argazkia gehitu" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "Ezin izan da fitxategia kargatu. Litekeena da formatua baliogabea izatea" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Ziur zaude uneko argazkia gakotik kendu nahi duzula?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Ezin izan da argazkia ezabatu" @@ -1065,7 +1217,11 @@ msgid "Couldn't add revoker" msgstr "Ezin izan da errebokatzailea gehitu" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Ulertzen dut ezkutuko gako hau betirako ezabatuko dela." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1080,11 +1236,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Ez dago sinatzeko gako erabilgarririk" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1092,62 +1248,153 @@ "Gako honen fidagarritasuna adierazteko erabil daitekeen PGP gako pertsonalik " "ez duzu." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Pasaesaldi okerra." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:603 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Idatzi '%s'(r)en pasaesaldi berria" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Bilaketa ez da nahiko zehatza. '%s' zerbitzariak gako gehiegi aurkitu ditu." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:606 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Idatzi '%s'(r)en pasaesaldia" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Idatzi pasaesaldi berria" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Ezin izan da '%s' zerbitzariarekin komunikatu: %s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Idatzi pasaesaldia" +#: ../pgp/seahorse-hkp-source.c:1129 +msgid "HTTP Key Server" +msgstr "HTTP gako-zerbitzaria" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Ezin izan dira gakoak inportatu" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Gakoak inportatzen gako zerbitzaritik" + +#: ../pgp/seahorse-keyserver-results.c:243 ../src/seahorse-key-manager.c:517 +msgid "_Remote" +msgstr "_Urrunekoa" + +#: ../pgp/seahorse-keyserver-results.c:245 +msgid "Close this window" +msgstr "Itxi leiho hau" + +#: ../pgp/seahorse-keyserver-results.c:249 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Bilatu urruneko gakoak..." + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Gakoak bilatzea gako zerbitzarian" + +#: ../pgp/seahorse-keyserver-results.c:254 ../src/seahorse-key-manager.xml.h:5 +msgid "_Import" +msgstr "_Inportatu" + +#: ../pgp/seahorse-keyserver-results.c:255 +msgid "Import selected keys to local key ring" +msgstr "Inportatu hautatutako gakoak lokaleko gako sortara" + +#: ../pgp/seahorse-keyserver-results.c:285 +msgid "Remote Keys" +msgstr "Urruneko gakoak" + +#: ../pgp/seahorse-keyserver-results.c:287 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Gako %d kargatu da" -msgstr[1] "%d gako kargatu dira" +msgid "Remote Keys Containing '%s'" +msgstr "'%s' duten urruneko gakoak" + +#: ../pgp/seahorse-keyserver-results.c:484 +msgid "The search for keys failed." +msgstr "Gakoen bilaketak huts egin du." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Key Servers:" +msgstr "Gako-zerbitzariak:" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "Shared Keys Near Me:" +msgstr "Nire inguruko gako partekatuak:" + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "Find Remote Keys" +msgstr "Bilatu urruneko gakoak" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:4 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Gako-datu baliogabeak (UIDak falta dira). Litekeena da ordenagailu baten " -"data etorkizunekoa izatea, edo autosinadura bat falta izatea." +"Horrek besteen gakoak bilatuko ditu Interneten. Gako horiek gako sorta " +"lokalera inporta daitezke." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Where to search:" +msgstr "Non bilatu:" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP gako-zerbitzaria" +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "_Search" +msgstr "_Bilatu" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search for keys containing: " +msgstr "_Bilatu hau duten gakoak: " + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Ezin izan dira gakoak zerbitzarian argitaratu" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Bilaketa ez da nahiko zehatza. '%s' zerbitzariak gako gehiegi aurkitu ditu." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Ezin izan dira gakoak zerbitzaritik eskuratu: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Ezin izan da '%s' zerbitzariarekin komunikatu: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "gako %d hautatu da sinkronizatzeko" +msgstr[1] "%d gako hautatu dira sinkronizatzeko" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Gakoak sinkronizatzen..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Gakoak sinkronizatzea" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Zure gako sortako gakoak argitaratzen ditu horrek, beste erabiltzaileentzat " +"erabilgarri egon daitezen. Besteen gakoak jaso zenituenetik haietan izandako " +"aldaketak ere jasotzen ditu." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Besteen gakoak jaso zenituenetik haietan egindako aldaketak eskuratzen ditu " +"horrek. Ez da argitaratzeko gako-zerbitzaririk hautatu, beraz, zure gakoak " +"ez dira besteentzat erabilgarri egongo." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Gako-zerbitzariak" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sinkronizatu" #: ../pgp/seahorse-ldap-source.c:440 #, c-format @@ -1169,51 +1416,30 @@ msgid "Resolving server address: %s" msgstr "Zerbitzariaren helbidea ebaztea: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1446 msgid "LDAP Key Server" msgstr "LDAP gako-zerbitzaria" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Sinatu gakoa..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Gako publikoa sinatzen du" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Ziur zaude %s behin betiko ezabatu nahi duzula?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Ziur zaude %d gako eta identitate behin betiko ezabatu nahi dituzula?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Ziur zaude %d gako behin betiko ezabatu nahi dituzula?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Ziur zaude %d identitate behin betiko ezabatu nahi dituzula?" - -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Ezin izan da erabiltzailearen IDa ezabatu" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sinkronizatu eta argitaratu gakoak..." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Ezin izan da gako pribatua ezabatu" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Ezin izan da gako publikoa ezabatu" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Argitaratu edo/eta sinkronizatu zure gakoak linean daudenekin." -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 +#: ../pgp/seahorse-pgp-backend.c:174 +msgid "PGP Keys" +msgstr "PGP gakoak" + +#: ../pgp/seahorse-pgp-backend.c:177 +msgid "PGP keys are for encrypting email or files" +msgstr "" +"PGP gakoak mezu elektronikoak eta fitxategiak enkriptatzeko erabiltzen dira" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "_Advanced key options" msgstr "Gako-aukera _aurreratuak" @@ -1242,7 +1468,9 @@ msgid "Generate a new key" msgstr "Sortu gako berri bat" -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:9 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:6 msgid "Key _Strength (bits):" msgstr "Gakoaren _indarra (bitetan):" @@ -1251,126 +1479,119 @@ msgstr "_Ez da iraungitzen" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "PGP gako berria" - -#: ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Comment:" msgstr "I_ruzkina:" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Iraungita" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "PGP gako pertsonalak" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP gakoa" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Ezin izan da erabiltzailearen ID nagusia aldatu" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Ziur zaude '%s' erabiltzailearen IDa behin betiko ezabatu nahi duzula?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Ezin izan da erabiltzailearen IDa ezabatu" + +#: ../pgp/seahorse-pgp-key-properties.c:428 +#: ../pgp/seahorse-pgp-key-properties.c:1564 msgid "[Unknown]" msgstr "[Ezezaguna]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:535 +#: ../pgp/seahorse-pgp-key-properties.c:1846 msgid "Name/Email" msgstr "Izena/Helbide elektronikoa" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:540 msgid "Signature ID" msgstr "Sinaduraren IDa" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:673 msgid "Couldn't change primary photo" msgstr "Ezin izan da argazki nagusia aldatu" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#: ../pgp/seahorse-pgp-key-properties.c:906 msgid "(unknown)" msgstr "(ezezaguna)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:909 #, c-format msgid "This key expired on: %s" msgstr "Gako hori data honetan iraungi zen: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:972 msgid "Name" msgstr "Izena" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1085 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Ziur zaude %2$s(r)en %1$d azpigakoa behin betiko ezabatu nahi duzula?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1094 msgid "Couldn't delete subkey" msgstr "Ezin izan da azpigakoa ezabatu" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1134 +#: ../pgp/seahorse-pgp-key-properties.c:1539 msgid "Unable to change trust" msgstr "Ezin izan da fidagarritasuna aldatu" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Ezin izan da gakoa \"%s\"(e)ra esportatu" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Esportatu gako osoa" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Ezin izan da gakoa esportatu." +#: ../pgp/seahorse-pgp-key-properties.c:1147 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Ezin izan da gakoa esportatu" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1379 +#: ../pgp/seahorse-pgp-key-properties.c:1468 msgctxt "Expires" msgid "Never" msgstr "Inoiz ere ez" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1426 msgid "ID" msgstr "IDa" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1429 msgid "Type" msgstr "Mota" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "Created" msgstr "Sortuta" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Expires" msgstr "Iraungitze-data" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Status" msgstr "Egoera" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Strength" msgstr "Indarra" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1461 +msgid "Expired" +msgstr "Iraungita" + +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Good" msgstr "Ona" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1849 msgid "Key ID" msgstr "Gakoaren IDa" @@ -1472,10 +1693,6 @@ msgid "Expires:" msgstr "Iraungitze-data:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Esportatu" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 msgid "Go to next photo" msgstr "Joan hurrengo argazkira" @@ -1616,9 +1833,7 @@ msgid "Public PGP Key" msgstr "PGP gako publikoa" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Fidagarritasuna" @@ -1667,13 +1882,17 @@ msgid "_Reason:" msgstr "_Arrazoia:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Ez duzu dokumentu edo mezu bat sinatzeko erabil daitekeen PGP gako " "pertsonalik." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Sinatu mezua gako honekin:" + #: ../pgp/seahorse-sign.xml.h:1 msgid "How carefully have you checked this key?" msgstr "Nola egiaztatu duzu gako hori?" @@ -1762,34 +1981,160 @@ msgid "_Very Carefully" msgstr "_Kontu handiz" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Sinatu mezua gako honekin:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Datuak esportatzen" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Datuak eskuratzen" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Datuak inportatzen" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Datuak bidaltzen" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Ez dago erabilgarri" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Ziurtagiri eta gako pertsonala" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Ziurtagiri pertsonala" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Ziurtagiria" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Ziurtagiriak (DERekin kodetuta)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Ziurtagiriak" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 ziurtagiriak eta dagokien gakoak" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Ziur zaude ziurtagiri %d betirako ezabatu nahi dituzula?" +msgstr[1] "Ziur zaude %d ziurtagiri betirako ezabatu nahi dituzula?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Ezin izan da gako pribatua sortu" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Sortu" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Gako pribatua" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Ziurtagiria eskatzeko erabilita" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Create a new private key" +msgstr "Sortu gako pribatu berria" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +msgid "Label:" +msgstr "Etiketa:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +msgid "Stored at:" +msgstr "Hemen gordeta:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Ulertzen dut gako hau betirako ezabatuko dela." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Izengabea" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Huts egin du ziurtagiria esportatzean" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Ezin izan da ezabatu" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Ziur zaude %s ziurtagiria ezabatu nahi duzula?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Ziur zaude ziurtagiri %d ezabatu nahi duzula?" -msgstr[1] "Ziur zaude %d ziurtagiri ezabatu nahi dituzula?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Ezabatzen" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Esportatu" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Esportatu ziurtagiria" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Ezabatu ziurtagiri edo gako hau" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Eskatu _ziurtagiria" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Sortu ziurtagiriaren eskatzeko fitxategi bat gako honentzako." + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Ezin izan da ziurtagiriaren eskaera gorde." + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Gorde ziurtagiriaren eskaera" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Ziurtagiriaren eskaera" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM-rekin kodetutako eskaera" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Ezin izan da ziurtagiriaren eskaera sortu" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Sortu ziurtagiriaren eskaerarako fitxategia." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "Name (CN):" +msgstr "Izena (CN):" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "The common name (CN) placed in the certificate request." +msgstr "Ziurtagiriaren eskaeran egongo den izen arrunta (CN)." + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Izenik gabeko gako pribatua" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" @@ -1811,134 +2156,109 @@ msgid "Manage your passwords and encryption keys" msgstr "Kudeatu pasahitzak eta enkriptatze-gakoak" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Pasahitzak eta gakoak" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Jarraitu" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Hautatu elementu mota sortzeko:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Jarraitu" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Sortu berria..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Gako %d hautatuta" -msgstr[1] "%d gako hautatua" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Huts egin du inportatzeak" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Inportatu" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Datuak inportatzeko:" -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Ezin izan dira gakoak inportatu" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Inportatutako gakoak" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Gakoak inportatzen" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:255 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Inportatu gakoa" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Gako mota ezezaguna, edo datu formatu baliogabea" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Gakoak inportatzea" +#: ../src/seahorse-key-manager.c:267 +msgid "All key files" +msgstr "Gako-fitxategi guztiak" -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Urrunekoa" +#: ../src/seahorse-key-manager.c:368 +msgid "Dropped text" +msgstr "Jaregindako testua" + +#: ../src/seahorse-key-manager.c:391 +msgid "Clipboard text" +msgstr "Arbeleko testua" + +#: ../src/seahorse-key-manager.c:518 +msgid "_New" +msgstr "_Berria" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:520 msgid "Close this program" msgstr "Itxi programa hau" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:521 ../src/seahorse-key-manager.c:523 msgid "_New..." msgstr "_Berria..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:522 msgid "Create a new key or item" msgstr "Sortu gako edo elementu berri bat" -#: ../src/seahorse-key-manager.c:742 +#: ../src/seahorse-key-manager.c:524 +msgid "Add a new key or item" +msgstr "Gehitu gako edo elementu berria" + +#: ../src/seahorse-key-manager.c:525 msgid "_Import..." msgstr "_Inportatu..." -#: ../src/seahorse-key-manager.c:743 +#: ../src/seahorse-key-manager.c:526 msgid "Import from a file" msgstr "Inportatu fitxategi batetik" -#: ../src/seahorse-key-manager.c:745 +#: ../src/seahorse-key-manager.c:528 msgid "Import from the clipboard" msgstr "Inportatu arbeletik" -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Bilatu urruneko gakoak..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Gakoak bilatzea gako zerbitzarian" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sinkronizatu eta argitaratu gakoak..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Argitaratu edo/eta sinkronizatu zure gakoak linean daudenekin." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Motak" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Erakutsi Mota zutabea" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Iraungi" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Erakutsi Iraungitze-data zutabea" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Fidagarritasuna" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Erakutsi Fidagarritasuna zutabea" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Baliozkotasuna" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Erakutsi Baliozkotasuna zutabea" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Iragazkia:" +#: ../src/seahorse-key-manager.c:532 +msgid "By _keyring" +msgstr "_Gako sortaren arabera" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show sidebar listing keyrings" +msgstr "Erakutsi albo-barra gako sortak zerrendatuz" + +#: ../src/seahorse-key-manager.c:537 +msgid "Show _personal" +msgstr "Erakutsi _pertsonala" + +#: ../src/seahorse-key-manager.c:538 +msgid "Only show personal keys, certificates and passwords" +msgstr "Erakutsi gako, ziurtagiri eta pasahitz pertsonalak soilik" + +#: ../src/seahorse-key-manager.c:539 +msgid "Show _trusted" +msgstr "Erakutsi _fidagarria" + +#: ../src/seahorse-key-manager.c:540 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Erakutsi gako, ziurtagiri eta pasahitz fidagarriak soilik" + +#: ../src/seahorse-key-manager.c:541 +msgid "Show _any" +msgstr "Erakutsi _edozein" + +#: ../src/seahorse-key-manager.c:542 +msgid "Show all keys, certificates and passwords" +msgstr "Erakutsi gako, ziurtagiri eta pasahitz guztiak" + +#: ../src/seahorse-key-manager.c:750 +msgid "Filter" +msgstr "Iragazi" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -1953,262 +2273,44 @@ msgstr "Inportatu lehendik dauden gakoak fitxategi batetik:" #: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Nire gako _pertsonalak" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Beste _gako batzuk" - -#: ../src/seahorse-key-manager.xml.h:6 msgid "To get started with encryption you will need keys." msgstr "Enkriptatzen hasteko gakoak beharko dituzu." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Inportatu" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Pasahitzak" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Ezin izan dira gakoak esportatu" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Baliozkotasuna" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Iraungitze-data" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Itxi leiho hau" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Zabaldu denak" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Zabaldu zerrenda guztiak" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Tolestu denak" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Tolestu zerrenda guztiak" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Urruneko gakoak" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "'%s' duten urruneko gakoak" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Gako-zerbitzariak:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Nire inguruko gako partekatuak:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Bilatu urruneko gakoak" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Horrek besteen gakoak bilatuko ditu Interneten. Gako horiek gako sorta " -"lokalera inporta daitezke." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Non bilatu:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Bilatu" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Bilatu hau duten gakoak: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Ezin izan dira gakoak zerbitzarian argitaratu" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Ezin izan dira gakoak zerbitzaritik eskuratu: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "gako %d hautatu da sinkronizatzeko" -msgstr[1] "%d gako hautatu dira sinkronizatzeko" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Gakoak sinkronizatzen..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Gakoak sinkronizatzea" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Zure gako sortako gakoak argitaratzen ditu horrek, beste erabiltzaileentzat " -"erabilgarri egon daitezen. Besteen gakoak jaso zenituenetik haietan izandako " -"aldaketak ere jasotzen ditu." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Besteen gakoak jaso zenituenetik haietan egindako aldaketak eskuratzen ditu " -"horrek. Ez da argitaratzeko gako-zerbitzaririk hautatu, beraz, zure gakoak " -"ez dira besteentzat erabilgarri egongo." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Gako-zerbitzariak" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sinkronizatu" - -#: ../src/seahorse-main.c:60 +#: ../src/seahorse-main.c:54 msgid "Version of this application" msgstr "Aplikazio honen bertsioa" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Ekarpenak:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "Hizkuntza Politikarako Sailburuordetza , 2008." - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse proiektuaren etxeko orria" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fitxategia" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Editatu" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Ikuspegia" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Laguntza" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Hobespenak" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Aldatu programa honen hobespenak" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Programa honi buruz" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Edukia" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Erakutsi Seahorse-ren laguntza" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Esportatu gako publikoa" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Gakoak esportatzen" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Ezin izan dira datuak gako zerbitzaritik eskuratu" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Kopiatutako gakoak" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Gakoak eskuratzen" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s gako pribatua da. Aurrera jarraitzea nahi duzu?" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Gakoak inportatzen gako zerbitzaritik" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Ezin izan da blokeatu" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Ezin izan da desblokeatu" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Erakutsi propietateak" - -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Ezabatu" - -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Hautatutako elementuak ezabatzen ditu" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Blokeatu" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_sportatu..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Desblokeatu" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Fitxategi batera esportatzen du" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propietateak" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopiatu arbelean" +#: ../ssh/seahorse-ssh-actions.c:88 +msgid "Configure Key for _Secure Shell..." +msgstr "Konfiguratu _shell seguruaren gakoa..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Inportatu hautatutako gakoak lokaleko gako sortara" +#: ../ssh/seahorse-ssh-actions.c:89 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Bidali Shell seguruaren gako publikoa beste makina batera, eta gaitu gako " +"horrekin egiten diren saio-hasierak." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2237,73 +2339,76 @@ msgid "Enter the new passphrase again: %s" msgstr "Idatzi pasaesaldi berria berriro: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Konfiguratu _shell seguruaren gakoa..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Bidali Shell seguruaren gako publikoa beste makina batera, eta gaitu gako " -"horrekin egiten diren saio-hasierak." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Shell segurua" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Beste ordenagailuekin konektatzeko erabilitako gako seguruak." -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Ziur zaude shell seguruko '%s' gakoa ezabatu nahi duzula?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 ../ssh/seahorse-ssh-deleter.c:92 #, c-format msgid "Are you sure you want to delete %d secure shell keys?" msgstr "Ziur zaude shell seguruko %d gakoak ezabatu nahi dituzula?" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Ezin izan da gakoa ezabatu" +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH gakoa" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Ezkutuko SSH gakoak" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "SSH gako publikoak" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Ez dago gako publikoaren fitxategirik erabilgarri gako honentzako." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:19 msgid "Secure Shell Key" msgstr "Shell seguruaren gakoa" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Beste ordenagailu batzuk atzitzeko erabilia (adibidez, terminal bat)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Ezin izan da Shell seguruaren gakoa sortu" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Shell seguruaren gakoa sortzea" #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"Erabili helbide elektronikoa eta beharrezko beste edozein oroigarri, gako " -"hori zertarako den jakiteko." +"Zure helbide elektronikoa, edo beste edozein oroigarri, gako hori " +"zertarako den jakiteko." #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"Shell seguruaren (SSH) gakoak SSHren bidez konfiantzako ordenagailuekin era " -"seguruan konektatzeko aukera ematen du, haietako bakoitzean pasahitza sartu " -"beharrik gabe." +"Shell seguruaren (SSH) gakoak beste ordenagailuekin era seguruan konektatzea " +"baimentzen dizu." #: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" -"Gako hori ordenagailu batean erabili nahi baduzu dagoeneko, zure gakoa " -"ezagutzeko konfigura dezakezu orain ordenagailu hori. " +"Gako hori ordenagailu batean erabili nahi baduzu, zure gako berria " +"ezagutzeko konfigura dezakezu ordenagailu hori. " #: ../ssh/seahorse-ssh-generate.xml.h:7 msgid "New Secure Shell Key" @@ -2313,27 +2418,31 @@ msgid "_Create and Set Up" msgstr "_Sortu eta konfiguratu" -#: ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../ssh/seahorse-ssh-generate.xml.h:10 msgid "_Just Create Key" msgstr "_Soilik gakoa sortu" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Gakoaren azalpena:" - -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Shell seguruaren gako irakurtezina)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "SSH gako pertsonalak" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH gakoa" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Ezin izan da gakoaren izena aldatu." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Ezin izan da gakoaren baimena aldatu." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Ezin izan da gakoaren pasaesaldia aldatu." @@ -2378,36 +2487,45 @@ msgid "Used to connect to other computers." msgstr "Beste ordenagailuekin konektatzeko erabilia." -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH komandoa ustekabean amaitu da." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Huts egin du SSH komandoak." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Urruneko ostalariaren pasahitza" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Idatzi gakoaren pasaesaldia" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Shell seguruaren gako berriaren pasaesaldia" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Gakoa inportatzea: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Gakoa inportatzea. Idatzi pasaesaldia" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH gakoak" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Ez dago gako pribatuaren fitxategirik erabilgarri gako honentzako." @@ -2448,15 +2566,179 @@ msgid "_Set Up" msgstr "_Konfiguratu" +#~ msgid "Couldn't delete item" +#~ msgstr "Ezin izan da elementua ezabatu." + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Elementua ezabatzen" +#~ msgstr[1] "Elementuak ezabatzen" + +#~ msgid "Passwords: %s" +#~ msgstr "Pasahitzak: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Pasahitzak: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Blokeatu pasahitzak gordetzeko gako sorta, horrela pasahitz maisua " +#~ "beharko da desblokeatzeko." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Desblokeatu pasahitzak gordetzeko gako sorta, horrela erabiltzeko " +#~ "erabilgarri egongo da." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Ezin izan da gako sorta ezabatu" + +#~ msgid "Archive files" +#~ msgstr "Artxibo-fitxategiak" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Badago lehendik izen hori duen fitxategi bat.\n" +#~ "\n" +#~ "Fitxategi berriarekin ordeztu nahi duzu?" + +#~ msgid "_Replace" +#~ msgstr "_Ordeztu" + +#~ msgid "_Sign Key..." +#~ msgstr "_Sinatu gakoa..." + +#~ msgid "Sign public key" +#~ msgstr "Gako publikoa sinatzen du" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Ziur zaude %d gako eta identitate behin betiko ezabatu nahi dituzula?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Ezin izan da gako publikoa ezabatu" + +#~ msgid "New PGP Key" +#~ msgstr "PGP gako berria" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Ezin izan da gakoa \"%s\"(e)ra esportatu" + +#~ msgid "Export Complete Key" +#~ msgstr "Esportatu gako osoa" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Ziur zaude %s ziurtagiria ezabatu nahi duzula?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Ziur zaude ziurtagiri %d ezabatu nahi duzula?" +#~ msgstr[1] "Ziur zaude %d ziurtagiri ezabatu nahi dituzula?" + +#~ msgid "Deleting" +#~ msgstr "Ezabatzen" + +#~ msgid "Create New ..." +#~ msgstr "Sortu berria..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Gako %d hautatuta" +#~ msgstr[1] "%d gako hautatua" + +#~ msgid "Importing keys" +#~ msgstr "Gakoak inportatzen" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Gako mota ezezaguna, edo datu formatu baliogabea" + +#~ msgid "Importing Keys" +#~ msgstr "Gakoak inportatzea" + +#~ msgid "T_ypes" +#~ msgstr "_Motak" + +#~ msgid "Show type column" +#~ msgstr "Erakutsi Mota zutabea" + +#~ msgid "_Expiry" +#~ msgstr "_Iraungi" + +#~ msgid "Show expiry column" +#~ msgstr "Erakutsi Iraungitze-data zutabea" + +#~ msgid "_Trust" +#~ msgstr "_Fidagarritasuna" + +#~ msgid "Show owner trust column" +#~ msgstr "Erakutsi Fidagarritasuna zutabea" + +#~ msgid "_Validity" +#~ msgstr "_Baliozkotasuna" + +#~ msgid "Show validity column" +#~ msgstr "Erakutsi Baliozkotasuna zutabea" + +#~ msgid "Other _Keys" +#~ msgstr "Beste _gako batzuk" + +#~ msgid "Validity" +#~ msgstr "Baliozkotasuna" + +#~ msgid "Expiration Date" +#~ msgstr "Iraungitze-data" + +#~ msgid "_Expand All" +#~ msgstr "_Zabaldu denak" + +#~ msgid "Expand all listings" +#~ msgstr "Zabaldu zerrenda guztiak" + +#~ msgid "_Collapse All" +#~ msgstr "_Tolestu denak" + +#~ msgid "Collapse all listings" +#~ msgstr "Tolestu zerrenda guztiak" + +#~ msgid "Export public key" +#~ msgstr "Esportatu gako publikoa" + +#~ msgid "Exporting keys" +#~ msgstr "Gakoak esportatzen" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Ezin izan dira datuak gako zerbitzaritik eskuratu" + +#~ msgid "Retrieving keys" +#~ msgstr "Gakoak eskuratzen" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s gako pribatua da. Aurrera jarraitzea nahi duzu?" + +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "_Ezabatu" + +#~ msgid "Couldn't delete key" +#~ msgstr "Ezin izan da gakoa ezabatu" + +#~ msgid "_Key Description:" +#~ msgstr "_Gakoaren azalpena:" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "Ez exekutatu seahorse-daemon daemon gisa" #~ msgid "couldn't fork process" #~ msgstr "ezin izan da prozesua sardetu" -#~ msgid "couldn't create new process group" -#~ msgstr "ezin izan da prozesu-talde berria sortu" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Enkriptatze-daemona (Seahorse)" @@ -2509,9 +2791,6 @@ #~ msgid "Bad Signature" #~ msgstr "Sinadura okerra" -#~ msgid "Couldn't verify signature." -#~ msgstr "Ezin izan da sinadura egiaztatu." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Sinatzailea ez da baliozkoa edo ez da ezagutzen: %s" @@ -2720,9 +2999,6 @@ #~ msgid "Web Password" #~ msgstr "Web-pasahitza" -#~ msgid "Network Password" -#~ msgstr "Sareko pasahitza" - #~ msgid "Couldn't set application access." #~ msgstr "Ezin izan da aplikazioaren atzipena ezarri." @@ -2735,9 +3011,6 @@ #~ msgid "Applications" #~ msgstr "Aplikazioak" -#~ msgid "_Delete" -#~ msgstr "_Ezabatu" - #~ msgid "_Read" #~ msgstr "_Irakurri" @@ -2841,12 +3114,6 @@ #~ msgid "Symmetric Key" #~ msgstr "Gako simetrikoa" -#~ msgid "Public Key" -#~ msgstr "Gako publikoa" - -#~ msgid "Private Key" -#~ msgstr "Gako pribatua" - #~ msgid "Credentials" #~ msgstr "Kredentzialak" @@ -2887,9 +3154,6 @@ #~ msgid "Loading Keys..." #~ msgstr "Gakoak kargatzen..." -#~ msgid "Searching for keys..." -#~ msgstr "Gakoak bilatzen..." - #~ msgid "Uploading keys..." #~ msgstr "Gakoak kargatzen..." @@ -2914,9 +3178,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "Gakoak sinkronizatzea" -#~ msgid "Encryption Key Manager" -#~ msgstr "Enkriptatzeko gakoen kudeatzailea" - #~ msgid "DSA" #~ msgstr "DSA" @@ -2929,9 +3190,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "Shell seguruaren gako publikoa" -#~ msgid "Secure Shell key" -#~ msgstr "Shell seguruaren gakoa" - #~ msgid "Passphrase:" #~ msgstr "Pasaesaldia:" diff -Nru seahorse-3.2.2/po/fi.po seahorse-3.6.3/po/fi.po --- seahorse-3.2.2/po/fi.po 2011-10-17 18:51:25.000000000 +0200 +++ seahorse-3.6.3/po/fi.po 2012-09-25 14:50:51.000000000 +0200 @@ -1,390 +1,487 @@ # Finnish messages for seahorse # Copyright (C) 2000-2009 Free Software Foundation, Inc. +# +# Gnome 2012-03 Finnish translation sprint participants: +# Jiri Grönroos +# Niklas Laxström # Jarmo Kielosto , 2000. # Tommi Vainikainen , 2008-2011. # Ilkka Tuohela , 2004-2009. # Jani Välimaa , 2009. -# +# Jiri Grönroos , 2012. msgid "" msgstr "" "Project-Id-Version: seahorse\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-26 09:40+0300\n" -"PO-Revision-Date: 2011-09-26 09:40+0300\n" -"Last-Translator: Tommi Vainikainen \n" -"Language-Team: Finnish \n" -"Language: fi\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-09-23 14:12+0300\n" +"Last-Translator: Jiri Grönroos \n" +"Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.5\n" +"X-POT-Import-Date: 2012-02-19 15:25:28+0000\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Luo salasana-avainnippu" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Uuden avainnipun nimi:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "Valitse nimi uudelle avainnipullu. Sinulta kysytään avaussalasanaa." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Uuden avainnipun nimi:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Palvelimen verkkonimi tai osoite." -msgid "Couldn't add keyring" -msgstr "Avainnippua ei voitu lisätä" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Uusi salasana-avainnippu" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Käytetään tallentamaan ohjelmien ja verkon salasanoja" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Uusi salasana..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Tallenna salasana tai salaisuus turvallisesti." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Salasanojen avainnippu" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Tallennettu salasana" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Oletusavainnippua ei voitu asettaa" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Avainnipun salasanaa ei voitu vaihtaa" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "A_seta oletus" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Ohjelmat yleensä tallentavat uuden salasana oletusavainnippuun." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Vaihda _salasana" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Vaihda salasana-avainnipun pääsalasanaa" + +#: ../gkr/seahorse-gkr-add-item.c:58 +#| msgid "Couldn't add photo" +msgid "Couldn't add item" +msgstr "Kohteen lisäys ei onnistunut" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Lisää salasana" #: ../gkr/seahorse-gkr-add-item.xml.h:2 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Kuvaus:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Avainnippu" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Salasana:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Näytä _salasana" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Ei voitu poistaa kohdetta" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Avainnippu" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Avainnippua ei voitu lisätä" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Salasanat" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Tallennetut henkilökohtaiset salasanat, pääsyoikeudet ja salaisuudet" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Pikaviestintilin salasana " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Salasana tai salaisuus" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Verkkosalasana" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Tallennettu huomautus" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Avainnipun salasana" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Salausavaimen salasana" + +#: ../gkr/seahorse-gkr-item.c:358 +#, fuzzy +msgid "Key storage password" +msgstr "Tallennettu salasana" +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome -salasana" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Gnomen verkkotilien salasana" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy-salasana" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Pikaviestimen salasana" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Verkonhallinnan salaisuus" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Haluatko varmasti poistaa salasanan ”%s”?" +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Haluatko varmasti poistaa %d salasanan?" msgstr[1] "Haluatko varmasti poistaa %d salasanaa?" -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Poistetaan kohdetta" -msgstr[1] "Poistetaan kohteita" - +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Pääsy verkkojakoon tai -resurssiin" +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Pääsy WWW-sivustolle" +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Avaa PGP-avaimen" +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Avaa SSH-avaimen" +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Tallennettu salasana tai kirjautuminen" +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Verkon pääsyoikeudet" +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Salasana" +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Salasanaa ei voitu vaihtaa." +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Päivitetään salasanoja" +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Kuvausta ei voitu asettaa." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Salasana:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Tekniset yksityiskohdat:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Yksityiskohdat" - -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Avain" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 msgid "Key Properties" msgstr "Avaimen ominaisuudet" -msgid "Login:" -msgstr "Käyttäjätunnus:" - -msgid "Server:" -msgstr "Palvelin:" - -msgid "Show pass_word" -msgstr "Näytä salasana" - -msgid "Type:" -msgstr "Tyyppi:" - #. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 msgid "Use:" msgstr "Käyttö:" -#, c-format -msgid "Passwords: %s" -msgstr "Salasanat: %s" - -#, c-format -msgid "Passwords: %s" -msgstr "Salasanat: %s" - -msgid "Password Keyring" -msgstr "Salasanojen avainnippu" - -msgid "Used to store application and network passwords" -msgstr "Käytetään tallentamaan ohjelmien ja verkon salasanoja" - -msgid "Stored Password" -msgstr "Tallennettu salasana" - -msgid "Safely store a password or secret." -msgstr "Tallenna salasana tai salaisuus turvallisesti." - -msgid "Couldn't unlock keyring" -msgstr "Avainnipun lukitusta ei voitu avata" - -msgid "Couldn't lock keyring" -msgstr "Avainnippua ei voitu lukita" - -msgid "Couldn't set default keyring" -msgstr "Oletusavainnippua ei voitu asettaa" - -msgid "Couldn't change keyring password" -msgstr "Avainnipun salasanaa ei voitu vaihtaa" - -msgid "_Lock" -msgstr "_Lukitse" +#: ../gkr/seahorse-gkr-item-properties.xml.h:5 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tyyppi:" -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Lukitse salasana-avainnippu, jolloin pääsalasana vaaditaan sen avaamiseksi." +#: ../gkr/seahorse-gkr-item-properties.xml.h:6 +msgid "Server:" +msgstr "Palvelin:" -msgid "_Unlock" -msgstr "_Avaa lukitus" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Käyttäjätunnus:" -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Avaa salasana-avainnipun lukitus pääsalasanalla, jolloin sen sisältö on " -"käytettävissä." +#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +msgid "Show pass_word" +msgstr "Näytä salasana" -msgid "_Set as default" -msgstr "A_seta oletus" +#: ../gkr/seahorse-gkr-item-properties.xml.h:9 +msgid "Password:" +msgstr "Salasana:" -msgid "Applications usually store new passwords in the default keyring." -msgstr "Ohjelmat yleensä tallentavat uuden salasana oletusavainnippuun." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Avain" -msgid "Change _Password" -msgstr "Vaihda _salasana" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Tekniset yksityiskohdat:" -msgid "Change the unlock password of the password storage keyring" -msgstr "Vaihda salasana-avainnipun pääsalasanaa" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Yksityiskohdat" -msgid "Couldn't delete keyring" -msgstr "Avainnippua ei voitu poistaa" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Avainnippu, joka avataan automaattisesti kirjautumisen yhteydessä" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Avainnippu, johon varastoidaan salasanat" +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Haluatko varmasti poistaa salasana-avainnipun ”%s”?" -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Poistetaan avainnippua" -msgstr[1] "Poistetaan avainnippuja" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Ymmärrän, että kaikki kohteet poistetaan lopullisesti." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Avainnipun ominaisuudet" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Nimi:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Luotu:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Avainnippu" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Avainnipun ominaisuudet" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nimi:" - -msgid "The operation was cancelled" -msgstr "Toiminto keskeytettiin" - -msgid "Access to the key ring was denied" -msgstr "Pääsy avainnippuun estettiin" - -msgid "The gnome-keyring daemon is not running" -msgstr "Gnome-keyring -palvelinprosessi ei ole päällä" - -msgid "The key ring has already been unlocked" -msgstr "Avainnipun salaus on jo avattu" - -msgid "No such key ring exists" -msgstr "Avainnippua ei ole olemassa" - -msgid "Couldn't communicate with key ring daemon" -msgstr "Yhteyttä avainnippupalveluun ei saatu muodostettua" - -msgid "The item already exists" -msgstr "Kohta on jo olemassa" - -msgid "Internal error accessing gnome-keyring" -msgstr "Sisäinen virhe yhteydessä gnome-keyring -palvelimeen" - +#: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Näytä liput" +#: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" msgstr "Näytetyn päiväyksen tai ajan ominaisuudet" +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "Laiska tila" +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "Laiska tila ei muotoile syötettyjä päiväyksiä tai aikoja" +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "Vuosi" +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "Näytetty vuosi" +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "Kuukausi" +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "Näytetty kuukausi" +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "Päivä" +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "Näytetty kuukauden päivä" +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "Tunti" +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "Näytetty tunti" +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "Minuutti" +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "Näytetty minuutti" +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "Sekunti" +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "Näytetty sekunti" +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "Vuosiarvon alaraja" +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "Aikaisimman mahdollisen päiväyksen vuosiosa" +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "Vuosiarvon yläraja" +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "Viimeisen mahdollisen päiväyksen vuosiosa" +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "Kuukausiarvon alaraja" +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "Aikaisimman mahdollisen päiväyksen kuukausiosa" +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "Kuukausiarvon yläraja" +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "Viimeisen mahdollisen päiväyksen kuukausiosa" +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "Päiväarvon alaraja" +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "Aikaisimman mahdollisen päiväyksen päiväysosa" +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "Päiväarvon yläraja" +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "Viimeisen mahdollisen päiväyksen päiväysosa" +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "Tuntiarvon alaraja" +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "Aikaisimman aikarajan tuntiosa" +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "Tuntiarvon yläraja" +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "Viimeisen mahdollisen päiväyksen tuntiosa" +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "Minuuttiarvon alaraja" +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "Aikaisimman aikarajan minuuttiosa" +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "Minuuttiarvon yläraja" +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "Viimeisen mahdollisen päiväyksen minuuttiosa" +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "Sekuntiarvon alaraja" +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "Aikaisimman aikarajan sekuntiosa" +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "Sekuntiarvon yläraja" +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "Viimeisen mahdollisen päiväyksen sekuntiosa" @@ -393,375 +490,618 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:1" +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "Päiväys" +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "Syötä päiväys käsin" +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "Valitse päiväys" +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "Valitse päiväys kalenterista" +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Aika" +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "Syötä aika käsin" +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "Valitse aika" +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "Valitse aika luettelosta" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: juu" +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "AM" +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "PM" #. Translators: This is hh:mm:ss AM/PM. +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d.%02d.%02d %s" #. Translators: This is hh:mm AM/PM. +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d.%02d %s" #. Translators: This is hh:mm:ss. +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d.%02d.%02d" #. Translators: This is hh:mm. +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d.%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u.%u.%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "ensimmäinen tilapäinen kohde" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Lisää avainpalvelin" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Verkkonimi:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Avainpalvelimen tyyppi:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Verkkonimi:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Portti, jossa palvelin on." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "ensimmäinen tilapäinen kohde" +msgid "The port to access the server on." +msgstr "Portti, jossa palvelin on." -msgid "Passphrase" -msgstr "Tunnuslause" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Tämän ohjelman versio" -msgid "Password:" -msgstr "Salasana:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Järjestelmän asetukset" -#. The second and main entry -msgid "Confirm:" -msgstr "Vahvista:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Avustajat:" -msgid "Not a valid Key Server address." -msgstr "Arvo ei ole kelvollinen avainpalvelimen osoite." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Salasanat ja salausavaimet" -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Pyydä apua järjestelmäsi ylläpitäjältä tai avainpalvelimen ylläpitäjältä." - -msgid "URL" -msgstr "URL" +"Jarmo Kielosto, 2000\n" +"Ilkka Tuohela, 2004-2009\n" +"Tommi Vainikainen, 2008\n" +"Jani Välimaa, 2009\n" +"\n" +"http://gnome.fi/" -msgid "Custom" -msgstr "Oma määrittely" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse-projektin kotisivu" -msgid "None: Don't publish keys" -msgstr "Ei mitään: älä julkaise avaimia" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Poisto ei onnistunut" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Nouda avaimet automaattisesti avain_palvelimilta" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Avaimia ei voitu viedä" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Synkronoi _muokatut avaimet automaattisesti avainpalvelimille" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Tietojen vienti ei onnistunut" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Avainpalvelimet" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Tiedosto" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Asetukset" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Vie…" -msgid "_Find keys via:" -msgstr "_Etsi uusia avaimia lähteestä:" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Vie tiedostoon" -msgid "_Publish keys to:" -msgstr "J_ulkaise avaimet:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Muokkaa" -msgid "Retrieving data" -msgstr "Noudetaan tietoja" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopioi leikepöydälle" -msgid "Exporting data" -msgstr "Viedään tietoja" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Poista" -msgid "Importing data" -msgstr "Tuodaan tietoja" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Poista valitut kohteet" -msgid "Sending data" -msgstr "Lähetetään tietoja" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Näytä kohteen ominaisuudet" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Näytä avainnipun ominaisuudet" -msgid "Unavailable" -msgstr "Ei käytettävissä" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Asetukset" -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Muuta ohjelman asetuksia" -msgid "Key Data" -msgstr "Avaimen tiedot" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Näytä" -msgid "Multiple Keys" -msgstr "Useita avaimia" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "O_hje" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -msgid "All key files" -msgstr "Kaikki avaintiedostot" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Tietoja ohjelmasta" -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Kaikki tiedostot" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Sisältö" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Näytä Seahorsen ohje" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Vie" -msgid "Archive files" -msgstr "Arkistotiedostot" +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Syötä PIN tai salasana: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Salasana:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Vahvista:" +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Arvo ei ole kelvollinen avainpalvelimen osoite." + +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"Tämänniminen tiedosto on jo olemassa.\n" -"\n" -"Haluatko korvata sen uudella tiedostolla?" +"Pyydä apua järjestelmäsi ylläpitäjältä tai avainpalvelimen ylläpitäjältä." -msgid "_Replace" -msgstr "Ko_rvaa" +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Oma määrittely" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Ei mitään: älä julkaise avaimia" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Asetukset" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Etsi uusia avaimia lähteestä:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "J_ulkaise avaimet:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Nouda avaimet automaattisesti avain_palvelimilta" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Synkronoi _muokatut avaimet automaattisesti avainpalvelimille" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Avainpalvelimet" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Tuntematon" #: ../libseahorse/seahorse-validity.c:42 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Ei koskaan" #: ../libseahorse/seahorse-validity.c:44 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Jonkin verran" #: ../libseahorse/seahorse-validity.c:46 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Kokonaan" #: ../libseahorse/seahorse-validity.c:48 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Ehdottomasti" #: ../libseahorse/seahorse-validity.c:50 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Ei käytössä" #: ../libseahorse/seahorse-validity.c:52 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Mitätöity" +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Ohjetta ei voitu näyttää: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Vanhenemispäivä:" +msgid "Never E_xpires" +msgstr "Ei vanhene _koskaan" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Luo uusi aliavain" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Vanheneeko avain koskaan" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Avaimen _tyyppi:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Avaimen pituus:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Avaimen _tyyppi:" +msgid "Expiration Date:" +msgstr "Vanhenemispäivä:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Avaimen pituus" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Ei vanhene _koskaan" +msgid "Generate a new subkey" +msgstr "Luo uusi aliavain" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Lisää käyttäjätunniste" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Luo uusi käyttäjätunniste" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Koko _nimi:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Avaimen _kommentti:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Tulee olla vähintään 5 merkkiä pitkä" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Valinnainen sähköpostiosoite" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Valinnainen avainta kuvaava kommentti" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Valinnainen sähköpostiosoite" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Koko _nimi:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Sähköpostiosoite:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Avaimen _kommentti:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Luo uusi käyttäjätunniste" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Muuta" +msgid "_Never expires" +msgstr "_Ei vanhene koskaan" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Mitätöi avain" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Ei vanhene koskaan" +msgid "C_hange" +msgstr "_Muuta" +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "Aliavainta ei voitu lisätä" +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "Lisää aliavain avaimelle %s" +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (vain allekirjoitus)" +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (vain salaus)" +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (vain allekirjoitus)" +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (vain salaus)" +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "Käyttäjän tunnistetta ei voitu lisätä" +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "Lisää käyttäjätunniste avaimeen %s" +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "Salauksen purku ei onnistunut. Sinulla ei ehkä ole purkuavainta." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Toiminto keskeytettiin" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Virheellinen vanhenemispäivä" +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "Vanhenemispäivän täytyy olla tulevaisuudessa" +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "Vanhenemispäivää ei voitu muuttaa" +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "Vanhenee: %s" +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Useita avaimia" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Avaimen tiedot" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +#, fuzzy +msgid "Armored PGP keys" +msgstr "Tuodut avaimet" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP-avaimet" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP-avain" +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Käytetään sähköpostin ja tiedostojen salaukseen" +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "PGP-avainta ei voitu luoda" +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Uuden PGP-avaimen tunnuslause" +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Syötä uuden avaimesi tunnuslause kahdesti." +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Luodaan avainta" +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Haluatko varmasti poistaa avaimen %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Haluatko varmasti poistaa %d avainta?" +msgstr[1] "Haluatko varmasti poistaa %d avainta?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Väärä salasana" +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Syötit väärän salasanan jo kolmannen kerran. Yritä uudelleen." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Väärä tunnuslause." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Syötä uusi tunnuslause avaimelle ”%s”" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Syötä tunnuslause avaimelle ”%s”" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Syötä uusi tunnuslause" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Syötä tunnuslause" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Tunnuslause" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Ladattiin %d avain" +msgstr[1] "Ladattiin %d avainta" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Virheellistä avaintietoa (puuttuvia tunnisteita). Tämä saattaa johtua " +"tietokoneesta, jonka kello on tulevaisuudessa, tai puuttuvasta " +"itseallekirjoituksesta." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG-avaimet" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -796,56 +1136,76 @@ msgid "All JPEG files" msgstr "Kaikki JPEG-tiedostot" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Kaikki tiedostot" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Valitse avaimeen lisättävä kuva" +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Valokuvaa ei voitu valmistella" +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Valokuvaa ei voitu lisätä" +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Tiedostoa ei voitu ladata ja se voi olla vioittunut" +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Haluatko varmasti poistaa nykyisien kuvan avaimestasi?" +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Valokuvaa ei voitu poistaa" +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "Aliavainta ei voitu mitätöidä" +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "Mitätöi: %s" +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "Ei syytä" +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "Ei syytä avaimen mitätöintiin" +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "Murrettu" +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "Avain on murrettu" +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "Korvattu" +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "Avain on korvattu" +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "Ei käytössä" +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "Avain ei ole enää käytössä" +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " @@ -854,9 +1214,15 @@ "Olet lisäämässä %s:n avaimen %s mitätöijäksi. Tätä toimenpidettä ei voi " "perua! Haluatko varmasti jatkaa?" +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "Mitätöijää ei voitu lisätä" +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Ymmärrän, että tämä salainen avain poistetaan lopullisesti." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -865,14 +1231,17 @@ "Tämä avaimen on jo allekirjoittanut\n" "”%s”" +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "Avainta ei voitu allekirjoittaa" #. TODO: We should be giving an error message that allows them to #. generate or import a key +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Allekirjoitukseen sopivia avaimia ei löydy" +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -880,398 +1249,573 @@ "Sinulla ei ole omia PGP-avaimia, joilla tämä avain voidaan allekirjoittaa ja " "ilmaista luottamuksesi siihen." -#, c-format -msgid "Wrong passphrase." -msgstr "Väärä tunnuslause." - -#, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Syötä uusi tunnuslause avaimelle ”%s”" - -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Syötä tunnuslause avaimelle ”%s”" - -msgid "Enter new passphrase" -msgstr "Syötä uusi tunnuslause" - -msgid "Enter passphrase" -msgstr "Syötä tunnuslause" - -#, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Ladattiin %d avain" -msgstr[1] "Ladattiin %d avainta" - -msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "" -"Virheellistä avaintietoa (puuttuvia tunnisteita). Tämä saattaa johtua " -"tietokoneesta, jonka kello on tulevaisuudessa, tai puuttuvasta " -"itseallekirjoituksesta." - #: ../pgp/seahorse-gpgme-subkey.c:199 msgid "ElGamal" msgstr "ElGamal" -msgid "HTTP Key Server" -msgstr "HTTP-avainpalvelin" - +#: ../pgp/seahorse-hkp-source.c:604 #, c-format msgid "Search was not specific enough. Server '%s' found too many keys." msgstr "" "Haku ei ollut tarpeeksi tarkka. Palvelin ”%s” löysi liian monta avainta." +#: ../pgp/seahorse-hkp-source.c:607 #, c-format msgid "Couldn't communicate with server '%s': %s" msgstr "Palvelimeen ”%s” ei saatu yhteyttä: %s" -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "Yhteys palvelimeen ”%s” epäonnistui: %s" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP-avainpalvelin" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Avaimia ei voitu tuoda" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Tuodaan avaimia avainpalvelimilta" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Verkko" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Sulje tämä ikkuna" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "Etsi _avaimia verkosta…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Etsi avaimia avainpalvelimelta" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Tuo" +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Tuo valitut avaimet paikalliseen avainnippuun" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Avain verkosta" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Connecting to: %s" -msgstr "Otetaan yhteyttä palvelimeen %s" +msgid "Remote Keys Containing '%s'" +msgstr "Avain verkosta, joka sisältää tunnisteen ”%s”" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Avainten etsintä epäonnistui." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Etsi avaimia verkosta" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "" +"Tämä etsii muiden avaimia verkosta. Löydetyt avaimet voidaan tuoda " +"paikalliseen avainnippuun." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "Et_si avaimia, jotka sisältävät: " +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Avainpalvelimet" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Lähellä olevat jaetut avaimet" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Mistä avaimia etsitään:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Etsi" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Avaimia ei voitu julkaista palvelimelle" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't resolve address: %s" -msgstr "Osoitetta ei voitu selvittää: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "Avaimia ei voitu hakea palvelimelta: %s" +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Resolving server address: %s" -msgstr "Selvitetään palvelimen osoitetta: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d avain on valittu synkronoitavaksi" +msgstr[1] "%d avainta on valittu synkronoitavaksi" -msgid "LDAP Key Server" -msgstr "LDAP-avainpalvelin" +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synkronoidaan avaimia…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Synkronoi avaimet" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Tämä valinta julkaisee avaimet avainnippuun, jolloin ne ovat muiden " +"käytettävissä. Vastaanotat samalla muutokset, joita muut ovat tehneet " +"aiemmin vastaanottamiisi avaimiin." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Tämä valinta hakee muutokset, joita muut ovat tehneet sen jälkeen kun itse " +"hait heidän avaimensa. Avainpalvelinta ei ole valittu julkaisua varten, " +"joten omia avaimiasi ei julkaista muiden käytettäväksi." -msgid "_Sign Key..." -msgstr "_Allekirjoitusavain…" +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Avain_palvelimet" -msgid "Sign public key" -msgstr "Allekirjoita julkinen avain" +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Synkronoi" +#: ../pgp/seahorse-ldap-source.c:441 #, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Haluatko varmasti poistaa avaimen %s?" +msgid "Couldn't communicate with '%s': %s" +msgstr "Yhteys palvelimeen ”%s” epäonnistui: %s" +#: ../pgp/seahorse-ldap-source.c:652 #, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Haluatko varmasti poistaa %d avainta ja tunnistetta?" +msgid "Connecting to: %s" +msgstr "Otetaan yhteyttä palvelimeen %s" +#: ../pgp/seahorse-ldap-source.c:658 #, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Haluatko varmasti poistaa %d avainta?" +msgid "Couldn't resolve address: %s" +msgstr "Osoitetta ei voitu selvittää: %s" +#: ../pgp/seahorse-ldap-source.c:702 #, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Haluatko varmasti poistaa %d tunnistetta?" +msgid "Resolving server address: %s" +msgstr "Selvitetään palvelimen osoitetta: %s" -msgid "Couldn't delete user ID" -msgstr "Käyttäjätunnistetta ei voitu poistaa" +#: ../pgp/seahorse-ldap-source.c:1447 +msgid "LDAP Key Server" +msgstr "LDAP-avainpalvelin" + +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Synkronoi ja julkaise avaimia…" -msgid "Couldn't delete private key" -msgstr "Yksityisavainta ei voitu poistaa" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Julkaise ja jaa avaimia muiden linjoilla olevien kanssa." -msgid "Couldn't delete public key" -msgstr "Julkista avainta ei voitu poistaa" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP-avaimet" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP-avaimia käytetään sähköpostiviestien ja tiedostojen salaukseen" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Avaimen _lisäasetukset" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Luo" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Luo uusi avain" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "PGP-avain mahdollistaa sähköpostin ja tiedostojen salauksen muille " "henkilöille." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Tässä käytetyt algoritmit" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Luo" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Kommentti:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Vanh_enemispäivä:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Ei _vanhene koskaan" +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Salaus_tyyppi:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Luo uusi avain" - +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Avaimen vahvuus (bittejä):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Ei _vanhene koskaan" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Uusi PGP-avain" +msgid "E_xpiration Date:" +msgstr "Vanh_enemispäivä:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Kommentti:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Avaimen _lisäasetukset" -msgid "Expired" -msgstr "Vanhentunut" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Henkilökohtainen PGP-avain" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP-avain" +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Ensisijaista käyttäjätunnistetta ei voitu vaihtaa" +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Haluatko varmasti poistaa käyttäjätunnisteen ”%s” pysyvästi?" +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Käyttäjätunnistetta ei voitu poistaa" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Tuntematon]" +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nimi/Sähköposti" +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Allekirjoituksen tunniste:" +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Ensisijaista valokuvaa ei voitu vaihtaa" +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(tuntematon)" +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Tämä avainta vanhenee: %s" +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nimi" +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Haluatko varmasti poistaa pysyväsi aliavaimen %d avaimesta %s?" +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Aliavainta ei voitu poistaa" +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Luotettavuutta ei voitu muuttaa" -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Avaimia ei voitu viedä palvelimelle ”%s”" - -msgid "Export Complete Key" -msgstr "Vie koko avain" - -msgid "Couldn't export key." -msgstr "Avaimta ei voitu viedä." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Avaimen vienti ei onnistunut" +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Ei koskaan" +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "Tunniste" -#. The key type column +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tyyppi" +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Luotu" +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Vanhenee" +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Tila" +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Vahvuus" +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Vanhentunut" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Hyvä" +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Avaimen tunniste" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Toiminnot" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Kommentti:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Ei koskaan" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Päivämäärät" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Tämä avain on mitätöity" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Sähköposti:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Avaimen omistaja mitätöi avaimen eikä sitä voida enää käyttää." -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Sormenjälki" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Tämä avain on vanhentunut" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Avaimen tunniste:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 +msgid "Add a photo to this key" +msgstr "Lisää valokuva avaimeen" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Avainten nimet ja tunnisteet" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 +msgid "Remove this photo from this key" +msgstr "Poista tämä valokuva tästä avaimesta" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 +msgid "Make this photo the primary photo" +msgstr "Tee tästä valokuvasta oletuskuva" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Siirry edelliseen valokuvaan" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Siirry seuraavaan valokuvaan" + +#. A photograph +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 msgid "Photo " msgstr "Valokuva " -msgid "Technical Details" -msgstr "Tekniset yksityiskohdat" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Avaimen tunniste:" -msgid "This key has been revoked" -msgstr "Tämä avain on mitätöity" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nimi:" -msgid "This key has expired" -msgstr "Tämä avain on vanhentunut" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Sähköposti:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tyyppi:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Kommentti:" #. To translators: This is the noun not the verb. -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 msgid "Use:" msgstr "Käyttö:" -msgid "_Subkeys" -msgstr "_Aliavaimet" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tyyppi:" -msgid "Add" -msgstr "Lisää" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 +msgid "Decrypt files and email sent to you." +msgstr "Pura tiedostojen ja vastaanotetun sähköpostin salaus." -msgid "Add a photo to this key" -msgstr "Lisää valokuva avaimeen" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Yksityinen PGP-avain" -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 msgid "Change _Passphrase" msgstr "Vaihda _tunnuslausetta" -msgid "Decrypt files and email sent to you." -msgstr "Pura tiedostojen ja vastaanotetun sähköpostin salaus." - -msgid "Delete" -msgstr "Poista" - -msgid "Expire" -msgstr "Vanhenna" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Omistaja" -msgid "Expires:" -msgstr "Vanhenee:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 +msgid "Key Names and Signatures" +msgstr "Avainten nimet ja tunnisteet" -msgid "Export" -msgstr "Vie" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Ensisijainen" -msgid "Go to next photo" -msgstr "Siirry seuraavaan valokuvaan" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +msgid "Sign" +msgstr "Allekirjoita" -msgid "Go to previous photo" -msgstr "Siirry edelliseen valokuvaan" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Poista" -msgid "Key ID:" -msgstr "Avaimen tunniste:" +#. Add another name to the PGP key. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 +msgid "_Add Name" +msgstr "Lisää _nimi" -msgid "Make this photo the primary photo" -msgstr "Tee tästä valokuvasta oletuskuva" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 +msgid "Revoke" +msgstr "Mitätöi" +#. List of names and signatures on the PGP key. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 msgid "Names and Signatures" msgstr "Nimet ja allekirjoitukset" -msgid "Never" -msgstr "Ei koskaan" - -msgid "Override Owner _Trust:" -msgstr "Ohita omistajan _luottamus:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Avaimen tunniste:" -msgid "Owner" -msgstr "Omistaja" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Vahvuus:" -msgid "Primary" -msgstr "Ensisijainen" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 +msgid "Technical Details" +msgstr "Tekniset yksityiskohdat" -msgid "Private PGP Key" -msgstr "Yksityinen PGP-avain" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 +msgid "Fingerprint" +msgstr "Sormenjälki" -msgid "Remove this photo from this key" -msgstr "Poista tämä valokuva tästä avaimesta" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Vanhenee:" -msgid "Revoke" -msgstr "Mitätöi" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Päivämäärät" -msgid "Sign" -msgstr "Allekirjoita" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Ohita omistajan _luottamus:" -msgid "Strength:" -msgstr "Vahvuus:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 +msgid "_Export Complete Key:" +msgstr "Vi_e koko avain" -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Avaimen omistaja mitätöi avaimen eikä sitä voida enää käyttää." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +msgid "Actions" +msgstr "Toiminnot" -msgid "_Add Name" -msgstr "Lisää _nimi" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Lisää" -msgid "_Export Complete Key:" -msgstr "Vi_e koko avain" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Vanhenna" -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nimi:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Aliavaimet" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Päiväykset:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Jonkin verran" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Sormenjälki:" +msgid "Fully" +msgstr "Kokonaan" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Osoita luottamus:" +msgid "Ultimately" +msgstr "Ehdottomasti" -msgid "Your trust of this key" -msgstr "Luottamuksesi tähän avaimeen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +#, fuzzy +#| msgid "Encrypt files and email to the key's owner " +msgid "Encrypt files and email to the key's owner" +msgstr "Salaa tiedostoja ja sähköpostia avaimen vastaanottajalle " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Julkinen PGP-avain" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Muut nimet:" -msgid "_People who have signed this key:" -msgstr "_Henkilöt, jotka ovat allekirjoittaneet tämän avaimen:" - -msgid "Encrypt files and email to the key's owner " -msgstr "Salaa tiedostoja ja sähköpostia avaimen vastaanottajalle " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Luottamuksesi tähän avaimeen" -msgid "Fully" -msgstr "Kokonaan" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Luottamuksesi määritellään käsin välilehdestä ”Yksityiskohdat”." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Luotan allekirjoittajan ”%s” allekirjoituksiin muissa avaimissa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1280,6 +1824,11 @@ "Jos uskot, että tämän avaimen omistaja on ”%s”, allekirjoita tämä " "avain:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Allekirjoita tämä avain" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1287,33 +1836,38 @@ "Jos et enää luota että ”%s” omistaa tämän avaimen, mitätöi " "allekirjoituksesi:" -msgid "Marginally" -msgstr "Jonkin verran" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "_Mitätöi allekirjoitus" -msgid "Public PGP Key" -msgstr "Julkinen PGP-avain" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Henkilöt, jotka ovat allekirjoittaneet tämän avaimen:" -#. Trust column +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Näytä allekirjoitukset vain henkilöille joihin luotan" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 msgid "Trust" msgstr "Luottamus" -msgid "Ultimately" -msgstr "Ehdottomasti" - -msgid "You _Trust the Owner:" -msgstr "Luo_ttamuksesi omistajaan:" - -msgid "Your trust is manually specified on the Details tab." -msgstr "Luottamuksesi määritellään käsin välilehdestä ”Yksityiskohdat”." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Sormenjälki:" -msgid "_Only display the signatures of people I trust" -msgstr "Näytä allekirjoitukset vain henkilöille joihin luotan" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 +msgid "Dates:" +msgstr "Päiväykset:" -msgid "_Revoke Signature" -msgstr "_Mitätöi allekirjoitus" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Osoita luottamus:" -msgid "_Sign this Key" -msgstr "_Allekirjoita tämä avain" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Luo_ttamuksesi omistajaan:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1321,55 +1875,63 @@ msgstr "Aliavain %d avaimesta %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Valinnainen mitätöimisen kuvaus" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Mitätöi" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Avaimen mitätöimisen syy" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Syy:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Valinnainen mitätöimisen kuvaus" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Mitätöi" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Sinulla ei ole henkilökohtaisia PGP-avaimia, joita voitaisiin käyttää " "asiakirjan tai viestin allekirjoitukseen." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Allekirjoita viesti avaimella:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Kuinka tarkasti olet tarkistanut tämän avaimen?" +msgid "Sign Key" +msgstr "Allekirjoita avain" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Kuinka muut näkevät tämän allekirjoituksen:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"Allekirjoittamalla ilmaiset luottamuksesi, että avain kuuluu seuraavalle " +"henkilölle:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Allekirjoita avain avaimella:" +msgid "Key Name" +msgstr "Avaimen nimi" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Pintapuolisesti tarkoittaa, että olet tarkistanut tavanomaisesti, " -"että avain kuuluu sen omistajalle. Voit esimerkiksi lukea avaimen " -"sormenjäljen omistajalle puhelimessa." +msgid "How carefully have you checked this key?" +msgstr "Kuinka tarkasti olet tarkistanut tämän avaimen?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Avaimen nimi" +msgid "_Not at all" +msgstr "_Ei lainkaan" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Pintapuolisesti" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "E_rittäin tarkasti" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1377,7 +1939,22 @@ "Ei lainkaan tarkoittaa, että uskot avaimen kuuluvan siinä mainitulle " "henkilölle, mutta et voinut tarkistaa tai et tarkistanut tätä todeksi." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +#, fuzzy +#| msgid "" +#| "Casually: means you have done a casual verification that the key " +#| "is owned by the person who claims to own it. For example, you could read " +#| "the key fingerprint to the owner over the phone. " +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Pintapuolisesti tarkoittaa, että olet tarkistanut tavanomaisesti, " +"että avain kuuluu sen omistajalle. Voit esimerkiksi lukea avaimen " +"sormenjäljen omistajalle puhelimessa." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1385,20 +1962,6 @@ "Erittäin tarkasti tulisi valita vain, jos olet ehdottoman varma että " "tämä avain kuuluu siinä mainitulle henkilölle." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "" -"Allekirjoittamalla ilmaiset luottamuksesi, että avain kuuluu seuraavalle " -"henkilölle:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Voin _mitätöidä tämän allekirjoituksen myöhemmin." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Allekirjoita avain" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1411,169 +1974,311 @@ "sähköpostiosoite kuuluu avaimen omistajalle." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Pintapuolisesti" +msgid "How others will see this signature:" +msgstr "Kuinka muut näkevät tämän allekirjoituksen:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Ei lainkaan" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Muut eivät näe tätä allekirjoitusta" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Voin _mitätöidä tämän allekirjoituksen myöhemmin." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Allekirjoita" +msgid "Sign key as:" +msgstr "Allekirjoita avain avaimella:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Allekirjoittaja:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "E_rittäin tarkasti" +msgid "_Sign" +msgstr "_Allekirjoita" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Allekirjoita viesti avaimella:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Viedään tietoja" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Noudetaan tietoja" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Tuodaan tietoja" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Lähetetään tietoja" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Ei käytettävissä" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Henkilökohtainen varmenne ja avain" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Henkilökohtainen varmenne" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Varmenne" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Varmenteet" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, fuzzy, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Haluatko varmasti poistaa %d tunnistetta?" +msgstr[1] "Haluatko varmasti poistaa %d tunnistetta?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Yksityisavaimen luonti ei onnistunut" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Luo" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Yksityinen avain" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Käytetään varmennepyyntöihin" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Luo uusi yksityinen avain" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Nimike:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#, fuzzy +msgid "Stored at:" +msgstr "Tallennettu salasana" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Ymmärrän, että tämä avain poistetaan lopullisesti." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Nimetön" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Varmenteen vienti epäonnistui" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Ei voitu poistaa" -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Haluatko varmasti poistaa varmenteen ”%s”?" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Vie" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Vie varmenne" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Poista tämä varmenne tai avain" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#, fuzzy +msgid "Request _Certificate" +msgstr "Varmenne" -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Haluatko varmasti poistaa %d varmenteen?" -msgstr[1] "Haluatko varmasti poistaa %d varmennetta?" +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +#, fuzzy +msgid "Create a certificate request file for this key" +msgstr "Tälle avaimelle ei ole saatavilla salaisen avaimen tiedostoa." -msgid "Deleting" -msgstr "Poistetaan" +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Varmennepyynnön tallennus epäonnistui" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Tallenna varmennepyyntö" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Varmennepyyntö" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Varmennepyynnön luonti epäonnistui" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Luo varmennepyyntötiedosto." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nimi (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Nimetön yksityinen avain" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Vaihda tunnuslausetta" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Varmista tunnuslause:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Uusi _tunnuslause:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Varmista uusi tunnuslause" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Uusi _tunnuslause:" +msgid "Con_firm Passphrase:" +msgstr "_Varmista tunnuslause:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Hallitse salasanoja ja salausavaimia" -msgid "Passwords and Keys" -msgstr "Salasanat ja salausavaimet" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Jatka" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "Valitse luotavan kohteen tyyppi:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "J_atka" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Luo _uusi…" - -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Valittu %d avain" -msgstr[1] "Valittu %d avainta" - -msgid "Couldn't import keys" -msgstr "Avaimia ei voitu tuoda" - -msgid "Imported keys" -msgstr "Tuodut avaimet" - -msgid "Importing keys" -msgstr "Tuodaan avaimia" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Tuonti epäonnistui" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Tuo" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Tuotavat tiedot:" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Tuo avain" -msgid "Unrecognized key type, or invalid data format" -msgstr "Tuntematon avaintyyppi, tai virheellinen tietomuoto" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Kaikki avaintiedostot" -msgid "Importing Keys" -msgstr "Tuodaan avaimia" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "" -msgid "_Remote" -msgstr "_Verkko" +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Leikepöydän teksti" +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Uusi" + +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Sulje ohjelma" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_Uusi…" +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Luo uusi avain tai kohde" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Lisää uusi avain tai kohde" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "_Tuo…" +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "Tuo tiedostosta" +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "Tuo leikepöydältä" -msgid "_Find Remote Keys..." -msgstr "Etsi _avaimia verkosta…" - -msgid "Search for keys on a key server" -msgstr "Etsi avaimia avainpalvelimelta" - -msgid "_Sync and Publish Keys..." -msgstr "_Synkronoi ja julkaise avaimia…" - -msgid "Publish and/or synchronize your keys with those online." -msgstr "Julkaise ja jaa avaimia muiden linjoilla olevien kanssa." - -msgid "T_ypes" -msgstr "T_yypit" +#: ../src/seahorse-key-manager.c:523 +#, fuzzy +msgid "By _keyring" +msgstr "_Avainnippu" -msgid "Show type column" -msgstr "Näytä tyyppi-sarake" +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "" -msgid "_Expiry" -msgstr "_Vanheneminen" +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Näytä _henkilökohtaiset" -msgid "Show expiry column" -msgstr "Näytä vanhenemispäivän sarake" +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Näytä vain henkilökohtaiset avaimet, varmenteet ja salasanat" -msgid "_Trust" -msgstr "_Luottamus" +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Näytä _luotetut" -msgid "Show owner trust column" -msgstr "Näytä avaimen luotettavuus -sarake" +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Näytä vain luotetut avaimet, varmenteet ja salasanat" -msgid "_Validity" -msgstr "Kel_vollisuus" +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Näytä _mikä tahansa" -msgid "Show validity column" -msgstr "Näytä avaimen kelvollisuus-sarake" +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Näytä kaikki avaimet, varmenteet ja salasanat" -msgid "Filter:" +#: ../src/seahorse-key-manager.c:737 +#, fuzzy +msgid "Filter" msgstr "Suodata:" #: ../src/seahorse-key-manager.xml.h:1 @@ -1584,417 +2289,290 @@ msgid "Generate a new key of your own: " msgstr "Luo itse uusi avain:" -#: ../src/seahorse-key-manager.xml.h:3 +#: ../src/seahorse-key-manager.xml.h:4 msgid "Import existing keys from a file:" msgstr "Tuo olemassa olevia avaimia tiedostosta:" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Henkilökohtaiset _avaimet" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Muut _avaimet" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Tarvitset salausavaimen aloittaaksesi salaamisen." - -msgid "_Import" -msgstr "_Tuo" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Salasanat" - -msgid "Couldn't export keys" -msgstr "Avaimia ei voitu viedä" - -msgid "Validity" -msgstr "Kelvollisuus" - -#. Expiry date column -msgid "Expiration Date" -msgstr "Vanhenemispäivä" - -msgid "Close this window" -msgstr "Sulje tämä ikkuna" - -msgid "_Expand All" -msgstr "_Laajenna kaikki" - -msgid "Expand all listings" -msgstr "Laajenna kaikki listaukset" - -msgid "_Collapse All" -msgstr "_" - -msgid "Collapse all listings" -msgstr "Pienennä kaikki listaukset" - -msgid "Remote Keys" -msgstr "Avain verkosta" - -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Avain verkosta, joka sisältää tunnisteen ”%s”" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Avainpalvelimet" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Lähellä olevat jaetut avaimet" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Etsi avaimia verkosta" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Tämä etsii muiden avaimia verkosta. Löydetyt avaimet voidaan tuoda " -"paikalliseen avainnippuun." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Mistä avaimia etsitään:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Etsi" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Et_si avaimia, jotka sisältävät: " - -msgid "Couldn't publish keys to server" -msgstr "Avaimia ei voitu julkaista palvelimelle" - -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Avaimia ei voitu hakea palvelimelta: %s" - -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d avain on valittu synkronoitavaksi" -msgstr[1] "%d avainta on valittu synkronoitavaksi" - -msgid "Synchronizing keys..." -msgstr "Synkronoidaan avaimia…" - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Synkronoi avaimet" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Tämä valinta julkaisee avaimet avainnippuun, jolloin ne ovat muiden " -"käytettävissä. Vastaanotat samalla muutokset, joita muut ovat tehneet " -"aiemmin vastaanottamiisi avaimiin." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Tämä valinta hakee muutokset, joita muut ovat tehneet sen jälkeen kun itse " -"hait heidän avaimensa. Avainpalvelinta ei ole valittu julkaisua varten, " -"joten omia avaimiasi ei julkaista muiden käytettäväksi." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Avain_palvelimet" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Synkronoi" - -msgid "Version of this application" -msgstr "Tämän ohjelman versio" - -msgid "Contributions:" -msgstr "Avustajat:" - -msgid "translator-credits" -msgstr "" -"Jarmo Kielosto, 2000\n" -"Ilkka Tuohela, 2004-2009\n" -"Tommi Vainikainen, 2008\n" -"Jani Välimaa, 2009\n" -"\n" -"http://gnome.fi/" - -msgid "Seahorse Project Homepage" -msgstr "Seahorse-projektin kotisivu" - -#. Top menu items -msgid "_File" -msgstr "_Tiedosto" - -msgid "_Edit" -msgstr "_Muokkaa" - -msgid "_View" -msgstr "_Näytä" - -msgid "_Help" -msgstr "O_hje" - -msgid "Prefere_nces" -msgstr "_Asetukset" - -msgid "Change preferences for this program" -msgstr "Muuta ohjelman asetuksia" - -msgid "About this program" -msgstr "Tietoja ohjelmasta" - -msgid "_Contents" -msgstr "_Sisältö" - -msgid "Show Seahorse help" -msgstr "Näytä Seahorsen ohje" - -msgid "Export public key" -msgstr "Vie julkinen avain" - -msgid "Exporting keys" -msgstr "Viedään avaimia" - -msgid "Couldn't retrieve data from key server" -msgstr "Tietoja ei voitu hakea avainpalvelimelta" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -msgid "Copied keys" -msgstr "Kopioitiin avaimia" - -msgid "Retrieving keys" -msgstr "Nouda avaimia" - -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s on salainen avain. Haluatko varmasti jatkaa?" - -msgid "Importing keys from key servers" -msgstr "Tuodaan avaimia avainpalvelimilta" - -msgid "Show properties" -msgstr "Näytä ominaisuudet" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Tarvitset salausavaimen aloittaaksesi salaamisen." -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Poista" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Lukitus ei onnistunut" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Lukituksen avaus ei onnistunut" -msgid "Delete selected items" -msgstr "Poista valitut kohteet" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Lukitse" -msgid "E_xport..." -msgstr "_Vie…" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Avaa lukitus" -msgid "Export to a file" -msgstr "Vie tiedostoon" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Ominaisuudet" -msgid "Copy to the clipboard" -msgstr "Kopioi leikepöydälle" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Määrittele _SSH-avain…" -msgid "Import selected keys to local key ring" -msgstr "Tuo valitut avaimet paikalliseen avainnippuun" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Lähetä julkinen SSH-avain toiselle tietokoneelle ja salli siihen " +"kirjautumiset lähetetyllä avaimella." +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" msgstr "Syötä SSH-avaimesi tunnuslause:" +#: ../ssh/seahorse-ssh-askpass.c:82 msgid "Old Key Passphrase" msgstr "Avaimen vanha tunnuslause" +#: ../ssh/seahorse-ssh-askpass.c:83 #, c-format msgid "Enter the old passphrase for: %s" msgstr "Syötä avaimen vanhan tunnuslause: %s" +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 msgid "New Key Passphrase" msgstr "Avaimen uusi tunnuslause" +#: ../ssh/seahorse-ssh-askpass.c:88 #, c-format msgid "Enter the new passphrase for: %s" msgstr "Syötä uusi tunnuslause: %s" +#: ../ssh/seahorse-ssh-askpass.c:93 #, c-format msgid "Enter the new passphrase again: %s" msgstr "Syötä uusi tunnuslause uudelleen: %s" -msgid "Configure Key for _Secure Shell..." -msgstr "Määrittele _SSH-avain…" - -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Lähetä julkinen SSH-avain toiselle tietokoneelle ja salli siihen " -"kirjautumiset lähetetyllä avaimella." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +#, fuzzy +msgid "Keys used to connect securely to other computers" +msgstr "Käytetään otettaessa yhteyttä muihin tietokoneisiin." +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Haluatko varmasti poistaa SSH-avaimen ”%s”?" -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Haluatko varmasti poistaa %d SSH-avainta?" +#: ../ssh/seahorse-ssh-deleter.c:91 +#, fuzzy, c-format +#| msgid "Are you sure you want to delete %d secure shell keys?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Haluatko varmasti poistaa %d SSH-avainta?" +msgstr[1] "Haluatko varmasti poistaa %d SSH-avainta?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH-avain" -msgid "Couldn't delete key" -msgstr "Avainta ei voitu poistaa" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Salaiset SSH-avaimet" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Julkiset SSH-avaimet" + +#: ../ssh/seahorse-ssh-exporter.c:290 +#, fuzzy +msgid "No public key file is available for this key." +msgstr "Tälle avaimelle ei ole saatavilla salaisen avaimen tiedostoa." -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "SSH-avain" +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Käytetään yhteyksissä muihin tietokoneisiin (esim päätteen kautta)" +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "SSH-avainta ei voitu luoda" +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Luodaan SSH-avainta" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Uusi SSH-avain" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." +msgid "_Just Create Key" +msgstr "Luo _vain avain" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_Luo ja ota käyttöön" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "SSH mahdollistaa salattujen yhteyksien luonnin muihin tietokoneisiin." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +#, fuzzy +msgid "Your email address, or a reminder of what this key is for." msgstr "" "Käytä sähköpostiosoitettasi tai muuta muistutusta kertomaan mihin " "tarkoitukseen tämä avain on." -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"SSH-avain sallii sinun ottaa yhteyttä luotettuihin tietokoneisiin " -"turvallisesti käyttäen SSH:ta ilman, että salasanaa tarvitsee syöttää joka " -"kerta." +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" +#: ../ssh/seahorse-ssh-generate.xml.h:12 +#, fuzzy msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "Jos sinulla on jo tietokone, johon yhteyttä otettaessa haluaisit käyttää " "tätä avainta, voit heti valtuuttaa tämän avaimen tähän tietokoneeseen." -msgid "New Secure Shell Key" -msgstr "Uusi SSH-avain" - -msgid "_Create and Set Up" -msgstr "_Luo ja ota käyttöön" - -msgid "_Just Create Key" -msgstr "Luo _vain avain" - -msgid "_Key Description:" -msgstr "_Avaimen kuvaus:" - -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Lukukelvoton SSH-avain)" +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Henkilökohtainen SSH-avain" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH-avain" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Avainta ei voitu nimetä uudestaan." +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Avaimen valtuutusta ei voitu muuttaa." +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Avaimen tunnuslausetta ei voitu vaihtaa." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmi:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Tunniste:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Sijainti:" - +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +#| msgid "Name:" +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nimi:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Vahvuus:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Käytetään otettaessa yhteyttä muihin tietokoneisiin." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Luottamus" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"Tämän avaimen omistaja on _valtuutettu ottamaan yhteyttä tähän tietokoneeseen" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Tämä vaikuttaa vain tiliin ”%s”." +#| msgid "This only applies to the '%s' account." +msgid "This only applies to the %s account." +msgstr "Tämä vaikuttaa vain tiliin ”%s”." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "Vi_e koko avain" +msgid "Algorithm:" +msgstr "Algoritmi:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"Tämän avaimen omistaja on _valtuutettu ottamaan yhteyttä tähän tietokoneeseen" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Vahvuus:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Sijainti:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Käytetään otettaessa yhteyttä muihin tietokoneisiin." +msgid "E_xport Complete Key" +msgstr "Vi_e koko avain" +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH-komento keskeytettiin odottamatta." +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH-komento epäonnistui." +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Etäpalvelimen salasana" +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Syötä avaimen tunnuslause" +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Uuden SSH-avaimen tunnuslause" +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Tuodaan avaimia: %s" +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Tuodaan avainta. Syötä tunnuslause" +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH-avaimet" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Tälle avaimelle ei ole saatavilla salaisen avaimen tiedostoa." +#: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." msgstr "SSH-avainta ei voitu määritellä etätietokoneelle." +#: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." msgstr "Määritellään SSH-avaimia…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "esim: tiedostopalvelin.esimerkki.fi:portti" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Valmistele tietokone SSH-yhteyttä varten" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2002,6 +2580,10 @@ "Jotta voit ottaa SSH-avaimen avulla yhteyttä toiseen tietokoneeseen, täytyy " "sinulla olla käyttäjätili kyseisessä tietokoneessa." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "esim: tiedostopalvelin.esimerkki.fi:portti" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Tietokoneen nimi:" @@ -2014,533 +2596,29 @@ msgid "_Set Up" msgstr "_Määrittele" -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "Älä suorita seahorse-daemon -prosessia taustalle" - -#~ msgid "couldn't fork process" -#~ msgstr "prosessin fork() epäonnistui" - -#~ msgid "couldn't create new process group" -#~ msgstr "uutta prosessiryhmää ei voi luoda" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "Salauspalvelin (Seahorse)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "Virheellinen tai tunnistamaton avaintyyppi: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "Tätä avaintyyppiä ei tueta: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "Tukea tälle ominaisuudelle ei otettu käyttöön käännösaikana" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "Virheellinen tai tunnistamaton avain: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "Allekirjoittanut vanhentunut %s." - -#~ msgid "Invalid Signature" -#~ msgstr "Virheellinen allekirjoitus" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "" -#~ "Allekirjoittanut päiväyksellä %s, vanhentunut." - -#~ msgid "Expired Signature" -#~ msgstr "Vanhentunut allekirjoitus" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "Allekirjoittanut Mitätöity %s." - -#~ msgid "Revoked Signature" -#~ msgstr "Mitätöity allekirjoitus" - -#~ msgid "Signed by on %s." -#~ msgstr "Allekirjoittanut %s." - -#~ msgid "Good Signature" -#~ msgstr "Hyväksytty allekirjoitus" - -#~ msgid "Signing key not in keyring." -#~ msgstr "Allekirjoitusavain ei ole avainnipussa." - -#~ msgid "Unknown Signature" -#~ msgstr "Tuntematon allekirjoitus" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "" -#~ "Väärä tai väärennetty allekirjoitus. Allekirjoitettuja tietoja on " -#~ "muutettu." - -#~ msgid "Bad Signature" -#~ msgstr "Väärä allekirjoitus" - -#~ msgid "Couldn't verify signature." -#~ msgstr "Allekirjoitusta ei voitu varmistaa" - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "Virheellinen tai tuntematon allekirjoittaja: %s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "Avain ei kelpaa allekirjoitukseen: %s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "Virheellinen tai tuntematon vastaanottaja: %s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "Avain ei kelpaa salaukseen: %s" - -#~ msgid "No recipients specified" -#~ msgstr "Vastaanottajia ei annettu" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "Virheellinen avaintyyppi salauksen purkuun: %s" - -#~ msgid "Please set clearuri" -#~ msgstr "Aseta selvätekstiuri" - -#~ msgid "Please set crypturi" -#~ msgstr "Aseta salatekstiuri" - -#~ msgid "Error opening clearuri" -#~ msgstr "Virhe avattaessa selvätekstiuria" - -#~ msgid "No signer specified" -#~ msgstr "Allekirjoittajaa ei annettu" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "Virheellinen avaintyyppi varmistukseen: %s" - -#~ msgid "Invalid key id: %s" -#~ msgstr "Virheellinen avaimen tunniste: %s" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "Lista avainpalvelinten URI-osoitteista, joista PGP-avaimia etsitään. " -#~ "Myöhemmissä versioissa voidaan lisätä näytettävä nimi erottamalla se " -#~ "välilyönnillä URI:sta." - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "Nouda avaimet automaattisesti" - -#~ msgid "Auto Sync Keys" -#~ msgstr "Synkronoi avaimet automaattisesti" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "" -#~ "Määrittelee näkyykö vanhenemispäivämäärän sarake avaintenhallinnassa." - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "Määrittelee näkyykö luottamus-sarake avaintenhallinnassa." - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "Määrittelee näkyykö tyyppisarake avaintenhallinnassa." - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "Määrittelee näkyykö kelpoisuus-sarake avaintenhallinnassa." - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "Ota DNS-SD -jako käyttöön" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "Ottaa käyttöön avainten DNS-SD (Apple Bonjour)-jaon. Seahorse-daemon " -#~ "täytyy olla käynnissä ja käännetty HKP- ja DNS-SD -tuen kanssa." - -#~ msgid "ID of the default key" -#~ msgstr "Oletusavaimen tunniste (ID)" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "" -#~ "Jos arvo on tosi, seahorsen salaamat tiedostot koodataan ASCII-kuoreen." - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "" -#~ "Jow arvo on tosi, lisätään oletusavain aina salauksen vastaanottajien " -#~ "listalle." - -#~ msgid "Last key server search pattern" -#~ msgstr "Viimeisin avainpalvelimen hakumalli" - -#~ msgid "Last key servers used" -#~ msgstr "Viimeksi käytetyt avainpalvelimet" - -#~ msgid "Last key used to sign a message." -#~ msgstr "Viimeisin viestin allekirjoitukseen käytetty avain." - -#~ msgid "PGP Key servers" -#~ msgstr "PGP-avainpalvelimet" - -#~ msgid "Publish keys to this key server." -#~ msgstr "Julkaise avaimet tälle avainpalvelimelle." - -#~ msgid "Show expires column in key manager" -#~ msgstr "Näytä vanhenemispäivä avaintenhallinnassa" - -#~ msgid "Show trust column in key manager" -#~ msgstr "Näytä luotettavuus avaintenhallinnassa" - -#~ msgid "Show type column in key manager" -#~ msgstr "Näytä tyyppi avaintenhallinnassa" - -#~ msgid "Show validity column in key manager" -#~ msgstr "Näytä kelpoisuus avaintenhallinnassa" - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "Määritä sarake, jonka perusteella vastaanottajat järjestetään. Sarakkeet " -#~ "ovat 'name' ja 'id'. Laita '-' sarakkeen nimen eteen, jos haluat " -#~ "järjestää laskevassa järjestyksessä." - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "Määritä sarake, jonka perusteella seahorsen pääikkuna järjestetään. " -#~ "Sarakkeet ovat 'name', 'id', 'validity', 'expires', 'trust' ja 'type'. " -#~ "Laita '-' sarakkeen nimen eteen, jos haluat järjestää laskevassa " -#~ "järjestyksessä." - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "" -#~ "Viimeksi viestin allekirjoitukseen käytetyn salaisen avaimen tunniste." - -#~ msgid "The column to sort the recipients by" -#~ msgstr "Sarake, jonka mukaan vastaanottajat järjestetään" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "Sarake, jonka mukaan seahorsen avaimet järjestetään" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "" -#~ "Avainpalvelin, jolle PGP-avaimet julkaistaan, tai tyhjä arvo, jos PGP-" -#~ "avaimia ei haluta julkaista." - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "" -#~ "Viimeisin avainpalvelin, jolta haku suoritettiin, tai tyhjä arvo kaikille " -#~ "avainpalvelimille." - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "Viimeisin avainpalvelimilta hakuun käytetty merkkijono." - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "" -#~ "Tämä määrittää tiettyihin toimenpiteisiin, lähinnä allekirjoitukseen, " -#~ "käytettävän oletusavaimen." - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "Määrittää noudetaanko avaimia automaattisesti avainpalvelimilta." - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "" -#~ "Määrittää synkronoidaanko muokatut avaimet automaattisesti " -#~ "oletusavainpalvelimelle." - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "Allekirjoitetaanko aina myös oletusavaimelle" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "Käytetäänkö ASCII-esitystä" - -#~ msgid "Web Password" -#~ msgstr "WWW-salasana" - -#~ msgid "Network Password" -#~ msgstr "Verkkosalasana" - -#~ msgid "Couldn't set application access." -#~ msgstr "Sovellusoikeuksia ei voitu asettaa." - -#~ msgid "Path:" -#~ msgstr "Polku:" - -#~ msgid "Permissions:" -#~ msgstr "Oikeudet:" - -#~ msgid "Applications" -#~ msgstr "Sovellukset" - -#~ msgid "_Read" -#~ msgstr "_Luku" - -#~ msgid "_Write" -#~ msgstr "_Kirjoitus" - -#~ msgctxt "infinitive" -#~ msgid "_Delete" -#~ msgstr "_Poisto" - -#~ msgid "Saving item..." -#~ msgstr "Tallennetaan kohtaa…" - -#~ msgid "Listing password keyrings" -#~ msgstr "Näytetään luettelo salasana-avainnipuista" - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "Yhtäkään salausavainta ei löytynyt, joilla pyytämäsi toimienpide voidaan " -#~ "suorittaa. Seuraavaksi käynnistetään ohjelma Salasanat ja " -#~ "salausavaimet, jonka avulla voit luoda avaimia tai tuoda " -#~ "olemassaolevia avaimia." - -#~ msgid "All Keys" -#~ msgstr "Kaikki avaimet" - -#~ msgid "Selected Recipients" -#~ msgstr "Valitut vastaanottajat" - -#~ msgid "Search Results" -#~ msgstr "Haun tulokset" - -#~ msgid "Search _for:" -#~ msgstr "Etsi _avainta:" - -#~ msgid "None (Don't Sign)" -#~ msgstr "Ei mitään (älä allekirjoita)" - -#~ msgid "Sign this message as %s" -#~ msgstr "Allekirjoita tämä viesti avaimella %s" - -#~ msgid "_Sign message as:" -#~ msgstr "Allekirjoita _tunnisteella:" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Tiedosto ei ole kelvollinen .desktop-tiedosto" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Tuntematon työpöytätiedoston versio: ”%s”" - -#~ msgid "Starting %s" -#~ msgstr "Käynnistetään %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Sovellus ei hyväksy asiakirjoja komentoriviltä" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Tuntematon käynnistysvalitsin: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "Asiakirjojen URI:a ei voi välittää 'Type=Link'-työpöytälinkille" - -#~ msgid "Not a launchable item" -#~ msgstr "Ei käynnistettävä kohde" - -#~ msgid "Disable connection to session manager" -#~ msgstr "Estä yhteys istunnonhallintaan" - -#~ msgid "FILE" -#~ msgstr "TIEDOSTO" - -#~ msgid "Session management options:" -#~ msgstr "Istunnonhallinnan valitsimet:" - -#~ msgid "Show session management options" -#~ msgstr "Näytä istunnonhallinnan valitsimet" - -#~ msgid "Key Imported" -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "Tuotiin avain" -#~ msgstr[1] "Tuotiin avaimia" - -#~ msgid "Imported %i key" -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "Tuotiin %d avain" -#~ msgstr[1] "Tuotiin %d avainta" - -#~ msgid "Imported a key for" -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "Tuotiin avain käyttäjälle" -#~ msgstr[1] "Tuotiin avaimia käyttäjälle" - -#~ msgid "Notification Messages" -#~ msgstr "Huomautusviestit" - -#~ msgid "Symmetric Key" -#~ msgstr "Symmetrinen avain" - -#~ msgid "Public Key" -#~ msgstr "Julkinen avain" - -#~ msgid "Private Key" -#~ msgstr "Yksityinen avain" - -#~ msgid "Credentials" -#~ msgstr "Oikeudet" - -#~ msgid "Identity" -#~ msgstr "Identiteetti" - -#~ msgid "Progress Title" -#~ msgstr "Edistymisen otsikko" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "Ohjelmaa file-roller ei voitu suorittaa" - -#~ msgid "Couldn't package files" -#~ msgstr "Tiedostoja ei voitu paketoida" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "Prosessi file-roller ei päättynyt onnistuneesti" - -#~ msgid "Loading Keys..." -#~ msgstr "Ladataan avaimia…" - -#~ msgid "Searching for keys..." -#~ msgstr "Etsitään avaimia…" - -#~ msgid "Uploading keys..." -#~ msgstr "Viedään avaimia…" - -#~ msgid "Retrieving keys..." -#~ msgstr "Noudetaan avaimia…" - -#~ msgid "Searching for keys on: %s" -#~ msgstr "Etsitään avaimia palvelimelta %s" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "Etsitään avaimia, jotka sisältävät merkkijonon ”%s”…" - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "Etsitään avaintunnistetta ”%s”…" - -#~ msgid "Retrieving remote keys..." -#~ msgstr "Haetaan avaimia palvelimelta…" - -#~ msgid "Sending keys to key server..." -#~ msgstr "Lähetetään avaimia palvelimelle…" - -#~ msgid "Synchronizing keys" -#~ msgstr "Avainten synkronointi" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Salausavainten hallinta" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Invalid" -#~ msgstr "Virheellinen" - -#~ msgid "Private Secure Shell Key" -#~ msgstr "Yksityinen SSH-avain" - -#~ msgid "Public Secure Shell Key" -#~ msgstr "Julkinen SSH-avain" - -#~ msgid "Secure Shell key" -#~ msgstr "SSH-avain" - -#~ msgid "Passphrase:" -#~ msgstr "Tunnuslause:" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "Syötä uuden SSH-avaimesi tunnuslause." - -#~ msgid "Couldn't share keys" -#~ msgstr "Avaimia ei voitu jakaa" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "Etsintätietoja ei voi julkaista verkkoon." - -#~ msgid "%s's encryption keys" -#~ msgstr "Käyttäjän %s salausavaimet" - -#~ msgid "Key Sharing" -#~ msgstr "Avainten jako" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "Avainten jako lähiverkossa sallii muiden käyttää keräämiäsi avaimia. Tämä " -#~ "tarkoittaa, että muut samassa verkossa olijat voivat automaattisesti " -#~ "salata viestejä sinulle ja niille joiden avaimet sinulla on, ilman että " -#~ "sinun täytyy lähettää heille avaimia erikseen.\n" -#~ "\n" -#~ "Huomautus: Salaisia avaimiasi ei jaeta." - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "_Jaa julkiset avaimet lähiverkossa" - -#~ msgid "Seahorse Daemon" -#~ msgstr "Seahorse-palvelinprosessi" +#~ msgid "Login keyring" +#~ msgstr "Sisäänkirjautumiseen liitetty avainnippu" -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "X avainta on valittu synkronoitavaksi" +#~ msgid "Access to the key ring was denied" +#~ msgstr "Pääsy avainnippuun estettiin" -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "" -#~ "Yksi tai useampi poistetuista avaimista on salainen avain. Oletko varma " -#~ "että haluat jatkaa?" +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Gnome-keyring -palvelinprosessi ei ole päällä" -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Avainnipun salaus on jo avattu" -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" +#~ msgid "No such key ring exists" +#~ msgstr "Avainnippua ei ole olemassa" -#~ msgid "Create a PGP Key" -#~ msgstr "Luo PGP-avain" +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Yhteyttä avainnippupalveluun ei saatu muodostettua" -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginal\n" -#~ "Full\n" -#~ "Ultimate" -#~ msgstr "" -#~ "Ei tiedossa\n" -#~ "Ei koskaan\n" -#~ "Keskimääräinen\n" -#~ "Täysi\n" -#~ "Ehdoton" +#~ msgid "The item already exists" +#~ msgstr "Kohta on jo olemassa" -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginally\n" -#~ "Fully\n" -#~ "Ultimately" -#~ msgstr "" -#~ "Tuntematon\n" -#~ "Ei koskaan\n" -#~ "Jonkin verran\n" -#~ "Täysin\n" -#~ "Ehdottomasti" +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Sisäinen virhe yhteydessä gnome-keyring -palvelimeen" -#~ msgid "_Trusted Keys" -#~ msgstr "_Luotetut avaimet" +#~ msgid "Algorithms here" +#~ msgstr "Tässä käytetyt algoritmit" diff -Nru seahorse-3.2.2/po/fr.po seahorse-3.6.3/po/fr.po --- seahorse-3.2.2/po/fr.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/fr.po 2012-09-18 13:10:35.000000000 +0200 @@ -1,5 +1,5 @@ # French translation of seahorse. -# Copyright (C) 2000-2011 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is distributed under the same license as the seahorse package. # # Gaël Quéri , 2000. @@ -10,18 +10,20 @@ # Claude Paroz , 2007-2011. # Stéphane Raimbault , 2007-2008. # Robert-André Mauchin , 2008. -# Bruno Brouard , 2009. -# Alexandre Franke , 2011. +# Bruno Brouard , 2009-2012. +# Alexandre Franke , 2011-2012. +# Grawok , 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-01 09:20+0200\n" +"POT-Creation-Date: 2012-09-09 14:39+0000\n" +"PO-Revision-Date: 2012-09-05 11:30+0200\n" "Last-Translator: Alexandre Franke \n" "Language-Team: GNOME French Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,10 +34,6 @@ msgstr "Ajouter un trousseau de mots de passe" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nom du nouveau trousseau :" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -43,312 +41,298 @@ "Veuillez choisir un nom pour le nouveau trousseau. Un mot de passe de " "déverrouillage vous sera demandé ensuite." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nom du nouveau trousseau :" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Le nom de l'hôte ou l'adresse du serveur." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Impossible d'ajouter un trousseau" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Nouveau trousseau de mots de passe" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "" +"Utilisé pour enregistrer les mots de passe des applications et du réseau" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nouveau mot de passe..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Enregistre de manière sécurisée un mot de passe ou un secret." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Trousseau de mots de passe" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Mot de passe enregistré" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Impossible de définir le trousseau par défaut" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Impossible de modifier le mot de passe du trousseau" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Par défaut" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Les applications enregistrent normalement les nouveaux mots de passe dans le " +"trousseau par défaut." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Modifier le _mot de passe" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "" +"Modifie le mot de passe de déverrouillage du trousseau contenant les mots de " +"passe" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Impossible d'ajouter l'élément" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Ajouter un mot de passe" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Description :" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Trousseau" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Mot de passe :" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Afficher le mot de _passe" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Impossible de supprimer l'élément" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Trousseau :" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Impossible d'ajouter un trousseau" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Mots de passe" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Mots de passe, informations d'authentification et secrets enregistrés" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Mot de passe du compte de messagerie instantanée pour " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Mot de passe ou secret" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Mot de passe du réseau" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Note enregistrée" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Mot de passe du trousseau" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Mot de passe de clé de chiffrement" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Mot de passe d'enregistrement de clé" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Mot de passe Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Mot de passe Gnome Online Accounts" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Mot de passe Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Mot de passe de messagerie instantanée" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Secret du gestionnaire de réseau" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Voulez-vous vraiment supprimer le mot de passe « %s » ?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Voulez-vous vraiment supprimer %d mot de passe ?" msgstr[1] "Voulez-vous vraiment supprimer %d mots de passe ?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Suppression de l'élément" -msgstr[1] "Suppression des éléments" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Accède à un partage ou une ressource réseau" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Accède à un site Web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Déverrouille une clé PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Déverrouille une clé de shell sécurisé" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Mot de passe ou identifiant enregistré" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Informations d'identification réseau" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Mot de passe" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Impossible de modifier le mot de passe." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Mise à jour du mot de passe" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Impossible de définir la description." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Mot de passe :" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Détails techniques :" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Détails" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Propriétés de la clé" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Clé" +msgid "Use:" +msgstr "Utilité :" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Propriétés de la clé" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Type :" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Identifiant :" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Serveur :" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Identifiant :" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Afficher le _mot de passe" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Type :" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Utilité :" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Mots de passe : %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Mots de passe : %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Trousseau de mots de passe" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "" -"Utilisé pour enregistrer les mots de passe des applications et du réseau" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Mot de passe enregistré" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "" -"Enregistre de manière sécurisée un mot de passe ou autre élément " -"confidentiel." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Impossible de déverrouiller le trousseau" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Impossible de verrouiller le trousseau" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Impossible de définir le trousseau par défaut" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Impossible de modifier le mot de passe du trousseau" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Verrouiller" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Verrouille le trousseau de stockage de mots de passe ce qui impose un mot de " -"passe maître pour le déverrouiller." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Déverrouiller" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Déverrouille le trousseau de stockage de mots de passe avec le mot de passe " -"maître afin de le rendre accessible." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Par défaut" +msgid "Password:" +msgstr "Mot de passe :" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Les applications enregistrent normalement les nouveaux mots de passe dans le " -"trousseau par défaut." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Clé" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Modifier le _mot de passe" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Détails techniques :" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "" -"Modifie le mot de passe de déverrouillage du trousseau contenant les mots de " -"passe" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Détails" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Impossible de supprimer le trousseau" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Un trousseau qui est automatiquement déverrouillé à la connexion" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Un trousseau utilisé pour stocker les mots de passe" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Voulez-vous vraiment supprimer le trousseau de mots de passe « %s » ?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Suppression du trousseau" -msgstr[1] "Suppression des trousseaux" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Je comprends que tous les éléments vont être supprimés définitivement." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Propriétés du trousseau" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nom :" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Créée le :" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Trousseau" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Propriétés du trousseau" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nom :" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "L'opération a été annulée" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "L'accès au trousseau a été refusé" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Le démon gnome-keyring n'a pas démarré" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Le trousseau a déjà été déverrouillé" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Ce trousseau n'existe pas" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Impossible de communiquer avec le démon du trousseau" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "L'élément existe déjà" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Erreur interne durant l'accès à gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Afficher les indicateurs" @@ -606,269 +590,334 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr " :" +msgid "initial temporary item" +msgstr "élément temporaire initial" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Ajouter un serveur de clés" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Hôte :" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Type de serveur de clés :" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Hôte :" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Le port sur lequel accéder au serveur." +msgid ":" +msgstr " :" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "élément temporaire initial" +msgid "The port to access the server on." +msgstr "Le port sur lequel accéder au serveur." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Phrase de passe" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Version de cette application" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Mot de passe :" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Paramètres système" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirmation :" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Contributions :" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Adresse de serveur de clés non valide." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Mots de passe et clés" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Pour obtenir de l'aide, contactez votre administrateur système ou " -"l'administrateur du serveur de clés." - -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +"Gaël Quéri \n" +"Stéphane Blondin \n" +"Christophe Merlet \n" +"David Soulayrol \n" +"Jonathan Ernst \n" +"Claude Paroz \n" +"Stéphane Raimbault \n" +"Bruno Brouard \n" +"Alexandre Franke " -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Personnalisé" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Page d'accueil du projet Seahorse" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Aucun : ne pas publier les clés" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Suppression impossible" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Récupérer automatiquement les _clés depuis les serveurs de clés" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Impossible d'exporter les clés" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Impossible d'exporter les données" + +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Fichier" + +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xporter..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exporte dans un fichier" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "É_dition" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Copie vers le presse-papiers" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Supprimer" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Efface les éléments sélectionnés" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Affiche les propriétés de cet élément" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Affiche les propriétés de ce trousseau" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Préfére_nces" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Modifie les préférences de ce programme" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Affichage" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Aid_e" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "À propos de ce programme" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Sommaire" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Affiche l'aide de Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exporter" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Saisissez le code PIN ou le mot de passe pour : %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Mot de passe :" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Confirmation :" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Adresse de serveur de clés non valide." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"Synchroniser automatiquement les clés _modifiées avec les serveurs de clés" +"Pour obtenir de l'aide, contactez votre administrateur système ou " +"l'administrateur du serveur de clés." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Serveurs de clés" +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Personnalisé" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Aucun : ne pas publier les clés" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Préférences" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Trouver des clés avec :" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Publier les clés sur :" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Récupération de données" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Exportation de données" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importation de données" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Récupérer automatiquement les _clés depuis les serveurs de clés" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Envoi de données" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"Synchroniser automatiquement les clés _modifiées avec les serveurs de clés" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Non disponible" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Serveurs de clés" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d/%m/%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Données de la clé" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Clés multiples" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Tous les fichiers de clé" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Tous les fichiers" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Fichiers d'archive" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Un fichier portant ce nom existe déjà.\n" -"\n" -"Voulez-vous le remplacer par un nouveau fichier ?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Remplacer" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Inconnue" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Jamais" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginale" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Complète" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Ultime" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Désactivée" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Révoquée" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Impossible d'afficher l'aide : %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Date d'expiration :" +msgid "Never E_xpires" +msgstr "N'e_xpire jamais" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Générer une nouvelle sous-clé" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Si la clé n'a pas une durée de vie limitée" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Type de la clé :" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Longueur de la clé :" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Type de la clé :" +msgid "Expiration Date:" +msgstr "Date d'expiration :" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Longueur de la clé" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "N'e_xpire jamais" +msgid "Generate a new subkey" +msgstr "Générer une nouvelle sous-clé" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Ajouter un identifiant utilisateur" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Créer le nouvel identifiant utilisateur" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nom complet :" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Co_mmentaire :" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Doit être long d'au-moins 5 caractères" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Adresse électronique optionnelle" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Commentaire optionnel décrivant la clé" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Adresse électronique optionnelle" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nom complet :" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Adresse électronique :" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Co_mmentaire :" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Créer le nouvel identifiant utilisateur" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Modifier" +msgid "_Never expires" +msgstr "_N'expire jamais" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Révoquer la clé" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_N'expire jamais" +msgid "C_hange" +msgstr "_Modifier" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -879,7 +928,7 @@ msgid "Add subkey to %s" msgstr "Ajouter une sous-clé à %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (signature seule)" @@ -887,7 +936,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (chiffrement seul)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (signature seule)" @@ -910,6 +959,11 @@ "Le déchiffrement a échoué. Vous ne disposez probablement pas de la clé de " "déchiffrement." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "L'opération a été annulée" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Date d'expiration non valide" @@ -927,48 +981,149 @@ msgid "Expiry: %s" msgstr "Expiration : %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Clés multiples" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Données de la clé" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Clés blindées PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Clés PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Clé PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Utilisée pour chiffrer les courriels et les fichiers" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA et ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Impossible de générer la clé PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Phrase de passe pour la nouvelle clé PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Saisissez deux fois la phrase de passe pour votre nouvelle clé." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Lors de la création d'une clé, il est nécessaire de générer\n" +"beaucoup de données aléatoires et pour cela nous avons besoin\n" +"de votre aide. Il est bon d'effectuer d'autres activités\n" +"comme saisir au clavier, déplacer la souris et utiliser des\n" +"applications. Cela fournit au système les données aléatoires\n" +"dont il a besoin." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Génération de clé" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Voulez-vous vraiment supprimer définitivement %s ?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Voulez-vous vraiment supprimer définitivement %d clé ?" +msgstr[1] "Voulez-vous vraiment supprimer définitivement %d clés ?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Mauvais mot de passe" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "C'est la troisième fois que vous saisissez un mauvais mot de passe. Essayez " "à nouveau." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Phrase de passe incorrecte." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Saisissez la nouvelle phrase de passe pour « %s »" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Saisissez la phrase de passe pour « %s »" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Saisissez la nouvelle phrase de passe" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Saisissez la phrase de passe" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Phrase de passe" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d clé chargée" +msgstr[1] "%d clés chargées" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Données de clé non valide (UID manquant). Cela peut provenir d'une date d'un " +"ordinateur configurée dans le futur ou d'une auto-signature manquante." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Clés GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG : répertoire par défaut du trousseau" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1003,29 +1158,33 @@ msgid "All JPEG files" msgstr "Tous les fichiers JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Tous les fichiers" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Choisissez une photo à joindre à la clé" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Impossible de préparer la photo" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Impossible d'ajouter une photo" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "Le fichier n'a pas pu être chargé. Il se peut que son format ne soit pas " "valide." -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Voulez-vous vraiment supprimer la photo actuelle de votre clé ?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Impossible de supprimer la photo" @@ -1083,7 +1242,11 @@ msgid "Couldn't add revoker" msgstr "Impossible d'ajouter un révocateur" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Je comprends que cette clé secrète sera supprimée définitivement." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1098,11 +1261,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Aucune clé utilisable pour la signature" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1110,516 +1273,582 @@ "Vous ne disposez d'aucune clé PGP personnelle permettant d'indiquer votre " "confiance dans cette clé." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Phrase de passe incorrecte." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Saisissez la nouvelle phrase de passe pour « %s »" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"La requête n'était pas assez spécifique. Le serveur « %s » a trouvé trop de " +"clés." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Saisissez la phrase de passe pour « %s »" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Impossible de communiquer avec le serveur « %s » : %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Saisissez la nouvelle phrase de passe" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Serveur de clés HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Saisissez la phrase de passe" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Impossible d'importer les clés" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importer des clés depuis les serveurs de clés" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Distant" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Ferme cette fenêtre" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Chercher des clés distantes..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Cherche des clés sur un serveur de clés" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importer" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importer les clés sélectionnées dans le trousseau local" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Clés distantes" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d clé chargée" -msgstr[1] "%d clés chargées" +msgid "Remote Keys Containing '%s'" +msgstr "Clés distantes contenant « %s »" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "La recherche de clés a échoué." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Chercher des clés distantes" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Données de clé non valide (UID manquant). Cela peut provenir d'une date d'un " -"ordinateur configurée dans le futur ou d'une auto-signature manquante." +"Ceci cherchera les clés d'autres personnes sur Internet. Ces clés peuvent " +"être importées dans votre trousseau de clés local." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "Ch_ercher des clés contenant :" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Serveur de clés HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Serveurs de clés :" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Clés partagées dans le voisinage :" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Emplacements de recherche :" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Chercher" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Impossible de publier les clés vers le serveur" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"La requête n'était pas assez spécifique. Le serveur « %s » a trouvé trop de " -"clés." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Impossible de récupérer les clés depuis le serveur : %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Impossible de communiquer avec le serveur « %s » : %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d clé est sélectionnée pour synchronisation" +msgstr[1] "%d clés sont sélectionnées pour synchronisation" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synchronisation des clés..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Synchroniser les clés" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Ceci publiera les clés de votre trousseau afin qu'elles soient disponibles " +"pour les autres. Vous obtiendrez également toutes les modifications que " +"d'autres ont faites depuis que vous avez reçu leurs clés." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Ceci récupérera toutes les modifications que d'autres ont faites depuis que " +"vous avez reçu leurs clés. Aucun serveur de clés n'a été choisi pour " +"publier, vos clés ne seront donc pas mises à disposition des autres." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Serveurs de _clés" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Synchroniser" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Impossible de communiquer avec « %s » : %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Connexion à : %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Impossible de résoudre l'adresse : %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Résolution de l'adresse du serveur : %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Serveur de clés LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Si_gner la clé..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Signe la clé publique" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Voulez-vous vraiment supprimer définitivement %s ?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Voulez-vous vraiment supprimer définitivement %d clés et identités ?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Voulez-vous vraiment supprimer définitivement %d clés ?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Voulez-vous vraiment supprimer définitivement %d identités ?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Synchroniser et publier des clés..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Impossible de supprimer l'identifiant utilisateur" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publie ou synchronise vos clés avec celles en ligne." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Impossible de supprimer la clé privée" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Impossible de supprimer la clé publique" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Clés PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Les clés PGP servent au chiffrement des courriels ou des fichiers" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Options _avancées de clé" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_réer" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Générer une nouvelle clé" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Une clé PGP vous permet de chiffrer des courriels ou des fichiers à " "destination d'autres personnes." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Les algorithmes" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_réer" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Commentaire :" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Date d'e_xpiration :" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "N'expire _jamais" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" -msgstr "_Type de chiffrement" - -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Générer une nouvelle clé" +msgstr "_Type de chiffrement :" -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Force de la clé (bits) :" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "N'expire _jamais" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nouvelle clé PGP" +msgid "E_xpiration Date:" +msgstr "Date d'e_xpiration :" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Commentaire :" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Options _avancées de clé" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Expiré" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Clé PGP personnelle" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Clé PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Impossible de modifier l'identifiant utilisateur primaire" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Voulez-vous vraiment supprimer définitivement l'identifiant utilisateur %s ?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Impossible de supprimer l'identifiant utilisateur" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Inconnue]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nom/Courriel" # src/dialogs/seahorse-signatures.glade2.h: -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Identifiant de signature" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Impossible de modifier la photo principale" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(inconnue)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Cette clé a expiré le : %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nom" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Voulez-vous vraiment supprimer définitivement la sous-clé %d de %s ?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Impossible de supprimer la sous-clé" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Impossible de modifier la confiance" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Impossible d'exporter la clé vers « %s »" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exporter la clé complète" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Impossible d'exporter la clé." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Impossible d'exporter la clé" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Jamais" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Type" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Créée le" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Expire" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "État" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Force" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Expiré" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Bon" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Identifiant de la clé" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Actions" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Commentaire :" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Dates" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Courriel :" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Empreinte" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Identifiant de la clé :" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Jamais" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Noms et signatures de clé" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Cette clé a été révoquée" -# #404785 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Photo " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"Le propriétaire de la clé l'a révoquée. Elle ne peut plus être utilisée." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Détails techniques" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Cette clé a expiré" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Cette clé a été révoquée" +msgid "Add a photo to this key" +msgstr "Ajouter une photo à cette clé" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Cette clé a expiré" +msgid "Remove this photo from this key" +msgstr "Enlever cette photo de cette clé" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Type :" +msgid "Make this photo the primary photo" +msgstr "Faire de cette photo la principale" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Utilisation :" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Aller à la photo précédente" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Sous-clés" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Aller à la photo suivante" +# #404785 +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Ajouter" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Photo " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Ajouter une photo à cette clé" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Identifiant de la clé :" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Changer la _phrase de passe" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nom :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Déchiffre des fichiers et courriels que vous avez reçus." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Courriel :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Supprimer" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Commentaire :" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Expiration" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Utilisation :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Expiration :" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Type :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exporter" +msgid "Decrypt files and email sent to you." +msgstr "Déchiffre des fichiers et courriels que vous avez reçus." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Clé PGP privée" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Aller à la photo suivante" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Changer la _phrase de passe" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Aller à la photo précédente" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Propriétaire" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Identifiant de la clé :" +msgid "Key Names and Signatures" +msgstr "Noms et signatures de clé" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Principale" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Faire de cette photo la principale" +msgid "Sign" +msgstr "Signer" -# src/dialogs/seahorse-signatures.glade2.h: -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Noms et signatures" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Supprimer" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Jamais" +msgid "_Add Name" +msgstr "_Ajouter nom" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Remplacer la _confiance du propriétaire :" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Propriétaire" +msgid "Revoke" +msgstr "Révoquer" +# src/dialogs/seahorse-signatures.glade2.h: +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Principale" +msgid "Names and Signatures" +msgstr "Noms et signatures" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Clé PGP privée" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Identifiant de la clé :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Enlever cette photo de cette clé" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Révoquer" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Force :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Signer" +msgid "Technical Details" +msgstr "Détails techniques" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Force :" +msgid "Fingerprint" +msgstr "Empreinte" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" -"Le propriétaire de la clé l'a révoquée. Elle ne peut plus être utilisée." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Expiration :" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Ajouter nom" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Dates" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Remplacer la _confiance du propriétaire :" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "E_xporter la clé complète :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nom :" +msgid "Actions" +msgstr "Actions" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Dates :" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Ajouter" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Expiration" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Sous-clés" + +# "Votre _confiance du propriétaire :" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginale" +# "Votre _confiance du propriétaire :" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Empreinte :" +msgid "Fully" +msgstr "Complète" +# "Votre _confiance du propriétaire :" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indication de confiance :" +msgid "Ultimately" +msgstr "Ultime" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Votre confiance dans cette clé" +msgid "Encrypt files and email to the key's owner" +msgstr "Chiffrement de fichiers et de courriels pour le propriétaire de la clé" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Clé PGP publique" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "Autres _noms :" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Personnes signataires de cette clé :" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Chiffrement de fichiers et de courriels pour le propriétaire de la clé" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Votre confiance dans cette clé" -# "Votre _confiance du propriétaire :" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Complète" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "" +"Votre degré de confiance est indiqué manuellement dans l'onglet Détails." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "J'ai confiance dans les signatures de « %s » sur d'autres clés" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1628,56 +1857,51 @@ "Si vous croyez que la personne propriétaire de cette clé est « %s », " "signez cette clé :" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Signer la clé" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" -"Si vous ne croyez plus que « %s » est propriétaire de cette clé, révoquez votre signature :" - -# "Votre _confiance du propriétaire :" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginale" +"Si vous ne croyez plus que « %s » est propriétaire de cette clé, " +"révoquez votre signature :" +# src/dialogs/seahorse-signatures.glade2.h: #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Clé PGP publique" +msgid "_Revoke Signature" +msgstr "_Révoquer la signature" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Personnes signataires de cette clé :" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Afficher _uniquement les signatures des personnes de confiance" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Confiance" -# "Votre _confiance du propriétaire :" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Ultime" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Votre _confiance du propriétaire :" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "" -"Votre degré de confiance est indiqué manuellement dans l'onglet Détails." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Empreinte :" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Afficher _uniquement les signatures des personnes de confiance" +msgid "Dates:" +msgstr "Dates :" -# src/dialogs/seahorse-signatures.glade2.h: -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Révoquer la signature" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indication de confiance :" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Signer la clé" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Votre _confiance du propriétaire :" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1685,56 +1909,61 @@ msgstr "Sous-clé %d de %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Description optionnelle de la révocation" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Ré_voquer" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Raison pour révoquer la clé" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Raison :" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Description optionnelle de la révocation" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Ré_voquer" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Vous ne disposez d'aucune clé PGP permettant de signer un document ou un " "message." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Signer le message avec la clé :" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Avec quelle précaution avez-vous vérifié cette clé ?" +msgid "Sign Key" +msgstr "Signer la clé" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Comment les autres verront cette signature :" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Votre signature atteste votre confiance que cette clé appartient à :" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Signer la clé comme :" +msgid "Key Name" +msgstr "Nom de la clé" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Superficiellement : signifie que vous avez vérifié rapidement que la " -"clé appartient bien à la personne qu'elle prétend représenter. Par exemple, " -"vous avez peut-être lu par téléphone l'empreinte de la clé à son " -"propriétaire." +msgid "How carefully have you checked this key?" +msgstr "Avec quelle précaution avez-vous vérifié cette clé ?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nom de la clé" +msgid "_Not at all" +msgstr "_Pas du tout" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "S_uperficiellement" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Très sérieusement" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1743,7 +1972,18 @@ "personne qu'elle prétend représenter, mais que vous n'avez pas pu ou pas " "voulu vous en assurer." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Superficiellement : signifie que vous avez vérifié rapidement que la " +"clé appartient bien à la personne qu'elle prétend représenter. Par exemple, " +"vous avez peut-être lu par téléphone l'empreinte de la clé à son " +"propriétaire." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1751,18 +1991,6 @@ "Très sérieusement : ne choisissez cette option que si vous êtes " "absolument sûr que cette clé est véritable." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Votre signature atteste votre confiance que cette clé appartient à :" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Je peux _révoquer cette signature à une date ultérieure." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Signer la clé" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1775,486 +2003,356 @@ "pour vérifier qu'il appartient bien au propriétaire de la clé." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "S_uperficiellement" +msgid "How others will see this signature:" +msgstr "Comment les autres verront cette signature :" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Pas du tout" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "Les _autres ne peuvent pas voir cette signature" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Je peux _révoquer cette signature à une date ultérieure." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Signer" +msgid "Sign key as:" +msgstr "Signer la clé comme :" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "Si_gnataire :" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Très sérieusement" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Signer le message avec la clé :" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Certificat" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Suppression impossible" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Voulez-vous vraiment supprimer le certificat « %s » ?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Voulez-vous vraiment supprimer %d certificat ?" -msgstr[1] "Voulez-vous vraiment supprimer %d certificats ?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Suppression" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Changer la phrase de passe" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firmer la phrase de passe :" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Confirmer la nouvelle phrase de passe" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Nouvelle _phrase de passe :" - -# Utilisation de l'infinitif dans les infobulles du Bureau -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Gérer vos mots de passe et vos clés de chiffrement" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Mots de passe et clés" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Sélectionnez le type d'élément à créer :" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Continuer" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Créer un nouveau..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d clé sélectionnée" -msgstr[1] "%d clés sélectionnées" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Impossible d'importer les clés" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Clés importées" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importation de clés" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importer une clé" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Type de clé non reconnu, ou format de données non valide" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importation de clés" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Distant" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Ferme ce programme" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nouveau..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Créer une nouvelle clé ou élément" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importer..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importer depuis un fichier" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importer depuis le presse-papiers" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Chercher des clés distantes..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Cherche des clés sur un serveur de clés" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Synchroniser et publier des clés..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publie ou synchronise vos clés avec celles en ligne." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_ypes" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Affiche la colonne de type" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Expiration" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Affiche la colonne d'expiration" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Confiance" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Affiche la colonne de confiance de clé" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validité" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Affiche la colonne de validité" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtre :" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Options de premier démarrage :" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Générer une nouvelle clé : " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importer des clés depuis un fichier :" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Mes clés _personnelles" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_Autres clés" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Pour débuter avec le chiffrement, vous aurez besoin de clés." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importer" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Mots de passe" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Impossible d'exporter les clés" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validité" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Date d'expiration" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Ferme cette fenêtre" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "Tout é_tendre" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Étend toutes les listes" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "Tout _réduire" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Réduit toutes les listes" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Clés distantes" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Clés distantes contenant « %s »" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Serveurs de clés :" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Clés partagées dans le voisinage :" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Chercher des clés distantes" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Ceci cherchera les clés d'autres personnes sur Internet. Ces clés peuvent " -"être importées dans votre trousseau de clés local." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Emplacements de recherche :" +msgid "_Sign" +msgstr "_Signer" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Chercher" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Exportation de données" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Ch_ercher des clés contenant :" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Récupération de données" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Impossible de publier les clés vers le serveur" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importation de données" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Impossible de récupérer les clés depuis le serveur : %s" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Envoi de données" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d clé est sélectionnée pour synchronisation" -msgstr[1] "%d clés sont sélectionnées pour synchronisation" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Non disponible" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Synchronisation des clés..." +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Clé et certificat personnel" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificat personnel" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Synchroniser les clés" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Certificat" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Ceci publiera les clés de votre trousseau afin qu'elles soient disponibles " -"pour les autres. Vous obtiendrez également toutes les modifications que " -"d'autres ont faites depuis que vous avez reçu leurs clés." +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificats (codage DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificats" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificats X.509 et clés connexes" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Voulez-vous vraiment supprimer définitivement %d certificat ?" +msgstr[1] "Voulez-vous vraiment supprimer définitivement %d certificats ?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Impossible de générer la clé privée" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Créer" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Clé privée" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Utilisé pour faire une demande de certificat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Créer une nouvelle clé privé" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Étiquette :" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Enregistré dans :" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Je comprends que cette clé sera supprimée définitivement." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Sans nom" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "L'exportation du certificat a échoué" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Ceci récupérera toutes les modifications que d'autres ont faites depuis que " -"vous avez reçu leurs clés. Aucun serveur de clés n'a été choisi pour " -"publier, vos clés ne seront donc pas mises à disposition des autres." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Suppression impossible" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Serveurs de _clés" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exporter" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exporte le certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Détruire ce certificat ou cette clé" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Demander le _certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Créer un fichier de demande de certificat pour cette clé" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Impossible d'enregistrer la demande de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Enregistrer la demande de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Demande de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Demande PEM codée" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Impossible de créer la demande de certificat" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Créer un fichier de demande de certificat." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Le nom commun (CN) placé dans la demande de certificat." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nom (CN) :" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Clé privée sans nom" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Synchroniser" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Changer la phrase de passe" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Version de cette application" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Nouvelle _phrase de passe :" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Contributions :" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Confirmer la nouvelle phrase de passe" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Gaël Quéri \n" -"Stéphane Blondin \n" -"Christophe Merlet \n" -"David Soulayrol \n" -"Jonathan Ernst \n" -"Claude Paroz \n" -"Stéphane Raimbault \n" -"Bruno Brouard \n" -"Alexandre Franke " +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Con_firmer la phrase de passe :" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Page d'accueil du projet Seahorse" +# Utilisation de l'infinitif dans les infobulles du Bureau +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Gérer vos mots de passe et vos clés de chiffrement" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fichier" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continuer" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "É_dition" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Sélectionnez le type d'élément à créer :" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Affichage" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Échec de l'importation" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importer" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Données à importer :" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Aid_e" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importer une clé" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Préfére_nces" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Tous les fichiers de clé" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Modifie les préférences de ce programme" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Texte déposé" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Texte du presse-papiers" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nouveau" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "À propos de ce programme" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Ferme ce programme" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Sommaire" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nouveau..." -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Affiche l'aide de Seahorse" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Créer une nouvelle clé ou élément" + +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Ajouter une nouvelle clé ou élément" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exporter la clé publique" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importer..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Exportation des clés" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importer depuis un fichier" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Impossible de récupérer les données depuis le serveur de clés" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importer depuis le presse-papiers" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Clés copiées" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Par _trousseau" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Afficher la barre latérale montrant les trousseaux" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Afficher les données _personnelles" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "N'afficher que les clés, certificats et mots de passe personnels" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Afficher les données de _confiance" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Ne montrer que les clés, certificats et mots de passe de confiance" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Tout _afficher" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Afficher l'ensemble des clés, certificats et mots de passe" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtrer" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Récupération des clés" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Options de premier démarrage :" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s est une clé privée. Voulez-vous vraiment poursuivre l'opération ?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Générer une nouvelle clé : " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importer des clés depuis les serveurs de clés" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importer des clés depuis un fichier :" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Affiche les propriétés" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Pour débuter avec le chiffrement, vous aurez besoin de clés." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Supprimer" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Impossible de verrouiller" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Impossible de déverrouiller" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Efface les éléments sélectionnés" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Verrouiller" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xporter..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Déverrouiller" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exporte dans un fichier" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propriétés" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copie vers le presse-papiers" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configurer la clé pour un _shell sécurisé..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importer les clés sélectionnées dans le trousseau local" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Envoie la clé publique de shell sécurisé vers une autre machine et active " +"les connexions à l'aide de cette clé." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2283,179 +2381,204 @@ msgid "Enter the new passphrase again: %s" msgstr "Saisissez encore une fois la nouvelle phrase de passe pour : %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configurer la clé pour un _shell sécurisé..." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Shell sécurisé" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" msgstr "" -"Envoie la clé publique de shell sécurisé vers une autre machine et active " -"les connexions à l'aide de cette clé." +"Clés utilisées pour se connecter de manière sécurisée à d'autres ordinateurs" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Voulez-vous vraiment supprimer la clé de shell sécurisé « %s » ?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Voulez-vous vraiment supprimer %d clés de shell sécurisé ?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Voulez-vous vraiment supprimer %d clé de shell sécurisé ?" +msgstr[1] "Voulez-vous vraiment supprimer %d clés de shell sécurisé ?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Clé SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Clé SSH secrète" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Clé SSH publique" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Aucun fichier de clé publique n'est disponible pour cette clé." -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Impossible de supprimer la clé" - -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Clé du shell sécurisé" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Utilisée pour accéder à d'autres ordinateurs (ex. via un terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Impossible de générer la clé de shell sécurisé" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Création d'une clé de shell sécurisé" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Nouvelle clé de shell sécurisé" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Utilisez votre courriel et tout autre indice permettant de vous rappeler " -"à quoi sert cette clé." +msgid "_Just Create Key" +msgstr "Créer _seulement" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Créer et configurer" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"Une clé de shell sécurisé (SSH) permet de vous connecter avec SSH de manière " -"sûre à des ordinateurs de confiance, sans devoir saisir un mot de passe " -"différent pour chacun d'eux." +"Une clé de shell sécurisé (SSH) permet de vous connecter de manière sûre à " +"d'autres ordinateurs." -#: ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Votre adresse électronique ou tout autre indice permettant de vous " +"rappeler à quoi sert cette clé." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "Si vous savez déjà que vous allez utiliser cette clé pour un ordinateur " "précis, vous pouvez le configurer maintenant pour qu'il reconnaisse cette " -"clé." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Nouvelle clé de shell sécurisé" +"nouvelle clé." -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Créer et configurer" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "Créer _seulement" +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Clé du shell sécurisé non lisible)" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Description de la clé :" +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Clé SSH personnelle" -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(clé du shell sécurisé non lisible)" +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Clé SSH" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Impossible de renommer la clé." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Impossible de modifier l'autorisation de la clé." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Impossible de modifier la phrase de passe de la clé." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algorithme :" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identifiant :" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Emplacement :" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nom :" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Force :" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Utilisée pour se connecter à d'autres ordinateurs." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Confiance" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"Le propriétaire de cette clé est _autorisé à se connecter à cet ordinateur" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Ceci ne s'applique qu'au compte « %s »." +msgid "This only applies to the %s account." +msgstr "Ceci ne s'applique qu'au compte %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xporter la clé complète" +msgid "Algorithm:" +msgstr "Algorithme :" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"Le propriétaire de cette clé est _autorisé à se connecter à cet ordinateur" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Force :" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Emplacement :" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Utilisée pour se connecter à d'autres ordinateurs." +msgid "E_xport Complete Key" +msgstr "E_xporter la clé complète" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "La commande SSH s'est terminée de manière inattendue." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "La commande SSH a échoué." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Mot de passe de l'hôte distant" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Saisissez la phrase de passe de la clé" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Phrase de passe pour la nouvelle clé du shell sécurisé" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importation de la clé : %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importation de la clé. Saisissez la phrase de passe" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Clés OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH : %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Aucun fichier de clé privée n'est disponible pour cette clé." @@ -2469,14 +2592,10 @@ msgstr "Configuration de clés de shell sécurisé..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "ex : serveur.exemple.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configurer un ordinateur pour une connexion SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2484,6 +2603,10 @@ "Pour utiliser votre clé de shell sécurisé sur un autre ordinateur utilisant " "SSH, vous devez disposer d'un compte pour vous connecter sur cet ordinateur." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "ex : serveur.exemple.com:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Nom de l'ordinateur :" @@ -2496,3 +2619,29 @@ msgid "_Set Up" msgstr "_Configurer" +#~ msgid "Login keyring" +#~ msgstr "Trousseau de connexion" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "L'accès au trousseau a été refusé" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Le démon gnome-keyring n'a pas démarré" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Le trousseau a déjà été déverrouillé" + +#~ msgid "No such key ring exists" +#~ msgstr "Ce trousseau n'existe pas" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Impossible de communiquer avec le démon du trousseau" + +#~ msgid "The item already exists" +#~ msgstr "L'élément existe déjà" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Erreur interne durant l'accès à gnome-keyring" + +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "Voulez-vous vraiment supprimer %d clés de shell sécurisé ?" diff -Nru seahorse-3.2.2/po/gl.po seahorse-3.6.3/po/gl.po --- seahorse-3.2.2/po/gl.po 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/gl.po 2012-11-12 08:32:13.000000000 +0100 @@ -1,40 +1,38 @@ -# translation of seahorse.master.po to Galician +# Galician translation of Seahorse. # Copyright (C) 2010 Fran Diéguez. # This file is distributed under the same license as the seahorse package. # -# Ignacio Casal Quinteiro , 2007. +# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas +# colaborar connosco, podes atopar máis información en http://www.trasno.net +# # Ignacio Casal Quinteiro , 2007. +# Ignacio Casal Quinteiro , 2007. # Ignacio Casal Quinteiro , 2007, 2008. # Mancomún - Centro de Referencia e Servizos de Software Libre , 2009. # Suso Baleato , 2009. # Antón Méixome , 2009. -# Fran Diéguez ,2009, 2010, 2011. -# Fran Dieguez , 2011. -# +# Fran Diéguez , 2009, 2010, 2011, 2012. +# Leandro Regueiro , 2012. msgid "" msgstr "" "Project-Id-Version: seahorse.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-15 22:51+0200\n" -"PO-Revision-Date: 2011-09-15 22:51+0200\n" -"Last-Translator: Fran Dieguez \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2012-08-17 00:07+0200\n" +"PO-Revision-Date: 2012-08-16 12:30+0200\n" +"Last-Translator: Leandro Regueiro \n" +"Language-Team: Galego \n" "Language: gl\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" +"X-Generator: Lokalize 1.0\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Engadir o contrasinal do anel de chaves" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nome novo do anel de chaves:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -42,310 +40,299 @@ "Elixa un nome para o novo anel de chaves. Preguntaráselle o contrasinal para " "desbloquear." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nome novo do anel de chaves:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "O nome do host ou o enderezo do servidor." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Non foi posíbel engadir o anel de chaves" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Contrasinal novo do anel de chaves" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Úsase para gardar os contrasinais de rede e de aplicativos" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Contrasinal novo…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Gardar de forma segura un contrasinal ou un segredo." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Contrasinal do anel de chaves" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Contrasinal gardado" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Non foi posíbel definir o anel de chaves predeterminado" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Non foi posíbel cambiar o contrasinal do anel de chaves" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "De_finir como predeterminado" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Os aplicativos normalmente almacenan os contrasinais novos no anel de chaves " +"predeterminado." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Cambiar o _contrasinal" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "" +"Cambiar o contrasinal de desbloqueo do anel de chaves de almacenamento de " +"contrasinais" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Non foi posíbel engadir o elemento" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Engadir un contrasinal" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Descrición:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "Anel de cha_ves:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Contrasinal:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Mostrar o _contrasinal" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Non foi posíbel eliminar o elemento" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "Anel de cha_ves:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Non foi posíbel engadir o anel de chaves" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Contrasinais" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Contrasinais personais, credenciais e segredos almacenados" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Contrasinal para a conta de MI" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Contrasinal ou segredo" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Contrasinal de rede" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Nota almacenada" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Contrasinal do anel de chaves" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Contrasina da chave de cifrado" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Contrasinal do almacén de chaves" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Contrasinal de Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Contrasinal de Contas en liña de GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Contrasinal de Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Contrasinal da mensaxaría instantánea" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Segredo do Xestor de rede" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Está seguro de que quere eliminar o contrasinal «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Está seguro de que quere eliminar %d contrasinal?" msgstr[1] "Está seguro de que quere eliminar %d contrasinais?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Eliminando o elemento" -msgstr[1] "Eliminando os elementos" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Acceder a un recurso ou espazo en rede compartido" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Acceder a un sitio web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Desbloquea unha chave PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" -msgstr "Desbloquea unha chave de intérprete de ordes seguro (SSH)" +msgstr "Desbloquea unha chave de Secure Shell (SSH)" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Contrasinal ou inicio de sesión gardado" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Credenciais de rede" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Contrasinal" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Non foi posíbel modificar o contrasinal." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Actualizando o contrasinal" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Non foi posíbel definir a descrición." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Contrasinal:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Detalles técnicos:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalles" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Propiedades da chave" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Tecla" +msgid "Use:" +msgstr "Uso:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Propiedades da chave" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipo:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Usuario:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Servidor:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Usuario:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Mostrar _contrasinal" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipo:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Contrasinais: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Contrasinais: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Contrasinal do anel de chaves" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Úsase para gardar os contrasinais de rede e de aplicativos" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Contrasinal gardado" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Gardar de forma segura un contrasinal ou un segredo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Non foi posíbel desbloquear o anel de chaves" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Non foi posíbel bloquear o anel de chaves" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Non foi posíbel definir o anel de chaves predeterminado" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Non foi posíbel cambiar o contrasinal do anel de chaves" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "B_loquear" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Bloquear o almacenamento de anel de chaves do contrasinal para que se " -"requira un contrasinal mestre para desbloquealo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Desbloquear" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Desbloquear o almacenamento do anel de chaves do contrasinal cun contrasinal " -"mestre para que o seu uso estea dispoñíbel." +msgid "Password:" +msgstr "Contrasinal:" -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "De_finir como predeterminado" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Tecla" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Os aplicativos normalmente almacenan os contrasinais novos no anel de chaves " -"predeterminado." +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Detalles técnicos:" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Cambiar o _contrasinal" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalles" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" msgstr "" -"Cambiar o contrasinal de desbloqueo do anel de chaves de almacenamento de " -"contrasinais" +"Un anel de chaves que é desbloqueado automaticamente ao inicio de sesión" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Non foi posíbel eliminar o anel de chaves" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Un anel de chaves usado para almacenar contrasinais" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "" "Está seguro de que quere eliminar o contrasinal do anel de chaves «%s»?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Eliminando o anel de chaves" -msgstr[1] "Eliminando os aneis de chaves" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Entendo que tódolos elementos serán eliminados de forma permanente." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Propiedades do anel de chaves" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nome:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Creado:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Anel de chaves" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Propiedades do anel de chaves" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nome:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "A operación foi cancelada" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Denegouse o acceso ao anel de chaves" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "O daemon do anel de chaves de GNOME non se está executando" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "O depósito de chaves xa foi desbloqueado" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Non existe ese anel de chaves" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Non foi posíbel comunicar co daemon do anel de chaves" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "O elemento xa existe" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Produciuse un erro interno ao acceder ao anel de chaves de GNOME" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Mostrar os parámetros" @@ -361,7 +348,7 @@ #: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "" -"O modo preguizoso non normaliza os datos introducidos e os valores temporais" +"O modo preguiceiro non normaliza os valores de data e tempo introducidos" #: ../libegg/egg-datetime.c:329 msgid "Year" @@ -603,270 +590,336 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "Elemento temporal inicial" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Engadir servidor de chaves" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Host:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Tipo de servidor de chaves:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Host:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "O porto para acceder ao servidor." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "Ítem temporal inicial" +msgid "The port to access the server on." +msgstr "O porto para acceder ao servidor." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Frase de paso" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versión deste aplicativo" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Contrasinal:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Preferencias do sistema" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirmar:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Colaboracións:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "O enderezo do servidor de chaves non é válido." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Contrasinais e chaves de cifrado" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Se precisa axuda contacte co seu administrador de sistemas ou co " -"administrador do servidor de chaves." +"Leandro Regueiro , 2012.\n" +"Fran Diéguez , 2009, 2010, 2011, 2012.\n" +"Antón Méixome , 2009.\n" +"Mancomún - Centro de Referencia e Servizos de Software Libre , 2009.\n" +"Suso Baleato , 2009.\n" +"Ignacio Casal Quinteiro , 2007, 2008.\n" +"\n" +"Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas\n" +"colaborar connosco, podes atopar máis información en http://www.trasno.net" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Páxina web do Seahorse" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Personalizado" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Non é posíbel eliminar" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Ningún: non publicar as chaves" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Non foi posíbel exportar as chaves" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Recuperar automaticamente as chaves a partir dos servidores de ch_aves" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Non foi posíbel exportar os datos" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "" -"Sincronizar automaticamente as chaves _modificadas a partir dos servidores " -"de chaves" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Ficheiro" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Servidores de chaves" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xportar…" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Preferencias" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exportar a un ficheiro" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Buscar chaves usando:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Editar" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Publicar chaves en:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Copiar ao portapapeis" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Obtendo datos" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "E_liminar" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Exportando datos" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Eliminar os elementos seleccionados" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importando datos" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Mostrar as propiedades para este elemento" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Mostrar as propiedades para este anel" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Enviando datos" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Preferencias" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Non dispoñíbel" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Cambia as preferencias deste programa" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d-%m-%Y" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Ver" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Datos da chave" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Axuda" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Chaves múltiples" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Sobre este programa" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Todos os ficheiros de chaves" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Contidos" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Todos os ficheiros" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Mostrar a axuda do Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exportar" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Escriba o PIN ou contrasinal para: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Contrasinal:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Confirmar:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arquivar ficheiros" +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "O enderezo do servidor de chaves non é válido." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"Xa existe un ficheiro con este nome.\n" -"\n" -"Quere substituílo por un novo?" +"Se precisa axuda contacte co seu administrador de sistemas ou co " +"administrador do servidor de chaves." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Personalizado" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Ningún: non publicar as chaves" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Preferencias" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Buscar chaves usando:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Publicar chaves en:" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Substituír" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Recuperar automaticamente as chaves a partir dos servidores de ch_aves" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"Sincronizar automaticamente as chaves _modificadas a partir dos servidores " +"de chaves" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Servidores de chaves" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d-%m-%Y" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Descoñecido" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nunca" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marxinal" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Completa" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Final" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Desactivada" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revogada" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Non foi posíbel mostrar a axuda: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Data de caducidade:" +msgid "Never E_xpires" +msgstr "Nu_nca caduca" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Xerar unha nova subchave" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Se a chave nunca caduca" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipo de chave:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Lonxitude de chave:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipo de chave:" +msgid "Expiration Date:" +msgstr "Data de caducidade:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Lonxitude da chave" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nu_nca caduca" +msgid "Generate a new subkey" +msgstr "Xerar unha nova subchave" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Engadir o ID de usuario" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Crear o novo ID de usuario" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nome completo:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Co_mentario de chave:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Debe ter como mínimo 5 caracteres" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Enderezo de correo opcional" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Comentario opcional para describir a chave" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Enderezo de correo opcional" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nome completo:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "Enderezo de corr_eo:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Co_mentario de chave:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Crear o novo ID de usuario" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Cambiar" +msgid "_Never expires" +msgstr "_Non caduca nunca" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revogar a chave" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Non caduca nunca" +msgid "C_hange" +msgstr "_Cambiar" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -877,7 +930,7 @@ msgid "Add subkey to %s" msgstr "Engadir subchave a %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (só asinar)" @@ -885,7 +938,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (só cifrar)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (só asinar)" @@ -906,6 +959,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "O descifrado fallou. Probabelmente non ten a chave de descifrado." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "A operación foi cancelada" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "A data de caducidade non é válida" @@ -923,47 +981,149 @@ msgid "Expiry: %s" msgstr "Caducidade: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Chaves múltiples" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Datos da chave" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Chaves PGP blindadas" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Chaves PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Usado para cifrar correo e ficheiros" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Non foi posíbel xerar a chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" -msgstr "Contrasinal para a nova chave PGP" +msgstr "Frase de paso para a nova chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." -msgstr "Introduza o contrasinal para a nova chave dúas veces." +msgstr "Introduza dúas veces a frase de paso para a nova chave." + +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Ao crear unha chave débense xerar moitos\n" +"datos aleatorios e precísase da súa axuda. É unha\n" +"boa idea realizar outras tarefas como escribir\n" +"co teclado, mover o rato ou usar aplicativos.\n" +"Isto fornécelle ao sistema os datos aleatorios\n" +"necesarios." -#: ../pgp/seahorse-gpgme-generate.c:219 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Xerando a chave" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Está seguro de que desexa eliminar permanentemente %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Está seguro de que desexa eliminar permanentemente %d chave?" +msgstr[1] "Está seguro de que desexa eliminar permanentemente %d chaves?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Contrasinal incorrecto" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Esta foi a terceira vez que inseriu o contrasinal incorrecto. Ténteo de novo." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "A frase de paso é incorrecta." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Introduza unha frase de paso nova para «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Introduza a frase de paso para «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Introduza a frase de paso nova" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Introduza a frase de paso" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Frase de paso" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d chave cargada" +msgstr[1] "%d chaves cargadas" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Os datos da chave non son válidos (faltan UID). Isto pode deberse a un " +"equipo cunha data estabelecida no futuro ou a unha sinatura persoal que " +"falta." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Chaves de GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: cartafol predeterminado do anel de chaves" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -998,28 +1158,32 @@ msgid "All JPEG files" msgstr "Todos os ficheiros JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Todos os ficheiros" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Seleccione unha foto para engadir á chave" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Non foi posíbel preparar a foto" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Non foi posíbel engadir a foto" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "Non foi posíbel cargar o ficheiro. Pode que estea nun formato non válido" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" -msgstr "Está seguro de que desexa quitar a foto actual da súa chave?" +msgstr "Está seguro de que desexa retirar a foto actual da súa chave?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Non foi posíbel eliminar a foto" @@ -1077,7 +1241,11 @@ msgid "Couldn't add revoker" msgstr "Non foi posíbel engadir o revogador" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Entendo que esta chave segreda eliminarase permanentemente." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1092,11 +1260,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Non hai chaves dispoñíbeis para asinar" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1104,513 +1272,575 @@ "Non ten ningunha chave persoal PGP que se poida usar para indicar a súa " "confianza nesta chave." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "A frase de paso é incorrecta." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Introduza unha frase de paso nova para «%s»" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"A busca non foi o suficientemente específica. O servidor «%s» encontrou " +"demasiadas chaves." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Introduza a frase de paso para «%s»" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Non foi posíbel comunicar co servidor «%s»: %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Introduza a frase de paso nova" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Servidor de chaves HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Introduza a frase de paso" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Non foi posíbel importar as chaves" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importando chaves desde servidores de chaves" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remoto" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Pechar esta xanela" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Buscar chaves remotas…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Buscar chaves nun servidor de chaves" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importar" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importar as chaves seleccionadas no anel de chaves local" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Chaves remotas" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d chave cargada" -msgstr[1] "%d chaves cargadas" +msgid "Remote Keys Containing '%s'" +msgstr "Chaves remotas que conteñan «%s»" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Produciuse un erro ao buscar as chaves." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Buscar chaves remotas" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Os datos da chave non son válidos (faltan UID). Isto pode deberse a un " -"equipo cunha data estabelecida no futuro ou a unha sinatura persoal que " -"falta." +"Isto buscará chaves para outros en Internet. Estas chaves poden importarse " +"despois no seu anel local de chaves." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Buscar chaves que conteñan: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Servidor de chaves HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Servidores de chaves:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Chaves compartidas próximas a min:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Onde buscar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Buscar" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Non foi posíbel publicar as chaves no servidor" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"A busca non foi o suficientemente específica. O servidor «%s» encontrou " -"demasiadas chaves." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Non foi posíbel obter as chaves desde o servidor: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Non foi posíbel comunicar co servidor «%s»: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d chave seleccionada para a sincronización" +msgstr[1] "%d chaves seleccionadas para a sincronización" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Sincronización de chaves…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronizar chaves" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Isto publicará as chaves do seu anel así que estarán dispoñíbeis para que as " +"usen outras persoas. Tamén obterá todos os cambios que outras persoas " +"fixeran desde que recibiu as súas chaves." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Isto recuperará todas as modificacións que outras persoas fixeran desde que " +"recibiu as súas chaves. Non se seleccionou ningún servidor de chaves para a " +"publicación, así que as súas propias chaves non estarán dispoñíbeis para " +"outras persoas." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Servidores de cha_ves" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronizar" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Non foi posíbel comunicar con «%s»: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Conectando con: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Non foi posíbel resolver o enderezo: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Resolvendo o enderezo do servidor: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Servidor de chaves LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "A_sinar unha chave…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Asinar chave pública" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Está seguro de que desexa eliminar permanentemente %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" -"Está seguro de que desexa eliminar permanentemente %d chaves e identidades?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Está seguro de que desexa eliminar permanentemente %d chaves?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronizar e publicar chaves…" -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Está seguro de que desexa eliminar permanentemente %d identidades?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publicar ou sincronizar as chaves coas que están en liña." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Non foi posíbel eliminar o ID de usuario" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Chave PGP" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Non foi posíbel eliminar a chave privada" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Non foi posíbel eliminar a chave pública" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Chaves PGP usadas para cifrar correo e ficheiros" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opcións _avanzadas de chave" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_rear" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Xerar unha nova chave" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Unha chave PGP permítelle cifrar correos electrónicos ou ficheiros para " "outras persoas." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmos aquí" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_rear" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Comentario:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Data de _caducidade:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Nunca caduca" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Tipo de cifrado:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Xerar unha nova chave" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Resistencia da chave (bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Nunca caduca" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nova chave PGP" +msgid "E_xpiration Date:" +msgstr "Data de _caducidade:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Comentario:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opcións _avanzadas de chave" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Caducada" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Chave PGP persoal" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Chave PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Non é posíbel cambiar o ID de usuario primario" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Está seguro de que quere eliminar o ID de usuario «%s» de forma permanente?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Non foi posíbel eliminar o ID de usuario" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Descoñecido]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nome/Correo-e" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID de sinatura" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Non foi posíbel cambiar a foto primaria" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(descoñecido)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Esta chave caducou o: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nome" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Está seguro de que quere eliminar permanentemente a subchave %d de %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Non foi posíbel eliminar a subchave" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Non é posíbel cambiar o nivel de confianza" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Non foi posíbel exportar a chave a «%s»" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exportar a chave completa" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Non foi posíbel exportar a chave." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Non foi posíbel exportar a chave" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nunca" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipo" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Creado" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Caducidade" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Estado" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Resistencia" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Caducada" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Bo" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID da chave" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Accións" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Comentario:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datas" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Correo electrónico:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Impresión dixital" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID de chave:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nunca" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nomes de chave e sinaturas" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Esta chave foi revogada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Foto" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "O propietario da chave revogou a chave. Non é posíbel usar máis." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Detalles técnicos" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Esta chave caducou" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Esta chave foi revogada" +msgid "Add a photo to this key" +msgstr "Engadir unha foto a esta chave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Esta chave caducou" +msgid "Remove this photo from this key" +msgstr "Retirar esta foto desta chave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipo:" - -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" +msgid "Make this photo the primary photo" +msgstr "Facer desta foto a foto primaria" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Subchaves" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Ir á foto anterior" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Ir á foto seguinte" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Engadir" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Foto" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Engadir unha foto a esta chave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID de chave:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Cambiar a frase de _paso" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nome:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Descifrar ficheiros e correos electrónicos enviados a vostede." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Correo electrónico:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Eliminar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Comentario:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Caducar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Uso:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Caduca:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipo:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exportar" +msgid "Decrypt files and email sent to you." +msgstr "Descifrar ficheiros e correos electrónicos enviados a vostede." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Chave PGP privada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Ir á foto seguinte" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Cambiar a frase de _paso" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Ir á foto anterior" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Propietario" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ID de chave:" +msgid "Key Names and Signatures" +msgstr "Nomes de chave e sinaturas" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primario" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Facer desta foto a foto primaria" +msgid "Sign" +msgstr "Sinatura" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nomes e sinaturas" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Eliminar" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nunca" +msgid "_Add Name" +msgstr "_Engadir nome" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Impor a confianza do _propietario:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Propietario" +msgid "Revoke" +msgstr "Revogar" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primario" +msgid "Names and Signatures" +msgstr "Nomes e sinaturas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Chave PGP privada" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID de chave:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Eliminar esta foto desta chave" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Revogar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Resistencia:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Sinatura" +msgid "Technical Details" +msgstr "Detalles técnicos" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Resistencia:" +msgid "Fingerprint" +msgstr "Impresión dixital" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "O propietario da chave revogou a chave. Non é posíbel usar máis." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Caduca:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Engadir nome" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datas" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Impor a confianza do _propietario:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Exportar chave completa:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nome:" +msgid "Actions" +msgstr "Accións" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datas:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Engadir" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Caducar" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Subchaves" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marxinal" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Impresión dixital:" +msgid "Fully" +msgstr "Completa" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indicar a confianza:" +msgid "Ultimately" +msgstr "Final" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "A súa confianza nesta chave" +msgid "Encrypt files and email to the key's owner" +msgstr "Cifra ficheiros e correo-e para o propietario da chave" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Chave PGP pública" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Outros nomes:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Persoas que asinaron esta chave:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Cifra ficheiros e correos electrónicos para o propietario da chave " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "A súa confianza nesta chave" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Completa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "" +"A súa confianza está especificada manualmente na lapela Detalles." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Confío nas sinaturas de «%s» noutras chaves" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1619,7 +1849,11 @@ "Se cree que a persoa á que pertence esta chave é «%s», asinar esta " "chave:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "A_sinar esta chave" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1627,44 +1861,38 @@ "Se xa non confía en que esta chave pertenza a «%s», revogue a súa " "sinatura:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marxinal" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Chave PGP pública" +msgid "_Revoke Signature" +msgstr "_Revogar sinatura" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Persoas que asinaron esta chave:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Mostrar _só as sinaturas das persoas en quen confío" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Confianza" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Final" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "_Confía no propietario:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "" -"A súa confianza está especificada manualmente na lapela Detalles." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Impresión dixital:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Mostrar _só as sinaturas das persoas en quen confío" +msgid "Dates:" +msgstr "Datas:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Revogar sinatura" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indicar a confianza:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "A_sinar esta chave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Confía no propietario:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1672,55 +1900,61 @@ msgstr "Chave secundaria %d de %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Descrición opcional de revogación" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_vogar" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Razón de revogación da chave" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Razón:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Descrición opcional de revogación" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Re_vogar" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Non ten chaves PGP persoais que se poidan usar para asinar un documento ou " "unha mensaxe." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "A_sinar a mensaxe coa chave:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Que coidado puxo na verificación desta chave?" +msgid "Sign Key" +msgstr "Asinar a chave" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Como verán outros esta sinatura:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Asinando indica que confía que esta chave pertence a:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Asinar a chave como:" +msgid "Key Name" +msgstr "Nome da chave" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Informalmente: significa que fixo unha verificación informal de que a " -"chave lle pertence á persoa que di posuíla. Por exemplo, vostede podería ler " -"a pegada dixital da chave ao propietario por teléfono. " +msgid "How carefully have you checked this key?" +msgstr "Que coidado puxo na verificación desta chave?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nome da chave" +msgid "_Not at all" +msgstr "_Ningunha en absoluto" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Informalmente" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Moi coidadosamente" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1729,7 +1963,17 @@ "persoa que di posuíla mais non puido facer ou non fixo ningunha verificación " "de que isto fose así." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Casualmente: significa que fixo unha verificación casual de que a " +"chave perténcelle á persoa que di posuíla. Por exemplo, podería ler a pegada " +"dixital da chave ao propietario por teléfono." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1737,18 +1981,6 @@ "Moi coidadosamente: Seleccione isto só se está completamente seguro " "de que esta chave é auténtica." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Asinando indica que confía que esta chave pertence a:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Podo _revogar esta sinatura nunha data posterior." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Asinar a chave" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1761,487 +1993,359 @@ "de correo pertence ao propietario." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Informalmente" +msgid "How others will see this signature:" +msgstr "Como verán outros esta sinatura:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Ningunha en absoluto" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Outros poderán non ver esta sinatura" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Podo _revogar esta sinatura nunha data posterior." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "A_sinar" +msgid "Sign key as:" +msgstr "Asinar a chave como:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "A_sinante:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Moi coidadosamente" +msgid "_Sign" +msgstr "A_sinar" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "A_sinar a mensaxe coa chave:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Exportando datos" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Obtendo datos" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importando datos" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Enviando datos" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Non dispoñíbel" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Certificado persoal e chave" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificado persoal" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certificado" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificados (codificados con DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificados" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificados X.509 e chaves relacionadas" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Está seguro de que desexa eliminar permanentemente %d identidade?" +msgstr[1] "Está seguro de que desexa eliminar permanentemente %d identidades?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Non foi posíbel xerar a chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Crear" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "USado para solicitar un certificado" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Crear unha chave privada nova" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etiqueta:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Almacenado en:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Entendo que esta chave eliminarase permanentemente." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Sen nome" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Produciuse un erro ao exportar o certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Non foi posíbel eliminar" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Está seguro de que quere eliminar o certificado «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Está seguro de que quere eliminar %d certificado?" -msgstr[1] "Está seguro de que quere eliminar %d certificados?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Eliminando" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exportar" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exportar o certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Eliminar este certificado ou chave" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Solicitar _certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Crear un ficheiro de solicitude de certificado para esta chave" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Non foi posíbel gardar a solicitude de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Gardar a solicitude de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Solicitude de contacto" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Solicitude codificada con PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Non foi posíbel crear a solicitude de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Crear un ficheiro de solicitude de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "O nome común (CN) localizado na solicitude de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nome (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Chave privada sen nome" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Cambiar a frase de paso" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firmar a frase de paso:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Confirmar a nova frase de paso" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "Nova frase de _paso:" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Xestione os seus contrasinais e chaves de cifrado" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Contrasinais e chaves de cifrado" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Seleccione o tipo de elemento para crear:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "C_ontinuar" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Crear unha nova…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d chave seleccionada" -msgstr[1] "%d chaves seleccionadas" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Non foi posíbel importar as chaves" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Chaves importadas" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importando chaves" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importar unha chave" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Non se recoñece o tipo de chave ou o formato de datos non é válido" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importando chaves" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remoto" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Pechar este programa" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Novo…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Crear unha chave ou elemento novo" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importar…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importar dun ficheiro" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importar desde o portapapeis" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Buscar chaves remotas…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Buscar chaves nun servidor de chaves" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronizar e publicar chaves…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publicar ou sincronizar as chaves coas que están en liña." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_ipos" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Mostrar a columna do tipo de chave" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Caducidade" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Mostrar a columna de caducidade" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Confianza" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Mostrar a columna de confianza do propietario" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validación" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Mostrar a columna de validación" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtro:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opcións de primeiro uso:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Xerar unha nova chave para un mesmo: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importar as chaves existentes nun ficheiro:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Chaves _persoais" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Outras c_haves" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Para poder comezar o proceso de cifrado precisará chaves." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importar" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Contrasinais" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Non foi posíbel exportar as chaves" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validez" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Data de caducidade" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Pechar esta xanela" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Expandir todo" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Expandir todas as listas" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Contraer todo" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Contraer todas as listas" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Chaves remotas" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Chaves remotas que conteñan «%s»" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servidores de chaves:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Chaves compartidas próximas a min:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Buscar chaves remotas" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Isto buscará chaves para outros en Internet. Estas chaves poden importarse " -"despois no seu anel local de chaves." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Onde buscar:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Buscar" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Buscar chaves que conteñan: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Non foi posíbel publicar as chaves no servidor" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Non foi posíbel obter as chaves desde o servidor: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d chave seleccionada para a sincronización" -msgstr[1] "%d chaves seleccionadas para a sincronización" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Sincronización de chaves…" - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronizar chaves" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Isto publicará as chaves do seu anel así que estarán dispoñíbeis para que as " -"usen outras persoas. Tamén obterá todos os cambios que outras persoas " -"fixeran desde que recibiu as súas chaves." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Isto recuperará todas as modificacións que outras persoas fixeran desde que " -"recibiu as súas chaves. Non se seleccionou ningún servidor de chaves para a " -"publicación, así que as súas propias chaves non estarán dispoñíbeis para " -"outras persoas." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Servidores de cha_ves" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronizar" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versión deste aplicativo" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Confirmar a nova frase de paso" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Colaboracións:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Con_firmar a frase de paso:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Fran Diéguez ,2009, 2010.\n" -"Antón Méixome , 2009.\n" -"Mancomún - Centro de Referencia e Servizos de Software Libre , 2009.\n" -"Suso Baleato , 2009.\n" -"Ignacio Casal Quinteiro , 2007, 2008." +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Xestione os seus contrasinais e chaves de cifrado" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Páxina web do Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continuar" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Ficheiro" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Seleccione o tipo de elemento para crear:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Editar" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Fallou a importación" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importar" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Datos que importar:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Ver" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importar unha chave" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Axuda" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Todos os ficheiros de chaves" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Preferencias" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Texto arrastrado" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Texto do portapapeis" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nova" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Cambia as preferencias deste programa" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Pechar este programa" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Sobre esta aplicativo" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Novo…" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Contidos" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Crear unha chave ou elemento novo" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Mostrar a axuda do Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Engadir unha chave ou un elemento novo" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exportar a chave pública" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importar…" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Exportar chaves" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importar dun ficheiro" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Non foi posíbel obter os datos do servidor de chaves" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importar desde o portapapeis" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Chaves copiadas" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Por _anel de chaves" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Mostrar a barra lateral listando os aneis de chaves" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Mostrar _persoais" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Mostrar só as chaves, certificados e contrasinais personais" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Mostrar _confiábeis" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Mostrar só as chaves, certificados e contrasinais confiábeis" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "_Mostrar calquera" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Mostrar tódalas chaves, certificados ou contrasinais" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtro" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Obter chaves" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opcións de primeiro uso:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s é unha chave privada. Está seguro de que quere proceder?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Xerar unha nova chave para un mesmo: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importando chaves desde servidores de chaves" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importar as chaves existentes nun ficheiro:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Mostrar as propiedades" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Para poder comezar o proceso de cifrado precisará chaves." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "E_liminar" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Non foi posíbel bloquear" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Non foi posíbel desbloquear" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Eliminar os elementos seleccionados" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "B_loquear" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xportar…" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Desbloquear" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exportar a un ficheiro" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propiedades" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copiar ao portapapeis" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configurar a chave para _Secure Shell (SSH)..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importar as chaves seleccionadas no anel de chaves local" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Enviar a chave pública de Secure Shell (SSH) a outra máquina e activar os " +"inicios de sesión usando esa chave." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" -msgstr "Introduza a súa frase de paso do intérprete de ordes segura:" +msgstr "Introduza a súa frase de paso para Secure Shell:" #: ../ssh/seahorse-ssh-askpass.c:82 msgid "Old Key Passphrase" @@ -2266,211 +2370,231 @@ msgid "Enter the new passphrase again: %s" msgstr "Escriba a nova frase de paso nova de novo: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configurar a chave para o intérprete de ordes _seguro…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Enviar a chave pública de intérprete de ordes seguro (SSH) a outra máquina e " -"activar os inicios de sesión usando esa chave." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell (SSH)" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Chaves usadas para conectar de maneira segura a outros equipos" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "" -"Está seguro de que quere eliminar a chave de intérprete de ordes seguro " -"(SSH) «%s»?" +msgstr "Está seguro de que quere eliminar a chave de Secure Shell (SSH) «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "" -"Está seguro de que quere eliminar %d chaves de intérprete de ordes seguro " -"(SSH)?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Está seguro de que quere eliminar %d chave de Secure Shell (SSH)?" +msgstr[1] "Está seguro de que quere eliminar %d chaves de Secure Shell (SSH)?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Chave SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Chaves SSH segredas" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Chaves SSH públicas" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Non foi posíbel eliminar a chave" +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Non hai ningún ficheiro de chave privada dispoñíbel para esta chave." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" -msgstr "Chave de intérprete de ordes seguro (SSH)" +msgstr "Chave de Secure Shell (SSH)?" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "" "Úsase para acceder a outros equipos (por exemplo a través dun terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" -msgstr "Non foi posíbel xerar a chave do intérprete de ordes seguro (SSH)" +msgstr "Non foi posíbel xerar a chave de Secure Shell (SSH)?" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" -msgstr "Crear a chave do intérprete de ordes seguro (SSH)" +msgstr "Creando a chave de Secure Shell (SSH)?" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Nova chave de Secure Shell (SSH)?" #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Use o seu enderezo de correo electrónico e calquera outro recordatorio " -"que precise para saber para que é esta chave." +msgid "_Just Create Key" +msgstr "Crear _só a chave" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Crear e configurar" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"Unha chave de intérprete de ordes seguro (SSH) permítelle conectar de modo " -"seguro cos computadores en que confía usando o SSH, sen ter que introducir " -"un contrasinal diferente para cada un deles." +"Unha chave de Secure Shell (SSH) permítelle conectar de modo seguro cos " +"computadores." -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"Se xa hai un computador co que quere usar esta chave, pode configurar ese " -"computador agora para que recoñeza a súa chave. " +"O seu enderezo de correo electrónico ou un recordatorio para saber para " +"que é esta chave." -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Nova chave de intérprete de ordes seguro (SSH)" +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Crear e configurar" +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Se xa hai un computador co que quere usar esta chave, pode configurar ese " +"computador para que recoñeza a súa nova chave." -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "Crear _só a chave" +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Chave de Secure Shell (SSH) ilexíbel)" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "Descrición da cha_ve:" +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Chaves SSH persoal" -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(Chave de intérprete de ordes seguro (SSH) ilexíbel)" +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Chvae SSH" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Non foi posíbel renomear a chave." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Non foi posíbel modificar a autorización da chave." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Non foi posíbel modificar a frase de paso da chave." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmo:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identificador:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Localización:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nome:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Resistencia:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Úsase para conectarse a outros computadores." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Confianza" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"O propietario desta chave está _autorizado para conectarse a este computador" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Isto só se lle aplica á conta «%s»." +msgid "This only applies to the %s account." +msgstr "Isto só se lle aplica á conta «%s»." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xportar a chave completa" +msgid "Algorithm:" +msgstr "Algoritmo:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"O propietario desta chave está _autorizado para conectarse a este computador" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Resistencia:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Localización:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Úsase para conectarse a outros computadores." +msgid "E_xport Complete Key" +msgstr "E_xportar a chave completa" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "A orde SSH terminou inesperadamente." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "A orde SSH fallou." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Contrasinal de host remoto" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Introduza a frase de paso da chave" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" -msgstr "Frase de paso para a nova chave do intérprete de ordes seguro (SSH)" +msgstr "Frase de paso para a nova chave de Secure Shell (SSH)?" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importando a chave: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importando a chave. Introduza a frase de paso" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Chaves OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Non hai ningún ficheiro de chave privada dispoñíbel para esta chave." #: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." msgstr "" -"Non foi posíbel configurar as chaves de intérprete de ordes seguro (SSH) no " -"computador remoto." +"Non foi posíbel configurar as chaves de Secure Shell (SSH) no computador " +"remoto." #: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." -msgstr "Configurando as chaves de intérprete de ordes seguro (SSH)…" +msgstr "Configurando as chaves de Secure Shell (SSH)…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "exemplo: servidordeficheiros.exemplo.com:porto" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configurar computador para a conexión SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." msgstr "" -"Para usar a súa chave de intérprete de ordes seguro con outro computador que " -"use SSH, debería ter xa unha conta nese computador." +"Para usar a súa chave de Secure Shell (SSH) con outro computador que use " +"SSH, debería ter xa unha conta de usuario nese computador." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "exemplo: servidordeficheiros.exemplo.com:porto" #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" @@ -2484,11 +2608,247 @@ msgid "_Set Up" msgstr "_Configurar" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "Anel de chaves do inicio de sesión" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Denegouse o acceso ao anel de chaves" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "O daemon do anel de chaves de GNOME non se está executando" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "O depósito de chaves xa foi desbloqueado" + +#~ msgid "No such key ring exists" +#~ msgstr "Non existe ese anel de chaves" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Non foi posíbel comunicar co daemon do anel de chaves" + +#~ msgid "The item already exists" +#~ msgstr "O elemento xa existe" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Produciuse un erro interno ao acceder ao anel de chaves de GNOME" + +#~ msgid "Algorithms here" +#~ msgstr "Algoritmos aquí" + +#~ msgid "Show the properties of this place" +#~ msgstr "Mostrar as propiedades para este lugar" + +#~ msgid "P_laces" +#~ msgstr "_Lugares" + +#~ msgid "Show places sidebar" +#~ msgstr "Mostrar a barra lateral de lugares" + +#~ msgid "OpenSSH directory" +#~ msgstr "Cartafol de OpenSSH" + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Non foi posíbel eliminar o anel de chaves" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Bloquear o almacenamento de anel de chaves do contrasinal para que se " +#~ "requira un contrasinal mestre para desbloquealo." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Desbloquear o almacenamento do anel de chaves do contrasinal cun " +#~ "contrasinal mestre para que o seu uso estea dispoñíbel." + +#~ msgid "Properties of the keyring." +#~ msgstr "Propiedades do anel de chaves." + +#~ msgid "Delete the keyring." +#~ msgstr "Eliminar o anel de chaves." + +#~ msgid "Lock the password storage keyring." +#~ msgstr "Bloquear o anel de chaves de almacenamento de contrasinais." -#~ msgid "Secure Shell key" -#~ msgstr "Chave de intérprete de ordes seguro (SSH)" +#~ msgid "Unlock the password storage keyring." +#~ msgstr "Desbloquear o anel de chaves de almacenamento de contrasinais." + +#~ msgid "Properties of the password." +#~ msgstr "Propiedades do contrasinal." + +#~ msgid "_Sign Key..." +#~ msgstr "A_sinar unha chave…" + +#~ msgid "Sign public key" +#~ msgstr "Asinar chave pública" + +#~ msgid "Properties of the key." +#~ msgstr "Propiedades da chave." + +#~ msgid "Lock this token" +#~ msgstr "Bloquear este token" + +#~ msgid "Unlock this token" +#~ msgstr "Desbloquear este token" + +#~ msgid "Properties of the certificate." +#~ msgstr "Propiedades do certificado." + +#~ msgid "Deleting keyring" +#~ msgid_plural "Deleting keyrings" +#~ msgstr[0] "Eliminando o anel de chaves" +#~ msgstr[1] "Eliminando os aneis de chaves" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Eliminando o elemento" +#~ msgstr[1] "Eliminando os elementos" + +#~ msgid "Delete the password." +#~ msgstr "Eliminar o contrasinal." + +#, fuzzy +#~ msgid "To do Keyring" +#~ msgstr "Anel de chaves" + +#~ msgid "Archive files" +#~ msgstr "Arquivar ficheiros" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Xa existe un ficheiro con este nome.\n" +#~ "\n" +#~ "Quere substituílo por un novo?" + +#~ msgid "_Replace" +#~ msgstr "_Substituír" + +#~ msgid "Export public key" +#~ msgstr "Exportar a chave pública" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Non foi posíbel exportar a chave a «%s»" + +#~ msgid "Exporting keys" +#~ msgstr "Exportar chaves" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Non foi posíbel obter os datos do servidor de chaves" + +#~ msgid "Retrieving keys" +#~ msgstr "Obter chaves" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Está seguro de que desexa eliminar permanentemente %d chaves e " +#~ "identidades?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Non foi posíbel eliminar a chave pública" + +#~ msgid "Delete the key." +#~ msgstr "Eliminar a chave." + +#~ msgid "Export Complete Key" +#~ msgstr "Exportar a chave completa" + +#~ msgid "Couldn't export key." +#~ msgstr "Non foi posíbel exportar a chave." + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Está seguro de que quere eliminar o certificado «%s»?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Está seguro de que quere eliminar %d certificado?" +#~ msgstr[1] "Está seguro de que quere eliminar %d certificados?" + +#~ msgid "Deleting" +#~ msgstr "Eliminando" + +#~ msgid "Couldn't delete key" +#~ msgstr "Non foi posíbel eliminar a chave" + +#~ msgid "Passwords: %s" +#~ msgstr "Contrasinais: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Contrasinais: %s" + +#~ msgid "New PGP Key" +#~ msgstr "Nova chave PGP" + +#~ msgid "Create New ..." +#~ msgstr "Crear unha nova…" + +#~ msgid "Importing keys" +#~ msgstr "Importando chaves" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Non se recoñece o tipo de chave ou o formato de datos non é válido" + +#~ msgid "Importing Keys" +#~ msgstr "Importando chaves" + +#~ msgid "T_ypes" +#~ msgstr "T_ipos" + +#~ msgid "Show type column" +#~ msgstr "Mostrar a columna do tipo de chave" + +#~ msgid "_Expiry" +#~ msgstr "_Caducidade" + +#~ msgid "Show expiry column" +#~ msgstr "Mostrar a columna de caducidade" + +#~ msgid "_Trust" +#~ msgstr "_Confianza" + +#~ msgid "Show owner trust column" +#~ msgstr "Mostrar a columna de confianza do propietario" + +#~ msgid "_Validity" +#~ msgstr "_Validación" + +#~ msgid "Show validity column" +#~ msgstr "Mostrar a columna de validación" + +#~ msgid "Other _Keys" +#~ msgstr "Outras c_haves" + +#~ msgid "Validity" +#~ msgstr "Validez" + +#~ msgid "Expiration Date" +#~ msgstr "Data de caducidade" + +#~ msgid "_Expand All" +#~ msgstr "_Expandir todo" + +#~ msgid "Expand all listings" +#~ msgstr "Expandir todas as listas" + +#~ msgid "_Collapse All" +#~ msgstr "_Contraer todo" + +#~ msgid "Collapse all listings" +#~ msgstr "Contraer todas as listas" + +#~ msgid "Copied keys" +#~ msgstr "Chaves copiadas" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s é unha chave privada. Está seguro de que quere proceder?" + +#~ msgid "_Key Description:" +#~ msgstr "Descrición da cha_ve:" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "" @@ -2498,33 +2858,18 @@ #~ msgid "Web Password" #~ msgstr "Contrasinal web" -#~ msgid "Network Password" -#~ msgstr "Contrasinal de rede" - #~ msgid "Deleting items" #~ msgstr "Eliminando os elementos" -#~ msgid "Deleting keyrings" -#~ msgstr "Eliminando os aneis de chaves" - #~ msgid "Symmetric Key" #~ msgstr "Chave simétrica" -#~ msgid "Public Key" -#~ msgstr "Chave pública" - -#~ msgid "Private Key" -#~ msgstr "Chave privada" - #~ msgid "Credentials" #~ msgstr "Credenciais" #~ msgid "Identity" #~ msgstr "Identidade" -#~ msgid "Encryption Key Manager" -#~ msgstr "Xestor de chaves de cifrado" - #~ msgid "Invalid" #~ msgstr "Non é válido" @@ -2540,9 +2885,6 @@ #~ msgid "couldn't fork process" #~ msgstr "non foi posíbel facer o fork do proceso" -#~ msgid "couldn't create new process group" -#~ msgstr "non foi posíbel crear un grupo de proceso novo" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Daemon de cifrado (Seahorse)" @@ -2597,9 +2939,6 @@ #~ msgid "Bad Signature" #~ msgstr "A sinatura é incorrecta" -#~ msgid "Couldn't verify signature." -#~ msgstr "Non foi posíbel verificar a sinatura." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Asinante non válido ou non recoñecido: %s" @@ -2925,9 +3264,6 @@ #~ msgid "Loading Keys..." #~ msgstr "Cargando chaves…" -#~ msgid "Searching for keys..." -#~ msgstr "Buscando as chaves…" - #~ msgid "Uploading keys..." #~ msgstr "Enviando chaves…" diff -Nru seahorse-3.2.2/po/he.po seahorse-3.6.3/po/he.po --- seahorse-3.2.2/po/he.po 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/he.po 2012-10-15 05:54:41.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-30 13:37+0300\n" -"PO-Revision-Date: 2011-09-30 14:00+0200\n" +"POT-Creation-Date: 2012-10-05 11:17+0200\n" +"PO-Revision-Date: 2012-07-10 22:41+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -22,311 +22,298 @@ msgstr "הוספת קבוצת ססמאות" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "שם קבוצת המפתחות החדשה:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "נא לבחור שם עבור קבוצת המפתחות החדשה. תוצג בפניך שאלה לססמת השחרור." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "שם קבוצת המפתחות החדשה:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "שם המארח או כתובת השרת." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "לא ניתן להוסיף קבוצת מפתחות" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "קבוצת ססמאות חדשה" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "בשימוש לצורך אחסון ססמאות ליישומים ולרשת" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "ססמה חדשה..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "אחסון בטוח של ססמה או סוד." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "קבוצת ססמאות" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "ססמה מאוחסנת" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "לא ניתן להגדיר את קבוצת הססמאות כבררת המחדל" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "לא ניתן לשנות את ססמת קבוצת המפתחות" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "ה_גדרה כבררת מחדל" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "יישומים לרוב מאחסנים ססמאות חדשות בקבוצת המפתחות כבררת המחדל." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "ה_חלפת ססמה" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "שינוי ססמת השחרור של קבוצת מפתחות המאחסנת ססמאות" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "לא ניתן להוסיף פריט" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "הוספת ססמה" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_תיאור:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_קבוצת מפתחות:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_ססמה:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "הצגת _ססמה" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "לא ניתן למחוק את הפריט" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_קבוצת מפתחות:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "לא ניתן להוסיף קבוצת מפתחות" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "ססמאות" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "ססמאות, פרטי גישה וסודות אישיים בלבד הנמצאים באחסון" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "ססמת חשבון המסרים המידיים עבור" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "ססמה או סוד" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "ססמת רשת" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "הערה מאוחסנת" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "ססמת קבוצת הססמאות" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "ססמת מפתח ההצפנה" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "ססמת אחסון המפתחות" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "הססמה של Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "ססמת החשבונות המקוונים של Gnome" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "הססמה של Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "ססמת המסרים המידיים" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "סוג מנהל חיבורי הרשת" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "האם למחוק את הססמה '%s'?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "האם ברצונך למחוק ססמה אחת?" msgstr[1] "האם ברצונך למחוק %d ססמאות?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "הפריט במחיקה" -msgstr[1] "הפריטים במחיקה" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "גישה לשיתוף או משאב ברשת" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "גישה לאתר אינטרנט" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "לשחרור מפתח PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "לשחרור מפתח SSH" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "ססמה או נתוני כניסה שמורים" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "פרטי זיהוי ברשת" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "ססמה" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "לא ניתן לשנות ססמה." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "הססמה מתעדכנת" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "לא ניתן לקבוע תיאור" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "ססמה:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "פרטים טכניים:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "פרטים" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "מאפייני מפתח" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "מפתח" +msgid "Use:" +msgstr "שימוש:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "מאפייני מפתח" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "סוג:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "כניסה:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "שרת:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "כניסה:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "הצגת _ססמה" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "סוג:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "שימוש:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "ססמאות: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "ססמאות: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "קבוצת ססמאות" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "בשימוש לצורך אחסון ססמאות ליישומים ולרשת" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "ססמה מאוחסנת" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "אחסון בטוח של ססמה או סוד." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "לא ניתן לשחרר את קבוצת המפתחות" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "לא ניתן לנעול את קבוצת המפתחות" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "לא ניתן להגדיר את קבוצת הססמאות כבררת המחדל" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "לא ניתן לשנות את ססמת קבוצת המפתחות" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_נעילה" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "נעילת קבוצת מפתחות המאחסנת ססמאות כך שנדרשת ססמה ראשית כדי לשחרר אותה." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_שחרור" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"שחרור קבוצת מפתחות המאחסנת ססמאות על ידי ססמה ראשית כדי שתהיה זמינה לשימוש." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "ה_גדרה כבררת מחדל" +msgid "Password:" +msgstr "ססמה:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "יישומים לרוב מאחסנים ססמאות חדשות בקבוצת המפתחות כבררת המחדל." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "מפתח" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "ה_חלפת ססמה" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "פרטים טכניים:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "שינוי ססמת השחרור של קבוצת מפתחות המאחסנת ססמאות" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "פרטים" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "לא ניתן למחוק את קבוצת המפתחות" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "קבוצת מפתחות שמשתחררת אוטומטית עם הכניסה" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "קבוצת מפתחות המשמשת לאחסון ססמאות" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "האם למחוק את קבוצת הססמאות '%s'?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "קבוצת המפתחות נמחקת" -msgstr[1] "קבוצות המפתחות נמחקות" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "מובן לי שכל הפריטים יימחקו לצמיתות." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "מאפייני קבוצת המפתחות" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "שם:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "נוצרה:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "קבוצת מפתחות" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "מאפייני קבוצת המפתחות" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_שם:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "הפעולה בוטלה" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "הגישה לקבוצת המפתחות נדחתה" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "מנוע קבוצות המפתחות (gnome-keyring) אינו רץ" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "קבוצת המפתחות כבר שוחררה" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "לא קיימת קבוצת מפתחות כזאת" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "לא ניתן לתקשר עם מנוע קבוצות המפתחות" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "הפריט כבר קיים" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "שגיאה פנימית בגישה ל־gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "הצגת דגלים" @@ -583,266 +570,327 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "פריט זמני ראשוני" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "הוספת שרת מפתח" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "מארח:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "סוג שרת מפתח:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "מארח:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "השער דרכו לגשת לשרת." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "פריט זמני ראשוני" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "גרסת יישום זה" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "מילת צופן" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- הגדרות מערכת" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "ססמה:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "תורמים:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "אישור:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "ססמאות ומפתחות" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "כתובת שרת המפתחות לא תקפה." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"ירון שהרבני \n" +"יאיר הרשקוביץ \n" +"\n" +"פרויקט תרגום GNOME לעברית\n" +"‏http://gnome-il.berlios.de" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "לקבלת עזרה ניתן לפנות למנהל המערכת או אל מנהל מערכת שרת המפתחות." +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "דף הבית של מיזם Seahorse" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "כתובת" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "לא ניתן למחוק" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "מותאם אישית" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "לא ניתן לייצא מפתחות" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "ללא: לא לפרסם מפתחות" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "לא ניתן לייצא נתונים" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "קבלת מפתחות מ_שרתי מפתחות אוטומטית" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_קובץ:" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "ס_נכרון מפתחות שהשתנו עם שרתי מפתח אוטומטית" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "יי_צוא..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "שרתי מפתח" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ייצוא לקובץ" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "העדפות" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "ע_ריכה" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_חיפוש מפתחות בעזרת:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "העתקה ללוח הגזירים" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_פרסום מפתחות ל:" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "מ_חיקה" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "מתקבלים נתונים" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "מחיקת הפריטים שנבחרו" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "מיוצאים נתונים" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "הצגת מאפיינים הפריט הזה" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "הצגת מאפייני קבוצת מפתחות זאת" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "מיובאים נתונים" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "ה_עדפות" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "נשלחים נתונים" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "שינוי העדפות תכנית זאת" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "לא זמין" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_תצוגה" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "ע_זרה" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "מידע מפתח" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "על אודות תכנית זו" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "מפתחות מרובים" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_תכנים" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "כל קובצי המפתחות" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "הצגת עזרה עבור Seahorse" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "כל הקבצים" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "ייצוא" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "נא להזין את ססמת ה־PIN עבור: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "ססמה:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "קבצי ארכיון" +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "אישור:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "כתובת שרת המפתחות לא תקפה." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"כבר קיים קובץ בשם זה.\n" -"\n" -"האם ברצונך להחליף אותו בקובץ חדש?" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "לקבלת עזרה ניתן לפנות למנהל המערכת או אל מנהל מערכת שרת המפתחות." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "כתובת" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "מותאם אישית" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "ללא: לא לפרסם מפתחות" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "העדפות" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_חיפוש מפתחות בעזרת:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_פרסום מפתחות ל:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "קבלת מפתחות מ_שרתי מפתחות אוטומטית" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "ס_נכרון מפתחות שהשתנו עם שרתי מפתח אוטומטית" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "שרתי מפתח" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "ה_חלפה" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "לא ידוע" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "לעולם לא" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "גבולי" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "מלא" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "אולטימטיבי" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "כבוי" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "בוטל" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "לא ניתן להציג עזרה: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "תאריך תפוגה:" +msgid "Never E_xpires" +msgstr "לעולם לא _פג" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "יצירת תת־מפתח חדש" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "האם המפתח לעולם לא פג" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_סוג מפתח:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_אורך מפתח:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_סוג מפתח:" +msgid "Expiration Date:" +msgstr "תאריך תפוגה:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "אורך המפתח" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "לעולם לא _פג" +msgid "Generate a new subkey" +msgstr "יצירת תת־מפתח חדש" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "הוספת זיהוי משתמש" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "יצירת מזהה משתמש חדש" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "שם _מלא:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "הע_רת מפתח:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "חייבת להיות מורכבת מ־5 ספרות לכול הפחות" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "כתובת דוא״ל אפשרית" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "הערה לא מחייבת לתיאור המפתח" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "כתובת דוא״ל אפשרית" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "שם _מלא:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "כתובת דוא״ל:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "הע_רת מפתח:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "יצירת מזהה משתמש חדש" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_שינוי" +msgid "_Never expires" +msgstr "_לעולם לא פג" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "שלילת מפתח" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_לעולם לא פג" +msgid "C_hange" +msgstr "_שינוי" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -853,7 +901,7 @@ msgid "Add subkey to %s" msgstr "הוספת תת־מפתח ל־%s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "‏DSA (חתימה בלבד)" @@ -861,7 +909,7 @@ msgid "ElGamal (encrypt only)" msgstr "אל־גמאל (הצפנה בלבד)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "‏RSA (חתימה בלבד)" @@ -882,6 +930,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "הפענוח נכשל. כנראה שמפתח הפענוח לא קיים." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "הפעולה בוטלה" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "תאריך התפוגה שגוי" @@ -899,46 +952,146 @@ msgid "Expiry: %s" msgstr "תפוגה: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "מפתחות מרובים" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "מידע מפתח" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "מפתחות PGP מאובטחים היטב" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "מפתחות PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "מפתח PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "משמש להצפנת דוא״ל וקבצים" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:91 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "‏DSA אל־גמאל" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "לא ניתן לייצר מפתח PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "מילת צפון עבור מפתח ה־PGP החדש" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "יש להזין את מילת הצופן עבור המפתח החדש שלך פעמיים." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"בעת יצירת מפתח חדש עלינו לייצר הרבה מידע אקראי\n" +"ולכן אנו זקוקים לעזרתך. כדאי מאוד לבצע כל מיני\n" +"פעולות כגון הקלדה על המקלדת, הזזת העכבר, שימוש\n" +"ביישומים. פעולות אלו מייצרות למערכת את הנתונים\n" +"האקראיים להם היא זקוקה." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:459 msgid "Generating key" msgstr "נוצר מפתח" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "האם למחוק את %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "האם אכן ברצונך למחוק מפתח אחד לצמיתות?" +msgstr[1] "האם אכן ברצונך למחוק %d מפתחות לצמיתות?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "ססמה שגויה" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "זוהי הפעם השלישית שהוקלדה ססמה שגויה. נא לנסות שוב." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "מילת הצופן שגויה." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "נא להזין מילת צופן חדשה עבור '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "נא להזין מילת צופן עבור '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "נא להזין מילת צופן חדשה" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "נא להזין מילת צופן" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "מילת צופן" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "מפתח אחד נטען" +msgstr[1] "%d מפתחות נטענו" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"נתוני המפתח שגויים (חסרים UID). שגיאה זאת נגרמה עקב מחשב ששעונו ממהר או " +"חתימה עצמית חסרה." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "מפתחות GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: תיקיית בררת המחדל של קבוצת המפתחות" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -973,27 +1126,31 @@ msgid "All JPEG files" msgstr "כל קובצי ה־JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "כל הקבצים" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "נא לבחור תמונה להוספה למפתח" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "לא ניתן להכין תמונה" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "לא ניתן להוסיף תמונה" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "לא ניתן לטעון את הקובץ. כנראה שהוא בתצורה שגויה" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "האם להסיר את התמונה הנוכחית מהמפתח?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "לא ניתן למחוק תמונה" @@ -1051,7 +1208,11 @@ msgid "Couldn't add revoker" msgstr "לא ניתן להוסיף מורשה שלילה" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "מובן לי שהמפתח הסודי יימחק לצמיתות." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1066,516 +1227,576 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "אין מפתחות שמתאימים להצפנה" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "אין לך מפתחות PGP שניתן להשתמש בם כדי לציין את אמינות מפתח זה בעיניך." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "מילת הצופן שגויה." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "אל־גמאל" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "נא להזין מילת צופן חדשה עבור '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "החיפוש לא היה מספיק מדויק. השרת '%s' מצא יותר מדי מפתחות." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "נא להזין מילת צופן עבור '%s'" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "נא להזין מילת צופן חדשה" +msgid "Couldn't communicate with server '%s': %s" +msgstr "לא ניתן לתקשר עם השרת '%s': ‏%s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "נא להזין מילת צופן" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "שרת מפתחות HTTP" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "לא ניתן לייבא מפתחות" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "מיובאים מפתחות משרת מפתחות" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_מרוחק" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "סגירת חלון זה" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_חיפוש מפתחות מרוחקים..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "חיפוש מפתחות בשרת מפתחות" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "יי_בוא" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "ייבוא המפתחות הנבחרים לקבוצת מפתחות מקומית" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "מפתחות מרוחקים" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "מפתח אחד נטען" -msgstr[1] "%d מפתחות נטענו" +msgid "Remote Keys Containing '%s'" +msgstr "מפתחות מרוחקים שמכילים '%s'" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "החיפוש אחר מפתחות נכשל." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "חיפוש מפתחות מרוחקים" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"נתוני המפתח שגויים (חסרים UID). שגיאה זאת נגרמה עקב מחשב ששעונו ממהר או " -"חתימה עצמית חסרה." +"פעולה זו תמצא מפתחות של אחרים באינטרנט. ניתן לייבא מפתחות אלה לקבוצת מפתחות " +"מקומית." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "אל־גמאל" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_חיפוש מפתחות שמכילים: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "שרת מפתחות HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "שרתי מפתח:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "מפתחות משותפים בסביבתי:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "איפה לחפש:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_חיפוש:" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "לא ניתן לפרסם מפתחות לשרת" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "החיפוש לא היה מספיק מדויק. השרת '%s' מצא יותר מדי מפתחות." +msgid "Couldn't retrieve keys from server: %s" +msgstr "לא ניתן לקבל מפתחות משרת: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "לא ניתן לתקשר עם השרת '%s': ‏%s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "מפתח אחד נבחר לסנכרון" +msgstr[1] "%d מפתחות נבחרו לסנכרון" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "מפתחות מסתנכרנים..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "סנכרון מפתחות" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"פעולה זו תפרסם את המפתחות בקבוצת המפתחות שלך כך שיהיו זמינים לשימושם של " +"אחרים. שינויים שאחרים ביצעו יתקבלו אליך מאחר שקיבלת את מפתחותיהם." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"פעולה זו תקבל כל שינויים שאחרים ביצעו מאז שקיבלת את מפתחותיהם. לא נבחר שרת " +"מפתחות לפרסום כך שמפתחותיך לא יהיו זמינים לאחרים." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_שרתי מפתח" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_סנכרון" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "לא ניתן לתקשר עם '%s': ‏%s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "מתחבר אל: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "לא ניתן לפענח את הכתובת: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "כתובת השרת מפוענחת: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "שרת מפתחות LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_חתימה על המפתח..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "חתימה על מפתח ציבורי" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "האם למחוק את %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "האם ברצונך למחוק %d מפתחות וזהויות לצמיתות?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "האם ברצונך למחוק %d מפתחות לצמיתות?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "האם ברצונך למחוק %d זהויות?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_סנכרון ופרסם מפתחות..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "לא ניתן למחוק את מזהה המשתמש" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "פרסום ו/או סנכרון מפתחותיך עם אלו באופן מקוון." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "לא ניתן למחוק מפתח פרטי" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "לא ניתן למחוק מפתח ציבורי" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "מפתחות PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "מפתחות PGP מיועדים להצפנת דוא״ל או קבצים" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_אפשרויות מפתח מתקדמות" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_צור" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "מפתח PGP מאפשר לך להצפין דוא״ל או קבצים לאנשים אחרים." +msgid "Generate a new key" +msgstr "יצר מפתח חדש" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "אלגוריתמים כאן" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "מפתח PGP מאפשר לך להצפין דוא״ל או קבצים לאנשים אחרים." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_צור" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_הערה:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "תאריך _תפוגה:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_לעולם לא פג" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_סוג הצפנה:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "יצר מפתח חדש" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_חוזק מפתח (סיביות):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_לעולם לא פג" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "מפתח PGP חדש" +msgid "E_xpiration Date:" +msgstr "תאריך _תפוגה:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_הערה:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_אפשרויות מפתח מתקדמות" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "פג תוקף" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "מפתח PGP אישי" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "מפתח PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "לא ניתן לשנות את מזהה המשתמש העיקרי" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "האם ברצונך למחוק את מזהה המשתמש '%s' לצמיתות?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "לא ניתן למחוק את מזהה המשתמש" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[לא ידוע]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "שם/דוא״ל" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "זיהוי חתימה" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "לא ניתן לשנות את התמונה הראשית" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(לא ידוע)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "תוקף מפתח זה פג ב: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "שם" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "אם ברצונך למחוק את תת המפתח %d של %s לצמיתות?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "לא ניתן למחוק תת־מפתח" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "לא ניתן לשנות את המהימנות" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "לא ניתן לייצא מפתח ל־\"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "ייצוא המפתח כולו" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "לא ניתן לייצא את המפתח." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "לא ניתן לייצא מפתח" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "לעולם לא" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "זיהוי" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "סוג" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "נוצר" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "תפוגה" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "מצב" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "חוזק" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "פג תוקף" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "טוב" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "זיהוי מפתח" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "פעולות" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "הערה:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "תאריכים" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "דוא״ל:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "טביעת אצבע:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "זיהוי מפתח:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "לעולם לא" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "שמות מפתח וחתימות" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "מפתח זה נשלל" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "תמונה " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "הבעלים של מפתח זה שלל את המפתח. לא ניתן עוד להשתמש בו." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "פרטים טכניים" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "פג תוקף מפתח זה" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "מפתח זה נשלל" +msgid "Add a photo to this key" +msgstr "הוספת תמונה למפתח זה" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "פג תוקף מפתח זה" +msgid "Remove this photo from this key" +msgstr "הסרת התמונה ממפתח זה" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "סוג:" +msgid "Make this photo the primary photo" +msgstr "הפיכת תמונה זו לתמונה הראשית" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "שימוש:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "חזרה אל התמונה הקודמת" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_תת מפתחות" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "מעבר אל התמונה הבאה" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "הוספה" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "תמונה " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "הוספת תמונה למפתח זה" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "_שינוי מילת הצופן" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "זיהוי מפתח:" + +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "שם:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "פענוח קבצים והודעות שנשלחו אליך." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "דוא״ל:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "מחיקה" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "הערה:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "תפוגה" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "שימוש:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "תפוגה:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "סוג:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "ייצוא" +msgid "Decrypt files and email sent to you." +msgstr "פענוח קבצים והודעות שנשלחו אליך." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "מפתח PGP פרטי" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "מעבר אל התמונה הבאה" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "_שינוי מילת הצופן" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "חזרה אל התמונה הקודמת" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "בעלים" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "זיהוי מפתח:" +msgid "Key Names and Signatures" +msgstr "שמות מפתח וחתימות" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "ראשי" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "הפיכת תמונה זו לתמונה הראשית" +msgid "Sign" +msgstr "חתימה" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "שמות וחתימות" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "מחיקה" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "לעולם לא" +msgid "_Add Name" +msgstr "הוספת _שם" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "דריסת _מהימנות הבעלים:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "בעלים" +msgid "Revoke" +msgstr "שלילה" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "ראשי" +msgid "Names and Signatures" +msgstr "שמות וחתימות" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "מפתח PGP פרטי" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "זיהוי מפתח:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "הסרת התמונה ממפתח זה" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "שלילה" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "חוזק:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "חתימה" +msgid "Technical Details" +msgstr "פרטים טכניים" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "חוזק:" +msgid "Fingerprint" +msgstr "טביעת אצבע:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "הבעלים של מפתח זה שלל את המפתח. לא ניתן עוד להשתמש בו." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "תפוגה:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "הוספת _שם" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "תאריכים" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "דריסת _מהימנות הבעלים:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "יי_צוא מפתח שלם:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "שם:" +msgid "Actions" +msgstr "פעולות" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "תאריכים:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "הוספה" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "תפוגה" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_תת מפתחות" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "באופן גבולי" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "טביעת אצבע:" +msgid "Fully" +msgstr "באופן מלא" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "ציון מהימנות:" +msgid "Ultimately" +msgstr "באופן אולטימטיבי" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "המהימנות שלך במפתח זה" +msgid "Encrypt files and email to the key's owner" +msgstr "הצפנת קבצים ושליחתם בדוא״ל אל בעלי המפתח" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "מפתח PGP ציבורי" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_שמות אחרים:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_אנשים שחתמו על מפתח זה:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "הצפן קבצים והודעה אל בעלי המפתח" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "המהימנות שלך במפתח זה" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "באופן מלא" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "המהימנות שלך מצוינת בלשונית ”פרטים“." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "אני בוטח בחתימות מ-'%s' במפתחות אחרים" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1583,7 +1804,11 @@ msgstr "" "אם ישנה סבירות שהבעלים של מפתח זה הם '%s', ניתן לחתום על מפתח זה:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_חתימה על מפתח זה" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1591,43 +1816,38 @@ "אם קיים בעיניך חשד ש־'%s' אינו עוד הבעלים של מפתח זה, ניתן לשלול את " "החתימה שלך:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "באופן גבולי" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "מפתח PGP ציבורי" +msgid "_Revoke Signature" +msgstr "_ביטול החתימה" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_אנשים שחתמו על מפתח זה:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "יש להציג אך ו_רק חתימות של אנשים מהימנים בעיני" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "מהימן" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "באופן אולטימטיבי" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "הבעלים _מהימנים:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "המהימנות שלך מצוינת בלשונית ”פרטים“." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "טביעת אצבע:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "יש להציג אך ו_רק חתימות של אנשים מהימנים בעיני" +msgid "Dates:" +msgstr "תאריכים:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_ביטול החתימה" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "ציון מהימנות:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_חתימה על מפתח זה" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "הבעלים _מהימנים:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1635,52 +1855,59 @@ msgstr "תת־מפתח %d של %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "תיאור לא מחייב של השלילה" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "ש_לילה" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "הסיבה לשלילת המפתח" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_סיבה:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "תיאור לא מחייב של השלילה" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "ש_לילה" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "אין לך מפתחות PGP אישיים אשר יכולים לשמש לחתימה על מסמך או הודעה." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_חתימה על הודעה עם מפתח:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "מהי מידת ההקפדה שננקטה במהלך בדיקת מפתח זה?" +msgid "Sign Key" +msgstr "חתימה על המפתח" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "כיצד אחרים יראו חתימה זו:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "חתימה תציין את העובדה שמפתח זה מהימן ושהוא שייך ל־:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "חתימה על המפתח בשם:" +msgid "Key Name" +msgstr "שם מפתח" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"לעתים: משמעות הדבר היא שבוצעו אימותים מדי פעם ופעם כדי לוודא שהמפתח בבעלותו " -"של הטוען לבעלותו. לדוגמה, ביכולתך להקריא את טביעת המפתח לבעלים בטלפון. " +msgid "How carefully have you checked this key?" +msgstr "מהי מידת ההקפדה שננקטה במהלך בדיקת מפתח זה?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "שם מפתח" +msgid "_Not at all" +msgstr "ב_כלל לא" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "ל_עתים" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_בזהירות רבה" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1688,24 +1915,21 @@ "כלל לא: משמעות הדבר היא שסביר להניח כי המפתח שייך לאדם הטוען לבעלותו, אך " "הדעה לא ניתנת לאימות או שלא נבדקה." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"לעתים: משמעות הדבר היא שבוצעו אימותים מדי פעם ופעם כדי לוודא שהמפתח בבעלותו " +"של הטוען לבעלותו. לדוגמה, ביכולתך להקריא את טביעת המפתח לבעלים בטלפון. " + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." msgstr "בזהירות רבה: יש לבחור זאת רק אם ידוע לך בבטחה שמפתח זה מקורי." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "חתימה תציין את העובדה שמפתח זה מהימן ושהוא שייך ל־:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "אוכל ל_שלול חתימה זו במועד מאוחר יותר." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "חתימה על המפתח" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1716,479 +1940,353 @@ "במפתח נכון. כדאי לך גם להשתמש בדוא״ל כדי לאמת שכתובת הדוא״ל שייכת לבעלים." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "ל_עתים" +msgid "How others will see this signature:" +msgstr "כיצד אחרים יראו חתימה זו:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "ב_כלל לא" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_אחרים לא יכולים לראות את החתימה" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "אוכל ל_שלול חתימה זו במועד מאוחר יותר." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_חתימה" +msgid "Sign key as:" +msgstr "חתימה על המפתח בשם:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_חותם:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_בזהירות רבה" +msgid "_Sign" +msgstr "_חתימה" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_חתימה על הודעה עם מפתח:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "מיוצאים נתונים" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "מתקבלים נתונים" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "מיובאים נתונים" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "נשלחים נתונים" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "לא זמין" + +#: ../pkcs11/seahorse-certificate.c:434 +msgid "Personal certificate and key" +msgstr "אישור ומפתח אישיים" + +#: ../pkcs11/seahorse-certificate.c:437 +msgid "Personal certificate" +msgstr "אישור אישי" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:439 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "אישור" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "אישורים (בקידוד DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "אישורים" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "אישורי X.509 וכאלה שקשורים אליהם" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "האם אכן ברצונך למחוק אישור אחד?" +msgstr[1] "האם אכן ברצונך למחוק %d אישורים?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:114 +msgid "Couldn't generate private key" +msgstr "לא ניתן ליצור מפתח פרטי" + +#: ../pkcs11/seahorse-pkcs11-generate.c:413 +#: ../pkcs11/seahorse-pkcs11-request.c:255 +msgid "Create" +msgstr "יצירה" + +#: ../pkcs11/seahorse-pkcs11-generate.c:506 +#: ../pkcs11/seahorse-private-key.c:178 +msgid "Private key" +msgstr "מפתח פרטיֹ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +msgid "Used to request a certificate" +msgstr "נעשה שימוש לצורך בקשת תעודה" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "יצירת מפתח פרטי חדש" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "תווית:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "אוחסן תחת:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "מובן לי כדי מפתח זה יימחק לצמיתות." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "ללא שם" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "ייצוא האישור נכשל" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "לא ניתן למחוק" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "האם ברצונך למחוק את האישור '%s'?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "האם ברצונך למחוק אישור אחד?" -msgstr[1] "האם ברצונך למחוק %d אישורים?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "בהליכי מחיקה" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "יי_צוא" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "ייצוא האישור" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "מחיקת אישור או מפתח זה" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "בקשת _אישור" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "יצירת בקשת אישור עבור מפתח זה" + +#: ../pkcs11/seahorse-pkcs11-request.c:103 +msgid "Couldn't save certificate request" +msgstr "לא ניתן לשמור את בקשת האישור" + +#: ../pkcs11/seahorse-pkcs11-request.c:126 +msgid "Save certificate request" +msgstr "שמירת בקשת האישור" + +#: ../pkcs11/seahorse-pkcs11-request.c:137 +msgid "Certificate request" +msgstr "בקשת אישור" + +#: ../pkcs11/seahorse-pkcs11-request.c:145 +msgid "PEM encoded request" +msgstr "בקשת PEM מקודדת" + +#: ../pkcs11/seahorse-pkcs11-request.c:193 +msgid "Couldn't create certificate request" +msgstr "לא ניתן ליצור בקשת אישור" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "יצירת קובץ בקשת אישור." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "השם הנפוץ (CN) שהוצב בבקשת האישור." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "שם (CN):" + +#: ../pkcs11/seahorse-private-key.c:131 +msgid "Unnamed private key" +msgstr "מפתח פרטי ללא שם" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "שינוי מילת הצופן" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_אימות מילת הצופן:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "מילת צופן _חדשה:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "אימות מילת הצופן החדשה" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "מילת צופן _חדשה:" +msgid "Con_firm Passphrase:" +msgstr "_אימות מילת הצופן:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "ניהול הססמאות ומפתחות ההצפנה שלך" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "ססמאות ומפתחות" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "המשך" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "נא לבחור את סוג המפתח שברצונך ליצור:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "ה_משך" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "יצירת חדש..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "מפתח אחד נבחר" -msgstr[1] "%d מפתחות נבחרו" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "לא ניתן לייבא מפתחות" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "מפתחות מיובאים" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "מייבא מפתחות" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "ייבוא מפתח" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "סוג מפתח לא מזוהה, או תצורת מידע שגויה" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "מפתחות מיובאים" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_מרוחק" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "סגירת תכנית זו" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_חדש..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "יצירת מפתח או פריט חדשים" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "יי_בוא" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "ייבוא מקובץ" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "ייבוא מלוח הגזירים" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_חיפוש מפתחות מרוחקים..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "חיפוש מפתחות בשרת מפתחות" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_סנכרון ופרסם מפתחות..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "פרסום ו/או סנכרון מפתחותיך עם אלו באופן מקוון." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_סוגים" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "הצגת עמודת הסוג" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_תפוגה" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "הצגת עמודת התפוגה" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_מהימנות" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "הצגת מהימנות הבעלים" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_תוקף" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "הצגת עמודת התוקף" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "מסנן:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "אפשרויות פעם ראשונה:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "יצירת מפתח חדש משלך: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "ייבוא מפתחות קיימים מקובץ:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "ה_מפתחות האישיים שלי" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "מפתחות _אחרים" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "על מנת להתחיל בהצפנה יש צורך במפתחות." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "יי_בוא" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_ססמאות" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "לא ניתן לייצא מפתחות" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "תוקף" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "תאריך תפוגה" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "סגירת חלון זה" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "ה_רחבת הכול" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "הרחבת כל הרשומות" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "צמצום ה_כול" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "צמצום כל הרשומות" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "מפתחות מרוחקים" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "מפתחות מרוחקים שמכילים '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "שרתי מפתח:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "מפתחות משותפים בסביבתי:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "חיפוש מפתחות מרוחקים" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"פעולה זו תמצא מפתחות של אחרים באינטרנט. ניתן לייבא מפתחות אלה לקבוצת מפתחות " -"מקומית." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "איפה לחפש:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_חיפוש:" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_חיפוש מפתחות שמכילים: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "לא ניתן לפרסם מפתחות לשרת" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "לא ניתן לקבל מפתחות משרת: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "מפתח אחד נבחר לסנכרון" -msgstr[1] "%d מפתחות נבחרו לסנכרון" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "מפתחות מסתנכרנים..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "סנכרון מפתחות" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"פעולה זו תפרסם את המפתחות בקבוצת המפתחות שלך כך שיהיו זמינים לשימושם של " -"אחרים. שינויים שאחרים ביצעו יתקבלו אליך מאחר שקיבלת את מפתחותיהם." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"פעולה זו תקבל כל שינויים שאחרים ביצעו מאז שקיבלת את מפתחותיהם. לא נבחר שרת " -"מפתחות לפרסום כך שמפתחותיך לא יהיו זמינים לאחרים." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_שרתי מפתח" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_סנכרון" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "גרסת יישום זה" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "תורמים:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"ירון שהרבני \n" -"יאיר הרשקוביץ \n" -"\n" -"פרויקט תרגום GNOME לעברית\n" -"‏http://gnome-il.berlios.de" - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "דף הבית של מיזם Seahorse" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_קובץ:" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "ע_ריכה" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "הייבוא נכשל" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "ייבוא" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "נתונים לייבוא:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_תצוגה" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "ייבוא מפתח" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "ע_זרה" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "כל קובצי המפתחות" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "ה_עדפות" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "טקסט שהושלך" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "טקסט מלוח הגזירים" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "חדש" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "שינוי העדפות תכנית זאת" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "סגירת תכנית זו" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "על אודות תכנית זו" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_חדש..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_תכנים" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "יצירת מפתח או פריט חדשים" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "הצגת עזרה עבור Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "הוספת מפתח או פריט חדשים" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "ייצוא מפתח ציבורי" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "יי_בוא" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "מפתחות מיוצאים" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "ייבוא מקובץ" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "לא ניתן לקבל מידע משרת המפתחות" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "ייבוא מלוח הגזירים" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "מפתחות מועתקים" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "לפי _קבוצת מפתחות" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "הצגת סרגל צד עם קבוצות המפתחות" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "הצגת _אישי" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "הצגת המפתחות, האישורים והססמאות האישיים בלבד" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "הצגת _מהימנים" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "הצגת המפתחות, האישורים והססמאות המהימנים בלבד" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "הצגת _כלשהו" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "הצגת כל המפתחות, האישורים והססמאות" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "מסנן" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "מתקבלים מפתחות" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "אפשרויות פעם ראשונה:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "‏%s הוא מפתח פרטי. להמשיך?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "יצירת מפתח חדש משלך: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "מיובאים מפתחות משרת מפתחות" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "ייבוא מפתחות קיימים מקובץ:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "הצגת מאפיינים" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "על מנת להתחיל בהצפנה יש צורך במפתחות." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "מ_חיקה" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "לא ניתן לנעול" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "לא ניתן לשחרר" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "מחיקת הפריטים שנבחרו" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_נעילה" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "יי_צוא..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_שחרור" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "ייצוא לקובץ" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "מ_אפיינים" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "העתקה ללוח הגזירים" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "הגדרת מפתח עבור _SSH..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "ייבוא המפתחות הנבחרים לקבוצת מפתחות מקומית" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "שליחת מפתח SSH ציבורי למכונה אחרת ולאפשר התחברות בעזרת מפתח זה." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2217,173 +2315,197 @@ msgid "Enter the new passphrase again: %s" msgstr "נא להזין את מילת הצופן החדשה שוב: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "הגדרת מפתח עבור _SSH..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "שליחת מפתח SSH ציבורי למכונה אחרת ולאפשר התחברות בעזרת מפתח זה." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "מעטפת מאובטחת" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "מפתחות המשמשים לחיבור בצורה מאובטחת למחשבים אחרים" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "האם למחוק את מפתח ה־SSH‏ '%s'?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "האם למחוק %d מפתחות SSH?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "האם למחוק מפתח SSH זה?" +msgstr[1] "האם למחוק %d מפתחות SSH?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "מפתח SSH" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "לא ניתן למחוק מפתח" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "מפתחות SSH סודיים" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "מפתחות SSH ציבוריים" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "אין קובץ מפתח ציבורי הזמין לטובת מפתח זה." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "מפתח SSH" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "משמש לגישה למחשבים אחרים (לדוגמה: דרך מסוף)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "לא ניתן ליצור מפתח SSH" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "נוצר מפתח SSH" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"ניתן להשתמש בכתובת הדוא״ל שלך, ובכל תזכורת אחרת על מנת לדעת למה משמש מפתח זה." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"מפתח Secure Shell‏ (SSH) מאפשר לך להתחבר באופן בטוח למחשבים מהימנים באמצעות " -"SSH ללא הזנת ססמה נפרדת לכול אחד מהם." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"אם כבר ישנו מחשב מולו ברצונך להשתמש במפתח זה, ניתן להגדיר שמחשב זה יזהה את " -"המפתח שלך כעת." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "מפתח SSH חדש" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "יצירת מפתח _בלבד" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "י_צירה והגדרה" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "יצירת מפתח _בלבד" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "מפתח Secure Shell‏ (SSH) מאפשר לך להתחבר באופן בטוח למחשבים אחרים." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "כתובת הדוא״ל שלך או תזכורת למה מיועד המפתח הזה." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_תיאור מפתח" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"אם ישנו מחשב מולו ברצונך להשתמש במפתח זה, ניתן להגדיר שמחשב זה יזהה את המפתח " +"החדש שלך." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(מפתח SSH לא קריא)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "מפתח SSH אישי" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "מפתח SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "לא ניתן לשנות שם מפתח" -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "לא ניתן לשנות את אימות המפתח." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "לא ניתן לשנות את מילת הצופן עבור המפתח." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "אלגוריתם:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "מזהה:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "מיקום:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "שם:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "חוזק:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "משמש להתחברות למחשבים אחרים." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "מהימנות" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "הבעלים של מפתח זה _מורשה להתחבר למחשב זה" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." +msgid "This only applies to the %s account." msgstr "נתונים אלו יהיו בתוקף רק עבור החשבון '%s'." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "יי_צוא מפתח שלם" +msgid "Algorithm:" +msgstr "אלגוריתם:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "הבעלים של מפתח זה _מורשה להתחבר למחשב זה" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "חוזק:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "מיקום:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "משמש להתחברות למחשבים אחרים." +msgid "E_xport Complete Key" +msgstr "יי_צוא מפתח שלם" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "פיקוד ה־SSH הסתיים באופן בלתי צפוי." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "פיקוד ה־SSH נכשל." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "ססמת המארח המרוחק" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "נא להזין מילת צופן למפתח" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "מילת צופן עבור מפתח Secure Shell חדש" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "מפתח מיובא: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "המפתח מיובא. נא להזין מילת צופן" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "מפתחות OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "אין קובץ מפתח פרטי הזמין למפתח זה." @@ -2396,14 +2518,10 @@ msgstr "מפתחות SSH מוגדרים..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "לדוגמה: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "הגדרת המחשב לחיבור SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2411,6 +2529,10 @@ "כדי להשתמש במפתח ה־Secure Shell שלך מול מחשב אחר המשתמש ב־SSH, כבר צריך " "להיות לך חשבון כניסה למחשב זה." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "לדוגמה: fileserver.example.com:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "שם _מחשב:" @@ -2423,15 +2545,256 @@ msgid "_Set Up" msgstr "ה_גדרה" +#~ msgid "Login keyring" +#~ msgstr "קבוצת מפתחות הכניסה" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "הגישה לקבוצת המפתחות נדחתה" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "מנוע קבוצות המפתחות (gnome-keyring) אינו רץ" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "קבוצת המפתחות כבר שוחררה" + +#~ msgid "No such key ring exists" +#~ msgstr "לא קיימת קבוצת מפתחות כזאת" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "לא ניתן לתקשר עם מנוע קבוצות המפתחות" + +#~ msgid "The item already exists" +#~ msgstr "הפריט כבר קיים" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "שגיאה פנימית בגישה ל־gnome-keyring" + +#~ msgid "Algorithms here" +#~ msgstr "אלגוריתמים כאן" + +#~ msgid "Show the properties of this place" +#~ msgstr "הצגת מאפייני המיקום הזה" + +#~ msgid "P_laces" +#~ msgstr "מי_קומים" + +#~ msgid "Show places sidebar" +#~ msgstr "הצגת סרגל המיקומים הצדי" + +#~ msgid "OpenSSH directory" +#~ msgstr "תיקיית ה־OpenSSH" + +#~ msgid "Couldn't unlock keyring" +#~ msgstr "לא ניתן לשחרר את קבוצת המפתחות" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "לא ניתן לנעול את קבוצת המפתחות" + +#~ msgid "Couldn't delete keyring" +#~ msgstr "לא ניתן למחוק את קבוצת המפתחות" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "נעילת קבוצת מפתחות המאחסנת ססמאות כך שנדרשת ססמה ראשית כדי לשחרר אותה." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "שחרור קבוצת מפתחות המאחסנת ססמאות על ידי ססמה ראשית כדי שתהיה זמינה " +#~ "לשימוש." + +#~ msgid "Properties of the keyring." +#~ msgstr "מאפייני קבוצת המפתחות." + +#~ msgid "Delete the keyring." +#~ msgstr "מחיקת קבוצת המפתחות." + +#~ msgid "Lock the password storage keyring." +#~ msgstr "נעילת קבוצת מפתחות אחסון הססמאות." + +#~ msgid "Unlock the password storage keyring." +#~ msgstr "שחרור קבוצת מפתחות אחסון הססמאות." + +#~ msgid "Properties of the password." +#~ msgstr "מאפייני הססמה." + +#~ msgid "_Sign Key..." +#~ msgstr "_חתימה על המפתח..." + +#~ msgid "Sign public key" +#~ msgstr "חתימה על מפתח ציבורי" + +#~ msgid "Properties of the key." +#~ msgstr "מאפייני המפתח." + +#~ msgid "Lock this token" +#~ msgstr "נעילת אסימון זה" + +#~ msgid "Unlock this token" +#~ msgstr "שחרור אסימון זה" + +#~ msgid "Properties of the certificate." +#~ msgstr "מאפייני האישור." + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "הפריט במחיקה" +#~ msgstr[1] "הפריטים במחיקה" + +#~ msgid "Delete the password." +#~ msgstr "מחיקת הססמה." + +#~ msgid "To do Keyring" +#~ msgstr "קבוצת המפתחות לביצוע" + +#~ msgid "Archive files" +#~ msgstr "קבצי ארכיון" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "כבר קיים קובץ בשם זה.\n" +#~ "\n" +#~ "האם ברצונך להחליף אותו בקובץ חדש?" + +#~ msgid "_Replace" +#~ msgstr "ה_חלפה" + +#~ msgid "Export public key" +#~ msgstr "ייצוא מפתח ציבורי" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "לא ניתן לייצא מפתח ל־\"%s\"" + +#~ msgid "Exporting keys" +#~ msgstr "מפתחות מיוצאים" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "לא ניתן לקבל מידע משרת המפתחות" + +#~ msgid "Retrieving keys" +#~ msgstr "מתקבלים מפתחות" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "האם ברצונך למחוק %d מפתחות וזהויות לצמיתות?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "לא ניתן למחוק מפתח ציבורי" + +#~ msgid "Delete the key." +#~ msgstr "מחיקת המפתח." + +#~ msgid "Export Complete Key" +#~ msgstr "ייצוא המפתח כולו" + +#~ msgid "Couldn't export key." +#~ msgstr "לא ניתן לייצא את המפתח." + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "האם ברצונך למחוק את האישור '%s'?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "האם ברצונך למחוק אישור אחד?" +#~ msgstr[1] "האם ברצונך למחוק %d אישורים?" + +#~ msgid "Deleting" +#~ msgstr "בהליכי מחיקה" + +#~ msgid "Couldn't delete key" +#~ msgstr "לא ניתן למחוק מפתח" + +#~ msgid "Passwords: %s" +#~ msgstr "ססמאות: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "ססמאות: %s" + +#~ msgid "New PGP Key" +#~ msgstr "מפתח PGP חדש" + +#~ msgid "Create New ..." +#~ msgstr "יצירת חדש..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "מפתח אחד נבחר" +#~ msgstr[1] "%d מפתחות נבחרו" + +#~ msgid "Importing keys" +#~ msgstr "מייבא מפתחות" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "סוג מפתח לא מזוהה, או תצורת מידע שגויה" + +#~ msgid "Importing Keys" +#~ msgstr "מפתחות מיובאים" + +#~ msgid "T_ypes" +#~ msgstr "_סוגים" + +#~ msgid "Show type column" +#~ msgstr "הצגת עמודת הסוג" + +#~ msgid "_Expiry" +#~ msgstr "_תפוגה" + +#~ msgid "Show expiry column" +#~ msgstr "הצגת עמודת התפוגה" + +#~ msgid "_Trust" +#~ msgstr "_מהימנות" + +#~ msgid "Show owner trust column" +#~ msgstr "הצגת מהימנות הבעלים" + +#~ msgid "_Validity" +#~ msgstr "_תוקף" + +#~ msgid "Show validity column" +#~ msgstr "הצגת עמודת התוקף" + +#~ msgid "Other _Keys" +#~ msgstr "מפתחות _אחרים" + +#~ msgid "Validity" +#~ msgstr "תוקף" + +#~ msgid "Expiration Date" +#~ msgstr "תאריך תפוגה" + +#~ msgid "_Expand All" +#~ msgstr "ה_רחבת הכול" + +#~ msgid "Expand all listings" +#~ msgstr "הרחבת כל הרשומות" + +#~ msgid "_Collapse All" +#~ msgstr "צמצום ה_כול" + +#~ msgid "Collapse all listings" +#~ msgstr "צמצום כל הרשומות" + +#~ msgid "Copied keys" +#~ msgstr "מפתחות מועתקים" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "‏%s הוא מפתח פרטי. להמשיך?" + +#~ msgid "_Key Description:" +#~ msgstr "_תיאור מפתח" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "Do not run seahorse-daemon as a daemon" #~ msgid "couldn't fork process" #~ msgstr "couldn't fork process" -#~ msgid "couldn't create new process group" -#~ msgstr "couldn't create new process group" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "מנוע הצפנה (Seahorse)" @@ -2483,9 +2846,6 @@ #~ msgid "Bad Signature" #~ msgstr "חתימה לא טובה" -#~ msgid "Couldn't verify signature." -#~ msgstr "לא ניתן לוודא חתימה." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "חותם לא תקין או לא מוכר: %s" @@ -2675,9 +3035,6 @@ #~ msgid "Web Password" #~ msgstr "ססמת Web" -#~ msgid "Network Password" -#~ msgstr "ססמת רשת" - #~ msgid "Couldn't set application access." #~ msgstr "לא ניתן להגדיר את הגישה ליישום." @@ -2796,12 +3153,6 @@ #~ msgid "Symmetric Key" #~ msgstr "מפתח סימטרי" -#~ msgid "Public Key" -#~ msgstr "מפתח ציבורי" - -#~ msgid "Private Key" -#~ msgstr "מפתח פרטי" - #~ msgid "Credentials" #~ msgstr "פרטי זיהוי" @@ -2823,9 +3174,6 @@ #~ msgid "Loading Keys..." #~ msgstr "מפתחות נטענים..." -#~ msgid "Searching for keys..." -#~ msgstr "מחפש מפתחות..." - #~ msgid "Uploading keys..." #~ msgstr "מעלה מפתחות..." @@ -2850,12 +3198,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "מסנכרן מפתחות" -#~ msgid "Encryption Key Manager" -#~ msgstr "מנהל מפתח הצפנה" - -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "לא תקף" @@ -2865,9 +3207,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "מפתח SSH ציבורי" -#~ msgid "Secure Shell key" -#~ msgstr "מפתח SSH" - #~ msgid "Passphrase:" #~ msgstr "מילת צופן:" @@ -2939,9 +3278,6 @@ #~ msgid "Password and Encryption Settings" #~ msgstr "הגדרות סיסמה והצפנה" -#~ msgid "_Add Keyring" -#~ msgstr "_הוסף קבוצת מפתחות" - #~ msgid "_Remove Keyring" #~ msgstr "_הסר קבוצת מפתחות" @@ -2962,9 +3298,6 @@ #~ msgid "_Quit" #~ msgstr "_יציאה" -#~ msgid "Create a new personal key" -#~ msgstr "צור מפתח ציבורי חדש" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "יבא מפתחות לקבוצת המפתחות שלך מקובץ" @@ -2980,9 +3313,6 @@ #~ msgid "_About" #~ msgstr "_אודות" -#~ msgid "P_roperties" -#~ msgstr "מ_אפיינים" - #~ msgid "E_xport Public Key..." #~ msgstr "י_צא מפתח ציבורי..." @@ -2992,9 +3322,6 @@ #~ msgid "Copy public part of selected keys to the clipboard" #~ msgstr "העתק את החלק הציבורי של מפתח לקובץ" -#~ msgid "_Delete Key" -#~ msgstr "_מחק מפתח" - #~ msgid "Imported %d key" #~ msgid_plural "Imported %d keys" #~ msgstr[0] "מפתח אחד יובא" @@ -3077,9 +3404,6 @@ #~ msgid "_Clear Cache" #~ msgstr "_נקה את המטמון" -#~ msgid "_Show Window" -#~ msgstr "הצג _חלון" - #~ msgid "Do not daemonize seahorse-agent" #~ msgstr "Do not daemonize seahorse-agent" @@ -3201,9 +3525,6 @@ #~ msgid "_Default key:" #~ msgstr "מפתח _ברירת מחדל:" -#~ msgid "Clipboard Text Encryption" -#~ msgstr "Clipboard Text Encryption" - #~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." #~ msgstr "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." @@ -3240,9 +3561,6 @@ #~ msgid "_Import Key" #~ msgstr "_יבא מפתח" -#~ msgid "Encrypted text" -#~ msgstr "טקסט מוצפן" - #~ msgid "Signed text" #~ msgstr "טקסט חתום" diff -Nru seahorse-3.2.2/po/hi.po seahorse-3.6.3/po/hi.po --- seahorse-3.2.2/po/hi.po 2011-09-14 17:04:58.000000000 +0200 +++ seahorse-3.6.3/po/hi.po 2012-09-25 14:50:51.000000000 +0200 @@ -4,18 +4,21 @@ # # Rajesh Ranjan , 2007, 2008, 2009. # Rajesh Ranjan , 2009. +# rajesh , 2012. msgid "" msgstr "" "Project-Id-Version: seahorse.master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&component=general\n" -"POT-Creation-Date: 2009-09-14 17:02+0000\n" -"PO-Revision-Date: 2009-09-15 13:11+0530\n" -"Last-Translator: Rajesh Ranjan \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-17 10:17+0000\n" +"PO-Revision-Date: 2012-09-23 21:16+0530\n" +"Last-Translator: rajesh \n" "Language-Team: Hindi \n" +"Language: hi\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" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "\n" "\n" "\n" @@ -34,393 +37,188 @@ "\n" "\n" "\n" -"X-Generator: KBabel 1.11.4\n" - -#: ../daemon/seahorse-daemon.c:69 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "सीहॉर्स डेमॉन को बतौर डेमॉन मत चलाएँ" - -#: ../daemon/seahorse-daemon.c:87 -msgid "couldn't fork process" -msgstr "प्रक्रिया तोड़ नहीं सका" - -#: ../daemon/seahorse-daemon.c:93 -msgid "couldn't create new process group" -msgstr "नयी प्रक्रिया समूह नहीं बना सका" - -#: ../daemon/seahorse-daemon.c:207 -msgid "Encryption Daemon (Seahorse)" -msgstr "गोपन डेमॉन (Seahorse)" - -#: ../daemon/seahorse-daemon.desktop.in.in.h:1 -msgid "Seahorse Daemon" -msgstr "सीहोर्स डेमॉन" - -#: ../daemon/seahorse-service.c:151 ../daemon/seahorse-service.c:175 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "अवैध या अपरिचित कुंजी प्रकार: %s" - -#: ../daemon/seahorse-service.c:224 ../daemon/seahorse-service-keyset.c:135 -#: ../daemon/seahorse-service-keyset.c:164 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "अवैध या अपरिचित कुंजी: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:160 -#, c-format -msgid "Signed by expired on %s." -msgstr " expired के द्वारा %s पर हस्ताक्षरित." - -#: ../daemon/seahorse-service-crypto.c:161 -msgid "Invalid Signature" -msgstr "अवैध हस्ताक्षर" - -#: ../daemon/seahorse-service-crypto.c:167 -#, c-format -msgid "Signed by on %s Expired." -msgstr " के द्वारा %s Expired पर हस्ताक्षरित." - -#: ../daemon/seahorse-service-crypto.c:168 -msgid "Expired Signature" -msgstr "समय समाप्त हस्ताक्षर" - -#: ../daemon/seahorse-service-crypto.c:174 -#, c-format -msgid "Signed by Revoked on %s." -msgstr " Revoked के द्वारा %s पर हस्ताक्षरित." - -#: ../daemon/seahorse-service-crypto.c:175 -msgid "Revoked Signature" -msgstr "वापस लिया हस्ताक्षर" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:181 -#, c-format -msgid "Signed by on %s." -msgstr " के द्वारा %s पर हस्ताक्षरित." - -#: ../daemon/seahorse-service-crypto.c:182 -msgid "Good Signature" -msgstr "अच्छा हस्ताक्षर" - -#: ../daemon/seahorse-service-crypto.c:187 -msgid "Signing key not in keyring." -msgstr "कीरिंग में हस्ताक्षर कुंजी नहीं" - -#: ../daemon/seahorse-service-crypto.c:188 -msgid "Unknown Signature" -msgstr "अज्ञात हस्ताक्षर" - -#: ../daemon/seahorse-service-crypto.c:192 -msgid "Bad or forged signature. The signed data was modified." -msgstr "खराब या बिगड़ा हुआ हस्ताक्षर. हस्ताक्षरित आँकड़ा बदला गया था." - -#: ../daemon/seahorse-service-crypto.c:193 -msgid "Bad Signature" -msgstr "खराब हस्ताक्षर" - -#: ../daemon/seahorse-service-crypto.c:201 -msgid "Couldn't verify signature." -msgstr "हस्ताक्षर जाँच नहीं सका." - -#: ../daemon/seahorse-service-crypto.c:257 -#: ../daemon/seahorse-service-crypto.c:364 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "अवैध या अपरिचित हस्ताक्षरकर्ता: %s" - -#: ../daemon/seahorse-service-crypto.c:264 -#: ../daemon/seahorse-service-crypto.c:371 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "कुंजी हस्ताक्षर के लिए वैध नहीं है: %s" - -#: ../daemon/seahorse-service-crypto.c:276 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "अवैध या अपरिचित प्राप्तकर्ता: %s" - -#: ../daemon/seahorse-service-crypto.c:284 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "कुंजी गोपन के लिए वैध प्राप्तकर्ता नहीं है: %s" - -#: ../daemon/seahorse-service-crypto.c:293 -#, c-format -msgid "No recipients specified" -msgstr "कोई प्राप्तकर्ता निर्दिष्ट नहीं" - -#: ../daemon/seahorse-service-crypto.c:359 -#, c-format -msgid "No signer specified" -msgstr "कोई हस्ताक्षरकर्ता निर्दिष्ट नहीं" - -#: ../daemon/seahorse-service-crypto.c:414 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "अवैध कुंजी प्रकार विगोपन के लिए: %s" - -#: ../daemon/seahorse-service-crypto.c:477 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "अवैध कुंजी प्रकार जाँच के लिए: %s" - -#: ../daemon/seahorse-service-keyset.c:200 -#, c-format -msgid "Invalid key id: %s" -msgstr "अवैध कुंजी आईडी: %s" - -#: ../daemon/seahorse-sharing.c:72 ../daemon/seahorse-sharing.c:216 -msgid "Couldn't share keys" -msgstr "कुंजी साझा नहीं कर सका" - -#: ../daemon/seahorse-sharing.c:73 -msgid "Can't publish discovery information on the network." -msgstr "संजाल पर खोज सूचना नहीं प्रकाशित कर सका." - -#. Translators: The %s will get filled in with the user name -#. of the user, to form a genitive. If this is difficult to -#. translate correctly so that it will work correctly in your -#. language, you may use something equivalent to -#. "Shared keys of %s". -#: ../daemon/seahorse-sharing.c:93 -#, c-format -msgid "%s's encryption keys" -msgstr "%s की गोपन कुंजी" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"दूरस्थ PGP कुंजी के लिए कुंजी सर्वर URI की सूची. बाद के संस्करण में प्रदर्शन नाम को शामिल " -"किया जा सकता है, एक स्थान जोड़कर और फिर नाम." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "कुंजी स्वतः पाएँ" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "कुंजी स्वतः तुल्यकालित करें" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "कुंजी प्रबंधक के समय समाप्त हुए स्तंभ के लिए दृश्यता नियंत्रित करता है." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "कुंजी प्रबंधक के विश्वसनीय संत हुए स्तंभ के लिए दृश्यता नियंत्रित करता है." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "कुंजी प्रबंधक के प्रकार स्तंभ के लिए दृश्यता नियंत्रित करता है." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "कुंजी प्रबंधक के वैधता स्तंभ के लिए दृश्यता नियंत्रित करता है." - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "DNS-SD साझा सक्रिय करें" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"DNS-SD (Apple Bonjour) कुंजी साझाकरण चल रहा है. सीहॉर्स डेमॉन को जरूर चलना चाहिए " -"और जरूर HKP और DNS-SD समर्थन के साथ निर्मित होना चाहिए." - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "तयशुदा कुंजी की आईडी" - -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "यदि सही पर सेट है, तब सीहॉर्स से गोपित फ़ाइलें ASCII आर्मर एन्कोडेड होंगी." - -#: ../data/seahorse.schemas.in.h:12 -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "यदि सही पर सेट है, फिर तयशुदा कुंजी को गोपन प्राप्तकर्ता सूची में हमेशा जोड़ा जाएगा." - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "अंतिम कुंजी सर्वर खोज प्रारूप" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "अंतिम कुंजी सर्वर प्रयुक्त" - -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "किसी संदेश को हस्ताक्षरित करने के अंतिम कुंजी." - -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "PGP कुंजी सर्वर" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "इस कुंजी सर्वर में कुंजी प्रकाशित करें." - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "कुंजी प्रबंधक में समय समाप्त स्तंभ दिखाएँ" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "कुंजी प्रबंधक में ट्रस्ट स्तंभ दिखाएँ" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "कुंजी प्रबंधक में प्रकार स्तंभ दिखाएँ" - -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "कुंजी प्रबंधक में वैधता स्तंभ दिखाएँ" +"\n" +"X-Generator: Lokalize 1.2\n" -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"स्तंभ निर्दिष्ट करें जिससे प्राप्तकर्ता विंडो को छाँटना है. स्तंभ हैं: 'name' और 'id'. कोई " -"'-' को स्तंभ नाम के सामने रखें अवरोही क्रम में छाँटने के लिए." +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "कूटशब्द कीरिंग जोड़ें" -#: ../data/seahorse.schemas.in.h:23 +#: ../gkr/seahorse-add-keyring.xml.h:2 msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." msgstr "" -"स्तंभ निर्दिष्ट करें जिससे सीहॉर्स कुंजी प्रबंधक विंडो को छाँटना है. स्तंभ हैं: 'name' 'id', " -"'validity', 'expires', 'trust', और 'type'. कोई '-' को स्तंभ नाम के सामने रखें " -"अवरोही क्रम में छाँटने के लिए." - -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "अंतिम गुप्त कुंजी की ID किसी संदेश के हस्ताक्षर के लिए." +"कृपया नए कीरिंग के लिए एक नाम चुनें. आपको किसी कूटशब्द को अनलॉक करने के लिए " +"प्रांप्ट किया " +"जाएगा." -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "प्राप्तकर्ता को इससे छाँटने के लिए स्तंभ" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "नया कुंजीरिंग नाम:" -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "सीहॉर्स कुंजी को इससे छाँटने के लिए स्तंभ" +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "सर्वर का मेजबाननाम या पता" -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"मुख्य सर्वर जिसमें PGP कुंजी को प्रकाशित करना है. या PGP कुंजी को जबरदस्ती प्रकाशन के लिए " -"रिक्त." +#: ../gkr/seahorse-gkr-actions.c:81 +#| msgid "Password Keyring" +msgid "New password keyring" +msgstr "नया कूटशब्द कीरिंग" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "अंतिम कुंजी सर्वर जिसके लिए खोज को किया गया था या सभी कुंजी सर्वर के लिए सर्वर." +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "अनुप्रयोग और संजाल कूटशब्द के लिए प्रयुक्त" -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "किसी मुख्य सर्वर के लिए अंतिम खोज प्रारूप." +#: ../gkr/seahorse-gkr-actions.c:83 +#| msgid "Network Password" +msgid "New password..." +msgstr "नया कूटशब्द..." -#: ../data/seahorse.schemas.in.h:30 -msgid "This specifies the default key to use for certain operations, mainly signing." -msgstr "यह खास संक्रिया के लिए तयशुदा कुंजी को निर्दिष्ट करता है, मुख्यतः हस्ताक्षर के लिए." +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "कूटशब्द सुरक्षित रूप से जमा करें या गुप्त रूप से." -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "क्या कुंजी को की सर्वर से स्वतः प्राप्त करना है या नहीं." +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "कूटशब्द कीरिंग" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." -msgstr "क्या रूपांतरित कुंजी को स्वतः तुल्यकालित करना है तयशुदा कुंजी सर्वर से." +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "जमा कूटशब्द" -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "क्या हमेशा तयशुदा कुंजी को गोपित करना है" +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "तयशुदा कुंजीरिंग सेट नहीं कर सका." -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "क्या ASCII आर्मर का प्रयोग करना है" +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "कुंजीरिंग कूटशब्द बदल नहीं सका." -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "कूटशब्द कीरिंग जोड़ें" +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "तयशुदा रूप में सेट करें (_S)" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "नया कुंजीरिंग नाम:" +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "अनुप्रयोग सामान्यतः एक नया कूटशब्द को तयशुदा कीरिंग में जमा करता है." -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"कृपया नए कीरिंग के लिए एक नाम चुनें. आपको किसी कूटशब्द को अनलॉक करने के लिए प्रांप्ट किया " -"जाएगा." +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "कूटशब्द बदलें (_P)" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "सर्वर का मेजबाननाम या पता" +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "कूटशब्द भंडारण कीरिंग के अनलॉक कूटशब्द को बदलें" -#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:59 -msgid "Couldn't add keyring" -msgstr "कीरिंग नहीं जोड़ सका" +#: ../gkr/seahorse-gkr-add-item.c:58 +#, fuzzy +#| msgid "Couldn't add photo" +msgid "Couldn't add item" +msgstr "फोटो जोड़ नहीं सका" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "कूटशब्द जोड़ें" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "वर्णन (_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "कीरिंग (_K):" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "कूटशब्द (_P):" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "कूटशब्द दिखाएँ (_S)" -#: ../gkr/seahorse-gkr-item.c:470 -msgid "Web Password" -msgstr "वेब कूटशब्द" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "कीरिंग (_K):" -#: ../gkr/seahorse-gkr-item.c:472 -msgid "Network Password" -msgstr "नेटवर्क कूटशब्द" +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "कीरिंग नहीं जोड़ सका" -#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" +#: ../gkr/seahorse-gkr-backend.c:205 +#| msgid "_Passwords" +msgid "Passwords" msgstr "कूटशब्द" -#: ../gkr/seahorse-gkr-item-commands.c:78 +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "" + +#: ../gkr/seahorse-gkr-item.c:353 +#, fuzzy +#| msgid "Safely store a password or secret." +msgid "Password or secret" +msgstr "कूटशब्द सुरक्षित रूप से जमा करें या गुप्त रूप से." + +#: ../gkr/seahorse-gkr-item.c:354 +#| msgid "Network Password" +msgid "Network password" +msgstr "नेटवर्क कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:355 +#| msgid "Stored Password" +msgid "Stored note" +msgstr "जमा नोट" + +#: ../gkr/seahorse-gkr-item.c:356 +#| msgid "Listing passwords" +msgid "Keyring password" +msgstr "कीरिंग कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:357 +#| msgid "Encryption Key Manager" +msgid "Encryption key password" +msgstr "गोपन कुंजी कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:358 +#| msgid "Stored Password" +msgid "Key storage password" +msgstr "कुंजी भंडार कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:359 +#| msgid "Show pass_word" +msgid "Google Chrome password" +msgstr "गूगल क्रोम कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "क्रोम ऑनलाइन खाता कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:361 +#| msgid "Show pass_word" +msgid "Telepathy password" +msgstr "टेलीपेथी कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:362 +#| msgid "Listing passwords" +msgid "Instant messaging password" +msgstr "तत्काल संदेश कूटशब्द" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "संजाल प्रबंधक गुप्त" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "क्या आव वाकई '%s' कूटशब्द को मिटाना चाहते हैं?" -#: ../gkr/seahorse-gkr-item-commands.c:81 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -451,465 +249,271 @@ msgid "Network Credentials" msgstr "संजाल श्रेय" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "कूटशब्द" + +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "कूटशब्द नहीं बदल सका." -#: ../gkr/seahorse-gkr-item-properties.c:347 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 +#| msgid "Listing passwords" +msgid "Updating password" +msgstr "कूटशब्द का अद्यतन" + +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "विवरण सेट नहीं कर सका." -#: ../gkr/seahorse-gkr-item-properties.c:641 -msgid "Couldn't set application access." -msgstr "अनुप्रयोग पहुँच सेट नहीं कर सका." - #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr " कूटशब्द:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr " पथ" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "अनुमति:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "कुंजी गुण" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Technical Details:" -msgstr "तकनीकी विवरण:" +msgid "Use:" +msgstr "प्रयोग:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "अनुप्रयोग" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "प्रकार:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:72 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Details" -msgstr "विवरण" +msgid "Server:" +msgstr "सर्वरः" #: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Key" -msgstr "कुंजी" +msgid "Login:" +msgstr "लॉगिन:" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "Key Properties" -msgstr "कुंजी गुण" +msgid "Show pass_word" +msgstr "कूटशब्द दिखाएँ (_w)" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "लॉगिन:" +msgid "Password:" +msgstr " कूटशब्द:" #: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "सर्वरः" +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "कुंजी" #: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "कूटशब्द दिखाएँ (_w)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "तकनीकी विवरण:" #: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Type:" -msgstr "प्रकार:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "विवरण" -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "प्रयोग:" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "कीरिंग जो स्वतः अनलॉक या लॉगिन" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "कूटशब्द जमा करने के लिए प्रयुक्त कीरिंग" -#. To translators: This is the infinitive not the imperative. This string refers to the ability of an application to delete this secret from its key ring. -#: ../gkr/seahorse-gkr-item-properties.xml.h:16 -msgid "_Delete" -msgstr "मिटाएँ (_D)" +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "क्या आप वाकई '%s' कूटशब्द कीरिंग को मिटाना चाहते हैं?" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Read" -msgstr "पढ़ें (_R)" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:21 -msgid "_Write" -msgstr "लिखें (_W)" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "कीरिंग गुण" -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "सूचीकरण कूटशब्द" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +#| msgid "_Name:" +msgid "Name:" +msgstr "नाम:" -#: ../gkr/seahorse-gkr-keyring.c:354 -#, c-format -msgid "Passwords: %s" -msgstr "कूटशब्द: %s" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "उत्पन्न किया:" -#: ../gkr/seahorse-gkr-keyring.c:355 -#, c-format -msgid "Passwords: %s" -msgstr " कूटशब्द: %s" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "कीरिंग" -#: ../gkr/seahorse-gkr-keyring-commands.c:112 -msgid "Password Keyring" -msgstr "कूटशब्द कीरिंग" +#: ../libegg/egg-datetime.c:317 +msgid "Display flags" +msgstr "प्रदर्शक फ्लैग्स" -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Used to store application and network passwords" -msgstr "अनुप्रयोग और संजाल कूटशब्द के लिए प्रयुक्त" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Stored Password" -msgstr "जमा कूटशब्द" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Safely store a password or secret." -msgstr "कूटशब्द सुरक्षित रूप से जमा करें या गुप्त रूप से." - -#: ../gkr/seahorse-gkr-keyring-commands.c:129 -msgid "Couldn't unlock keyring" -msgstr "कीरिंग खोल नहीं सका" - -#: ../gkr/seahorse-gkr-keyring-commands.c:170 -msgid "Couldn't lock keyring" -msgstr "कुंजीरिंग खोल नहीं सका" - -#: ../gkr/seahorse-gkr-keyring-commands.c:211 -msgid "Couldn't set default keyring" -msgstr "तयशुदा कुंजीरिंग सेट नहीं कर सका." - -#: ../gkr/seahorse-gkr-keyring-commands.c:250 -msgid "Couldn't change keyring password" -msgstr "कुंजीरिंग कूटशब्द बदल नहीं सका." - -#: ../gkr/seahorse-gkr-keyring-commands.c:281 -msgid "_Lock" -msgstr "खोलें (_L)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:282 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "कूटशब्द भंडार कीरिंग को लॉक करें ताकि एक प्रधान कूटशब्द इसे खोलने के लिए जरूरी हो." - -#: ../gkr/seahorse-gkr-keyring-commands.c:283 -msgid "_Unlock" -msgstr "अनलॉक करें (_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:284 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "कूटशब्द भंडार कीरिंग को अनलॉक करें ताकि एक प्रधान कूटशब्द इसे खोलने के लिए उपलब्ध हो." - -#: ../gkr/seahorse-gkr-keyring-commands.c:285 -msgid "_Set as default" -msgstr "तयशुदा रूप में सेट करें (_S)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:286 -msgid "Applications usually store new passwords in the default keyring." -msgstr "अनुप्रयोग सामान्यतः एक नया कूटशब्द को तयशुदा कीरिंग में जमा करता है." - -#: ../gkr/seahorse-gkr-keyring-commands.c:287 -msgid "Change _Password" -msgstr "कूटशब्द बदलें (_P)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "Change the unlock password of the password storage keyring" -msgstr "कूटशब्द भंडारण कीरिंग के अनलॉक कूटशब्द को बदलें" - -#: ../gkr/seahorse-gkr-keyring-commands.c:353 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "क्या आप वाकई '%s' कूटशब्द कीरिंग को मिटाना चाहते हैं?" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -msgid "Created:" -msgstr "उत्पन्न किया:" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "कीरिंग" - -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "कीरिंग गुण" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "नाम (_N):" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "इस कीरिंग में पहुँच मना किया गया" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "गनोम कीरिंग डेमॉन चल नहीं रहा है" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "यह कुंजीरिंग पहले से खुला नहीं है" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "कोई ऐसा कुंजी मौजूद नहीं है" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "कीरिंग डेमॉन के साथ संचार नहीं कर सका" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "मद पहले से मौजूद है" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "आंतरिक त्रुटि गनोम कीरिंग की पहुँच पाने में" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "सहेज रहा है मद." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "मिटा रहे मद..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "मिटा रहे कीरिंग..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "अनुसूचन कूटशब्द कीरिंग" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"कोई गोपन कुंजी नहीं पाई गई थी जिसके साथ आपके द्वारा किए गए संक्रिया को करना है. " -"प्रोग्राम Passwords and Encryption Keys अब आरंभ किया जाएगा जिसे या तो आप " -"किसी कुंजी को बना सकते हैं या कोई एक बना सकते हैं." - -#: ../libcryptui/cryptui-key-chooser.c:173 -msgid "All Keys" -msgstr "सभी कुंजी" - -#: ../libcryptui/cryptui-key-chooser.c:174 -msgid "Selected Recipients" -msgstr "चयनित प्राप्तकर्ता" - -#: ../libcryptui/cryptui-key-chooser.c:175 -msgid "Search Results" -msgstr "खोज परिणाम" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:185 -msgid "Search _for:" -msgstr "इसके लिए ढूंढें :" - -#: ../libcryptui/cryptui-key-chooser.c:243 -msgid "None (Don't Sign)" -msgstr "कुछ नहीं (हस्ताक्षर नहीं करें)" - -#: ../libcryptui/cryptui-key-chooser.c:256 -#, c-format -msgid "Sign this message as %s" -msgstr "हस्ताक्षर यह संदेश जैसे %s" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:278 -msgid "_Sign message as:" -msgstr "हस्ताक्षर संदेश जैसे:" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:828 -msgid "Name" -msgstr "नाम" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1743 -#: ../src/seahorse-key-manager-store.c:840 -msgid "Key ID" -msgstr "कुंजी आईडी" - -#: ../libegg/egg-datetime.c:313 -msgid "Display flags" -msgstr "प्रदर्शक फ्लैग्स" - -#: ../libegg/egg-datetime.c:314 +#: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" msgstr "प्रदर्शित दिनांक और/या समय विशेषता" -#: ../libegg/egg-datetime.c:319 +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "सुस्त विधि" -#: ../libegg/egg-datetime.c:320 +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "दाखिल दिनांक व समय मान को सुस्त मोड सामान्य नहीं करता है" -#: ../libegg/egg-datetime.c:325 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "वर्ष" -#: ../libegg/egg-datetime.c:326 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "प्रदर्शित साल" -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "महीना" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "प्रदर्शित महीना" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "दिन" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "प्रदर्शित दिन का महीना" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "घंटा" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "प्रदर्शित घंटा" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "मिनट" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "प्रदर्शित मिनट" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "सेकेण्ड" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "प्रदर्शित सेकण्ड" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "निचला सीमा साल" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "निचली तिथि सीमा का साल का हिस्सा" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "ऊपरी सीमा साल" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "ऊपरी तिथि सीमा का साल का हिस्सा" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "निचला सीमा महीना" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "निचली तिथि सीमा का महीने का हिस्सा" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "ऊपरी सीमा महीना" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "ऊपरी तिथि सीमा का महीने का हिस्सा" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "निचला सीमा दिन" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "निचली तिथि सीमा का महीने का हिस्सा का दिन" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "ऊपरी सीमा दिन" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "ऊपरी तिथि सीमा का महीने का हिस्सा का दिन" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "निचला सीमा घंटा" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "निचली तिथि सीमा का घंटे का हिस्सा" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "ऊपरी सीमा घंटा" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "ऊपरी तिथि सीमा का घंटे का हिस्सा" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "निचला सीमा मिनट" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "निचली समय सीमा का मिनट का हिस्सा" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "ऊपरी सीमा मिनट" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "ऊपरी समय सीमा का मिनट का हिस्सा" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "निचला सीमा सेकण्ड" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "निचली समय सीमा का सेकेंड का हिस्सा" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "ऊपरी सीमा सेकण्ड" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "ऊपरी समय सीमा का सेकेंड का हिस्सा" @@ -918,580 +522,623 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:470 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:0" -#: ../libegg/egg-datetime.c:492 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "तिथि" -#: ../libegg/egg-datetime.c:492 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "तिथि सीधे दाखिल करें" -#: ../libegg/egg-datetime.c:499 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "चुनें तिथि" -#: ../libegg/egg-datetime.c:499 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "चुनें तिथि कैलेंडर से" -#: ../libegg/egg-datetime.c:517 ../libegg/egg-datetime.c:2192 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "समय" -#: ../libegg/egg-datetime.c:517 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "प्रविष्ट करें समय सीधे" -#: ../libegg/egg-datetime.c:524 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "चुनें समय" -#: ../libegg/egg-datetime.c:524 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "सूची से समय चुनें" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:791 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: no" -#: ../libegg/egg-datetime.c:795 ../libegg/egg-datetime.c:1253 -#: ../libegg/egg-datetime.c:1257 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "पूर्वाह्न" -#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1254 -#: ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "अपराह्न" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:805 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:808 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:812 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:815 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1169 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1234 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "फ़ाइल वैध .desktop फ़ाइल नहीं है" +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "आरंभिक अस्थाई मद" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "अपरिचित डेस्कटॉप फ़ाइल संस्करण '%s'" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "जोड़ें कुंजी सर्वर" -#: ../libegg/eggdesktopfile.c:958 -#, c-format -msgid "Starting %s" -msgstr "%s शुरू हो रहा है" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "कुंजी सर्वर प्रकार:" -#: ../libegg/eggdesktopfile.c:1100 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "कमांड लाइन पर अनुप्रयोग दस्तावेज़ स्वीकार नहीं करता है" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "होस्टः" -#: ../libegg/eggdesktopfile.c:1168 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "अपरिचित लॉन्च विकल्प: %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1373 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "दस्तावेज़ URI को 'Type=Link' डेस्कटॉप प्रविष्टि में भेज नहीं सकता है" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "सर्वर चालू करने के लिए पोर्ट में अभिगम." -#: ../libegg/eggdesktopfile.c:1392 -#, c-format -msgid "Not a launchable item" -msgstr "चलाने योग्य प्रोग्राम नहीं है" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "इस अनुप्रयोग का संस्करण" -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "सत्र प्रबंधक में संबंधन निष्क्रिय करें" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- सिस्टम जमावट" -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "सहेजा विन्यास समाहित करता फ़ाइल निर्दिष्ट करें" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "योगदान:" -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "फ़ाइल" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +#| msgid "Passwords and Encryption Keys" +msgid "Passwords and Keys" +msgstr "कूटशब्द व कुंजी" -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "सत्र प्रबंधन ID निर्दिष्ट करें" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "राजेश रंजन (rranjan@redhat.com; rajesh672@gmail.com)" -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1312 -msgid "ID" -msgstr "आईडी" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "सीहोर्स परियोजना मुख पृष्ठ" -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "सत्र प्रबंधन विकल्प:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "दिखाएँ सत्र प्रबंधन विकल्प" +#: ../libseahorse/seahorse-catalog.c:191 +#| msgid "Couldn't delete." +msgid "Cannot delete" +msgstr "मिटा नहीं सकता है" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "कुंजी निर्यात नहीं कर सका" -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "जोड़ें कुंजी सर्वर" +#: ../libseahorse/seahorse-catalog.c:268 +#| msgid "Couldn't export key." +msgid "Couldn't export data" +msgstr "आँकड़ा निर्यात नहीं कर सका" -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "होस्टः" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "फ़ाइल (_F)" -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "कुंजी सर्वर प्रकार:" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "निर्यात करें (_x)..." -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "सर्वर चालू करने के लिए पोर्ट में अभिगम." +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "एक फ़ाइल में निर्यात करें" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "आरंभिक अस्थाई मद" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "संपादन (_E)" -#: ../libseahorse/seahorse-notification.c:566 -#: ../libseahorse/seahorse-notification.c:594 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "कुंजी आयातित" -msgstr[1] "कुंजी आयातित" - -#: ../libseahorse/seahorse-notification.c:570 -#: ../libseahorse/seahorse-notification.c:593 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "आयातित %i कुंजी" -msgstr[1] "आयातित %i कुंजियाँ" - -#: ../libseahorse/seahorse-notification.c:572 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "इसके लिए आयातित कुंजी" -msgstr[1] "इसके लिए आयातित कुंजियाँ" - -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "अधिसूचना संदेश" - -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "सममितीय कुंजी" - -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "सार्वजनिक कुंजी" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "इस क्लिपबोर्ड में नक़ल करें" -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "निजी कुंजी" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "मिटाएँ (_D)" -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "श्रेय" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "मिटाएँ चयनित वस्तुएँ" -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "उपयोक्ता" +#: ../libseahorse/seahorse-catalog.c:287 +#, fuzzy +#| msgid "Show properties" +msgid "Show the properties of this item" +msgstr "दिखाएँ गुण" -#: ../libseahorse/seahorse-passphrase.c:194 -msgid "Passphrase" -msgstr "कूटशब्द" +#: ../libseahorse/seahorse-catalog.c:289 +#, fuzzy +#| msgid "Show properties" +msgid "Show the properties of this keyring" +msgstr "दिखाएँ गुण" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "वरीयताएँ (_n)" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "इस प्रोग्राम के लिए वरीयता बदलें" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "देखें (_V)" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "मदद (_H)" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "इस प्रोग्राम का परिचय" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "विषय सूची (_C)" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "दिखाएँ सीहोर्स मदद" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "निर्यात" + +#: ../libseahorse/seahorse-interaction.c:99 +#, fuzzy, c-format +#| msgid "Enter the old passphrase for: %s" +msgid "Enter PIN or password for: %s" +msgstr "इसके लिए पुराना कूटशब्द दाखिल करें: %s" -#: ../libseahorse/seahorse-passphrase.c:197 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "पासवर्ड: " -#: ../libseahorse/seahorse-passphrase.c:260 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" msgstr "संपुष्ट करें:" -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "वैध कुंजी सर्वर पता नहीं." -#: ../libseahorse/seahorse-prefs.c:64 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." msgstr "मदद के लिए तंत्र प्रशासक से संपर्क करें या कुंजी सर्वर का प्रशासक." -#: ../libseahorse/seahorse-prefs.c:173 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "यूआरएल" -#: ../libseahorse/seahorse-prefs.c:353 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" msgstr "अनुकूलित" -#: ../libseahorse/seahorse-prefs.c:420 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" msgstr "कुछ नहीं: कुंजी प्रकाशित नहीं करें" #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "की सर्वर से स्वतः कुंजी पाएँ (_k)" - -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "की सर्वर से स्वतः रूपांतरित कुंजी तुल्यकालित करें (_m)" - -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "कुंजी सर्वर" - -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Key Sharing" -msgstr "कुंजी साझेदारी" - -#: ../libseahorse/seahorse-prefs.xml.h:5 msgid "Preferences" msgstr "वरीयताएं" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "" -"Sharing your keys allows other people on your network to use the keys you've " -"collected. This means they can automatically encrypt things for you or those " -"you know, without you having to send them your key.\n" -"\n" -"Note: Your personal keys will not be compromised." -msgstr "" -"अपनी कुंजी को साझा करना आपके संजाल पर दूसरे लोगों को आपके द्वारा जमा कुंजी को प्रयोग करने " -"की अनुमति मिलती है. इसका मतलब है कि वे वस्तुओं को स्वतः गोपित करते हैं या वे जिसे तुम जानते " -"हो, बिना तुम्हारे अपनी कुंजी भेजने के लिए.\n" -"\n" -"नोट: आपकी निजी कुंजी भेदा नहीं जा सकेगा." - -#: ../libseahorse/seahorse-prefs.xml.h:9 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "कुंजी इसससे ढूँढ़ें (_F):" -#: ../libseahorse/seahorse-prefs.xml.h:10 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "प्रकाशित करें कुंजी:" -#: ../libseahorse/seahorse-prefs.xml.h:11 -msgid "_Share my keys with others on my network" -msgstr "मेरे अपने संजाल पर मेरी कुंजी को दूसरे के साथ साझा करें (_S)" - -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "प्रगति शीर्षक" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "की सर्वर से स्वतः कुंजी पाएँ (_k)" -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "अनुपलब्ध" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "की सर्वर से स्वतः रूपांतरित कुंजी तुल्यकालित करें (_m)" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "कुंजी सर्वर" -#: ../libseahorse/seahorse-util.c:237 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:513 -msgid "Key Data" -msgstr "कुंजी डाटा" - -#: ../libseahorse/seahorse-util.c:515 -msgid "Multiple Keys" -msgstr "बहुमुखी कुंजी" - -#: ../libseahorse/seahorse-util.c:771 -msgid "Couldn't run file-roller" -msgstr "फाइल रोलर नहीं चला सका" - -#: ../libseahorse/seahorse-util.c:777 -msgid "Couldn't package files" -msgstr "फाइल पैकेज नहीं कर सका" - -#: ../libseahorse/seahorse-util.c:778 -msgid "The file-roller process did not complete successfully" -msgstr "फाइल रोलर प्रक्रिया सफलतापूर्वक नहीं चल सकी" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:943 -msgid "All key files" -msgstr "सभी कुंजी फाइल" - -#: ../libseahorse/seahorse-util.c:954 ../libseahorse/seahorse-util.c:1002 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "सभी फ़ाइलें" - -#: ../libseahorse/seahorse-util.c:995 -msgid "Archive files" -msgstr "अभिलेखागार फाइल" - -#: ../libseahorse/seahorse-util.c:1065 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"कोई फ़ाइल पहले से मौजूद है इसके नाम के साथ.\n" -"\n" -"क्या आप इसे नई फ़ाइल के साथ बदलना चाहते हैं?" - -#: ../libseahorse/seahorse-util.c:1068 -msgid "_Replace" -msgstr "बदलें (_R)" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1131 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "अज्ञात" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1137 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "कभी नहीं" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1144 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "आंशिक" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1150 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "भरा हुआ" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1156 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "सर्वश्रेष्ठ" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1349 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "अक्षम" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1345 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "रद्द" -#: ../libseahorse/seahorse-widget.c:362 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "मदद दिखाई नहीं जा सकी: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "समय समाप्ति तिथि:" +msgid "Never E_xpires" +msgstr "कभी नहीं समाप्त" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "नई उपकुंजी उत्पन्न करें" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "यदि कुंजी कभी समाप्त नहीं होती है" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "कुंजी क़िस्म:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "कुंजी लंबाई:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "कुंजी क़िस्म:" +msgid "Expiration Date:" +msgstr "समय समाप्ति तिथि:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "कुंजी लंबाई" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "कभी नहीं समाप्त" +msgid "Generate a new subkey" +msgstr "नई उपकुंजी उत्पन्न करें" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "जोड़ें उपयोक्ता आईडी" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "नया उपयोक्ता आईडी बनाएँ" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "पूरा नाम:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "कुंजी टिप्पणी:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "कम से कम 5 वर्ण लंबाई जरूर होना चाहिए" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "वैकल्पिक ईमेल पता" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "कुंजी का विवरण देता वैकल्पिक टिप्पणी" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "वैकल्पिक ईमेल पता" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "पूरा नाम:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "ईमेल पता:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "कुंजी टिप्पणी:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "नया उपयोक्ता आईडी बनाएँ" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "बदलें (_h)" +msgid "_Never expires" +msgstr "कभी नहीं समाप्त" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "कुंजी वापस लें" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "कभी नहीं समाप्त" +msgid "C_hange" +msgstr "बदलें (_h)" -#: ../pgp/seahorse-gpgme-add-subkey.c:144 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "उपकुंजी जोड़ नहीं सका" -#: ../pgp/seahorse-gpgme-add-subkey.c:163 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "उपकुंजी %s में जोड़ें" -#: ../pgp/seahorse-gpgme-add-subkey.c:179 ../pgp/seahorse-gpgme-generate.c:96 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (sign only)" -#: ../pgp/seahorse-gpgme-add-subkey.c:187 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (encrypt only)" -#: ../pgp/seahorse-gpgme-add-subkey.c:193 ../pgp/seahorse-gpgme-generate.c:97 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (sign only)" -#: ../pgp/seahorse-gpgme-add-subkey.c:199 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (encrypt only)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "उपयोक्ता आईडी नहीं जोड़ सका" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "%s में उपयोक्ता आईडी जोड़ें" -#: ../pgp/seahorse-gpgme.c:51 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "विगोपन विफल. आपके पास संभवतः विगोपन कुंजी नहीं है." -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "यह ऑपरेशन रद्द कर दी गई थी" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "अवैध समाप्ति तिथि" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "समाप्ति तिथि भविष्य में होनी चाहिए" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "समाप्ति तिथि नहीं बदल सका" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "समाप्ति तिथि: %s" -#: ../pgp/seahorse-gpgme-generate.c:65 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "बहुमुखी कुंजी" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "कुंजी डाटा" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +#, fuzzy +#| msgid "Imported keys" +msgid "Armored PGP keys" +msgstr "आयात कुंजी" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +#| msgid "PGP Key" +msgid "PGP keys" +msgstr "पीजीपी कुंजी" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "पीजीपी कुंजी" -#: ../pgp/seahorse-gpgme-generate.c:66 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "ईमेल और फाइल गोपित करने में प्रयुक्त" -#: ../pgp/seahorse-gpgme-generate.c:95 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 +msgid "RSA" +msgstr "RSA" + +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:106 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "पीजीपी कुंजी नहीं बना सका" -#: ../pgp/seahorse-gpgme-generate.c:213 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "नया पीजीपी कुंजी के लिए कूटशब्द" -#: ../pgp/seahorse-gpgme-generate.c:214 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "अपनी नई कुंजी के लिए कूटशब्द दो बार दाखिल करें" -#: ../pgp/seahorse-gpgme-generate.c:223 -msgid "Couldn't generate key" -msgstr "कुंजी नहीं बना सका" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" -#: ../pgp/seahorse-gpgme-generate.c:225 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "कुंजी जनन" +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "क्या आप %s को स्थाई रूप से मिटाने के लिए निश्चित हैं?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +#| msgid "Are you sure you want to permanently delete %d keys?" +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "क्या आप %d कुंजी को स्थाई रूप से मिटाने के लिए निश्चित हैं?" +msgstr[1] "क्या आप %d कुंजियों को स्थाई रूप से मिटाने के लिए निश्चित हैं?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +#| msgid "Show pass_word" +msgid "Wrong password" +msgstr "गलत कूटशब्द" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +msgid "This was the third time you entered a wrong password. Please try again." +msgstr "" + +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "गलत कूटशब्द." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' के लिए नया कूटशब्द दाखिल करें" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' के लिए कूटशब्द दाखिल करें." + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "नया कूटशब्द दाखिल करें" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "कूटशब्द दाखिल करें" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "कूटशब्द" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d कुंजी लोड किया" +msgstr[1] "%d कुंजियाँ लोड किया" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"अवैध कुंजी आँकड़ा (अनुपस्थित UID). यह किसी कंप्यूटर के कारण हो सकता है जिसका " +"दिनांक भविष्य " +"में सेट हो या स्व हस्ताक्षर अनुपस्थित हो." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG कुंजी" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: तयशुदा कीरिंग निर्देशिका" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1515,7 +1162,8 @@ "This is not a image file, or an unrecognized kind of image file. Try to use " "a JPEG image." msgstr "" -"यह कोई छवि फ़ाइल नहीं है, या कोई अपिरिचित प्रकार की छवि फ़ाइल. JPEG छवि के पकड़े जाने " +"यह कोई छवि फ़ाइल नहीं है, या कोई अपिरिचित प्रकार की छवि फ़ाइल. JPEG छवि के " +"पकड़े जाने " "की कोशिश करें." #: ../pgp/seahorse-gpgme-photos.c:224 @@ -1526,68 +1174,79 @@ msgid "All JPEG files" msgstr "सभी JPEG फाइल" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "सभी फ़ाइलें" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "कुंजी में जोड़ने के लिए फोटो चुनें" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +#, fuzzy +#| msgid "Couldn't add photo" +msgid "Couldn't prepare photo" +msgstr "फोटो जोड़ नहीं सका" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "फोटो जोड़ नहीं सका" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "फ़ाइल लोड नहीं की जा सकी. यह एक अवैध प्रारूप में हो सकता है" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" -msgstr "क्या आप निश्चित हैं कि आप मौजूदा फोटो को अपनी कुंजी से हटाना चाहते हैं?" +msgstr "" +"क्या आप निश्चित हैं कि आप मौजूदा फोटो को अपनी कुंजी से हटाना चाहते हैं?" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "फोटो नहीं मिटा सका" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "उपकुंजी वापस नहीं ले सका" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "वापस लें: %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "कोई कारण नहीं" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "कुंजी वापसीक के लिए कोई कारण नहीं" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "भेदा गया" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "कुंजी के साथ छेड़ छाड़ की गई है" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "सुपरसीडेड" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "कुंजी सुपरसीडेड" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "नहीं प्रयुक्त" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "कुंजी अब नहीं प्रयुक्त" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " @@ -1596,611 +1255,672 @@ "You are about to add %s as a revoker for %s. This operation cannot be " "undone! Are you sure you want to continue?" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "वापस लेने वाला नहीं जोड़ सका" -#: ../pgp/seahorse-gpgme-sign.c:96 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "" + +#: ../pgp/seahorse-gpgme-sign.c:100 +#, c-format +msgid "" +"This key was already signed by\n" +"\"%s\"" +msgstr "" + +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "कुंजी हस्ताक्षर नहीं कर सका" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:149 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "हस्ताक्षर के लिए कोई कुंजी प्रयोग के लायक नहीं" -#: ../pgp/seahorse-gpgme-sign.c:150 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "" -"आपके पास कोई निजी PGP कुंजी नहीं है जो कि इस कुंजी की भरोसे को संकेत देने के लिए प्रयोग की " +"आपके पास कोई निजी PGP कुंजी नहीं है जो कि इस कुंजी की भरोसे को संकेत देने के " +"लिए प्रयोग की " "गई है." -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "गलत कूटशब्द." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s' के लिए नया कूटशब्द दाखिल करें" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "खोज विशिष्ट नहीं था. सर्वर '%s' ने कई कुंजियाँ पाई." -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s' के लिए कूटशब्द दाखिल करें." +msgid "Couldn't communicate with server '%s': %s" +msgstr "सर्वर '%s' के साथ संचार नहीं कर सका: %s" -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "नया कूटशब्द दाखिल करें" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP कुंजी सर्वर" -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "कूटशब्द दाखिल करें" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "कुंजी आयात नहीं कर सका" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "कुंजी सर्वर से कुंजी आयात कर रहा है" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "दूरस्थ (_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "इस विंडो को बन्द करें" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "दूरस्थ कुंजियाँ ढूँढ़ें (_F)..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "कुंजी सर्वर पर कुंजी के लिए खोजें" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "आयात करें (_I)" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "स्थानीय कुंजी रिंग में चुने कुंजियों को आयात करें" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "रिमोट कुंजी" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d कुंजी लोड किया" -msgstr[1] "%d कुंजियाँ लोड किया" +msgid "Remote Keys Containing '%s'" +msgstr "दूरस्थ कुंजी जो '%s' समाहित करता है" + +#: ../pgp/seahorse-keyserver-results.c:485 +#, fuzzy +#| msgid "Searching for keys..." +msgid "The search for keys failed." +msgstr "कुंजी के लिए ढूंढा जा रहा है..." -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "कुंजी लोड हो रहा है." +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "दूरस्थ कुंजी ढूँढ़ें" -#: ../pgp/seahorse-gpgme-source.c:820 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"अवैध कुंजी आँकड़ा (अनुपस्थित UID). यह किसी कंप्यूटर के कारण हो सकता है जिसका दिनांक भविष्य " -"में सेट हो या स्व हस्ताक्षर अनुपस्थित हो." +"यह इंटरनेट पर दूसरे के लिए कुंजी को ढूँढ़ेगा. इन कुंजियों को आपके स्थानीय की " +"रिंग में आयातित " +"किया जाएगा." -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:538 -msgid "Importing Keys" -msgstr "कुंजी आयात कर रहा है" - -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "कुंजी निर्यात किया जा रहा है" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "कुंजी के लिए खोजे जो समाहित करता है (_S): " -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr " कुंजी सर्वर" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr " साझेदारी कुंजी मेरे नजदीक" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "कहाँ खोजना है:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "ढूंढें (_S)" -#: ../pgp/seahorse-hkp-source.c:330 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "सर्वर में कुंजी प्रकाशित नहीं कर सका" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "खोज विशिष्ट नहीं था. सर्वर '%s' ने कई कुंजियाँ पाई." +msgid "Couldn't retrieve keys from server: %s" +msgstr "सर्वर से कुंजियाँ नहीं पा सका: %s" -#: ../pgp/seahorse-hkp-source.c:332 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "सर्वर '%s' के साथ संचार नहीं कर सका: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d कुंजी तुल्यकालन के लिए चयनित है" +msgstr[1] "%d कुंजियाँ तुल्यकालन के लिए चयनित है" -#: ../pgp/seahorse-hkp-source.c:576 -msgid "Searching for keys..." -msgstr "कुंजी के लिए ढूंढा जा रहा है..." +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "कुंजी सिंक्रोनाइज किया जा रहा है." -#: ../pgp/seahorse-hkp-source.c:647 -msgid "Uploading keys..." -msgstr "कुंजी अपलोड किया जा रहा है..." - -#: ../pgp/seahorse-hkp-source.c:725 -msgid "Retrieving keys..." -msgstr "कुंजी पुनःप्राप्त कर रहा है..." - -#: ../pgp/seahorse-hkp-source.c:831 -#, c-format -msgid "Searching for keys on: %s" -msgstr "कुंजी के लिए खोज कर रहा है: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:908 ../pgp/seahorse-hkp-source.c:981 -#: ../pgp/seahorse-ldap-source.c:668 -#, c-format -msgid "Connecting to: %s" -msgstr "इससे कनेक्ट कर रहा है: %s" +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "कुंजी तुल्यकालित करें" -#: ../pgp/seahorse-hkp-source.c:1005 -msgid "HTTP Key Server" -msgstr "HTTP कुंजी सर्वर" +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"यह आपके कीरिंग में कुंजियों को प्रकाशित करेगा ताकि वे दूसरे के लिए प्रयोग के " +"लिए उपलब्ध रहे. " +"आप भी किसी परिवर्तन को पाएँगे जिसे दूसरे ने किया है जब आपने उनकी कुंजी पाई है." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"यह किसी परिवर्तन को प्राप्त करेगा जिसे दूसरे ने किया है जब से आपने उनकी " +"कुंजियों को पाया " +"है. कोई कुंजी सर्वर को नहीं चुना गया है प्रकाशन के लिए, ताकि आपकी कुंजी " +"दूसरों के लिए " +"उपलब्ध नहीं रह पाएँगी." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "कुंजी सर्वर" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "तुल्यकालित करें (_S)" -#: ../pgp/seahorse-ldap-source.c:459 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "'%s' से संचार नहीं कर सका: %s" -#: ../pgp/seahorse-ldap-source.c:641 +#: ../pgp/seahorse-ldap-source.c:652 +#, c-format +msgid "Connecting to: %s" +msgstr "इससे कनेक्ट कर रहा है: %s" + +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "पता हल नहीं कर सका: %s" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "सर्वर पता का हल: %s" -#: ../pgp/seahorse-ldap-source.c:955 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "'%s' समाहित करते कुंजी के लिए खोज..." - -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "'%s' कुंजी आईडी के लिए खोज..." - -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "दूरस्थ कुंजी पुनःप्राप्त कर रहा है..." - -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "कुंजी सर्वर में कुंजी भेजा जा रहा है..." - -#: ../pgp/seahorse-ldap-source.c:1423 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP कुंजी सर्वर" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "हस्ताक्षर कुंजी (_S)..." - -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "सार्वजनिक कुंजी हस्ताक्षर करें" - -#: ../pgp/seahorse-pgp-commands.c:171 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "क्या आप %s को स्थाई रूप से मिटाने के लिए निश्चित हैं?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "तुल्यकालित करें और प्रकाशित करें..." -#: ../pgp/seahorse-pgp-commands.c:176 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "क्या आप %d कुंजी व पहचान को स्थाई रूप से मिटाने के लिए निश्चित हैं?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "जो ऑनलाइन हैं उनसे अपनी कुंजी प्रकाशित और/या तुल्यकालित करें." -#: ../pgp/seahorse-pgp-commands.c:178 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "क्या आप %d कुंजी को स्थाई रूप से मिटाने के लिए निश्चित हैं?" +#: ../pgp/seahorse-pgp-backend.c:172 +#| msgid "PGP Key" +msgid "PGP Keys" +msgstr "पीजीपी कुंजी" -#: ../pgp/seahorse-pgp-commands.c:180 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "क्या आप %d पहचान को स्थाई रूप से मिटाने के लिए निश्चित हैं?" +#: ../pgp/seahorse-pgp-backend.c:175 +#, fuzzy +#| msgid "Used to encrypt email and files" +msgid "PGP keys are for encrypting email or files" +msgstr "ईमेल और फाइल गोपित करने में प्रयुक्त" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr " उन्नत कुंजी विकल्प" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "बनाएँ (_r)" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "कोई PGP कुंजी दूसरे लोगों की ईमेल या फ़ाइलों को गोपित करने की अनुमति देता है." +msgid "Generate a new key" +msgstr "उत्पन्न करें नया कुंजी" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "अलगोरिथम यहाँ" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "बनाएँ (_r)" - -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "समाप्ति तिथि:" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "" +"कोई PGP कुंजी दूसरे लोगों की ईमेल या फ़ाइलों को गोपित करने की अनुमति देता है." -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "Encryption _Type:" -msgstr "गोपन प्रकार:" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "टिप्पणी (_C):" #: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "उत्पन्न करें नया कुंजी" +msgid "Ne_ver Expires" +msgstr "कभी समाप्त नहीं होता है" #: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "Key _Strength (bits):" -msgstr "कुंजी ताकत (bits):" +msgid "Encryption _Type:" +msgstr "गोपन प्रकार:" #: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "कभी समाप्त नहीं होता है" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 +msgid "Key _Strength (bits):" +msgstr "कुंजी ताकत (bits):" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "नया पीजीपी कुंजी" +msgid "E_xpiration Date:" +msgstr "समाप्ति तिथि:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "टिप्पणी (_C):" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr " उन्नत कुंजी विकल्प" -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Private PGP Key" +#: ../pgp/seahorse-pgp-key.c:353 +#| msgid "My _Personal Keys" +msgid "Personal PGP key" msgstr "निजी पीजीपी कुंजी" -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Public PGP Key" -msgstr "सार्वजनिक पीजीपी कुंजी" - -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1347 -msgid "Expired" -msgstr "मियाद ख़त्म" +#: ../pgp/seahorse-pgp-key.c:355 +#| msgid "PGP Key" +msgid "PGP key" +msgstr "पीजीपी कुंजी" -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "प्राथमिक उपयोक्ता आईडी बदल नहीं सका" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "क्या आप वाकई '%s' उपयोक्ता ID को स्थायी रूप से मिटाना चाहते हैं?" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "उपयोक्ता आईडी मिटा नहीं सका" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1462 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[अज्ञात]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1740 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "नाम/ईमेल" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "हस्ताक्षर आईडी" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "प्रधान फोटो नहीं बदल सका" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(अज्ञात)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "यह कुंजी समाप्त होता है: %s" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "नाम" + +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "क्या आप वाकई %d %s की उपकुंजी को स्थाई रूप से मिटाना चाहते हैं?" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "उपकुंजी नहीं मिटा सका" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1425 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "ट्रस्ट नहीं बदलने में असमर्थ" -#: ../pgp/seahorse-pgp-key-properties.c:1005 ../src/seahorse-viewer.c:315 -#: ../ssh/seahorse-ssh-key-properties.c:167 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "\"%s\" में कुंजी निर्यात नहीं कर सका" - -#: ../pgp/seahorse-pgp-key-properties.c:1033 -#: ../ssh/seahorse-ssh-key-properties.c:191 -msgid "Export Complete Key" -msgstr "निर्यात पूर्ण कुंजी" - -#: ../pgp/seahorse-pgp-key-properties.c:1058 -#: ../ssh/seahorse-ssh-key-properties.c:213 -msgid "Couldn't export key." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +#| msgid "Couldn't export key." +msgid "Couldn't export key" msgstr "कुंजी निर्यात नहीं कर सका." -#: ../pgp/seahorse-pgp-key-properties.c:1265 -#: ../pgp/seahorse-pgp-key-properties.c:1354 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "कभी नहीं" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1315 -#: ../src/seahorse-key-manager-store.c:859 +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "आईडी" + +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "प्रकार" -#: ../pgp/seahorse-pgp-key-properties.c:1318 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "उत्पन्न किया" -#: ../pgp/seahorse-pgp-key-properties.c:1321 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "समाप्त" -#: ../pgp/seahorse-pgp-key-properties.c:1324 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "स्तर" -#: ../pgp/seahorse-pgp-key-properties.c:1327 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "ताकत" -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "मियाद ख़त्म" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "अच्छा" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "क्रिया" +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "कुंजी आईडी" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "टिप्पणी:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr " तिथि" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr " ईमेल:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr " फ़िंगरप्रिंट" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr " कुंजी आईडी" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "कभी नहीं" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr " कुंजी नाम और हस्ताक्षर" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "यह कुंजी वापस नहीं लिया जा सका" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Name:" -msgstr "नाम:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"कुंजी के स्वामी ने कुंजी को वापस ले लिया. यह अब प्रयोग नहीं किया जा सकता है." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -msgid "Photo " -msgstr " फोटो" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "इस कुंजी का समय समाप्त हो गया" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -msgid "Technical Details" -msgstr " तकनीकी विवरण" +msgid "Add a photo to this key" +msgstr "इस कुंजी में एक फोटो जोड़ें" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has been revoked" -msgstr "यह कुंजी वापस नहीं लिया जा सका" +msgid "Remove this photo from this key" +msgstr "इस कुंजी से फोटो हटाएँ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -msgid "This key has expired" -msgstr "इस कुंजी का समय समाप्त हो गया" +msgid "Make this photo the primary photo" +msgstr "इस फोटो को प्राथमिक फोटो बनाएँ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Type:" -msgstr "टाइप:" +msgid "Go to previous photo" +msgstr "पिछले फोटो में जाएँ" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -msgid "Use:" -msgstr " उपयोग" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "अगले फोटो में जाएँ" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "_Subkeys" -msgstr "उपकुंजी (_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr " फोटो" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add" -msgstr "जोड़ें" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -msgid "Add a photo to this key" -msgstr "इस कुंजी में एक फोटो जोड़ें" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr " कुंजी आईडी" +#. Name of key, usually a persons name #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "Change _Passphrase" -msgstr "बदलें कूटशब्द" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +#| msgid "Name:" +msgctxt "name-of-key" +msgid "Name:" +msgstr "नाम:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr " ईमेल:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Decrypt files and email sent to you." -msgstr "फ़ाइलों व ईमेल जो आपकी भेजी गई हैं विगोपित करें." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "टिप्पणी:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -msgid "Delete" -msgstr "मिटाएँ" +#. To translators: This is the noun not the verb. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr " उपयोग" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -msgid "Expire" -msgstr "समाप्त" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "टाइप:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Expires:" -msgstr "खत्म होगाः" +msgid "Decrypt files and email sent to you." +msgstr "फ़ाइलों व ईमेल जो आपकी भेजी गई हैं विगोपित करें." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 -msgid "Export" -msgstr "निर्यात" +msgid "Private PGP Key" +msgstr "निजी पीजीपी कुंजी" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "बदलें कूटशब्द" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to next photo" -msgstr "अगले फोटो में जाएँ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "मालिक" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -msgid "Go to previous photo" -msgstr "पिछले फोटो में जाएँ" +msgid "Key Names and Signatures" +msgstr " कुंजी नाम और हस्ताक्षर" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -msgid "Key ID:" -msgstr "कुंजी आईडी:" +msgid "Primary" +msgstr "प्राथमिक" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +msgid "Sign" +msgstr "हस्ताक्षर करें" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 -msgid "Make this photo the primary photo" -msgstr "इस फोटो को प्राथमिक फोटो बनाएँ" +msgid "Delete" +msgstr "मिटाएँ" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -msgid "Names and Signatures" -msgstr "नाम और हस्ताक्षर" +msgid "_Add Name" +msgstr "जोड़ें नाम" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Never" -msgstr "कभी नहीं" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -msgid "Override Owner _Trust:" -msgstr "Override Owner _Trust:" +msgid "Revoke" +msgstr "वापस लें" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Owner" -msgstr "मालिक" +msgid "Names and Signatures" +msgstr "नाम और हस्ताक्षर" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Primary" -msgstr "प्राथमिक" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "कुंजी आईडी:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Remove this photo from this key" -msgstr "इस कुंजी से फोटो हटाएँ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "सामर्थ्य:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Revoke" -msgstr "वापस लें" +msgid "Technical Details" +msgstr " तकनीकी विवरण" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -msgid "Sign" -msgstr "हस्ताक्षर करें" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "Strength:" -msgstr "सामर्थ्य:" +msgid "Fingerprint" +msgstr " फ़िंगरप्रिंट" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "कुंजी के स्वामी ने कुंजी को वापस ले लिया. यह अब प्रयोग नहीं किया जा सकता है." - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 -msgid "_Add Name" -msgstr "जोड़ें नाम" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "खत्म होगाः" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -msgid "_Export Complete Key:" -msgstr "निर्यात पूर्ण कुंजी:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr " तिथि" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr " तिथि" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Override Owner _Trust:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Fingerprint:" -msgstr " फ़िंगरप्रिंट" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 +msgid "_Export Complete Key:" +msgstr "निर्यात पूर्ण कुंजी:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "ट्रस्ट संकेत करें:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +msgid "Actions" +msgstr "क्रिया" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "Your trust of this key" -msgstr "इस कुंजी आपका ट्र्स्ट" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "जोड़ें" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_Other Names:" -msgstr "अन्य नाम (_O):" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "समाप्त" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_People who have signed this key:" -msgstr "लोग जिन्होंने इस कुंजी को हस्ताक्षर किया है (_P):" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "उपकुंजी (_S)" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Encrypt files and email to the key's owner " -msgstr "फ़ाइलों को गोपित करें और की स्वामी को ईमेल करें" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "आंशिक" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 msgid "Fully" msgstr "पूर्णतः" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 +msgid "Ultimately" +msgstr "सर्वश्रेष्ठ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +#, fuzzy +#| msgid "Encrypt files and email to the key's owner " +msgid "Encrypt files and email to the key's owner" +msgstr "फ़ाइलों को गोपित करें और की स्वामी को ईमेल करें" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "सार्वजनिक पीजीपी कुंजी" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +msgid "_Other Names:" +msgstr "अन्य नाम (_O):" + #: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "इस कुंजी आपका ट्र्स्ट" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "आपका ट्रस्ट दस्ती रूप से Details टैब पर निर्दिष्ट है." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "मैं '%s' से दूसरी कुंजियों पर हस्ताक्षर पर भरोसा करता हूँ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "" -"यदि आप भरोसा करते हैं कि व्यक्ति जो कि इस कुंजी का स्वामी है वह है '%s', इस कुंजी के लिए " +"यदि आप भरोसा करते हैं कि व्यक्ति जो कि इस कुंजी का स्वामी है वह है '%s', इस " +"कुंजी के लिए " "हस्ताक्षर करें :" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "यह कुंजी हस्ताक्षर करें (_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format -msgid "If you no longer trust that '%s' owns this key, revoke your signature:" +msgid "" +"If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" -"यदि आप अब भरोसा नहीं करते हैं कि '%s' ने इस कुंजी को स्वामित्व में लिया है, अपने हस्ताक्षर " +"यदि आप अब भरोसा नहीं करते हैं कि '%s' ने इस कुंजी को स्वामित्व में लिया है, " +"अपने हस्ताक्षर " "को वापस लें:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Marginally" -msgstr "आंशिक" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "हस्ताक्षर वापस लें" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -#: ../src/seahorse-key-manager-store.c:853 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "लोग जिन्होंने इस कुंजी को हस्ताक्षर किया है (_P):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "केवल उन लोगों का हस्ताक्षर दिखाएँ जिसपर मैं भरोसा करता है (_O)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 msgid "Trust" msgstr "ट्रस्ट" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 -msgid "Ultimately" -msgstr "सर्वश्रेष्ठ" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "You _Trust the Owner:" -msgstr "आप स्वामी पर ट्रस्ट करते हैं (_T):" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr " फ़िंगरप्रिंट" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "Your trust is manually specified on the Details tab." -msgstr "आपका ट्रस्ट दस्ती रूप से Details टैब पर निर्दिष्ट है." - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Only display the signatures of people I trust" -msgstr "केवल उन लोगों का हस्ताक्षर दिखाएँ जिसपर मैं भरोसा करता है (_O)" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Revoke Signature" -msgstr "हस्ताक्षर वापस लें" +msgid "Dates:" +msgstr " तिथि" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgid "_Sign this Key" -msgstr "यह कुंजी हस्ताक्षर करें (_S)" +msgid "Indicate Trust:" +msgstr "ट्रस्ट संकेत करें:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "आप स्वामी पर ट्रस्ट करते हैं (_T):" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -2208,806 +1928,1394 @@ msgstr "%d उपकुंजी %s का" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "वापसी के अनुकूलतम विवरण" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "वापस करें (_v)" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "कुंजी वापसी के कारण" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "कारण (_R):" -#: ../pgp/seahorse-signer.c:62 -msgid "You have no personal PGP keys that can be used to sign a document or message." +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "वापसी के अनुकूलतम विवरण" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "वापस करें (_v)" + +#: ../pgp/seahorse-signer.c:63 +msgid "" +"You have no personal PGP keys that can be used to sign a document or message." msgstr "" -"आपके पास कोई निजी PGP कुंजी नहीं है जो किसी दस्तावेज या संदेश को हस्ताक्षर करने के लिए " +"आपके पास कोई निजी PGP कुंजी नहीं है जो किसी दस्तावेज या संदेश को हस्ताक्षर " +"करने के लिए " "प्रयोग की जाती है." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "कुंजी के साथ संदेश हस्ताक्षर करें:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "कितनी सावधानी से आपने इस कुंजी जाँचा है?" +msgid "Sign Key" +msgstr "हस्ताक्षर कुंजी" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "कैसे दूसरे इन हस्ताक्षर को देख पाएँगे:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "इसे हस्ताक्षर करके आप अपना भरोसा बताते हैं कि यह कुंजी इसका हिस्सा है:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "कुंजी इस रूप में हस्ताक्षर करें:" +msgid "Key Name" +msgstr "कुंजी नाम" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "Casually: का अर्थ है कि आपने लापरवाही से जाँच की है कि कुंजी उसके द्वारा स्वामित्व में है जो इसके स्वामी होवे ता दावा करता है. उदाहरण के लिए, आप फोन पर कुंजी फिंगरप्रिंट को पढ़ सकते हैं. " +msgid "How carefully have you checked this key?" +msgstr "कितनी सावधानी से आपने इस कुंजी जाँचा है?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "कुंजी नाम" +msgid "_Not at all" +msgstr "सब नहीं (_N)" #: ../pgp/seahorse-sign.xml.h:6 -msgid "" -"Not at all: means you believe the key is owned by the person who " -"claims to own it, but you could not or did not verify this to be a fact." -msgstr "बिलकुल नहीं: का अर्थ है कि आप मानते हैं कि कुंजी उस व्यक्ति के द्वारा स्वामित्व में है जो इसका दावा करता है, लेकिन आप इसकी जाँच नहीं कर सके या नहीं किया." +msgid "_Casually" +msgstr "आराम से (_C)" #: ../pgp/seahorse-sign.xml.h:7 -msgid "" -"Very Carefully: Select this only if you are absolutely sure that this " -"key is genuine." -msgstr "बहुत सावधानी से: इसे केवल तभी चुनें जब आप पूरी तरह से निश्चित हैं कि यह कुंजी सही है." +msgid "_Very Carefully" +msgstr "बहुत ध्यान से (_V)" #: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "इसे हस्ताक्षर करके आप अपना भरोसा बताते हैं कि यह कुंजी इसका हिस्सा है:" +msgid "" +"Not at all: means you believe the key is owned by the person who " +"claims to own it, but you could not or did not verify this to be a fact." +msgstr "" +"बिलकुल नहीं: का अर्थ है कि आप मानते हैं कि कुंजी उस व्यक्ति के द्वारा " +"स्वामित्व में है " +"जो इसका दावा करता है, लेकिन आप इसकी जाँच नहीं कर सके या नहीं किया." #: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "मैं इस हस्ताक्षर को बाद के दिनों में वापस ले सकता हूँ (_r)" +#| msgid "" +#| "Casually: means you have done a casual verification that the key " +#| "is owned by the person who claims to own it. For example, you could read " +#| "the key fingerprint to the owner over the phone. " +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"कैजुअली: का अर्थ है कि आपने लापरवाही से जाँच की है कि कुंजी उसके " +"द्वारा " +"स्वामित्व में है जो इसके स्वामी होवे ता दावा करता है. उदाहरण के लिए, आप फोन " +"पर कुंजी " +"फिंगरप्रिंट को पढ़ सकते हैं. " #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "हस्ताक्षर कुंजी" +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "" +"बहुत सावधानी से: इसे केवल तभी चुनें जब आप पूरी तरह से निश्चित हैं कि " +"यह कुंजी सही है." #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " "personally check that the name on the key is correct. You should have also " "used email to check that the email address belongs to the owner." -msgstr "आप इसका प्रयोग फोटो पहचान के लिए कर सकते हैं (जैसे कि पासपोर्ट) व्यक्तिगत रूप से जाँचने के लिए कि कुंजी का नाम सही है. आपको जरूर ईमेल को प्रयोग करना चाहिए जो ईमेल पता स्वामी का अवयव है." +msgstr "" +"आप इसका प्रयोग फोटो पहचान के लिए कर सकते हैं (जैसे कि पासपोर्ट) व्यक्तिगत रूप " +"से जाँचने के " +"लिए कि कुंजी का नाम सही है. आपको जरूर ईमेल को प्रयोग करना चाहिए जो ईमेल पता " +"स्वामी " +"का अवयव है." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "आराम से (_C)" +msgid "How others will see this signature:" +msgstr "कैसे दूसरे इन हस्ताक्षर को देख पाएँगे:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "सब नहीं (_N)" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "अन्य हस्ताक्षर नहीं देख सकते हैं (_O)" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "मैं इस हस्ताक्षर को बाद के दिनों में वापस ले सकता हूँ (_r)" + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "हस्ताक्षर" +msgid "Sign key as:" +msgstr "कुंजी इस रूप में हस्ताक्षर करें:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "हस्ताक्षरकर्ता (_S):" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "बहुत ध्यान से (_V)" +msgid "_Sign" +msgstr "हस्ताक्षर" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "कुंजी के साथ संदेश हस्ताक्षर करें:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +#| msgid "Exporting Keys" +msgid "Exporting data" +msgstr "आँकड़ा निर्यात किया जा रहा है" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +#| msgid "Retrieving keys" +msgid "Retrieving data" +msgstr "आँकड़ा प्राप्त कर रहा है" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +#| msgid "Importing Keys" +msgid "Importing data" +msgstr "महत्वपूर्ण आँकड़ा" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "आँकड़ा भेज रहा है" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "अनुपलब्ध" + +#: ../pkcs11/seahorse-certificate.c:435 +#, fuzzy +#| msgid "Generate a new key" +msgid "Personal certificate and key" +msgstr "उत्पन्न करें नया कुंजी" + +#: ../pkcs11/seahorse-certificate.c:438 +#| msgid "Certificate" +msgid "Personal certificate" +msgstr "निजी प्रमाणपत्र" -#: ../pkcs11/seahorse-pkcs11-certificate.c:107 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:68 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "प्रमाणपत्र" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "क्या आप वाकई '%s' प्रमाणपत्र को मिटाना चाहते हैं?" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "प्रमाणपत्र (DER एन्कोडेड)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +#| msgid "Certificate" +msgid "Certificates" +msgstr "प्रमाणपत्र" -#: ../pkcs11/seahorse-pkcs11-commands.c:111 +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 #, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "क्या आप वाकई %d प्रमाणपत्र को मिटाना चाहते हैं?" -msgstr[1] "क्या आप वाकई %d प्रमाणपत्रों को मिटाना चाहते हैं?" +#| msgid "Are you sure you want to permanently delete %d identities?" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "क्या आप %d प्रमाणपत्र को स्थाई रूप से मिटाने के लिए निश्चित हैं?" +msgstr[1] "क्या आप %d प्रमाणपत्र को स्थाई रूप से मिटाने के लिए निश्चित हैं?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +#| msgid "Couldn't generate key" +msgid "Couldn't generate private key" +msgstr "निजी कुंजी नहीं बना सका" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +#| msgid "Created" +msgid "Create" +msgstr "बनायें" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +#| msgid "Private Key" +msgid "Private key" +msgstr "निजी कुंजी" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#, fuzzy +#| msgid "Create a new key or item" +msgid "Create a new private key" +msgstr "नई कुंजी या मद बनाएँ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "लेबल:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#, fuzzy +#| msgid "Stored Password" +msgid "Stored at:" +msgstr "जमा कूटशब्द" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "बेनाम" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +#| msgid "Couldn't delete." +msgid "Couldn't delete" +msgstr "मिटा नहीं सका" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +#| msgid "Export" +msgid "_Export" +msgstr "निर्यात करें (_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +#, fuzzy +#| msgid "Export to a file" +msgid "Export the certificate" +msgstr "एक फ़ाइल में निर्यात करें" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "इस प्रमाणपत्र या कुंजी मिटाएँ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#| msgid "Certificate" +msgid "Request _Certificate" +msgstr "आग्रह प्रमाणपत्र (_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +#, fuzzy +#| msgid "No private key file is available for this key." +msgid "Create a certificate request file for this key" +msgstr "इस कुंजी के लिए कोई निजी कुंजी फ़ाइल उपलब्ध नहीं है." + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +#, fuzzy +#| msgid "Couldn't verify signature." +msgid "Couldn't save certificate request" +msgstr "हस्ताक्षर जाँच नहीं सका." + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +#| msgid "Certificate" +msgid "Certificate request" +msgstr "प्रमाणपत्र निवेदन" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +#, fuzzy +#| msgid "couldn't create new process group" +msgid "Couldn't create certificate request" +msgstr "नयी प्रक्रिया समूह नहीं बना सका" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +#| msgid "_Name:" +msgid "Name (CN):" +msgstr "नाम (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +#| msgid "Private Key" +msgid "Unnamed private key" +msgstr "बेनाम निजी कुंजी" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "बदलें कूटशब्द" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "कूटशब्द की पुष्टि करें:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "नया कूटशब्द:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "नया कूटशब्द की पुष्टि करें" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "नया कूटशब्द:" +msgid "Con_firm Passphrase:" +msgstr "कूटशब्द की पुष्टि करें:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "अपना कूटशब्द और गोपन कुंजी प्रबंधित करें" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:853 -msgid "Passwords and Encryption Keys" -msgstr "कूटशब्द व गोपन कुंजी" +#: ../src/seahorse-generate-select.c:229 +#| msgid "C_ontinue" +msgid "Continue" +msgstr "जारी रखें" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "बनाने के लिए मद का प्रकार चुनें (_S):" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "जारी रखें (_o)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "बनाएँ नया." - -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d कुंजी चयनित" -msgstr[1] "%d कुंजियाँ चयनित" - -#: ../src/seahorse-key-manager.c:404 ../src/seahorse-key-manager.c:464 -#: ../src/seahorse-key-manager.c:527 ../src/seahorse-viewer.c:482 -msgid "Couldn't import keys" -msgstr "कुंजी आयात नहीं कर सका" - -#: ../src/seahorse-key-manager.c:409 ../src/seahorse-viewer.c:487 -msgid "Imported keys" -msgstr "आयात कुंजी" - -#: ../src/seahorse-key-manager.c:458 -msgid "Importing keys" -msgstr "कुंजी आयात कर रहा है" +#: ../src/seahorse-import-dialog.c:98 +#| msgid "Import from a file" +msgid "Import failed" +msgstr "आयात विफल" + +#: ../src/seahorse-import-dialog.c:116 +#| msgid "_Import" +msgid "Import" +msgstr "आयात" + +#: ../src/seahorse-import-dialog.c:129 +#, fuzzy +#| msgid "Dates:" +msgid "Data to be imported:" +msgstr " तिथि" -#: ../src/seahorse-key-manager.c:481 ../ssh/seahorse-ssh-operation.c:1017 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "कुंजी आयात करें" -#: ../src/seahorse-key-manager.c:527 -msgid "Unrecognized key type, or invalid data format" -msgstr "अपरिचित कुंजी प्रकार, या अवैध आँकड़ा प्रारूप" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "सभी कुंजी फाइल" -#: ../src/seahorse-key-manager.c:721 ../src/seahorse-keyserver-results.c:207 -msgid "_Remote" -msgstr "दूरस्थ (_R)" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "क्लिपबोर्ड पाठ" + +#: ../src/seahorse-key-manager.c:509 +#| msgid "_New..." +msgid "_New" +msgstr "नया (_N)" -#: ../src/seahorse-key-manager.c:723 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "यह प्रोग्राम बंद करें" -#: ../src/seahorse-key-manager.c:724 -msgid "_New..." -msgstr "नया (_N)..." +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "नया (_N)..." + +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "नई कुंजी या मद बनाएँ" + +#: ../src/seahorse-key-manager.c:515 +#, fuzzy +#| msgid "Create a new key or item" +msgid "Add a new key or item" +msgstr "नई कुंजी या मद बनाएँ" + +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "आयात करें (_I)..." + +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "किसी फाइल से आयात करें" + +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "किसी क्लिपबोर्ड से आयात करें" + +#: ../src/seahorse-key-manager.c:523 +#| msgid "_Keyring:" +msgid "By _keyring" +msgstr "कीरिंग के अनुसार (_k)" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "" + +#: ../src/seahorse-key-manager.c:528 +#, fuzzy +#| msgid "Show properties" +msgid "Show _personal" +msgstr "दिखाएँ गुण" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "" + +#: ../src/seahorse-key-manager.c:737 +#| msgid "Filter:" +msgid "Filter" +msgstr "फ़िल्टर" + +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr " प्रथम समय विकल्प" + +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "स्वयं अपनी नई कुंजी बनाएँ: " + +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "मौजूदा कुंजी को किसी फ़ाइल से आयात करें:" + +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "गोपन के साथ शुरू करने के लिए आपको कुंजी की जरूरत है." + +#: ../src/seahorse-sidebar.c:799 +#| msgid "Couldn't lock keyring" +msgid "Couldn't lock" +msgstr "बंद नहीं कर सका" + +#: ../src/seahorse-sidebar.c:836 +#| msgid "Couldn't unlock keyring" +msgid "Couldn't unlock" +msgstr "खोल नहीं सका" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "खोलें (_L)" + +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "अनलॉक करें (_U)" + +#: ../src/seahorse-sidebar.c:968 +#| msgid "Key Properties" +msgid "_Properties" +msgstr "गुण (_P)" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "सिक्योर शेल के लिए कुंजी विन्यस्त करें (_S)..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"सार्वजनिक सिक्योर शेल कुंजी को दूसरे मशीन में भेजता है, और उस कुंजी के प्रयोग " +"लॉगिन सक्रिय " +"करें." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "अपना सिक्योर शेल कूटशब्द दाखिल करें:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "पुराना कुंजी कूटशब्द" + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "इसके लिए पुराना कूटशब्द दाखिल करें: %s" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "नया कुंजी कूटशब्द" + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "इसके लिए नया कूटशब्द दाखिल करें: %s" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, fuzzy, c-format +#| msgid "Enter the new passphrase for: %s" +msgid "Enter the new passphrase again: %s" +msgstr "इसके लिए नया कूटशब्द दाखिल करें: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +#| msgid "Secure Shell Key" +msgid "Secure Shell" +msgstr "सिक्योर शेल कुंजी" + +#: ../ssh/seahorse-ssh-backend.c:94 +#, fuzzy +#| msgid "Used to connect to other computers." +msgid "Keys used to connect securely to other computers" +msgstr "दूसरे कंप्यूटर के साथ कनेक्ट होने के लिए प्रयुक्त." + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "क्या आप वाकई '%s' सिक्योर शेल कुंजी को मिटाना चाहते हैं?" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +#| msgid "Are you sure you want to delete %d secure shell keys?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "क्या आप वाकई %d सिक्योर शेल कुंजी को मिटाना चाहते हैं?" +msgstr[1] "क्या आप वाकई %d सिक्योर शेल कुंजी को मिटाना चाहते हैं?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +#| msgid "Sign Key" +msgid "Ssh Key" +msgstr "Ssh कुंजी" + +#: ../ssh/seahorse-ssh-exporter.c:122 +#| msgid "Secure Shell key" +msgid "Secret SSH keys" +msgstr "गुप्त SSH कुंजी" + +#: ../ssh/seahorse-ssh-exporter.c:126 +#| msgid "Public Key" +msgid "Public SSH keys" +msgstr "सार्वजनिक SSH कुंजी" + +#: ../ssh/seahorse-ssh-exporter.c:290 +#, fuzzy +#| msgid "No private key file is available for this key." +msgid "No public key file is available for this key." +msgstr "इस कुंजी के लिए कोई निजी कुंजी फ़ाइल उपलब्ध नहीं है." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "सिक्योर शेल कुंजी" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "दूसरे कंप्यूटर की पहुँच में असमर्थ (उदा: टर्मिनल से होकर)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "सिक्योर शेल कुंजी नहीं उत्पन्न कर सका" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "सिक्योर शेल कुंजी बना रहा है" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "नया सिक्योर शेल कुंजी" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "सिर्फ कुंजी बनाएं (_J)" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "बनाएं और सेटअप करें (_C)" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +#, fuzzy +#| msgid "" +#| "A Secure Shell (SSH) key lets you connect securely to trusted computers " +#| "using SSH, without entering a different password for each of them." +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"सिक्योर शेल (SSH) कुंजी आपको सुरक्षित रूप से कनेक्ट करने की अनुमति देता है " +"भरोसेमेंद कंप्यूटर को " +"SSH के प्रयोग से, बिना भिन्न कूटशब्द को उनमें से प्रत्येक के लिए दाखिल किए." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +#| msgid "" +#| "Use your email address, and any other reminder you need about what " +#| "this key is for." +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"अपने ईमेल पता या दूसरे अनुस्मारक का जिसे आपको जरूरत है कि यह कुंजी " +"किससे के लिए है." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +#, fuzzy +#| msgid "" +#| "If there is already a computer you want to use this key with, you can set " +#| "up that computer to recognize your key now. " +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"यदि पहले से एक कंप्यूटर है जिसे आप इस कुंजी के साथ प्रयोग करना चाहते हैं, आप " +"उन कंप्यूटर को " +"सेट अफ करना चाहते हैं अपनी कुंजी को अब जानने के लिए. " + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(अपठनीय सिक्योर शेल की)" + +#: ../ssh/seahorse-ssh-key.c:218 +#| msgid "My _Personal Keys" +msgid "Personal SSH key" +msgstr "निजी SSH कुंजी" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH कुंजी" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "कुंजी का फिर नाम नहीं दे सका." + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "कुंजी के लिए सत्यापन नहीं बदल सका" + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "कुंजी के लिए कूटशब्द बदल नहीं सका." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "पहचानकर्ता:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +#| msgid "Name:" +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "नाम:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "दूसरे कंप्यूटर के साथ कनेक्ट होने के लिए प्रयुक्त." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "विश्वास" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"इस कुंजी का स्वामी इस कंप्यूटर के साथ कनेक्ट होने के लिए अधिकृत है (_a)" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, fuzzy, no-c-format +#| msgid "This only applies to the '%s' account." +msgid "This only applies to the %s account." +msgstr "यह केवल '%s' खाता पर लागू होता है." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "अलगोरिथम:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "शक्ति:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "अवस्थिति:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "पूरी कुंजी भेजें (_x)" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH कमांड को अप्रत्याशित रूप से रोक दिया गया." + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH कमांड विफल रहा." + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "रिमोट होस्ट कूटशब्द" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "कुंजी कूटशब्द दाखिल करें" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "नए सिक्योर शेल कुंजी के लिए कूटशब्द" + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "कुंजी आयात कर रहा है: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "कुंजी आयात कर रहा है. कूटशब्द प्रविष्ट करें" + +#: ../ssh/seahorse-ssh-source.c:232 +#| msgid "Copied keys" +msgid "OpenSSH keys" +msgstr "OpenSSH कुंजी" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "इस कुंजी के लिए कोई निजी कुंजी फ़ाइल उपलब्ध नहीं है." + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "सिक्योर शेल कुंजी को दूरस्थ कंप्यूटर पर विन्यस्त नहीं कर सका." + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "सिक्योर शेल कुंजी बिन्यस्त कर रहा है..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "SSH संबंधन के लिए कंप्यूटर सेटअप करें" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"अपनी सिक्योर शेल कुंजी को दूसरे कंप्यूटर के साथ प्रयोग करने के लिए जो कि SSH " +"का प्रयोग " +"करता है, आपको जरूर अपने उस कंप्यूटर पर लॉगिन खाता रखना चाहिए." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "उदा: fileserver.example.com:port" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "कंप्यूटर नाम (_C):" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "लागिन नाम (_L)" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "सेट अप (_S)" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "सीहॉर्स डेमॉन को बतौर डेमॉन मत चलाएँ" + +#~ msgid "couldn't fork process" +#~ msgstr "प्रक्रिया तोड़ नहीं सका" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "गोपन डेमॉन (Seahorse)" + +#~ msgid "Seahorse Daemon" +#~ msgstr "सीहोर्स डेमॉन" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "अवैध या अपरिचित कुंजी प्रकार: %s" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "अवैध या अपरिचित कुंजी: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr " expired के द्वारा %s पर हस्ताक्षरित." + +#~ msgid "Invalid Signature" +#~ msgstr "अवैध हस्ताक्षर" + +#~ msgid "Signed by on %s Expired." +#~ msgstr " के द्वारा %s Expired पर हस्ताक्षरित." + +#~ msgid "Expired Signature" +#~ msgstr "समय समाप्त हस्ताक्षर" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr " Revoked के द्वारा %s पर हस्ताक्षरित." + +#~ msgid "Revoked Signature" +#~ msgstr "वापस लिया हस्ताक्षर" + +#~ msgid "Signed by on %s." +#~ msgstr " के द्वारा %s पर हस्ताक्षरित." + +#~ msgid "Good Signature" +#~ msgstr "अच्छा हस्ताक्षर" + +#~ msgid "Signing key not in keyring." +#~ msgstr "कीरिंग में हस्ताक्षर कुंजी नहीं" + +#~ msgid "Unknown Signature" +#~ msgstr "अज्ञात हस्ताक्षर" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "खराब या बिगड़ा हुआ हस्ताक्षर. हस्ताक्षरित आँकड़ा बदला गया था." + +#~ msgid "Bad Signature" +#~ msgstr "खराब हस्ताक्षर" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "अवैध या अपरिचित हस्ताक्षरकर्ता: %s" + +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "कुंजी हस्ताक्षर के लिए वैध नहीं है: %s" + +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "अवैध या अपरिचित प्राप्तकर्ता: %s" + +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "कुंजी गोपन के लिए वैध प्राप्तकर्ता नहीं है: %s" + +#~ msgid "No recipients specified" +#~ msgstr "कोई प्राप्तकर्ता निर्दिष्ट नहीं" + +#~ msgid "No signer specified" +#~ msgstr "कोई हस्ताक्षरकर्ता निर्दिष्ट नहीं" + +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "अवैध कुंजी प्रकार विगोपन के लिए: %s" + +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "अवैध कुंजी प्रकार जाँच के लिए: %s" + +#~ msgid "Invalid key id: %s" +#~ msgstr "अवैध कुंजी आईडी: %s" + +#~ msgid "Couldn't share keys" +#~ msgstr "कुंजी साझा नहीं कर सका" + +#~ msgid "Can't publish discovery information on the network." +#~ msgstr "संजाल पर खोज सूचना नहीं प्रकाशित कर सका." + +#~ msgid "%s's encryption keys" +#~ msgstr "%s की गोपन कुंजी" + +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "दूरस्थ PGP कुंजी के लिए कुंजी सर्वर URI की सूची. बाद के संस्करण में प्रदर्शन नाम को शामिल " +#~ "किया जा सकता है, एक स्थान जोड़कर और फिर नाम." + +#~ msgid "Auto Retrieve Keys" +#~ msgstr "कुंजी स्वतः पाएँ" + +#~ msgid "Auto Sync Keys" +#~ msgstr "कुंजी स्वतः तुल्यकालित करें" + +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "कुंजी प्रबंधक के समय समाप्त हुए स्तंभ के लिए दृश्यता नियंत्रित करता है." + +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "कुंजी प्रबंधक के विश्वसनीय संत हुए स्तंभ के लिए दृश्यता नियंत्रित करता है." + +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "कुंजी प्रबंधक के प्रकार स्तंभ के लिए दृश्यता नियंत्रित करता है." + +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "कुंजी प्रबंधक के वैधता स्तंभ के लिए दृश्यता नियंत्रित करता है." + +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "DNS-SD साझा सक्रिय करें" + +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "DNS-SD (Apple Bonjour) कुंजी साझाकरण चल रहा है. सीहॉर्स डेमॉन को जरूर चलना " +#~ "चाहिए और जरूर HKP और DNS-SD समर्थन के साथ निर्मित होना चाहिए." + +#~ msgid "ID of the default key" +#~ msgstr "तयशुदा कुंजी की आईडी" + +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "यदि सही पर सेट है, तब सीहॉर्स से गोपित फ़ाइलें ASCII आर्मर एन्कोडेड होंगी." + +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "यदि सही पर सेट है, फिर तयशुदा कुंजी को गोपन प्राप्तकर्ता सूची में हमेशा जोड़ा जाएगा." + +#~ msgid "Last key server search pattern" +#~ msgstr "अंतिम कुंजी सर्वर खोज प्रारूप" + +#~ msgid "Last key servers used" +#~ msgstr "अंतिम कुंजी सर्वर प्रयुक्त" + +#~ msgid "Last key used to sign a message." +#~ msgstr "किसी संदेश को हस्ताक्षरित करने के अंतिम कुंजी." -#: ../src/seahorse-key-manager.c:725 -msgid "Create a new key or item" -msgstr "नई कुंजी या मद बनाएँ" +#~ msgid "PGP Key servers" +#~ msgstr "PGP कुंजी सर्वर" -#: ../src/seahorse-key-manager.c:726 -msgid "_Import..." -msgstr "आयात करें (_I)..." +#~ msgid "Publish keys to this key server." +#~ msgstr "इस कुंजी सर्वर में कुंजी प्रकाशित करें." -#: ../src/seahorse-key-manager.c:727 -msgid "Import from a file" -msgstr "किसी फाइल से आयात करें" +#~ msgid "Show expires column in key manager" +#~ msgstr "कुंजी प्रबंधक में समय समाप्त स्तंभ दिखाएँ" -#: ../src/seahorse-key-manager.c:729 -msgid "Import from the clipboard" -msgstr "किसी क्लिपबोर्ड से आयात करें" +#~ msgid "Show trust column in key manager" +#~ msgstr "कुंजी प्रबंधक में ट्रस्ट स्तंभ दिखाएँ" -#: ../src/seahorse-key-manager.c:734 ../src/seahorse-keyserver-results.c:217 -msgid "_Find Remote Keys..." -msgstr "दूरस्थ कुंजियाँ ढूँढ़ें (_F)..." +#~ msgid "Show type column in key manager" +#~ msgstr "कुंजी प्रबंधक में प्रकार स्तंभ दिखाएँ" -#: ../src/seahorse-key-manager.c:735 ../src/seahorse-keyserver-results.c:218 -msgid "Search for keys on a key server" -msgstr "कुंजी सर्वर पर कुंजी के लिए खोजें" +#~ msgid "Show validity column in key manager" +#~ msgstr "कुंजी प्रबंधक में वैधता स्तंभ दिखाएँ" -#: ../src/seahorse-key-manager.c:736 -msgid "_Sync and Publish Keys..." -msgstr "तुल्यकालित करें और प्रकाशित करें..." +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "स्तंभ निर्दिष्ट करें जिससे प्राप्तकर्ता विंडो को छाँटना है. स्तंभ हैं: 'name' और 'id'. कोई " +#~ "'-' को स्तंभ नाम के सामने रखें अवरोही क्रम में छाँटने के लिए." -#: ../src/seahorse-key-manager.c:737 -msgid "Publish and/or synchronize your keys with those online." -msgstr "जो ऑनलाइन हैं उनसे अपनी कुंजी प्रकाशित और/या तुल्यकालित करें." +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "स्तंभ निर्दिष्ट करें जिससे सीहॉर्स कुंजी प्रबंधक विंडो को छाँटना है. स्तंभ हैं: 'name' 'id', " +#~ "'validity', 'expires', 'trust', और 'type'. कोई '-' को स्तंभ नाम के सामने रखें " +#~ "अवरोही क्रम में छाँटने के लिए." -#: ../src/seahorse-key-manager.c:742 -msgid "T_ypes" -msgstr "प्रकार" +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "अंतिम गुप्त कुंजी की ID किसी संदेश के हस्ताक्षर के लिए." -#: ../src/seahorse-key-manager.c:742 -msgid "Show type column" -msgstr "दिखाएँ प्रकार स्तंभ" - -#: ../src/seahorse-key-manager.c:744 -msgid "_Expiry" -msgstr "समय समाप्ति (_E)" - -#: ../src/seahorse-key-manager.c:744 -msgid "Show expiry column" -msgstr "दिखाएँ समाप्ति स्तंभ" - -#: ../src/seahorse-key-manager.c:746 -msgid "_Trust" -msgstr "ट्रस्ट (_T)" - -#: ../src/seahorse-key-manager.c:746 -msgid "Show owner trust column" -msgstr "दिखाएँ स्वामी ट्रस्ट स्तंभ" - -#: ../src/seahorse-key-manager.c:748 -msgid "_Validity" -msgstr "वैधता" - -#: ../src/seahorse-key-manager.c:748 -msgid "Show validity column" -msgstr "दिखाएँ वैधता स्तंभ" - -#: ../src/seahorse-key-manager.c:922 -msgid "Filter:" -msgstr "फ़िल्टर:" +#~ msgid "The column to sort the recipients by" +#~ msgstr "प्राप्तकर्ता को इससे छाँटने के लिए स्तंभ" -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr " प्रथम समय विकल्प" +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "सीहॉर्स कुंजी को इससे छाँटने के लिए स्तंभ" -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "स्वयं अपनी नई कुंजी बनाएँ: " +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "मुख्य सर्वर जिसमें PGP कुंजी को प्रकाशित करना है. या PGP कुंजी को जबरदस्ती प्रकाशन के " +#~ "लिए रिक्त." -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "मौजूदा कुंजी को किसी फ़ाइल से आयात करें:" +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "" +#~ "अंतिम कुंजी सर्वर जिसके लिए खोज को किया गया था या सभी कुंजी सर्वर के लिए सर्वर." -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "मेरा निजी कुंजी" +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "किसी मुख्य सर्वर के लिए अंतिम खोज प्रारूप." -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "अन्य कुंजियाँ (_K)" +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "यह खास संक्रिया के लिए तयशुदा कुंजी को निर्दिष्ट करता है, मुख्यतः हस्ताक्षर के लिए." -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "गोपन के साथ शुरू करने के लिए आपको कुंजी की जरूरत है." +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "क्या कुंजी को की सर्वर से स्वतः प्राप्त करना है या नहीं." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:546 -msgid "_Import" -msgstr "आयात करें (_I)" +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "क्या रूपांतरित कुंजी को स्वतः तुल्यकालित करना है तयशुदा कुंजी सर्वर से." -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "कूटशब्द (_P)" +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "क्या हमेशा तयशुदा कुंजी को गोपित करना है" -#: ../src/seahorse-key-manager-store.c:648 ../src/seahorse-viewer.c:282 -msgid "Couldn't export keys" -msgstr "कुंजी निर्यात नहीं कर सका" +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "क्या ASCII आर्मर का प्रयोग करना है" -#: ../src/seahorse-key-manager-store.c:846 -msgid "Validity" -msgstr "वैधता" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:865 -msgid "Expiration Date" -msgstr "समाप्ति तिथि" +#~ msgid "Web Password" +#~ msgstr "वेब कूटशब्द" -#: ../src/seahorse-keyserver-results.c:209 -msgid "Close this window" -msgstr "इस विंडो को बन्द करें" +#~ msgid "Couldn't set application access." +#~ msgstr "अनुप्रयोग पहुँच सेट नहीं कर सका." -#: ../src/seahorse-keyserver-results.c:210 -msgid "_Expand All" -msgstr "सभी विस्तारित करें (_E)" - -#: ../src/seahorse-keyserver-results.c:211 -msgid "Expand all listings" -msgstr "सभी सूची फैलाएँ" - -#: ../src/seahorse-keyserver-results.c:212 -msgid "_Collapse All" -msgstr "सभी संकुचित करें (_C)" - -#: ../src/seahorse-keyserver-results.c:213 -msgid "Collapse all listings" -msgstr "सभी सूची समेटें" +#~ msgid "Path:" +#~ msgstr " पथ" -#: ../src/seahorse-keyserver-results.c:275 -msgid "Remote Keys" -msgstr "रिमोट कुंजी" +#~ msgid "Permissions:" +#~ msgstr "अनुमति:" -#: ../src/seahorse-keyserver-results.c:277 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "दूरस्थ कुंजी जो '%s' समाहित करता है" +#~ msgid "Applications" +#~ msgstr "अनुप्रयोग" -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr " कुंजी सर्वर" +#~ msgid "_Read" +#~ msgstr "पढ़ें (_R)" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr " साझेदारी कुंजी मेरे नजदीक" +#~ msgid "_Write" +#~ msgstr "लिखें (_W)" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "दूरस्थ कुंजी ढूँढ़ें" +#~ msgid "Passwords: %s" +#~ msgstr "कूटशब्द: %s" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "यह इंटरनेट पर दूसरे के लिए कुंजी को ढूँढ़ेगा. इन कुंजियों को आपके स्थानीय की रिंग में आयातित किया जाएगा." +#~ msgid "Passwords: %s" +#~ msgstr " कूटशब्द: %s" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "कहाँ खोजना है:" +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "कूटशब्द भंडार कीरिंग को लॉक करें ताकि एक प्रधान कूटशब्द इसे खोलने के लिए जरूरी हो." -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "ढूंढें (_S)" +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "कूटशब्द भंडार कीरिंग को अनलॉक करें ताकि एक प्रधान कूटशब्द इसे खोलने के लिए उपलब्ध हो." -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "कुंजी के लिए खोजे जो समाहित करता है (_S): " +#~ msgid "Access to the key ring was denied" +#~ msgstr "इस कीरिंग में पहुँच मना किया गया" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "सर्वर में कुंजी प्रकाशित नहीं कर सका" +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "गनोम कीरिंग डेमॉन चल नहीं रहा है" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "सर्वर से कुंजियाँ नहीं पा सका: %s" +#~ msgid "The key ring has already been unlocked" +#~ msgstr "यह कुंजीरिंग पहले से खुला नहीं है" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d कुंजी तुल्यकालन के लिए चयनित है" -msgstr[1] "%d कुंजियाँ तुल्यकालन के लिए चयनित है" +#~ msgid "No such key ring exists" +#~ msgstr "कोई ऐसा कुंजी मौजूद नहीं है" -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "कुंजी सिंक्रोनाइज किया जा रहा है" +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "कीरिंग डेमॉन के साथ संचार नहीं कर सका" -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "कुंजी सिंक्रोनाइज किया जा रहा है." +#~ msgid "The item already exists" +#~ msgstr "मद पहले से मौजूद है" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "X keys are selected for synchronizing" -msgstr "X कुंजी को तुल्यकालन के लिए चुना गया है" +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "आंतरिक त्रुटि गनोम कीरिंग की पहुँच पाने में" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "Sync Keys" -msgstr "कुंजी तुल्यकालित करें" +#~ msgid "Saving item..." +#~ msgstr "सहेज रहा है मद." -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "यह आपके कीरिंग में कुंजियों को प्रकाशित करेगा ताकि वे दूसरे के लिए प्रयोग के लिए उपलब्ध रहे. आप भी किसी परिवर्तन को पाएँगे जिसे दूसरे ने किया है जब आपने उनकी कुंजी पाई है." +#~ msgid "Deleting item..." +#~ msgstr "मिटा रहे मद..." -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "यह किसी परिवर्तन को प्राप्त करेगा जिसे दूसरे ने किया है जब से आपने उनकी कुंजियों को पाया है. कोई कुंजी सर्वर को नहीं चुना गया है प्रकाशन के लिए, ताकि आपकी कुंजी दूसरों के लिए उपलब्ध नहीं रह पाएँगी." +#~ msgid "Deleting keyring..." +#~ msgstr "मिटा रहे कीरिंग..." -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Key Servers" -msgstr "कुंजी सर्वर" +#~ msgid "Listing password keyrings" +#~ msgstr "अनुसूचन कूटशब्द कीरिंग" -#: ../src/seahorse-keyserver-sync.xml.h:6 -msgid "_Sync" -msgstr "तुल्यकालित करें (_S)" +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "कोई गोपन कुंजी नहीं पाई गई थी जिसके साथ आपके द्वारा किए गए संक्रिया को करना है. " +#~ "प्रोग्राम Passwords and Encryption Keys अब आरंभ किया जाएगा जिसे या तो " +#~ "आप किसी कुंजी को बना सकते हैं या कोई एक बना सकते हैं." -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "इस अनुप्रयोग का संस्करण" +#~ msgid "All Keys" +#~ msgstr "सभी कुंजी" -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:170 -msgid "Encryption Key Manager" -msgstr "गोपन कुंजी प्रबंधक" +#~ msgid "Selected Recipients" +#~ msgstr "चयनित प्राप्तकर्ता" -#: ../src/seahorse-viewer.c:141 -msgid "Contributions:" -msgstr "योगदान:" +#~ msgid "Search Results" +#~ msgstr "खोज परिणाम" -#: ../src/seahorse-viewer.c:172 -msgid "translator-credits" -msgstr "राजेश रंजन (rranjan@redhat.com; rajesh672@gmail.com)" +#~ msgid "Search _for:" +#~ msgstr "इसके लिए ढूंढें :" -#: ../src/seahorse-viewer.c:175 -msgid "Seahorse Project Homepage" -msgstr "सीहोर्स परियोजना मुख पृष्ठ" +#~ msgid "None (Don't Sign)" +#~ msgstr "कुछ नहीं (हस्ताक्षर नहीं करें)" -#. Top menu items -#: ../src/seahorse-viewer.c:194 -msgid "_File" -msgstr "फ़ाइल (_F)" +#~ msgid "Sign this message as %s" +#~ msgstr "हस्ताक्षर यह संदेश जैसे %s" -#: ../src/seahorse-viewer.c:195 -msgid "_Edit" -msgstr "संपादन (_E)" +#~ msgid "_Sign message as:" +#~ msgstr "हस्ताक्षर संदेश जैसे:" -#: ../src/seahorse-viewer.c:196 -msgid "_View" -msgstr "देखें (_V)" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "फ़ाइल वैध .desktop फ़ाइल नहीं है" -#: ../src/seahorse-viewer.c:197 -msgid "_Help" -msgstr "मदद (_H)" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "अपरिचित डेस्कटॉप फ़ाइल संस्करण '%s'" -#: ../src/seahorse-viewer.c:199 -msgid "Prefere_nces" -msgstr "वरीयताएँ (_n)" +#~ msgid "Starting %s" +#~ msgstr "%s शुरू हो रहा है" -#: ../src/seahorse-viewer.c:200 -msgid "Change preferences for this program" -msgstr "इस प्रोग्राम के लिए वरीयता बदलें" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "कमांड लाइन पर अनुप्रयोग दस्तावेज़ स्वीकार नहीं करता है" -#: ../src/seahorse-viewer.c:203 -msgid "About this program" -msgstr "इस प्रोग्राम का परिचय" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "अपरिचित लॉन्च विकल्प: %d" -#: ../src/seahorse-viewer.c:204 -msgid "_Contents" -msgstr "विषय सूची (_C)" +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "दस्तावेज़ URI को 'Type=Link' डेस्कटॉप प्रविष्टि में भेज नहीं सकता है" -#: ../src/seahorse-viewer.c:205 -msgid "Show Seahorse help" -msgstr "दिखाएँ सीहोर्स मदद" +#~ msgid "Not a launchable item" +#~ msgstr "चलाने योग्य प्रोग्राम नहीं है" -#: ../src/seahorse-viewer.c:302 -msgid "Export public key" -msgstr "सार्वजनिक कुंजी निर्यात" +#~ msgid "Disable connection to session manager" +#~ msgstr "सत्र प्रबंधक में संबंधन निष्क्रिय करें" -#: ../src/seahorse-viewer.c:320 -msgid "Exporting keys" -msgstr "कुंजी निर्यात किया जा रहा है" +#~ msgid "Specify file containing saved configuration" +#~ msgstr "सहेजा विन्यास समाहित करता फ़ाइल निर्दिष्ट करें" -#: ../src/seahorse-viewer.c:345 -msgid "Couldn't retrieve data from key server" -msgstr "कुंजी सर्वर से आँकड़ा पा नहीं सका" +#~ msgid "FILE" +#~ msgstr "फ़ाइल" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:364 -msgid "Copied keys" -msgstr "कुंजी नक़ल किया" +#~ msgid "Specify session management ID" +#~ msgstr "सत्र प्रबंधन ID निर्दिष्ट करें" -#: ../src/seahorse-viewer.c:384 -msgid "Retrieving keys" -msgstr "कुंजी पुनःप्राप्त कर रहा है" +#~ msgid "Session management options:" +#~ msgstr "सत्र प्रबंधन विकल्प:" -#: ../src/seahorse-viewer.c:399 -msgid "Couldn't delete." -msgstr "मिटा नहीं सका." +#~ msgid "Show session management options" +#~ msgstr "दिखाएँ सत्र प्रबंधन विकल्प" -#: ../src/seahorse-viewer.c:433 -msgid "Deleting..." -msgstr "मिटा रहा है..." +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "कुंजी आयातित" +#~ msgstr[1] "कुंजी आयातित" -#: ../src/seahorse-viewer.c:459 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s एक निजी कुंजी है. क्या आप वाकई आगे बढ़ना चाहते हैं?" +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "आयातित %i कुंजी" +#~ msgstr[1] "आयातित %i कुंजियाँ" -#: ../src/seahorse-viewer.c:507 -msgid "Importing keys from key servers" -msgstr "कुंजी सर्वर से कुंजी आयात कर रहा है" +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "इसके लिए आयातित कुंजी" +#~ msgstr[1] "इसके लिए आयातित कुंजियाँ" -#: ../src/seahorse-viewer.c:533 -msgid "Show properties" -msgstr "दिखाएँ गुण" +#~ msgid "Notification Messages" +#~ msgstr "अधिसूचना संदेश" -#: ../src/seahorse-viewer.c:534 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "मिटाएँ (_D)" +#~ msgid "Symmetric Key" +#~ msgstr "सममितीय कुंजी" -#: ../src/seahorse-viewer.c:535 -msgid "Delete selected items" -msgstr "मिटाएँ चयनित वस्तुएँ" +#~ msgid "Credentials" +#~ msgstr "श्रेय" -#: ../src/seahorse-viewer.c:539 -msgid "E_xport..." -msgstr "निर्यात करें (_x)..." +#~ msgid "Identity" +#~ msgstr "उपयोक्ता" -#: ../src/seahorse-viewer.c:540 -msgid "Export to a file" -msgstr "एक फ़ाइल में निर्यात करें" +#~ msgid "Key Sharing" +#~ msgstr "कुंजी साझेदारी" -#: ../src/seahorse-viewer.c:542 -msgid "Copy to the clipboard" -msgstr "इस क्लिपबोर्ड में नक़ल करें" +#~ msgid "" +#~ "Sharing your keys allows other people on your network to use the keys " +#~ "you've collected. This means they can automatically encrypt things for " +#~ "you or those you know, without you having to send them your key.\n" +#~ "\n" +#~ "Note: Your personal keys will not be compromised." +#~ msgstr "" +#~ "अपनी कुंजी को साझा करना आपके संजाल पर दूसरे लोगों को आपके द्वारा जमा कुंजी को प्रयोग " +#~ "करने की अनुमति मिलती है. इसका मतलब है कि वे वस्तुओं को स्वतः गोपित करते हैं या वे जिसे " +#~ "तुम जानते हो, बिना तुम्हारे अपनी कुंजी भेजने के लिए.\n" +#~ "\n" +#~ "नोट: आपकी निजी कुंजी भेदा नहीं जा सकेगा." -#: ../src/seahorse-viewer.c:547 -msgid "Import selected keys to local key ring" -msgstr "स्थानीय कुंजी रिंग में चुने कुंजियों को आयात करें" +#~ msgid "_Share my keys with others on my network" +#~ msgstr "मेरे अपने संजाल पर मेरी कुंजी को दूसरे के साथ साझा करें (_S)" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "अपना सिक्योर शेल कूटशब्द दाखिल करें:" +#~ msgid "Progress Title" +#~ msgstr "प्रगति शीर्षक" -#: ../ssh/seahorse-ssh-commands.c:85 -msgid "Configure Key for _Secure Shell..." -msgstr "सिक्योर शेल के लिए कुंजी विन्यस्त करें (_S)..." +#~ msgid "Couldn't run file-roller" +#~ msgstr "फाइल रोलर नहीं चला सका" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "सार्वजनिक सिक्योर शेल कुंजी को दूसरे मशीन में भेजता है, और उस कुंजी के प्रयोग लॉगिन सक्रिय करें." +#~ msgid "Couldn't package files" +#~ msgstr "फाइल पैकेज नहीं कर सका" -#: ../ssh/seahorse-ssh-commands.c:115 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "क्या आप वाकई '%s' सिक्योर शेल कुंजी को मिटाना चाहते हैं?" +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "फाइल रोलर प्रक्रिया सफलतापूर्वक नहीं चल सकी" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "क्या आप वाकई %d सिक्योर शेल कुंजी को मिटाना चाहते हैं?" +#~ msgid "Archive files" +#~ msgstr "अभिलेखागार फाइल" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Secure Shell Key" -msgstr "सिक्योर शेल कुंजी" +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "कोई फ़ाइल पहले से मौजूद है इसके नाम के साथ.\n" +#~ "\n" +#~ "क्या आप इसे नई फ़ाइल के साथ बदलना चाहते हैं?" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "दूसरे कंप्यूटर की पहुँच में असमर्थ (उदा: टर्मिनल से होकर)" +#~ msgid "_Replace" +#~ msgstr "बदलें (_R)" -#: ../ssh/seahorse-ssh-generate.c:90 -msgid "Couldn't generate Secure Shell key" -msgstr "सिक्योर शेल कुंजी नहीं उत्पन्न कर सका" +#~ msgid "Loading Keys..." +#~ msgstr "कुंजी लोड हो रहा है." -#: ../ssh/seahorse-ssh-generate.c:205 -msgid "Creating Secure Shell Key" -msgstr "सिक्योर शेल कुंजी बना रहा है" +#~ msgid "Uploading keys..." +#~ msgstr "कुंजी अपलोड किया जा रहा है..." -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "अपने ईमेल पता का प्रयोग करें, और किसी दूसरे अनुस्मारक का जिसे आपको जरूरत है कि यह कुंजी किससे के लिए है." +#~ msgid "Retrieving keys..." +#~ msgstr "कुंजी पुनःप्राप्त कर रहा है..." -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "सिक्योर शेल (SSH) कुंजी आपको सुरक्षित रूप से कनेक्ट करने की अनुमति देता है भरोसेमेंद कंप्यूटर को SSH के प्रयोग से, बिना भिन्न कूटशब्द को उनमें से प्रत्येक के लिए दाखिल किए." +#~ msgid "Searching for keys on: %s" +#~ msgstr "कुंजी के लिए खोज कर रहा है: %s" -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "'%s' समाहित करते कुंजी के लिए खोज..." -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "यदि पहले से एक कंप्यूटर है जिसे आप इस कुंजी के साथ प्रयोग करना चाहते हैं, आप उन कंप्यूटर को सेट अफ करना चाहते हैं अपनी कुंजी को अब जानने के लिए. " +#~ msgid "Searching for key id '%s'..." +#~ msgstr "'%s' कुंजी आईडी के लिए खोज..." -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" -msgstr "नया सिक्योर शेल कुंजी" +#~ msgid "Retrieving remote keys..." +#~ msgstr "दूरस्थ कुंजी पुनःप्राप्त कर रहा है..." -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "RSA" -msgstr "RSA" +#~ msgid "Sending keys to key server..." +#~ msgstr "कुंजी सर्वर में कुंजी भेजा जा रहा है..." -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "बनाएं और सेटअप करें (_C)" +#~ msgid "_Sign Key..." +#~ msgstr "हस्ताक्षर कुंजी (_S)..." -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "सिर्फ कुंजी बनाएं (_J)" +#~ msgid "Sign public key" +#~ msgstr "सार्वजनिक कुंजी हस्ताक्षर करें" -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "कुंजी विवरण (_K):" +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "क्या आप %d कुंजी व पहचान को स्थाई रूप से मिटाने के लिए निश्चित हैं?" -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(अपठनीय सिक्योर शेल की)" +#~ msgid "Algorithms here" +#~ msgstr "अलगोरिथम यहाँ" -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "अवैध" - -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "निजी सिक्योर शेल कुंजी" - -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "सार्वजनिक सिक्योर शेल कुंजी" +#~ msgid "New PGP Key" +#~ msgstr "नया पीजीपी कुंजी" -#: ../ssh/seahorse-ssh-key-properties.c:71 -msgid "Couldn't rename key." -msgstr "कुंजी का फिर नाम नहीं दे सका." +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "\"%s\" में कुंजी निर्यात नहीं कर सका" -#: ../ssh/seahorse-ssh-key-properties.c:112 -msgid "Couldn't change authorization for key." -msgstr "कुंजी के लिए सत्यापन नहीं बदल सका" +#~ msgid "Export Complete Key" +#~ msgstr "निर्यात पूर्ण कुंजी" -#: ../ssh/seahorse-ssh-key-properties.c:127 -msgid "Couldn't change passphrase for key." -msgstr "कुंजी के लिए कूटशब्द बदल नहीं सका." +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "क्या आप वाकई '%s' प्रमाणपत्र को मिटाना चाहते हैं?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "/home/nate/.ssh/blah_rsa" -msgstr "/home/nate/.ssh/blah_rsa" +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "क्या आप वाकई %d प्रमाणपत्र को मिटाना चाहते हैं?" +#~ msgstr[1] "क्या आप वाकई %d प्रमाणपत्रों को मिटाना चाहते हैं?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "00:00:00:00:00" -msgstr "00:00:00:00:00" +#~ msgid "Create New ..." +#~ msgstr "बनाएँ नया." -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Algorithm:" -msgstr "अलगोरिथम:" +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "%d कुंजी चयनित" +#~ msgstr[1] "%d कुंजियाँ चयनित" -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Identifier:" -msgstr "पहचानकर्ता:" +#~ msgid "Importing keys" +#~ msgstr "कुंजी आयात कर रहा है" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Location:" -msgstr "अवस्थिति:" +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "अपरिचित कुंजी प्रकार, या अवैध आँकड़ा प्रारूप" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Strength:" -msgstr "शक्ति:" +#~ msgid "T_ypes" +#~ msgstr "प्रकार" -#: ../ssh/seahorse-ssh-key-properties.xml.h:10 -msgid "Trust" -msgstr "विश्वास" +#~ msgid "Show type column" +#~ msgstr "दिखाएँ प्रकार स्तंभ" -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "यह केवल '%s' खाता पर लागू होता है." +#~ msgid "_Expiry" +#~ msgstr "समय समाप्ति (_E)" -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "E_xport Complete Key" -msgstr "पूरी कुंजी भेजें (_x)" +#~ msgid "Show expiry column" +#~ msgstr "दिखाएँ समाप्ति स्तंभ" -#: ../ssh/seahorse-ssh-key-properties.xml.h:22 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "इस कुंजी का स्वामी इस कंप्यूटर के साथ कनेक्ट होने के लिए अधिकृत है (_a)" +#~ msgid "_Trust" +#~ msgstr "ट्रस्ट (_T)" -#: ../ssh/seahorse-ssh-key-properties.xml.h:23 -msgid "Used to connect to other computers." -msgstr "दूसरे कंप्यूटर के साथ कनेक्ट होने के लिए प्रयुक्त." +#~ msgid "Show owner trust column" +#~ msgstr "दिखाएँ स्वामी ट्रस्ट स्तंभ" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH कमांड को अप्रत्याशित रूप से रोक दिया गया." +#~ msgid "_Validity" +#~ msgstr "वैधता" -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 -msgid "The SSH command failed." -msgstr "SSH कमांड विफल रहा." +#~ msgid "Show validity column" +#~ msgstr "दिखाएँ वैधता स्तंभ" -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "सिक्योर शेल कुंजी" +#~ msgid "Other _Keys" +#~ msgstr "अन्य कुंजियाँ (_K)" -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "कूटशब्द" +#~ msgid "Validity" +#~ msgstr "वैधता" -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 -msgid "Remote Host Password" -msgstr "रिमोट होस्ट कूटशब्द" +#~ msgid "Expiration Date" +#~ msgstr "समाप्ति तिथि" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "पुराना कुंजी कूटशब्द" +#~ msgid "_Expand All" +#~ msgstr "सभी विस्तारित करें (_E)" -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "इसके लिए पुराना कूटशब्द दाखिल करें: %s" +#~ msgid "Expand all listings" +#~ msgstr "सभी सूची फैलाएँ" -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "नया कुंजी कूटशब्द" +#~ msgid "_Collapse All" +#~ msgstr "सभी संकुचित करें (_C)" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "इसके लिए नया कूटशब्द दाखिल करें: %s" +#~ msgid "Collapse all listings" +#~ msgstr "सभी सूची समेटें" -#: ../ssh/seahorse-ssh-operation.c:864 -msgid "Enter Key Passphrase" -msgstr "कुंजी कूटशब्द दाखिल करें" +#~ msgid "Synchronizing keys" +#~ msgstr "कुंजी सिंक्रोनाइज किया जा रहा है" -#: ../ssh/seahorse-ssh-operation.c:931 -msgid "Passphrase for New Secure Shell Key" -msgstr "नए सिक्योर शेल कुंजी के लिए कूटशब्द" +#~ msgid "X keys are selected for synchronizing" +#~ msgstr "X कुंजी को तुल्यकालन के लिए चुना गया है" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "अपनी नई सिक्योर शेल कुंजी के लिए कूटशब्द दाखिल करें." +#~ msgid "Export public key" +#~ msgstr "सार्वजनिक कुंजी निर्यात" -#: ../ssh/seahorse-ssh-operation.c:1013 -#, c-format -msgid "Importing key: %s" -msgstr "कुंजी आयात कर रहा है: %s" +#~ msgid "Exporting keys" +#~ msgstr "कुंजी निर्यात किया जा रहा है" -#: ../ssh/seahorse-ssh-operation.c:1015 -msgid "Importing key. Enter passphrase" -msgstr "कुंजी आयात कर रहा है. कूटशब्द प्रविष्ट करें" +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "कुंजी सर्वर से आँकड़ा पा नहीं सका" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." -msgstr "इस कुंजी के लिए कोई निजी कुंजी फ़ाइल उपलब्ध नहीं है." +#~ msgid "Deleting..." +#~ msgstr "मिटा रहा है..." -#: ../ssh/seahorse-ssh-upload.c:45 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "सिक्योर शेल कुंजी को दूरस्थ कंप्यूटर पर विन्यस्त नहीं कर सका." +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s एक निजी कुंजी है. क्या आप वाकई आगे बढ़ना चाहते हैं?" -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 -msgid "Configuring Secure Shell Keys..." -msgstr "सिक्योर शेल कुंजी बिन्यस्त कर रहा है..." +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "मिटाएँ (_D)" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "उदा: fileserver.example.com:port" +#~ msgid "_Key Description:" +#~ msgstr "कुंजी विवरण (_K):" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "SSH संबंधन के लिए कंप्यूटर सेटअप करें" +#~ msgid "Invalid" +#~ msgstr "अवैध" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "अपनी सिक्योर शेल कुंजी को दूसरे कंप्यूटर के साथ प्रयोग करने के लिए जो कि SSH का प्रयोग करता है, आपको जरूर अपने उस कंप्यूटर पर लॉगिन खाता रखना चाहिए." +#~ msgid "Private Secure Shell Key" +#~ msgstr "निजी सिक्योर शेल कुंजी" -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "कंप्यूटर नाम (_C):" +#~ msgid "Public Secure Shell Key" +#~ msgstr "सार्वजनिक सिक्योर शेल कुंजी" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "लागिन नाम (_L)" +#~ msgid "/home/nate/.ssh/blah_rsa" +#~ msgstr "/home/nate/.ssh/blah_rsa" -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "सेट अप (_S)" +#~ msgid "00:00:00:00:00" +#~ msgstr "00:00:00:00:00" + +#~ msgid "Passphrase:" +#~ msgstr "कूटशब्द" +#~ msgid "Enter a passphrase for your new Secure Shell key." +#~ msgstr "अपनी नई सिक्योर शेल कुंजी के लिए कूटशब्द दाखिल करें." diff -Nru seahorse-3.2.2/po/hu.po seahorse-3.6.3/po/hu.po --- seahorse-3.2.2/po/hu.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/hu.po 2012-09-18 13:10:35.000000000 +0200 @@ -4,21 +4,22 @@ # # Péter Mátó , 2003. # Andras Timar , 2003. -# Gabor Kelemen , 2005, 2007, 2008, 2009, 2010, 2011. +# Gabor Kelemen , 2005, 2007, 2008, 2009, 2010, 2011, 2012. # Mate Ory , 2008. msgid "" msgstr "" "Project-Id-Version: seahorse master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-21 01:40+0200\n" -"PO-Revision-Date: 2011-09-21 01:39+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-09-04 23:38+0200\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Magyar \n" -"Language: \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: Lokalize 1.0\n" +"Language: hu\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../gkr/seahorse-add-keyring.xml.h:1 @@ -26,316 +27,302 @@ msgstr "Jelszókulcstartó hozzáadása" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Új kulcstartónév:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "" "Válassza ki az új kulcstartó nevét. A program bekéri a feloldási jelszót." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Új kulcstartónév:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "A kiszolgáló neve vagy címe." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Nem sikerült a kulcstartót hozzáadni" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Új jelszókulcstartó" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Alkalmazás- és hálózati jelszavak tárolására használatos" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Új jelszó…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Jelszó vagy titkos információ biztonságos tárolása." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Jelszókulcstartó" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Tárolt jelszó" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Nem sikerült beállítani az alapértelmezett kulcstartót" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Nem lehet megváltoztatni a kulcstartó jelszavát" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Beállítás alapértelmezettként" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Az alkalmazások általában az alapértelmezett kulcstartón tárolják a " +"jelszavakat." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Jelszó meg_változtatása" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "A jelszótároló kulcstartó feloldási jelszavának módosítása" + +#: ../gkr/seahorse-gkr-add-item.c:58 +#| msgid "Couldn't delete item" +msgid "Couldn't add item" +msgstr "Nem vehető fel az elem" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Jelszó hozzáadása" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Leírás:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "K_ulcstartó:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Jelszó:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Jelszó megjelenítése" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Nem törölhető az elem." +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "K_ulcstartó:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Nem sikerült a kulcstartót hozzáadni" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Jelszavak" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Tárolt személyes jelszavak, hitelesítési adatok és titkos információk" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Azonnaliüzenő fiók jelszava ehhez: " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Jelszó vagy titkos információ" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Hálózati jelszó" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Tárolt jegyzet" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Kulcstartó jelszava" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Titkosítási kulcs jelszava" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Kulcstároló jelszava" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome jelszava" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Gnome Online fiókok jelszava" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy jelszava" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Azonnali üzenő jelszava" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Hálózatkezelő titkos információi" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Biztosan törölni akarja a(z) „%s” jelszót?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Biztosan törölni akar %d jelszót?" msgstr[1] "Biztosan törölni akar %d jelszót?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Elem törlése" -msgstr[1] "Elemek törlése" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Hálózati megosztás vagy erőforrás elérése" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Webhely elérése" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Feloldja egy PGP kulcs zárolását" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Feloldja egy SSH kulcs zárolását" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Mentett jelszó vagy bejelentkezés" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Hálózati hitelesítési adatok" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Jelszó" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Nem lehet megváltoztatni a jelszót." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Jelszó frissítése" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Nem állítható be a leírás." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Jelszó:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Technikai részletek:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Részletek" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "A kulcs tulajdonságai" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Kulcs" +msgid "Use:" +msgstr "Használat:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "A kulcs tulajdonságai" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Típus:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Bejelentkezési név:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Kiszolgáló:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Bejelentkezési név:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "_Jelszó megjelenítése" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Típus:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Használat:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Jelszavak: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Jelszavak: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Jelszókulcstartó" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Alkalmazás- és hálózati jelszavak tárolására használatos" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Tárolt jelszó" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Jelszó vagy titkos információ biztonságos tárolása." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Nem sikerült a kulcstartót feloldani" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Nem sikerült a kulcstartót zárolni" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Nem sikerült beállítani az alapértelmezett kulcstartót" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Nem lehet megváltoztatni a kulcstartó jelszavát" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Zárolás" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"A jelszótároló kulcstartó zárolása, a feloldásához mesterjelszó lesz " -"szükséges." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Feloldás" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"A jelszótároló kulcstartó feloldása mesterjelszóval, így használható lesz." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Beállítás alapértelmezettként" +msgid "Password:" +msgstr "Jelszó:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Az alkalmazások általában az alapértelmezett kulcstartón tárolják a " -"jelszavakat." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Kulcs" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Jelszó meg_változtatása" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Technikai részletek:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "A jelszótároló kulcstartó feloldási jelszavának módosítása" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Részletek" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Nem sikerült a kulcstartó törlése" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Bejelentkezéskor automatikusan feloldásra kerülő kulcstartó" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Jelszavak tárolására használt kulcstartó" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Biztosan törölni akarja a(z) „%s” jelszótároló kulcstartót?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Kulcstartó törlése" -msgstr[1] "Kulcstartók törlése" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Megértettem, hogy minden elem véglegesen törlésre kerül." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Kulcstartó tulajdonságai" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Név:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Létrehozva:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Kulcstartó" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Kulcstartó tulajdonságai" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Név:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "A művelet megszakítva" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "A kulcstartó elérése megtagadva" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "A gnome-keyring démon nem fut" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "A kulcstartó már fel lett oldva" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Nincs ilyen kulcstartó" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Nem lehet kommunikálni a kulcstartó démonnal" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Az elem már létezik" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Belső hiba a gnome-keyring elérésekor" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Kijelzett kapcsolók" @@ -592,268 +579,328 @@ msgstr "%u.%u.%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "kiinduló ideiglenes elem" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Kulcskiszolgáló hozzáadása" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Gép:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Kulcskiszolgáló típusa:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Gép:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "A port, melyen a kiszolgáló elérhető." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "kiinduló ideiglenes elem" +msgid "The port to access the server on." +msgstr "A port, melyen a kiszolgáló elérhető." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Jelmondat" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Ezen alkalmazás verziója" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Jelszó:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "– Rendszerbeállítások" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Megerősítés:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Közreműködők:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Nem érvényes kulcskiszolgálócím." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Jelszavak és kulcsok" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Segítségért vegye fel a kapcsolatot a rendszergazdával vagy a " -"kulcskiszolgáló rendszergazdájával." - -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +"Kelemen Gábor \n" +"Mátó Péter \n" +"Őry Máté \n" +"Tímár András " -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Egyéni" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "A Seahorse projekt honlapja" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Nincs: ne tegye közzé a kulcsokat" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Nem törölhető" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Kulcsok automatikus lekérése k_ulcskiszolgálókról" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Nem sikerült a kulcsok exportálása" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "_Módosított kulcsok automatikus szinkronizálása kulcskiszolgálókkal" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Nem sikerült exportálni az adatokat" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Kulcskiszolgálók" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Fájl" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Exportálás…" + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exportálás fájlba" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "S_zerkesztés" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Másolás a vágólapra" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Törlés" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Kijelölt elemek törlése" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Elem tulajdonságainak megjelenítése" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Kulcstartó tulajdonságainak megjelenítése" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "B_eállítások" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Ezen program beállításainak megváltoztatása" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Nézet" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Súgó" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "A program névjegye" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Tartalom" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "A Seahorse súgójának megjelenítése" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exportálás" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Adja meg %s PIN-kódját vagy jelszavát" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Jelszó:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Megerősítés:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Nem érvényes kulcskiszolgálócím." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Segítségért vegye fel a kapcsolatot a rendszergazdával vagy a " +"kulcskiszolgáló rendszergazdájával." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Egyéni" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Nincs: ne tegye közzé a kulcsokat" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Beállítások" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "K_ulcsok keresése:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "Kulcs_ok közzététele:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Adatok letöltése" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Adatok exportálása" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Adatok importálása" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Kulcsok automatikus lekérése k_ulcskiszolgálókról" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Adatok küldése" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "_Módosított kulcsok automatikus szinkronizálása kulcskiszolgálókkal" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Nem érhető el" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Kulcskiszolgálók" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y. %m. %d" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Kulcsadatok" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Többszörös kulcsok" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Minden kulcsfájl" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Minden fájl" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Archív fájlok" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Már létezik egy ugyanilyen nevű fájl.\n" -"\n" -"Le akarja cserélni az új fájllal?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Csere" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Ismeretlen" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Soha" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Kismértékben" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Teljesen" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Tökéletesen" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Tiltva" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Visszavonva" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Nem lehet megjeleníteni a súgót: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Lejárati idő:" +msgid "Never E_xpires" +msgstr "_Soha nem jár le" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Új részkulcs létrehozása" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Ha a kulcs soha nem jár le" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Kulcs_típus:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Kulcs_hossz:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Kulcs_típus:" +msgid "Expiration Date:" +msgstr "Lejárati idő:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Kulcs hossza" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "_Soha nem jár le" +msgid "Generate a new subkey" +msgstr "Új részkulcs létrehozása" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Felhasználóazonosító hozzáadása" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Új felhasználóazonosító létrehozása" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Teljes _név:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Kulcs _megjegyzés:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Legalább öt karakter hosszú kell legyen" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Opcionális e-mail cím" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "A kulcsot leíró opcionális megjegyzés" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Opcionális e-mail cím" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Teljes _név:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_E-mail cím:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Kulcs _megjegyzés:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Új felhasználóazonosító létrehozása" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Változtatás" +msgid "_Never expires" +msgstr "S_oha nem jár le" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Kulcs visszavonása" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "S_oha nem jár le" +msgid "C_hange" +msgstr "_Változtatás" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -864,7 +911,7 @@ msgid "Add subkey to %s" msgstr "Részkulcs hozzáadása a következőhöz: %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (csak aláírásra)" @@ -872,7 +919,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (csak titkosításra)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (csak aláíráshoz)" @@ -895,6 +942,11 @@ "A visszafejtés meghiúsult. Valószínűleg nem rendelkezik a visszafejtési " "kulccsal." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "A művelet megszakítva" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Érvénytelen lejárati dátum" @@ -912,46 +964,146 @@ msgid "Expiry: %s" msgstr "Lejárat: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Többszörös kulcsok" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Kulcsadatok" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Páncélozott PGP-kulcsok" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP-kulcsok" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP kulcs" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "E-mailek és fájlok titkosításához" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Nem sikerült a PGP kulcs előállítása" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Új PGP kulcs jelmondata" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Írja be kétszer az új kulcs jelmondatát." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Kulcs létrehozásakor rengeteg véletlenszerű adatot kell\n" +"létrehoznunk, és segítenie kell. Ilyenkor csináljon valami\n" +"mást, például gépeljen a billentyűzeten, mozgassa az egeret,\n" +"használjon más alkalmazásokat. Ez biztosítja a rendszer\n" +"számára szükséges véletlenszerű adatokat." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Kulcs előállítása" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Biztosan végleg törli a következőt: %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Biztosan véglegesen töröl %d kulcsot?" +msgstr[1] "Biztosan véglegesen töröl %d kulcsot?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Hibás jelszó" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Harmadik alkalommal adott meg hibás jelszót. Próbálja újra." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Rossz jelmondat." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Írja be az új jelmondatot %s számára" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Írja be a jelmondatot %s számára" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Írja be az új jelmondatot" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Írja be a jelmondatot" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Jelmondat" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Betöltve %d kulcs" +msgstr[1] "Betöltve %d kulcs" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Érvénytelen kulcsadatok (hiányzó felhasználói azonosítók). Ezt egy jövőbe " +"állított dátumú számítógép vagy hiányzó önaláírás okozhatja." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG kulcsok" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: alapértelmezett kulcstartókönyvtár" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -985,27 +1137,31 @@ msgid "All JPEG files" msgstr "Minden JPEG fájl" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Minden fájl" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Válassza ki a kulcshoz adandó fényképet" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Nem készíthető elő a fénykép" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Nem adható hozzá a fénykép" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "A fájl nem tölthető be. Lehetséges, hogy a formátuma érvénytelen." -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Biztosan törölni akarja jelenlegi fényképet a kulcsról?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Nem törölhető a fénykép" @@ -1063,7 +1219,11 @@ msgid "Couldn't add revoker" msgstr "Nem sikerült a visszavonó hozzáadása" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Megértettem, hogy ez a titkos kulcs véglegesen törlésre kerül." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1078,519 +1238,581 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nincsenek az aláíráshoz megfelelő kulcsok" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "" "Nincsenek titkos PGP kulcsai, amelyekkel jelezhetné a bizalmát a kulcsban." -#: ../pgp/seahorse-gpgme-source.c:86 +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" + +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Wrong passphrase." -msgstr "Rossz jelmondat." +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"A keresés nem volt elég egyedi. A(z) „%s” kiszolgáló túl sok kulcsot talált." -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Írja be az új jelmondatot %s számára" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Nem lehet kommunikálni a(z) „%s” kiszolgálóval: %s" -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Írja be a jelmondatot %s számára" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP kulcskiszolgáló" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Írja be az új jelmondatot" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Nem sikerült a kulcsok importálása" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Írja be a jelmondatot" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Kulcsok importálása kulcskiszolgálókról" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "Tá_voli" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Ezen ablak bezárása" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "Táv_oli kulcsok keresése…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Kulcsok keresése egy kulcskiszolgálón" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importálás" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Kiválasztott kulcsok importálása a helyi kulcstartóra" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Távoli kulcsok" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Betöltve %d kulcs" -msgstr[1] "Betöltve %d kulcs" +msgid "Remote Keys Containing '%s'" +msgstr "„%s” kifejezést tartalmazó távoli kulcsok" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "A kulcsok keresése sikertelen." -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Távoli kulcsok keresése" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Érvénytelen kulcsadatok (hiányzó felhasználói azonosítók). Ezt egy jövőbe " -"állított dátumú számítógép vagy hiányzó önaláírás okozhatja." +"Ez mások kulcsait keresi meg az interneten. Ezek a kulcsok importálhatóak az " +"Ön helyi kulcstartójára." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "Kulcsok _keresése, amelyek tartalmazzák ezt: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP kulcskiszolgáló" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Kulcskiszolgálók:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Megosztott kulcsok a környezetemben:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Keresés itt:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Keresés" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Nem sikerült a kulcsok közzététele a kiszolgálón" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"A keresés nem volt elég egyedi. A(z) „%s” kiszolgáló túl sok kulcsot talált." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Nem sikerült a kulcsokat letölteni a kiszolgálóról: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Nem lehet kommunikálni a(z) „%s” kiszolgálóval: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d kulcs kiválasztva szinkronizáláshoz" +msgstr[1] "%d kulcs kiválasztva szinkronizáláshoz" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Kulcsok szinkronizálása…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Kulcsok szinkronizálása" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Ezzel közzé fogja tenni a kulcstartóján lévő kulcsokat, így mások is " +"használhatják azokat. Ezen kívül meg fog kapni minden változtatást, amit " +"mások a kulcsaikon végrehajtottak, mióta Ön megkapta azokat." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Ez le fog tölteni minden változást, amit mások a kulcsaikon végrehajtottak, " +"mióta Ön letöltötte azokat. Nem választott ki kulcskiszolgálót a " +"közzétételhez, így az Ön kulcsai nem lesznek elérhetők mások számára." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "K_ulcskiszolgálók" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Szinkronizálás" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Nem lehet kommunikálni a következővel: „%s”: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Kapcsolódás a következőhöz: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Nem oldható fel a cím: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Kiszolgálócím feloldása: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP kulcskiszolgáló" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "K_ulcs aláírása…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Nyilvános kulcs aláírása" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Biztosan végleg törli a következőt: %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Biztosan véglegesen töröl %d kulcsot és személyazonosságot?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Biztosan véglegesen töröl %d kulcsot?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Biztosan véglegesen töröl %d személyazonosságot?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "Kulcsok szinkronizálása és _közzététele…" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Nem sikerült a felhasználóazonosító törlése" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Kulcsainak közzététele és/vagy szinkronizálása az online lévőkkel." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Nem sikerült a személyes kulcs törlése" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Nem sikerült a nyilvános kulcs törlése" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP-kulcsok" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "A PGP-kulcsok e-mailek és fájlok titkosítására szolgálnak" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Spe_ciális kulcsbeállítások" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Létrehozás" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Új kulcs előállítása" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "A PGP kulcs lehetővé teszi e-mailek vagy fájlok titkosítását mások számára." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmusok ide" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Létrehozás" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Megjegyzés:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Lejárati idő:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "S_oha nem jár le" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Titkosítás típusa:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Új kulcs előállítása" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Kulcs _erőssége (bit):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "S_oha nem jár le" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Új PGP kulcs" +msgid "E_xpiration Date:" +msgstr "_Lejárati idő:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Megjegyzés:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Spe_ciális kulcsbeállítások" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Lejárt" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Személyes PGP-kulcs" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP-kulcs" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Nem lehet megváltoztatni az elsődleges felhasználóazonosítót" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Biztosan véglegesen törölni akarja a(z) „%s” felhasználóazonosítót?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Nem sikerült a felhasználóazonosító törlése" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Ismeretlen]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Név/e-mail" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Aláírás-azonosító" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Nem lehet megváltoztatni az elsődleges fényképet" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(ismeretlen)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "A kulcs lejárt ekkor: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Név" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Biztosan véglegesen törölni akarja %d részkulcsot %s kulcsból?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Nem sikerült a részkulcs törlése" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Nem módosítható a megbízhatóság" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Nem sikerült exportálni a kulcsot ide: „%s”" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Teljes kulcs exportálása" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Nem sikerült exportálni a kulcsot." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Nem sikerült exportálni a kulcsot" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Soha" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "Azonosító" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Típus" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Létrehozva" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Lejár" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Állapot" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Erősség" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Lejárt" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Jó" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Kulcsazonosító" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Műveletek" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Megjegyzés:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Dátumok" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-mail:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Ujjlenyomat" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Kulcsazonosító:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Soha" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Kulcsnevek és aláírások" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "A kulcs vissza lett vonva" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fénykép" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "A kulcs tulajdonosa visszavonta a kulcsot, amely már nem használható." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Technikai részletek" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "A kulcs lejárt" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "A kulcs vissza lett vonva" +msgid "Add a photo to this key" +msgstr "Fénykép hozzáadása a kulcshoz" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "A kulcs lejárt" +msgid "Remove this photo from this key" +msgstr "Fénykép eltávolítása a kulcsról" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Típus:" +msgid "Make this photo the primary photo" +msgstr "A fénykép elsődlegessé tétele" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Használat:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Ugrás az előző fényképre" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Részkulcsok" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Ugrás a következő fényképre" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Hozzáadás" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fénykép" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Fénykép hozzáadása a kulcshoz" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Kulcsazonosító:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Jelmondat meg_változtatása" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Név:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Fogadott e-mailek és fájlok visszafejtése." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-mail:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Törlés" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Megjegyzés:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Lejárt" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Használat:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Lejárat:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Típus:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exportálás" +msgid "Decrypt files and email sent to you." +msgstr "Fogadott e-mailek és fájlok visszafejtése." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Titkos PGP kulcs" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Ugrás a következő fényképre" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Jelmondat meg_változtatása" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Ugrás az előző fényképre" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Tulajdonos" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Kulcsazonosító:" +msgid "Key Names and Signatures" +msgstr "Kulcsnevek és aláírások" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Elsődleges" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "A fénykép elsődlegessé tétele" +msgid "Sign" +msgstr "Aláírás" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nevek és aláírások" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Törlés" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Soha" +msgid "_Add Name" +msgstr "Né_v hozzáadása" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Megbízhatóság _felülbírálása:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Tulajdonos" +msgid "Revoke" +msgstr "Visszavonva" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Elsődleges" +msgid "Names and Signatures" +msgstr "Nevek és aláírások" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Titkos PGP kulcs" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Kulcsazonosító:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Fénykép eltávolítása a kulcsról" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Visszavonva" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Erősség:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Aláírás" +msgid "Technical Details" +msgstr "Technikai részletek" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Erősség:" +msgid "Fingerprint" +msgstr "Ujjlenyomat" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "A kulcs tulajdonosa visszavonta a kulcsot, amely már nem használható." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Lejárat:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "Né_v hozzáadása" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Dátumok" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Megbízhatóság _felülbírálása:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Teljes kulcs exportálása:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Név:" +msgid "Actions" +msgstr "Műveletek" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Dátumok:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Hozzáadás" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Lejárt" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Részkulcsok" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Kismértékben" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Ujjlenyomat:" +msgid "Fully" +msgstr "Teljesen" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Megbízhatóság jelzése:" +msgid "Ultimately" +msgstr "Tökéletesen" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "A kulcs megbízhatósága" +msgid "Encrypt files and email to the key's owner" +msgstr "Fájlok és e-mailek titkosítása a kulcs tulajdonosának" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Nyilvános PGP kulcs" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Egyéb nevek:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "A k_ulcsot aláíró személyek:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Fájlok és e-mailek titkosítása a kulcs tulajdonosának " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "A kulcs megbízhatósága" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Teljesen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "A bizalma a Részletek fülön van saját kezűleg megadva." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Megbízom „%s” aláírásaiban más kulcsokhoz " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1599,7 +1821,11 @@ "Amennyiben úgy gondolja, hogy ez a kulcs valóban „%s” tulajdona, írja alá:" "" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "K_ulcs aláírása" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1607,43 +1833,38 @@ "Ha már nem biztos abban, hogy a kulcs „%s” tulajdona, vonja vissza az " "aláírását:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Kismértékben" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Nyilvános PGP kulcs" +msgid "_Revoke Signature" +msgstr "_Aláírás visszavonása" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "A k_ulcsot aláíró személyek:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Csak a megbízható személyek aláírásainak megjelenítése" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Megbízhatóság" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Tökéletesen" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Me_gbízik a tulajdonosban:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "A bizalma a Részletek fülön van saját kezűleg megadva." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Ujjlenyomat:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Csak a megbízható személyek aláírásainak megjelenítése" +msgid "Dates:" +msgstr "Dátumok:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Aláírás visszavonása" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Megbízhatóság jelzése:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "K_ulcs aláírása" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Me_gbízik a tulajdonosban:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1651,55 +1872,61 @@ msgstr "%2$s %1$d részkulcsa" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "A visszavonás opcionális leírása" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Visszavonás" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "A kulcs visszavonásának oka" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Ok:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "A visszavonás opcionális leírása" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Visszavonás" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Nincsenek dokumentumok vagy üzenetek aláírására használható személyes PGP " "kulcsai." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Aláírás a kö_vetkező kulccsal:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Mennyire alaposan ellenőrizte ezt a kulcsot?" +msgid "Sign Key" +msgstr "Kulcs aláírása" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Hogyan fogják mások látni ezt az aláírást:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "A kulcs aláírásával kifejezi bizalmát, hogy a kulcs tulajdonosa:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Kulcs aláírása mint:" +msgid "Key Name" +msgstr "Kulcs neve" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Szokásos módon: azaz a megszokott módon ellenőrizte, hogy a kulcs " -"ahhoz tartozik, aki a tulajdonosnak mondja magát. Például beolvashatta a " -"kulcs ujjlenyomatát a tulajdonosnak a telefonba." +msgid "How carefully have you checked this key?" +msgstr "Mennyire alaposan ellenőrizte ezt a kulcsot?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Kulcs neve" +msgid "_Not at all" +msgstr "_Egyáltalán nem" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "S_zokásos módon" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "N_agyon alaposan" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1707,7 +1934,17 @@ "Egyáltalán nem: azaz elhiszi, hogy a kulcs ahhoz tartozik, aki a " "tulajdonosnak mondja magát, de nem ellenőrizte ennek valóságalapját." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Szokásos módon: azaz a megszokott módon ellenőrizte, hogy a kulcs " +"ahhoz tartozik, aki a tulajdonosnak mondja magát. Például beolvashatta a " +"kulcs ujjlenyomatát a tulajdonosnak a telefonba." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1715,18 +1952,6 @@ "Nagyon alaposan: ezt csak akkor válassza, ha teljesen biztos a kulcs " "eredetiségében." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "A kulcs aláírásával kifejezi bizalmát, hogy a kulcs tulajdonosa:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Később _visszavonhatom ezt az aláírást." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Kulcs aláírása" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1738,480 +1963,355 @@ "ellenőrizze, hogy az e-mail cím a tulajdonoshoz tartozik." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "S_zokásos módon" +msgid "How others will see this signature:" +msgstr "Hogyan fogják mások látni ezt az aláírást:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Egyáltalán nem" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "Mások nem láthatják ezt az _aláírást" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Később _visszavonhatom ezt az aláírást." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Aláírás" +msgid "Sign key as:" +msgstr "Kulcs aláírása mint:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Aláíró:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "N_agyon alaposan" +msgid "_Sign" +msgstr "_Aláírás" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Aláírás a kö_vetkező kulccsal:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Adatok exportálása" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Adatok letöltése" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Adatok importálása" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Adatok küldése" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Nem érhető el" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Személyes tanúsítvány és kulcs" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Személyes tanúsítvány" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Tanúsítvány" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Tanúsítványok (DER kódolású)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Tanúsítványok" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 tanúsítványok és kapcsolódó kulcsok" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Biztosan véglegesen töröl %d tanúsítványt?" +msgstr[1] "Biztosan véglegesen töröl %d tanúsítványt?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Nem sikerült a személyes kulcs előállítása" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Létrehozás" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Személyes kulcs" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Tanúsítvány kérésére használatos" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Új személyes kulcs létrehozása" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Címke:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Tárolva itt:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Megértettem, hogy ez a kulcs véglegesen törlésre kerül." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Névtelen" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "A tanúsítvány exportálása meghiúsult" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Nem törölhető." -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Biztosan törölni akarja a(z) „%s” tanúsítványt?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Biztosan törölni akar %d tanúsítványt?" -msgstr[1] "Biztosan törölni akar %d tanúsítványt?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Törlés" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exportálás" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Tanúsítvány exportálása" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Tanúsítvány vagy kulcs törlése" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Tanúsítvány _kérése" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Tanúsítványkérési fájl létrehozása ehhez a kulcshoz" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Nem menthető a tanúsítványkérés" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Tanúsítványkérés mentése" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Tanúsítványkérés" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM-kódolású kérés" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Nem sikerült a tanúsítványkérést létrehozni" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Tanúsítványkérési fájl létrehozása." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "A tanúsítványkérésbe elhelyezendő közönséges név (CN)." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Név (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Névtelen személyes kulcs" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Jelmondat megváltoztatása" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Jelmondat _megerősítése:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Új jelmondat megerősítése" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "Új _jelmondat:" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Jelszavak és titkosítási kulcsok kezelése" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Jelszavak és kulcsok" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Válassza ki az előállítandó elem típusát:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Folytatás" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Új létrehozása…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d kulcs kiválasztva" -msgstr[1] "%d kulcs kiválasztva" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Nem sikerült a kulcsok importálása" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importált kulcsok" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Kulcsok importálása" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Kulcs importálása" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Ismeretlen kulcstípus vagy érvénytelen adatformátum" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Kulcsok importálása" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "Tá_voli" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "A program bezárása" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "Ú_j…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Új kulcs vagy elem készítése" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importálás…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importálás fájlból" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importálás a vágólapról" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "Táv_oli kulcsok keresése…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Kulcsok keresése egy kulcskiszolgálón" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "Kulcsok szinkronizálása és _közzététele…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Kulcsainak közzététele és/vagy szinkronizálása az online lévőkkel." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Típus" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "A Típus oszlop mutatása" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Lejár" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "A Lejár oszlop mutatása" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Megbízhatóság" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "A Megbízhatóság oszlop mutatása" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "Ér_vényesség" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Az Érvényesség oszlop mutatása" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Szűrő:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Kezdeti lehetőségek:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Új saját kulcs létrehozása: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Létező kulcsok importálása fájlból:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Saját k_ulcsok" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Egyéb kul_csok" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "A titkosítás elkezdéséhez kulcsokra lesz szüksége." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importálás" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Jelszavak" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Nem sikerült a kulcsok exportálása" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Érvényesség" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Lejárati idő" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Ezen ablak bezárása" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "Összes _kibontása" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Minden lista kibontása" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "Összes össze_csukása" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Minden lista összecsukása" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Távoli kulcsok" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "„%s” kifejezést tartalmazó távoli kulcsok" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Kulcskiszolgálók:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Megosztott kulcsok a környezetemben:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Távoli kulcsok keresése" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Ez mások kulcsait keresi meg az interneten. Ezek a kulcsok importálhatóak az " -"Ön helyi kulcstartójára." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Keresés itt:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Keresés" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Kulcsok _keresése, amelyek tartalmazzák ezt: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Nem sikerült a kulcsok közzététele a kiszolgálón" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Nem sikerült a kulcsokat letölteni a kiszolgálóról: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d kulcs kiválasztva szinkronizáláshoz" -msgstr[1] "%d kulcs kiválasztva szinkronizáláshoz" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Kulcsok szinkronizálása…" - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Kulcsok szinkronizálása" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Ezzel közzé fogja tenni a kulcstartóján lévő kulcsokat, így mások is " -"használhatják azokat. Ezen kívül meg fog kapni minden változtatást, amit " -"mások a kulcsaikon végrehajtottak, mióta Ön megkapta azokat." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Ez le fog tölteni minden változást, amit mások a kulcsaikon végrehajtottak, " -"mióta Ön letöltötte azokat. Nem választott ki kulcskiszolgálót a " -"közzétételhez, így az Ön kulcsai nem lesznek elérhetők mások számára." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "K_ulcskiszolgálók" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Szinkronizálás" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Ezen alkalmazás verziója" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Új jelmondat megerősítése" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Közreműködők:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Jelmondat _megerősítése:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Kelemen Gábor \n" -"Mátó Péter \n" -"Őry Máté \n" -"Tímár András " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Jelszavak és titkosítási kulcsok kezelése" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "A Seahorse projekt honlapja" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Folytatás" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fájl" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Válassza ki az előállítandó elem típusát:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "S_zerkesztés" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Az importálás meghiúsult" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importálás" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Importálandó adatok:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Nézet" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Kulcs importálása" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Súgó" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Minden kulcsfájl" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "B_eállítások" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Ejtett szöveg" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Vágólapszöveg" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "Ú_j" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Ezen program beállításainak megváltoztatása" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "A program bezárása" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "A program névjegye" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "Ú_j…" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Tartalom" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Új kulcs vagy elem készítése" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "A Seahorse súgójának megjelenítése" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Új kulcs vagy elem hozzáadása" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Nyilvános kulcs exportálása" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importálás…" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Kulcsok exportálása" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importálás fájlból" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Nem sikerült az adatokat letölteni a kulcskiszolgálóról" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importálás a vágólapról" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Másolt kulcsok" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "K_ulcstartó szerint" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Kulcstartókat felsoroló oldalsáv megjelenítése" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "S_zemélyes megjelenítése" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Csak személyes kulcsok, tanúsítványok és jelszavak megjelenítése" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "_Megbízható megjelenítése" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Csak megbízható kulcsok, tanúsítványok és jelszavak megjelenítése" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Ö_sszes megjelenítése" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Minden kulcs, tanúsítvány és jelszó megjelenítése" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Szűrő" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Kulcsok letöltése" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Kezdeti lehetőségek:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s egy személyes kulcs. Biztosan folytatja?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Új saját kulcs létrehozása: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Kulcsok importálása kulcskiszolgálókról" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Létező kulcsok importálása fájlból:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Tulajdonságok megjelenítése" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "A titkosítás elkezdéséhez kulcsokra lesz szüksége." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Törlés" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Nem sikerült a zárolás" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Nem sikerült feloldás" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Kijelölt elemek törlése" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Zárolás" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_Exportálás…" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Feloldás" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exportálás fájlba" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Tulajdonságok" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Másolás a vágólapra" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "_SSH kulcs beállítása…" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Kiválasztott kulcsok importálása a helyi kulcstartóra" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Nyilvános SSH kulcs küldése másik gépre és a kulcsot használó " +"bejelentkezések engedélyezése." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2240,176 +2340,199 @@ msgid "Enter the new passphrase again: %s" msgstr "Írja be ismét az új jelmondatot: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "_SSH kulcs beállítása…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Nyilvános SSH kulcs küldése másik gépre és a kulcsot használó " -"bejelentkezések engedélyezése." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Biztonságos parancsértelmező" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Más számítógépekhez való biztonságos csatlakozásra használható kulcsok" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Biztosan törölni akarja a(z) „%s” SSH kulcsot?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Biztosan véglegesen töröl %d SSH kulcsot?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Nem sikerült a kulcs törlése" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Biztosan véglegesen töröl %d SSH kulcsot?" +msgstr[1] "Biztosan véglegesen töröl %d SSH kulcsot?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH-kulcs" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Titkos SSH-kulcsok" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Nyilvános SSH-kulcsok" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Nem áll rendelkezésre nyilvános kulcsfájl ehhez a kulcshoz." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "SSH kulcs" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Más számítógépek (például terminálon keresztüli) eléréséhez" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Nem sikerült az SSH kulcs előállítása" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "SSH kulcs előállítása" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Használja az e-mail címét és bármely más emlékeztetőt, hogy ne felejtse " -"el, mire való a kulcs." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Az SSH kulcs lehetővé teszi a biztonságos csatlakozást megbízható, SSH-t " -"használó számítógépekhez különböző jelszavak használata nélkül." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Ha van olyan számítógép, amelyhez a kulcsot kívánja használni, akkor " -"beállíthatja a számítógépet a kulcs felismerésére. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Új SSH kulcs" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Csak létrehozás" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Létrehozás és beállítás" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Csak létrehozás" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Az SSH-kulcs lehetővé teszi a biztonságos csatlakozást más számítógépekhez." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Az e-mail címe vagy valamilyen emlékeztető a kulcs funkciójáról." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "Kulcs_leírás:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Ha van olyan számítógép, amelyhez a kulcsot kívánja használni, akkor " +"beállíthatja a számítógépet az új kulcs felismerésére." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(olvashatatlan SSH kulcs)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Személyes SSH-kulcs" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH-kulcs" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Nem sikerült a kulcs átnevezése." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Nem sikerült megváltoztatni a kulcs hitelesítését." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Nem sikerült megváltoztatni a kulcs jelmondatát." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmus:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Azonosító:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Hely:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Név:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Erősség:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Más számítógépekhez csatlakozásra használható." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Megbízhatóság" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "A kulcs tulajdonosa _jogosult csatlakozni ehhez a számítógéphez" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Ez csak a(z) „%s” fiókra vonatkozik." +msgid "This only applies to the %s account." +msgstr "Ez csak a(z) %s fiókra vonatkozik." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_Teljes kulcs exportálása" +msgid "Algorithm:" +msgstr "Algoritmus:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "A kulcs tulajdonosa _jogosult csatlakozni ehhez a számítógéphez" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Erősség:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Hely:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Más számítógépekhez csatlakozásra használható." +msgid "E_xport Complete Key" +msgstr "_Teljes kulcs exportálása" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Az SSH parancs váratlanul befejeződött." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Az SSH parancs meghiúsult." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Távoli gép jelszava" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Írja be a kulcs jelmondatát" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Az új SSH kulcs jelmondata" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Kulcs importálása: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Kulcs importálása. Írja be a jelmondatot" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH kulcsok" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Nem áll rendelkezésre személyes kulcsfájl ehhez a kulcshoz." @@ -2422,14 +2545,10 @@ msgstr "SSH kulcsok beállítása…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "például: fájlkiszolgáló.példa.hu:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Számítógép beállítása SSH kapcsolathoz" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2437,6 +2556,10 @@ "Másik, SSH-t használó számítógépen SSH kulcs használatához már rendelkeznie " "kell felhasználói fiókkal az adott gépre." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "például: fájlkiszolgáló.példa.hu:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Számítógép neve:" @@ -2449,15 +2572,196 @@ msgid "_Set Up" msgstr "_Beállítás" +#~ msgid "Login keyring" +#~ msgstr "Bejelentkezési kulcstartó" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "A kulcstartó elérése megtagadva" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "A gnome-keyring démon nem fut" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "A kulcstartó már fel lett oldva" + +#~ msgid "No such key ring exists" +#~ msgstr "Nincs ilyen kulcstartó" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Nem lehet kommunikálni a kulcstartó démonnal" + +#~ msgid "The item already exists" +#~ msgstr "Az elem már létezik" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Belső hiba a gnome-keyring elérésekor" + +#~ msgid "Algorithms here" +#~ msgstr "Algoritmusok ide" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Elem törlése" +#~ msgstr[1] "Elemek törlése" + +#~ msgid "Passwords: %s" +#~ msgstr "Jelszavak: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Jelszavak: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "A jelszótároló kulcstartó zárolása, a feloldásához mesterjelszó lesz " +#~ "szükséges." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "A jelszótároló kulcstartó feloldása mesterjelszóval, így használható lesz." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Nem sikerült a kulcstartó törlése" + +#~ msgid "Archive files" +#~ msgstr "Archív fájlok" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Már létezik egy ugyanilyen nevű fájl.\n" +#~ "\n" +#~ "Le akarja cserélni az új fájllal?" + +#~ msgid "_Replace" +#~ msgstr "_Csere" + +#~ msgid "_Sign Key..." +#~ msgstr "K_ulcs aláírása…" + +#~ msgid "Sign public key" +#~ msgstr "Nyilvános kulcs aláírása" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "Biztosan véglegesen töröl %d kulcsot és személyazonosságot?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Nem sikerült a nyilvános kulcs törlése" + +#~ msgid "New PGP Key" +#~ msgstr "Új PGP kulcs" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Nem sikerült exportálni a kulcsot ide: „%s”" + +#~ msgid "Export Complete Key" +#~ msgstr "Teljes kulcs exportálása" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Biztosan törölni akarja a(z) „%s” tanúsítványt?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Biztosan törölni akar %d tanúsítványt?" +#~ msgstr[1] "Biztosan törölni akar %d tanúsítványt?" + +#~ msgid "Deleting" +#~ msgstr "Törlés" + +#~ msgid "Create New ..." +#~ msgstr "Új létrehozása…" + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "%d kulcs kiválasztva" +#~ msgstr[1] "%d kulcs kiválasztva" + +#~ msgid "Importing keys" +#~ msgstr "Kulcsok importálása" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Ismeretlen kulcstípus vagy érvénytelen adatformátum" + +#~ msgid "Importing Keys" +#~ msgstr "Kulcsok importálása" + +#~ msgid "T_ypes" +#~ msgstr "_Típus" + +#~ msgid "Show type column" +#~ msgstr "A Típus oszlop mutatása" + +#~ msgid "_Expiry" +#~ msgstr "_Lejár" + +#~ msgid "Show expiry column" +#~ msgstr "A Lejár oszlop mutatása" + +#~ msgid "_Trust" +#~ msgstr "_Megbízhatóság" + +#~ msgid "Show owner trust column" +#~ msgstr "A Megbízhatóság oszlop mutatása" + +#~ msgid "_Validity" +#~ msgstr "Ér_vényesség" + +#~ msgid "Show validity column" +#~ msgstr "Az Érvényesség oszlop mutatása" + +#~ msgid "Other _Keys" +#~ msgstr "Egyéb kul_csok" + +#~ msgid "Validity" +#~ msgstr "Érvényesség" + +#~ msgid "Expiration Date" +#~ msgstr "Lejárati idő" + +#~ msgid "_Expand All" +#~ msgstr "Összes _kibontása" + +#~ msgid "Expand all listings" +#~ msgstr "Minden lista kibontása" + +#~ msgid "_Collapse All" +#~ msgstr "Összes össze_csukása" + +#~ msgid "Collapse all listings" +#~ msgstr "Minden lista összecsukása" + +#~ msgid "Export public key" +#~ msgstr "Nyilvános kulcs exportálása" + +#~ msgid "Exporting keys" +#~ msgstr "Kulcsok exportálása" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Nem sikerült az adatokat letölteni a kulcskiszolgálóról" + +#~ msgid "Retrieving keys" +#~ msgstr "Kulcsok letöltése" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s egy személyes kulcs. Biztosan folytatja?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Nem sikerült a kulcs törlése" + +#~ msgid "_Key Description:" +#~ msgstr "Kulcs_leírás:" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "Ne futtassa démonként a seahorse-daemont" #~ msgid "couldn't fork process" #~ msgstr "nem sikerült folyamatot indítani" -#~ msgid "couldn't create new process group" -#~ msgstr "nem sikerült új folyamatcsoportot létrehozni" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Titkosítási démon (Seahorse)" @@ -2510,9 +2814,6 @@ #~ msgid "Bad Signature" #~ msgstr "Rossz aláírás" -#~ msgid "Couldn't verify signature." -#~ msgstr "Nem ellenőrizhető az aláírás." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Érvénytelen vagy ismeretlen aláíró: %s" @@ -2705,9 +3006,6 @@ #~ msgid "Web Password" #~ msgstr "Webes jelszó" -#~ msgid "Network Password" -#~ msgstr "Hálózati jelszó" - #~ msgid "Couldn't set application access." #~ msgstr "Nem állítható be az alkalmazás elérése." @@ -2827,12 +3125,6 @@ #~ msgid "Symmetric Key" #~ msgstr "Szimmetrikus kulcs" -#~ msgid "Public Key" -#~ msgstr "Nyilvános kulcs" - -#~ msgid "Private Key" -#~ msgstr "Magánkulcs" - #~ msgid "Credentials" #~ msgstr "Hitelesítési adatok" @@ -2854,9 +3146,6 @@ #~ msgid "Loading Keys..." #~ msgstr "Kulcsok betöltése…" -#~ msgid "Searching for keys..." -#~ msgstr "Kulcsok keresése…" - #~ msgid "Uploading keys..." #~ msgstr "Kulcsok feltöltése…" @@ -2881,12 +3170,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "Kulcsok szinkronizálása" -#~ msgid "Encryption Key Manager" -#~ msgstr "Titkosítási kulcsok kezelése" - -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "Érvénytelen" @@ -2896,9 +3179,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "Nyilvános SSH kulcs" -#~ msgid "Secure Shell key" -#~ msgstr "SSH kulcs" - #~ msgid "Passphrase:" #~ msgstr "Jelmondat:" diff -Nru seahorse-3.2.2/po/id.po seahorse-3.6.3/po/id.po --- seahorse-3.2.2/po/id.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/id.po 2012-11-12 08:32:13.000000000 +0100 @@ -2,36 +2,41 @@ # Copyright (C) 2010 THE seahorse'S COPYRIGHT HOLDER # This file is distributed under the same license as the seahorse package. # -# Andika Triwidada , 2010, 2011. -# Dirgita , 2011. +# Andika Triwidada , 2010, 2011, 2012. +# Dirgita , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: seahorse master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-24 23:39+0000\n" -"PO-Revision-Date: 2011-09-25 16:05+0700\n" -"Last-Translator: Andika Triwidada \n" -"Language-Team: GNOME Indonesian Translation Team \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-07-31 00:00+0000\n" +"PO-Revision-Date: 2012-08-13 15:15+0700\n" +"Last-Translator: Dirgita \n" +"Language-Team: Indonesian \n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Poedit-Language: Indonesian\n" "X-Poedit-Country: Indonesia\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Tambahkan Ring Kunci Sandi" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nama Ring Kunci Baru:" +msgid "" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "" +"Silakan pilih suatu nama bagi ring kunci baru. Anda akan ditanyai kata sandi " +"untuk membuka kunci." #: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "Please choose a name for the new keyring. You will be prompted for an unlock password." -msgstr "Silakan pilih suatu nama bagi ring kunci baru. Anda akan ditanyai kata sandi untuk membuka kunci." +msgid "New Keyring Name:" +msgstr "Nama Ring Kunci Baru:" #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 @@ -39,292 +44,282 @@ msgid "The host name or address of the server." msgstr "Nama host atau alamat dari server." -#: ../gkr/seahorse-gkr-add-item.c:61 -#: ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Tak bisa menambah ring kunci" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Ring kunci baru untuk sandi" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Dipakai untuk menyimpan sandi jaringan dan aplikasi" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Sandi baru..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Menyimpan suatu sandi atau rahasia secara aman." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Ring Kunci Sandi" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Sandi Tersimpan" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Tak bisa menata ring kunci baku" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Tak bisa mengubah sandi ring kunci" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "Tata _sebagai baku" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Aplikasi biasanya menyimpan sandi baru pada ring kunci baku." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Ubah _Sandi" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Ubah sandi pembuka kunci dari ring kunci penyimpan sandi" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Tak bisa menambah butir" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Tambah Sandi" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "Ke_terangan:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "Cincin _Kunci:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Sandi:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Tampilkan _Sandi" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Tak bisa menghapus butir" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "Cincin _Kunci:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Tak bisa menambah ring kunci" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Sandi" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Sandi, kredensial, dan rahasia pribadi yang tersimpan" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Sandi akun IM untuk " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Sandi atau rahasia" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Sandi jaringan" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Catatan tersimpan" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Sandi ring kunci" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Sandi kunci enkripsi" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Sandi penyimpanan kunci" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Sandi Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Sandi Akun Daring Gnome" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Sandi Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Sandi perpesanan instan" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Rahasia Manajer Jaringan" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Anda yakin ingin menghapus sandi '%s'?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Anda yakin ingin menghapus %d sandi?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Menghapus butir" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Mengakses suatu sumber daya atau share jaringan" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Akses suatu situs web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Buka kunci suatu kunci PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Buka kunci suatu kunci Secure Shell" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Sandi atau log masuk tersimpan" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Kredensial Jaringan" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Sandi" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Tak bisa mengubah sandi." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Memutakhirkan sandi" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Tak bisa menata keterangan." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Sandi:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Rincian Teknis:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Rincian" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Properti Kunci" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Kunci" +msgid "Use:" +msgstr "Pakai:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Properti Kunci" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipe:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Log Masuk:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Log Masuk:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Tampilkan _sandi" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipe:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Pakai:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Sandi: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Sandi: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Ring Kunci Sandi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Dipakai untuk menyimpan sandi jaringan dan aplikasi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Sandi Tersimpan" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Menyimpan suatu sandi atau rahasia secara aman." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Tak bisa membuka ring kunci" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Tak bisa mengunci ring kunci" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Tak bisa menata ring kunci baku" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Tak bisa mengubah sandi ring kunci" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Mengunci" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "Lock the password storage keyring so a master password is required to unlock it." -msgstr "Kunci ring kunci tempat menyimpan sandi sehingga sandi utama diperlukan untuk membuka kuncinya." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "B_uka kunci" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "Unlock the password storage keyring with a master password so it is available for use." -msgstr "Buka kunci ring kunci tempat menyimpan sandi dengan sandi utama sehingga dapat dipakai." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "Tata _sebagai baku" +msgid "Password:" +msgstr "Sandi:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Aplikasi biasanya menyimpan sandi baru pada ring kunci baku." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Kunci" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Ubah _Sandi" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Rincian Teknis:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Ubah sandi pembuka kunci dari ring kunci penyimpan sandi" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Rincian" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Tak bisa menghapus ring kunci" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Sebuah ring kunci yang secara otomatis terbuka saat log masuk" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Suatu ring kunci dipakai untuk menyimpan sandi" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Anda yakin ingin menghapus ring kunci sandi '%s'?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Menghapus ring kunci" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Saya paham bahwa semua butir akan dihapus secara permanen." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Properti Ring Kunci" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nama:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Dibuat:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Ring Kunci" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Properti Ring Kunci" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nama:" - -#: ../gkr/seahorse-gkr-operation.c:52 -#: ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 -#: ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Operasi dibatalkan" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Akses ke ring kunci ditolak" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Daemon gnome-keyring tak sedang berjalan" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Ring kunci telah dibuka kuncinya" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Ring kunci itu tak ada" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Tak bisa berkomunikasi dengan daemon ring kunci" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Butir sudah ada" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Galat internal saat mengakses gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Tampilkan bendera" @@ -510,8 +505,7 @@ msgid "Select the date from a calendar" msgstr "Pilih tanggal dari suatu kalender" -#: ../libegg/egg-datetime.c:521 -#: ../libegg/egg-datetime.c:2199 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Waktu" @@ -534,14 +528,12 @@ msgid "24hr: no" msgstr "24hr: yes" -#: ../libegg/egg-datetime.c:797 -#: ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 #: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "AM" -#: ../libegg/egg-datetime.c:799 -#: ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 #: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "PM" @@ -584,270 +576,326 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "butir awal sementara" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Tambah Server Kunci" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Host:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Tipe Server Kunci:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Host:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "Nomor port untuk mengakses server." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "butir awal sementara " +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versi aplikasi ini" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Frase Sandi" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Pengaturan Sistem" -#: ../libseahorse/seahorse-passphrase.c:183 -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Sandi:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Kontribusi:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Konfirmasi:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Sandi dan Kunci" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Bukan alamat Server Kunci yang valid." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Andika Triwidada , 2010, 2011, 2012.\n" +"Dirgita , 2011." -#: ../libseahorse/seahorse-prefs.c:69 -msgid "For help contact your system adminstrator or the administrator of the key server." -msgstr "Untuk bantuan silakan hubung administrator sistem Anda atau administrator server kunci." +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Situs Web Projek Seahorse" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Tak bisa menghapus" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Gubahan" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Tak bisa mengekspor kunci" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Tak satupun: Jangan publikasikan kunci" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Tak bisa mengekspor data" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Otomatis ambil kunci dari server _kunci" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Berkas" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Oto_matis selaraskan kunci yang berubah dengan server kunci" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_kspor..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Server Kunci" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Ekspor ke suatu berkas" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Preferensi" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Sunting" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Cari kunci melalui:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Salin ke clipboard" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Publikasikan kunci ke:" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Hapus" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Mengambil data" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Hapus butir yang dipilih" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Mengekspor data" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Tampilkan properti butir ini" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Tampilkan properti ring kunci ini" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Mengimpor data" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Prefere_nsi" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Mengirim data" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Ubah preferensi program ini" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Tak tersedia" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Tilik" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Ba_ntuan" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Data Kunci" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Tentang program ini" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Kunci Berganda" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Isi" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Semua berkas kunci" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Tampilkan bantuan Seahorse" -#: ../libseahorse/seahorse-util.c:745 -#: ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Semua berkas" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Ekspor" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Berkas arsip" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Telah ada berkas dengan nama ini.\n" -"\n" -"Anda ingin menggantikannya dengan suatu berkas baru?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Gantikan" +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Masukkan PIN atau sandi bagi: %s" -#: ../libseahorse/seahorse-validity.c:40 -#: ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Sandi:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Konfirmasi:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Bukan alamat Server Kunci yang valid." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Untuk bantuan silakan hubung administrator sistem Anda atau administrator " +"server kunci." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Gubahan" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Tak satupun: Jangan publikasikan kunci" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Preferensi" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Cari kunci melalui:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Publikasikan kunci ke:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Otomatis ambil kunci dari server _kunci" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Oto_matis selaraskan kunci yang berubah dengan server kunci" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Server Kunci" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" + +#: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Tidak diketahui" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Tidak pernah" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Sekedarnya" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Penuh" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Paling dipercaya" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Dimatikan" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" -msgstr "Dicabut " +msgstr "Dicabut" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Tidak dapat menampilkan bantuan: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Tanggal Kedaluarsa:" +msgid "Never E_xpires" +msgstr "Tak Pernah _Kadaluarsa" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Buat suatu sub kunci baru" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Bila kunci tak pernah kadaluarsa" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipe Kunci:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Panjang Kunci:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipe Kunci:" +msgid "Expiration Date:" +msgstr "Tanggal Kedaluarsa:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Panjang Kunci" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Tak Pernah _Kadaluarsa" +msgid "Generate a new subkey" +msgstr "Buat suatu sub kunci baru" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Tambah ID Pengguna" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Buat ID pengguna baru" +msgid "Must be at least 5 characters long" +msgstr "Panjangnya mesti paling tidak 5 karakter" #: ../pgp/seahorse-add-uid.xml.h:3 -#: ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nama Lengkap:" +msgid "Optional email address" +msgstr "Alamat surel tambahan" #: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Ko_mentar Kunci:" - -#: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "Panjangnya mesti paling tidak 5 karakter" - -#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Optional comment describing key" msgstr "Komentar tambahan yang menjelaskan kunci" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Alamat surel tambahan" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nama Lengkap:" -#: ../pgp/seahorse-add-uid.xml.h:8 -#: ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "Alamat _Email:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Ko_mentar Kunci:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Buat ID pengguna baru" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Uba_h" +msgid "_Never expires" +msgstr "Tak per_nah kadaluarsa" -#: ../pgp/seahorse-expires.xml.h:2 -#: ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Cabut Kunci" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "Tak per_nah kadaluarsa" +msgid "C_hange" +msgstr "Uba_h" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -858,8 +906,7 @@ msgid "Add subkey to %s" msgstr "Tambah sub kunci ke %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 -#: ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (hanya tanda tangan)" @@ -867,8 +914,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (hanya menyandi)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 -#: ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (hanya tanda tangan)" @@ -887,7 +933,13 @@ #: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." -msgstr "Pengawa-sandian gagal. Anda barangkali tidak memiliki kunci pengawa-sandian." +msgstr "" +"Pengawa-sandian gagal. Anda barangkali tidak memiliki kunci pengawa-sandian." + +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Operasi dibatalkan" #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" @@ -906,46 +958,145 @@ msgid "Expiry: %s" msgstr "Kadaluarsa: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Kunci Berganda" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Data Kunci" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Kunci PGP yang terbungkus" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Kunci PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Kunci PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Dipakai untuk menyandikan surel dan berkas" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Tak bisa membuat kunci PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Frasa sandi bagi kunci PGP Baru" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Masukkan frasa sandi bagi kunci Anda dua kali." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Ketika membuat sebuah kunci, kami harus membuat\n" +"banyak sekali data acak yang memerlukan bantuan\n" +"dari Anda. Adalah hal yang sangat bagus apabila Anda\n" +"melakukan aksi lain seperti mengetik, menggerakkan\n" +"tetikus, maupun memakai aplikasi. Ini memberi\n" +"sistem data acak yang diperlukannya tersebut." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Menjangkitkan kunci" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Anda yakin ingin menghapus %s secara permanen?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Anda yakin ingin menghapus %d kunci secara permanen?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Sandi salah" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Ini kali ketiga Anda memasukkan sandi yang salah. Silakan coba lagi." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Frasa sandi salah." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Masukkan frasa kunci baru bagi '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Masukkan frasa sandi untuk '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Masukkan frasa kunci baru" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Masukkan frasa sandi" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Frase Sandi" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Termuat %d kunci" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Data kunci tak valid (tak ada UID). Ini mungkin karena suatu komputer dengan " +"tanggal yang ditata di masa depan atau tanda-tangan sendiri yang hilang." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Kunci GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: direktori ring kunci baku" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -965,8 +1116,12 @@ #: ../pgp/seahorse-gpgme-photos.c:128 #, c-format -msgid "This is not a image file, or an unrecognized kind of image file. Try to use a JPEG image." -msgstr "Ini bukan berkas citra, atau berkas citra yang tak dikenal. Cobalah memakai citra JPEG." +msgid "" +"This is not a image file, or an unrecognized kind of image file. Try to use " +"a JPEG image." +msgstr "" +"Ini bukan berkas citra, atau berkas citra yang tak dikenal. Cobalah memakai " +"citra JPEG." #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" @@ -976,28 +1131,31 @@ msgid "All JPEG files" msgstr "Semua berkas JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Semua berkas" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Pilih Foto untuk Ditambahkan ke Kunci" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Tak bisa menyiapkan foto" -#: ../pgp/seahorse-gpgme-photos.c:288 -#: ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Tak bisa menambah foto" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Berkas tak dapat dimuat. Mungkin bentuknya tak valid" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Anda yakin ingin menghapus foto kini dari kunci Anda?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Tak bisa menghapus foto" @@ -1044,14 +1202,22 @@ #: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format -msgid "You are about to add %s as a revoker for %s. This operation cannot be undone! Are you sure you want to continue?" -msgstr "Anda akan menambah %s sebagai pencabut bagi %s. Operasi ini tak bisa dibatalkan! Anda yakin akan melanjutkan?" +msgid "" +"You are about to add %s as a revoker for %s. This operation cannot be " +"undone! Are you sure you want to continue?" +msgstr "" +"Anda akan menambah %s sebagai pencabut bagi %s. Operasi ini tak bisa " +"dibatalkan! Anda yakin akan melanjutkan?" #: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "Tak bisa menambah pencabut" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Saya paham bahwa kunci rahasia ini akan dihapus secara permanen." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1066,563 +1232,633 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 -#: ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Tak ada kunci yang dapat dipakai untuk menanda-tangani" -#: ../pgp/seahorse-gpgme-sign.c:162 -msgid "You have no personal PGP keys that can be used to indicate your trust of this key." -msgstr "Anda tak punya kunci PGP pribadi yang dapat dipakai untuk mengindikasikan kepercayaan Anda atas kunci ini." +#: ../pgp/seahorse-gpgme-sign.c:165 +msgid "" +"You have no personal PGP keys that can be used to indicate your trust of " +"this key." +msgstr "" +"Anda tak punya kunci PGP pribadi yang dapat dipakai untuk mengindikasikan " +"kepercayaan Anda atas kunci ini." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Frasa sandi salah." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Masukkan frasa kunci baru bagi '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Pencarian tidak cukup spesifik. Server '%s' menemukan terlalu banyak kunci." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Masukkan frasa sandi untuk '%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Tak bisa berkomunikasi dengan server '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Masukkan frasa kunci baru" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Server Kunci HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Masukkan frasa sandi" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Tak bisa mengimpor kunci" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Mengimpor kunci dari server kunci" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Jauh" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Tutup jendela ini" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Cari Kunci Jauh..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Cari kunci di server kunci" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Impor" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Impor kunci yang dipilih ke ring kunci lokal" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Kunci Jauh" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Termuat %d kunci" +msgid "Remote Keys Containing '%s'" +msgstr "Kunci Jauh Memuat '%s'" -#: ../pgp/seahorse-gpgme-source.c:649 -msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." -msgstr "Data kunci tak valid (tak ada UID). Ini mungkin karena suatu komputer dengan tanggal yang ditata di masa depan atau tanda-tangan sendiri yang hilang." +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Pencarian kunci gagal." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Cari Kunci Jauh" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Server Kunci HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "" +"Ini akan mencari kunci milik orang lain di Internet. Kunci tersebut kemudian " +"dapat diimpor ke ring kunci lokal Anda." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Cari kunci yang memuat: " + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Server Kunci:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Kunci Dipakai Bersama Dekat Aku:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Mencari di mana:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Cari" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Tak bisa mempublikasikan kunci ke server" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Pencarian tidak cukup spesifik. Server '%s' menemukan terlalu banyak kunci." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Tak bisa mengambil kunci dari server: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Tak bisa berkomunikasi dengan server '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d kunci dipilih untuk penyelarasan" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Menyelaraskan kunci..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Selaraskan Kunci" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Ini akan mempublikasikan kunci pada ring kunci Anda sehingga mereka dapat " +"dipakai orang lain. Anda juga mendapat perubahan yang dilakukan orang lain " +"sejak Anda menerima kunci mereka." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Ini akan mengambil sebarang perubahan yang telah dilakukan orang lain sejam " +"Anda menerima kunci mereka. Tak ada server kunci yang dipilih untuk " +"publikasi, sehingga kunci Anda tak akan disediakan bagi orang lain." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Server _Kunci" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Selaraskan" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Tak bisa berkomunikasi dengan '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Menyambung ke: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Tak bisa memecah alamat: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Memecah alamat server: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Server Kunci LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Tanda Tangani Kunci..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Tanda tangani kunci publik" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Anda yakin ingin menghapus %s secara permanen?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Anda yakin ingin menghapus %d kunci dan identitas secara permanen?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Anda yakin ingin menghapus %d kunci secara permanen?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Selaraskan dari Publikasikan Kunci..." -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Anda yakin ingin menghapus %d identitas secara permanen?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publikasikan dan/atau selaraskan kunci Anda dengan yang daring." -#: ../pgp/seahorse-pgp-commands.c:201 -#: ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Tak bisa menghapus ID pengguna" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Kunci PGP" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Tak bisa menghapus kunci privat" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Tak bisa menghapus kunci publik" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Kunci PGP pipakai untuk menyandikan surel atau berkas" #: ../pgp/seahorse-pgp-generate.xml.h:1 -#: ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opsi kunci tingk_at lanjut" +msgid "C_reate" +msgstr "_Buat" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "Suatu kunci PGP memungkinkan Anda menyandikan surel atau berkas ke orang lain" +msgid "Generate a new key" +msgstr "Buat suatu kunci baru" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritma disini" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "" +"Suatu kunci PGP memungkinkan Anda menyandikan surel atau berkas ke orang lain" -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Buat" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Komentar:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Tanggal _Kadaluarsa:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Tak _Pernah Kadaluarsa" -#: ../pgp/seahorse-pgp-generate.xml.h:6 -#: ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Tipe Penyandian:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Buat suatu kunci baru" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 -#: ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Kekuatan Kunci (bit):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Tak _Pernah Kadaluarsa" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Kunci PGP Baru" +msgid "E_xpiration Date:" +msgstr "Tanggal _Kadaluarsa:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Komentar:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opsi kunci tingk_at lanjut" -#: ../pgp/seahorse-pgp-key.c:572 -#: ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Kadaluarsa " +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Kunci pribadi PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Kunci PGP" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Tak bisa mengubah ID pengguna primer" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Anda yakin ingin menghapus ID pengguna '%s' selamanya?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Tak bisa menghapus ID pengguna" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "Tidak diketahui" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nama/Email" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID Tanda Tangan" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Tak bisa mengubah foto utama" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(tidak diketahui)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Kunci ini kedaluarsa pada: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nama" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Anda yakin ingin menghapus sub kunci %d dari %s selamanya?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Tak bisa menghapus sub kunci" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Tak bisa mengubah kepercayaan" -#: ../pgp/seahorse-pgp-key-properties.c:1142 -#: ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Tak bisa mengekspor kunci ke \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Ekspor Kunci Lengkap" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Tak bisa mengekspor kunci." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Tak bisa mengekspor kunci" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Tidak pernah" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Jenis" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Dibuat" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Kadaluwarsa" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Status" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Kekuatan" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Kadaluarsa" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Bagus" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID Kunci" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Aksi" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Komentar:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Tanggal" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Email:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Sidik Jari:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID Kunci:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Tidak pernah" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Tanda Tangan dan Nama Kunci" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Kunci ini telah dicabut" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Foto " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Pemilik kunci telah mencabut kunci. Itu tak bisa dipakai lagi." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Rincian Teknis" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Kunci ini telah kadaluarsa" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Kunci ini telah dicabut" +msgid "Add a photo to this key" +msgstr "Tambah foto ke kunci ini" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Kunci ini telah kadaluarsa" +msgid "Remove this photo from this key" +msgstr "Hapus foto ini dari kunci ini" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipe:" +msgid "Make this photo the primary photo" +msgstr "Buat foto ini foto utama" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Pakai:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Ke foto sebelumnya" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Sub Kunci" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Ke foto berikutnya" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Tambah" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Foto " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Tambah foto ke kunci ini" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID Kunci:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Ubah _Frasa Sandi" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nama:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Awasandi berkas dan surel yang dikirim ke Anda." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Email:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Hapus" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Komentar:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Kadaluarsa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Pakai:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Kadaluarsa:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipe:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Ekspor" +msgid "Decrypt files and email sent to you." +msgstr "Awasandi berkas dan surel yang dikirim ke Anda." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Kunci PGP Privat" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Ke foto berikutnya" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Ubah _Frasa Sandi" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Ke foto sebelumnya" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Pemilik" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ID Kunci:" +msgid "Key Names and Signatures" +msgstr "Tanda Tangan dan Nama Kunci" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Utama" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Buat foto ini foto utama" +msgid "Sign" +msgstr "Tandatangani" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nama dan Tanda Tangan" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Hapus" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Tidak pernah" +msgid "_Add Name" +msgstr "T_ambah Nama" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "_Timpa Kepercayaan Pemilik:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Pemilik" +msgid "Revoke" +msgstr "Cabut" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Utama" +msgid "Names and Signatures" +msgstr "Nama dan Tanda Tangan" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Kunci PGP Privat" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID Kunci:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Hapus foto ini dari kunci ini" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Cabut" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Kekuatan:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Tandatangani" +msgid "Technical Details" +msgstr "Rincian Teknis" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Kekuatan:" +msgid "Fingerprint" +msgstr "Sidik Jari:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Pemilik kunci telah mencabut kunci. Itu tak bisa dipakai lagi." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Kadaluarsa:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "T_ambah Nama" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Tanggal" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "_Timpa Kepercayaan Pemilik:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Ekspor Kunci Lengkap:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nama:" +msgid "Actions" +msgstr "Aksi" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Tanggal:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Tambah" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Kadaluarsa" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Sub Kunci" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Sekedarnya" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Sidik jari:" +msgid "Fully" +msgstr "Sepenuhnya" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indikasikan Kepercayaan:" +msgid "Ultimately" +msgstr "Sepenuhnya" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Kepercayaan Anda atas kunci ini" +msgid "Encrypt files and email to the key's owner" +msgstr "Sandikan berkas dan surel ke pemilik kunci" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Kunci PGP Publik" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "Nama _Lain:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Orang yang telah menanda-tangani kunci ini:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Sandikan berkas dan surel ke pemilik kunci" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Kepercayaan Anda atas kunci ini" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Sepenuhnya" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Kepercayaan Anda dinyatakan secara manual pada tab Rincian." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Saya percaya tanda tangan dari '%s' pada kunci lain" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 -#, no-c-format -msgid "If you believe that the person that owns this key is '%s', sign this key:" -msgstr "Bila Anda percaya bahwa orang yang memiliki kunci ini adalah '%s', tanda tangani kunci ini:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format -msgid "If you no longer trust that '%s' owns this key, revoke your signature:" -msgstr "Bila Anda tak lagi percaya bahwa '%s' memiliki kunci ini, cabut tanda tangan Anda:" +msgid "" +"If you believe that the person that owns this key is '%s', sign this " +"key:" +msgstr "" +"Bila Anda percaya bahwa orang yang memiliki kunci ini adalah '%s', tanda " +"tangani kunci ini:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Sekedarnya" +msgid "_Sign this Key" +msgstr "_Tanda Tangani Kunci Ini" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 +#, no-c-format +msgid "" +"If you no longer trust that '%s' owns this key, revoke your signature:" +msgstr "" +"Bila Anda tak lagi percaya bahwa '%s' memiliki kunci ini, cabut tanda " +"tangan Anda:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Kunci PGP Publik" +msgid "_Revoke Signature" +msgstr "_Cabut Tanda Tangan" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Orang yang telah menanda-tangani kunci ini:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Hanya tampilkan tanda tangan _orang yang saya percayai" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Percaya" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Sepenuhnya" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Anda Mem_percayai sang Pemilik:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Kepercayaan Anda dinyatakan secara manual pada tab Rincian." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Sidik jari:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Hanya tampilkan tanda tangan _orang yang saya percayai" +msgid "Dates:" +msgstr "Tanggal:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Cabut Tanda Tangan" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indikasikan Kepercayaan:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Tanda Tangani Kunci Ini" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Anda Mem_percayai sang Pemilik:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1630,278 +1866,402 @@ msgstr "Sub kunci %d dari %s" #: ../pgp/seahorse-revoke.xml.h:1 +msgid "Reason for revoking the key" +msgstr "Alasan mencabut kunci" + +#: ../pgp/seahorse-revoke.xml.h:2 +msgid "_Reason:" +msgstr "_Alasan:" + +#: ../pgp/seahorse-revoke.xml.h:4 msgid "Optional description of revocation" msgstr "Keterangan tambahan atas pencabutan" -#: ../pgp/seahorse-revoke.xml.h:2 +#: ../pgp/seahorse-revoke.xml.h:6 msgid "Re_voke" msgstr "Ca_but" -#: ../pgp/seahorse-revoke.xml.h:3 -msgid "Reason for revoking the key" -msgstr "Alasan mencabut kunci" - -#: ../pgp/seahorse-revoke.xml.h:6 -msgid "_Reason:" -msgstr "_Alasan:" +#: ../pgp/seahorse-signer.c:63 +msgid "" +"You have no personal PGP keys that can be used to sign a document or message." +msgstr "" +"Anda tak memiliki kunci PGP personal yang dapat dipakai untuk menanda " +"tangani dokumen atau pesan." -#: ../pgp/seahorse-signer.c:62 -msgid "You have no personal PGP keys that can be used to sign a document or message." -msgstr "Anda tak memiliki kunci PGP personal yang dapat dipakai untuk menanda tangani dokumen atau pesan." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Tanda tangani pe_san dengan kunci:" #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Seberapa hati-hati Anda telah periksa kunci ini?" +msgid "Sign Key" +msgstr "Tanda Tangani Kunci" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Bagaimana orang lain melihat tanda tangan ini:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"Dengan menanda-tangani Anda mengindikasikan kepercayaan Anda bahwa kunci ini " +"milik:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Tanda tangani kunci sebagai:" +msgid "Key Name" +msgstr "Nama Kunci" #: ../pgp/seahorse-sign.xml.h:4 -msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. " -msgstr "Santai: berarti Anda telah melakukan verifikasi secara santai bahwa kunci dimiliki oleh orang yang mengklaim memilikinya. Sebagai contoh, Anda dapat membaca sidik jari kunci ke pemilik melalui telepon." +msgid "How carefully have you checked this key?" +msgstr "Seberapa hati-hati Anda telah periksa kunci ini?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nama Kunci" +msgid "_Not at all" +msgstr "Tanpa apapun" #: ../pgp/seahorse-sign.xml.h:6 -msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." -msgstr "Tanpa apapun: berarti Anda percaya bahwa kunci dimiliki oleh orang yang mengklaim memilikinya, tapi Anda tidak dapat atau tidak memverifikasi ini sebagai fakta." +msgid "_Casually" +msgstr "Dengan _santai" #: ../pgp/seahorse-sign.xml.h:7 -msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." -msgstr "Dengan Sangat Berhati-hati: Pilih ini hanya jika Anda amat sangat yakin bahwa kunci ini asli." +msgid "_Very Carefully" +msgstr "Dengan Sangat _Hati-hati" #: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Dengan menanda-tangani Anda mengindikasikan kepercayaan Anda bahwa kunci ini milik:" +msgid "" +"Not at all: means you believe the key is owned by the person who " +"claims to own it, but you could not or did not verify this to be a fact." +msgstr "" +"Tanpa apapun: berarti Anda percaya bahwa kunci dimiliki oleh orang " +"yang mengklaim memilikinya, tapi Anda tidak dapat atau tidak memverifikasi " +"ini sebagai fakta." #: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Saya dapat mencabut tanda tangan ini di kemudian ha_ri." +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Santai: berarti Anda telah melakukan verifikasi secara santai bahwa " +"kunci dimiliki oleh orang yang mengklaim memilikinya. Sebagai contoh, Anda " +"dapat membaca sidik jari kunci ke pemilik melalui telepon." #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Tanda Tangani Kunci" +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "" +"Dengan Sangat Berhati-hati: Pilih ini hanya jika Anda amat sangat " +"yakin bahwa kunci ini asli." #: ../pgp/seahorse-sign.xml.h:11 -msgid "You could use a hard to forge photo identification (such as a passport) to personally check that the name on the key is correct. You should have also used email to check that the email address belongs to the owner." -msgstr "Anda dapat memakai identifikasi foto yang sulit dipalsu (seperti misalnya paspor) untuk menguji secara pribadi bahwa nama pada kunci adalah benar. Anda juga mesti telah memakai surel untuk memeriksa bahwa alamat email memang milik sang pemilik tersebut." +msgid "" +"You could use a hard to forge photo identification (such as a passport) to " +"personally check that the name on the key is correct. You should have also " +"used email to check that the email address belongs to the owner." +msgstr "" +"Anda dapat memakai identifikasi foto yang sulit dipalsu (seperti misalnya " +"paspor) untuk menguji secara pribadi bahwa nama pada kunci adalah benar. " +"Anda juga mesti telah memakai surel untuk memeriksa bahwa alamat email " +"memang milik sang pemilik tersebut." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "Dengan _santai" +msgid "How others will see this signature:" +msgstr "Bagaimana orang lain melihat tanda tangan ini:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "Tanpa apapun" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Orang lain tak boleh melihat tanda tangan ini" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Saya dapat mencabut tanda tangan ini di kemudian ha_ri." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Tandatangani" +msgid "Sign key as:" +msgstr "Tanda tangani kunci sebagai:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Penandatangan:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "Dengan Sangat _Hati-hati" +msgid "_Sign" +msgstr "_Tandatangani" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Tanda tangani pe_san dengan kunci:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Mengekspor data" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Mengambil data" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Mengimpor data" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Mengirim data" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Tak tersedia" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Kunci dan sertifikat pribadi" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Sertifikat pribadi" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Sertifikat" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Sertifikat (dienkode DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Sertifikat" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Sertifikat X.509 dan kunci-kunci terkait" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Anda yakin ingin menghapus %d sertifikat secara permanen?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Tak bisa mebuat kunci privat" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Buat" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Kunci privat" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Dipakai untuk meminta sertifikat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Buat suatu kunci privat baru" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Label:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Tersimpan di:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Saya paham bahwa kunci ini akan dihapus secara permanen." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Tanpa nama" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Gagal mengekspor sertifikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Tak bisa menghapus" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Anda yakin ingin menghapus sertifikat '%s'?" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Ekspor" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Ekspor sertifikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Hapus sertifikat atau kunci ini" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Minta _Sertifikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Membuat berkas permintaan sertifikat bagi kunci ini" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Tak bisa menyimpan permintaan sertifikat" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Simpan permintaan sertifikat" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Permintaan sertifikat" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Permintaan terenkode PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Tak bisa membuat permintaan sertifikat" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Buat suatu berkas permintaan sertifikat." -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Anda yakin ingin menghapus %d sertifikat?" +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "" +"Nama umum (common name, CN) yang ditempatkan di dalam permintaan sertifikat." -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Menghapus" +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nama (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Kunci privat tanpa nama" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Ubah Frasa Sandi" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Kon_firmasi Frasa Sandi:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "_Frasa Sandi Baru:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Konfirmasi frasa sandi baru" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "_Frasa Sandi Baru:" +msgid "Con_firm Passphrase:" +msgstr "Kon_firmasi Frasa Sandi:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Kelola sandi dan kunci penyandian Anda" -#: ../src/seahorse.desktop.in.in.h:2 -#: ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 -#: ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Sandi dan Kunci" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Lanjutkan" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "Pilih jeni_s butir yang akan dibuat:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "L_anjutkan" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Buat Baru ..." - -#: ../src/seahorse-key-manager.c:251 -#: ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d kunci dipilih" - -#: ../src/seahorse-key-manager.c:431 -#: ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 -#: ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Tak bisa mengimpor kunci" - -#: ../src/seahorse-key-manager.c:433 -#: ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Kunci diimpor" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Mengimpor kunci" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Pengimporan gagal" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Impor" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Data yang akan diimpor:" -#: ../src/seahorse-key-manager.c:504 -#: ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Impor Kunci" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Jenis kunci tak dikenal, atau bentuk data tak valid" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Mengimpor Kunci" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Semua berkas kunci" -#: ../src/seahorse-key-manager.c:737 -#: ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Jauh" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Teks yang dijatuhkan" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Teks papan klip" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Baru" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Tutup program ini" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_Baru..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Buat suatu butir atau kunci baru" -#: ../src/seahorse-key-manager.c:742 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Tambahkan kunci atau butir baru" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "_Impor..." -#: ../src/seahorse-key-manager.c:743 +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "Impor dari sebuah berkas" -#: ../src/seahorse-key-manager.c:745 +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "Impor dari clipboard" -#: ../src/seahorse-key-manager.c:750 -#: ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Cari Kunci Jauh..." - -#: ../src/seahorse-key-manager.c:751 -#: ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Cari kunci di server kunci" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Selaraskan dari Publikasikan Kunci..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publikasikan dan/atau selaraskan kunci Anda dengan yang daring." +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Menurut ring _kunci" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Tampilkan bilah sisi yang menampilkan daftar ring kunci" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Tampilkan _pribadi" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Hanya tampilkan kunci, sertifikat, dan sandi pribadi" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "_Tampilkan terpercaya" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Hanya tampilkan kunci, sertifikat, dan sandi yang terpercaya" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Tampulkan _apapun" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Tampilkan semua kunci, sertifikat, dan sandi" -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_ipe" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Tampilkan kolom tipe" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "Ka_daluarsa" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Tampilkan kolom kadaluarsa" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Kepercayaan" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Tampilkan kolom kepercayaan pemilik" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validitas" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Tampilkan kolom validitas" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Penyaring:" +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Penyaring" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -1909,259 +2269,49 @@ #: ../src/seahorse-key-manager.xml.h:2 msgid "Generate a new key of your own: " -msgstr "Buat sendiri kunci barumu:" +msgstr "Buat sendiri kunci barumu: " -#: ../src/seahorse-key-manager.xml.h:3 +#: ../src/seahorse-key-manager.xml.h:4 msgid "Import existing keys from a file:" msgstr "Impor kunci dari suatu berkas:" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Kunci _Pribadiku" - #: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_Kunci Lain" - -#: ../src/seahorse-key-manager.xml.h:6 msgid "To get started with encryption you will need keys." msgstr "Untuk mulai menyandi Anda perlu kunci." -#: ../src/seahorse-key-manager.xml.h:7 -#: ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Impor" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Sandi" - -#: ../src/seahorse-key-manager-store.c:610 -#: ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Tak bisa mengekspor kunci" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validitas" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Tanggal Kadaluarsa" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Tutup jendela ini" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "K_embangkan Semua" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Kembangkan semua daftar" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Lipat Semua" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Lipat semua daftar" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Kunci Jauh" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Kunci Jauh Memuat '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Server Kunci:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Kunci Dipakai Bersama Dekat Aku:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Cari Kunci Jauh" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." -msgstr "Ini akan mencari kunci milik orang lain di Internet. Kunci tersebut kemudian dapat diimpor ke ring kunci lokal Anda." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Mencari di mana:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Cari" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Cari kunci yang memuat:" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Tak bisa mempublikasikan kunci ke server" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Tak bisa mengambil kunci dari server: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d kunci dipilih untuk penyelarasan" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Menyelaraskan kunci..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Selaraskan Kunci" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Tak bisa mengunci" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Tak bisa membuka kunci" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." -msgstr "Ini akan mempublikasikan kunci pada ring kunci Anda sehingga mereka dapat dipakai orang lain. Anda juga mendapat perubahan yang dilakukan orang lain sejak Anda menerima kunci mereka." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." -msgstr "Ini akan mengambil sebarang perubahan yang telah dilakukan orang lain sejam Anda menerima kunci mereka. Tak ada server kunci yang dipilih untuk publikasi, sehingga kunci Anda tak akan disediakan bagi orang lain." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Server _Kunci" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Mengunci" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Selaraskan" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "B_uka kunci" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versi aplikasi ini" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Properti" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Kontribusi:" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Tata Kunci bagi _Secure Shell..." -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." msgstr "" -"Andika Triwidada , 2010, 2011.\n" -"Dirgita , 2011." - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Situs Web Projek Seahorse" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Berkas" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Sunting" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Tilik" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Ba_ntuan" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Prefere_nsi" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Ubah preferensi program ini" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Tentang program ini" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Isi" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Tampilkan bantuan Seahorse" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Ekspor kunci publik" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Mengekspor kunci" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Tak bisa mengambil data dari server kunci" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Telah menyalin kunci" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Mengambil kunci" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s adalah suatu kunci privat. Anda yakin ingin melanjutkan?" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Mengimpor kunci dari server kunci" - -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Tampilkan properti" - -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Hapus" - -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Hapus butir yang dipilih" - -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_kspor..." - -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Ekspor ke suatu berkas" +"Kirim kunci publik Secure Shell ke mesin lain, dan bolehkan log masuk " +"memakai kunci itu." -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Salin ke clipboard" - -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Impor kunci yang dipilih ke ring kunci lokal" - -#: ../ssh/seahorse-ssh-askpass.c:60 -#: ../ssh/seahorse-ssh-askpass.c:68 +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" msgstr "Masukkan frasa sandi Secure Shell Anda:" @@ -2174,8 +2324,7 @@ msgid "Enter the old passphrase for: %s" msgstr "Masukkan frasa sandi lama bagi: %s" -#: ../ssh/seahorse-ssh-askpass.c:87 -#: ../ssh/seahorse-ssh-askpass.c:92 +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 msgid "New Key Passphrase" msgstr "Frasa Sandi Kunci Baru" @@ -2189,163 +2338,199 @@ msgid "Enter the new passphrase again: %s" msgstr "Masukkan frasa sandii baru lagi: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Tata Kunci bagi _Secure Shell..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "Send public Secure Shell key to another machine, and enable logins using that key." -msgstr "Kirim kunci publik Secure Shell ke mesin lain, dan bolehkan log masuk memakai kunci itu." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Kunci yang dipakai untuk menyambung secara aman ke komputer lain" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Anda yakin ingin menghapus kunci secure shell '%s'?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Anda yakin ingin menghapus %d kunci secure shell?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Anda yakin ingin menghapus %d kunci secure shell?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Kunci SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Kunci Rahasia SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Kunci Publik SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Tak tersedia berkas kunci publik bagi kunci ini." -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Tak bisa menghapus kunci" - -#: ../ssh/seahorse-ssh-generate.c:60 -#: ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 -#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Kunci Secure Shell" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Dipakai untuk mengakses komputer lain (mis: lewat terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 -#: ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Tak bisa membuat kunci Secure Shell" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Membuat Kunci Secure Shell" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "Use your email address, and any other reminder you need about what this key is for." -msgstr "Pakai alamat surel Anda, dan sebarang pengingat lain yang Anda perlukan tentang apa guna kunci ini." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "A Secure Shell (SSH) key lets you connect securely to trusted computers using SSH, without entering a different password for each of them." -msgstr "Suatu kunci Secure Shell (SSH) memungkinkan Anda menyambung secara aman ke komputer yang terpercaya melalui SSH, tanpa memasukkan sandi yang berbeda untuk setiap mesin." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "If there is already a computer you want to use this key with, you can set up that computer to recognize your key now. " -msgstr "Bila sudah ada komputer yang ingin Anda pakaikan kunci ini, Anda dapat menyiapkan komputer tersebut untuk mengenal kunci Anda sekarang." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Kunci Secure Shell Baru" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Hanya Buat Kunci" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Buat dan Siapkan" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Hanya Buat Kunci" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Suatu kunci Secure Shell (SSH) memungkinkan Anda menyambung secara aman ke " +"komputer lain." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Alamat surel Anda, atau suatu pengingat tentang apa guna kunci ini." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Keterangan Kunci:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Bila sudah ada komputer yang ingin Anda pakaikan kunci ini, Anda dapat " +"menyiapkan komputer tersebut untuk mengenal kunci Anda sekarang." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Kunci Secure Shell Tak Dapat Dibaca)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Kunci pribadi SSH" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Kunci SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Tak bisa mengubah nama kunci." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Tak bisa mengubah otorisasi bagi kunci." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Tak bisa mengubah frasa sandi bagi kunci." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritma:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identifier:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Lokasi:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nama:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Kekuatan:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Dipakai untuk menyambung ke komputer lain." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Kepercayaan" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Pemilik kunci ini diijink_an untuk menyambung ke komputer ini" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Ini hanya berlaku bagi akun '%s'." +msgid "This only applies to the %s account." +msgstr "Ini hanya berlaku bagi akun %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_kspor Kunci Lengkap" +msgid "Algorithm:" +msgstr "Algoritma:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Pemilik kunci ini diijink_an untuk menyambung ke komputer ini" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Kekuatan:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Lokasi:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Dipakai untuk menyambung ke komputer lain." +msgid "E_xport Complete Key" +msgstr "E_kspor Kunci Lengkap" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Perintah SSH tak tersangka-sangka diakhiri." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Perintah SSH gagal." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Sandi Host Jauh" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Masukkan Frasa Sandi Kunci" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Frasa Sandi bagi Kunci Secure Shell Baru" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Mengimpor kunci: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Mengimpor kunci. Masukkan frasa kunci" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Kunci OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Tak tersedia kunci pribadi bagi kunci publik ini." @@ -2358,16 +2543,20 @@ msgstr "Menata Kunci Secure Shell.." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "mis: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Siapkan Komputer untuk Sambungan SSH" +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"Untuk memakai kunci Secure Shell Anda dengan komputer lain yang memakai SSH, " +"Anda mesti telah memiliki akun log masuk pada komputer itu." + #: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." -msgstr "Untuk memakai kunci Secure Shell Anda dengan komputer lain yang memakai SSH, Anda mesti telah memiliki akun log masuk pada komputer itu." +msgid "eg: fileserver.example.com:port" +msgstr "mis: fileserver.example.com:port" #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" @@ -2380,4 +2569,3 @@ #: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" msgstr "_Atur" - diff -Nru seahorse-3.2.2/po/it.po seahorse-3.6.3/po/it.po --- seahorse-3.2.2/po/it.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/it.po 2012-08-21 12:23:19.000000000 +0200 @@ -1,36 +1,32 @@ # Italian translation of Seahorse -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 the Free Software Foundation, Inc. +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 the Free Software Foundation, Inc. # This file is distributed under the same license as the seahorse package. # Luigi maselli , 2003 # # keyserver -> server di chiavi come nel Manuale GNU sulla privacy # passphrase -> invariato come nel Manuale GNU sulla privacy # password keyring -> lascio solo portachiavi anche per uniformarsi col vecchio portachiavi di GNOME -# Milo Casagrande , 2006, 2007, 2008, 2009, 2010, 2011. +# Milo Casagrande , 2006, 2007, 2008, 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-16 21:58+0200\n" -"PO-Revision-Date: 2011-09-16 22:00+0200\n" +"POT-Creation-Date: 2012-08-19 17:59+0200\n" +"PO-Revision-Date: 2012-08-19 18:04+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Aggiungi portachiavi" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nome del nuovo portachiavi:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -38,310 +34,299 @@ "Scegliere un nome per il nuovo portachiavi. Verrà richiesta una password di " "sblocco." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nome del nuovo portachiavi:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Il nome dell'host o l'indirizzo del server." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Impossibile aggiungere portachiavi" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Nuovo portachiavi" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Usato per salvare le password delle applicazioni e di rete" + +# +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nuova password..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Salvare una password o un segreto in sicurezza." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Portachiavi" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Password salvate" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Impossibile impostare il portachiavi predefinito" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Impossibile cambiare la password del portachiavi" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "Imposta _predefinito" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Le applicazioni solitamente salvano le nuove password nel portachiavi " +"predefinito." + +# (ndt) pulsante... un po' lunghetta +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Cambia pass_word" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Cambia la password di sblocco del portachiavi delle password" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Impossibile aggiungere l'oggetto" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Aggiungi password" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Descrizione:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Portachiavi:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "Pass_word:" # (ndt) opzione -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Mostrare password" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Impossibile eliminare l'oggetto" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Portachiavi:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Impossibile aggiungere portachiavi" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Password" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Archivia password, credenziali e segreti personali" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Password account messaggistica per" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Password o segreto" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Password di rete" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Nota associata" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Password del portachiavi" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Password chiave di cifratura" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Password chiave archivio" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Password di «Google Chrome»" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Password di «Account online»" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Password di Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Password messaggistica istantanea" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Segreto di Network Manager" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" -msgstr "Eliminare veramente la password «%s»?" +msgstr "Eliminare la password «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "Eliminare veramente %d password?" -msgstr[1] "Eliminare veramente %d password?" +msgstr[0] "Eliminare %d password?" +msgstr[1] "Eliminare %d password?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Eliminazione oggetto in corso" -msgstr[1] "Eliminazione oggetti in corso" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Accedi a una risorsa o una condivisione di rete" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Accedi a un sito web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Sblocca una chiave PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Sblocca una chiave Secure Shell" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Password o dati di accesso salvati" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Credenziali di rete" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Password" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Impossibile cambiare la password." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Aggiornamento password in corso" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Impossibile impostare la descrizione." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Password:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Dettagli tecnici:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Dettagli" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Proprietà della chiave" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Chiave" +msgid "Use:" +msgstr "Uso:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Proprietà della chiave" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipo:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Accesso:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Accesso:" + # (ndt) opzione #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Mostrare pass_word" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipo:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Password: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Password: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Portachiavi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Usato per salvare le password delle applicazioni e di rete" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Password salvate" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Salvare una password o un segreto in sicurezza." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Impossibile sbloccare il portachiavi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Impossibile bloccare il portachiavi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Impossibile impostare il portachiavi predefinito" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Impossibile cambiare la password del portachiavi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Blocca" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Blocca la password del portachiavi in modo che sia necessaria una password " -"principale per sbloccarlo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Sblocca" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Sblocca la password del portachiavi con una password principale in modo che " -"sia disponibile all'uso." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "Imposta _predefinito" +msgid "Password:" +msgstr "Password:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Le applicazioni solitamente salvano le nuove password nel portachiavi " -"predefinito." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Chiave" -# (ndt) pulsante... un po' lunghetta -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Cambia pass_word" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Dettagli tecnici:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Cambia la password di sblocco del portachiavi delle password" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Dettagli" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Impossibile eliminare il portachiavi" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Un portachiavi sbloccato automaticamente all'accesso" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Un portachiavi per salvare password" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "Eliminare veramente il portachiavi «%s»?" - -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Eliminazione portachiavi in corso" -msgstr[1] "Eliminazione portachiavi in corso" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "Created:" -msgstr "Creata:" +msgstr "Eliminare il portachiavi «%s»?" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "Portachiavi" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Tutti gli elementi saranno persi per sempre." # (ndt) titolo finestra -#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../gkr/seahorse-gkr-keyring.xml.h:1 msgid "Keyring Properties" msgstr "Proprietà del portachiavi" -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nome:" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Nome:" -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "L'operazione è stata annullata" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "Creata:" -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Accesso negato al portachiavi" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Il demone gnome-keyring non è in esecuzione" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Il portachiavi è già stato sbloccato" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Portachiavi inesistente" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Impossibile comunicare con il demone del portachiavi" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "L'oggetto esiste già" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Errore interno nell'accedere a gnome-keyring" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "Portachiavi" #: ../libegg/egg-datetime.c:317 msgid "Display flags" @@ -608,270 +593,328 @@ msgstr "%u.%u.%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "oggetto temporaneo iniziale" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Aggiungi server di chiavi" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Host:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Tipo di server di chiavi:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Host:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "La porta di accesso del server." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "oggetto temporaneo iniziale" +msgid "The port to access the server on." +msgstr "La porta di accesso del server." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Passphrase" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versione di questa applicazione" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Password:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Impostazioni di sistema" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Conferma:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Contributi:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Non è un indirizzo di server di chiavi valido." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Password e chiavi" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Per ulteriore aiuto contattare l'amministratore di sistema o " -"l'amministratore del server di chiavi." +"Milo Casagrande \n" +"Luigi Maselli " -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Sito web del progetto Seahorse" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Personalizzato" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Impossibile eliminare" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Nessuno: non pubblicare le chiavi" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Impossibile esportare le chiavi" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Recuperare _automaticamente le chiavi dai server di chiavi" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Impossibile esportare i dati" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_File" + +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_sporta..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Esporta in un file" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Modifica" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Copia negli appunti" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Elimina" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Elimina gli oggetti selezionati" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Mostra le proprietà di questo oggetto" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Mostra le proprietà di questo portachiavi" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Preferen_ze" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Modifica le preferenze di questo programma" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Visualizza" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "A_iuto" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Informazioni riguardo questo programma" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Sommario" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Mostra l'aiuto di Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Esporta" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Inserire PIN o password per: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Password:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Conferma:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Non è un indirizzo di server di chiavi valido." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"_Sincronizzare automaticamente le chiavi modificate con i server di chiavi" +"Per ulteriore aiuto contattare l'amministratore di sistema o " +"l'amministratore del server di chiavi." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Server di chiavi" +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Personalizzato" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Nessuno: non pubblicare le chiavi" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Preferenze" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "Cercare le chiavi _utilizzando:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Pubblicare le chiavi in:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Recupero dati in corso" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Esportazione dati in corso" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importazione dati in corso" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Recuperare _automaticamente le chiavi dai server di chiavi" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Invio dati in corso" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"_Sincronizzare automaticamente le chiavi modificate con i server di chiavi" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Non disponibile" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Server di chiavi" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d/%m/%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Dati della chiave" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Chiavi multiple" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Tutti i file chiave" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Tutti i file" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "File archivio" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Esiste già un file con questo nome.\n" -"\n" -"Sostituirlo con il nuovo file?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Sostituisci" - # (NdT) femminile, è per la fiducia? #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Sconosciuta" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nessuna" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginale" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Piena" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Completa" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Disabilitata" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revocata" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Impossibile visualizzare l'aiuto: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Data di scadenza:" +msgid "Never E_xpires" +msgstr "Ness_una scadenza" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Genera una nuova sottochiave" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Se la chiave non scade" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipo chiave:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Lunghezza chiave:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipo chiave:" +msgid "Expiration Date:" +msgstr "Data di scadenza:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Lunghezza della chiave" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Ness_una scadenza" +msgid "Generate a new subkey" +msgstr "Genera una nuova sottochiave" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Aggiungi ID utente" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Crea un nuovo ID utente" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nome e cognome:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Co_mmento chiave:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Deve essere lungo almeno 5 caratteri" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Indirizzo email opzionale" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Commenti opzionali di descrizione della chiave" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Indirizzo email opzionale" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nome e cognome:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "Indirizzo _email:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Co_mmento chiave:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Crea un nuovo ID utente" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Modifica" +msgid "_Never expires" +msgstr "Nessuna _scadenza" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revoca chiave" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "Nessuna _scadenza" +msgid "C_hange" +msgstr "_Modifica" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -882,7 +925,7 @@ msgid "Add subkey to %s" msgstr "Aggiungi sottochiave a %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (solo firma)" @@ -890,7 +933,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (solo cifratura)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (solo firma)" @@ -913,6 +956,11 @@ "Decifrazione non riuscita. Probabilmente non è presente la chiave di " "decifrazione." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "L'operazione è stata annullata" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Data di scadenza non valida" @@ -930,46 +978,148 @@ msgid "Expiry: %s" msgstr "Scadenza: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Chiavi multiple" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Dati della chiave" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Chiavi PGP con armatura" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Chiavi PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Chiave PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Utilizzata per cifrare email e file" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Impossibile generare la chiave PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Passphrase per la nuova chiave PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Inserire due volte la passphrase per la nuova chiave." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Quando viene creata una chiave è necessario generare\n" +"molti dati casuali. In questa circostanza è molto utile\n" +"eseguire altre azioni come digitare sulla tastiera,\n" +"spostare il mouse o utilizzare altre applicazioni.\n" +"Facendo ciò vengono forniti al sistema i dati casuali\n" +"necessari." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Generazione della chiave" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Eliminare definitivamente %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Eliminare definitivamente %d chiave?" +msgstr[1] "Eliminare definitivamente %d chiavi?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" -msgstr "Password errata" +msgstr "Password non corretta" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "È stata inserita per la terza volta la password errata. Riprovare." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Passphrase non corretta." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Inserire una nuova passphrase per «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Inserire passphrase per «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Inserire una nuova passphrase" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Inserire passphrase" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Passphrase" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Caricata %d chiave" +msgstr[1] "Caricate %d chiavi" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Dati della chiave non validi (mancano gli UID). Può essere causato da un " +"computer con una data impostata male (nel futuro) o dalla mancanza di una " +"auto-firma." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Chiavi GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: directory portachiavi predefinita" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1004,28 +1154,32 @@ msgid "All JPEG files" msgstr "Solo JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Tutti i file" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Scegliere una foto da aggiungere alla chiave" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Impossibile preparare la fotografia" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Impossibile aggiungere la fotografia" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "Il file non può essere caricato. Potrebbe essere in un formato non valido" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Eliminare la fotografia dalla propria chiave?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Impossibile eliminare la fotografia" @@ -1084,7 +1238,11 @@ msgid "Couldn't add revoker" msgstr "Impossibile aggiungere revoca" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Questo segreto sarà perso per sempre." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1099,521 +1257,583 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nessuna chiave valida per firmare" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "" -"Non si possiede alcuna chiave PGP da usare per indicare la fiducia posta in " -"questa chiave." +"Nessuna chiave PGP da usare per indicare la fiducia posta in questa chiave." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Passphrase non corretta." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Inserire una nuova passphrase per «%s»" - -#: ../pgp/seahorse-gpgme-source.c:92 +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"La ricerca non era sufficientemente specifica. Trovate troppe chiavi nel " +"server «%s»." + +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Inserire passphrase per «%s»" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Impossibile comunicare con il server «%s»: %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Inserire una nuova passphrase" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Server di chiavi HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Inserire passphrase" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Impossibile importare le chiavi" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importazione delle chiavi dal server" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remoto" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Chiude questa finestra" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Cerca chiavi remote..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Cerca chiavi in un server di chiavi" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importa" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importa le chiavi selezionate nel portachiavi locale" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Chiavi remote" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Caricata %d chiave" -msgstr[1] "Caricate %d chiavi" +msgid "Remote Keys Containing '%s'" +msgstr "Chiavi remote contenenti «%s»" + +# (ndt) un po' libera... +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "La ricerca di chiavi non ha fornito alcun risultato." -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Cerca chiavi remote" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Dati delle chiavi non validi (manca UID). Può essere causato da un computer " -"con una data impostata male (nel futuro) o dalla mancanza di una auto-firma." +"Proseguendo verranno cercate altre chiavi attraverso Internet. Queste chiavi " +"possono poi essere importate nel proprio portachiavi." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Cerca chiavi contenenti: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Server di chiavi HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Server di chiavi:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Chiavi condivise nelle vicinanze:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Dove cercare:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Trova" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Impossibile pubblicare le chiavi sul server" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"La ricerca non era sufficientemente specifica. Trovate troppe chiavi nel " -"server «%s»." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Impossibile ottenere le chiavi dal server: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Impossibile comunicare con il server «%s»: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d chiave selezionata per la sincronizzazione" +msgstr[1] "%d chiavi selezionate per la sincronizzazione" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Sincronizzazione chiavi..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronizza chiavi" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Proseguendo verranno pubblicate le chiavi del proprio portachiavi così da " +"renderle disponibili ad altri per l'uso. Inoltre si riceveranno tutti i " +"cambiamenti apportati alle chiavi." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Questo permette di ricevere i cambiamenti apportati da altre persone alle " +"chiavi. Dato che nessun server di chiavi è stato selezionato per la " +"pubblicazione, le proprie chiavi non saranno rese disponibili ad altri." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Server di _chiavi" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronizza" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Impossibile comunicare con «%s»: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Connessione a: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Impossibile trovare l'indirizzo: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Ricerca indirizzo del server: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Server di chiavi LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Firma chiave..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Firma una chiave pubblica" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Eliminare definitivamente %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Eliminare definitivamente %d chiavi e identità?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Eliminare definitivamente %d chiavi?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Eliminare definitivamente %d identità?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronizza e pubblica le chiavi..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Impossibile eliminare l'ID utente" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Pubblica o sincronizza le proprie chiavi con quelle in rete." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Impossibile eliminare la chiave privata" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Impossibile eliminare la chiave pubblica" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Chiavi PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Le chiavi PGP sono usate per cifrare email o file" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opzioni _avanzate" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_rea" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "Una chiave PGP consente di cifrare email o file ad altre persone." +msgid "Generate a new key" +msgstr "Genera una nuova chiave" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmo" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "Una chiave PGP consente di cifrare email o file ad altre persone." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_rea" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Commento:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Data di scaden_za:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Ness_una scadenza" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Tipo di cifratura:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Genera una nuova chiave" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Dimensione della chiave (in bit):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Ness_una scadenza" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nuova chiave PGP" +msgid "E_xpiration Date:" +msgstr "Data di scaden_za:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Commento:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opzioni _avanzate" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Scaduto" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Chiavi PGP personale" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Chiave PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Impossibile modificare ID utente primario" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Eliminare definitivamente l'ID utente «%s»?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Impossibile eliminare l'ID utente" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Sconosciuto]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nome/Email" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID firma" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Impossibile modificare la fotografia principale" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(sconosciuto)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Chiave scaduta il: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nome" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Eliminare definitivamente la sottochiave %d di %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Impossibile eliminare la sottochiave" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Impossibile modificare la fiducia" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Impossibile esportare la chiave in «%s»" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Esporta chiave completa" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Impossibile esportare la chiave." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Impossibile esportare la chiave" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nessuna" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipo" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Creata" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Scade" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Stato" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Robustezza" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Scaduto" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Buona" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID chiave" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Azioni" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Commento:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Date" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Email:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Impronta" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID chiave:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Mai" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nomi della chiave e firme" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Questa chiave è stata revocata" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotografia " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Il proprietario ha revocato la chiave. Non può più essere usata." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Dettagli tecnici" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Questa chiave è scaduta" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Questa chiave è stata revocata" +msgid "Add a photo to this key" +msgstr "Aggiungi una fotografia a questa chiave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Questa chiave è scaduta" +msgid "Remove this photo from this key" +msgstr "Rimuovi questa fotografia dalla chiave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipo:" +msgid "Make this photo the primary photo" +msgstr "Imposta questa come fotografia principale" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Foto precedente" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Sottochiavi" +msgid "Go to next photo" +msgstr "Foto successiva" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Aggiungi" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotografia " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Aggiungi una fotografia a questa chiave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID chiave:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Cambia _passphrase" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nome:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Decifra file ed email ricevute." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Email:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Elimina" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Commento:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Scade" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Uso:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Scadenza:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipo:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Esporta" +msgid "Decrypt files and email sent to you." +msgstr "Decifra file ed email ricevute." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Chiave PGP privata" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Foto successiva" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Cambia _passphrase" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Foto precedente" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Proprietario" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ID chiave:" +msgid "Key Names and Signatures" +msgstr "Nomi della chiave e firme" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primario" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Imposta questa come fotografia principale" +msgid "Sign" +msgstr "Firma" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nomi e firme" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Elimina" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Mai" +msgid "_Add Name" +msgstr "_Aggiungi nome" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Sovrascrivi _fiducia proprietario:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Proprietario" +msgid "Revoke" +msgstr "Revoca" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primario" +msgid "Names and Signatures" +msgstr "Nomi e firme" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Chiave PGP privata" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID chiave:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Rimuovi questa fotografia dalla chiave" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Revoca" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Dimensione:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Firma" +msgid "Technical Details" +msgstr "Dettagli tecnici" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Dimensione:" +msgid "Fingerprint" +msgstr "Impronta" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Il proprietario ha revocato la chiave. Non può più essere usata." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Scadenza:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Aggiungi nome" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Date" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Sovrascrivi _fiducia proprietario:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Esporta chiave completa:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nome:" +msgid "Actions" +msgstr "Azioni" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Date:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Aggiungi" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Scade" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Sottochiavi" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginale" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Impronta:" +msgid "Fully" +msgstr "Piena" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indicare fiducia:" +msgid "Ultimately" +msgstr "Completa" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "La propria fiducia in questa chiave" +msgid "Encrypt files and email to the key's owner" +msgstr "Cifra file ed email con la chiave del rispettivo proprietario " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Chiave PGP pubblica" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Altri nomi:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Persone che hanno firmato questa chiave:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Cifra file ed email con la chiave del rispettivo proprietario" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "La propria fiducia in questa chiave" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Piena" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "La propria fiducia è specificata nella scheda Dettagli." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Fidarsi delle firme di «%s» su altre chiavi" # (ndt) sono un po' più libere, ma è per renderle all'impersonale il più possibile -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1622,7 +1842,11 @@ "Se il proprietario di questa chiave è proprio «%s», firmare questa " "chiave:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Firma questa chiave" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1630,44 +1854,39 @@ "Se «%s» non è più il proprietario di questa chiave, revocare la " "propria firma:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginale" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Chiave PGP pubblica" +msgid "_Revoke Signature" +msgstr "_Revoca firma" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Persone che hanno firmato questa chiave:" + +# (ndt) opzione +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Visualizzare solo le firme delle persone di cui mi fido" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Fiducia" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Completa" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "_Fiducia posta nel proprietario:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "La propria fiducia è specificata nella scheda Dettagli." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Impronta:" -# (ndt) opzione #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Visualizzare solo le firme delle persone di cui mi fido" +msgid "Dates:" +msgstr "Date:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Revoca firma" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indicare fiducia:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Firma questa chiave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Fiducia posta nel proprietario:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1675,55 +1894,59 @@ msgstr "Sottochiave %d di %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Descrizione opzionale per la revoca" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_voca" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Motivo per revocare la chiave" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Motivo:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Descrizione opzionale per la revoca" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Re_voca" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." -msgstr "" -"Non si possiede alcuna chiave PGP per poter firmare un documento o un " -"messaggio." +msgstr "Nessuna chiave PGP per poter firmare un documento o un messaggio." + +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Firmare il messaggio con la c_hiave:" #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Quanto attentamente è stata verificata questa chiave?" +msgid "Sign Key" +msgstr "Firma chiave" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Come gli altri vedono questa firma:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Firmando questa chiave si certifica che essa appartiene a:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Firmare la chiave come:" +msgid "Key Name" +msgstr "Nome chiave" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Superficialmente: significa che si è svolta una verifica superficiale " -"del proprietario della chiave. Per esempio si è letto l'impronta della " -"chiave al telefono." +msgid "How carefully have you checked this key?" +msgstr "Quanto attentamente è stata verificata questa chiave?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nome chiave" +msgid "_Not at all" +msgstr "_Per niente" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "Superfi_cialmente" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Molto attentamente" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1731,7 +1954,17 @@ "Per niente: significa che si crede che il possessore della chiave sia " "il legittimo proprietario, ma non è stato possibile verificarlo con certezza." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Superficialmente: significa che si è svolta una verifica superficiale " +"del proprietario della chiave. Per esempio si è letto l'impronta della " +"chiave al telefono. " + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1739,18 +1972,6 @@ "Molto attentamente: scegliere questo solo se si è assolutamente certi " "che questa chiave è autentica." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Firmando questa chiave si certifica che essa appartiene a:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Posso _revocare questa firma in un momento successivo" - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Firma chiave" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1763,478 +1984,355 @@ "proprietario della chiave." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "Superfi_cialmente" +msgid "How others will see this signature:" +msgstr "Come gli altri vedono questa firma:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Per niente" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Non consentire agli altri di vedere questa firma" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Posso _revocare questa firma in un momento successivo" + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Firma" +msgid "Sign key as:" +msgstr "Firmare la chiave come:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "Firma_tario:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Molto attentamente" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Firmare il messaggio con la c_hiave:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Certificato" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Impossibile eliminare" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Eliminare veramente il certificato «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Eliminare veramente %d certificato?" -msgstr[1] "Eliminare veramente %d certificati?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Eliminazione in corso" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Cambia passphrase" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Conferma passphrase:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Conferma nuova passphrase" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Nuova _passphrase:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Gestisce le proprie password e chiavi di cifratura" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Password e chiavi" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Selezionare il tipo di oggetto da creare:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "C_ontinua" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Crea nuovo..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d chiave selezionata" -msgstr[1] "%d chiavi selezionate" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Impossibile importare le chiavi" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Chiavi importate" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importazione chiavi" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importa chiave" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Tipo di chiave non riconosciuto o formato dati non valido" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importazione chiavi" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remoto" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Chiude il programma" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nuovo..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Crea una nuova chiave od oggetto" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importa..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importa da un file" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importa dagli appunti" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Cerca chiavi remote..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Cerca chiavi in un server di chiavi" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronizza e pubblica le chiavi..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Pubblica o sincronizza le proprie chiavi con quelle in rete." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Tipi di chiave" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Mostra la colonna del tipo di chiave" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "Data di scaden_za" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Mostra la colonna della scadenza della chiave" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Fiducia" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Mostra la colonna della fiducia accordata al proprietario" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validità" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Mostra la colonna della validità della chiave" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtro:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opzioni iniziali:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Genera una nuova chiave:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importa chiavi esistenti da un file:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Chiavi _personali" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Al_tre chiavi" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Per iniziare con la cifratura sono necessarie delle chiavi." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importa" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "Pass_word" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Impossibile esportare le chiavi" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validità" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Data di scadenza" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Chiude questa finestra" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Espandi tutto" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Espande tutti gli elenchi" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Contrai tutto" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Contrae tutti gli elenchi" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Chiavi remote" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Chiavi remote contenenti «%s»" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Server di chiavi:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Chiavi condivise nelle vicinanze:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Cerca chiavi remote" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Proseguendo verranno cercate altre chiavi attraverso Internet. Queste chiavi " -"possono poi essere importate nel proprio portachiavi." +msgid "_Sign" +msgstr "_Firma" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Dove cercare:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Esportazione dati in corso" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Trova" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Recupero dati in corso" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Cerca chiavi contenenti: " +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importazione dati in corso" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Impossibile pubblicare le chiavi sul server" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Invio dati in corso" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Impossibile ottenere le chiavi dal server: %s" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Non disponibile" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d chiave selezionata per la sincronizzazione" -msgstr[1] "%d chiavi selezionate per la sincronizzazione" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Certificato e chiave personali" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificato personale" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Sincronizzazione chiavi..." +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Certificato" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronizza chiavi" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificati (codificati DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificati" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificati X.509 e relative chiavi" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Eliminare definitivamente %d certificato?" +msgstr[1] "Eliminare definitivamente %d certificati?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Impossibile generare la chiave privata" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Crea" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Chiave privata" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Utilizzata per richiedere un certificato" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Crea una nuova chiave privata" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etichetta:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Salvata in:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Questa chiave sarà persa per sempre." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Senza nome" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Esportazione del certificato non riuscita" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Proseguendo verranno pubblicate le chiavi del proprio portachiavi così da " -"renderle disponibili ad altri per l'uso. Inoltre si riceveranno tutti i " -"cambiamenti apportati alle chiavi." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Impossibile eliminare" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Questo permette di ricevere i cambiamenti apportati da altre persone alle " -"chiavi. Dato che nessun server di chiavi è stato selezionato per la " -"pubblicazione, le proprie chiavi non saranno rese disponibili ad altri." +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Esporta" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Esporta il certificato" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Elimina questo certificato o chiave" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "_Richiedi certificato" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Crea una richiesta di certificato per questa chiave" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Impossibile salvare la richiesta di certificato" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Salva richiesta certificato" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Richiesta certificato" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Richiesta codificata PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Impossibile creare la richiesta di certificato" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Crea una richiesta di certificato" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Il nome comune (CN) nella richiesta di certificato" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nome (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Chiave privata senza nome" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Server di _chiavi" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Cambia passphrase" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronizza" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Nuova _passphrase:" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versione di questa applicazione" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Conferma nuova passphrase" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Contributi:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "_Conferma passphrase:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Milo Casagrande \n" -"Luigi Maselli " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Gestisce le proprie password e chiavi di cifratura" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Sito web del progetto Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continua" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_File" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Selezionare il tipo di oggetto da creare:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Modifica" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Importazione non riuscita" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importa" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Dati da importare:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Visualizza" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importa chiave" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "A_iuto" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Tutti i file chiave" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Preferen_ze" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Testo scartato" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Testo negli appunti" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nuovo" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Modifica le preferenze di questo programma" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Chiude il programma" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Informazioni riguardo questo programma" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nuovo..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Sommario" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Crea una nuova chiave od oggetto" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Mostra l'aiuto di Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Aggiunge una nuova chiave od oggetto" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Esporta la chiave pubblica" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importa..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Esportazione chiavi" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importa da un file" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Impossibile ottenere i dati dal server di chiavi" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importa dagli appunti" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Chiavi copiate" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Per _portachiavi" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Mostra il riquadro laterale con i portachiavi" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Mostra _personali" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Mostra solo chiavi, certificati e password personali" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Mostra _fidati" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Mostra solo chiavi, certificati e password fidati" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Mostra _qualsiasi" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Mostra tutte le chiavi, certificati e password" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtra" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Recupero delle chiavi" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opzioni iniziali:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s è una chiave privata. Continuare in ogni caso?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Genera una nuova chiave:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importazione delle chiavi dal server" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importa chiavi esistenti da un file:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Mostra le proprietà" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Per iniziare con la cifratura sono necessarie delle chiavi." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Elimina" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Impossibile bloccare" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Impossibile sbloccare" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Elimina gli oggetti selezionati" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Blocca" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_sporta..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Sblocca" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Esporta in un file" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Proprietà" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copia negli appunti" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configura chiave per _Secure Shell..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importa le chiavi selezionate nel portachiavi locale" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Invia la chiave pubblica Secure Shell a un'altra macchina e abilita " +"l'accesso utilizzando tale chiave." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2263,182 +2361,206 @@ msgid "Enter the new passphrase again: %s" msgstr "Inserire nuovamente la nuova passphrase: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configura chiave per _Secure Shell..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Invia la chiave pubblica Secure Shell a un'altra macchina e abilita " -"l'accesso utilizzando tale chiave." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Chiavi utilizzate per collegarsi ad altri computer" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Eliminare veramente la chiave Secure Shell «%s»?" +msgstr "Eliminare la chiave Secure Shell «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Eliminare veramente %d chiavi Secure Shell?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Eliminare %d chiave Secure Shell?" +msgstr[1] "Eliminare %d chiavi Secure Shell?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Chiave SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Chiave SSH segreta" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Chiave SSH pubblica" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Impossibile eliminare la chiave" +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Nessun file di chiave pubblica disponibile per questa chiave." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Chiave Secure Shell" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "" "Utilizzata per accedere ad altri computer (es. attraverso un terminale)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Impossibile generare la chiave Secure Shell" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Creazione chiave Secure Shell" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Usare il proprio indirizzo email e qualsiasi altro promemoria per " -"ricordarsi lo scopo di questa chiave." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Una chiave Secure Shell (SSH) consente di collegarsi, in modo sicuro, a " -"computer fidati utilizzando SSH, senza dover inserire una password diversa " -"per ognuno di essi." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Se si dispone già di un computer con cui usare questa chiave, è possibile " -"configurarlo ora al riconoscimento della chiave." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Nuova chiave Secure Shell" -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Crea e configura" - # (Ndt) usato solo crea per conformità con il pulsante # nella procedura di creazione delle chiavi PGP -#: ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../ssh/seahorse-ssh-generate.xml.h:2 msgid "_Just Create Key" msgstr "C_rea" +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_Crea e configura" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Una chiave Secure Shell (SSH) consente di collegarsi, in modo sicuro, in " +"altri computer." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Il proprio indirizzo email o qualsiasi altro promemoria per ricordarsi lo " +"scopo di questa chiave." + #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Descrizione chiave:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Se si dispone già di un computer con cui usare questa chiave, è possibile " +"configurarlo al riconoscimento della chiave." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Chiave Secure Shell non leggibile)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Chiave SSH personale" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Chiave SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Impossibile rinominare la chiave." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Impossibile cambiare l'autorizzazione per la chiave." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Impossibile cambiare la passphrase per la chiave." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmo:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identificatore:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Posizione:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nome:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Dimensione:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Utilizzata per collegarsi ad altri computer." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Fiducia" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Questo si applica solamente all'account «%s»." - -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_sporta chiavi complete" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 msgid "The owner of this key is _authorized to connect to this computer" msgstr "" "Il proprietario di questa chiave è _autorizzato a collegarsi a questo " "computer" +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "Questo si applica solamente all'account %s." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "Algoritmo:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Dimensione:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Posizione:" + #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Utilizzata per collegarsi ad altri computer." +msgid "E_xport Complete Key" +msgstr "E_sporta chiavi complete" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Il comando SSH è stato terminato inaspettatamente." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Il comando SSH non è riuscito." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Password host remoto" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Inserire la passphrase della chiave" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Passphrase per la nuova chiave Secure Shell" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importazione chiave: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importazione chiave. Inserire la passphrase" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Chiave OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Nessuna chiave privata disponibile per questa chiave." @@ -2451,14 +2573,10 @@ msgstr "Configurazione chiavi Secure Shell..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "es: server.esempio.it:porta" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configurare il computer per connessione SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2466,6 +2584,10 @@ "Per poter usare la propria chiave Secure Shell con un altro computer che usa " "SSH, è necessario avere già un account di accesso su quel computer." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "es: server.esempio.it:porta" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Nome _computer:" diff -Nru seahorse-3.2.2/po/ja.po seahorse-3.6.3/po/ja.po --- seahorse-3.2.2/po/ja.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/ja.po 2012-08-21 12:23:19.000000000 +0200 @@ -1,18 +1,19 @@ # Seahorse ja.po. -# Copyright (C) 1999-2011 seahorse's COPYRIGHT HOLDER +# Copyright (C) 1999-2012 seahorse's COPYRIGHT HOLDER # Anthony Mulcahy , 1999-2000. # Takeshi AIHANA , 2000-2009. # Takayuki KUSANO , 2009-2011. # Hideki Yamane (Debian-JP) , 2010. +# Hideki Yamane , 2011. # msgid "" msgstr "" "Project-Id-Version: seahorse master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-11 08:24+0900\n" -"Last-Translator: Jiro Matsuzawa \n" +"POT-Creation-Date: 2012-01-11 07:50+0000\n" +"PO-Revision-Date: 2012-01-15 14:19+0900\n" +"Last-Translator: OKANO Takayoshi \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" -msgstr "パスワード・キーリングの追加" +msgstr "パスワードキーリングの追加" #: ../gkr/seahorse-add-keyring.xml.h:2 msgid "New Keyring Name:" @@ -40,11 +41,61 @@ #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." -msgstr "サーバーのホスト名や IP-アドレスです" +msgstr "サーバーのホスト名や IP アドレスです" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "新しいパスワードキーリング" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "" +"アプリケーションやネットワークで使用するパスワードを保管する際に使用します" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "新規パスワード..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "パスワードや秘密鍵を安全に保存する。" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "パスワードキーリング" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "保存されているパスワード" + +#: ../gkr/seahorse-gkr-actions.c:151 +msgid "Couldn't set default keyring" +msgstr "デフォルトのキーリングに指定できません" + +#: ../gkr/seahorse-gkr-actions.c:183 +msgid "Couldn't change keyring password" +msgstr "キーリングのパスワードを変更できません" + +#: ../gkr/seahorse-gkr-actions.c:209 +msgid "_Set as default" +msgstr "デフォルトにする(_S)" + +#: ../gkr/seahorse-gkr-actions.c:210 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"アプリケーションがパスワードを保管するデフォルトのキーリングに指定します" + +#: ../gkr/seahorse-gkr-actions.c:211 +msgid "Change _Password" +msgstr "パスワードの変更(_P)" + +#: ../gkr/seahorse-gkr-actions.c:212 +msgid "Change the unlock password of the password storage keyring" +msgstr "キーリングのロックを解除する際に必要なパスワードを変更します" + +#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:71 msgid "Couldn't add keyring" -msgstr "キーリングを追加できませんでした" +msgstr "キーリングを追加できません" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" @@ -52,8 +103,9 @@ #: ../gkr/seahorse-gkr-add-item.xml.h:2 #: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "_Description:" -msgstr "補足(_D):" +msgstr "説明(_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 msgid "_Keyring:" @@ -67,72 +119,114 @@ msgid "_Show Password" msgstr "パスワードを表示(_S)" -#: ../gkr/seahorse-gkr-item-commands.c:78 -#, fuzzy -#| msgid "Couldn't delete." -msgid "Couldn't delete item" -msgstr "削除できませんでした" +#: ../gkr/seahorse-gkr-backend.c:99 +msgid "Passwords" +msgstr "パスワード" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-backend.c:102 +msgid "Stored personal passwords, credentials and secrets" +msgstr "保存された自分のパスワード、資格情報および秘密鍵" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:317 +msgid "IM account password for " +msgstr "メッセンジャーのアカウントパスワード: " + +#: ../gkr/seahorse-gkr-item.c:383 +msgid "Password or secret" +msgstr "パスワードまたは秘密鍵" + +#: ../gkr/seahorse-gkr-item.c:384 +msgid "Network password" +msgstr "ネットワークパスワード" + +#: ../gkr/seahorse-gkr-item.c:385 +msgid "Stored note" +msgstr "保存されているメモ" + +#: ../gkr/seahorse-gkr-item.c:386 +msgid "Keyring password" +msgstr "キーリングのパスワード" + +#: ../gkr/seahorse-gkr-item.c:387 +msgid "Encryption key password" +msgstr "暗号鍵のパスワード" + +#: ../gkr/seahorse-gkr-item.c:388 +msgid "Key storage password" +msgstr "鍵の保管パスワード" + +#: ../gkr/seahorse-gkr-item.c:389 +msgid "Google Chrome password" +msgstr "Google Chrome のパスワード" + +#: ../gkr/seahorse-gkr-item.c:390 +msgid "Gnome Online Accounts password" +msgstr "Gnome オンラインアカウントのパスワード" + +#: ../gkr/seahorse-gkr-item.c:391 +msgid "Telepathy password" +msgstr "Telepathy のパスワード" + +#: ../gkr/seahorse-gkr-item.c:392 +msgid "Instant messaging password" +msgstr "インスタントメッセンジャーのパスワード" + +#: ../gkr/seahorse-gkr-item.c:393 +msgid "Network Manager secret" +msgstr "ネットワークマネージャーの秘密鍵" + +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete the password '%s'?" -msgstr "本当にパスワードの '%s' を削除しますか?" +msgstr "本当にパスワード '%s' を削除しますか?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:86 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "本当に%d個のパスワードを削除しますか?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -#, fuzzy -#| msgid "Deleting item..." -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "アイテムの削除中..." - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a network share or resource" msgstr "ネットワーク共有やリソースへのアクセス" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Access a website" msgstr "ウェブサイトへのアクセス" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a PGP key" -msgstr "PGP 鍵の解除" +msgstr "PGP 鍵のロックを解除" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Unlocks a Secure Shell key" -msgstr "SSH 鍵の解除" +msgstr "SSH 鍵のロックを解除" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:81 msgid "Saved password or login" -msgstr "パスワードの保存やログイン" +msgstr "保存されているパスワードまたはログイン" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:105 msgid "Network Credentials" -msgstr "ネットワークの証明書" +msgstr "ネットワークの資格情報" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:110 msgid "Password" msgstr "パスワード" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:210 msgid "Couldn't change password." -msgstr "パスワードを変更できませんでした" +msgstr "パスワードを変更できません" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 -#, fuzzy -#| msgid "Listing passwords" +#: ../gkr/seahorse-gkr-item-properties.c:255 +#: ../gkr/seahorse-gkr-item-properties.c:376 msgid "Updating password" -msgstr "パスワード入力待ち" +msgstr "パスワードの更新中" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:336 msgid "Couldn't set description." -msgstr "説明を追加できませんでした" +msgstr "説明を設定できません。" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 msgid "Password:" @@ -142,7 +236,7 @@ #: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 #: ../ssh/seahorse-ssh-key-properties.xml.h:7 msgid "Technical Details:" -msgstr "詳細:" +msgstr "技術的な詳細:" #: ../gkr/seahorse-gkr-item-properties.xml.h:3 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 @@ -187,107 +281,29 @@ msgid "Use:" msgstr "使用目的:" -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "パスワード: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "パスワード: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "パスワード用のキーリング" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "アプリやネットワークで使用するパスワードを保管する際に使用します" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "保存されているパスワード" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "パスワードや秘密鍵を安全に保存する。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "キーリングのロックを解除できませんでした" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "キーリングをロックできませんでした" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "デフォルトのキーリングに指定できませんでした" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "キーリングのパスワードを変更できませんでした" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "ロック(_L)" +#: ../gkr/seahorse-gkr-keyring.c:147 +msgid "Login keyring" +msgstr "ログインキーリング" -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." +#: ../gkr/seahorse-gkr-keyring.c:676 +msgid "A keyring that is automatically unlocked on login" msgstr "" -"パスワードを保管しているキーリングにロックをかけます (ロックを解除するにはマ" -"スター・パスワードが必要になります)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "ロックの解除(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "パスワードを保管しているキーリングのロックを解除します" - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "デフォルトにする(_S)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "アプリケーションがパスワードを保管する標準のキーリングに指定します" - -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "パスワードの変更(_P)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "キーリングのロックを解除する際に必要なパスワードを変更します" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 +#: ../gkr/seahorse-gkr-keyring.c:677 #, fuzzy -#| msgid "Couldn't delete subkey" -msgid "Couldn't delete keyring" -msgstr "副鍵を削除できませんでした" +#| msgid "Key storage password" +msgid "A keyring used to store passwords" +msgstr "鍵の保管パスワード" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "本当に '%s' というパスワード用キーリングを削除しますか?" +msgstr "本当に '%s' というパスワードキーリングを削除しますか?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -#, fuzzy -#| msgid "Deleting keyring..." -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "キーリングの削除中..." +#: ../gkr/seahorse-gkr-keyring-deleter.c:83 +msgid "I understand that all items will be permanently deleted." +msgstr "" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. #. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 @@ -304,39 +320,41 @@ msgstr "キーリングのプロパティ" #: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" +#, fuzzy +#| msgid "_Name:" +msgid "Name:" msgstr "名前(_N):" -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 +#: ../gkr/seahorse-gkr-operation.c:54 ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:585 ../ssh/seahorse-ssh-operation.c:194 msgid "The operation was cancelled" -msgstr "" +msgstr "操作はキャンセルされました" -#: ../gkr/seahorse-gkr-operation.c:57 +#: ../gkr/seahorse-gkr-operation.c:59 msgid "Access to the key ring was denied" msgstr "キーリングへのアクセスが拒否されました" -#: ../gkr/seahorse-gkr-operation.c:60 +#: ../gkr/seahorse-gkr-operation.c:62 msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring デーモンが起動されていません" +msgstr "gnome-keyring デーモンが動作していません" -#: ../gkr/seahorse-gkr-operation.c:63 +#: ../gkr/seahorse-gkr-operation.c:65 msgid "The key ring has already been unlocked" msgstr "そのキーリングは既にロックが解除されています" -#: ../gkr/seahorse-gkr-operation.c:66 +#: ../gkr/seahorse-gkr-operation.c:68 msgid "No such key ring exists" msgstr "そのようなキーリングは存在しません" -#: ../gkr/seahorse-gkr-operation.c:69 +#: ../gkr/seahorse-gkr-operation.c:71 msgid "Couldn't communicate with key ring daemon" -msgstr "キーリング・デーモンと通信できませんでした" +msgstr "キーリングデーモンと通信できません" -#: ../gkr/seahorse-gkr-operation.c:72 +#: ../gkr/seahorse-gkr-operation.c:74 msgid "The item already exists" -msgstr "そのアイテムは既に登録されています" +msgstr "その項目は既に登録されています" -#: ../gkr/seahorse-gkr-operation.c:78 +#: ../gkr/seahorse-gkr-operation.c:80 msgid "Internal error accessing gnome-keyring" msgstr "gnome-keyring へアクセスする際に内部エラーが発生しました" @@ -450,27 +468,27 @@ #: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" -msgstr "表示する日の最大値です" +msgstr "表示する日数の最大値です" #: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" -msgstr "最小時" +msgstr "最小時間" #: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" -msgstr "表示する時の最小値です" +msgstr "表示する時間の最小値です" #: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" -msgstr "最大時" +msgstr "最大時間" #: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" -msgstr "表示する時の最大値です" +msgstr "表示する時間の最大値です" #: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" -msgstr "最小分" +msgstr "最小分数" #: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" @@ -478,7 +496,7 @@ #: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" -msgstr "最大分" +msgstr "最大分数" #: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" @@ -486,7 +504,7 @@ #: ../libegg/egg-datetime.c:425 msgid "Lower limit second" -msgstr "最小秒" +msgstr "最小秒数" #: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" @@ -494,7 +512,7 @@ #: ../libegg/egg-datetime.c:431 msgid "Upper limit second" -msgstr "最大秒" +msgstr "最大秒数" #: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" @@ -515,7 +533,7 @@ #: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" -msgstr "日付を直接してください" +msgstr "日付を直接入力してください" #: ../libegg/egg-datetime.c:503 msgid "Select Date" @@ -531,7 +549,7 @@ #: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" -msgstr "時刻を入力してください" +msgstr "時刻を直接入力してください" #: ../libegg/egg-datetime.c:528 msgid "Select Time" @@ -613,46 +631,163 @@ #: ../libseahorse/seahorse-add-keyserver.xml.h:6 msgid "The port to access the server on." -msgstr "サーバーにアクセスする際に使用するポート番号です" +msgstr "サーバーにアクセスする際に使用するポート番号です。" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "initial temporary item" -msgstr "初期一時アイテム" +msgstr "初回に一時生成する項目" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "パスフレーズ" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "貢献者:" + +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:2 +#: ../src/seahorse-key-manager.c:647 ../src/seahorse-main.c:68 +msgid "Passwords and Keys" +msgstr "パスワードと鍵" + +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"相花 毅 \n" +"Anthony Mulcahy \n" +"草野 貴之 \n" +"やまねひでき \n" +"日本GNOMEユーザー会 http://www.gnome.gr.jp/" + +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse プロジェクトのページ" + +#: ../libseahorse/seahorse-catalog.c:191 +#, fuzzy +#| msgid "Couldn't delete" +msgid "Cannot delete" +msgstr "削除できません" + +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "鍵をエクスポートできません" + +#: ../libseahorse/seahorse-catalog.c:268 +#, fuzzy +#| msgid "Couldn't export keys" +msgid "Couldn't export data" +msgstr "鍵をエクスポートできません" + +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "ファイル(_F)" + +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "エクスポート(_X)..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ファイルへ書き出します" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "編集(_E)" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "クリップボードへコピーします" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +#, fuzzy +#| msgctxt "" +#| "This text refers to deleting an item from its type's backing store." +#| msgid "_Delete" +msgid "_Delete" +msgstr "削除(_D)" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "選択したアイテムを削除します" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "このアイテムのプロパティを表示します" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this place" +msgstr "この場所のプロパティを表示します" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "設定(_N)" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "このプログラムの設定を変更します" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "表示(_V)" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "ヘルプ(_H)" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "このプログラムの情報を表示します" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "目次(_C)" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Seahorse のヘルプを表示します" + +#: ../libseahorse/seahorse-exportable.c:404 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 +msgid "Export" +msgstr "エクスポート" + +#: ../libseahorse/seahorse-interaction.c:100 +#, fuzzy, c-format +#| msgid "Enter the old passphrase for: %s" +msgid "Enter PIN or password for: %s" +msgstr "'%s' の古いパスフレーズを入力してください" + +#: ../libseahorse/seahorse-passphrase.c:182 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "パスワード:" #. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 +#: ../libseahorse/seahorse-passphrase.c:244 msgid "Confirm:" msgstr "パスワードの確認:" -#: ../libseahorse/seahorse-prefs.c:68 +#: ../libseahorse/seahorse-prefs.c:66 msgid "Not a valid Key Server address." -msgstr "鍵サーバーのアドレスが間違っています" +msgstr "鍵サーバーのアドレスが無効です。" -#: ../libseahorse/seahorse-prefs.c:69 +#: ../libseahorse/seahorse-prefs.c:67 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." -msgstr "詳細はシステム管理者または鍵の管理者に問い合わせてください" +msgstr "" +"詳細はシステム管理者、あるいは鍵サーバーの管理者に問い合わせてください。" -#: ../libseahorse/seahorse-prefs.c:183 +#: ../libseahorse/seahorse-prefs.c:180 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:348 +#: ../libseahorse/seahorse-prefs.c:350 msgid "Custom" msgstr "その他" -#: ../libseahorse/seahorse-prefs.c:406 +#: ../libseahorse/seahorse-prefs.c:403 msgid "None: Don't publish keys" -msgstr "なし (鍵を公開しない)" +msgstr "なし: 鍵を公開しない" #: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Automatically retrieve keys from _key servers" @@ -678,119 +813,57 @@ msgid "_Publish keys to:" msgstr "鍵の公開先(_P):" -#: ../libseahorse/seahorse-transfer.c:178 -#, fuzzy -#| msgid "Retrieving keys" -msgid "Retrieving data" -msgstr "鍵の取得中" - -#: ../libseahorse/seahorse-transfer.c:178 -#, fuzzy -#| msgid "Exporting Keys" -msgid "Exporting data" -msgstr "鍵のエクスポート" - -#: ../libseahorse/seahorse-transfer.c:182 -#, fuzzy -#| msgid "Importing Keys" -msgid "Importing data" -msgstr "鍵のインポート" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "" - -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "利用不可" - -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "鍵のデータ" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "複数の鍵" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "すべての鍵ファイル" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "すべてのファイル" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "書庫ファイル" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"同名のファイルが既に存在しています。\n" -"\n" -"新しいファイルで置き換えてもよろしいですか?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "上書きする(_R)" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-key-properties.c:1248 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "不明" # 参考: http://pgp.iijlab.net/trans/ #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1254 msgctxt "Validity" msgid "Never" msgstr "信用しない" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 +#: ../pgp/seahorse-pgp-key-properties.c:1261 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 msgid "Marginal" msgstr "ぎりぎり信用する" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 +#: ../pgp/seahorse-pgp-key-properties.c:1267 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 msgid "Full" msgstr "完全に信用する" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 +#: ../pgp/seahorse-pgp-key-properties.c:1273 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 msgid "Ultimate" msgstr "究極に信用する" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1463 msgid "Disabled" msgstr "無効にする" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1459 msgid "Revoked" msgstr "失効済み" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:473 #, c-format msgid "Could not display help: %s" -msgstr "ヘルプを表示できませんでした: %s" +msgstr "ヘルプを表示できません: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 msgid "Expiration Date:" @@ -802,13 +875,14 @@ #: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" -msgstr "鍵の有効期限を設定しない場合にONにします" +msgstr "鍵の有効期限を設定しない場合" #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "鍵の長さ(_L):" #: ../pgp/seahorse-add-subkey.xml.h:5 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 msgid "Key _Type:" msgstr "鍵の種類(_T):" @@ -846,11 +920,11 @@ #: ../pgp/seahorse-add-uid.xml.h:7 msgid "Optional email address" -msgstr "オプションで E-メール・アドレスを入力します" +msgstr "オプションでメールアドレスを入力します" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Email Address:" -msgstr "E-メール・アドレス(_E):" +msgstr "メールアドレス(_E):" #: ../pgp/seahorse-expires.xml.h:1 msgid "C_hange" @@ -866,14 +940,14 @@ #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" -msgstr "副鍵を追加できませんでした" +msgstr "副鍵を追加できません" #: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "%s へ副鍵を追加する" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (署名のみ)" @@ -881,7 +955,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (暗号化のみ)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (署名のみ)" @@ -891,7 +965,7 @@ #: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" -msgstr "ユーザー ID を追加できませんでした" +msgstr "ユーザー ID を追加できません" #: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format @@ -900,11 +974,11 @@ #: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." -msgstr "復号化できませんでした (おそらく復号鍵をお持ちでないようです)" +msgstr "復号できません (おそらく復号鍵をお持ちでないようです)" #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" -msgstr "有効期限が間違っています" +msgstr "有効期限の日付が無効です" #: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" @@ -912,61 +986,149 @@ #: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" -msgstr "有効期限を変更できませんでした" +msgstr "有効期限を変更できません" #: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "有効期限: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "複数の鍵" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "鍵のデータ" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +#, fuzzy +#| msgid "Personal PGP key" +msgid "Armored PGP keys" +msgstr "自分の PGP 鍵" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +#, fuzzy +#| msgid "PGP key" +msgid "PGP keys" +msgstr "PGP 鍵" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP 鍵" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "メールやファイルを暗号化する際に使用します" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" -msgstr "PGP 鍵を生成できませんでした" +msgstr "PGP 鍵を生成できません" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "新しい PGP 鍵のパスフレーズ" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "新しい鍵のパスフレーズを二回入力してください:" -#: ../pgp/seahorse-gpgme-generate.c:219 +#: ../pgp/seahorse-gpgme-generate.c:223 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "鍵の生成中" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "本当に %s という鍵を抹消しますか?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, fuzzy, c-format +#| msgid "Are you sure you want to permanently delete %d keys?" +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "本当に %d個の鍵を抹消しますか?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "パスワードが間違っています" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "間違ったパスワードを入力したのは3回目です。再度試してください。" +#: ../pgp/seahorse-gpgme-keyring.c:90 +#, c-format +msgid "Wrong passphrase." +msgstr "パスフレーズが間違っています。" + +#: ../pgp/seahorse-gpgme-keyring.c:94 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' の新しいパスフレーズを入力してください" + +#: ../pgp/seahorse-gpgme-keyring.c:96 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' のパスフレーズを入力してください" + +#: ../pgp/seahorse-gpgme-keyring.c:99 +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Enter new passphrase" +msgstr "新しいパスフレーズを入力してください" + +#: ../pgp/seahorse-gpgme-keyring.c:101 +msgid "Enter passphrase" +msgstr "パスフレーズを入力してください" + +#: ../pgp/seahorse-gpgme-keyring.c:106 +msgid "Passphrase" +msgstr "パスフレーズ" + +#: ../pgp/seahorse-gpgme-keyring.c:307 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] " %d個の鍵を読み込みました" + +#: ../pgp/seahorse-gpgme-keyring.c:654 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"無効な鍵データです (UID がありません)。これはコンピューターの日付が未来に設定" +"されているか、あるいは自分自身の署名が存在しない場合に発生する場合がありま" +"す。" + +#: ../pgp/seahorse-gpgme-keyring.c:814 +msgid "GnuPG keyring" +msgstr "GnuPG キーリング" + +#: ../pgp/seahorse-gpgme-keyring.c:817 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: デフォルトのキーリングディレクトリ" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" "The photo is too large\n" "The recommended size for a photo on your key is %d x %d pixels." msgstr "" -"画像のサイズが大きすぎます\n" -"推奨する画像のサイズは %d x %d ピクセルです。" +"写真のサイズが大きすぎます\n" +"推奨する写真のサイズは %d x %d ピクセルです。" #: ../pgp/seahorse-gpgme-photos.c:78 msgid "_Don't Resize" @@ -993,36 +1155,37 @@ msgid "All JPEG files" msgstr "すべての JPEG ファイル" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:283 +msgid "All files" +msgstr "すべてのファイル" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" -msgstr "鍵に登録する画像の選択" +msgstr "鍵に登録する写真の選択" -#: ../pgp/seahorse-gpgme-photos.c:278 -#, fuzzy -#| msgid "Couldn't add photo" +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" -msgstr "画像を登録できませんでした" +msgstr "写真の準備ができません" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" -msgstr "画像を登録できませんでした" +msgstr "写真を追加できません" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" -msgstr "" -"ファイルを読み込めませんでした (フォーマットが間違っているかもしれません)" +msgstr "ファイルを読み込めませんでした (無効なフォーマットの可能性があります)" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" -msgstr "本当にこの鍵に登録した画像を除してもよろしいですか?" +msgstr "本当にこの鍵に登録した写真を削除してもよろしいですか?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" -msgstr "画像を削除できませんでした" +msgstr "写真を削除できません" #: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" -msgstr "副鍵を失効できませんでした" +msgstr "副鍵を失効できません" #: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format @@ -1047,11 +1210,11 @@ #: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" -msgstr "失効" +msgstr "交換済" #: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" -msgstr "鍵が失効しています" +msgstr "鍵は新しいものに交換されました" #: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" @@ -1059,7 +1222,7 @@ #: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" -msgstr "鍵が利用されていません" +msgstr "鍵が使われていません" #: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format @@ -1067,100 +1230,193 @@ "You are about to add %s as a revoker for %s. This operation cannot be " "undone! Are you sure you want to continue?" msgstr "" -"%s を %s の Revoker (失効) として追加しようとしています。この処理は取り消しが" -"できません! 続行してもよろしいですか?" +"%s を %s の失効者 (Revoker) として追加しようとしています。この処理は取り消し" +"ができません! 続行してもよろしいですか?" #: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" -msgstr "Revoker に追加できませんでした" +msgstr "失効者を追加できません" + +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" "\"%s\"" msgstr "" -"この鍵は既に以下の署名者に署名されてます。\n" +"この鍵は既に以下の人に署名されてます。\n" "\"%s\"" #: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" -msgstr "鍵に署名できませんでした" +msgstr "鍵に署名できません" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" -msgstr "署名に利用できる鍵ではありません" +msgstr "署名に利用できる鍵がありません" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." -msgstr "この鍵の信用度を表すのに使用する個人的な PGP 鍵がありません。" +msgstr "この鍵の信用度を表すのに使用する自身の PGP 鍵がありません。" -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "パスフレーズが間違っています" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:603 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s' の新しいパスフレーズを入力してください" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"サーバー '%s' には非常にたくさんの鍵があるため、一致する鍵を特定できませんで" +"した" -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:606 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s' のパスフレーズを入力してください" +msgid "Couldn't communicate with server '%s': %s" +msgstr "サーバー '%s' と通信できません: %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "新しいパスフレーズを入力してください" +#: ../pgp/seahorse-hkp-source.c:1129 +msgid "HTTP Key Server" +msgstr "HTTP 鍵サーバー" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "パスフレーズを入力してください" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "鍵をインポートできません" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "鍵を鍵サーバーからインポートする" + +#: ../pgp/seahorse-keyserver-results.c:243 ../src/seahorse-key-manager.c:499 +msgid "_Remote" +msgstr "リモート(_R)" + +#: ../pgp/seahorse-keyserver-results.c:245 +msgid "Close this window" +msgstr "このウィンドウを閉じます" + +#: ../pgp/seahorse-keyserver-results.c:249 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "リモートにある鍵の検索(_F)..." + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "鍵サーバーから鍵を検索します" + +#: ../pgp/seahorse-keyserver-results.c:254 ../src/seahorse-key-manager.xml.h:5 +msgid "_Import" +msgstr "インポート(_I)" + +#: ../pgp/seahorse-keyserver-results.c:255 +msgid "Import selected keys to local key ring" +msgstr "選択した鍵をローカルのキーリングへインポートします" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:285 +msgid "Remote Keys" +msgstr "リモートの鍵" + +#: ../pgp/seahorse-keyserver-results.c:287 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] " %d個の鍵を読み込みました" +msgid "Remote Keys Containing '%s'" +msgstr "'%s' を含むリモートの鍵" + +#: ../pgp/seahorse-keyserver-results.c:484 +msgid "The search for keys failed." +msgstr "鍵の検索が失敗しました。" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Key Servers:" +msgstr "鍵サーバー:" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 +#, fuzzy +msgid "Shared Keys Near Me:" +msgstr "近くで共有している鍵:" + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "Find Remote Keys" +msgstr "リモートにある鍵の検索" + +#: ../pgp/seahorse-keyserver-search.xml.h:4 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"鍵データが間違っています (UID がありません)。これはコンピューターの日付が未来" -"を指しているか、あるいは自分自身の署名が存在しない場合に発生する場合がありま" -"す。" +"インターネット上にある他の鍵を検索し、その結果をローカルのキーリングに取り込" +"みます。" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Where to search:" +msgstr "検索する鍵サーバー:" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP の鍵サーバー" +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "_Search" +msgstr "検索(_S)" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search for keys containing: " +msgstr "検索する鍵の内容(_S): " + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "鍵をサーバーに出力できません" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"サーバー '%s' には非常にたくさんの鍵があるため、一致する鍵を特定できませんで" -"した" +msgid "Couldn't retrieve keys from server: %s" +msgstr "サーバーから鍵を取得できません: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "サーバー '%s' と通信できませんでした: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] " %d個の鍵を同期します" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "鍵の同期中..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "鍵の同期" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"キーリングの中にある鍵を公開して他の人達から利用できるようにします。さらに鍵" +"を同期して変更内容を適用します。" + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"鍵を受け取ってから発生した変更点を取得します。鍵を公開する鍵サーバーが選択さ" +"れていないので、他の人達から利用することはできません。" + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "鍵サーバー(_K)" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "同期する(_S)" #: ../pgp/seahorse-ldap-source.c:440 #, c-format msgid "Couldn't communicate with '%s': %s" -msgstr "'%s' と通信できませんでした: %s" +msgstr "'%s' と通信できません: %s" #: ../pgp/seahorse-ldap-source.c:651 #, c-format @@ -1170,69 +1426,42 @@ #: ../pgp/seahorse-ldap-source.c:657 #, c-format msgid "Couldn't resolve address: %s" -msgstr "次のアドレスを解決できませんでした: %s" +msgstr "次のアドレスを解決できません: %s" #: ../pgp/seahorse-ldap-source.c:701 #, c-format msgid "Resolving server address: %s" msgstr "次のサーバーのアドレスを解決しています: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1446 msgid "LDAP Key Server" -msgstr "LDAP の鍵サーバー" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "鍵に署名する(_S)..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "公開鍵に署名します" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "本当に %s という鍵を抹消しますか?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "本当に %d個の鍵と ID を抹消しますか?" +msgstr "LDAP 鍵サーバー" -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "本当に %d個の鍵を抹消しますか?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "本当に %d個の ID を抹消しますか?" - -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "ユーザー ID を削除できませんでした" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "鍵の公開と同期(_S)..." -#: ../pgp/seahorse-pgp-commands.c:205 -#, fuzzy -#| msgid "Couldn't generate key" -msgid "Couldn't delete private key" -msgstr "鍵を生成できませんでした" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "この鍵を公開してオンライン上の鍵と同期します" -#: ../pgp/seahorse-pgp-commands.c:208 -#, fuzzy -#| msgid "Couldn't delete subkey" -msgid "Couldn't delete public key" -msgstr "副鍵を削除できませんでした" +#: ../pgp/seahorse-pgp-backend.c:174 +msgid "PGP Keys" +msgstr "PGP 鍵" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 +#: ../pgp/seahorse-pgp-backend.c:177 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP 鍵はメールやファイルを暗号化するのに使われます" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "_Advanced key options" -msgstr "拡張オプション(_A)" +msgstr "鍵の拡張オプション(_A)" #: ../pgp/seahorse-pgp-generate.xml.h:2 msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "" -"PGP の鍵を利用すると他の人達に暗号化したメールやファイルを送信できます。" +msgstr "PGP 鍵を利用すると他の人達に暗号化したメールやファイルを送信できます。" #: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "Algorithms here" @@ -1254,7 +1483,9 @@ msgid "Generate a new key" msgstr "新しい鍵を生成します" -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:9 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:6 msgid "Key _Strength (bits):" msgstr "鍵の長さ (ビット)(_S):" @@ -1263,127 +1494,122 @@ msgstr "有効期限を設定しない(_V)" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "新しい PGP 鍵" - -#: ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Comment:" msgstr "コメント(_C):" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "期限切れ" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "自分の PGP 鍵" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP 鍵" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" -msgstr "プライマリのユーザー ID に変更できませんでした" +msgstr "プライマリユーザー ID が変更できません" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" -msgstr "本当に '%s' というユーザーを抹消しますか?" +msgstr "本当に '%s' というユーザー ID を抹消しますか?" + +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "ユーザー ID を削除できません" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:428 +#: ../pgp/seahorse-pgp-key-properties.c:1564 msgid "[Unknown]" msgstr "[不明]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:535 +#: ../pgp/seahorse-pgp-key-properties.c:1846 msgid "Name/Email" -msgstr "名前/E-メール" +msgstr "名前/メール" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:540 msgid "Signature ID" msgstr "署名の ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:673 msgid "Couldn't change primary photo" -msgstr "プライマリの画像を変更できませんでした" +msgstr "プライマリの写真を変更できません" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#: ../pgp/seahorse-pgp-key-properties.c:906 msgid "(unknown)" msgstr "(不明)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:909 #, c-format msgid "This key expired on: %s" msgstr "この鍵の有効期限: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:972 msgid "Name" msgstr "名前" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1085 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "本当に副鍵 %d (%s) を完全に削除しますか?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1094 msgid "Couldn't delete subkey" -msgstr "副鍵を削除できませんでした" +msgstr "副鍵を削除できません" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1134 +#: ../pgp/seahorse-pgp-key-properties.c:1539 msgid "Unable to change trust" msgstr "信用度を変更できません" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "\"%s\" へ鍵をエクスポートできませんでした" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "鍵のエクスポート" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "鍵をエクスポートできませんでした" +#: ../pgp/seahorse-pgp-key-properties.c:1147 +#: ../ssh/seahorse-ssh-key-properties.c:202 +#, fuzzy +#| msgid "Couldn't export keys" +msgid "Couldn't export key" +msgstr "鍵をエクスポートできません" # 参考: http://pgp.iijlab.net/trans/ -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1379 +#: ../pgp/seahorse-pgp-key-properties.c:1468 msgctxt "Expires" msgid "Never" msgstr "有効期限なし" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1426 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1429 msgid "Type" msgstr "種類" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "Created" msgstr "生成済み" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Expires" msgstr "有効期限" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Status" msgstr "状態" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Strength" msgstr "強度" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1461 +msgid "Expired" +msgstr "期限切れ" + +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Good" msgstr "良い" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1849 msgid "Key ID" msgstr "鍵の ID" @@ -1403,7 +1629,7 @@ #: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 msgid "Email:" -msgstr "E-メール・アドレス:" +msgstr "メールアドレス:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Fingerprint" @@ -1421,21 +1647,21 @@ #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 msgid "Photo " -msgstr " 画像 " +msgstr "写真 " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 msgid "Technical Details" -msgstr "鍵の詳細" +msgstr "技術的な詳細" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 msgid "This key has been revoked" -msgstr "この鍵は失効しています" +msgstr "この鍵は失効されています" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 msgid "This key has expired" -msgstr "この鍵の有効期限は次のとおり:" +msgstr "この鍵は有効期限が切れています" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 @@ -1461,7 +1687,7 @@ #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 msgid "Add a photo to this key" -msgstr "この鍵に画像を登録します" +msgstr "この鍵に写真を登録します" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 #: ../ssh/seahorse-ssh-key-properties.xml.h:14 @@ -1470,7 +1696,7 @@ #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 msgid "Decrypt files and email sent to you." -msgstr "送付されたファイルやメールを復号化する" +msgstr "送付されたファイルやメールを復号します。" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 msgid "Delete" @@ -1485,26 +1711,22 @@ msgid "Expires:" msgstr "有効期限:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "エクスポート" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 msgid "Go to next photo" -msgstr "次の画像へジャンプします" +msgstr "次の写真へ移動します" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 msgid "Go to previous photo" -msgstr "前の画像へジャンプします" +msgstr "前の写真へ移動します" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 msgid "Key ID:" -msgstr "鍵の ID:" +msgstr "鍵 ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 msgid "Make this photo the primary photo" -msgstr "この画像をプライマリの画像にします" +msgstr "この写真をプライマリの写真にします" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 msgid "Names and Signatures" @@ -1531,11 +1753,11 @@ #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 msgid "Private PGP Key" -msgstr "個人的に利用する PGP 鍵" +msgstr "プライベート PGP 鍵" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 msgid "Remove this photo from this key" -msgstr "このアイコンを削除します" +msgstr "この鍵からこの写真を削除します" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 msgid "Revoke" @@ -1553,7 +1775,7 @@ #: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "所有者が鍵を破棄したので、もう利用できません" +msgstr "鍵の所有者が鍵を破棄したので、もう利用できません。" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Add Name" @@ -1592,7 +1814,7 @@ #: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 msgid "_People who have signed this key:" -msgstr "この鍵に署名している人(_P):" +msgstr "この鍵に署名した人(_P):" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 msgid "Encrypt files and email to the key's owner " @@ -1620,8 +1842,8 @@ msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" -"この鍵を所有している '%s' という人物を信用しないのであれば、署名を無効" -"にしておいてください:" +"この鍵を所有している '%s' という人物を信用しないのであれば、署名を失効" +"させてください:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 msgid "Marginally" @@ -1629,11 +1851,9 @@ #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 msgid "Public PGP Key" -msgstr "公開用の PGP 鍵" +msgstr "公開 PGP 鍵" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "信用度" @@ -1659,7 +1879,7 @@ #: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 msgid "_Sign this Key" -msgstr "署名(_S)" +msgstr "この鍵に署名する(_S)" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1668,7 +1888,7 @@ #: ../pgp/seahorse-revoke.xml.h:1 msgid "Optional description of revocation" -msgstr "オプションで破棄の簡単な説明を入力します" +msgstr "失効の追加説明" #: ../pgp/seahorse-revoke.xml.h:2 msgid "Re_voke" @@ -1682,13 +1902,17 @@ msgid "_Reason:" msgstr "理由(_R):" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" -"ドキュメントやメッセージに署名する際に使用する個人的な PGP 鍵を所有していませ" +"ドキュメントやメッセージに署名する際に使用できる自分の PGP 鍵を所有していませ" "ん。" +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "次の鍵を使ってメッセージに署名する(_S):" + #: ../pgp/seahorse-sign.xml.h:1 msgid "How carefully have you checked this key?" msgstr "この鍵をどれくらい入念にチェックしたか?" @@ -1738,11 +1962,11 @@ #: ../pgp/seahorse-sign.xml.h:9 msgid "I can _revoke this signature at a later date." -msgstr "後日、この署名を失効させることができる(_R)" +msgstr "後日、この署名を失効させることができます。(_R)" #: ../pgp/seahorse-sign.xml.h:10 msgid "Sign Key" -msgstr "署名" +msgstr "鍵に署名する" #: ../pgp/seahorse-sign.xml.h:11 msgid "" @@ -1751,9 +1975,9 @@ "used email to check that the email address belongs to the owner." msgstr "" "鍵の名前が妥当であることを個人的に証明するために、例えばパスポートに貼ってあ" -"る写真ようなものを利用して身元を偽造させないようにすることが可能です。さらに" -"念を入れて、所有者を証明するための E-メール・アドレスも利用した方が良いでしょ" -"う。" +"る写真のようなものを利用して身元を偽造させないようにすることが可能です。さら" +"に念を入れて、電子メールを送って、このメールアドレスが本人のものであることも" +"確認した方が良いでしょう。" #: ../pgp/seahorse-sign.xml.h:12 msgid "_Casually" @@ -1769,7 +1993,7 @@ #: ../pgp/seahorse-sign.xml.h:15 msgid "_Sign" -msgstr "署名(_S)" +msgstr "署名する(_S)" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" @@ -1779,37 +2003,202 @@ msgid "_Very Carefully" msgstr "かなり注意深くチェックした(_V)" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "次の鍵を使ってメッセージに署名する(_S):" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "データをエクスポート中" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "データの取得中" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "鍵のインポート中" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "データの送信中" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "利用不可" + +#: ../pkcs11/seahorse-certificate.c:435 +#, fuzzy +#| msgid "X.509 certificates and related keys" +msgid "Personal certificate and key" +msgstr "X.509 証明書と関連の鍵" + +#: ../pkcs11/seahorse-certificate.c:438 +#, fuzzy +#| msgid "Properties of the certificate." +msgid "Personal certificate" +msgstr "証明書のプロパティです。" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "証明書" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +#, fuzzy +#| msgid "Certificates" +msgid "Certificates (DER encoded)" +msgstr "証明書" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "証明書" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 証明書と関連の鍵" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, fuzzy, c-format +#| msgid "Are you sure you want to permanently delete %d identities?" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "本当に %d個の ID を抹消しますか?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +#, fuzzy +#| msgid "Couldn't delete private key" +msgid "Couldn't generate private key" +msgstr "秘密鍵を削除できません" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +#, fuzzy +#| msgid "C_reate" +msgid "Create" +msgstr "生成(_R)" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +#, fuzzy +#| msgid "Private PGP Key" +msgid "Private key" +msgstr "プライベート PGP 鍵" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +#, fuzzy +#| msgid "Delete the certificate." +msgid "Used to request a certificate" +msgstr "証明書を削除します。" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +#, fuzzy +#| msgid "Create a new key or item" +msgid "Create a new private key" +msgstr "新しい鍵またはアイテムを生成します" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +msgid "Label:" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#, fuzzy +#| msgid "Stored note" +msgid "Stored at:" +msgstr "保存されているメモ" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 #, fuzzy -#| msgid "Couldn't delete." +#| msgid "Delete the certificate." +msgid "Failed to export certificate" +msgstr "証明書を削除します。" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" -msgstr "削除できませんでした" +msgstr "削除できません" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "本当に '%s' という証明書を削除しますか?" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +#, fuzzy +#| msgid "Export" +msgid "_Export" +msgstr "エクスポート" -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "本当に%d個の証明書を削除しますか?" +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +#, fuzzy +#| msgid "Delete the certificate." +msgid "Export the certificate" +msgstr "証明書を削除します。" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +#, fuzzy +#| msgid "Delete the certificate." +msgid "Delete this certificate or key" +msgstr "証明書を削除します。" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#, fuzzy +#| msgid "Certificate" +msgid "Request _Certificate" +msgstr "証明書" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +#, fuzzy +#| msgid "No private key file is available for this key." +msgid "Create a certificate request file for this key" +msgstr "この鍵に対して利用できる秘密鍵ファイルはありません" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +#, fuzzy +#| msgid "Couldn't delete private key" +msgid "Couldn't save certificate request" +msgstr "秘密鍵を削除できません" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +#, fuzzy +#| msgid "Certificates" +msgid "Save certificate request" +msgstr "証明書" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +#, fuzzy +#| msgid "Certificates" +msgid "Certificate request" +msgstr "証明書" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +#, fuzzy +#| msgid "Couldn't delete private key" +msgid "Couldn't create certificate request" +msgstr "秘密鍵を削除できません" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "" -#: ../pkcs11/seahorse-pkcs11-commands.c:143 +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 #, fuzzy -#| msgid "Deleting..." -msgid "Deleting" -msgstr "削除中..." +#| msgid "_Name:" +msgid "Name (CN):" +msgstr "名前(_N):" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "The common name (CN) placed in the certificate request." +msgstr "" + +#: ../pkcs11/seahorse-private-key.c:132 +#, fuzzy +#| msgid "Couldn't delete private key" +msgid "Unnamed private key" +msgstr "秘密鍵を削除できません" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" @@ -1831,135 +2220,111 @@ msgid "Manage your passwords and encryption keys" msgstr "パスワードや暗号鍵を管理します" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -#, fuzzy -#| msgid "Passwords and Encryption Keys" -msgid "Passwords and Keys" -msgstr "パスワードと暗号鍵" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "続行" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" -msgstr "生成するアイテムの種類を選択してください(_S):" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "続行(_O)" +msgstr "生成する項目の種類を選択してください(_S):" -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "新しいアイテムの生成" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "インポートが失敗しました" -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] " %d個の鍵を選択しました" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "鍵をインポートできませんでした" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "鍵のインポートが完了しました" +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "インポート" -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "鍵のインポート中" +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "インポートする日付:" -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:237 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "鍵のインポート" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "鍵の種類を認識できない、またはデータのフォーマットが間違っています" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "鍵のインポート" +#: ../src/seahorse-key-manager.c:249 +msgid "All key files" +msgstr "すべての鍵ファイル" -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "リモート(_R)" +#: ../src/seahorse-key-manager.c:350 +msgid "Dropped text" +msgstr "ドラッグしたテキスト" + +#: ../src/seahorse-key-manager.c:373 +msgid "Clipboard text" +msgstr "クリップボードのテキスト" + +#: ../src/seahorse-key-manager.c:500 +msgid "_New" +msgstr "新規(_N)" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:502 msgid "Close this program" msgstr "このプログラムを終了します" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:503 ../src/seahorse-key-manager.c:505 msgid "_New..." msgstr "新規(_N)..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:504 msgid "Create a new key or item" msgstr "新しい鍵またはアイテムを生成します" -#: ../src/seahorse-key-manager.c:742 +#: ../src/seahorse-key-manager.c:506 +msgid "Add a new key or item" +msgstr "新しい鍵またはアイテムを追加します" + +#: ../src/seahorse-key-manager.c:507 msgid "_Import..." msgstr "インポート(_I)..." -#: ../src/seahorse-key-manager.c:743 +#: ../src/seahorse-key-manager.c:508 msgid "Import from a file" msgstr "ファイルから取り込みます" -#: ../src/seahorse-key-manager.c:745 +#: ../src/seahorse-key-manager.c:510 msgid "Import from the clipboard" msgstr "クリップボードから取り込みます" -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "リモートの鍵の検索(_F)..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "鍵サーバーから鍵を検索します" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "鍵の公開と同期(_S)..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "この鍵を公開してオンラインの鍵と同期します" +#: ../src/seahorse-key-manager.c:514 +msgid "P_laces" +msgstr "場所(_L)" + +#: ../src/seahorse-key-manager.c:515 +msgid "Show places sidebar" +msgstr "場所のサイドバーを表示する" + +#: ../src/seahorse-key-manager.c:519 +msgid "Show _personal" +msgstr "自分のものを表示する(_P)" + +#: ../src/seahorse-key-manager.c:520 +msgid "Only show personal keys, certificates and passwords" +msgstr "自分の鍵、証明書およびパスワードのみを表示します" + +#: ../src/seahorse-key-manager.c:521 +msgid "Show _trusted" +msgstr "信頼済みのみ表示する(_T)" + +#: ../src/seahorse-key-manager.c:522 +msgid "Only show trusted keys, certificates and passwords" +msgstr "信頼している鍵、証明書そしてパスワードのみを表示します" -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "種類(_Y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "\"種類\" の項目を表示する" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "有効期限(_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "\"有効期限\" の項目を表示する" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "信用度(_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "\"信用度\" の項目を表示する" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "妥当性(_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "\"妥当性\" の項目を表示する" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "フィルター:" +#: ../src/seahorse-key-manager.c:523 +#, fuzzy +#| msgid "_Show _any" +msgid "Show _any" +msgstr "すべてを表示(_A)" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show all keys, certificates and passwords" +msgstr "すべての鍵、証明書およびパスワードを表示します" + +#: ../src/seahorse-key-manager.c:729 +msgid "Filter" +msgstr "フィルター" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -1974,264 +2339,50 @@ msgstr "既存の鍵をファイルからインポートする: " #: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "個人の鍵(_P)" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "他の鍵(_K)" - -#: ../src/seahorse-key-manager.xml.h:6 msgid "To get started with encryption you will need keys." -msgstr "暗号化を始めるには鍵が必要です: " +msgstr "暗号化を始めるには鍵が必要です。" -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "インポート(_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "パスワード(_P)" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "鍵をエクスポートできませんでした" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "妥当性" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "有効期限" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "このウィンドウを閉じます" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "すべて展開する(_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "すべてのリストを展開します" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "すべて畳む(_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "すべてのリストを畳みます" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "リモートの鍵" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "'%s' を含むリモートの鍵" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "鍵サーバー:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "近くで共有している鍵:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "リモートにある鍵の検索" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"インターネット上にある他の鍵を検索し、その結果をローカルのキーリングに取り込" -"みます。" - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "検索する鍵サーバー:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "検索(_S)" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "検索する鍵の内容(_S): " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "鍵をサーバーに格納できませんでした" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "サーバーから鍵を取得できませんでした: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] " %d個の鍵を同期します" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "鍵の同期中..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "鍵の同期" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"キーリングの中にある鍵を公開して他の人達から利用できるようにします。さらに鍵" -"を同期して変更内容を適用します。" - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"鍵を受け取ってから発生した変更点を取得します。鍵を公開する鍵サーバーが選択さ" -"れていないので、他の人達から利用することはできません。" - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "鍵サーバー(_K)" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "同期する(_S)" - -#: ../src/seahorse-main.c:60 +#: ../src/seahorse-main.c:54 msgid "Version of this application" msgstr "このアプリケーションのバージョン" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "貢献者:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"相花 毅 \n" -"Anthony Mulcahy \n" -"草野 貴之 \n" -"Hideki Yamane (Debian-JP) \n" -"日本GNOMEユーザー会 http://www.gnome.gr.jp/" - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse プロジェクトのページ" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "ファイル(_F)" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "編集(_E)" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "表示(_V)" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "ヘルプ(_H)" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "設定(_N)" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "このプログラムの設定を変更します" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "このプログラムの情報を表示します" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "目次(_C)" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Seahorse のヘルプを表示します" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "公開鍵のエクスポート" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "鍵のエクスポート" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "鍵サーバーから鍵データを取得できませんでした" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "鍵をコピーしました" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "鍵の取得中" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s は秘密鍵のようですが、続行してもよろしいですか?" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "鍵を鍵サーバーからインポートする" - -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "プロパティを表示します" +#: ../src/seahorse-sidebar.c:799 +#, fuzzy +#| msgid "Couldn't lock keyring" +msgid "Couldn't lock" +msgstr "キーリングをロックできません" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "削除(_D)" +#: ../src/seahorse-sidebar.c:836 +#, fuzzy +#| msgid "Couldn't unlock keyring" +msgid "Couldn't unlock" +msgstr "キーリングのロックを解除できません" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "選択したアイテムを削除します" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "ロック(_L)" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "エクスポート(_X)..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "ロックの解除(_U)" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "ファイルへ書き出します" +#: ../src/seahorse-sidebar.c:968 +#, fuzzy +#| msgid "Key Properties" +msgid "_Properties" +msgstr "鍵のプロパティ" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "クリップボードへコピーします" +#: ../ssh/seahorse-ssh-actions.c:88 +msgid "Configure Key for _Secure Shell..." +msgstr "SSH 鍵の設定(_S)..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "選択した鍵をローカルのキーリングへインポートします" +#: ../ssh/seahorse-ssh-actions.c:89 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"SSH 公開鍵を他のコンピューターに送信し、それを使ってログインできるようにしま" +"す。" #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2239,7 +2390,7 @@ #: ../ssh/seahorse-ssh-askpass.c:82 msgid "Old Key Passphrase" -msgstr "古い鍵のパスフレーズ" +msgstr "以前の鍵パスフレーズ" #: ../ssh/seahorse-ssh-askpass.c:83 #, c-format @@ -2248,7 +2399,7 @@ #: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 msgid "New Key Passphrase" -msgstr "新しい鍵のパスフレーズ" +msgstr "新しい鍵パスフレーズ" #: ../ssh/seahorse-ssh-askpass.c:88 #, c-format @@ -2256,112 +2407,125 @@ msgstr "'%s' の新しいパスフレーズを入力してください" #: ../ssh/seahorse-ssh-askpass.c:93 -#, fuzzy, c-format -#| msgid "Enter the new passphrase for: %s" +#, c-format msgid "Enter the new passphrase again: %s" -msgstr "'%s' の新しいパスフレーズを入力してください" +msgstr "'%s' の新しいパスフレーズをもう一度入力してください" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "SSH の鍵の設定(_S)..." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "セキュアシェル" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"SSH 用の鍵を他のコンピューターに送信し、それを使ってログインできるようにしま" -"す" +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "他のコンピューターに安全に接続する際に使用される鍵" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "本当に '%s' という SSH の鍵を削除しますか?" +msgstr "本当に '%s' という SSH 鍵を削除しますか?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 ../ssh/seahorse-ssh-deleter.c:92 #, c-format msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "本当に %d個の SSH 用の鍵を削除しますか?" +msgstr "本当に %d個の SSH 鍵を削除しますか?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +#, fuzzy +#| msgid "Sign Key" +msgid "Ssh Key" +msgstr "鍵に署名する" -#: ../ssh/seahorse-ssh-commands.c:133 +#: ../ssh/seahorse-ssh-exporter.c:122 #, fuzzy -#| msgid "Couldn't delete subkey" -msgid "Couldn't delete key" -msgstr "副鍵を削除できませんでした" +#| msgid "Secure Shell Key" +msgid "Secret SSH keys" +msgstr "セキュアシェルの鍵" + +#: ../ssh/seahorse-ssh-exporter.c:126 +#, fuzzy +#| msgid "Public PGP Key" +msgid "Public SSH keys" +msgstr "公開 PGP 鍵" + +#: ../ssh/seahorse-ssh-exporter.c:290 +#, fuzzy +#| msgid "No private key file is available for this key." +msgid "No public key file is available for this key." +msgstr "この鍵に対して利用できる秘密鍵ファイルはありません" -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:19 msgid "Secure Shell Key" -msgstr "セキュア・シェルの鍵" +msgstr "セキュアシェルの鍵" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "端末などから他のコンピューターにアクセスする際に使用します" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" -msgstr "SSH 用の鍵を生成できませんでした" +msgstr "SSH 鍵を生成できません" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" -msgstr "SSH 用の鍵の生成" +msgstr "SSH 鍵の生成" #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"この鍵を識別する際に必要となる文字列とE-メール・アドレスを指定してくださ" -"い。" +msgid "Your email address, or a reminder of what this key is for." +msgstr "メールアドレス、またはこの鍵の目的のメモです。" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"セキュア・シェル (SSH) の鍵を利用すると、SSH を使って信用できるコンピューター" -"に安全に接続できます (コンピューター毎に複数のパスワードを用意しておく必要は" -"ありません)。" +"セキュアシェル (SSH) 鍵を利用すると、他のコンピューターに安全に接続できます。" #: ../ssh/seahorse-ssh-generate.xml.h:5 +#, fuzzy +#| msgid "" +#| "If there a computer you want to use this key with, you can set up that " +#| "computer to recognize your new key." msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" -"この鍵を利用するコンピューターが既に存在しているのであれば、この鍵を認識する" -"ようにコンピューター側を設定してください。 " +"この鍵で接続したいコンピューターがあれば、新しい鍵を認識するようにコンピュー" +"ター側を設定することができます。 " #: ../ssh/seahorse-ssh-generate.xml.h:7 msgid "New Secure Shell Key" -msgstr "新しいセキュア・シェルの鍵" +msgstr "新しいセキュアシェルの鍵" #: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "_Create and Set Up" msgstr "生成と設定(_C)" -#: ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../ssh/seahorse-ssh-generate.xml.h:10 msgid "_Just Create Key" msgstr "生成のみ(_J)" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "鍵の説明(_K):" - -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" -msgstr "(読み込むことができない SSH 用の鍵)" +msgstr "(読み込むことができない SSH 鍵)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "自分の SSH 鍵" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH 鍵" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." -msgstr "鍵の名前を変更できませんでした" +msgstr "鍵の名前を変更できません。" -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." -msgstr "鍵の認証を変更できませんでした" +msgstr "鍵の認証を変更できません。" -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." -msgstr "鍵のパスフレーズを変更できませんでした" +msgstr "鍵のパスフレーズを変更できません。" #: ../ssh/seahorse-ssh-key-properties.xml.h:1 msgid "Algorithm:" @@ -2369,7 +2533,7 @@ #: ../ssh/seahorse-ssh-key-properties.xml.h:3 msgid "Identifier:" -msgstr "識別番号:" +msgstr "識別子:" #: ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Location:" @@ -2390,60 +2554,69 @@ #: ../ssh/seahorse-ssh-key-properties.xml.h:13 #, no-c-format msgid "This only applies to the '%s' account." -msgstr "(この鍵を '%s' というアカウントにのみ適用します)" +msgstr "この鍵を '%s' というアカウントにのみ適用します。" #: ../ssh/seahorse-ssh-key-properties.xml.h:16 msgid "E_xport Complete Key" -msgstr "鍵のエクスポート(_X)" +msgstr "鍵をまるごとエクスポート(_X)" #: ../ssh/seahorse-ssh-key-properties.xml.h:20 msgid "The owner of this key is _authorized to connect to this computer" -msgstr "リモートのコンピューターに接続したら、この鍵の所有者で認証を行う(_A)" +msgstr "このコンピューターに接続するのに、この鍵の所有者を認証する(_A)" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 msgid "Used to connect to other computers." -msgstr "他のコンピューターに接続する際に使用する" +msgstr "他のコンピューターに接続する際に使用します。" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." -msgstr "SSH のコマンドが強制終了しました" +msgstr "SSH のコマンドが強制終了されました。" -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." -msgstr "SSH コマンドの投入に失敗しました" +msgstr "SSH コマンドの投入に失敗しました。" -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" -msgstr "リモート・ホストのパスワード" +msgstr "リモートホストのパスワード" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" -msgstr "鍵のパスフレーズを入力します" +msgstr "鍵のパスフレーズを入力する" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" -msgstr "セキュア・シェルで使用する新しい鍵のパスフレーズ" +msgstr "セキュアシェルで使用する新しい鍵のパスフレーズ" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "鍵のインポート: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" -msgstr "鍵をインポートします (パスフレーズを入力してください)" +msgstr "鍵をインポートします。パスフレーズを入力してください" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH directory" +msgstr "OpenSSH のディレクトリ" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "この鍵に対して利用できる秘密鍵ファイルはありません" #: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "リモートのコンピューター上にある SSH 用の鍵を設定できませんでした" +msgstr "リモートのコンピューター上にある SSH 鍵を設定できません" #: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." -msgstr "SSH の鍵を設定しています..." +msgstr "SSH 鍵を設定しています..." #: ../ssh/seahorse-ssh-upload.xml.h:1 msgid "eg: fileserver.example.com:port" @@ -2458,8 +2631,8 @@ "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." msgstr "" -"SSH の鍵を別のコンピューターで利用する場合は、そのコンピューターのログイン・" -"アカウントが必要になります。" +"SSH 鍵を別のコンピューターで利用する場合は、そのコンピューターのログインアカ" +"ウントが必要になります。" #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" @@ -2473,524 +2646,123 @@ msgid "_Set Up" msgstr "設定(_S)" -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Secure Shell key" -#~ msgstr "セキュア・シェルの鍵" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "セキュア・シェルで使用する新しい鍵のパスフレーズを入力してください" - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "seahorse-daemon をデーモン化しない" - -#~ msgid "couldn't fork process" -#~ msgstr "子プロセスを生成できませんでした" - -#~ msgid "couldn't create new process group" -#~ msgstr "新しいプロセスのグループを生成できませんでした" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "暗号鍵デーモン (Seahorse)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "鍵の種類が間違っているか認識できません: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "このタイプの鍵はサポートされていません: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "この機能はビルド時に有効化されていません" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "鍵が間違っているか認識できません: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "%2$s にある期限切れので署名しました" - -#~ msgid "Invalid Signature" -#~ msgstr "おかしな署名です" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "%2$s にある期限切れので署名しました" - -#~ msgid "Expired Signature" -#~ msgstr "期限切れの署名です" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "%2$s にある失効したで署名しました" - -#~ msgid "Revoked Signature" -#~ msgstr "失効した署名" - -#~ msgid "Signed by on %s." -#~ msgstr "%2$s にあるで署名しました" +#~ msgid "Couldn't delete keyring" +#~ msgstr "キーリングを削除できません" -#~ msgid "Good Signature" -#~ msgstr "良い署名です" - -#~ msgid "Signing key not in keyring." -#~ msgstr "署名用の鍵がキーリングの中にありません" - -#~ msgid "Unknown Signature" -#~ msgstr "不明な署名です" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "" -#~ "おかしな署名または偽造された署名です (署名したデータは変更されています)" - -#~ msgid "Bad Signature" -#~ msgstr "おかしな署名です" - -#~ msgid "Couldn't verify signature." -#~ msgstr "署名を解読できませんでした" - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "署名者が間違っているか認識できません: %s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "署名に対して鍵が有効になっていません: %s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "受取人が間違っているかまたは認識できません: %s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "暗号化に対して妥当な受取人ではありません: %s" - -#~ msgid "No recipients specified" -#~ msgstr "受取人が指定されていません" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "解読する鍵の種類が間違っています: %s" - -#~ msgid "Please set clearuri" -#~ msgstr "clearuri を設定してください" - -#~ msgid "Please set crypturi" -#~ msgstr "crypturi を設定してください" - -#~ msgid "Error opening clearuri" -#~ msgstr "clearuri を開くのにエラーが発生しました" - -#~ msgid "No signer specified" -#~ msgstr "署名者が指定されていません" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "検証する鍵の種類が間違っています: %s" - -#~ msgid "Invalid key id: %s" -#~ msgstr "鍵の ID が間違っています: %s" +#~ msgid "Deleting keyring" +#~ msgid_plural "Deleting keyrings" +#~ msgstr[0] "キーリングの削除中" #~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." #~ msgstr "" -#~ "リモートの PGP 鍵を検索する鍵サーバーの URI の並びです。新しいバージョンで" -#~ "は空白の後にサーバー名を追加して表示することができます。" - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "鍵の自動取得" - -#~ msgid "Auto Sync Keys" -#~ msgstr "鍵を自動的に同期する" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "鍵マネージャーの期限エントリの表示/非表示を制御します。" - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "鍵マネージャーの信用度エントリのの表示/非表示を制御します。" - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "鍵マネージャーの種類エントリの表示/非表示を制御します。" - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "鍵マネージャーの有効性エントリの表示/非表示を制御します。" - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "DNS-SD 共有を有効にする" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "鍵を DNS-SD (アップルの Bonjour) を使って共有します。seahorse-daemon を " -#~ "HKP と DNS-SD サポート付きでビルドし、かつ常に seahorse-daemon を起動して" -#~ "おく必要があります。" - -#~ msgid "ID of the default key" -#~ msgstr "デフォルトの鍵の ID" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "" -#~ "TRUE にすると、seahorse で暗号化したファイルは ASCII 保護したエンコードに" -#~ "なります。" +#~ "パスワードを保管しているキーリングにロックをかけます (ロックを解除するには" +#~ "マスターパスワードが必要になります)" #~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "TRUE にすると、常にデフォルトの鍵を暗号の受取人一覧に追加されます。" - -#~ msgid "Last key server search pattern" -#~ msgstr "最後に使用した鍵サーバーの検索パターン" - -#~ msgid "Last key servers used" -#~ msgstr "最後に使用した鍵サーバー" - -#~ msgid "Last key used to sign a message." -#~ msgstr "メッセージに署名した際に使用した最後の鍵です。" - -#~ msgid "PGP Key servers" -#~ msgstr "PGP 鍵サーバー" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "パスワードを保管しているキーリングのロックを解除します" -#~ msgid "Publish keys to this key server." -#~ msgstr "この鍵サーバーで鍵を公開する" +#~ msgid "Delete the keyring." +#~ msgstr "キーリングを削除。" -#~ msgid "Show expires column in key manager" -#~ msgstr "鍵マネージャーの中に \"期限\" の項目を表示する" +#~ msgid "Properties of the keyring." +#~ msgstr "キーリングのプロパティです。" -#~ msgid "Show trust column in key manager" -#~ msgstr "鍵マネージャーの中に \"信用度\" の項目を表示する" +#~ msgid "Lock the password storage keyring." +#~ msgstr "パスワードを保存しているキーリングをロックします。" -#~ msgid "Show type column in key manager" -#~ msgstr "鍵マネージャーの中に \"種類\" の項目を表示する" +#~| msgid "Change the unlock password of the password storage keyring" +#~ msgid "Unlock the password storage keyring." +#~ msgstr "パスワードを保存しているキーリングのロックを解除します。" -#~ msgid "Show validity column in key manager" -#~ msgstr "鍵マネージャーの中に \"有効性\" の項目を表示する" +#~ msgid "Couldn't delete item" +#~ msgstr "アイテムを削除できません" -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "受取人ウィンドウに表示する項目の並び替え指定します。指定可能な項目: " -#~ "'name' と 'id' (各項目の先頭に '-' を付与すると逆順に並べます)" +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "アイテムの削除中" -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "Seahorse 鍵マネージャーのメイン・ウィンドウに表示する項目を指定します。指" -#~ "定可能な項目: 'name'、'id'、'validity'、'expires'、'trust'、'length' と " -#~ "'type' (各項目の先頭に '-' を付けると逆順に並べます)" +#~ msgid "Properties of the password." +#~ msgstr "パスワードのプロパティです。" -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "メッセージの署名で最後に使用した秘密鍵の ID です。" +#~ msgid "Delete the password." +#~ msgstr "パスワードを削除する。" -#~ msgid "The column to sort the recipients by" -#~ msgstr "受取人のウィンドウに表示する情報" +#~ msgid "To do Keyring" +#~ msgstr "To do キーリング" -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "Seahorse 鍵マネージャーに表示する情報" +#~ msgid "Archive files" +#~ msgstr "書庫ファイル" #~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "" -#~ "PGP 鍵を公開する鍵サーバーです。空にすると PGP 鍵の公開を禁止します。" - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "" -#~ "最後に検索を実行した鍵サーバーです。すべての鍵サーバーを対象とする場合は空" -#~ "にしてください。" - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "鍵サーバーに対して最後に実施した検索パターンです。" - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "主に署名などの操作で使用するデフォルトの鍵を指定します。" - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "鍵サーバーから自動的に鍵を取得するかどうかです。" - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "変更した鍵を自動的にデフォルトの鍵サーバーと同期するかどうかです。" - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "常にデフォルトの鍵を暗号化するかどうか" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "ASCII 保護を使用するかどうか" - -#~ msgid "Web Password" -#~ msgstr "ウェブのパスワード" - -#~ msgid "Network Password" -#~ msgstr "ネットワークのパスワード" - -#~ msgid "Couldn't set application access." -#~ msgstr "アプリケーションのアクセスを指定できませんでした" - -#~ msgid "Path:" -#~ msgstr "パス名:" - -#~ msgid "Permissions:" -#~ msgstr "権限:" - -#~ msgid "Applications" -#~ msgstr "アプリケーション" - -#~ msgid "_Read" -#~ msgstr "読み込み(_R)" - -#~ msgid "_Write" -#~ msgstr "書き込み(_W)" - -#~ msgctxt "infinitive" -#~ msgid "_Delete" -#~ msgstr "削除(_D)" - -#~ msgid "Saving item..." -#~ msgstr "アイテムの保存中..." - -#~ msgid "Listing password keyrings" -#~ msgstr "パスワードの入力待ち" - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "要求した操作を実行する際に必要となる暗号鍵が見つかりませんでした。パス" -#~ "ワードと暗号鍵というプログラムを起動できないので鍵を生成したりインポー" -#~ "トすることはできません。" - -#~ msgid "All Keys" -#~ msgstr "すべての鍵から検索" - -#~ msgid "Selected Recipients" -#~ msgstr "選択した受取人から検索" - -#~ msgid "Search Results" -#~ msgstr "結果から検索" - -#~ msgid "Search _for:" -#~ msgstr "検索(_F):" - -#~ msgid "None (Don't Sign)" -#~ msgstr "なし (署名しない)" - -#~ msgid "Sign this message as %s" -#~ msgstr "%s を使ってメッセージに署名する" - -#~ msgid "_Sign message as:" -#~ msgstr "次の鍵を使ってメッセージに署名する(_S):" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "妥当な .desktop ファイルではありません" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "バージョン '%s' の .desktop ファイルはサポートしていません" - -#~ msgid "Starting %s" -#~ msgstr "%sの起動中です" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "コマンドラインからドキュメントにはアクセスできません" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "不明な起動オプションです: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" #~ msgstr "" -#~ "ドキュメントの URI を 'Type=Link' な .desktop エントリには渡せません" - -#~ msgid "Not a launchable item" -#~ msgstr "起動可能なアイテムではありません" - -#~ msgid "Disable connection to session manager" -#~ msgstr "セッション・マネージャーに接続しない" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "設定を保存したファイルを指定する" - -#~ msgid "FILE" -#~ msgstr "FILE" - -#~ msgid "Specify session management ID" -#~ msgstr "セッション管理の ID を指定する" - -#~ msgid "Session management options:" -#~ msgstr "セッション管理のオプション:" - -#~ msgid "Show session management options" -#~ msgstr "セッション管理のオプションを表示する" - -#~ msgid "Key Imported" -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "鍵のインポートが完了しました" - -#~ msgid "Imported %i key" -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] " %d個の鍵をインポートしました" - -#~ msgid "Imported a key for" -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "次の鍵のインポートが完了しました: " - -#~ msgid "Notification Messages" -#~ msgstr "通知メッセージ" - -#~ msgid "Symmetric Key" -#~ msgstr "対称鍵" - -#~ msgid "Public Key" -#~ msgstr "公開鍵" - -#~ msgid "Private Key" -#~ msgstr "秘密鍵" - -#~ msgid "Credentials" -#~ msgstr "証明書" - -#~ msgid "Identity" -#~ msgstr "身元情報" - -#~ msgid "Progress Title" -#~ msgstr "進行状態のタイトル" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "'file-roller' を起動できませんでした" - -#~ msgid "Couldn't package files" -#~ msgstr "ファイルを書庫に格納できませんでした" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "'file-roller' の起動に失敗しました" - -#~ msgid "Loading Keys..." -#~ msgstr "鍵の読み込み中..." - -#~ msgid "Searching for keys..." -#~ msgstr "鍵の検索中..." - -#~ msgid "Uploading keys..." -#~ msgstr "鍵の読み込み中..." - -#~ msgid "Retrieving keys..." -#~ msgstr "鍵の取得中..." - -#~ msgid "Searching for keys on: %s" -#~ msgstr "次のサーバーから鍵の検索中: %s" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "'%s' を含む鍵の検索中..." - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "鍵 (ID='%s') の検索中..." - -#~ msgid "Retrieving remote keys..." -#~ msgstr "リモートの鍵の取得中..." - -#~ msgid "Sending keys to key server..." -#~ msgstr "鍵を鍵サーバーへ転送中..." - -#~ msgid "Synchronizing keys" -#~ msgstr "鍵の同期" +#~ "同名のファイルが既に存在しています。\n" +#~ "\n" +#~ "新しいファイルで上書きしてもよろしいですか?" -#~ msgid "Encryption Key Manager" -#~ msgstr "暗号鍵マネージャー" +#~ msgid "_Replace" +#~ msgstr "上書きする(_R)" -#~ msgid "Invalid" -#~ msgstr "間違っています" +#~ msgid "Export public key" +#~ msgstr "公開鍵のエクスポート" -#~ msgid "Private Secure Shell Key" -#~ msgstr "個人的なセキュア・シェルの鍵" +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "\"%s\" へ鍵をエクスポートできません" -#~ msgid "Public Secure Shell Key" -#~ msgstr "公開可能なセキュア・シェルの鍵" +#~ msgid "Exporting keys" +#~ msgstr "鍵のエクスポート" -# 参考: -# PGP に関する訳語表 (http://pgp.iijlab.net/trans/) -# GPG の README 翻訳 (http://www.hyuki.com/gnu/gnupg-v12-readme.html) -#~ msgid "Passphrase:" -#~ msgstr "パスフレーズ:" +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "鍵サーバーから鍵データを取得できません" -#~ msgid "Couldn't share keys" -#~ msgstr "鍵を共有できませんでした" +#~ msgid "Retrieving keys" +#~ msgstr "鍵の取得中" -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "Discovery 情報をネットワーク上に公開できません" +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "本当に %d個の鍵と ID を抹消しますか?" -#~ msgid "%s's encryption keys" -#~ msgstr "%s さんの暗号鍵" +#~ msgid "Couldn't delete public key" +#~ msgstr "公開鍵を削除できません" -#~ msgid "Key Sharing" -#~ msgstr "鍵の共有" +#~ msgid "_Sign Key..." +#~ msgstr "鍵に署名する(_S)..." -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "鍵を共有すると、収集した鍵をネットワーク上にいる他のユーザーから利用できる" -#~ "ようになります。すなわち、いちいち相手に鍵を送ることなく、あなたの鍵 (もし" -#~ "くはあなたが知っている鍵) を自動的に暗号化してもらえるということです。\n" -#~ "\n" -#~ "注意: 個人的に使用する鍵は公開しないようにしてください。" +#~ msgid "Sign public key" +#~ msgstr "公開鍵に署名します" -#~ msgid "_Share my keys with others on my network" -#~ msgstr "自分の鍵をネットワーク上で共有する(_S)" +#~ msgid "Properties of the key." +#~ msgstr "この鍵のプロパティです。" -#~ msgid "Seahorse Daemon" -#~ msgstr "Seahorse のデーモン" +#~ msgid "Delete the key." +#~ msgstr "この鍵を削除します。" -#~ msgid "Create a PGP Key" -#~ msgstr "PGP 鍵の生成" +#~ msgid "Export Complete Key" +#~ msgstr "鍵のエクスポート" -# 参考: http://pgp.iijlab.net/trans/ -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginal\n" -#~ "Full\n" -#~ "Ultimate" -#~ msgstr "" -#~ "不明\n" -#~ "信用しない\n" -#~ "ある程度の信用\n" -#~ "完全に信用\n" -#~ "絶対に信用 (自分自身)" +#~ msgid "Couldn't export key." +#~ msgstr "鍵をエクスポートできません。" -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginally\n" -#~ "Fully\n" -#~ "Ultimately" -#~ msgstr "" -#~ "不明\n" -#~ "信用しない\n" -#~ "ぎりぎり信用する\n" -#~ "完全に信用する\n" -#~ "究極に信用する" +#~ msgid "Lock this token" +#~ msgstr "このトークンをロックする" -#~ msgid "_Trusted Keys" -#~ msgstr "信用する鍵(_T)" +#~ msgid "Unlock this token" +#~ msgstr "このトークンのロックを解除する" -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "選択したX個の鍵を同期します" +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "本当に '%s' という証明書を削除しますか?" -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "1個以上の秘密鍵を削除します。続行してもよろしいですか?" +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "本当に%d個の証明書を削除しますか?" -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" +#~ msgid "Deleting" +#~ msgstr "削除中" -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" +#~ msgid "Couldn't delete key" +#~ msgstr "鍵を削除できません" diff -Nru seahorse-3.2.2/po/ko.po seahorse-3.6.3/po/ko.po --- seahorse-3.2.2/po/ko.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/ko.po 2012-09-18 13:10:35.000000000 +0200 @@ -1,6 +1,6 @@ # seahorse Korean message translation # This file is distributed under the same license as the seahorse package. -# Changwoo Ryu , 2007, 2008, 2009, 2010, 2011. +# Changwoo Ryu , 2007-2012. # # 새로 번역하는 분은 아래 "translator-credit"에 추가하세요. # @@ -14,8 +14,8 @@ "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-23 02:15+0900\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-09-15 18:28+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" @@ -29,308 +29,297 @@ msgstr "암호 키 모음 추가" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "새 키 모음 이름:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "새 키 모음의 이름을 입력하십시오. 잠금 풀기 암호도 물어봅니다." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "새 키 모음 이름:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "서버의 호스트 이름 혹은 IP 주소." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "키 모음을 추가할 수 없습니다" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "새 암호 키 모음" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "응용 프로그램 및 네트워크 암호를 저장하는 데 사용" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "새 암호..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "안전하게 암호 및 비밀글을 저장." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "암호 키 모음" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "저장한 암호" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "기본 키 모음을 설정할 수 없습니다" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "키 모음 암호를 바꿀 수 없습니다" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "기본으로 설정(_S)" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "응용 프로그램은 보통 새 암호를 기본 키 모음에 저장합니다." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "암호 바꾸기(_P)" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "암호 저장 키 모음의 잠금을 푸는 암호를 바꿉니다" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "항목을 추가할 수 없습니다" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "암호 추가" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "설명(_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "키 모음(_K):" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "암호(_P):" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "암호 표시(_S)" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "항목을 삭제할 수 없습니다" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "키 모음(_K):" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "키 모음을 추가할 수 없습니다" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "암호" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "저장한 개인 암호, 인증 토큰, 비밀글" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "다음 메신저의 계정 암호: " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "암호 및 비밀글" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "네트워크 암호" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "저장한 메모" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "키 모음 암호" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "암호화 키 암호" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "키 저장 암호" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "구글 크롬 암호" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "그놈 온라인 계정 암호" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "텔레파시 암호" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "메신저 암호" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "네트워크 관리 비밀글" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "정말로 '%s' 암호를 삭제하시겠습니까?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "정말로 암호 %d개를 삭제하시겠습니까?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "항목을 지우는 중" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "네트워크 공유 혹은 자원에 접근" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "웹사이트에 접근" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "PGP 키 잠금 해제" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "보안 셸 키 잠금 해제" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "저장한 암호 혹은 로그인" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "네트워크 인증서" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "암호" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "암호를 바꿀 수 없습니다." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "암호를 업데이트하는 중" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "설명을 설정할 수 없습니다." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "암호:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "자세한 기술 정보:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "자세한 정보" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "키 속성" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "키" +msgid "Use:" +msgstr "사용:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "키 속성" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "종류:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "로그인:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "서버:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "로그인:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "암호 표시(_W)" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "종류:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "사용:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "암호: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "암호: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "암호 키 모음" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "응용 프로그램 및 네트워크 암호를 저장하는 데 사용" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "저장한 암호" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "안전하게 암호 및 비밀글을 저장." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "키 모음을 풀 수 없습니다" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "키 모음을 잠글 수 없습니다" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "기본 키 모음을 설정할 수 없습니다" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "키 모음 암호를 바꿀 수 없습니다" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "잠그기(_L)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "암호 저장 키 모음을 잠급니다. 잠금을 풀려면 마스터 암호가 필요합니다." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "풀기(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"암호 저장 키 모음을 마스터 암호로 풉니다. 잠금을 풀어야 사용할 수 있습니다." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "기본으로 설정(_S)" +msgid "Password:" +msgstr "암호:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "응용 프로그램은 보통 새 암호를 기본 키 모음에 저장합니다." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "키" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "암호 바꾸기(_P)" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "자세한 기술 정보:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "암호 저장 키 모음의 잠금을 푸는 암호를 바꿉니다" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "자세한 정보" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "키 모음을 삭제할 수 없습니다" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "로그인하면 자동으로 잠금이 풀리는 키 모음" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "암호를 저장할 때 사용하는 키 모음" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "정말로 '%s' 암호 키 모음을 삭제하시겠습니까?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "키 모음을 삭제하는 중" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "모든 항목이 영구히 지워지는 것을 이해합니다." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "키 모음 속성" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "이름:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "만든 때:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "키 모음" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "키 모음 속성" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "이름(_N):" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "작업이 취소되었습니다" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "키 모음에 접근이 거부되었습니다" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "그놈 키 모음 데몬이 동작하고 있지 않습니다" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "키 모음이 이미 잠금 해제 되었습니다" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "그런 키 모음이 없습니다" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "키 모음 데몬과 통신할 수 없습니다" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "해당 항목이 이미 있습니다" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "그놈 키 모음에 접근하는 데 내부 오류가 발생했습니다" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "표시 플래그" @@ -587,267 +576,323 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "최초 임시 항목" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "키 서버 추가" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "호스트:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "키 서버 종류:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "호스트:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "서버에 접속할 때 쓸 포트." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "최초 임시 항목" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "이 프로그램의 버전" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "암호" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- 시스템 설정" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "암호:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "기여한 분:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "다시 입력:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "암호 및 키" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "올바른 키 서버 주소가 아닙니다." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "류창우 " -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "" -"도움이 필요하면 시스템 관리자 혹은 해당 키 서버의 관리자에게 문의하십시오." +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "시호스 프로젝트 홈페이지" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "삭제할 수 없습니다" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "사용자 설정" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "키를 내보낼 수 없습니다" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "없음: 키를 공개하지 않음" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "데이터를 내보낼 수 없습니다." -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "키 서버에서 키를 자동으로 가져오기(_K)" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "파일(_F)" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "자동으로 내용이 바뀐 키를 키 서버와 동기화(_M)" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "내보내기(_X)..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "키 서버" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "파일로 내보냅니다" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "편집(_E)" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "클립보드로 복사합니다" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "삭제(_D)" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "선택한 항목을 삭제합니다" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "이 항목의 속성을 표시합니다" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "이 키 모음의 속성을 표시합니다" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "기본 설정(_N)" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "이 프로그램의 기본 설정을 바꿉니다" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "보기(_V)" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "도움말(_H)" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "이 프로그램 정보" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "차례(_C)" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "시호스 도움말을 표시합니다" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "내보내기" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "다음에 대한 PIN 또는 암호를 입력하십시오: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "암호:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "다시 입력:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "올바른 키 서버 주소가 아닙니다." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"도움이 필요하면 시스템 관리자 혹은 해당 키 서버의 관리자에게 문의하십시오." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "사용자 설정" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "없음: 키를 공개하지 않음" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "기본 설정" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "키를 찾는 방법(_F):" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "키를 공개할 곳(_P):" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "데이터를 가져오는 중" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "데이터를 내보내는 중" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "데이터를 가져오는 중" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "키 서버에서 키를 자동으로 가져오기(_K)" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "데이터를 보내는 중" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "자동으로 내용이 바뀐 키를 키 서버와 동기화(_M)" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "사용할 수 없음" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "키 서버" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "키 데이터" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "여러 개 키" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "모든 키 파일" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "모든 파일" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "아카이브 파일" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"같은 이름의 파일이 이미 있습니다.\n" -"\n" -"새로 만들 파일로 덮어 쓰시겠습니까?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "바꾸기(_R)" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "알 수 없음" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "아님" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "어느 정도" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "완전함" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "절대적" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "사용하지 않음" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "철회됨" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "도움말을 표시할 수 없습니다: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "만료 날짜:" +msgid "Never E_xpires" +msgstr "만료되지 않음(_X)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "새 서브키 만들기" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "키가 만료되지 않는 지 여부" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "키 종류(_T):" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "키 길이(_L):" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "키 종류(_T):" +msgid "Expiration Date:" +msgstr "만료 날짜:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "키의 길이" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "만료되지 않음(_X)" +msgid "Generate a new subkey" +msgstr "새 서브키 만들기" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "사용자 아이디 추가" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "새 사용자 아이디를 만듭니다" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "전체 이름(_N):" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "키 추가 설명(_M):" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "길이가 최소 5글자가 되어야 합니다" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "전자메일 주소(선택 정보)" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" -msgstr "키에 대해 설명하는 추가 설명 (선택 정보)" +msgstr "키에 대해 설명하는 추가 설명(선택 정보)" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "전자메일 주소 (선택 정보)" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "전체 이름(_N):" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "전자메일 주소(_E):" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "키 추가 설명(_M):" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "새 사용자 아이디를 만듭니다" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "바꾸기(_H)" +msgid "_Never expires" +msgstr "만료되지 않음(_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "키 철회" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "만료되지 않음(_N)" +msgid "C_hange" +msgstr "바꾸기(_H)" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -858,7 +903,7 @@ msgid "Add subkey to %s" msgstr "%s에 서브키 추가" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (서명 전용)" @@ -866,7 +911,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (암호화 전용)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (서명 전용)" @@ -887,6 +932,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "암호화 해제가 실패했습니다. 해제 키를 가지고 있지 않은 것 같습니다." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "작업이 취소되었습니다" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "만료 날짜가 잘못되었습니다" @@ -904,46 +954,145 @@ msgid "Expiry: %s" msgstr "만료: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "여러 개 키" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "키 데이터" + +# 주의: ASCII-armored를 뜻하는 말임 +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "텍스트 형식 PGP 키" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP 키" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP 키" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "전자메일 및 파일 암호화에 사용" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "PGP 키를 만들 수 없습니다" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "새 PGP 키의 암호" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "새 키의 암호를 두 번 입력하십시오." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"키를 만들 때 아주 많은 임의 데이터가 필요하니 도움이\n" +"필요합니다. 키보드를 두들기거나, 마우스를 움직이거나,\n" +"다른 프로그램을 사용하는 것 같은 기타 작업을 하면\n" +"좋습니다. 그렇게 하면 시스템이 필요한 임의 데이터를\n" +"획득합니다." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "키를 만드는 중" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "정말로 %s 키를 완전히 삭제하시겠습니까?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "정말로 키 %d개를 완전히 삭제하시겠습니까?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "암호가 틀렸습니다" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "세 번째로 틀린 암호를 입력했습니다. 다시 시도하십시오." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "암호가 틀렸습니다." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s'에 대한 새 암호를 입력하십시오" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s'에 대한 암호를 입력하십시오" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "새 암호를 입력하십시오" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "암호를 입력하십시오" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "암호" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "키 %d개를 읽어들였습니다" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"키 데이터가 잘못되었습니다. (UID가 없습니다.) 컴퓨터의 날짜를 미래로 설정했거" +"나 자체 서명을 하지 않았기 때문일 것입니다." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG 키" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: 기본 키 모음 디렉터리" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -978,27 +1127,31 @@ msgid "All JPEG files" msgstr "모든 JPEG 파일" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "모든 파일" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "키에 덧붙일 사진을 선택하십시오" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "사진을 준비할 수 없습니다" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "사진을 덧붙일 수 없습니다" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "파일을 읽어들일 수 업습니다. 형식이 잘못되었습니다" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "정말로 현재 사진을 키에서 제거하시겠습니까?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "사진을 삭제할 수 없습니다" @@ -1056,7 +1209,11 @@ msgid "Couldn't add revoker" msgstr "철회 표시를 붙일 수 없습니다" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "이 비밀 키가 영구히 지워지는 것을 이해합니다." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1071,522 +1228,581 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "서명에 사용할 수 있는 키가 없습니다" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "이 키의 신뢰도를 지정할 용도로 쓸 수 있는 개인 PGP 키가 없습니다." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "암호가 틀렸습니다." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s'에 대한 새 암호를 입력하십시오" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"검색 기준이 구체적이지 않습니다. '%s' 서버에서 해당 기준에 맞는 키가 너무 많" +"습니다." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s'에 대한 암호를 입력하십시오" +msgid "Couldn't communicate with server '%s': %s" +msgstr "'%s' 서버와 통신할 수 없습니다: %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "새 암호를 입력하십시오" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP 키 서버" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "암호를 입력하십시오" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "키를 가져올 수 없습니다" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "키 서버에서 키를 가져오는 중" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "원격(_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "이 창을 닫습니다" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "원격 키 찾기(_F)..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "키 서버에서 키를 찾습니다" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "가져오기(_I)" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "선택한 키를 로컬 키 모음에 가져옵니다" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "원격 키" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "키 %d개를 읽어들였습니다" +msgid "Remote Keys Containing '%s'" +msgstr "'%s'이(가) 들어 있는 원격 키" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "키 검색에 실패했습니다." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "원격 키 찾기" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"키 데이터가 잘못되었습니다. (UID가 없습니다.) 컴퓨터의 날짜를 미래로 설정했거" -"나 자체 서명을 하지 않았기 때문일 것입니다." +"인터넷에서 다른 사람의 키를 찾습니다. 찾은 키는 로컬 키 모음으로 가져올 수 있" +"습니다." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "다음이 들어 있는 키 검색(_S): " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP 키 서버" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "키 서버:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "내 주변의 공유한 키:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "찾을 위치:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "검색(_S)" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "키를 서버에 공개할 수 없습니다" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"검색 기준이 구체적이지 않습니다. '%s' 서버에서 해당 기준에 맞는 키가 너무 많" -"습니다." +msgid "Couldn't retrieve keys from server: %s" +msgstr "키를 서버에서 가져올 수 없습니다: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "'%s' 서버와 통신할 수 없습니다: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d개 키를 동기화한다고 선택했습니다" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "키 동기화하는 중..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "키 동기화" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"내 키 모음에 들어 있는 키를 다른 사람이 쓸 수 있게 공개합니다. 또 내가 키를 " +"받은 뒤에 다른 사람이 바꾼 내용이 있으면 그 키의 내용을 가져오게 됩니다." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"내가 키를 받은 뒤에 다른 사람이 바꾼 내용이 있으면 그 키의 내용을 가져오게 됩" +"니다. 공개할 키 서버를 지정하지 않았으므로, 내 키를 다른 사람이 쓸 수는 없게 " +"합니다." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "키 서버(_K)" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "동기화(_S)" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "'%s'에 통신할 수 없습니다: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "다음에 연결하는 중: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "주소의 IP를 찾을 수 없습니다: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "서버 주소의 IP를 찾는 중: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP 키 서버" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "키 서명(_S)..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "공개 키에 서명합니다" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "정말로 %s 키를 완전히 삭제하시겠습니까?" - -# pgp identity - 이름과 메일 주소를 말함 -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "정말로 키와 신원 %d개를 완전히 삭제하시겠습니까?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "정말로 키 %d개를 완전히 삭제하시겠습니까?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "키 동기화 및 공개(_S)..." -# pgp identity - 이름과 메일 주소를 말함 -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "정말로 신원 %d개를 완전히 삭제하시겠습니까?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "자기 키를 온라인에 공개하거나 온라인에 있는 키와 동기화합니다." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "사용자 아이디를 삭제할 수 없습니다" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP 키" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "개인 키를 삭제할 수 없습니다" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "공개 키를 삭제할 수 없습니다" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP 키는 전자메일 및 파일 암호화에 사용합니다" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "고급 키 옵션(_A)" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "만들기(_R)" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "새 키를 만듭니다" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "PGP 키를 이용해 전자메일이나 파일을 다른 사람에게 보낼 때 암호화할 수 있습니" "다." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "여기에 알고리즘" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "만들기(_R)" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "추가 설명(_C):" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "만료 날짜(_X):" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "만료하지 않음(_V)" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "암호화 종류(_T):" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "새 키를 만듭니다" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "키 강도(_S) (비트수):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "만료하지 않음(_V)" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "새 PGP 키" +msgid "E_xpiration Date:" +msgstr "만료 날짜(_X):" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "추가 설명(_C):" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "고급 키 옵션(_A)" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "만료됨" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "개인 PGP 키" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP 키" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "주요 사용자 아이디를 바꿀 수 없습니다" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "정말로 '%s' 사용자 ID를 완전히 삭제하시겠습니까?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "사용자 아이디를 삭제할 수 없습니다" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[알 수 없음]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "이름/전자메일" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "서명 아이디" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "주요 사진을 바꿀 수 없습니다" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(알 수 없음)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "이 키는 다음 날짜에 만료되었습니다: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "이름" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "정말로 %2$s 키의 서브키 %1$d번을 완전히 삭제하시겠습니까?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "서브키를 삭제할 수 없습니다" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "신뢰도를 바꿀 수 없습니다" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "키를 \"%s\"에 내보낼 수 없습니다" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "전체 키 내보내기" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" msgstr "키를 내보낼 수 없습니다." -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "하지 않음" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "종류" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "만든 때" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "만료" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "상태" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "강도" +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "만료됨" + # 번역주: revoked/expired의 상대말로 써야 하는데 괜찮을지? -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "좋음" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "키 아이디" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "동작" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "추가 설명:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "날짜" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "전자메일:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "핑거프린트" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "키 아이디:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "하지 않음" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "키 이름과 서명" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "이 키는 철회되었습니다" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "사진 " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "키의 소유자가 키를 철회했습니다. 이 키는 더 이상 사용할 수 없습니다." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "기술 정보" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "이 키는 만료되었습니다" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "이 키는 철회되었습니다" +msgid "Add a photo to this key" +msgstr "이 키에 사진을 추가합니다" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "이 키는 만료되었습니다" +msgid "Remove this photo from this key" +msgstr "이 사진을 이 키에서 지웁니다" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "종류:" +msgid "Make this photo the primary photo" +msgstr "이 사진을 주요 사진으로 하기" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "용도:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "이전 사진으로 이동" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "서브키(_S)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "다음 사진으로 이동" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "추가" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "사진 " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "이 키에 사진을 추가합니다" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "암호 바꾸기(_P)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "키 아이디:" + +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "이름:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "나에게 보낸 파일 및 전자메일을 복호화합니다." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "전자메일:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "삭제" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "추가 설명:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "만료" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "용도:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "만료:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "종류:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "내보내기" +msgid "Decrypt files and email sent to you." +msgstr "나에게 보낸 파일 및 전자메일을 복호화합니다." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "개인 PGP 키" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "다음 사진으로 이동" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "암호 바꾸기(_P)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "이전 사진으로 이동" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "소유자" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "키 아이디:" +msgid "Key Names and Signatures" +msgstr "키 이름과 서명" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "주요" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "이 사진을 주요 사진으로 하기" +msgid "Sign" +msgstr "서명" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "이름 및 서명" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "삭제" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "하지 않음" +msgid "_Add Name" +msgstr "이름 추가(_A)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "소유자 신뢰 무시(_T):" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "소유자" +msgid "Revoke" +msgstr "철회" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "주요" +msgid "Names and Signatures" +msgstr "이름 및 서명" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "개인 PGP 키" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "키 아이디:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "이 사진을 이 키에서 지웁니다" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "철회" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "강도:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "서명" +msgid "Technical Details" +msgstr "기술 정보" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "강도:" +msgid "Fingerprint" +msgstr "핑거프린트" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "키의 소유자가 키를 철회했습니다. 이 키는 더 이상 사용할 수 없습니다." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "만료:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "이름 추가(_A)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "날짜" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "소유자 신뢰 무시(_T):" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "전체 키 내보내기(_E):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "이름:" +msgid "Actions" +msgstr "동작" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "날짜:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "추가" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "만료" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "서브키(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "어느 정도" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "핑거프린트:" +msgid "Fully" +msgstr "완전히" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "신뢰도 지정:" +msgid "Ultimately" +msgstr "절대적으로" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "이 키에 대한 나의 신뢰" +msgid "Encrypt files and email to the key's owner" +msgstr "키 소유자에게 보내는 파일 및 전자메일 암호화" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "공개 PGP 키" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "다른 이름(_O):" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "이 키에 서명한 사람들(_P):" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "키 소유자에게 보내는 파일 및 전자메일 암호화" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "이 키에 대한 나의 신뢰" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "완전히" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "나의 신뢰는 자세한 정보 탭에서 수동으로 지정합니다." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "'%s'이(가) 다른 키에 한 서명을 신뢰합니다" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1594,7 +1810,11 @@ msgstr "" "이 키를 소유한 사람이 '%s'임을 신뢰한다면, 이 키에 서명하십시오:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "이 키에 서명(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1602,43 +1822,38 @@ "이 키를 소유한 사람이 '%s'임을 더 이상 신뢰하지 않으면, 서명을 철회하" "십시오:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "어느 정도" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "공개 PGP 키" +msgid "_Revoke Signature" +msgstr "서명 철회(_R)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "이 키에 서명한 사람들(_P):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "내가 신뢰하는 사람의 서명만 표시(_O)" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "신뢰" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "절대적으로" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "소유자에 대한 신뢰(_T):" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "나의 신뢰는 자세한 정보 탭에서 수동으로 지정합니다." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "핑거프린트:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "내가 신뢰하는 사람의 서명만 표시(_O)" +msgid "Dates:" +msgstr "날짜:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "서명 철회(_R)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "신뢰도 지정:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "이 키에 서명(_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "소유자에 대한 신뢰(_T):" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1646,53 +1861,59 @@ msgstr "%2$s의 서브키 %1$d번" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "철회하는 이유 (선택 정보)" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "철회(_V)" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "키를 철회하는 이유" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "이유(_R):" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "철회하는 이유(선택 정보)" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "철회(_V)" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "문서나 메시지에 서명할 때 쓸 수 있는 개인 PGP 키가 없습니다." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "메시지 서명에 사용할 키(_S):" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "이 키를 얼마나 철저하게 확인했습니까?" +msgid "Sign Key" +msgstr "키 서명" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "다른 사람들에게 이 서명이 보이는 방식:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "서명하면 이 키가 다음 사람의 소유라는 것을 내가 신뢰한다는 뜻입니다:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "키를 서명할 때 쓸 키:" +msgid "Key Name" +msgstr "키 이름" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"적당히: 이 키를 소유하고 있다고 주장하는 사람이 이 키를 정말로 소유하" -"고 있는 지 적당히 확인했다는 뜻입니다. 예를 들어, 전화를 통해 키 소유자에게 " -"핑거프린트를 읽어서 확인한 경우입니다." +msgid "How carefully have you checked this key?" +msgstr "이 키를 얼마나 철저하게 확인했습니까?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "키 이름" +msgid "_Not at all" +msgstr "전혀 하지 않음(_N)" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "적당히(_C)" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "매우 철저히(_V)" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1701,7 +1922,17 @@ "로 소유하고 있다고 믿지만, 그게 사실인지 확인할 수 없거나 확인한 적이 없습니" "다." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"적당히: 이 키를 소유하고 있다고 주장하는 사람이 이 키를 정말로 소유하" +"고 있는 지 적당히 확인했다는 뜻입니다. 예를 들어, 전화를 통해 키 소유자에게 " +"핑거프린트를 읽어서 확인한 경우입니다." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1709,18 +1940,6 @@ "매우 철저히: 이 키가 올바르다고 전적으로 확신하는 경우에만 선택하십시" "오." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "서명하면 이 키가 다음 사람의 소유라는 것을 내가 신뢰한다는 뜻입니다:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "나중에 이 서명을 철회할 수 있습니다(_R)." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "키 서명" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1732,473 +1951,355 @@ "유인지 확인하기 위해 전자메일을 사용해야 합니다." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "적당히(_C)" +msgid "How others will see this signature:" +msgstr "다른 사람들에게 이 서명이 보이는 방식:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "전혀 하지 않음(_N)" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "다른 사람들은 이 서명을 볼 수 없음(_O)" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "나중에 이 서명을 철회할 수 있습니다(_R)." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "서명(_S)" +msgid "Sign key as:" +msgstr "키를 서명할 때 쓸 키:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "서명에 사용할 키(_S):" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "매우 철저히(_V)" +msgid "_Sign" +msgstr "서명(_S)" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "메시지 서명에 사용할 키(_S):" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "데이터를 내보내는 중" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "데이터를 가져오는 중" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "데이터를 가져오는 중" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "데이터를 보내는 중" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "사용할 수 없음" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "개인 인증서 및 키" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "개인 인증서" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "인증서" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "삭제할 수 없습니다" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "인증서(DER 인코딩)" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "정말로 '%s' 인증서를 삭제하시겠습니까?" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "인증서" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 인증서 및 관련 키" -#: ../pkcs11/seahorse-pkcs11-commands.c:130 +# pgp identity - 이름과 메일 주소를 말함 +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 #, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "정말로 인증서 %d개를 삭제하시겠습니까?" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "정말로 인증서 %d개를 완전히 삭제하시겠습니까?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "개인 키를 생성할 수 없습니다" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "만들기" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "개인 키" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "인증서를 요청하는데 사용합니다" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "새 개인 키를 만듭니다" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "레이블:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "저장 위치:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "이 키가 영구히 지워지는 것을 이해합니다." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "이름 없음" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "인증서를 내보내는데 실패했습니다" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "삭제할 수 없습니다" -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "삭제하는 중" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "내보내기(_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "인증서를 내보냅니다" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "이 인증서 또는 키를 삭제합니다" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "인증서 요청(_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "이 키에 대한 인증서 요청 파일을 만듭니다" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "인증서 요청을 저장할 수 없습니다" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "인증서 요청 저장" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "인증서 요청" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM 인코딩한 요청" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "인증서 요청을 만들 수 없습니다" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "인증서 요청 파일을 만듭니다." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "인증서 요청에 쓸 공통 이름(Common Name, CN)." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "이름(CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "이름 없는 개인 키" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "암호 바꾸기" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "암호 다시 입력(_F):" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "새 암호(_P):" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "새 암호 다시 입력" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "새 암호(_P):" +msgid "Con_firm Passphrase:" +msgstr "암호 다시 입력(_F):" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "암호 및 암호화 키를 관리합니다" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "암호 및 키" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "만드려는 키의 종류 선택(_S):" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "계속(_O)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "새로 만들기..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d개 키를 선택했습니다" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "키를 가져올 수 없습니다" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "키를 가져왔습니다" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "키를 가져오는 중" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "키 가져오기" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "키 종류를 알 수 없거나, 데이터 형식이 잘못되었습니다" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "키를 가져오는 중" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "원격(_R)" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "이 프로그램을 닫습니다" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "새로 만들기(_N)..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "새 키나 새 항목을 만듭니다" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "가져오기(_I)..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "파일에서 가져옵니다" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "클립보드에서 가져옵니다" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "원격 키 찾기(_F)..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "키 서버에서 키를 찾습니다" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "키 동기화 및 공개(_S)..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "자기 키를 온라인에 공개하거나 온라인에 있는 키와 동기화합니다." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "종류(_Y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "종류 열을 표시합니다" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "만료(_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "만료 열을 표시합니다" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "신뢰(_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "소유자 신뢰 열을 표시합니다" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "확인(_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "확인 열 표시" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "필터:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "처음 사용하는 경우:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "자기만의 새 키 만들기: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "파일에서 기존에 만든 키를 가져오기:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "내 개인 키(_P)" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "기타 키(_K)" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "암호화를 시작하려면 키가 있어야 합니다." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "가져오기(_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "암호(_P)" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "키를 내보낼 수 없습니다" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "유효" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "만료 날짜" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "이 창을 닫습니다" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "모두 펴기(_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "모든 목록을 펼칩니다" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "모두 감추기(_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "모든 목록을 감춥니다" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "원격 키" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "'%s'이(가) 들어 있는 원격 키" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "키 서버:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "내 주변의 공유한 키:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "원격 키 찾기" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"인터넷에서 다른 사람의 키를 찾습니다. 찾은 키는 로컬 키 모음으로 가져올 수 있" -"습니다." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "찾을 위치:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "검색(_S)" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "다음이 들어 있는 키 검색(_S): " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "키를 서버에 공개할 수 없습니다" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "키를 서버에서 가져올 수 없습니다: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d개 키를 동기화한다고 선택했습니다" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "키 동기화하는 중..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "키 동기화" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"내 키 모음에 들어 있는 키를 다른 사람이 쓸 수 있게 공개합니다. 또 내가 키를 " -"받은 뒤에 다른 사람이 바꾼 내용이 있으면 그 키의 내용을 가져오게 됩니다." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"내가 키를 받은 뒤에 다른 사람이 바꾼 내용이 있으면 그 키의 내용을 가져오게 됩" -"니다. 공개할 키 서버를 지정하지 않았으므로, 내 키를 다른 사람이 쓸 수는 없게 " -"합니다." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "키 서버(_K)" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "동기화(_S)" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "이 프로그램의 버전" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "계속" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "기여한 분:" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "만드려는 키의 종류 선택(_S):" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "류창우 " +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "가져오기 실패" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "가져오기" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "가져온 데이터:" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "시호스 프로젝트 홈페이지" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "키 가져오기" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "파일(_F)" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "모든 키 파일" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "편집(_E)" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "끌어놓은 텍스트" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "클립보드 텍스트" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "새로 만들기(_N)" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "보기(_V)" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "이 프로그램을 닫습니다" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "도움말(_H)" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "새로 만들기(_N)..." -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "기본 설정(_N)" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "새 키나 새 항목을 만듭니다" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "이 프로그램의 기본 설정을 바꿉니다" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "새 키나 항목을 추가합니다" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "이 프로그램 정보" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "가져오기(_I)..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "차례(_C)" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "파일에서 가져옵니다" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "시호스 도움말을 표시합니다" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "클립보드에서 가져옵니다" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "공개 키 내보내기" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "키를 내보내는 중" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "키 서버에서 데이터를 가져올 수 없습니다" - -# 상태 문자열 -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "키를 복사했습니다" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "키를 가져오는 중" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "키 모음 순서(_K)" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "가장자리 창에서 키 모음 목록을 표시" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "개인 항목 표시(_P)" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "개인 키, 인증서, 암호만 표시합니다" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "신뢰하는 항목 표시(_T)" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "신뢰하는 키, 인증서, 암호만 표시합니다" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "모두 표시(_A)" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "모든 키, 인증서, 암호 표시합니다" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "필터" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s 키는 개인 키입니다. 정말로 계속 하시겠습니까?" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "처음 사용하는 경우:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "키 서버에서 키를 가져오는 중" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "자기만의 새 키 만들기: " -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "속성을 표시합니다" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "파일에서 기존에 만든 키를 가져오기:" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "삭제(_D)" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "암호화를 시작하려면 키가 있어야 합니다." -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "선택한 항목을 삭제합니다" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "잠글 수 없습니다" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "잠금을 풀 수 없습니다" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "내보내기(_X)..." +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "잠그기(_L)" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "파일로 내보냅니다" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "풀기(_U)" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "클립보드로 복사합니다" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "속성(_P)" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "선택한 키를 로컬 키 모음에 가져옵니다" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "보안 셸 키 설정(_S)..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"보안셸 공개 키를 다른 컴퓨터에 보내고, 그 키를 사용해 로그인할 수 있게 만듭니" +"다." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2227,176 +2328,198 @@ msgid "Enter the new passphrase again: %s" msgstr "새 암호를 다시 입력하십시오: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "보안 셸 키 설정(_S)..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"보안셸 공개 키를 다른 컴퓨터에 보내고, 그 키를 사용해 로그인할 수 있게 만듭니" -"다." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "보안 셸" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "다른 컴퓨터에 안전하게 연결하는 데 사용하는 키" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "정말로 '%s' 보안 셸 키를 삭제하시겠습니까?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "정말로 보안 셸 키 %d개를 삭제하시겠습니까?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "키를 삭제할 수 없습니다" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "정말로 보안 셸 키 %d개를 삭제하시겠습니까?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH 키" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "비밀 SSH 키" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "공개 SSH 키" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "이 키에 대해 공개 키 파일이 없습니다." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "보안 셸 키" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" -msgstr "다른 컴퓨터에 접속하는 데 사용 (예: 터미널을 통해)" +msgstr "다른 컴퓨터에 접속하는 데 사용(예: 터미널을 통해)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "보안 셸 키를 만들 수 없습니다" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "보안 셸 키를 만드는 중" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "새 보안 셸 키" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." +msgid "_Just Create Key" +msgstr "키만 만들기(_J)" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "만들고 설정(_C)" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "보안 셸(SSH) 키를 이용하면 신뢰하는 컴퓨터에 안전하게 SSH를 이용해 연결할 수 있습니다." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" "자기 전자메일 주소를 사용하거나, 기타 이 키의 용도가 무엇인지 알 수 있는 " "말을 사용하십시오." -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"보안 셸 (SSH) 키를 이용하면 신뢰하는 컴퓨터에 안전하게 SSH를 이용해 연결할 " -"수 있습니다. 컴퓨터마다 암호를 입력할 필요가 없게 됩니다." +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" -#: ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:12 msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "이 키를 어떤 컴퓨터에서 이용하려면, 지금 그 컴퓨터를 설정해서 이 키를 인식하" "도록 하십시오." -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "새 보안 셸 키" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "만들고 설정(_C)" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "키만 만들기(_J)" - -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "키 설명(_K):" - -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(보안 셸 키를 읽을 수 없습니다)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "개인 SSH 키" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH 키" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "키의 이름을 바꿀 수 없습니다." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "이 키에 대한 인증을 바꿀 수 없습니다." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "키의 암호를 바꿀 수 없습니다." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "알고리즘:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "아이디:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "위치:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "이름:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "강도:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "다른 컴퓨터에 연결하는 데 사용합니다." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "신뢰" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "이 키의 소유자는 이 컴퓨터에 연결할 수 있음(_A)" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "이 사항은 '%s' 계정에만 적용됩니다." +msgid "This only applies to the %s account." +msgstr "이 사항은 %s 계정에만 적용됩니다." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "전체 키 내보내기(_X)" +msgid "Algorithm:" +msgstr "알고리즘:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "이 키의 소유자는 이 컴퓨터에 연결할 수 있음(_A)" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "강도:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "위치:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "다른 컴퓨터에 연결하는 데 사용합니다." +msgid "E_xport Complete Key" +msgstr "전체 키 내보내기(_X)" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH 명령이 예상치 못하게 끝났습니다." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH 명령이 실패했습니다." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "원격 호스트 암호" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "키 암호를 입력하십시오" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "새 보안 셸 키의 암호" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "키를 가져오는 중: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "키를 가져오는 중입니다. 암호를 입력하십시오" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH 키" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "이 키에 대해 개인 키 파일이 없습니다." @@ -2409,14 +2532,10 @@ msgstr "보안 셸 키를 설정하는 중..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "예: fileserver.example.com:포트번호" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "컴퓨터에 SSH 연결 설정" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2424,6 +2543,10 @@ "보안 셸 키를 SSH를 사용하는 다른 컴퓨터에 사용하려면, 그 컴퓨터에 로그인 계정" "이 이미 있어야 합니다." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "예: fileserver.example.com:포트번호" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "컴퓨터 이름(_C):" @@ -2436,15 +2559,194 @@ msgid "_Set Up" msgstr "설정(_S)" +#~ msgid "Login keyring" +#~ msgstr "로그인 키 모음" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "키 모음에 접근이 거부되었습니다" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "그놈 키 모음 데몬이 동작하고 있지 않습니다" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "키 모음이 이미 잠금 해제 되었습니다" + +#~ msgid "No such key ring exists" +#~ msgstr "그런 키 모음이 없습니다" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "키 모음 데몬과 통신할 수 없습니다" + +#~ msgid "The item already exists" +#~ msgstr "해당 항목이 이미 있습니다" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "그놈 키 모음에 접근하는 데 내부 오류가 발생했습니다" + +#~ msgid "Algorithms here" +#~ msgstr "여기에 알고리즘" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "항목을 지우는 중" + +#~ msgid "Passwords: %s" +#~ msgstr "암호: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "암호: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "암호 저장 키 모음을 잠급니다. 잠금을 풀려면 마스터 암호가 필요합니다." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "암호 저장 키 모음을 마스터 암호로 풉니다. 잠금을 풀어야 사용할 수 있습니" +#~ "다." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "키 모음을 삭제할 수 없습니다" + +#~ msgid "Archive files" +#~ msgstr "아카이브 파일" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "같은 이름의 파일이 이미 있습니다.\n" +#~ "\n" +#~ "새로 만들 파일로 덮어 쓰시겠습니까?" + +#~ msgid "_Replace" +#~ msgstr "바꾸기(_R)" + +#~ msgid "_Sign Key..." +#~ msgstr "키 서명(_S)..." + +#~ msgid "Sign public key" +#~ msgstr "공개 키에 서명합니다" + +# pgp identity - 이름과 메일 주소를 말함 +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "정말로 키와 신원 %d개를 완전히 삭제하시겠습니까?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "공개 키를 삭제할 수 없습니다" + +#~ msgid "New PGP Key" +#~ msgstr "새 PGP 키" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "키를 \"%s\"에 내보낼 수 없습니다" + +#~ msgid "Export Complete Key" +#~ msgstr "전체 키 내보내기" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "정말로 '%s' 인증서를 삭제하시겠습니까?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "정말로 인증서 %d개를 삭제하시겠습니까?" + +#~ msgid "Deleting" +#~ msgstr "삭제하는 중" + +#~ msgid "Create New ..." +#~ msgstr "새로 만들기..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "%d개 키를 선택했습니다" + +#~ msgid "Importing keys" +#~ msgstr "키를 가져오는 중" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "키 종류를 알 수 없거나, 데이터 형식이 잘못되었습니다" + +#~ msgid "Importing Keys" +#~ msgstr "키를 가져오는 중" + +#~ msgid "T_ypes" +#~ msgstr "종류(_Y)" + +#~ msgid "Show type column" +#~ msgstr "종류 열을 표시합니다" + +#~ msgid "_Expiry" +#~ msgstr "만료(_E)" + +#~ msgid "Show expiry column" +#~ msgstr "만료 열을 표시합니다" + +#~ msgid "_Trust" +#~ msgstr "신뢰(_T)" + +#~ msgid "Show owner trust column" +#~ msgstr "소유자 신뢰 열을 표시합니다" + +#~ msgid "_Validity" +#~ msgstr "확인(_V)" + +#~ msgid "Show validity column" +#~ msgstr "확인 열 표시" + +#~ msgid "Other _Keys" +#~ msgstr "기타 키(_K)" + +#~ msgid "Validity" +#~ msgstr "유효" + +#~ msgid "Expiration Date" +#~ msgstr "만료 날짜" + +#~ msgid "_Expand All" +#~ msgstr "모두 펴기(_E)" + +#~ msgid "Expand all listings" +#~ msgstr "모든 목록을 펼칩니다" + +#~ msgid "_Collapse All" +#~ msgstr "모두 감추기(_C)" + +#~ msgid "Collapse all listings" +#~ msgstr "모든 목록을 감춥니다" + +#~ msgid "Export public key" +#~ msgstr "공개 키 내보내기" + +#~ msgid "Exporting keys" +#~ msgstr "키를 내보내는 중" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "키 서버에서 데이터를 가져올 수 없습니다" + +#~ msgid "Retrieving keys" +#~ msgstr "키를 가져오는 중" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s 키는 개인 키입니다. 정말로 계속 하시겠습니까?" + +#~ msgid "Couldn't delete key" +#~ msgstr "키를 삭제할 수 없습니다" + +#~ msgid "_Key Description:" +#~ msgstr "키 설명(_K):" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "seahorse-daemon을 데몬으로 실행하지 않습니다" #~ msgid "couldn't fork process" #~ msgstr "프로세스를 포크할 수 없습니다" -#~ msgid "couldn't create new process group" -#~ msgstr "새 프로세스 그룹을 만들 수 없습니다" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "암호화 데몬 (시호스)" @@ -2496,9 +2798,6 @@ #~ msgid "Bad Signature" #~ msgstr "서명 틀림" -#~ msgid "Couldn't verify signature." -#~ msgstr "서명이 올바른 지 확인할 수 없습니다." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "서명에 사용한 키가 잘못되었거나 키를 알 수 없습니다: %s" @@ -2674,9 +2973,6 @@ #~ msgid "Web Password" #~ msgstr "웹 암호" -#~ msgid "Network Password" -#~ msgstr "네트워크 암호" - #~ msgid "Couldn't set application access." #~ msgstr "프로그램 접근 권한을 설정할 수 없습니다." @@ -2791,12 +3087,6 @@ #~ msgid "Symmetric Key" #~ msgstr "대칭 키" -#~ msgid "Public Key" -#~ msgstr "공개 키" - -#~ msgid "Private Key" -#~ msgstr "개인 키" - #~ msgid "Credentials" #~ msgstr "자격 증명" @@ -2819,9 +3109,6 @@ #~ msgid "Loading Keys..." #~ msgstr "키를 읽어들이는 중입니다..." -#~ msgid "Searching for keys..." -#~ msgstr "키를 찾는 중입니다..." - #~ msgid "Uploading keys..." #~ msgstr "키를 업로드하는 중입니다..." @@ -2846,12 +3133,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "키 동기화" -#~ msgid "Encryption Key Manager" -#~ msgstr "암호화 키 관리자" - -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "잘못됨" @@ -2861,9 +3142,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "공개 보안 셸 키" -#~ msgid "Secure Shell key" -#~ msgstr "보안 셸 키" - #~ msgid "Passphrase:" #~ msgstr "암호:" @@ -2925,12 +3203,6 @@ #~ msgid "Validity" #~ msgstr "유효" -#~ msgid "Common Name (CN)" -#~ msgstr "공통 이름 (Common Name, CN)" - -#~ msgid "Email Recipient Certificate" -#~ msgstr "전자메일 수신자 인증서" - #~ msgid "Email Signer Certificate" #~ msgstr "전자메일 서명 인증서" @@ -2955,9 +3227,6 @@ #~ msgid "SSL Client Certificate" #~ msgstr "SSL 클라이언트 인증서" -#~ msgid "SSL Server Certificate" -#~ msgstr "SSL 서버 인증서" - #~ msgid "Serial Number" #~ msgstr "일련번호" @@ -2970,9 +3239,6 @@ #~ msgid "Removing item" #~ msgstr "항목을 지우는 중입니다" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "사용자가 로그인하면 자동으로 잠금을 풉니다." - #~ msgid "Couldn't get default password keyring" #~ msgstr "기본 암호 키 모음을 읽을 수 없습니다" @@ -3018,9 +3284,6 @@ #~ msgid "Expiry for Subkey %d of %s" #~ msgstr "%2$s의 서브키 %1$d번 만료" -#~ msgid "Create a new personal key" -#~ msgstr "새 개인 키를 만듭니다" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "파일에서 키를 내 키 모음으로 가져옵니다" diff -Nru seahorse-3.2.2/po/LINGUAS seahorse-3.6.3/po/LINGUAS --- seahorse-3.2.2/po/LINGUAS 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/po/LINGUAS 2012-08-21 12:23:18.000000000 +0200 @@ -4,6 +4,7 @@ as ast az +be be@latin bg bn diff -Nru seahorse-3.2.2/po/lt.po seahorse-3.6.3/po/lt.po --- seahorse-3.2.2/po/lt.po 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/lt.po 2012-08-21 12:23:19.000000000 +0200 @@ -7,19 +7,21 @@ # Vytautas Liuolia , 2008. # Rimas Kudelis , 2009. # Žygimantas Beručka , 2010. +# Algimantas Margevičius , 2011. +# msgid "" msgstr "" "Project-Id-Version: seahorse master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-18 15:47+0300\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-07-22 21:49+0300\n" "Last-Translator: Aurimas Černius \n" -"Language-Team: Lithuanian \n" +"Language-Team: Lietuvių <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "X-Generator: Virtaal 0.6.1\n" "X-Poedit-Language: Lithuanian\n" "X-Poedit-Country: LITHUANIA\n" @@ -30,56 +32,165 @@ msgstr "Pridėti slaptažodžių raktinę" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Naujos raktinės vardas:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "Please choose a name for the new keyring. You will be prompted for an unlock password." msgstr "Prašome pasirinkti naujosios raktinės vardą. Jūsų bus paprašyta įvesti atrakinimo slaptažodį." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Naujos raktinės vardas:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Serverio kompiuterio vardas arba adresas." -#: ../gkr/seahorse-gkr-add-item.c:61 -#: ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Nepavyko pridėti raktinės" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Nauja slaptažodžių raktinė" + +#: ../gkr/seahorse-gkr-actions.c:82 +#: ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Naudojama programų ir tinklo slaptažodžių saugojimui" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Naujas slaptažodis..." + +#: ../gkr/seahorse-gkr-actions.c:84 +#: ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Saugiai įsiminti slaptažodį ar paslaptį." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Slaptažodžių raktinė" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Įrašytas slaptažodis" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Nepavyko nustatyti numatytosios raktinės" + +#: ../gkr/seahorse-gkr-actions.c:225 +#: ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Nepavyko pakeisti raktinės slaptažodžio" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "Padaryti _numatytuoju" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Programos paprastai įrašo naujus slaptažodžius numatytoje raktinėje." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Pakeisti sla_ptažodį" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Pakeisti slaptažodžių saugyklos raktinės atrakinimo slaptažodį" + +#: ../gkr/seahorse-gkr-add-item.c:58 +#| msgid "Couldn't delete item" +msgid "Couldn't add item" +msgstr "Nepavyko pridėti elemento" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Pridėti slaptažodį" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 +#: ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "Pa_aiškinimas:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Raktinė:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Slaptažodis:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Rodyti _slaptažodį" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Nepavyko pašalinti elemento" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Raktinė:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Nepavyko pridėti raktinės" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Slaptažodžiai" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Saugomi asmeniniai slaptažodžiai, įgaliojimai ir paslaptys" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "IM paskyros slaptažodis skirtas " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Slaptažodis ar paslaptis" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Tinklo slaptažodis" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Saugojama pastaba" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Raktinės slaptažodis" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Šifravimo rakto slaptažodis" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Raktų saugyklos slaptažodis" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome slaptažodis" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Gnome Online Accounts slpatažodis" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy slaptažodis" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Momentinių pranešimų slaptažodis" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Tinklo tvarkyklės paslaptis" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Ar tikrai norite pašalinti slaptažodį „%s“?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -87,254 +198,138 @@ msgstr[1] "Ar tikrai norite pašalinti %d slaptažodžius?" msgstr[2] "Ar tikrai norite pašalinti %d slaptažodžių?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Pašalinamas elementas" -msgstr[1] "Pašalinami elementai" -msgstr[2] "Pašalinami elementai" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Pasiekti tinkle paviešintą aplanką ar resursą" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Pasiekti interneto svetainę" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Atrakina PGP raktą" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Atrakina saugaus prisijungimo (SSH) raktą" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Išsaugotas slaptažodis ar prisijungimo vardas" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Tinklo prisijungimo duomenys" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Slaptažodis" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Nepavyko pakeisti slaptažodžio." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Atnaujinamas slaptažodis" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Nepavyko pakeisti aprašymo." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Slaptažodis:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Techninės detalės:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalės" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Rakto savybės" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Raktas" +msgid "Use:" +msgstr "Naudoti:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Rakto savybės" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipas:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Prisijungimo vardas:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Serveris:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Prisijungimo vardas:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Rodyti _slaptažodį" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipas:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Naudoti:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Slaptažodžiai: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Slaptažodžiai: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Slaptažodžių raktinė" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Naudojama programų ir tinklo slaptažodžių saugojimui" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Įrašytas slaptažodis" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Saugiai įsiminti slaptažodį ar paslaptį." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Nepavyko atrakinti raktinės" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Nepavyko užrakinti raktinės" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Nepavyko nustatyti numatytosios raktinės" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Nepavyko pakeisti raktinės slaptažodžio" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Užrakinti" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "Lock the password storage keyring so a master password is required to unlock it." -msgstr "Užrakinti slaptažodžių saugyklos raktinę, kad jai atrakinti reiktų pagrindinio slaptažodžio." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Atrakinti" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "Unlock the password storage keyring with a master password so it is available for use." -msgstr "Atrakinti slaptažodžių saugyklos raktinę pagrindiniu slaptažodžiu, kad ja būtų galima naudotis." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "Padaryti _numatytuoju" +msgid "Password:" +msgstr "Slaptažodis:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Programos paprastai įrašo naujus slaptažodžius numatytoje raktinėje." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Raktas" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Pakeisti sla_ptažodį" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Techninės detalės:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Pakeisti slaptažodžių saugyklos raktinės atrakinimo slaptažodį" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalės" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Nepavyko pašalinti raktinės" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Raktinė, kuri yra automatiškai atrakinama prisijungiant" + +#: ../gkr/seahorse-gkr-keyring.c:467 +#| msgid "Key storage password" +msgid "A keyring used to store passwords" +msgstr "Raktinė slaptažodžiams saugoti" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Ar tikrai norite pašalinti slaptažodžių raktinę „%s“?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Pašalinama raktinė" -msgstr[1] "Pašalinamos raktinės" -msgstr[2] "Pašalinamos raktinės" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Aš suprantu, kad visi elementai bus negrįžtamai ištrinti." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Raktinės savybės" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +#| msgid "_Name:" +msgid "Name:" +msgstr "Pavadinimas:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Sukurta:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Raktinė" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Raktinės savybės" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "Pavadi_nimas:" - -#: ../gkr/seahorse-gkr-operation.c:52 -#: ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 -#: ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Veiksmas atšauktas" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Priėjimas prie raktinės uždraustas" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring tarnyba neveikia" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Raktinė jau atrakinta" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Tokia raktinė neegzistuoja" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Nepavyko susisiekti su raktinės tarnyba" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Elementas jau egzistuoja" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Vidinė klaida, bandant susisiekti su gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Rodyti požymius" @@ -594,270 +589,337 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "pradinis laikinasis elementas" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Pridėti raktų serverį" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Serverio adresas:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Raktų serverio tipas:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Serverio adresas:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "Prievadas, kuriuo serveris yra pasiekiamas." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "pradinis laikinasis elementas" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Šios programos versija" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Slaptažodis" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Sistemos nustatymai" -#: ../libseahorse/seahorse-passphrase.c:183 -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Slaptažodis:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Padėkos:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Patvirtink:" +#: ../libseahorse/seahorse-catalog.c:112 +#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Slaptažodžiai ir raktai" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Netinkamas raktų serverio adresas. " +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Mantas Kriaučiūnas \n" +"Eglė Girinaitė \n" +"Vytautas Liuolia \n" +"Rimas Kudelis " -#: ../libseahorse/seahorse-prefs.c:69 -msgid "For help contact your system adminstrator or the administrator of the key server." -msgstr "Pagalbos prašykite savo sistemos administratoriaus arba raktų serverio administratoriaus." +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse projekto tinklalapis" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +#| msgid "Couldn't delete" +msgid "Cannot delete" +msgstr "Nepavyko pašalinti" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Kitoks" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Nepavyko eksportuoti raktų" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Nesiųsti raktų niekur" +#: ../libseahorse/seahorse-catalog.c:268 +#| msgid "Couldn't export keys" +msgid "Couldn't export data" +msgstr "Nepavyko eksportuoti duomenų" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Automatiškai parsiųsti raktus iš _raktų serverių" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Failas" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Automatiškai sinchronizuoti pa_keistus raktus su raktų serveriais" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_ksportuoti..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Raktų serveriai" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Eksportuoti į failą" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Nustatymai" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Keisti" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Ieškoti raktų serveriuose:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopijuoti į iškarpinę" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "Nu_siųsti raktus į:" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 +#: ../src/seahorse-sidebar.c:957 +#| msgctxt "" +#| "This text refers to deleting an item from its type's backing store." +#| msgid "_Delete" +msgid "_Delete" +msgstr "Pa_šalinti" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Gaunami duomenys" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Pašalinti pažymėtus elementus" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Eksportuojami duomenys" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Rodyti šio elemento savybes" + +#: ../libseahorse/seahorse-catalog.c:289 +#| msgid "Show the properties of this item" +msgid "Show the properties of this keyring" +msgstr "Rodyti šios raktinės savybes" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importuojami duomenys" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Nustatymai" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Siunčiami duomenys" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Keisti šios programos nustatymus" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Negalimas" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "R_odyti" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Pagalba" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Rakto informacija" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Apie šią programą" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Keli raktai" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Turinys" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Visi raktų failai" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Rodyti Seahorse pagalbą" -#: ../libseahorse/seahorse-util.c:745 -#: ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Visi failai" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Eksportuoti" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Archyvo failai" +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Įveskite slaptažodį arba PIN: %s" -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Failas su tokiu vardu jau yra.\n" -"\n" -"Ar norite jį pakeisti nauju failu?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Pakeisti" +#: ../libseahorse/seahorse-passphrase.c:183 +#: ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Slaptažodis:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Patvirtink:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Netinkamas raktų serverio adresas. " + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "For help contact your system adminstrator or the administrator of the key server." +msgstr "Pagalbos prašykite savo sistemos administratoriaus arba raktų serverio administratoriaus." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Kitoks" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Nesiųsti raktų niekur" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Nustatymai" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Ieškoti raktų serveriuose:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "Nu_siųsti raktus į:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Automatiškai parsiųsti raktus iš _raktų serverių" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Automatiškai sinchronizuoti pa_keistus raktus su raktų serveriais" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Raktų serveriai" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 #: ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Nežinau" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Niekada" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Dalinis" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Pilnas" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Visiškas" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Išjungtas" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Paskelbtas negaliojančiu" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Nepavyko įkelti žinyno: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Galioja iki:" +msgid "Never E_xpires" +msgstr "Niekada _nesibaigia" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Sukurti naują antrinį raktą" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Jei rakto galiojimas niekada nesibaigia" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Rakto _tipas:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Rakto _ilgis:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Rakto _tipas:" +msgid "Expiration Date:" +msgstr "Galioja iki:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Rakto ilgis" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Niekada _nesibaigia" +msgid "Generate a new subkey" +msgstr "Sukurti naują antrinį raktą" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Įdėti naudotojo ID" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Sukurti naują naudotojo ID" +msgid "Must be at least 5 characters long" +msgstr "Turi būti bent 5 simbolių ilgio" #: ../pgp/seahorse-add-uid.xml.h:3 -#: ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Vardas ir pavardė:" +msgid "Optional email address" +msgstr "El. pašto adresas (neprivalomas)" #: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Rakto _komentaras:" - -#: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "Turi būti bent 5 simbolių ilgio" - -#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Optional comment describing key" msgstr "Komentaras, aprašantis raktą (neprivalomas)" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "El. pašto adresas (neprivalomas)" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Vardas ir pavardė:" -#: ../pgp/seahorse-add-uid.xml.h:8 -#: ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 +#: ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_El. pašto adresas:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Rakto _komentaras:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Sukurti naują naudotojo ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Keisti" +msgid "_Never expires" +msgstr "_Niekada nenustoja galioti" #: ../pgp/seahorse-expires.xml.h:2 -#: ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Raktą paskelbti negaliojančiu" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Niekada nenustoja galioti" +msgid "C_hange" +msgstr "_Keisti" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -869,7 +931,7 @@ msgstr "Pridėti antrinį raktą prie „%s“" #: ../pgp/seahorse-gpgme-add-subkey.c:197 -#: ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (tik pasirašymui)" @@ -878,7 +940,7 @@ msgstr "ElGamal (tik šifravimui)" #: ../pgp/seahorse-gpgme-add-subkey.c:211 -#: ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (tik pasirašymui)" @@ -899,6 +961,12 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Iššifravimas nepavyko. Greičiausiai neturite iššifravimo rakto." +#: ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Veiksmas atšauktas" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Netinkama galiojimo data" @@ -916,46 +984,148 @@ msgid "Expiry: %s" msgstr "Galioja iki: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Keli raktai" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Rakto informacija" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +#| msgid "Personal PGP key" +msgid "Armored PGP keys" +msgstr "Apsaugoti PGP raktai" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +#| msgid "PGP key" +msgid "PGP keys" +msgstr "PGP raktai" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP raktas" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Naudojamas laiškų bei failų šifravimui ir pasirašymui" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Nepavyko sukurti PGP rakto" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Naujojo PGP rakto slaptažodis" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Dukart įveskite naujojo rakto slaptažodį." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Kuriant raktą reikia sugeneruoti daug atsitiktinių\n" +"duomenų ir mums reikia jūsų pagalbos. Labai\n" +"padėtų, jei atliktumėte kitų veiksmų, pvz. spausdintumėt\n" +"klaviatūra, judintumėt pelę, naudotumėtės programomis.\n" +"Tai suteikia sistemai reikiamų atsitiktinių duomenų." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Kuriamas raktas" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Ar tikrai norite negrįžtamai pašalinti %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +#| msgid "Are you sure you want to permanently delete %d keys?" +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Ar tikrai norite negrįžtamai pašalinti %d raktą?" +msgstr[1] "Ar tikrai norite negrįžtamai pašalinti %d raktus?" +msgstr[2] "Ar tikrai norite negrįžtamai pašalinti %d raktų?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Neteisingas slaptažodis" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Tris kartus įvedėte neteisingą slaptažodį. Bandykite dar kartą." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Neteisingas slaptažodis." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Įveskite naują rakto „%s“ slaptažodį" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Įveskite rakto „%s“ slaptažodį" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Įveskite naują slaptažodį" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Įveskite slaptažodį" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Slaptažodis" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Įkeltas %d raktas" +msgstr[1] "Įkelti %d raktai" +msgstr[2] "Įkelta %d raktų" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." +msgstr "Netinkami rakto duomenys (trūksta UID). To priežastis gali būti kompiuteris, kuriame data nustatyta ateityje, arba trūkstamas auto-parašas." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +#| msgid "GnuPG keyring" +msgid "GnuPG keys" +msgstr "GnuPG raktai" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: numatytasis raktinės aplankas" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -986,28 +1156,33 @@ msgid "All JPEG files" msgstr "Visi JPEG failai" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 +#: ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Visi failai" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Pasirinkite nuotrauką pridėti prie rakto" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Nepavyko paruošti nuotraukos" -#: ../pgp/seahorse-gpgme-photos.c:288 -#: ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 +#: ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Nepavyko pridėti nuotraukos" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Failo nepavyko įkelti. Galbūt formatas yra netinkamas" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Ar tikrai norite pašalinti šią nuotrauką iš rakto?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Nepavyko pašalinti nuotraukos" @@ -1061,7 +1236,12 @@ msgid "Couldn't add revoker" msgstr "Nepavyko paskelbti negaliojančiu" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 +#: ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Aš suprantu, kad šis slaptas raktas bus negrįžtamai ištrintas." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1076,565 +1256,614 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 -#: ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 +#: ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nėra pasirašymui tinkamų raktų" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "You have no personal PGP keys that can be used to indicate your trust of this key." msgstr "Jūs neturite asmeninių PGP raktų, kuriuos galėtume panaudoti nustatant jūsų pasitikėjimą šiuo raktu." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Neteisingas slaptažodis." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Įveskite naują rakto „%s“ slaptažodį" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "Paieška buvo labai nekonkreti. Serveris '%s' rado per daug raktų." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Įveskite rakto „%s“ slaptažodį" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Nepavyko susisiekti su serveriu '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Įveskite naują slaptažodį" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP Raktų serveris" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Įveskite slaptažodį" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Nepavyko importuoti raktų" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importuojami raktai iš raktų serverių" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 +#: ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Darbas tinkle" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Uždaryti šį langą" + +#: ../pgp/seahorse-keyserver-results.c:250 +#: ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Ieškoti raktų internete..." + +#: ../pgp/seahorse-keyserver-results.c:251 +#: ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Ieškoti raktų raktų serveryje" + +#: ../pgp/seahorse-keyserver-results.c:255 +#: ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importuoti" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Pasirinktus raktus importuoti į vietinę raktinę" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Raktai internete" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Įkeltas %d raktas" -msgstr[1] "Įkelti %d raktai" -msgstr[2] "Įkelta %d raktų" +msgid "Remote Keys Containing '%s'" +msgstr "Raktai internete, turintys „%s“" -#: ../pgp/seahorse-gpgme-source.c:649 -msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." -msgstr "Netinkami rakto duomenys (trūksta UID). To priežastis gali būti kompiuteris, kuriame data nustatyta ateityje, arba trūkstamas auto-parašas." +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Raktų paieška nepavyko." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Ieškoti raktų internete" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP Raktų serveris" +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." +msgstr "Kitų asmenų raktus galite rasti internete. Paskui galėsite pasirinkti, kuriuos iš rastų raktų norėsite importuoti į Jūsų vietinę raktinę." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Ieškoti raktų, turinčių:" + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Raktų serveriai:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Paviešinti raktai vietiniame tinkle:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Kur ieškoti:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Ieškoti" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Nepavyko nusiųsti raktų į serverį" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Paieška buvo labai nekonkreti. Serveris '%s' rado per daug raktų." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Nepavyko gauti raktų iš serverio: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Nepavyko susisiekti su serveriu '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d raktas pasirinktas sinchronizavimui" +msgstr[1] "%d raktai pasirinkti sinchronizavimui" +msgstr[2] "%d raktų pasirinkta sinchronizavimui" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Sinchronizuojami raktai..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sinchronizuoti raktus" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." +msgstr "Jūsų raktinėje esančių raktų viešosios dalys bus nusiųstos į viešą raktų serverį, kad tuos raktus galėtų naudoti kiti. Taipogi gausite raktų atnaujinimus, kuriuos kiti žmonės padarė po paskutinio raktų gavimo." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." +msgstr "Bus parsiųsti raktų atnaujinimai, kuriuos kiti žmonės padarė po paskutinio raktų gavimo. Nebuvo nurodytas joks raktų serveris nusiuntimui, taigi Jūsų sukurti nauji raktai bei raktų pakeitimai nebus prieinami kitiems." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Raktų serveriai" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sinchronizuoti" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Nepavyko susisiekti su '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Jungiamasi prie: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Nepavyko rasti adreso: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Ieškoma serverio adreso: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP Raktų serveris" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Pasirašyti raktą..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Pasirašyti viešą raktą" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Ar tikrai norite negrįžtamai pašalinti %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Ar tikrai norite negrįžtamai pašalinti %d raktų ir tapatybių?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Ar tikrai norite negrįžtamai pašalinti %d raktų?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Ar tikrai norite negrįžtamai pašalinti %d tapatybių?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "Sinchronizuoti bei nusiųsti _raktus..." -#: ../pgp/seahorse-pgp-commands.c:201 -#: ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Nepavyko pašalinti naudotojo ID" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Nusiųsti ir/arba sinchronizuoti turimus raktus su internetiniais." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Nepavyko pašalinti privataus rakto" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Nepavyko pašalinti viešojo rakto" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP raktai" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP raktai, skirti laiškų bei failų šifravimui" #: ../pgp/seahorse-pgp-generate.xml.h:1 -#: ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Papildomos rakto parinktys" +msgid "C_reate" +msgstr "_Sukurti" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "PGP raktas leidžia šifruoti el. laiškus ar failus kitiems žmonėms. " +msgid "Generate a new key" +msgstr "Sukurti naują raktą" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmai čia" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "PGP raktas leidžia šifruoti el. laiškus ar failus kitiems žmonėms. " -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Sukurti" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Komentaras:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Galiojimo pabaigos data:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Niekada nesibaigia" -#: ../pgp/seahorse-pgp-generate.xml.h:6 -#: ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 +#: ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Šifravimo _tipas:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Sukurti naują raktą" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 -#: ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Rakto _stiprumas (bitais):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Niekada nesibaigia" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Naujas PGP raktas" +msgid "E_xpiration Date:" +msgstr "_Galiojimo pabaigos data:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Komentaras:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Papildomos rakto parinktys" -#: ../pgp/seahorse-pgp-key.c:572 -#: ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Nebegaliojantis" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Asmeninis PGP raktas" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP raktas" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Nepavyko pakeisti pirminio vartotojo ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Ar tikrai norite negrįžtamai pašalinti „%s“ naudotojo ID?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Nepavyko pašalinti naudotojo ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Nežinomas]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Vardas/el. paštas" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Parašo ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Nepavyko pakeisti pirminės nuotraukos" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(nežinomas)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Šio rakto galiojimo laikas baigėsi: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Vardas" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Ar tikrai norite negrįžtamai pašalinti antrinį raktą %d, priklausantį %s ?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Nepavyko pašalinti antrinio rakto" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Nepavyko pakeisti pasitikėjimo reikšmės" -#: ../pgp/seahorse-pgp-key-properties.c:1142 -#: ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Nepavyko eksportuoti rakto į „%s“" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Eksportuoti visą raktą" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Nepavyko eksportuoti rakto." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +#| msgid "Couldn't export keys" +msgid "Couldn't export key" +msgstr "Nepavyko eksportuoti rakto" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Niekada" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipas" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Sukurtas" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Galiojimas baigiasi" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Būsena" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Stiprumas" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Nebegaliojantis" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Geras" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Rakto ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Veiksmai" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Komentaras:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datos" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "El. paštas:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Atspaudas" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Rakto ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Niekada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Raktų vardai ir parašai" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Šis raktas paskelbtas negaliojančiu" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Nuotrauka " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Rakto savininkas raktą paskelbė negaliojančiu. Jis nebegali būti naudojamas." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Techninės detalės" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Šio rakto galiojimas baigėsi" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Šis raktas paskelbtas negaliojančiu" +msgid "Add a photo to this key" +msgstr "Prie šio rakto pridėti nuotrauką" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Šio rakto galiojimas baigėsi" +msgid "Remove this photo from this key" +msgstr "Pašalinti šią nuotrauką iš rakto" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipas:" +msgid "Make this photo the primary photo" +msgstr "Šią nuotrauką padaryti pirmine" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Naudojimas:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Eiti prie ankstesnės nuotraukos" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Antriniai raktai" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Eiti prie kitos nuotraukos" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Pridėti" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Nuotrauka " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Prie šio rakto pridėti nuotrauką" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Rakto ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Pakeisti _slaptažodį" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Vardas:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Iššifruoti failus ir Jums atsiųstus el. laiškus." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "El. paštas:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Pašalinti " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Komentaras:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Galiojimas baigsis" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Naudojimas:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Galiojimas baigiasi: " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipas:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Eksportuoti" +msgid "Decrypt files and email sent to you." +msgstr "Iššifruoti failus ir Jums atsiųstus el. laiškus." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Privatus PGP raktas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Eiti prie kitos nuotraukos" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Pakeisti _slaptažodį" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Eiti prie ankstesnės nuotraukos" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Savininkas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Rakto ID:" +msgid "Key Names and Signatures" +msgstr "Raktų vardai ir parašai" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Pirminis" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Šią nuotrauką padaryti pirmine" +msgid "Sign" +msgstr "Pasirašyti" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Vardai ir parašai" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Pašalinti " +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Niekada" +msgid "_Add Name" +msgstr "_Pridėti vardą" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Nustatyti pasitikėjimą savo raktu:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Savininkas" +msgid "Revoke" +msgstr "Paskelbti negaliojančiu" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Pirminis" +msgid "Names and Signatures" +msgstr "Vardai ir parašai" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Privatus PGP raktas" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Rakto ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Pašalinti šią nuotrauką iš rakto" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Paskelbti negaliojančiu" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Stiprumas:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Pasirašyti" +msgid "Technical Details" +msgstr "Techninės detalės" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Stiprumas:" +msgid "Fingerprint" +msgstr "Atspaudas" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Rakto savininkas raktą paskelbė negaliojančiu. Jis nebegali būti naudojamas." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Galiojimas baigiasi: " -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Pridėti vardą" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datos" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Nustatyti pasitikėjimą savo raktu:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Eksportuoti visą raktą:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Vardas:" +msgid "Actions" +msgstr "Veiksmai" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datos:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Pridėti" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Galiojimas baigsis" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Antriniai raktai" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Dalinai" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Atspaudas:" +msgid "Fully" +msgstr "Pilnai" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Nurodykite pasitikėjimą:" +msgid "Ultimately" +msgstr "Visiškai" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Jūsų pasitikėjimas šiuo raktu" +#| msgid "Encrypt files and email to the key's owner " +msgid "Encrypt files and email to the key's owner" +msgstr "Šifruoti failus ir siųsti el. paštu rakto savininkui" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Viešas PGP raktas" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Kiti vardai:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "Ž_monės pasirašę šį raktą:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Šifruoti failams ir el. laiškams rakto savininkui" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Jūsų pasitikėjimas šiuo raktu" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Pilnai" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Pasitikėjimas yra nustatytas kortelėje Detalės." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Aš pasitikiu asmens „%s“ parašais kituose raktuose" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "If you believe that the person that owns this key is '%s', sign this key:" msgstr "Jei tikite, kad šio rakto savininkas yra „%s“, pasirašykite šį raktą:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "Pasirašyti šį _raktą" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "Jei nebetikite, kad šis raktas priklauso „%s“, savo parašą paskelbkite negaliojančiu:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Dalinai" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Viešas PGP raktas" +msgid "_Revoke Signature" +msgstr "_Parašą paskelbti negaliojančiu" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "Ž_monės pasirašę šį raktą:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Pateikti _tik žmonių, kuriais pasitikiu, parašus" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Pasitikėjimas" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Visiškai" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Jūsų pasi_tikėjimas savininku:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Pasitikėjimas yra nustatytas kortelėje Detalės." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Atspaudas:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Pateikti _tik žmonių, kuriais pasitikiu, parašus" +msgid "Dates:" +msgstr "Datos:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Parašą paskelbti negaliojančiu" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Nurodykite pasitikėjimą:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "Pasirašyti šį _raktą" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Jūsų pasi_tikėjimas savininku:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1642,2068 +1871,724 @@ msgstr "Antrinis raktas %d priklausąs %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Neprivalomas rakto paskelbimo negaliojančiu aprašymas" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Paskelbti _negaliojančiu" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Rakto paskelbimo negaliojančiu priežastis" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Priežastis:" -#: ../pgp/seahorse-signer.c:62 -msgid "You have no personal PGP keys that can be used to sign a document or message." -msgstr "Jūs neturite asmeninių PGP raktų, kuriais galima pasirašyti dokumentą ar žinutę. " - -#: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Kaip atidžiai Jūs tikrinote šį raktą?" - -#: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Kaip kiti matys šį parašą:" - -#: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Pasirašyti raktą kaip:" - -#: ../pgp/seahorse-sign.xml.h:4 -msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. " -msgstr "Nerūpestingai: reiškia, jog atsakingai nepatikrinote, kad raktas priklauso čia minimam asmeniui. Pavyzdžiui, jei rakto atspaudas Jums buvo pasakytas telefonu." - -#: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Rakto vardas" - -#: ../pgp/seahorse-sign.xml.h:6 -msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." -msgstr "Netikrinau: reiškia, jog tikite, kad raktas priklauso čia minimam asmeniui, tačiau negalite patikrinti arba netikrinote, kad tikrai taip yra." - -#: ../pgp/seahorse-sign.xml.h:7 -msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." -msgstr "Labai atidžiai: Pasirinkite tik tada, jei esate visiškai tikri, kad raktas yra nesuklastotas." - -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Pasirašydami Jūs parodote savo pasitikėjimą, kad šis raktas priklauso:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Aš pasilieku teisę šį parašą paskelbti ne_galiojančiu." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Pasirašyti raktą" - -#: ../pgp/seahorse-sign.xml.h:11 -msgid "You could use a hard to forge photo identification (such as a passport) to personally check that the name on the key is correct. You should have also used email to check that the email address belongs to the owner." -msgstr "Rakto savininko tapatybei patvirtinti, reiktų naudotis sunkiai suklastojamu asmens tapatybę įrodančiu dokumentu su nuotrauka (pvz. pasu). El. pašto adreso patikrinimui, reiktų nurodytu adresu parašyti šiuo raktu užšifruotą laišką ir iššifruotą gauti atgal." - -#: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Nerūpestingai" - -#: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "Ne_tikrinau" - -#: ../pgp/seahorse-sign.xml.h:14 -msgid "_Others may not see this signature" -msgstr "_Kiti negalės šio parašo matyti" - -#: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Pasirašyti" - -#: ../pgp/seahorse-sign.xml.h:16 -msgid "_Signer:" -msgstr "_Pasirašantysis:" - -#: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Labai atidžiai" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Pasirašyti žinutę su raktu:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Sertifikatas" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Nepavyko pašalinti" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Ar tikrai norite pašalinti sertifikatą „%s“" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Ar tikrai norite pašalinti %d sertifikatą?" -msgstr[1] "Ar tikrai norite pašalinti %d sertifikatus?" -msgstr[2] "Ar tikrai norite pašalinti %d sertifikatų?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Šalinama" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Pakeisti slaptažodį" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Patvirtinkite slaptažodį:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Patvirtinkite naująjį slaptažodį" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Naujas slaptažodis:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Tvarkyti Jūsų slaptažodžius ir šifravimo raktus" - -#: ../src/seahorse.desktop.in.in.h:2 -#: ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 -#: ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Slaptažodžiai ir raktai" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "Pa_sirinkite kuriamo elemento tipą:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Tęsti" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Sukurti naują..." - -#: ../src/seahorse-key-manager.c:251 -#: ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Pasirinktas %d raktas" -msgstr[1] "Pasirinkti %d raktai" -msgstr[2] "Pasirinkta %d raktų" - -#: ../src/seahorse-key-manager.c:431 -#: ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 -#: ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Nepavyko importuoti raktų" - -#: ../src/seahorse-key-manager.c:433 -#: ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importuoti raktai" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importuojami raktai" - -#: ../src/seahorse-key-manager.c:504 -#: ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importuoti raktą" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Neatpažįstamas rakto tipas, ar netinkamas duomenų formatas" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importuojami raktai" - -#: ../src/seahorse-key-manager.c:737 -#: ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Darbas tinkle" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Užverti šią programą" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Naujas..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Sukurti naują raktą ar elementą" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "I_mportuoti..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importuoti iš failo" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importuoti iš iškarpinės" - -#: ../src/seahorse-key-manager.c:750 -#: ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Ieškoti raktų internete..." - -#: ../src/seahorse-key-manager.c:751 -#: ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Ieškoti raktų raktų serveryje" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "Sinchronizuoti bei nusiųsti _raktus..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Nusiųsti ir/arba sinchronizuoti turimus raktus su internetiniais." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Tipas" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Rodyti stulpelį „Tipas“" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "Galiojimo _laikas" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Rodyti stulpelį „Galioja iki“" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Pasitikėjimas" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Rodyti stulpelį „Pasitikėjimas savininku“" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Galiojimas" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Rodyti galiojimo stulpelį" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtras" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Pirmojo karto parinktys:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Susikurkite naują raktą sau:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importuoti egzistuojančius raktus iš failo:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Mano _asmeniniai raktai" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Kiti _raktai" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Norint pradėti šifravimą Jums reikės raktų." - -#: ../src/seahorse-key-manager.xml.h:7 -#: ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importuoti" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Slaptažodžiai" - -#: ../src/seahorse-key-manager-store.c:610 -#: ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Nepavyko eksportuoti raktų" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Galiojimas" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Galioja iki" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Uždaryti šį langą" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Išskleisti viską" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Išskleisti visus įrašus" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Suskleisti viską" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Suskleisti visus įrašus" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Raktai internete" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Raktai internete, turintys „%s“" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Raktų serveriai:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Paviešinti raktai vietiniame tinkle:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Ieškoti raktų internete" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." -msgstr "Kitų asmenų raktus galite rasti internete. Paskui galėsite pasirinkti, kuriuos iš rastų raktų norėsite importuoti į Jūsų vietinę raktinę." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Kur ieškoti:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Ieškoti" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Ieškoti raktų, turinčių:" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Nepavyko nusiųsti raktų į serverį" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Nepavyko gauti raktų iš serverio: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d raktas pasirinktas sinchronizavimui" -msgstr[1] "%d raktai pasirinkti sinchronizavimui" -msgstr[2] "%d raktų pasirinkta sinchronizavimui" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Sinchronizuojami raktai..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sinchronizuoti raktus" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." -msgstr "Jūsų raktinėje esančių raktų viešosios dalys bus nusiųstos į viešą raktų serverį, kad tuos raktus galėtų naudoti kiti. Taipogi gausite raktų atnaujinimus, kuriuos kiti žmonės padarė po paskutinio raktų gavimo." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." -msgstr "Bus parsiųsti raktų atnaujinimai, kuriuos kiti žmonės padarė po paskutinio raktų gavimo. Nebuvo nurodytas joks raktų serveris nusiuntimui, taigi Jūsų sukurti nauji raktai bei raktų pakeitimai nebus prieinami kitiems." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Raktų serveriai" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sinchronizuoti" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Šios programos versija" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Padėkos:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Mantas Kriaučiūnas \n" -"Eglė Girinaitė \n" -"Vytautas Liuolia \n" -"Rimas Kudelis " - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse projekto tinklalapis" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Failas" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Keisti" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "R_odyti" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Pagalba" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Nustatymai" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Keisti šios programos nustatymus" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Apie šią programą" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Turinys" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Rodyti Seahorse pagalbą" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Eksportuoti viešą raktą" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Eksportuojami raktai" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Nepavyko gauti informacijos iš raktų serverio" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Nukopijuoti raktai" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Gaunami raktai" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s yra privatusis raktas. Ar tikrai norite tęsti?" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importuojami raktai iš raktų serverių" - -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Rodyti savybes" - -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "Pa_šalinti" - -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Pašalinti pažymėtus elementus" - -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_ksportuoti..." - -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Eksportuoti į failą" - -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopijuoti į iškarpinę" - -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Pasirinktus raktus importuoti į vietinę raktinę" - -#: ../ssh/seahorse-ssh-askpass.c:60 -#: ../ssh/seahorse-ssh-askpass.c:68 -msgid "Enter your Secure Shell passphrase:" -msgstr "Saugaus prisijungimo (SSH) slaptažodis:" - -#: ../ssh/seahorse-ssh-askpass.c:82 -msgid "Old Key Passphrase" -msgstr "Senasis rakto slaptažodis" - -#: ../ssh/seahorse-ssh-askpass.c:83 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "Įveskite senąjį rakto „%s“ slaptažodį:" - -#: ../ssh/seahorse-ssh-askpass.c:87 -#: ../ssh/seahorse-ssh-askpass.c:92 -msgid "New Key Passphrase" -msgstr "Naujasis rakto slaptažodis" - -#: ../ssh/seahorse-ssh-askpass.c:88 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "Įveskite naująjį rakto „%s“ slaptažodį:" - -#: ../ssh/seahorse-ssh-askpass.c:93 -#, c-format -#| msgid "Enter the new passphrase for: %s" -msgid "Enter the new passphrase again: %s" -msgstr "Dar kartą įveskite naująjį slaptažodį: %s" - -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Konfigūruoti saugaus prisijungimo (SSH) raktą..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "Send public Secure Shell key to another machine, and enable logins using that key." -msgstr "Nusiųsti viešą saugaus prisijungimo (SSH) raktą į kitą kompiuterį bei įjungti galimybę prisijungti, naudojant šitą raktą." - -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Ar tikrai norite pašalinti ssh raktą „%s“?" - -#: ../ssh/seahorse-ssh-commands.c:121 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Ar tikrai norite pašalinti %d ssh raktų?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Nepavyko pašalinti rakto" - -#: ../ssh/seahorse-ssh-generate.c:60 -#: ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 -#: ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "Saugaus prisijungimo (SSH) raktas" - -#: ../ssh/seahorse-ssh-generate.c:61 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "Naudojamas prisijungti prie kitų kompiuterių (pvz.: per terminalą)" - -#: ../ssh/seahorse-ssh-generate.c:115 -#: ../ssh/seahorse-ssh-generate.c:131 -msgid "Couldn't generate Secure Shell key" -msgstr "Nepavyko sukurti saugaus prisijungimo (SSH) rakto" - -#: ../ssh/seahorse-ssh-generate.c:197 -msgid "Creating Secure Shell Key" -msgstr "Kuriamas saugaus prisijungimo (SSH) raktas" - -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "Use your email address, and any other reminder you need about what this key is for." -msgstr "Naudokite savo el. pašto adresą ar kitokias užuominas šio rakto paskirties priminimui." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "A Secure Shell (SSH) key lets you connect securely to trusted computers using SSH, without entering a different password for each of them." -msgstr "Saugaus prisijungimo (SSH) raktas skirtas saugiai prisijungti prie patikimų kompiuterių SSH protokolu, nenaudojant skirtingų slaptažodžių kiekvienam kompiuteriui." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "If there is already a computer you want to use this key with, you can set up that computer to recognize your key now. " -msgstr "Jei turite kompiuterį, prie kurio jungsitės naudodami šį raktą, dabar galite nustatyti, kad šis kompiuteris atpažintų Jūsų raktą." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Naujas saugaus prisijungimo (SSH) raktas" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Sukurti ir nustatyti" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Tik sukurti raktą" - -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Rakto aprašymas:" - -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(Nenuskaitomas saugaus prisijungimo (SSH) raktas)" - -#: ../ssh/seahorse-ssh-key-properties.c:79 -msgid "Couldn't rename key." -msgstr "Nepavyko pervadinti rakto." - -#: ../ssh/seahorse-ssh-key-properties.c:132 -msgid "Couldn't change authorization for key." -msgstr "Nepavyko pakeisti leidimų šiam raktui." - -#: ../ssh/seahorse-ssh-key-properties.c:167 -msgid "Couldn't change passphrase for key." -msgstr "Nepavyko pakeisti leidimų šiam raktui." - -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmas:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "Identifikatorius:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Vieta:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "Vardas:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Stiprumas:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "Pasitikėjimas" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Galioja tiktai '%s' naudotojui." - -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_Eksportuoti visą raktą" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Šio rakto savininkui _leidžiama prisijungti prie šio kompiuterio" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Naudotas prisijungti prie kitų kompiuterių." - -#: ../ssh/seahorse-ssh-operation.c:198 -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH komanda (programa) netikėtai baigė darbą." - -#: ../ssh/seahorse-ssh-operation.c:208 -msgid "The SSH command failed." -msgstr "SSH komanda nepavyko." - -#: ../ssh/seahorse-ssh-operation.c:518 -msgid "Remote Host Password" -msgstr "Nuotolinio kompiuterio slaptažodis" - -#: ../ssh/seahorse-ssh-operation.c:634 -msgid "Enter Key Passphrase" -msgstr "Įveskite rakto slaptažodį" - -#: ../ssh/seahorse-ssh-operation.c:724 -msgid "Passphrase for New Secure Shell Key" -msgstr "Naujojo saugaus prisijungimo (SSH) rakto slaptažodis" - -#: ../ssh/seahorse-ssh-operation.c:908 -#, c-format -msgid "Importing key: %s" -msgstr "Importuojamas raktas: %s" - -#: ../ssh/seahorse-ssh-operation.c:910 -msgid "Importing key. Enter passphrase" -msgstr "Importuojamas raktas. Įveskite slaptažodį" - -#: ../ssh/seahorse-ssh-source.c:951 -msgid "No private key file is available for this key." -msgstr "Šiam raktui nėra privataus rakto failo." - -#: ../ssh/seahorse-ssh-upload.c:50 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "Nepavyko sukonfigūruoti saugaus prisijungimo (SSH) raktų nutolusiame kompiuteryje." - -#: ../ssh/seahorse-ssh-upload.c:133 -msgid "Configuring Secure Shell Keys..." -msgstr "Konfigūruojami saugaus prisijungimo (SSH) raktai..." - -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "pvz.: linux.openoffice.lt:prievadas" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "Nustatyti kitą kompiuterį saugiam (SSH) prisijungimui" - -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." -msgstr "Norėdami naudoti saugaus prisijungimo (SSH) raktą jungimuisi prie kito kompiuterio, privalote turėti paskyrą šiame kompiuteryje." - -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "_Kompiuterio vardas:" - -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "_Prisijungimo vardas:" - -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "_Nustatyti" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Secure Shell key" -#~ msgstr "Saugaus prisijungimo (SSH) raktas" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "Įveskite naujojo saugaus prisijungimo (SSH) rakto slaptažodį." - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "Nevykdyti seahorse-daemon kaip tarnybos" - -#~ msgid "couldn't fork process" -#~ msgstr "nepavyko atšakoti proceso" - -#~ msgid "couldn't create new process group" -#~ msgstr "nepavyko sukurti naujos proceso grupės" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "Šifravimo tarnyba (Seahorse)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "Netinkamas arba neatpažintas rakto tipas: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "Šis rakto tipas nepalaikomas: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "Šios funkcijos palaikymas kompiliavimo metu buvo neįjungtas" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "Netinkamas arba neatpažintas raktas: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "Pasirašė , galiojimas baigėsi: %s." - -#~ msgid "Invalid Signature" -#~ msgstr "Netinkamas parašas" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "" -#~ "Pasirašė , pasirašymo data: %s, baigėsi " -#~ "galiojimas." - -#~ msgid "Expired Signature" -#~ msgstr "Nebegaliojantis parašas" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "Pasirašė , paskelbta negaliojančiu: %s." - -#~ msgid "Revoked Signature" -#~ msgstr "Parašas paskelbtas negaliojančiu" - -#~ msgid "Signed by on %s." -#~ msgstr "Pasirašė , pasirašymo data: %s." - -#~ msgid "Good Signature" -#~ msgstr "Parašas geras" - -#~ msgid "Signing key not in keyring." -#~ msgstr "Pasirašymo rakto nėra raktinėje." - -#~ msgid "Unknown Signature" -#~ msgstr "Nežinomas parašas" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "Blogas arba padirbtas parašas. Pasirašymo data buvo pakeista." - -#~ msgid "Bad Signature" -#~ msgstr "Blogas parašas" - -#~ msgid "Couldn't verify signature." -#~ msgstr "Parašo nepavyko patikrinti." - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "Netinkamas arba neatpažintas pasirašantysis: %s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "Raktas nėra tinkamas pasirašymui: %s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "Netinkamas arba neatpažintas gavėjas: %s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "Raktas nėra tinkamas gavėjas šifravimui: %s" - -#~ msgid "No recipients specified" -#~ msgstr "Nenurodytas joks gavėjas" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "Netinkamas rakto tipas iššifravimui: %s" - -#~ msgid "Please set clearuri" -#~ msgstr "Nustatykite clearuri" - -#~ msgid "Please set crypturi" -#~ msgstr "Nustatykite crypturi" - -#~ msgid "Error opening clearuri" -#~ msgstr "Klaida atveriant clearuri" - -#~ msgid "No signer specified" -#~ msgstr "Pasirašantysis nenurodyas" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "Netinkamas rakti tipas tikrinimui: %s" - -#~ msgid "Invalid key id: %s" -#~ msgstr "Netinkamas rakto id: %s" - -#~ msgid "Couldn't share keys" -#~ msgstr "Nepavyko paviešinti raktų" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "Nepavyko paskelbti viešinimo informacijos tinkle." - -#~ msgid "%s's encryption keys" -#~ msgstr "Asmens „%s“ šifravimo raktai" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "Raktų serverių adresų (URI) sąrašas, PGP raktų paieškai internete. " -#~ "Vėlesnėse versijose rodomas vardas gali būti įtrauktas, padedant tarpą ir " -#~ "tada vardą." - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "Automatiškai parsiųsti raktus" - -#~ msgid "Auto Sync Keys" -#~ msgstr "Automatiškai sinchronizuoti raktus" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "Keičia stulpelio „Galioja iki“ rodymą raktų tvarkymo programoje." - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "Keičia stulpelio „Pasitikėjimas“ rodymą raktų tvarkymo programoje." - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "Keičia stulpelio „Tipas“ rodymą raktų tvarkymo programoje." - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "Keičia stulpelio „Galiojimas“ rodymą raktų tvarkymo programoje." - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "Įjungti viešinimą DNS-SD protokolu" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "Įjungia raktų viešinimą DNS-SD (Apple Bonjour) protokolu: seahorse-daemon " -#~ "turi būti paleistas bei turi būti sukompiliuotas su HKP bei DNS-SD " -#~ "palaikymu." - -#~ msgid "ID of the default key" -#~ msgstr "Numatyto rakto ID" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "" -#~ "Jei „tiesa“, failai užšifruoti su seahorse bus koduoti ASCII apvalkale." - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "" -#~ "Jei nustatyta (teigiama reikšmė) - tuomet numatytasis raktas visada bus " -#~ "įdėtas į šifravimo gavėjų (raktų, kurie galės iššifruoti) sąrašą." - -#~ msgid "Last key server search pattern" -#~ msgstr "Paskutinis raktų serveriuose vykdytos paieškos šablonas" - -#~ msgid "Last key servers used" -#~ msgstr "Paskutiniai naudoti raktų serveriai" - -#~ msgid "Last key used to sign a message." -#~ msgstr "Paskutinis raktas, naudotas žinutės pasirašymui." - -#~ msgid "PGP Key servers" -#~ msgstr "PGP raktų serveriai" - -#~ msgid "Publish keys to this key server." -#~ msgstr "Nusiųsti raktus į šį raktų serverį." - -#~ msgid "Show expires column in key manager" -#~ msgstr "Rodyti stulpelį „galioja iki“ raktų tvarkymo programoje" - -#~ msgid "Show trust column in key manager" -#~ msgstr "Rodyti stulpelį „Pasitikėjimas“ raktų tvarkymo programoje" - -#~ msgid "Show type column in key manager" -#~ msgstr "Rodyti stulpelį „tipas“ raktų tvarkymo programoje" - -#~ msgid "Show validity column in key manager" -#~ msgstr "Rodyti stulpelį „galiojimas“ raktų tvarkymo programoje" - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "Nurodykite stulpelį, pagal kurį rikiuoti gavėjų langą. Stulpeliai šie: " -#~ "„name“ ir „id“. Įrašykite „-“ prieš stulpelio vardą, jei norite rikiuoti " -#~ "mažėjančia tvarka." - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "Nurodykite stulpelį, pagal kurį rikiuoti gavėjų langą. Stulpeliai šie: " -#~ "„name“, „id“, „validity“, „expires“, „trust“ ir „type“. Įrašykite „-“ " -#~ "prieš stulpelio vardą, jei norite rikiuoti mažėjančia tvarka." - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "" -#~ "Paskutinio slaptojo rakto, naudoto pasirašant žinutę, identifikatorius " -#~ "(ID)." - -#~ msgid "The column to sort the recipients by" -#~ msgstr "Stulpelis, pagal kurį rikiuoti gavėjus" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "Stulpelis, pagal kurį rikiuoti seahorse raktus" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "" -#~ "Raktų serveris, naudojamas PGP raktų nusiuntimui arba tuščia, jei norite " -#~ "uždrausti PGP raktų publikavimą." - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "" -#~ "Paskutinis raktų serveris, kuriam vykdyta užklausa, arba tuščia visiems " -#~ "serveriams." - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "" -#~ "Paskutinis paieškos šablonas, pagal kurį buvo ieškota raktų serveriuose." - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "" -#~ "Čia nurodomas standartinis raktas, naudojamas kai kuriems veiksmams, " -#~ "pagrinde pasirašymui." - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "Ar raktai turėtų būti automatiškai parsiunčiami iš raktų serverių." - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "" -#~ "Ar pakeisti raktai turėtų būti automatiškai susinchronizuojami su " -#~ "standartiniu raktų serveriu." - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "Ar visada šifruojant naudoti ir numatytąjį raktą" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "Ar naudoti ASCII apvalkalą" - -#~ msgid "Web Password" -#~ msgstr "Žiniatinklio slaptažodis" - -#~ msgid "Network Password" -#~ msgstr "Tinklo slaptažodis" - -#~ msgid "Couldn't set application access." -#~ msgstr "Nepavyko pakeisti programos priėjimo teisių." - -#~ msgid "Path:" -#~ msgstr "Kelias:" - -#~ msgid "Permissions:" -#~ msgstr "Leidimai:" - -#~ msgid "Applications" -#~ msgstr "Programos" - -#~ msgid "_Delete" -#~ msgstr "Pa_šalinti" - -#~ msgid "_Read" -#~ msgstr "_Skaityti" - -#~ msgid "_Write" -#~ msgstr "_Rašyti" - -#~ msgid "Saving item..." -#~ msgstr "Saugomas elementas..." - -#~ msgid "Listing password keyrings" -#~ msgstr "Išvardijamos slaptažodžių raktinės" - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "Nerasta šifravimo raktų, reikalingų atlikti Jūsų norimai operacijai. " -#~ "Dabar bus paleista programa „Slaptažodžiai ir šifravimo raktai“ – " -#~ "joje galėsite sukurti arba importuoti raktą." - -#~ msgid "All Keys" -#~ msgstr "Visi raktai" - -#~ msgid "Selected Recipients" -#~ msgstr "Pasirinkti gavėjai" - -#~ msgid "Search Results" -#~ msgstr "Paieškos rezultatai" - -#~ msgid "Search _for:" -#~ msgstr "_Ieškoti:" - -#~ msgid "None (Don't Sign)" -#~ msgstr "Nepasirašyti" - -#~ msgid "Sign this message as %s" -#~ msgstr "Pasirašyti informacinę žinutę kaip %s" - -#~ msgid "_Sign message as:" -#~ msgstr "_Pasirašyti informacinę žinutę kaip:" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Šis failas nėra taisyklingas .desktop failas" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Neatpažinta darbastalio failo versija „%s“" - -#~ msgid "Starting %s" -#~ msgstr "Paleidžiama %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Programa nepriima dokumentų komandų eilutėje" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Neatpažintas paleidimo parametras: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "Negalima perduoti dokumento URI „Type=Link“ darbastalio elementui" - -#~ msgid "Not a launchable item" -#~ msgstr "Nepaleidžiamas elementas" - -#~ msgid "Disable connection to session manager" -#~ msgstr "Atjungti nuo seanso valdyklės" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Nurodyti failą su įrašytais nustatymais" - -#~ msgid "FILE" -#~ msgstr "FAILAS" - -#~ msgid "Specify session management ID" -#~ msgstr "Nurodykite seanso valdymo ID" - -#~ msgid "Session management options:" -#~ msgstr "Seanso valdymo parinktys:" - -#~ msgid "Show session management options" -#~ msgstr "Rodyti seanso valdymo parinktis" - -#~ msgid "Key Imported" - -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "Raktas importuotas" -#~ msgstr[1] "Raktai importuoti" -#~ msgstr[2] "Raktų importuota" - -#~ msgid "Imported %i key" - -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "Importuotas %i raktas" -#~ msgstr[1] "Importuoti %i raktai" -#~ msgstr[2] "Importuota %i raktų" - -#~ msgid "Imported a key for" - -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "Importuotas raktas" -#~ msgstr[1] "Importuoti raktai" -#~ msgstr[2] "Importuota raktų" - -#~ msgid "Notification Messages" -#~ msgstr "Informaciniai pranešimai" - -#~ msgid "Symmetric Key" -#~ msgstr "Simetrinis raktas" - -#~ msgid "Public Key" -#~ msgstr "Viešasis raktas" - -#~ msgid "Private Key" -#~ msgstr "Privatusis raktas" - -#~ msgid "Credentials" -#~ msgstr "Kredencialai" - -#~ msgid "Identity" -#~ msgstr "Tapatybė" - -#~ msgid "Key Sharing" -#~ msgstr "Raktų viešinimas" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "Jei įjungsite raktų viešinimą - žmonės iš Jūsų vietinio tinklo galės " -#~ "iškart naudotis Jūsų sukauptais raktais. Jie galės šifruoti Jums ir Jūsų " -#~ "pažįstamiems skirtą informaciją (Jums nereikės siuntinėti savo raktų " -#~ "vietinio tinklo nariams).\n" -#~ "\n" -#~ "Pastaba: Jūsų asmeniniai (privatūs) raktai liks saugūs." - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "_Viešinti sukauptus raktus vietiniame tinkle" - -#~ msgid "Progress Title" -#~ msgstr "Eigos antraštė" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "Nepavyko paleisti file-roller" - -#~ msgid "Couldn't package files" -#~ msgstr "Nepavyko supakuoti failų" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "Programa file-roller nesėkmingai baigė darbą" - -#~ msgid "Loading Keys..." -#~ msgstr "Įkeliami raktai..." - -#~ msgid "Searching for keys..." -#~ msgstr "Ieškoma raktų..." - -#~ msgid "Uploading keys..." -#~ msgstr "Nusiunčiami raktai..." - -#~ msgid "Retrieving keys..." -#~ msgstr "Gaunami raktai..." - -#~ msgid "Searching for keys on: %s" -#~ msgstr "Ieškoma raktų %s serveryje" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "Ieškoma raktų, turinčių „%s“" - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "Ieškoma pagal rakto id „%s“" - -#~ msgid "Retrieving remote keys..." -#~ msgstr "Atsiunčiami raktai iš tinklo..." - -#~ msgid "Sending keys to key server..." -#~ msgstr "Raktai siunčiami į serverį..." - -#~ msgid "Synchronizing keys" -#~ msgstr "Sinchronizuojami raktai" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Šifravimo raktų tvarkymas" - -#~ msgid "Invalid" -#~ msgstr "Netinkamas" - -#~ msgid "Private Secure Shell Key" -#~ msgstr "Privatus saugaus prisijungimo (SSH) raktas" - -#~ msgid "Public Secure Shell Key" -#~ msgstr "Viešas saugaus prisijungimo (SSH) raktas" - -#~ msgid "Passphrase:" -#~ msgstr "Slaptažodis:" - -#~ msgid "Seahorse Daemon" -#~ msgstr "Seahorse tarnyba" - -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "X raktų pasirinkta sinchronizavimui" - -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/naudotojas/.ssh/blah_rsa" - -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" - -#~ msgid "Create a PGP Key" -#~ msgstr "Sukurti PGP raktą" - -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginal\n" -#~ "Full\n" -#~ "Ultimate" -#~ msgstr "" -#~ "Nežinomas\n" -#~ "Niekada\n" -#~ "Dalinis\n" -#~ "Pilnas\n" -#~ "Visiškas" - -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginally\n" -#~ "Fully\n" -#~ "Ultimately" -#~ msgstr "" -#~ "Nežinau\n" -#~ "Niekada\n" -#~ "Dalinai\n" -#~ "Pilnai\n" -#~ "Visiškai" - -#~ msgid "Other _Collected Keys" -#~ msgstr "Kiti s_ukaupti raktai" - -#~ msgid "_Trusted Keys" -#~ msgstr "Pa_tikimi raktai" - -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "" -#~ "Vienas ar keli pašalinti raktai yra privatieji. Ar tikrai norite tęsti?" - -#~ msgid "Removing item" -#~ msgstr "Šalinamas elementas" - -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "Automatiškai atrakinamas vartotojui prisijungus." - -#~ msgid "Couldn't get default password keyring" -#~ msgstr "Nepavyko įkelti numatytosios slaptažodžių raktinės" - -#~ msgid "Couldn't get list of password keyrings" -#~ msgstr "Nepavyko įkelti slaptažodžių raktinių sąrašo" - -#~ msgid "Couldn't remove keyring" -#~ msgstr "Nepavyko pašalinti rakto" - -#~ msgid "Are you sure you want to permanently delete the '%s' keyring?" -#~ msgstr "Ar tikrai norite negrįžtamai ištrinti raktinę „%s“?" - -#~ msgid "Default Keyring" -#~ msgstr "Numatytoji raktinė" - -#~ msgid "Password Keyrings" -#~ msgstr "Slaptažodžių raktinės" - -#~ msgid "Password and Encryption Settings" -#~ msgstr "Slaptažodžių bei šifravimo nustatymai" - -#~ msgid "_Add Keyring" -#~ msgstr "Pridėti _raktinę" - -#~ msgid "_Remove Keyring" -#~ msgstr "_Pašalinti raktinę" - -#~ msgid "Unknown Key: %s" -#~ msgstr "Nežinomas raktas: %s" - -#~ msgid "Unknown Key" -#~ msgstr "Nežinomas raktas" - -#~ msgid "Unavailable Key" -#~ msgstr "Nepasiekiamas raktas" - -#~ msgid "X509 Certificate" -#~ msgstr "X509 sertifikatas" - -#~ msgid "Loading..." -#~ msgstr "Įkeliama..." - -#~ msgid "Invalid or unrecognized object." -#~ msgstr "Netinkamas arba neatpažintas objektas." - -#~ msgid "Expiry for Subkey %d of %s" -#~ msgstr "Antrinio rakto %d, priklausančio %s, galiojimas" - -#~ msgid "_Quit" -#~ msgstr "_Išeiti" - -#~ msgid "Create a new personal key" -#~ msgstr "Sukurti naują asmeninį raktą" - -#~ msgid "Import keys into your key ring from a file" -#~ msgstr "Importuoti raktus iš failo į jūsų raktinę" - -#~ msgid "_Close" -#~ msgstr "_Uždaryti" - -#~ msgid "Secure Shell Passphrase" -#~ msgstr "Saugaus prisijungimo (SSH) slaptafrazė" - -#~ msgid "Secure Shell Key Passphrase" -#~ msgstr "Saugaus prisijungimo (SSH) rakto slaptafrazė" - -#~ msgid "Enter the passphrase for: %s" -#~ msgstr "Įveskite „%s“ rakto slaptafrazę." - -#~ msgid "Save this passphrase in my keyring" -#~ msgstr "Išsaugoti šią slaptafrazę mano raktinėje" - -#~ msgid "Please enter a passphrase to use." -#~ msgstr "Įveskite norimą slaptafrazę." - -#~ msgid "Unparseable Key ID" -#~ msgstr "Netaisyklingas rakto ID" - -#~ msgid "Unknown/Invalid Key" -#~ msgstr "Nežinomas/Netinkamas raktas" - -#~ msgid "PGP Key: %s" -#~ msgstr "PGP raktas %s" - -#~ msgid "" -#~ "Warning: Your system is not configured to cache passphrases in " -#~ "secure memory." -#~ msgstr "" -#~ "Įspėjame: Jūsų sistemoje nėra įjungta galimybė įsiminti " -#~ "slaptafrazes saugioje atmintyje." - -#~ msgid "Cache _Preferences" -#~ msgstr "Įsiminimo _nustatymai " - -#~ msgid "Cached Encryption Keys" -#~ msgstr "Įsiminti šifravimo raktai" - -#~ msgid "Change passphrase cache settings." -#~ msgstr "Keisti slaptafrazės įsiminimo nustatymus." - -#~ msgid "Clear passphrase cache" -#~ msgstr "Panaikinti slaptafrazės įsiminimą" - -#~ msgid "_Clear Cache" -#~ msgstr "_Panaikinti įsiminimus" - -#~ msgid "_Show Window" -#~ msgstr "_Rodyti langą" - -#~ msgid "Do not daemonize seahorse-agent" -#~ msgstr "Neleisti seahorse-agent kaip tarnybos" - -#~ msgid "Print variables in for a C type shell" -#~ msgstr "Spausdinti kintamuosius C kevalui" - -#~ msgid "Display environment variables (the default)" -#~ msgstr "Rodyti aplinkos kintamuosius (numatytoji veiksena)" - -#~ msgid "Allow GPG agent request from any display" -#~ msgstr "Leisti GPG agento užklausas iš bet kurio ekrano" - -#~ msgid "command..." -#~ msgstr "komanda..." - -#~ msgid "Encryption Key Agent (Seahorse)" -#~ msgstr "Šifravimo rakto agentas (Seahorse)" - -#~ msgid "no command specified to execute" -#~ msgstr "jokia komanda nenurodyta paleidimui" - -#~ msgid "Authorize Passphrase Access" -#~ msgstr "Leisti prieiti prie slaptafrazės" - -#~ msgid "The passphrase is cached in memory." -#~ msgstr "Slaptafrazė įsiminta kompiuterio atmintyje." - -#~ msgid "Always ask me before using a cached passphrase" -#~ msgstr "Visada paklausti prieš naudojant įsimintą slaptafrazę" - -#~ msgid "_Authorize" -#~ msgstr "_Leisti" - -#~ msgid "Key Name" -#~ msgstr "Rakto vardas" - -#~ msgid "" -#~ "After performing an decrypt or verify operation from the applet, display " -#~ "the resulting text in a window." -#~ msgstr "" -#~ "Atlikus iššifravimo arba patikrinimo operaciją iš įtaiso, rodyti tekstą " -#~ "lange." - -#~ msgid "" -#~ "After performing an encrypt or signing operation from the applet, display " -#~ "the resulting text in a window." -#~ msgstr "" -#~ "Atlikus užšifravimo arba pasirašymo operaciją iš įtaiso, rodyti tekstą " -#~ "lange." - -#~ msgid "Display cache reminder in the notification area" -#~ msgstr "Rodyti priminimą apie įsimintus raktus pranešimų skydelyje" - -#~ msgid "Display clipboard after decrypting" -#~ msgstr "Rodyti iškarpinės turinį po iššifravimo" - -#~ msgid "Display clipboard after encrypting" -#~ msgstr "Rodyti iškarpinės turinį po užšifravimo" - -#~ msgid "Expire passwords in the cache" -#~ msgstr "Užmiršti slaptažodžius" - -#~ msgid "" -#~ "If set to 'gnome' uses gnome-keyring to cache passwords. When set to " -#~ "'internal' uses internal cache." -#~ msgstr "" -#~ "Jei nurodyta „gnome“ - tuomet slaptažodžių įsiminimui bus naudojama " -#~ "„gnome-keyring“ programa. Jei nurodyta „internal“ - įsiminimui naudos " -#~ "vidinę paprogramę." - -#~ msgid "Prompt before using GPG passwords in cache" -#~ msgstr "Paklausti prieš naudojant įsimintus GPG slaptažodžius" - -#~ msgid "" -#~ "Reflect the contents of the clipboard (whether encrypted, signed, etc...) " -#~ "in the panel applet icon." -#~ msgstr "" -#~ "Atvaizduoja iškarpinės turinį (ar buvo pasirašyta, užšifruota ir pan.)" -#~ "skydelio įtaiso piktogramoje." - -#~ msgid "" -#~ "Set to 'true' to enable display of the cache reminder in the notification " -#~ "area of your panel." -#~ msgstr "" -#~ "Nustatykite „tiesa“, jei norite įjungti priminimus apie įsimintus " -#~ "slaptažodžius skydelio perspėjimų srityje." - -#~ msgid "" -#~ "Set to 'true' to have seahorse-agent prompt before giving out passwords " -#~ "it has cached." -#~ msgstr "" -#~ "Nustatykite „tiesa“, jei norite, kad seahorse-agent paklaustų prieš " -#~ "pateikdamas slaptažodžius, kurie buvo įsiminti." - -#~ msgid "Show clipboard state in panel" -#~ msgstr "Rodyti iškarpinės būseną skydelyje" - -#~ msgid "The time (in minutes) to cache GPG passwords" -#~ msgstr "Laikas (minutėmis) įsiminti GPG slaptažodžius" - -#~ msgid "" -#~ "This is the amount of time, specified in minutes, to cache GPG passwords " -#~ "in seahorse-agent." -#~ msgstr "seahorse-agent GPG slaptažodžių įsiminimo trukmė minutėmis." - -#~ msgid "" -#~ "This option enables the GPG password cache in the seahorse-agent program. " -#~ "The 'use-agent' setting in gpg.conf affects this setting." -#~ msgstr "" -#~ "Ši parinktis įjungia GPG slaptažodžių įsiminimą seahorse-agent " -#~ "programoje. Šios parinkties naudojimą tap pat lemia „use-agent“ " -#~ "nustatymas gpg.conf faile." - -#~ msgid "" -#~ "When set, seahorse-agent expires GPG passwords in its cache after a " -#~ "period of time." -#~ msgstr "" -#~ "Nustačius, seahorse-agent užmirš įsimintus GPG slaptažodžius praėjus " -#~ "pasirinktam laiko tarpui." - -#~ msgid "Whether the GPG password cache is enabled" -#~ msgstr "Ar GPG slaptažodžio įsiminimas įjungtas " - -#~ msgid "None. Prompt for a key." -#~ msgstr "Joks. Paklausti kiekvieną kartą." - -#~ msgid "Default Key" -#~ msgstr "Numatytasis raktas" - -#~ msgid "Remember PGP Passphrases" -#~ msgstr "Įsiminti PGP slaptafrazes" - -#~ msgid "A supported PGP passphrase caching agent is not running." -#~ msgstr "Nepaleistas tinkamas PGP slaptafrazių įsiminimo agentas." - -#~ msgid "This key is used to sign messages when no other key is chosen" -#~ msgstr "" -#~ "Šis raktas bus naudojamas žinučių (laiškų) pasirašymui, jei nebus " -#~ "pasirinktas kitas raktas" - -#~ msgid "As_k me before using a cached passphrase" -#~ msgstr "_Paklausti prieš naudojant įsimintą slaptafrazę" - -#~ msgid "Encryption" -#~ msgstr "Šifravimas" - -#~ msgid "PGP Passphrases" -#~ msgstr "PGP Slaptafrazės" - -#~ msgid "Show _icon in status area when passphrases are in memory" -#~ msgstr "_Rodyti piktogramą būsenos juostoje, kai slaptafrazės yra atmintyje" - -#~ msgid "When _encrypting, always include myself as a recipient" -#~ msgstr "" -#~ "Šifruojant visada pridėti mane prie gavėjų, kurie galės tai iššifruoti, " -#~ "sąrašo" - -#~ msgid "_Always remember passphrases whenever logged in" -#~ msgstr "Įsiminti slaptafrazes _visą laiką, kai esu prisijungęs" - -#~ msgid "_Default key:" -#~ msgstr "_Numatytasis raktas:" - -#~ msgid "_Never remember passphrases" -#~ msgstr "_Niekada neįsiminti slaptafrazių" - -#~ msgid "_Remember passphrases for" -#~ msgstr "Slaptafrazes įsi_minti" - -#~ msgid "Couldn't set permissions on backup file." -#~ msgstr "Nepavyko nustatyti atsarginio failo teisių (leidimų)." - -#~ msgid "Clipboard Text Encryption" -#~ msgstr "Iškarpinės teksto šifravimas" - -#~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." -#~ msgstr "" -#~ "Užšifruoti, iššifruoti ar pasirašyti iškarpinės turinį (naudojant PGP " -#~ "tipo šifravimą)." - -#~ msgid "Seahorse Applet Factory" -#~ msgstr "Seahorse įtaisų gamykla" - -#~ msgid "_About" -#~ msgstr "_Apie" - -#~ msgid "seahorse-applet" -#~ msgstr "seahorse-applet" - -#~ msgid "Use PGP/GPG to encrypt/decrypt/sign/verify/import the clipboard." -#~ msgstr "" -#~ "Naudoti PGP/GPG iškarpinės turinio šifravimui/iššifravimui/pasirašymui/" -#~ "tikrinimui/importavimui." - -#~ msgid "Choose Recipient Keys" -#~ msgstr "Pasirinkti gavėjo raktus" - -#~ msgid "Encrypted Text" -#~ msgstr "Užšifruotas tekstas" - -#~ msgid "Encryption Failed" -#~ msgstr "Nepavyko užšifruoti" - -#~ msgid "The clipboard could not be encrypted." -#~ msgstr "Iškarpinės turinio neina užšifruotas." - -#~ msgid "Choose Key to Sign with" -#~ msgstr "Išsirinkite raktą, su kuriuo pasirašinėsite" - -#~ msgid "Signed Text" -#~ msgstr "Pasirašytas tekstas" - -#~ msgid "Signing Failed" -#~ msgstr "Nepavyko pasirašyti" - -#~ msgid "The clipboard could not be Signed." -#~ msgstr "Iškarpinės turinio neina pasirašyti." - -#~ msgid "Import Failed" -#~ msgstr "Nepavyko importuoti" - -#~ msgid "Keys were found but not imported." -#~ msgstr "Raktai surasti, bet nebuvo importuoti. " - -#~ msgid "Decrypting Failed" -#~ msgstr "Nepavyko iššifruoti" - -#~ msgid "Text may be malformed." -#~ msgstr "Tekstas gali būti sugadintas arba netaisyklingas." - -#~ msgid "No PGP key or message was found on clipboard" -#~ msgstr "Iškarpinėje nebuvo rasta jokio PGP rakto ar žinutės" - -#~ msgid "No PGP data found." -#~ msgstr "Nerasta PGP informacijos." - -#~ msgid "Decrypted Text" -#~ msgstr "Iššifruotas tekstas" - -#~ msgid "Could not display the help file" -#~ msgstr "Nepavyko parodyti žinyno failo" - -#~ msgid "_Encrypt Clipboard" -#~ msgstr "_Užšifruoti iškarpinės turinį" - -#~ msgid "_Sign Clipboard" -#~ msgstr "_Pasirašyti iškarpinės turinį" - -#~ msgid "_Decrypt/Verify Clipboard" -#~ msgstr "_Iššifruoti/patikrinti iškarpinės turinį " - -#~ msgid "_Import Keys from Clipboard" -#~ msgstr "I_mportuoti raktus iš iškarpinės" - -#~ msgid "Encryption Applet" -#~ msgstr "Šifravimo įtaisas" - -#~ msgid "Display clipboard contents after:" -#~ msgstr "Rodyti iškarpinės turinį po:" - -#~ msgid "Clipboard Encryption Preferences" -#~ msgstr "Iškarpinės šifravimo nustatymai" - -#~ msgid "_Decrypting or verifying the clipboard" -#~ msgstr "_Iššifruojamas ar tikrinamas iškarpinės turinys" - -#~ msgid "_Encrypting or signing the clipboard" -#~ msgstr "_Šifruojamas ar pasirašomas iškarpinės turinys" - -#~ msgid "_Show clipboard state in panel" -#~ msgstr "_Rodyti iškarpinės būseną skydelyje" - -#~ msgid "_Encrypt" -#~ msgstr "_Užšifruoti" - -#~ msgid "_Decrypt/Verify" -#~ msgstr "_Iššifruoti/Patikrinti" - -#~ msgid "_Import Key" -#~ msgstr "_Importuoti raktą" - -#~ msgid "Couldn't connect to seahorse-daemon" -#~ msgstr "Nepavyko prisijungti prie seahorse-demono." - -#~ msgid "Encrypted text" -#~ msgstr "Užšifruotas tekstas" - -#~ msgid "Couldn't encrypt text" -#~ msgstr "Nepavyko užšifruoti teksto" - -#~ msgid "Keys found but not imported" -#~ msgstr "Raktai rasti, bet ne importuoti" - -#~ msgid "Couldn't decrypt text" -#~ msgstr "Nepavyko iššifruoti teksto" - -#~ msgid "Couldn't verify text" -#~ msgstr "Nepavyko patikrinti teksto" - -#~ msgid "No encrypted or signed text is selected." -#~ msgstr "Nėra pažymėta užšifruoto ar pasirašyto teksto." +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Neprivalomas rakto paskelbimo negaliojančiu aprašymas" -#~ msgid "Decrypted text" -#~ msgstr "Iššifruotas tekstas" +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Paskelbti _negaliojančiu" -#~ msgid "Verified text" -#~ msgstr "Patikrintas tekstas" +#: ../pgp/seahorse-signer.c:63 +msgid "You have no personal PGP keys that can be used to sign a document or message." +msgstr "Jūs neturite asmeninių PGP raktų, kuriais galima pasirašyti dokumentą ar žinutę. " -#~ msgid "Imported %d key" +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Pasirašyti žinutę su raktu:" -#~ msgid_plural "Imported %d keys" -#~ msgstr[0] "Importuotas %d raktas" -#~ msgstr[1] "Importuoti %d raktai" -#~ msgstr[2] "Importuota %d raktų" +#: ../pgp/seahorse-sign.xml.h:1 +msgid "Sign Key" +msgstr "Pasirašyti raktą" -#~ msgid "Signed text" -#~ msgstr "Pasirašytas tekstas" +#: ../pgp/seahorse-sign.xml.h:2 +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Pasirašydami Jūs parodote savo pasitikėjimą, kad šis raktas priklauso:" -#~ msgid "Couldn't sign text" -#~ msgstr "Nepavyko pasirašyti teksto" +#: ../pgp/seahorse-sign.xml.h:3 +msgid "Key Name" +msgstr "Rakto vardas" -#~ msgid "_Encrypt..." -#~ msgstr "_Užšifruoti..." +#: ../pgp/seahorse-sign.xml.h:4 +msgid "How carefully have you checked this key?" +msgstr "Kaip atidžiai Jūs tikrinote šį raktą?" -#~ msgid "Encrypt the selected text" -#~ msgstr "Užšifruoti pažymėtą tekstą" +#: ../pgp/seahorse-sign.xml.h:5 +msgid "_Not at all" +msgstr "Ne_tikrinau" -#~ msgid "Decr_ypt/Verify" -#~ msgstr "Išši_fruoti/Patikrinti" +#: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Nerūpestingai" -#~ msgid "Decrypt and/or Verify text" -#~ msgstr "Iššifruoti ir/arba patikrinti tekstą" +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Labai atidžiai" -#~ msgid "Sig_n..." -#~ msgstr "_Pasirašyti..." +#: ../pgp/seahorse-sign.xml.h:8 +msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." +msgstr "Netikrinau: reiškia, jog tikite, kad raktas priklauso čia minimam asmeniui, tačiau negalite patikrinti arba netikrinote, kad tikrai taip yra." -#~ msgid "Sign the selected text" -#~ msgstr "Pasirašyti pažymėtą tekstą" +#: ../pgp/seahorse-sign.xml.h:9 +#| msgid "" +#| "Casually: means you have done a casual verification that the key " +#| "is owned by the person who claims to own it. For example, you could read " +#| "the key fingerprint to the owner over the phone. " +msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone." +msgstr "Nerūpestingai: reiškia, jog atsakingai nepatikrinote, kad raktas priklauso čia minimam asmeniui. Pavyzdžiui, jei rakto atspaudas Jums buvo pasakytas telefonu." -#~ msgid "Enable the seahorse encryption plugin for gedit." -#~ msgstr "" -#~ "Įjungti seahorse šifravimo priedą gedit tekstų redagavimo programoje." +#: ../pgp/seahorse-sign.xml.h:10 +msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." +msgstr "Labai atidžiai: Pasirinkite tik tada, jei esate visiškai tikri, kad raktas yra nesuklastotas." -#~ msgid "Enable the seahorse gedit plugin" -#~ msgstr "Įjungti seahorse priedą gedit programoje." +#: ../pgp/seahorse-sign.xml.h:11 +msgid "You could use a hard to forge photo identification (such as a passport) to personally check that the name on the key is correct. You should have also used email to check that the email address belongs to the owner." +msgstr "Rakto savininko tapatybei patvirtinti, reiktų naudotis sunkiai suklastojamu asmens tapatybę įrodančiu dokumentu su nuotrauka (pvz. pasu). El. pašto adreso patikrinimui, reiktų nurodytu adresu parašyti šiuo raktu užšifruotą laišką ir iššifruotą gauti atgal." -#~ msgid "Text Encryption" -#~ msgstr "Teksto šifravimas" +#: ../pgp/seahorse-sign.xml.h:12 +msgid "How others will see this signature:" +msgstr "Kaip kiti matys šį parašą:" -#~ msgid "This plugin performs encryption operations on text." -#~ msgstr "Šis priedas šifruoja tekstą." +#: ../pgp/seahorse-sign.xml.h:13 +msgid "_Others may not see this signature" +msgstr "_Kiti negalės šio parašo matyti" -#~ msgid "Encrypt..." -#~ msgstr "Užšifruoti..." +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Aš pasilieku teisę šį parašą paskelbti ne_galiojančiu." -#~ msgid "Encrypt (and optionally sign) the selected file" +#: ../pgp/seahorse-sign.xml.h:15 +msgid "Sign key as:" +msgstr "Pasirašyti raktą kaip:" -#~ msgid_plural "Encrypt the selected files" -#~ msgstr[0] "Užšifruoti (ir, esant norui, pasirašyti) pasirinktą failą" -#~ msgstr[1] "Užšifruoti pasirinktus failus" -#~ msgstr[2] "Užšifruoti pasirinktus failus" +#: ../pgp/seahorse-sign.xml.h:16 +msgid "_Signer:" +msgstr "_Pasirašantysis:" -#~ msgid "Sign the selected file" +#: ../pgp/seahorse-sign.xml.h:17 +msgid "_Sign" +msgstr "_Pasirašyti" -#~ msgid_plural "Sign the selected files" -#~ msgstr[0] "Užšifruoti pasirinktą failą" -#~ msgstr[1] "Užšifruoti pasirinktus failus" -#~ msgstr[2] "Užšifruoti pasirinktus failus" +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Eksportuojami duomenys" -#~ msgid "For internal use" -#~ msgstr "Vidiniam naudojimui" +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Gaunami duomenys" -#~ msgid "Encryption Preferences" -#~ msgstr "Šifravimo nustatymai" +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importuojami duomenys" -#~ msgid "Configure key servers and other encryption settings" -#~ msgstr "Konfigūruoti raktų serverius ir kitus šifravimo nustatymus" +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Siunčiami duomenys" -#~ msgid "Encryption and Keyrings" -#~ msgstr "Šifravimas ir raktinės" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Negalimas" -#~ msgid "Encrypt file" -#~ msgstr "Užšifruoti failą" +#: ../pkcs11/seahorse-certificate.c:435 +#| msgid "X.509 certificates and related keys" +msgid "Personal certificate and key" +msgstr "Asmeniniai liudijimas ir raktas" + +#: ../pkcs11/seahorse-certificate.c:438 +#| msgid "Properties of the certificate." +msgid "Personal certificate" +msgstr "Asmeninis liudijimas" -#~ msgid "Sign file with default key" -#~ msgstr "Pasirašyti failą su numatytuoju raktu" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Liudijimas" -#~ msgid "Encrypt and sign file with default key" -#~ msgstr "Užšifruoti ir pasirašyti failą su numatytuoju raktu" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +#| msgid "Certificates" +msgid "Certificates (DER encoded)" +msgstr "Liudijimai (DER koduoti)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Liudijimai" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 liudijimai ir susiję raktai" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +#| msgid "Are you sure you want to permanently delete %d identities?" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Ar tikrai norite negrįžtamai pašalinti %d liudijimą?" +msgstr[1] "Ar tikrai norite negrįžtamai pašalinti %d liudijimus?" +msgstr[2] "Ar tikrai norite negrįžtamai pašalinti %d liudijimų?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +#| msgid "Couldn't delete private key" +msgid "Couldn't generate private key" +msgstr "Nepavyko sugeneruoti privataus rakto" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +#| msgid "C_reate" +msgid "Create" +msgstr "Sukurti" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Privatus raktas" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +#| msgid "Delete the certificate." +msgid "Used to request a certificate" +msgstr "Naudojamas prašyti liudijimo." + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#| msgid "Create a new key or item" +msgid "Create a new private key" +msgstr "Sukurti naują privatų raktą" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Žyma:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#| msgid "Stored note" +msgid "Stored at:" +msgstr "Saugojimo vieta:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Aš suprantu, kad šis raktas bus negrįžtamai ištrintas." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Nepavadintas" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +#| msgid "Delete the certificate." +msgid "Failed to export certificate" +msgstr "Nepavyko eksportuoti liudijimo." -#~ msgid "Decrypt encrypted file" -#~ msgstr "Iššifruoti užšifruotą failą" +#: ../pkcs11/seahorse-pkcs11-properties.c:190 +#: ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Nepavyko pašalinti" -#~ msgid "Verify signature file" -#~ msgstr "Patikrinti pagal parašo failą" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +#| msgid "Export" +msgid "_Export" +msgstr "_Eksportuoti" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +#| msgid "Delete the certificate." +msgid "Export the certificate" +msgstr "Eksportuoti liudijimą" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +#| msgid "Delete the certificate." +msgid "Delete this certificate or key" +msgstr "Pašalinti šį liudijimą ar raktą" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#| msgid "Certificate" +msgid "Request _Certificate" +msgstr "Prašyti _liudijimo" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +#| msgid "No private key file is available for this key." +msgid "Create a certificate request file for this key" +msgstr "Sukurti liudijimo užklausos failą šiam raktui" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +#| msgid "Couldn't delete private key" +msgid "Couldn't save certificate request" +msgstr "Nepavyko įrašyti liudijimo užklausos" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +#| msgid "Certificates" +msgid "Save certificate request" +msgstr "Įrašyti liudijimo užklausą" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +#| msgid "Certificates" +msgid "Certificate request" +msgstr "Liudijimo užklausa" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM koduota užklausa" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +#| msgid "Couldn't delete private key" +msgid "Couldn't create certificate request" +msgstr "Nepavyko sukurti liudijimo užklausos" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Sukurti liudijimo užklausos failą." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Bendras vardas (CN) patalpintas liudijimo užklausoje." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +#| msgid "_Name:" +msgid "Name (CN):" +msgstr "Pavadinimas (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Nepavadintas privatus raktas" -#~ msgid "Read list of URIs on standard in" -#~ msgstr "Skaityti failų (URI) sąrašą iš standartinės įvesties" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Pakeisti slaptažodį" -#~ msgid "file..." -#~ msgstr "failas..." +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Naujas slaptažodis:" -#~ msgid "Choose Recipients" -#~ msgstr "Pasirinkite gavėjus, kuriems skirta ši informacija" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Patvirtinkite naująjį slaptažodį" -#~ msgid "Couldn't load keys" -#~ msgstr "Nepavyko įkelti raktų" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "_Patvirtinkite slaptažodį:" -#~ msgid "Choose Encrypted File Name for '%s'" -#~ msgstr "Nurodykite vardą užšifruojam failui '%s'" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Tvarkyti Jūsų slaptažodžius ir šifravimo raktus" -#~ msgid "Choose Signer" -#~ msgstr "Pasirinkite asmenį bei raktą, kuriuo pasirašysite" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Tęsti" -#~ msgid "Choose Signature File Name for '%s'" -#~ msgstr "Nurodykite vardą el. parašo failui: '%s'" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "Pa_sirinkite kuriamo elemento tipą:" -#~ msgid "Import is complete" -#~ msgstr "Importavimas baigtas" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Nepavyko importuoti" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importuoti" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Duomenys importavimui:" -#~ msgid "Importing keys ..." -#~ msgstr "Importuojami raktai..." +#: ../src/seahorse-key-manager.c:262 +#: ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importuoti raktą" -#~ msgid "Choose Decrypted File Name for '%s'" -#~ msgstr "Nurodykite vardą iššifruotam failui '%s'" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Visi raktų failai" -#~ msgid "Choose Original File for '%s'" -#~ msgstr "Pasirinkite failą, kurį tikrinsite su el. parašu iš failo '%s'" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Įrašytas tekstas" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Iškarpinės tekstas" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Naujas" -#~ msgid "No valid signatures found" -#~ msgstr "Nerasta galiojančių parašų" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Užverti šią programą" -#~ msgid "File Encryption Tool" -#~ msgstr "Failų šifravimo įrankis" +#: ../src/seahorse-key-manager.c:512 +#: ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Naujas..." -#~ msgid "Encrypting" -#~ msgstr "Šifruojama" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Sukurti naują raktą ar elementą" -#~ msgid "Couldn't encrypt file: %s" -#~ msgstr "Nepavyko užšifruoti failo: %s" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Pridėti naują raktą ar elementą" -#~ msgid "Signing" -#~ msgstr "Pasirašoma" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "I_mportuoti..." -#~ msgid "Couldn't sign file: %s" -#~ msgstr "Nepavyko pasirašyti failo: %s" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importuoti iš failo" -#~ msgid "Couldn't import keys from file: %s" -#~ msgstr "Nepavyko importuoti raktų iš failo: %s" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importuoti iš iškarpinės" -#~ msgid "Decrypting" -#~ msgstr "Iššifruojama" +#: ../src/seahorse-key-manager.c:523 +#| msgid "_Keyring:" +msgid "By _keyring" +msgstr "Pagal _raktinę" + +#: ../src/seahorse-key-manager.c:524 +#| msgid "Deleting keyring" +#| msgid_plural "Deleting keyrings" +msgid "Show sidebar listing keyrings" +msgstr "Rodyti šoninį polangį su raktinėmis" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Rodyti _asmeninius" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Rodyti tik asmeninius raktus, liudijimus ir slaptažodžius" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Rodyti pat_ikimus" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Rodyti tik patikimus raktus, liudijimus ir slaptažodžius" + +#: ../src/seahorse-key-manager.c:532 +#| msgid "_Show _any" +msgid "Show _any" +msgstr "Rodyti bet _kurį" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Rodyti visus raktus, liudijimus ir slaptažodžius" -#~ msgid "Couldn't decrypt file: %s" -#~ msgstr "Nepavyko iššifruoti failo: %s" +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtras" -#~ msgid "Verifying" -#~ msgstr "Tikrinama" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Pirmojo karto parinktys:" -#~ msgid "Couldn't verify file: %s" -#~ msgstr "Nepavyko patikrinti failo: %s" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Susikurkite naują raktą sau:" -#~ msgid "Ace (.ace)" -#~ msgstr "Ace (.ace)" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importuoti egzistuojančius raktus iš failo:" -#~ msgid "Ar (.ar)" -#~ msgstr "Ar (.ar)" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Norint pradėti šifravimą Jums reikės raktų." -#~ msgid "Arj (.arj)" -#~ msgstr "Arj (.arj)" +#: ../src/seahorse-sidebar.c:799 +#| msgid "Couldn't lock keyring" +msgid "Couldn't lock" +msgstr "Nepavyko užrakinti" + +#: ../src/seahorse-sidebar.c:836 +#| msgid "Couldn't unlock keyring" +msgid "Couldn't unlock" +msgstr "Nepavyko atrakinti" -#~ msgid "Ear (.ear)" -#~ msgstr "Ear (.ear)" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Užrakinti" -#~ msgid "Self-extracting zip (.exe)" -#~ msgstr "Išsispaudžiantis zip (.exe)" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Atrakinti" -#~ msgid "Jar (.jar)" -#~ msgstr "Jar (.jar)" +#: ../src/seahorse-sidebar.c:968 +#| msgid "Key Properties" +msgid "_Properties" +msgstr "_Savybės" -#~ msgid "Lha (.lzh)" -#~ msgstr "Lha (.lzh)" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Konfigūruoti saugaus prisijungimo (SSH) raktą..." -#~ msgid "Rar (.rar)" -#~ msgstr "Rar (.rar)" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "Send public Secure Shell key to another machine, and enable logins using that key." +msgstr "Nusiųsti viešą saugaus prisijungimo (SSH) raktą į kitą kompiuterį bei įjungti galimybę prisijungti, naudojant šitą raktą." -#~ msgid "Tar uncompressed (.tar)" -#~ msgstr "Tar (nearchyvuotas) (.tar)" +#: ../ssh/seahorse-ssh-askpass.c:60 +#: ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Saugaus prisijungimo (SSH) slaptažodis:" -#~ msgid "Tar compressed with bzip (.tar.bz)" -#~ msgstr "Tar (archyvuotas su bzip) (.tar.bz)" +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Senasis rakto slaptažodis" -#~ msgid "Tar compressed with bzip2 (.tar.bz2)" -#~ msgstr "Tar (archyvuotas su bzip2) (.tar.bz2)" +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "Įveskite senąjį rakto „%s“ slaptažodį:" -#~ msgid "Tar compressed with gzip (.tar.gz)" -#~ msgstr "Tar (archyvuotas su gzip) (.tar.gz)" +#: ../ssh/seahorse-ssh-askpass.c:87 +#: ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Naujasis rakto slaptažodis" -#~ msgid "Tar compressed with lzop (.tar.lzo)" -#~ msgstr "Tar (archyvuotas su lzop) (.tar.lzo)" +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "Įveskite naująjį rakto „%s“ slaptažodį:" -#~ msgid "Tar compressed with compress (.tar.Z)" -#~ msgstr "Tar (archyvuotas su compress) (.tar.Z)" +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Dar kartą įveskite naująjį slaptažodį: %s" -#~ msgid "War (.war)" -#~ msgstr "War (.war)" +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Saugus prisijungimas" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Raktai, naudojami saugiam prisijungimui prie kitų kompiuterių" -#~ msgid "Zip (.zip)" -#~ msgstr "Zip (.zip)" +#: ../ssh/seahorse-ssh-deleter.c:81 +#: ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "Ar tikrai norite pašalinti ssh raktą „%s“?" -#~ msgid "Zoo (.zoo)" -#~ msgstr "Zoo (.zoo)" +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +#| msgid "Are you sure you want to delete %d secure shell keys?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Ar tikrai norite pašalinti %d saugaus apvalkalo raktą?" +msgstr[1] "Ar tikrai norite pašalinti %d saugaus apvalkalo raktus?" +msgstr[2] "Ar tikrai norite pašalinti %d saugaus apvalkalo raktų?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +#| msgid "Sign Key" +msgid "Ssh Key" +msgstr "Ssh raktas" + +#: ../ssh/seahorse-ssh-exporter.c:122 +#| msgid "Secure Shell Key" +msgid "Secret SSH keys" +msgstr "Slaptas SSH raktas" + +#: ../ssh/seahorse-ssh-exporter.c:126 +#| msgid "Public PGP Key" +msgid "Public SSH keys" +msgstr "Viešas SSH raktas" + +#: ../ssh/seahorse-ssh-exporter.c:290 +#| msgid "No private key file is available for this key." +msgid "No public key file is available for this key." +msgstr "Šiam raktui nėra viešo rakto failo." + +#: ../ssh/seahorse-ssh-generate.c:55 +#: ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 +#: ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "Saugaus prisijungimo (SSH) raktas" -#~ msgid "7-Zip (.7z)" -#~ msgstr "7-Zip (.7z)" +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "Naudojamas prisijungti prie kitų kompiuterių (pvz.: per terminalą)" -#~ msgid "You have selected %d file " +#: ../ssh/seahorse-ssh-generate.c:110 +#: ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "Nepavyko sukurti saugaus prisijungimo (SSH) rakto" -#~ msgid_plural "You have selected %d files " -#~ msgstr[0] "Jūs pasirinkote %d failą " -#~ msgstr[1] "Jūs pasirinkote %d failus " -#~ msgstr[2] "Jūs pasirinkote %d failų " +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "Kuriamas saugaus prisijungimo (SSH) raktas" -#~ msgid "and %d folder" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Naujas saugaus prisijungimo (SSH) raktas" -#~ msgid_plural "and %d folders" -#~ msgstr[0] "ir %d aplanką" -#~ msgstr[1] "ir %d aplankus" -#~ msgstr[2] "ir %d aplankų" +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Tik sukurti raktą" -#~ msgid "%s%s" -#~ msgstr "%s%s" +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_Sukurti ir nustatyti" -#~ msgid "You have selected %d files" -#~ msgstr "Jūs pasirinkote %d failus" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "Saugaus prisijungimo (SSH) raktas skirtas saugiai prisijungti prie patikimų kompiuterių." -#~ msgid "You have selected %d folder" +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Tavo el. pašto adresas ar kita užuomina šio rakto paskirties priminimui." -#~ msgid_plural "You have selected %d folders" -#~ msgstr[0] "Jūs pasirinkote %d aplanką" -#~ msgstr[1] "Jūs pasirinkote %d aplankus" -#~ msgstr[2] "Jūs pasirinkote %d aplankų" +#: ../ssh/seahorse-ssh-generate.xml.h:10 +#| msgid "RSA" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +#| msgid "" +#| "If there a computer you want to use this key with, you can set up that " +#| "computer to recognize your new key." +msgid "If there is a computer you want to use this key with, you can set up that computer to recognize your new key." +msgstr "Jei turite kompiuterį, prie kurio jungsitės naudodami šį raktą, dabar galite nustatyti, kad šis kompiuteris atpažintų Jūsų raktą." -#~ msgid "Couldn't list files" -#~ msgstr "Nepavyko sudaryti failų sąrašo" +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Nenuskaitomas saugaus prisijungimo (SSH) raktas)" -#~ msgid "Couldn't read file" -#~ msgstr "Nepavyko perskaityti failo" +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Asmeninis SSH raktas" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH raktas" -#~ msgid "Back up Key Rings to Archive" -#~ msgstr "Kopijuoti raktines į archyvą" +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "Nepavyko pervadinti rakto." -#~ msgid "_Key" -#~ msgstr "_Raktas" +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "Nepavyko pakeisti leidimų šiam raktui." -#~ msgid "_Back up Key Rings..." -#~ msgstr "Padaryti raktinių atsargines _kopijas..." +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "Nepavyko pakeisti leidimų šiam raktui." -#~ msgid "Back up all keys" -#~ msgstr "Padaryti visų raktų atsargines kopijas" +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "Identifikatorius:" -#~ msgid "P_roperties" -#~ msgstr "Sa_vybės" +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +#| msgid "Name:" +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "Vardas:" -#~ msgid "E_xport Public Key..." -#~ msgstr "_Eksportuoti viešą raktą..." +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Naudotas prisijungti prie kitų kompiuterių." -#~ msgid "_Copy Public Key" -#~ msgstr "Kopijuoti viešą raktą" +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "Pasitikėjimas" -#~ msgid "Copy public part of selected keys to the clipboard" -#~ msgstr "Kopijuoti pasirinktų raktų viešas dalis į iškarpinę" +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Šio rakto savininkui _leidžiama prisijungti prie šio kompiuterio" -#~ msgid "_Delete Key" -#~ msgstr "_Ištrinti raktą" +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +#| msgid "This only applies to the '%s' account." +msgid "This only applies to the %s account." +msgstr "Galioja tiktai '%s' paskyrai." -#~ msgid "Set Up Computer for _Secure Shell..." -#~ msgstr "Sukonfigūruoti kompiuterį _saugiam prisijungimui (SSH)..." +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "Algoritmas:" -#~ msgid "User ID" -#~ msgstr "Naudotojo ID" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Stiprumas:" -#~ msgid "Couldn't retrieve key data" -#~ msgstr "Nepavyko gauti rakto duomenų" +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Vieta:" -#~ msgid "Couldn't write key to file" -#~ msgstr "Nepavyko įrašyti rakto į failą" +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "_Eksportuoti visą raktą" -#~ msgid "Couldn't import keys into key ring" -#~ msgstr "Nepavyko importuoti raktų į raktinę" +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH komanda (programa) netikėtai baigė darbą." -#~ msgid "Couldn't write keys to file: %s" -#~ msgstr "Nepavyko raktų įrašyti į failą: %s" +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH komanda nepavyko." -#~ msgid "Save Remote Keys" -#~ msgstr "Išsaugoti internete esančius raktus" +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "Nuotolinio kompiuterio slaptažodis" -#~ msgid "No matching keys found" -#~ msgstr "Sutampančių raktų nerasta" +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "Įveskite rakto slaptažodį" -#~ msgid "Save Key As..." -#~ msgstr "Išsaugoti raktą kaip..." +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "Naujojo saugaus prisijungimo (SSH) rakto slaptažodis" -#~ msgid "Save selected keys as a file" -#~ msgstr "Išsaugoti pasirinktus raktus į failą" +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "Importuojamas raktas: %s" -#~ msgid "_Copy Key" -#~ msgstr "_Kopijuoti raktą" +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "Importuojamas raktas. Įveskite slaptažodį" -#~ msgid "Remote Encryption Keys" -#~ msgstr "Šifravimo raktai tinkle" +#: ../ssh/seahorse-ssh-source.c:232 +#| msgid "OpenSSH: %s" +msgid "OpenSSH keys" +msgstr "OpenSSH raktai" -#~ msgid "You have selected multiple files or folders" -#~ msgstr "Jūs pasirinkote keletą failų ar aplankų" +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" -#~ msgid "" -#~ "Because the files are located remotely, each file will be encrypted " -#~ "separately." -#~ msgstr "" -#~ "Kadangi failai yra ne jūsų kompiuteryje, kiekvienas iš jų bus užšifruotas " -#~ "atskirai." +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "Šiam raktui nėra privataus rakto failo." -#~ msgid "Encrypt Multiple Files" -#~ msgstr "Užšifruoti keletą failų" +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "Nepavyko sukonfigūruoti saugaus prisijungimo (SSH) raktų nutolusiame kompiuteryje." -#~ msgid "Encrypt each file separately" -#~ msgstr "Šifruoti kiekvieną failą atskirai" +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "Konfigūruojami saugaus prisijungimo (SSH) raktai..." -#~ msgid "Encrypt packed together in a package" -#~ msgstr "Užšifruoti supakuotus į vieną paketą" +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "Nustatyti kitą kompiuterį saugiam (SSH) prisijungimui" -#~ msgid "Package Name:" -#~ msgstr "Paketo failo vardas:" +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." +msgstr "Norėdami naudoti saugaus prisijungimo (SSH) raktą jungimuisi prie kito kompiuterio, privalote turėti paskyrą šiame kompiuteryje." -#~ msgid "Packaging:" -#~ msgstr "Pakavimas:" +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "pvz.: linux.openoffice.lt:prievadas" -#~ msgid "encrypted-package" -#~ msgstr "užšifruotas-paketas" +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "_Kompiuterio vardas:" -#~ msgid "Decrypt File" -#~ msgstr "Iššifruoti failą" +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "_Prisijungimo vardas:" -#~ msgid "I have checked that this key belongs to '%s'" -#~ msgstr "Patikrinau, kad šis raktas priklauso asmeniui „%s“" +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "_Nustatyti" -#~ msgid "Verify Signature" -#~ msgstr "Patikrinti parašą " diff -Nru seahorse-3.2.2/po/lv.po seahorse-3.6.3/po/lv.po --- seahorse-3.2.2/po/lv.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/lv.po 2012-09-25 14:50:51.000000000 +0200 @@ -3,34 +3,29 @@ # This file is distributed under the same license as the PACKAGE package. # # Pēteris Krišjānis , 2009. -# Peteris Krisjanis , 2010. +# Peteris Krisjanis , 2010, 2012. # Rudolfs , 2011. -# Rūdofls Mazurs , 2011. +# Rūdofls Mazurs , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-15 19:58+0300\n" -"Last-Translator: Rūdofls Mazurs \n" -"Language-Team: Latvian \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-09-24 17:17+0300\n" +"PO-Revision-Date: 2012-09-24 17:24+0300\n" +"Last-Translator: Rūdolfs Mazurs \n" +"Language-Team: Latvian \n" +"Language: lv\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 != 0 ? 1 : 2;\n" -"X-Generator: Lokalize 1.2\n" -"Language: lv\n" +"X-Generator: Lokalize 1.4\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Pievienot paroļu saišķi" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Jaunā saišķa nosaukums:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -38,47 +33,157 @@ "Lūdzu izvēlieties nosaukumu jaunajam saišķim. Jums tiks dots ievadīt " "atslēgšanas paroli." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Jaunā saišķa nosaukums:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Servera nosaukums vai adrese." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Neizdevās pievienot saišķi" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Jauns paroļu saišķis" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Tiek izmantots lietotņu un tīkla paroļu glabāšanai" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Jauna parole..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Droši glabā paroli vai noslēpumu." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Paroļu saišķis" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Saglabāta parole" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Neizdevās iestatīt noklusēto saišķi" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Neizdevās nomainīt saišķa paroli" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Iestatīt kā noklusēto" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Lietotnes parasti glabā jaunas paroles noklusētajā saišķī." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Nomainīt _paroli" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Izmainīt atslēgšanas paroli paroļu saišķim" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Neizdevās pievienot vienumu" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Pievienot paroli" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Apraksts:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Saišķis:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Parole:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Parādīt paroli" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Neizdevās izdzēst vienumu" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Saišķis:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Neizdevās pievienot saišķi" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Paroles" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Noglabātās personiskās paroles, akreditācijas dati un noslēpumi" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "TZ konta parole " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Parole vai noslēpums" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Tīkla parole" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Saglabāta piezīme" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Saišķa parole" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Šifrēšanas atslēgas parole" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Atslēgu glabātuves parole" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome parole" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Gnome tiešsaistes kontu parole" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy parole" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Tūlītējās ziņojumapmaiņas parole" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Network Manager (tīkla pārvaldnieka) noslēpums" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Vai tiešām vēlaties dzēst paroli '%s'?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -86,259 +191,136 @@ msgstr[1] "Vai tiešām vēlaties dzēst %d paroles?" msgstr[2] "Vai tiešām vēlaties dzēst %d paroles?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Dzēš vienību" -msgstr[1] "Dzēš vienības" -msgstr[2] "Dzēš vienību" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Piekļūt tīkla koplietojumam vai resursam" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Piekļūt tīmekļa vietnei" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Atslēdz PGP atslēgu" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Atslēdz drošās čaulas atslēgu" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Saglabāta parole vai pieteikšanās" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Tīkla akreditācijas dati" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Parole" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Neizdevās mainīt paroli." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Atjaunina paroli" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Neizdevās iestatīt aprakstu." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Parole" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Tehniskās detaļas" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detaļas" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Atslēgas parametri" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Atslēga" +msgid "Use:" +msgstr "Lietojums:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Atslēgas parametri" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tips:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Pieteikšanās vārds:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Serveris:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Pieteikšanās vārds:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Parādīt pa_roli" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tips:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Lietojums:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Paroles: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Paroles: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Paroļu saišķis" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Tiek izmantots lietotņu un tīkla paroļu glabāšanai" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Saglabāta parole" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Droši glabā paroli vai noslēpumu." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Neizdevās atslēgt saišķi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Neizdevās aizslēgt saišķi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Neizdevās iestatīt noklusēto saišķi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Neizdevās nomainīt saišķa paroli" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "Aiz_slēgt" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Slēgt paroļu saišķi; tādējādi galvenā parole tiks pieprasīta, lai to " -"atslēgtu." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Atslēgt" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Atslēgt paroļu saišķi ar galveno paroli, lai tas būtu pieejams lietošanai." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Iestatīt kā noklusēto" +msgid "Password:" +msgstr "Parole" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Lietotnes parasti glabā jaunas paroles noklusētajā saišķī." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Atslēga" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Nomainīt _paroli" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Tehniskās detaļas" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Izmainīt atslēgšanas paroli paroļu saišķim" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detaļas" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Neizdevās dzēst atslēgu saišķi" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Saišķis, kas tiek automātiski atslēgts pie pieteikšanās" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Saišķis, lai glabātu paroles" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Vai tiešām vēlaties dzēst paroļu saišķi '%s'?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Dzēš saišķi" -msgstr[1] "Dzēš saišķus" -msgstr[2] "Dzēš saišķu" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Es saprotu, ka visi vienumi tiks neatgriezeniski dzēsti." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Saišķa parametri" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nosaukums:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Izveidots:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Saišķis" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Saišķa parametri" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nosaukums:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Darbība tika atcelta" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Piekļuve atslēgu saišķim tika liegta" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Gnome-keyring dēmons nav palaists" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Atslēgu saišķim jau ir atslēgts" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Tāds atslēgu saišķis neeksistē" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Neizdevās sazināties ar atslēgu saišķa dēmonu" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Vienība jau eksistē" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Iekšēja kļūda piekļūstot gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Parādīšanas karogi" @@ -595,268 +577,332 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "sākuma pagaidu vienība" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Pievienot atslēgas serveri" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Hosts:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Atslēgas servera tips:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Hosts:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Pieslēgvieta, pie kuras piekļūt serverim." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "sākuma pagaidu vienība" +msgid "The port to access the server on." +msgstr "Pieslēgvieta, pie kuras piekļūt serverim." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Parole" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Šīs lietotnes versija" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Parole:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Sistēmas iestatījumi" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Apstipriniet:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Palīdzējuši:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Nederīga atslēgu servera adrese." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Paroles un atslēgas" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Lai saņemtu palīdzību, sazinieties ar savu sistēmas administratoru, vai arī " -"atslēgas servera administratoru." +"Nauris Kanasnieks \n" +"Jānis Laimiņš \n" +"Pēteris Krišjānis \n" +"\n" +"Launchpad Contributions:\n" +" Mārtiņš Bruņenieks https://launchpad.net/~papuass\n" +" Pēteris Krišjānis https://launchpad.net/~pecisk-gmail\n" +" Raivis Dejus https://launchpad.net/~orvils" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse projekta mājas lapa" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Pielāgots" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Neizdevās izdzēst" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Nepublicēt atslēgas" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Neizdevās eksportēt atslēgas" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Automātiski iegūt atslēgas no _atslēgu serveriem" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Neizdevās eksportēt datus" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Automātiski sinhronizēt _izmainītās atslēgas ar atslēgu serveriem" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Datne" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Atslēgu serveri" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_ksportēt..." -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Iestatījumi" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Eksportēt uz datni" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Meklēt atslēgas, izmantojot:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Rediģēt" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Publicēt atslēgas uz:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopēt uz starpliktuvi" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Saņem datus" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Dzēst" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Eksportē datus" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Dzēst izvēlētās vienības" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importē datus" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Rādīt šī vienuma īpašības" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Rādīt šī saišķa īpašības" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Sūta datus" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Ies_tatījumi" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Nav pieejams" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Mainīt šīs programmas iestatījumus" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d.%m.%Y" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Skats" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Atslēgas dati" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Palīdzība" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Vairākas atslēgas" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Par programmu" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Visi atslēgu faili" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Saturs" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Visi faili" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Parādīt Seahorse palīdzību" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Eksportēt" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Ievadiet %s PIN vai paroli" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arhīva faili" +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Parole:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Apstipriniet:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Nederīga atslēgu servera adrese." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"Fails ar šādu nosaukumu jau pastāv\n" -"\n" -"Vai vēlaties aizstāt to ar jauno failu?" +"Lai saņemtu palīdzību, sazinieties ar savu sistēmas administratoru, vai arī " +"atslēgas servera administratoru." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Pielāgots" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Nepublicēt atslēgas" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Iestatījumi" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Meklēt atslēgas, izmantojot:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Publicēt atslēgas uz:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Automātiski iegūt atslēgas no _atslēgu serveriem" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Automātiski sinhronizēt _izmainītās atslēgas ar atslēgu serveriem" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Atslēgu serveri" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Aizvietot" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d.%m.%Y" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Nezināms" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nekad" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Daļēji" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Pilnībā" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Gandrīz" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Deaktivizēta" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Atsaukta" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Neizdevās parādīt palīdzību: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Derīguma beigu datums:" +msgid "Never E_xpires" +msgstr "Nekad neiz_beidzas" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Ģenerēt jaunu apakšatslēgu" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Ja atslēgai nekad neizbeidzas" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Atslēgas _tips:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Atslēgas _garums:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Atslēgas _tips:" +msgid "Expiration Date:" +msgstr "Derīguma beigu datums:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Atslēgas garums" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nekad neiz_beidzas" +msgid "Generate a new subkey" +msgstr "Ģenerēt jaunu apakšatslēgu" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Pievienot lietotāja ID" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Izveidot jaunu lietotāja ID" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Pilns _vārds:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Atslēgas ko_mentārs:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Jābūt minimums 5 simbolus garam" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Neobligāta epasta adrese" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Neobligāts atslēgu paskaidrojošs komentārs" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Neobligāta epasta adrese" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Pilns _vārds:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_E-pasta adrese:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Atslēgas ko_mentārs:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Izveidot jaunu lietotāja ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Mainīt" +msgid "_Never expires" +msgstr "_Nekad neizbeidzas" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Atsaukt atslēgu" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Nekad neizbeidzas" +msgid "C_hange" +msgstr "_Mainīt" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -867,7 +913,7 @@ msgid "Add subkey to %s" msgstr "Pievienot apakšatslēgu %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (tikai parakstīšanai)" @@ -875,7 +921,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (tikai šifrēšanai)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (tikai parakstīšanai)" @@ -896,6 +942,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Atšifrēšana nesekmīga. Jums, visticamāk, nav atšifrēšanas atslēgas." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Darbība tika atcelta" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Nederīgs derīguma beigu datums" @@ -913,47 +964,149 @@ msgid "Expiry: %s" msgstr "Derīga līdz: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Vairākas atslēgas" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Atslēgas dati" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Bruņotas PGP atslēgas" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP atslēgas" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP atslēga" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" -msgstr "Izmanto, lai šifrētu e-pastu un failus" +msgstr "Izmanto, lai šifrētu e-pastu un datnes" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Neizdevās ģenerēt PGP atslēgu" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Parole jaunajai PGP atslēgai" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Ievadiet paroli divreiz savai jaunajai atslēgai." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Kad izveido atslēgu, jāģenerē daudz nejaušu datu un \n" +"mums vajag jūsu palīdzību. Šajā laikā vajadzētu veikt\n" +"dažas citas darbības, piemēram, rakstīt ar tastatūru,\n" +"pārvietot peli, lietot lietotnes. Tas dos sistēmai\n" +"tik ļoti vajadzīgos nejaušos datus." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Ģenerē atslēgu" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Vai jūs esat pārliecināti, ka vēlaties neatgriezeniski dzēst %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Vai jūs esat pārliecināti, ka vēlaties dzēst %d atslēgu?" +msgstr[1] "Vai jūs esat pārliecināti, ka vēlaties dzēst %d atslēgas?" +msgstr[2] "Vai jūs esat pārliecināti, ka vēlaties dzēst %d atslēgu?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Nepareiza parole" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Šī bija trešā reize, kad ievadījāt nepareizu paroli. Lūdzu, mēģiniet vēlreiz." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Nepareiza parole." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Ievadiet jaunu '%s' paroli" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Ievadiet '%s' paroli" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Ievadiet jaunu paroli" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Ievadiet paroli" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Parole" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Ielādēta %d atslēga" +msgstr[1] "Ielādētas %d atslēgas" +msgstr[2] "Ielādētas %d atslēgas" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Nederīgi atslēgas dati (trūkst UID). Tas, iespējams, ir tādēļ, ka dators ir " +"ar iestatītu datumu nākotnē, vai arī atslēga nav pašparakstīta." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG atslēgas" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: noklusētā saišķa direktorija" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -977,38 +1130,42 @@ "This is not a image file, or an unrecognized kind of image file. Try to use " "a JPEG image." msgstr "" -"Šis nav attēla fails, vai arī tas ir nepazīstamā formātā. Mēģiniet izmantot " +"Šī nav attēla datne, vai arī tā ir nepazīstamā formātā. Mēģiniet izmantot " "JPEG attēlu." #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" -msgstr "Visi attēlu faili" +msgstr "Visas attēlu datnes" #: ../pgp/seahorse-gpgme-photos.c:237 msgid "All JPEG files" -msgstr "Visi JPEG faili" +msgstr "Visas JPEG datnes" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Visas datnes" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Izvēlieties fotogrāfiju, kuru pievienot atslēgai" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Neizdevās sagatavot fotogrāfiju" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Neizdevās pievienot fotogrāfiju" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" -msgstr "Neizdevās ielādēt failu. Iespējams tam ir nederīgs formāts" +msgstr "Neizdevās ielādēt datni. Iespējams tai ir nederīgs formāts" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Vai tiešām vēlaties izņemt aktuālo fotogrāfiju no atslēgas?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Neizdevās izdzēst fotogrāfiju" @@ -1066,7 +1223,11 @@ msgid "Couldn't add revoker" msgstr "Neizdevās pievienot atsaucēju" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Es saprotu, ka šī slepenā atslēga tiks neatgriezeniski dzēsta." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1081,11 +1242,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nav parakstīšanai lietojamu atslēgu" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1093,511 +1254,572 @@ "Jums nav pieejama neviena personīgā PGP atslēga, kuru varētu izmantot, lai " "apstiprinātu jūsu uzticēšanās līmeni šai atslēgai." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Nepareiza parole." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Ievadiet jaunu '%s' paroli" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Meklējums nebija pietiekami konkrēts. Serveris '%s' atrada pārāk daudz " +"atslēgas." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Ievadiet '%s' paroli" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Neizdevās sazināties ar serveri '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Ievadiet jaunu paroli" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP atslēgu serveris" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Ievadiet paroli" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Neizdevās importēt atslēgas" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importē atslēgas no atslēgu serveriem" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Attālināta" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Aizvērt šo logu" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Meklēt attālinātās atslēgas..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Meklēt priekš atslēgas uz atslēgas servera" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importēt" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importēt izvēlētās atslēgas lokālajā atslēgu riņķī" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Attālinātās atslēgas" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Ielādēta %d atslēga" -msgstr[1] "Ielādētas %d atslēgas" -msgstr[2] "Ielādētas %d atslēgas" +msgid "Remote Keys Containing '%s'" +msgstr "Attālinātās atslēgas, kuras satur '%s'" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Atslēgu meklēšana neizdevās." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Meklēt attālinātās atslēgas" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Nederīgi atslēgas dati (trūkst UID). Tas, iespējams, ir tādēļ, ka dators ir " -"ar iestatītu datumu nākotnē, vai arī atslēga nav pašparakstīta." +"Internetā tiks atrastas citu lietotāju atslēgas. Šīs atslēgas varēsiet " +"importēt jūsu atslēgu saišķī." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Meklēt atslēgas, kuras satur: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP atslēgu serveris" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Atslēgu serveri:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Tuvu man koplietotās atslēgas:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Kur meklēt:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Meklēt" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Neizdevās publicēt atslēgas serverī" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Meklējums nebija pietiekami konkrēts. Serveris '%s' atrada pārāk daudz " -"atslēgas." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Neizdevās dabūt atslēgas no servera: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Neizdevās sazināties ar serveri '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] " %d atslēga ir izvēlēta sinhronizēšanai" +msgstr[1] "%d atslēgas ir izvēlētas sinhronizēšanai" +msgstr[2] "%d atslēgas ir izvēlētas sinhronizēšanai" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Sinhronizē atslēgas..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sinhronizēt atslēgas" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Publicēs atslēgas no jūsu atslēgu saišķa, lai tās būtu pieejamas citiem " +"lietošanai. Tiks arī atjauninātas jebkuras izmaiņas, ko citi būs veikuši, " +"kopš jūs saņēmāt viņu atslēgas." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Atjauninās jebkuras izmaiņas, ko citi būs veikuši, kopš jūs saņēmāt viņu " +"atslēgas. Neviens atslēgas serveris nav izvēlēts publicēšanai, tādējādi jūsu " +"atslēgas nebūs pieejamas citiem." -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Atslēgu serveri" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sinhronizēt" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Neizdevās sazināties ar '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Pieslēdzas pie: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Neizdevās sameklēt adresi: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Meklē servera adresi: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP atslēgu serveris" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Parakstīt atslēgu..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Parakstīt publisko atslēgu" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Vai jūs esat pārliecināti, ka vēlaties neatgriezeniski dzēst %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" -"Vai jūs esat pārliecināti, ka vēlaties dzēst %d atslēgas un identitātes?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Vai jūs esat pārliecināti, ka vēlaties dzēst %d atslēgas?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Vai jūs esat pārliecināti, ka vēlaties dzēst %d identitātes?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sinhronizēt un publicēt atslēgas..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Neizdevās izdzēst lietotāja ID" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publicēt un/vai sinhronizēt tavas atslēgas ar tiešsaistē esošajām." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Neizdevās dzēst privāto atslēgu" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Neizdevās dzēst publisko atslēgu" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP atslēgas" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP atslēgas izmanto, lai šifrētu e-pastu vai datnes" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Paplašinātas atslēgas opcijas" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "Iz_veidot" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "PGP atslēga ļauj jums šifrēt e-pastu vai failus citiem cilvēkiem." +msgid "Generate a new key" +msgstr "Ģenerēt jaunu atslēgu" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmi šeit" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "PGP atslēga ļauj šifrēt e-pastu vai datnes citiem cilvēkiem." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "Iz_veidot" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Komentārs:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Derīguma _termiņš:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Derīguma termiņš nekad nebeidzas" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Šifrēšanas _tips:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Ģenerēt jaunu atslēgu" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Atslēgas _stiprums (bitos):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Derīguma termiņš nekad nebeidzas" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Jauna PGP atslēga" +msgid "E_xpiration Date:" +msgstr "Derīguma _termiņš:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Komentārs:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Paplašinātas atslēgas opcijas" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Beidzies derīguma termiņš" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Personīgā PGP atslēga" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP atslēga" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Neizdevās izmainīt primāro lietotāja ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Vai esat pārliecināti, ka vēlaties neatgriezeniski dzēst '%s' lietotāja ID?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Neizdevās izdzēst lietotāja ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Nezināms]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Vārds/e-pasts" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Paraksta ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Neizdevās nomainīt primāro fotogrāfiju" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(nezināms)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Šīs atslēgas derīguma termiņš bija līdz %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nosaukums" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Vai tiešām vēlaties neatgriezeniski dzēst apakšatslēgu %d no %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Neizdevās izdzēst apakšatslēgu" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Neizdevās nomainīt uzticamību" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Neizdevās eksportēt atslēgu uz \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Eksportēt pilnu atslēgu" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Neizdevās eksportēt atslēgu." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Neizdevās eksportēt atslēgu" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nekad" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tips" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Izveidota" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Derīga līdz" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Statuss" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Stiprums" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Beidzies derīguma termiņš" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Labi" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Atslēgas ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Darbības" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Komentāri:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datumi" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-pasts:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Nospiedums" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Atslēgas ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nekad" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Atslēgu nosaukumi un paraksti" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Atslēga ir atsaukta" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotogrāfija" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Atslēgas īpašnieks ir atsaucis šo atslēgu. Tā vairs nav izmantojama." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Tehniskās detaļas" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Atslēgai ir beidzies derīguma termiņš" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Atslēga ir atsaukta" +msgid "Add a photo to this key" +msgstr "Pievienot fotogrāfiju šai atslēgai" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Atslēgai ir beidzies derīguma termiņš" +msgid "Remove this photo from this key" +msgstr "Aizvākt šo fotogrāfiju no šīs atslēgas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tips:" +msgid "Make this photo the primary photo" +msgstr "Padarīt šo fotogrāfiju par primāro" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Iet uz iepriekšējo fotogrāfiju" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Izmantošana:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Apakšatslēgas" +msgid "Go to next photo" +msgstr "Iet uz nākamo fotogrāfiju" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Pievienot" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotogrāfija" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Pievienot fotogrāfiju šai atslēgai" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Atslēgas ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Mainīt _paroli" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nosaukums:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Atkodēt failus un aizsūtīt sev." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-pasts:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Dzēst" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Komentāri:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Derīgums" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Izmantošana:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Derīga līdz:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tips:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Eksportēt" +msgid "Decrypt files and email sent to you." +msgstr "Atšifrēt datnes un aizsūtīt sev." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Privātā PGP atslēga" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Iet uz nākamo fotogrāfiju" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Mainīt _paroli" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Iet uz iepriekšējo fotogrāfiju" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Īpašnieks" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Atslēgas ID:" +msgid "Key Names and Signatures" +msgstr "Atslēgu nosaukumi un paraksti" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primārais" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Padarīt šo fotogrāfiju par primāro" +msgid "Sign" +msgstr "Parakstīt" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nosaukumi un paraksti" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Dzēst" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nekad" +msgid "_Add Name" +msgstr "_Pievienot nosaukumu" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Aizstāt īpašnieka _uzticamību:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Īpašnieks" +msgid "Revoke" +msgstr "Atsaukt" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primārais" +msgid "Names and Signatures" +msgstr "Nosaukumi un paraksti" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Privātā PGP atslēga" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Atslēgas ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Aizvākt šo fotogrāfiju no šīs atslēgas" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Atsaukt" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Stiprums:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Parakstīt" +msgid "Technical Details" +msgstr "Tehniskās detaļas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Stiprums:" +msgid "Fingerprint" +msgstr "Nospiedums" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Atslēgas īpašnieks ir atsaucis šo atslēgu. Tā vairs nav izmantojama." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Derīga līdz:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Pievienot nosaukumu" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datumi" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Aizstāt īpašnieka _uzticamību:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Eksportēt visu atslēgu:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nosaukums:" +msgid "Actions" +msgstr "Darbības" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datumi:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Pievienot" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Derīgums" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Apakšatslēgas" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Daļēji" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Nospiedumi:" +msgid "Fully" +msgstr "Pilnībā" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Norādītdit uzticamību:" +msgid "Ultimately" +msgstr "Gandrīz" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Jūsu uzticība šai atslēgai" +msgid "Encrypt files and email to the key's owner" +msgstr "Šifrēt datnes un e-pastus un nosūtīt tos atslēgas īpašniekam " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Publiskā PGP atslēga" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Citi vārdi:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "Cil_vēki, kas parakstījuši šai atslēgu:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Šifrēt failus un nosūtīt atslēgas īpašniekam " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Jūsu uzticība šai atslēgai" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Pilnībā" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Jūsu uzticība tiek pašrocīgi norādīta Detaļas cilnē." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Es uzticos '%s' parakstiem par citām atslēgām" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1606,7 +1828,11 @@ "Ja jūs ticat, ka persona, kurai pieder šī atslēga, ir '%s', parakstiet šo atslēgu:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Parakstīt šo atslēgu" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1614,43 +1840,38 @@ "Ja jūs vairāk neuzticaties tam, ka '%s' pieder šī atslēga, atsauciet " "jūsu parakstu:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Daļēji" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Publiskā PGP atslēga" +msgid "_Revoke Signature" +msgstr "_Atsaukt parakstu" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "Cil_vēki, kas parakstījuši šai atslēgu:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Rādīt šo parakstu tikai man uzticamiem cilvēkiem" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Uzticamība" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Gandrīz" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Jūs _uzticaties īpašniekam:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Jūsu uzticība tiek pašrocīgi norādīta Detaļas cilnē." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Nospiedumi:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Rādīt šo parakstu tikai man uzticamiem cilvēkiem" +msgid "Dates:" +msgstr "Datumi:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Atsaukt parakstu" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Norādītdit uzticamību:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Parakstīt šo atslēgu" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Jūs _uzticaties īpašniekam:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1658,55 +1879,62 @@ msgstr "Apakšatslēga %d no %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Atsaukšanas iemesls (neobligāts)" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "At_saukt" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Iemesls atslēgas atsaukšanai" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Iemesls:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Atsaukšanas iemesls (neobligāts)" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "At_saukt" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Jums nav personisku PGP atslēgu kas varētu tikt izmantotas, lai parakstītu " "dokumentu vai ziņojumu." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Parak_stīt vēstuli ar atslēgu:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Cik piesardzīgi jūs pārbaudījāt šo atslēgu?" +msgid "Sign Key" +msgstr "Parakstīt atslēgu" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Kā citi redzēs šo parakstu:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"Parakstoties, jūs aplieciniet, ka uzticaties tam, kam šī atslēga pieder:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Parakstīt atslēgu kā:" +msgid "Key Name" +msgstr " Atslēgas nosaukums" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Vispārīgi: nozīmē jūs esat veikuši parasto pārbaudi un noskaidrojuši " -"atslēgas piederību dotajai personai. Piemēram, jūs varētu nolasīt atslēgas " -"nospiedumu īpašniekam pa telefonu salīdzināšanai." +msgid "How carefully have you checked this key?" +msgstr "Cik piesardzīgi jūs pārbaudījāt šo atslēgu?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr " Atslēgas nosaukums" +msgid "_Not at all" +msgstr "_Nemaz" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Vispārīgi" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Ļoti rūpīgi" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1714,7 +1942,17 @@ "Nemaz: nozīmē ka jūs ticat, ka atslēga pieder dotajai personai, bet " "jūs nevarējāt pārbaudīt vai nepārbaudījāt šo faktu." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Vispārīgi: jūs esat veikuši parasto pārbaudi un noskaidrojuši " +"atslēgas piederību dotajai personai. Piemēram, jūs varētu nolasīt atslēgas " +"nospiedumu īpašniekam pa tālruni salīdzināšanai. " + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1722,19 +1960,6 @@ "Ļoti rūpīgi: Izvēlieties šo tikai tad, kad esat absolūti " "pārliecināti, ka atslēga ir īsta." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "" -"Parakstoties, jūs aplieciniet, ka uzticaties tam, kam šī atslēga pieder:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Varu _atsaukt šo parakstu vēlāk." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Parakstīt atslēgu" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1747,487 +1972,358 @@ "īpašniekam." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Vispārīgi" +msgid "How others will see this signature:" +msgstr "Kā citi redzēs šo parakstu:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Nemaz" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Citi varētu neredzēt šo parakstu" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Varu _atsaukt šo parakstu vēlāk." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Paraksts" +msgid "Sign key as:" +msgstr "Parakstīt atslēgu kā:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Parakstītājs:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Ļoti rūpīgi" +msgid "_Sign" +msgstr "_Paraksts" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Parak_stīt vēstuli ar atslēgu:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Eksportē datus" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Saņem datus" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importē datus" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Sūta datus" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Nav pieejams" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Personīgais sertifikāts un atslēga" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Personīgais sertifikāts" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Sertifikāts" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Sertifikāti (DER kodēti)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Sertifikāti" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 sertifikāti un saistītās atslēgas" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Vai jūs esat pārliecināti, ka vēlaties dzēst %d identitāti?" +msgstr[1] "Vai jūs esat pārliecināti, ka vēlaties dzēst %d identitātes?" +msgstr[2] "Vai jūs esat pārliecināti, ka vēlaties dzēst %d identitātes?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Neizdevās uzģenerēt privāto atslēgu" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Izveidot" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Privātā atslēga" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Tiek izmantots, lai pieprasītu sertifikātu" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Izveidot jaunu privāto atslēgu" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etiķete:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Noglabāts:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Es saprotu, ka šī atslēga tiks neatgriezeniski dzēsta." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Nenosaukts" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Neizdevās eksportēt sertifikātu" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Neizdevās izdzēst" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Vai esat pārliecināts, ka vēlaties dzēst sertifikātu '%s'?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Vai esat pārliecināts, ka vēlaties dzēst %d sertifikātu?" -msgstr[1] "Vai esat pārliecināts, ka vēlaties dzēst %d sertifikātus?" -msgstr[2] "Vai esat pārliecināts, ka vēlaties dzēst %d sertifikātus?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Dzēš" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Eksportēt" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Eksportēt sertifikātu" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Dzēst šo sertifikātu vai atslēgu" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Pieprasīt _sertifikātu" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Izveidot sertifikāta pieprasījuma datni šai atslēgai" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Neizdevās saglabāt sertifikāta pieprasījumu" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Saglabāt sertifikāta pieprasījumu" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Sertifikāta pieprasījums" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM šifrēts pieprasījums" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Neizdevās izveidot sertifikāta pieprasījumu" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Izveidot sertifikāta pieprasījuma datni." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "" +"Kopējais nosaukums (common name vai CN), kas norādīts sertifikāta " +"pieprasījumā." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nosaukums (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Nenosaukta privātā atslēga" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Mainīt paroli" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Ap_stiprināt paroli:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Apstiprināt jauno paroli" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "Jauna _parole:" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Pārvaldīt paroles un šifrēšanas atslēgas" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Paroles un atslēgas" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "Izvēlietie_s izveidojamās vienības tipu:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "T_urpināt" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Izveidot jaunu ..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Izvēlēta %d atslēga" -msgstr[1] "Izvēlētas %d atslēgas" -msgstr[2] "Izvēlētas %d atslēgas" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Neizdevās importēt atslēgas" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importētās atslēgas" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importē atslēgas" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importēt atslēgu" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Neatpazīstams atslēgas tips, vai nederīgs datu formāts" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importē atslēgas" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Attālināta" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Aizvērt šo programmu" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Jauna..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Izveidot jaunu atslēgu vai vienību" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importēt..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importēt no faila" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importēt no starpliktuves" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Meklēt attālinātās atslēgas..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Meklēt priekš atslēgas uz atslēgas servera" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sinhronizēt un publicēt atslēgas..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publicēt un/vai sinhronizēt tavas atslēgas ar tiešsaistē esošajām." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_ipi" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Parādīt tipa kolonnu" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Derīguma termiņš" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Parādīt derīguma termiņa kolonnu" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Uzticamība" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Parādīt īpašnieka uzticamības kolonnu" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Derīgums" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Parādīt derīguma kolonnu" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtrs:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Pirmās reizes opcijas" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Izveidot sev jaunu atslēgu: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importēt eksistējošas atslēgas no faila:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Manas _personīgās atslēgas" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Citas _atslēgas" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Lai sāktu ar šifrēšanu, jums būs nepieciešamas atslēgas." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importēt" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Paroles" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Neizdevās eksportēt atslēgas" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Derīgums" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Derīgs līdz" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Aizvērt šo logu" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Izplest visus" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Izvērst visus sarakstus" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Sakļaut visus" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Sakļaut visus sarakstus" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Attālinātās atslēgas" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Attālinātās atslēgas, kuras satur '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Atslēgu serveri:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Tuvu man koplietotās atslēgas:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Meklēt attālinātās atslēgas" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Internetā tiks atrastas citu lietotāju atslēgas. Šīs atslēgas varēsiet " -"importēt jūsu atslēgu saišķī." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Kur meklēt:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Meklēt" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Meklēt atslēgas, kuras satur: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Neizdevās publicēt atslēgas serverī" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Neizdevās dabūt atslēgas no servera: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] " %d atslēga ir izvēlēta sinhronizēšanai" -msgstr[1] "%d atslēgas ir izvēlētas sinhronizēšanai" -msgstr[2] "%d atslēgas ir izvēlētas sinhronizēšanai" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Sinhronizē atslēgas..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sinhronizēt atslēgas" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Publicēs atslēgas no jūsu atslēgu saišķa, lai tās būtu pieejamas citiem " -"lietošanai. Tiks arī atjauninātas jebkuras izmaiņas, ko citi būs veikuši, " -"kopš jūs saņēmāt viņu atslēgas." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Atjauninās jebkuras izmaiņas, ko citi būs veikuši, kopš jūs saņēmāt viņu " -"atslēgas. Neviens atslēgas serveris nav izvēlēts publicēšanai, tādējādi jūsu " -"atslēgas nebūs pieejamas citiem." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Atslēgu serveri" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Apstiprināt jauno paroli" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sinhronizēt" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Ap_stiprināt paroli:" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Šīs lietotnes versija" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Pārvaldīt paroles un šifrēšanas atslēgas" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Palīdzējuši:" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Turpināt" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Nauris Kanasnieks \n" -"Jānis Laimiņš \n" -"Pēteris Krišjānis \n" -"\n" -"Launchpad Contributions:\n" -" Mārtiņš Bruņenieks https://launchpad.net/~papuass\n" -" Pēteris Krišjānis https://launchpad.net/~pecisk-gmail\n" -" Raivis Dejus https://launchpad.net/~orvils" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "Izvēlietie_s izveidojamās vienības tipu:" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse projekta mājas lapa" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Importēšana neizdevusies" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importēšana" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Dati, kas tiks importēti" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fails" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importēt atslēgu" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Rediģēt" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Visas atslēgu datnes" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Skats" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Nomests teksts" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Palīdzība" +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Starpliktuves teksts" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Ies_tatījumi" +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Jauns" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Mainīt šīs programmas iestatījumus" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Aizvērt šo programmu" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Par programmu" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Jauna..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Saturs" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Izveidot jaunu atslēgu vai vienību" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Parādīt Seahorse palīdzību" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Izveidot jaunu atslēgu vai vienumu" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Eksportē publisko atslēgu" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importēt..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Eksportē atslēgas" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importēt no datnes" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Neizdevās iegūt datus no atslēgu servera" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importēt no starpliktuves" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Nokopēja atslēgas" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Pēc _saišķa" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Rādīt sānu joslu ar saišķu sarakstu" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Rādīt _personīgos" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Rādīt tikai personīgās atslēgas, sertifikātus un paroles" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Rādīt _uzticamos" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Rādīt tikai uzticamās atslēgas, sertifikātus un paroles" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Rādīt _jebkādu" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Rādīt visas atslēgas, sertifikātus un paroles" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtrs" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Iegūst atslēgas" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Pirmās reizes opcijas" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s ir privātā atslēga. Vai esat pārliecināts, ka vēlaties turpināt?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Izveidot sev jaunu atslēgu: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importē atslēgas no atslēgu serveriem" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importēt eksistējošas atslēgas no datnes:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Rādīt rekvizītus" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Lai sāktu ar šifrēšanu, jums būs nepieciešamas atslēgas." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Dzēst" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Neizdevās aizslēgt" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Neizdevās atslēgt" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Dzēst izvēlētās vienības" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "Aiz_slēgt" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_ksportēt..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Atslēgt" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Eksportēt uz failu" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "Ī_pašības" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopēt uz starpliktuvi" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Konfigurēt atslēgu _drošajai čaulai..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importēt izvēlētās atslēgas lokālajā atslēgu riņķī" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Nosūtīt publisko drošās čaulas atslēgu uz citu datoru un aktivizēt kontus, " +"kuri izmantos šo atslēgu." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2253,182 +2349,207 @@ #: ../ssh/seahorse-ssh-askpass.c:93 #, c-format -#| msgid "Enter the new passphrase for: %s" msgid "Enter the new passphrase again: %s" msgstr "Atkārtoti ievadiet jauno paroli: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Konfigurēt atslēgu _drošajai čaulai..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Nosūtīt publisko drošās čaulas atslēgu uz citu datoru un aktivizēt kontus, " -"kuri izmantos šo atslēgu." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Drošā čaula" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Atslēgas, kas tiek izmantotas, lai pieslēgtos citiem datoriem" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Vai tiešām vēlaties dzēst drošās čaulas atslēgu '%s'?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Vai esat pārliecināts, ka vēlaties dzēst %d drošās čaulas atslēgas?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Vai tiešām vēlaties dzēst %d drošās čaulas atslēgu?" +msgstr[1] "Vai tiešām vēlaties dzēst %d drošās čaulas atslēgas?" +msgstr[2] "Vai tiešām vēlaties dzēst %d drošās čaulas atslēgu?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ssh atslēga" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Drošās SSH atslēgas" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Publiskās SSH atslēgas" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Šai atslēgai nav pieejama datne ar publiskās atslēgas daļu." -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Neizdevās izdzēst atslēgu" - -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Drošās čaulas atslēga" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Izmanto, lai piekļūtu citiem datoriem (piem.: caur termināli)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Neizdevās izveidot drošās čaulas atslēgu" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Izveido drošās čaulas atslēgu" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Jauna drošās čaulas atslēga" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Izmantojiet jūsu e-pasta adresi, un jebkuru citu jums nepieciešamu " -"atgādinājumu par šīs atslēgas mērķi." +msgid "_Just Create Key" +msgstr "Izveidot _tikai atslēgu" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Izveidot un iestatīt" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" "Drošās čaulas (Secure Shell jeb SSH) atslēga ļauj jums droši savienoties ar " -"uzticamiem datoriem izmantojot SSH, neizmantojot paroles." +"citiem datoriem." -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"Ja ir jau kāds dators, ar kuru jūs vēlaties šo atslēgu izmantot, jūs tagad " -"varat iestatīt to, lai tas atpazītu jūsu atslēgu." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Jauna drošās čaulas atslēga" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Izveidot un iestatīt" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "Izveidot _tikai atslēgu" +"Jūsu e-pasta adrese, vai jebkurš cits atgādinājums par to, kam šis " +"saišķis domāts." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Atslēgas apraksts:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Ja ir jau kāds dators, ar kuru jūs vēlaties šo atslēgu izmantot, jūs to " +"varat iestatīt, lai tas atpazītu jūsu atslēgu." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Nenolasāma drošās čaulas atslēga)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Personīgā SSH atslēga" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH atslēga" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Neizdevās pārsaukt atslēgu." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Neizdevās nomainīt atslēgas autorizāciju." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Neizdevās nomainīt atslēgas paroli." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritms:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identifikators:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Atrašanās vieta:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nosaukums:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Stiprums:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Izmanto, lai pieslēgtos citiem datoriem." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Uzticamība" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Šīs atslēgas īpašnieks ir _autorizēts, lai pieslēgtos šim datoram" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Attiecas tikai uz '%s' kontu." +msgid "This only applies to the %s account." +msgstr "Attiecas tikai uz %s kontu." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_ksportēt pilnu atslēgu" +msgid "Algorithm:" +msgstr "Algoritms:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Šīs atslēgas īpašnieks ir _autorizēts, lai pieslēgtos šim datoram" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Stiprums:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Atrašanās vieta:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Izmanto, lai pieslēgtos citiem datoriem." +msgid "E_xport Complete Key" +msgstr "E_ksportēt pilnu atslēgu" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH komanda tika negaidīti pārtraukta." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH komanda neizdevās." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Attālinātā saimniekdatora parole" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Ievadiet atslēgas paroli" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Parole jaunajai drošās čaulas atslēgai" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importē atslēgu: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importē atslēgu. Ievadiet paroli" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH atslēgas" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." -msgstr "Šai atslēgai nav pieejams privātās atslēgas fails." +msgstr "Šai atslēgai nav pieejama privātās atslēgas datne." #: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." @@ -2439,14 +2560,10 @@ msgstr "Konfigurē drošās čaulas atslēgas..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "piem..: failuserveris.piemers.lv:ports" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Iestatīt datoru SSH savienojumam" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2454,6 +2571,10 @@ "Lai izmantotu jūsu drošās čaulas atslēgu ar citu datoru kas izmanto SSH, " "jums jābūt jau izveidotam kontam uz tā." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "piemēram: datnuserveris.piemers.lv:ports" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Datora nosaukums:" @@ -2466,11 +2587,201 @@ msgid "_Set Up" msgstr "_Iestatīt" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "Pieteikšanās saišķis" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Piekļuve atslēgu saišķim tika liegta" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Gnome-keyring dēmons nav palaists" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Atslēgu saišķim jau ir atslēgts" + +#~ msgid "No such key ring exists" +#~ msgstr "Tāds atslēgu saišķis neeksistē" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Neizdevās sazināties ar atslēgu saišķa dēmonu" -#~ msgid "Secure Shell key" -#~ msgstr "Drošās čaulas atslēga" +#~ msgid "The item already exists" +#~ msgstr "Vienība jau eksistē" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Iekšēja kļūda piekļūstot gnome-keyring" + +#~ msgid "Algorithms here" +#~ msgstr "Algoritmi šeit" + +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "Vai esat pārliecināts, ka vēlaties dzēst %d drošās čaulas atslēgas?" + +#~| msgctxt "name-of-key" +#~| msgid "Name:" +#~ msgid "Name:" +#~ msgstr "Nosaukums:" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Dzēš vienību" +#~ msgstr[1] "Dzēš vienības" +#~ msgstr[2] "Dzēš vienību" + +#~ msgid "Passwords: %s" +#~ msgstr "Paroles: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Paroles: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Slēgt paroļu saišķi; tādējādi galvenā parole tiks pieprasīta, lai to " +#~ "atslēgtu." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Atslēgt paroļu saišķi ar galveno paroli, lai tas būtu pieejams lietošanai." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Neizdevās dzēst atslēgu saišķi" + +#~ msgid "Archive files" +#~ msgstr "Arhīva faili" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Fails ar šādu nosaukumu jau pastāv\n" +#~ "\n" +#~ "Vai vēlaties aizstāt to ar jauno failu?" + +#~ msgid "_Replace" +#~ msgstr "_Aizvietot" + +#~ msgid "_Sign Key..." +#~ msgstr "_Parakstīt atslēgu..." + +#~ msgid "Sign public key" +#~ msgstr "Parakstīt publisko atslēgu" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Vai jūs esat pārliecināti, ka vēlaties dzēst %d atslēgas un identitātes?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Neizdevās dzēst publisko atslēgu" + +#~ msgid "New PGP Key" +#~ msgstr "Jauna PGP atslēga" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Neizdevās eksportēt atslēgu uz \"%s\"" + +#~ msgid "Export Complete Key" +#~ msgstr "Eksportēt pilnu atslēgu" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Vai esat pārliecināts, ka vēlaties dzēst sertifikātu '%s'?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Vai esat pārliecināts, ka vēlaties dzēst %d sertifikātu?" +#~ msgstr[1] "Vai esat pārliecināts, ka vēlaties dzēst %d sertifikātus?" +#~ msgstr[2] "Vai esat pārliecināts, ka vēlaties dzēst %d sertifikātus?" + +#~ msgid "Deleting" +#~ msgstr "Dzēš" + +#~ msgid "Create New ..." +#~ msgstr "Izveidot jaunu ..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Izvēlēta %d atslēga" +#~ msgstr[1] "Izvēlētas %d atslēgas" +#~ msgstr[2] "Izvēlētas %d atslēgas" + +#~ msgid "Importing keys" +#~ msgstr "Importē atslēgas" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Neatpazīstams atslēgas tips, vai nederīgs datu formāts" + +#~ msgid "Importing Keys" +#~ msgstr "Importē atslēgas" + +#~ msgid "T_ypes" +#~ msgstr "T_ipi" + +#~ msgid "Show type column" +#~ msgstr "Parādīt tipa kolonnu" + +#~ msgid "_Expiry" +#~ msgstr "_Derīguma termiņš" + +#~ msgid "Show expiry column" +#~ msgstr "Parādīt derīguma termiņa kolonnu" + +#~ msgid "_Trust" +#~ msgstr "_Uzticamība" + +#~ msgid "Show owner trust column" +#~ msgstr "Parādīt īpašnieka uzticamības kolonnu" + +#~ msgid "_Validity" +#~ msgstr "_Derīgums" + +#~ msgid "Show validity column" +#~ msgstr "Parādīt derīguma kolonnu" + +#~ msgid "Other _Keys" +#~ msgstr "Citas _atslēgas" + +#~ msgid "Validity" +#~ msgstr "Derīgums" + +#~ msgid "Expiration Date" +#~ msgstr "Derīgs līdz" + +#~ msgid "_Expand All" +#~ msgstr "_Izplest visus" + +#~ msgid "Expand all listings" +#~ msgstr "Izvērst visus sarakstus" + +#~ msgid "_Collapse All" +#~ msgstr "_Sakļaut visus" + +#~ msgid "Collapse all listings" +#~ msgstr "Sakļaut visus sarakstus" + +#~ msgid "Export public key" +#~ msgstr "Eksportē publisko atslēgu" + +#~ msgid "Exporting keys" +#~ msgstr "Eksportē atslēgas" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Neizdevās iegūt datus no atslēgu servera" + +#~ msgid "Retrieving keys" +#~ msgstr "Iegūst atslēgas" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s ir privātā atslēga. Vai esat pārliecināts, ka vēlaties turpināt?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Neizdevās izdzēst atslēgu" + +#~ msgid "_Key Description:" +#~ msgstr "_Atslēgas apraksts:" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "Ievadiet paroli jaunajai drošās čaulas atslēgai." @@ -2481,9 +2792,6 @@ #~ msgid "couldn't fork process" #~ msgstr "neizdevās atdalīt procesu" -#~ msgid "couldn't create new process group" -#~ msgstr "neizdevās izveidot jaunu procesu grupu" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Šifrēšanas dēmons (Seahorse)" @@ -2535,9 +2843,6 @@ #~ msgid "Bad Signature" #~ msgstr "Slikts paraksts" -#~ msgid "Couldn't verify signature." -#~ msgstr "Neizdevās apstiprināt parakstu." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Nederīgs vai neatpazīts parakstītājs: %s" @@ -2728,9 +3033,6 @@ #~ msgid "Web Password" #~ msgstr "Tīmekļa parole" -#~ msgid "Network Password" -#~ msgstr "Tīkla parole" - #~ msgid "Couldn't set application access." #~ msgstr "Neizdevās iestatīt lietotnes pieeju." @@ -2854,12 +3156,6 @@ #~ msgid "Symmetric Key" #~ msgstr "Simetriskā atslēga" -#~ msgid "Public Key" -#~ msgstr "Publiskā atslēga" - -#~ msgid "Private Key" -#~ msgstr "Privātā atslēga" - #~ msgid "Credentials" #~ msgstr "Akreditācijas dati" @@ -2881,9 +3177,6 @@ #~ msgid "Loading Keys..." #~ msgstr "Ielādē atslēgas..." -#~ msgid "Searching for keys..." -#~ msgstr "Meklē atslēgas..." - #~ msgid "Uploading keys..." #~ msgstr "Augšupielādē atslēgas..." @@ -2908,9 +3201,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "Sinhronizē atslēgas" -#~ msgid "Encryption Key Manager" -#~ msgstr "Šifrēšanas atslēgu pārvaldnieks" - #~ msgid "Invalid" #~ msgstr "Nederīga" diff -Nru seahorse-3.2.2/po/Makefile.in.in seahorse-3.6.3/po/Makefile.in.in --- seahorse-3.2.2/po/Makefile.in.in 2011-11-14 11:51:38.000000000 +0100 +++ seahorse-3.6.3/po/Makefile.in.in 2012-11-09 17:33:38.000000000 +0100 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru seahorse-3.2.2/po/mk.po seahorse-3.6.3/po/mk.po --- seahorse-3.2.2/po/mk.po 2011-09-14 17:04:58.000000000 +0200 +++ seahorse-3.6.3/po/mk.po 2012-08-21 12:23:19.000000000 +0200 @@ -12,741 +12,537 @@ msgid "" msgstr "" "Project-Id-Version: seahorse.HEAD.mk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-07 12:48+0000\n" -"PO-Revision-Date: 2008-09-25 18:48+0200\n" -"Last-Translator: Jovan Naumovski \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-12-19 08:57+0000\n" +"PO-Revision-Date: 2012-01-02 21:36+0100\n" +"Last-Translator: Jovan N\n" "Language-Team: Macedonian \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=3; plural= n==1 || n%10==1 ? 0 : 1\n" +"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n" -#: ../daemon/seahorse-daemon.c:66 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "Не го извршувај seahorse-daemon како демон" - -#: ../daemon/seahorse-daemon.c:84 -msgid "couldn't fork process" -msgstr "не можам да го разделам процесот" - -#: ../daemon/seahorse-daemon.c:90 -msgid "couldn't create new process group" -msgstr "не можам да креирам нова група за процеси" - -#: ../daemon/seahorse-daemon.c:191 -msgid "Encryption Daemon (Seahorse)" -msgstr "Демон за енкриптирање (Seahorse)" - -#: ../daemon/seahorse-service.c:110 ../daemon/seahorse-service.c:134 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "Невалиден или непрепознаен тип на клуч: %s" - -#: ../daemon/seahorse-service.c:183 ../daemon/seahorse-service-keyset.c:130 -#: ../daemon/seahorse-service-keyset.c:160 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "Невалиден или непрепознаен клуч: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:142 -#, c-format -msgid "Signed by expired on %s." -msgstr "Потпишано од <Ид. на клуч='%s'/> истечено на %s." - -#: ../daemon/seahorse-service-crypto.c:143 -msgid "Invalid Signature" -msgstr "Невалиден потпис" - -#: ../daemon/seahorse-service-crypto.c:149 -#, c-format -msgid "Signed by on %s Expired." -msgstr "Потпишано од <Ид. на клуч='%s'/> на %s Истечено." - -#: ../daemon/seahorse-service-crypto.c:150 -msgid "Expired Signature" -msgstr "Истечен потпис" - -#: ../daemon/seahorse-service-crypto.c:156 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "Потпишано од <Ид. на клуч='%s'/> Отповикано на %s." - -#: ../daemon/seahorse-service-crypto.c:157 -msgid "Revoked Signature" -msgstr "Отповикан потпис" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:163 -#, c-format -msgid "Signed by on %s." -msgstr "Потпишано од <Ид. на клуч='%s'/> на %s." - -#: ../daemon/seahorse-service-crypto.c:164 -msgid "Good Signature" -msgstr "Добар потпис" - -#: ../daemon/seahorse-service-crypto.c:169 -msgid "Signing key not in keyring." -msgstr "Клучот за потпис не е во приврзокот." - -#: ../daemon/seahorse-service-crypto.c:170 -msgid "Unknown Signature" -msgstr "Непознат потпис" - -#: ../daemon/seahorse-service-crypto.c:174 -msgid "Bad or forged signature. The signed data was modified." -msgstr "Лош или фалсификуван потпис. Потпишаните податоци беа изменети." - -#: ../daemon/seahorse-service-crypto.c:175 -msgid "Bad Signature" -msgstr "Лош потпис" +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "Додај приврзок со лозинки" -#: ../daemon/seahorse-service-crypto.c:183 -msgid "Couldn't verify signature." -msgstr "Не можев да го проверам потписот." +#: ../gkr/seahorse-add-keyring.xml.h:2 +msgid "New Keyring Name:" +msgstr "Ново име на приврзок:" -#: ../daemon/seahorse-service-crypto.c:239 -#: ../daemon/seahorse-service-crypto.c:346 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "Невалиден или непрепознаен потпишувач: %s" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "Please choose a name for the new keyring. You will be prompted for an unlock password." +msgstr "Ве молам, одберете име за новиот приврзок. Ќе треба да дадете лозинка за отклучување." + +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "Име на хост или адреса на серверот." -#: ../daemon/seahorse-service-crypto.c:246 -#: ../daemon/seahorse-service-crypto.c:353 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "Овој клуч не е валиден за потпишување: %s" +#: ../gkr/seahorse-gkr-actions.c:81 +#| msgid "Password Keyrings" +msgid "New password keyring" +msgstr "Нов приврзок за лозинки" + +#: ../gkr/seahorse-gkr-actions.c:82 +#: ../gkr/seahorse-gkr-actions.c:89 +#| msgid "_Location for application passwords:" +msgid "Used to store application and network passwords" +msgstr "Се користи за зачувување на лозинките од апликациите и од мрежата" + +#: ../gkr/seahorse-gkr-actions.c:83 +#| msgid "Network Password" +msgid "New password..." +msgstr "Нова лозинка..." + +#: ../gkr/seahorse-gkr-actions.c:84 +#: ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Безбедно зачувај лозинка или тајна." + +#: ../gkr/seahorse-gkr-actions.c:88 +#| msgid "Password Keyrings" +msgid "Password Keyring" +msgstr "Приврзок со лозинки" + +#: ../gkr/seahorse-gkr-actions.c:90 +#| msgid "Network Password" +msgid "Stored Password" +msgstr "Зачувана лозинка" + +#: ../gkr/seahorse-gkr-actions.c:151 +#| msgid "Couldn't set default password keyring" +msgid "Couldn't set default keyring" +msgstr "Не можам да поставам стандарден приврзок" -#: ../daemon/seahorse-service-crypto.c:258 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "Невалиден или непрепознаен примач: %s" +#: ../gkr/seahorse-gkr-actions.c:183 +msgid "Couldn't change keyring password" +msgstr "Не можам да ја променам лозинката на приврзокот" -#: ../daemon/seahorse-service-crypto.c:266 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "Клучот не е валиден примач за енкрипција: %s" +#: ../gkr/seahorse-gkr-actions.c:209 +msgid "_Set as default" +msgstr "_Постави како стандарден" + +#: ../gkr/seahorse-gkr-actions.c:210 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Апликацијата вообичаено зачувува нови лозинки во стандардниот приврзок" + +#: ../gkr/seahorse-gkr-actions.c:211 +#| msgid "Change Unlock _Password" +msgid "Change _Password" +msgstr "Промени ја _лозинката" + +#: ../gkr/seahorse-gkr-actions.c:212 +msgid "Change the unlock password of the password storage keyring" +msgstr "Промени ја лозинката за отклучување на приврзокот за чување на лозинки" -#: ../daemon/seahorse-service-crypto.c:275 -#, c-format -msgid "No recipients specified" -msgstr "Не се одредени примачи" +#: ../gkr/seahorse-gkr-add-item.c:60 +#: ../gkr/seahorse-gkr-add-keyring.c:71 +msgid "Couldn't add keyring" +msgstr "Не можам да додадам приврзок" -#: ../daemon/seahorse-service-crypto.c:341 -#, c-format -msgid "No signer specified" -msgstr "Не е одреден примач" +#: ../gkr/seahorse-gkr-add-item.xml.h:1 +#| msgid "Password" +msgid "Add Password" +msgstr "Додај лозинка" + +#: ../gkr/seahorse-gkr-add-item.xml.h:2 +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-revoke.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:9 +msgid "_Description:" +msgstr "_Опис:" -#: ../daemon/seahorse-service-crypto.c:396 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "Невалиден тип на клуч за декриптирање: %s" +#: ../gkr/seahorse-gkr-add-item.xml.h:3 +#| msgid "_Add Keyring" +msgid "_Keyring:" +msgstr "_Приврзок:" + +#: ../gkr/seahorse-gkr-add-item.xml.h:4 +#| msgid "Password:" +msgid "_Password:" +msgstr "_Лозинка:" + +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#| msgid "Show pass_word" +msgid "_Show Password" +msgstr "_Прикажи лозинка" + +#: ../gkr/seahorse-gkr-backend.c:99 +#| msgid "_Passwords" +msgid "Passwords" +msgstr "Лозинки" + +#: ../gkr/seahorse-gkr-backend.c:102 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Зачувани лични лозинки, акредитиви и тајни" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:317 +msgid "IM account password for " +msgstr "Лозинка за сметка на инстант пораки за " + +#: ../gkr/seahorse-gkr-item.c:383 +#| msgid "_Passwords" +msgid "Password or secret" +msgstr "Лозинка или тајна" + +#: ../gkr/seahorse-gkr-item.c:384 +#| msgid "Network Password" +msgid "Network password" +msgstr "Мрежна лозинка" -#: ../daemon/seahorse-service-crypto.c:459 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "Невалиден тип на клуч за проверка: %s" +#: ../gkr/seahorse-gkr-item.c:385 +#| msgid "Strength" +msgid "Stored note" +msgstr "Зачувана белешка" + +#: ../gkr/seahorse-gkr-item.c:386 +#| msgid "Listing passwords" +msgid "Keyring password" +msgstr "Лозинка на приврзок" + +#: ../gkr/seahorse-gkr-item.c:387 +#| msgid "Encryption Key Manager" +msgid "Encryption key password" +msgstr "Лозинка на клуч за енкрипција" + +#: ../gkr/seahorse-gkr-item.c:388 +#| msgid "Network Password" +msgid "Key storage password" +msgstr "Лозинка за клуч за склад" + +#: ../gkr/seahorse-gkr-item.c:389 +#| msgid "Show pass_word" +msgid "Google Chrome password" +msgstr "Лозинка за Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:390 +msgid "Gnome Online Accounts password" +msgstr "Лозинка за онлајн сметки на Gnome" + +#: ../gkr/seahorse-gkr-item.c:391 +#| msgid "Show pass_word" +msgid "Telepathy password" +msgstr "Лозинка за Telepathy" + +#: ../gkr/seahorse-gkr-item.c:392 +#| msgid "Listing passwords" +msgid "Instant messaging password" +msgstr "Лозинка за инстант пораки" + +#: ../gkr/seahorse-gkr-item.c:393 +msgid "Network Manager secret" +msgstr "Лозинка на Network Manager" -#: ../daemon/seahorse-service-keyset.c:196 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format -msgid "Invalid key id: %s" -msgstr "Невалидно Ид. на клуч: %s" - -#: ../daemon/seahorse-sharing.c:72 ../daemon/seahorse-sharing.c:216 -msgid "Couldn't share keys" -msgstr "Не можам да споделам клучеви" - -#: ../daemon/seahorse-sharing.c:73 -msgid "Can't publish discovery information on the network." -msgstr "Не можам да ги објавам откриените информации на мрежата." +msgid "Are you sure you want to delete the password '%s'?" +msgstr "Дали сте сигурни дека сакате да ја избришете лозинката „%s“?" -#. Translators: The %s will get filled in with the user name -#. of the user, to form a genitive. If this is difficult to -#. translate correctly so that it will work correctly in your -#. language, you may use something equivalent to -#. "Shared keys of %s". -#: ../daemon/seahorse-sharing.c:93 +#: ../gkr/seahorse-gkr-item-deleter.c:86 #, c-format -msgid "%s's encryption keys" -msgstr "Клучевите за енкриптирање на %s" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"Листа со URI на сервери за клучеви за оддалечени PGP клучеви. Во поновите " -"верзии ќе биде вклучено и име на приказ, со додавање на празен простор, па " -"името." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "Автоматско земање на клучеви" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "Автоматски синхронизирани клучеви" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "Ја контролира видливоста на колоната за истекување на менаџерот на клучеви." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "Ја контролира видливоста на колоната за доверливост на менаџерот на клучеви." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "Ја контролира видливоста на колоната за тип на менаџерот на клучеви." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "Ја контролира видливоста на колоната за валидност на менаџерот на клучеви." - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "Овозможи DNS-SD споделување" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"Овозможува DNS-SD (Apple Bonjour) споделување на клучеви. seahorse-daemon " -"мора да се извршува и мора да е компајлиран со HKP и DNS-SD поддршка." - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "Ид. на стандарниот клуч" - -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" -"Ако е поставено на точно, тогаш датотеките енкриптирани со seahorse ќе бидат " -"енкриптирани со ASCII штит." - -#: ../data/seahorse.schemas.in.h:12 -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "" -"Ако е поддесено на вистинско, тогаш стандардниот клуч секогаш ќе биде " -"додаден во енкрипцијата на примачот на листата" - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "Последниот шаблон за пребарување на сервер за клучеви" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "Последните употребувани сервери" - -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "Последниот клуч употребен за потпишување на порака." - -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "Сервери за PGP клучеви" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "Објави ги клучевите на овој сервер за клучеви." - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "Покажи истекувачка колона во менаџерот на клучеви" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "Покажи trust колона во менаџерот на копчиња" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "Покажи тип на колони во менаџерот на копчиња" - -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "Покажи валидна колона во менаџерот на копчиња" - -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"Одреди ја колоната за сортирање на примачите по прозорец. Колоните се: „име“ " -"и „Ид.“. Ставете „-“ пред името на колоната за сортирање во обратен редослед." - -#: ../data/seahorse.schemas.in.h:23 -msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." -msgstr "" -"Одреди ја колоната за сортирање на seahorse менаџерот на клучеви по " -"прозорец. Колоните се: „име“, „Ид.“, „валидност“, „истекува“, „доверливо“ и " -"„тип“. Ставете „-“ пред името на колоната за сортирање во обратен редослед." - -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "Ид. на последниот таен клуч користен за потпишување на порака." - -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "Колоната по која ќе се сортираат примачите" - -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "Колоната по која ќе се сортираат клучевите на seahorse" - -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"Серверот за клучеви на кој што ќе се објавуваат PGP клучевите. Празно за да " -"не се објавуваат PGP клучевите." - -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "" -"Последниот сервер за клучеви на кој што се извршуваше пребарување или празно " -"за сите сервери за клучеви." - -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "Последниот шаблон за пребарување на сервер за клучеви." - -#: ../data/seahorse.schemas.in.h:30 -msgid "This specifies the default key to use for certain operations, mainly signing." -msgstr "" -"Ова го одредува стандардниот клуч кој ќе се користи за одредени операции, " -"најчесто за потпишување." - -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "Дали клучевите автоматски да се земаат од серверите за клучеви." - -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." -msgstr "" -"Дали изменетите клучеви автоматски да се синхронизираат со стандардниот " -"сервер на клучеви." - -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "Дали секогаш да го енкриптира стандардниот клуч" - -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "Дали да користи ASCII Оклоп" - -#: ../gkr/seahorse-gkeyring-item.c:243 ../pgp/seahorse-pgp-key.c:209 -#: ../ssh/seahorse-ssh-key.c:115 -msgid "Invalid" -msgstr "Невалидно" - -#: ../gkr/seahorse-gkeyring-item.c:260 -msgid "Web Password" -msgstr "Web лозинка" - -#: ../gkr/seahorse-gkeyring-item.c:262 -msgid "Network Password" -msgstr "Мрежна лозинка" +#| msgid "Are you sure you want to delete %d passwords?" +msgid "Are you sure you want to delete %d password?" +msgid_plural "Are you sure you want to delete %d passwords?" +msgstr[0] "Дали сте сигурни дека сакате да избришете %d лозинка?" +msgstr[1] "Дали сте сигурни дека сакате да избришете %d лозинки?" -#: ../gkr/seahorse-gkeyring-item.c:264 -#: ../gkr/seahorse-gkeyring-item-properties.c:126 -#: ../gkr/seahorse-gkeyring-source.c:676 -msgid "Password" -msgstr "Лозинка" - -#: ../gkr/seahorse-gkeyring-item-properties.c:98 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a network share or resource" msgstr "Пристапи мрежно споделување или ресурс" -#: ../gkr/seahorse-gkeyring-item-properties.c:102 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Access a website" msgstr "Пристапи веб место" -#: ../gkr/seahorse-gkeyring-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a PGP key" msgstr "Отклучува PGP клуч" -#: ../gkr/seahorse-gkeyring-item-properties.c:109 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Unlocks a Secure Shell key" msgstr "Отклучува клуч на безбедна школка" -#: ../gkr/seahorse-gkeyring-item-properties.c:112 +#: ../gkr/seahorse-gkr-item-properties.c:81 msgid "Saved password or login" msgstr "Зачувана лозинка или најава" -#: ../gkr/seahorse-gkeyring-item-properties.c:126 +#: ../gkr/seahorse-gkr-item-properties.c:105 msgid "Network Credentials" msgstr "Мрежни акредитации" -#: ../gkr/seahorse-gkeyring-item-properties.c:187 +#: ../gkr/seahorse-gkr-item-properties.c:110 +msgid "Password" +msgstr "Лозинка" + +#: ../gkr/seahorse-gkr-item-properties.c:210 msgid "Couldn't change password." msgstr "Не можам да ја променам лозинката." -#: ../gkr/seahorse-gkeyring-item-properties.c:295 +#: ../gkr/seahorse-gkr-item-properties.c:255 +#: ../gkr/seahorse-gkr-item-properties.c:376 +#| msgid "Listing passwords" +msgid "Updating password" +msgstr "Ажурирам лозинка" + +#: ../gkr/seahorse-gkr-item-properties.c:336 msgid "Couldn't set description." msgstr "Не можам да го поставам описот." -#: ../gkr/seahorse-gkeyring-item-properties.c:505 -msgid "Couldn't set application access." -msgstr "Не можам да го поставам пристапот на апликацијата." - -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:1 +#: ../gkr/seahorse-gkr-item-properties.xml.h:1 msgid "Password:" msgstr "Лозинка:" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:2 -msgid "Path:" -msgstr "Патека:" - -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:3 -msgid "Permissions:" -msgstr "Пермисии:" - -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:9 -#: ../ssh/seahorse-ssh-key-properties.glade.h:9 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 msgid "Technical Details:" msgstr "Технички детали:" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:5 -msgid "Applications" -msgstr "Апликации" - -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:23 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:20 -#: ../ssh/seahorse-ssh-key-properties.glade.h:17 +#: ../gkr/seahorse-gkr-item-properties.xml.h:3 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 msgid "Details" msgstr "Детали" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:7 -#: ../ssh/seahorse-ssh-key-properties.glade.h:19 +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 msgid "Key" msgstr "Клуч" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:30 -#: ../ssh/seahorse-ssh-key-properties.glade.h:20 +#: ../gkr/seahorse-gkr-item-properties.xml.h:5 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 msgid "Key Properties" msgstr "Својства на клучот" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:9 +#: ../gkr/seahorse-gkr-item-properties.xml.h:6 msgid "Login:" msgstr "Најава:" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:10 +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Сервер:" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:11 +#: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Прикажи лоз_инка" -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:36 +#: ../gkr/seahorse-gkr-item-properties.xml.h:9 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 msgid "Type:" msgstr "Тип:" #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:14 +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 msgid "Use:" msgstr "Употреба:" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:16 -msgid "_Delete" -msgstr "_Избриши" +#: ../gkr/seahorse-gkr-keyring.c:147 +#| msgid "Couldn't add keyring" +msgid "Login keyring" +msgstr "Приврзок за најава" + +#: ../gkr/seahorse-gkr-keyring.c:673 +#| msgid "Automatically unlocked when user logs in." +msgid "A keyring that is automatically unlocked on login" +msgstr "Автоматски отклучено кога корисникот се најавува" + +#: ../gkr/seahorse-gkr-keyring.c:674 +msgid "A keyring used to store passwords" +msgstr "Приврзок кој се користи за зачувување на лозинки" + +#: ../gkr/seahorse-gkr-keyring-deleter.c:80 +#, c-format +#| msgid "Are you sure you want to delete the password '%s'?" +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "Дали сте сигурни дека сакате да ја избришете лозинката на приврзокот „%s“?" + +#: ../gkr/seahorse-gkr-keyring-deleter.c:83 +msgid "I understand that all items will be permanently deleted." +msgstr "Разбирам дека сите предмети ќе бидат трајно избришани." -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:17 -#: ../pgp/seahorse-revoke.glade.h:5 -msgid "_Description:" -msgstr "_Опис:" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Created:" +msgstr "Креирано:" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:19 -msgid "_Read" -msgstr "_Прочитај" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkeyring-item-properties.glade.h:21 -msgid "_Write" -msgstr "_Запиши" +#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#| msgid "Key Sharing" +msgid "Keyring" +msgstr "Приврзок" + +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#| msgid "Key Properties" +msgid "Keyring Properties" +msgstr "Својства на приврзокот" + +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +#| msgid "Name" +msgid "Name:" +msgstr "Име:" + +#: ../gkr/seahorse-gkr-operation.c:54 +#: ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:585 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Операцијата беше прекината" -#: ../gkr/seahorse-gkeyring-operation.c:205 +#: ../gkr/seahorse-gkr-operation.c:59 msgid "Access to the key ring was denied" msgstr "Пристапот до приврзокот беше одбиен" -#: ../gkr/seahorse-gkeyring-operation.c:208 +#: ../gkr/seahorse-gkr-operation.c:62 msgid "The gnome-keyring daemon is not running" msgstr "Демонот за приврзоци на GNOME не се извршува" -#: ../gkr/seahorse-gkeyring-operation.c:211 +#: ../gkr/seahorse-gkr-operation.c:65 msgid "The key ring has already been unlocked" msgstr "Приврзокот веќе е отклучен" -#: ../gkr/seahorse-gkeyring-operation.c:214 +#: ../gkr/seahorse-gkr-operation.c:68 msgid "No such key ring exists" msgstr "Не постои таков приврзок" -#: ../gkr/seahorse-gkeyring-operation.c:217 +#: ../gkr/seahorse-gkr-operation.c:71 msgid "Couldn't communicate with key ring daemon" msgstr "Не можам да комуницирам со демонот за приврзоци" -#: ../gkr/seahorse-gkeyring-operation.c:220 +#: ../gkr/seahorse-gkr-operation.c:74 msgid "The item already exists" msgstr "Предметот веќе постои" -#: ../gkr/seahorse-gkeyring-operation.c:226 +#: ../gkr/seahorse-gkr-operation.c:80 msgid "Internal error accessing gnome-keyring" msgstr "Внатрешна грешка во пристапувањето на gnome-keyring" -#: ../gkr/seahorse-gkeyring-operation.c:283 -#: ../gkr/seahorse-gkeyring-operation.c:315 -msgid "Saving item..." -msgstr "Зачувувам предмет..." - -#: ../gkr/seahorse-gkeyring-source.c:408 -msgid "Retrieving key" -msgstr "Земам клуч..." - -#. Start listing of ids -#: ../gkr/seahorse-gkeyring-source.c:422 -msgid "Listing passwords" -msgstr "Ги листам лозинките" - -#. Start listing of ids -#: ../gkr/seahorse-gkeyring-source.c:554 -msgid "Removing item" -msgstr "Отстранувам предмет" - -#: ../gkr/seahorse-gkr-commands.vala:63 -#, c-format -msgid "Are you sure you want to delete the password '%s'?" -msgstr "Дали сте сигурни дека сакате да ја избришете лозинката „%s“?" - -#: ../gkr/seahorse-gkr-commands.vala:65 -#, c-format -msgid "Are you sure you want to delete %d passwords?" -msgstr "Дали сте сигурни дека сакате да избришете %d лозинки?" - -#: ../libcryptui/cryptui-key-chooser.c:173 -msgid "All Keys" -msgstr "Сите клучеви" - -#: ../libcryptui/cryptui-key-chooser.c:174 -msgid "Selected Recipients" -msgstr "Избрани примачи" - -#: ../libcryptui/cryptui-key-chooser.c:175 -msgid "Search Results" -msgstr "Резултати од пребарувањето" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:185 -msgid "Search _for:" -msgstr "_Пребарувај:" - -#: ../libcryptui/cryptui-key-chooser.c:243 -msgid "None (Don't Sign)" -msgstr "Ништо (не потпишувај)" - -#: ../libcryptui/cryptui-key-chooser.c:256 -#, c-format -msgid "Sign this message as %s" -msgstr "Потпиши ја пораката како %s" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:278 -msgid "_Sign message as:" -msgstr "_Потпиши ја пораката како:" - -#. TODO: Icons -#: ../libcryptui/cryptui-key-list.c:117 -#: ../pgp/seahorse-pgp-key-properties.c:905 -#: ../src/seahorse-key-manager-store.c:817 -msgid "Name" -msgstr "Име" - -#: ../libcryptui/cryptui-key-list.c:120 -#: ../pgp/seahorse-pgp-key-properties.c:1773 -#: ../src/seahorse-key-manager-store.c:829 -msgid "Key ID" -msgstr "Идентификациј на клуч" - -#: ../libegg/egg-datetime.c:313 +#: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Прикажи флегови" -#: ../libegg/egg-datetime.c:314 +#: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" msgstr "Прикажани датум и/или својства за време" -#: ../libegg/egg-datetime.c:319 +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "Мрзлив режим" -#: ../libegg/egg-datetime.c:320 +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "Мрзливиот режим не ги нормализира внесените вредности за време и датум" -#: ../libegg/egg-datetime.c:325 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "Година" -#: ../libegg/egg-datetime.c:326 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "Прикажана година" -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "Месец" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "Прикажан месец" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "Ден" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "Прикажан ден од месецот" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "Час" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "Прикажан час" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "Минута" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "Прикажана минута" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "Секунда" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "Прикажана секунда" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "Долна граница на години" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "Граница на долен дел од годината" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "Горна граница за година" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "Граница на горен дел од годината" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "Долен лимит на месец" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "Делот со месеци на долниот лимит на датуми" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "Горен лимит на месец" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "Делот со месеци на горниот лимит на датуми" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "Долен лимит на ден" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "Делот со денови од месецот од долниот лимит на времето" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "Горен лимит на ден" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "Делот со денови од месецот од горниот лимит на времето" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "Горен лимит на часови" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "Делот со часови на долниот лимит на времето" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "Горен лимит на часови" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "Делот со часови на горниот лимит на времето" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "Долен лимит на минути" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "Делот со минути на долниот лимит на времето" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "Горен лимит на минути" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "Делот со минути на горниот лимит на времето" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "Долен лимит на секунди" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "Втор дел од долниот лимит за време" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "Горен лимит на секунди" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "Втор дел од горниот лимит за време" @@ -755,1496 +551,1674 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:470 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:1" -#: ../libegg/egg-datetime.c:492 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "Датум" -#: ../libegg/egg-datetime.c:492 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "Внесете го датумот директно" -#: ../libegg/egg-datetime.c:499 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "Избери датум" -#: ../libegg/egg-datetime.c:499 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "Изберете го датумот од календар" -#: ../libegg/egg-datetime.c:517 ../libegg/egg-datetime.c:2192 +#: ../libegg/egg-datetime.c:521 +#: ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Време" -#: ../libegg/egg-datetime.c:517 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "Внесете го времето директно" -#: ../libegg/egg-datetime.c:524 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "Избери време" -#: ../libegg/egg-datetime.c:524 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "Изберете го времето од листа" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:791 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: yes" -#: ../libegg/egg-datetime.c:795 ../libegg/egg-datetime.c:1253 -#: ../libegg/egg-datetime.c:1257 +#: ../libegg/egg-datetime.c:797 +#: ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "AM" -#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1254 +#: ../libegg/egg-datetime.c:799 #: ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "PM" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:805 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:808 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:812 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:815 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1169 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1234 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libseahorse/seahorse-add-keyring.glade.h:1 -msgid "Add Password Keyring" -msgstr "Додај приврзок со лозинки" - -#: ../libseahorse/seahorse-add-keyring.glade.h:2 -msgid "New Keyring Name:" -msgstr "Ново име на приврзок:" - -#: ../libseahorse/seahorse-add-keyring.glade.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"Ве молам, одберете име за новиот приврзок. Ќе треба да дадете лозинка за " -"отклучување." - -#: ../libseahorse/seahorse-add-keyring.glade.h:4 -#: ../libseahorse/seahorse-add-keyserver.glade.h:5 -#: ../ssh/seahorse-ssh-upload.glade.h:3 -msgid "The host name or address of the server." -msgstr "Име на хост или адреса на серверот." - -#: ../libseahorse/seahorse-add-keyserver.glade.h:1 +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 msgid ":" msgstr ":" -#: ../libseahorse/seahorse-add-keyserver.glade.h:2 +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Додај сервер за клучеви" -#: ../libseahorse/seahorse-add-keyserver.glade.h:3 +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 msgid "Host:" msgstr "Хост:" -#: ../libseahorse/seahorse-add-keyserver.glade.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Тип на сервер за клучеви:" -#: ../libseahorse/seahorse-add-keyserver.glade.h:6 +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 msgid "The port to access the server on." msgstr "Порта за пристап на серверот." -#: ../libseahorse/seahorse-notification.c:566 -#: ../libseahorse/seahorse-notification.c:594 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "Клучот е увезен" -msgstr[1] "Клучевите се увезени" -msgstr[2] "Клучевите се увезени" - -#: ../libseahorse/seahorse-notification.c:570 -#: ../libseahorse/seahorse-notification.c:593 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "Увезен е %i клуч" -msgstr[1] "Увезени се %i клучеви" -msgstr[2] "Увезени се %i клучеви" - -#: ../libseahorse/seahorse-notification.c:572 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "Увезoв клуч за" -msgstr[1] "Увезoв клучеви за" -msgstr[2] "Увезoв клучеви за" - -#: ../libseahorse/seahorse-notify.glade.h:1 -msgid "Notification Messages" -msgstr "Пораки за известување" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "initial temporary item" +msgstr "иницијален привремен предмет" + +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Придонеси:" + +#: ../libseahorse/seahorse-catalog.c:112 +#: ../src/seahorse.desktop.in.in.h:2 +#: ../src/seahorse-key-manager.c:647 +#: ../src/seahorse-main.c:68 +#| msgid "Passwords and Encryption Keys" +msgid "Passwords and Keys" +msgstr "Лозинки и клучеви" + +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "ок" + +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Домашната страница на проектот Seahorse" + +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Не можам да избришам" -#: ../libseahorse/seahorse-passphrase.c:174 -msgid "Passphrase" -msgstr "Тајна фраза" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Не можев да увезам клучеви" -#: ../libseahorse/seahorse-passphrase.c:177 +#: ../libseahorse/seahorse-catalog.c:268 +#| msgid "Couldn't export key." +msgid "Couldn't export data" +msgstr "Не можев да извезам податоци" + +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +#| msgid "Filter:" +msgid "_File" +msgstr "_Датотека" + +#: ../libseahorse/seahorse-catalog.c:278 +#| msgid "_Import..." +msgid "E_xport..." +msgstr "И_звези..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Извези во датотека" + +#: ../libseahorse/seahorse-catalog.c:280 +#| msgid "_Quit" +msgid "_Edit" +msgstr "_Уреди" + +#: ../libseahorse/seahorse-catalog.c:283 +#| msgid "Import keys from the clipboard" +msgid "Copy to the clipboard" +msgstr "Копирај во таблата со иссечоци" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 +#: ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Избриши" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Избриши ги избраните предмети" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Покажи ги својствата на овој предмет" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this place" +msgstr "Покажи ги својствата на ова место" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Префере_нци" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Промени ги преференците на оваа програма" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Поглед" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Помош" + +#: ../libseahorse/seahorse-catalog.c:295 +#| msgid "Close this program" +msgid "About this program" +msgstr "За оваа програма" + +#: ../libseahorse/seahorse-catalog.c:296 +#| msgid "_Comment:" +msgid "_Contents" +msgstr "_Содржини" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Покажи помош за Seahorse" + +#: ../libseahorse/seahorse-exportable.c:404 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 +msgid "Export" +msgstr "Извези" + +#: ../libseahorse/seahorse-interaction.c:100 +#, c-format +#| msgid "Enter the old passphrase for: %s" +msgid "Enter PIN or password for: %s" +msgstr "Внесете PIN или лозинка за: %s" + +#: ../libseahorse/seahorse-passphrase.c:182 +#: ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "Лозинка:" -#: ../libseahorse/seahorse-passphrase.c:241 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:244 msgid "Confirm:" msgstr "Потврди:" -#: ../libseahorse/seahorse-prefs.c:65 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "Не е валидна адреса за сервер на клучеви" -#: ../libseahorse/seahorse-prefs.c:66 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "" -"За помош контактирајте со Вашиот администратор на системот или " -"администраторот на серверот за клучеви." +#: ../libseahorse/seahorse-prefs.c:68 +msgid "For help contact your system adminstrator or the administrator of the key server." +msgstr "За помош контактирајте со Вашиот администратор на системот или администраторот на серверот за клучеви." -#: ../libseahorse/seahorse-prefs.c:177 +#: ../libseahorse/seahorse-prefs.c:182 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:359 +#: ../libseahorse/seahorse-prefs.c:352 msgid "Custom" msgstr "Прилагодено" -#: ../libseahorse/seahorse-prefs.c:433 +#: ../libseahorse/seahorse-prefs.c:405 msgid "None: Don't publish keys" msgstr "Ништо: Не објавувај клучеви" -#: ../libseahorse/seahorse-prefs-keyrings.c:207 -msgid "Automatically unlocked when user logs in." -msgstr "Автоматски отклучено кога корисникот се најавува." - -#: ../libseahorse/seahorse-prefs-keyrings.c:244 -msgid "Couldn't get default password keyring" -msgstr "Не можам да го добијам стандардниот приврзок на лозинки" - -#: ../libseahorse/seahorse-prefs-keyrings.c:267 -msgid "Couldn't get list of password keyrings" -msgstr "Не можам да добијам листа на приврзоци со лозинки" - -#: ../libseahorse/seahorse-prefs-keyrings.c:322 -msgid "Couldn't set default password keyring" -msgstr "Не можам да поставам стандардна лозинка за приврзокот" - -#: ../libseahorse/seahorse-prefs-keyrings.c:404 -msgid "Couldn't remove keyring" -msgstr "Не можам да го отстранам приврзокот" - -#: ../libseahorse/seahorse-prefs-keyrings.c:422 -#, c-format -msgid "Are you sure you want to permanently delete the '%s' keyring?" -msgstr "Дали сте сигурни дека сакате трајно да го избришете приврзокот „%s“?" - -#: ../libseahorse/seahorse-prefs-keyrings.c:470 -msgid "Couldn't add keyring" -msgstr "Не можам да додадам приврзок" - -#: ../libseahorse/seahorse-prefs-keyrings.c:527 -msgid "Couldn't change keyring password" -msgstr "Не можам да ја променам лозинката на приврзокот" - -#: ../libseahorse/seahorse-prefs.glade.h:1 -msgid "Default Keyring" -msgstr "Стандарден приврзок" - -#: ../libseahorse/seahorse-prefs.glade.h:2 -msgid "Password Keyrings" -msgstr "Приврзоци со лозинки:" - -#: ../libseahorse/seahorse-prefs.glade.h:3 +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Automatically retrieve keys from _key servers" msgstr "Автоматски добивај ги клучевите од серверите за _клучеви" -#: ../libseahorse/seahorse-prefs.glade.h:4 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "Automatically synchronize _modified keys with key servers" msgstr "Автоматски синхронизирај ги _изменетите клучеви со серверите за клучеви" -#: ../libseahorse/seahorse-prefs.glade.h:5 -msgid "Change Unlock _Password" -msgstr "Промени ја _лозинката за отклучување" - -#: ../libseahorse/seahorse-prefs.glade.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "Key Servers" msgstr "Сервери за клучеви" -#: ../libseahorse/seahorse-prefs.glade.h:7 -msgid "Key Sharing" -msgstr "Споделување на клучеви" - -#: ../libseahorse/seahorse-prefs.glade.h:8 -msgid "Password Keyrings" -msgstr "Приврзоци со лозинки" - -#: ../libseahorse/seahorse-prefs.glade.h:9 -msgid "Password and Encryption Settings" -msgstr "Лозинки и поставувања за енкрипција" - -#: ../libseahorse/seahorse-prefs.glade.h:10 -msgid "" -"Sharing your keys allows other people on your network to use the keys you've " -"collected. This means they can automatically encrypt things for you or those " -"you know, without you having to send them your key.\n" -"\n" -"Note: Your personal keys will not be compromised." -msgstr "" -"Споделувањето на Вашите клучеви им овозможува на другите луѓе на мрежата да " -"ги користат клучевите кои сте ги собрале. Ова значи дека тие ќе можат " -"автоматски да енкриптираат нешта за Вас или за тие што ги познавате, без да " -"мора да им го испраќате Вашиот клуч.\n" -"\n" -"Белешка: Вашите лични клучеви нема да се земат во предвид." - -#: ../libseahorse/seahorse-prefs.glade.h:13 -msgid "_Add Keyring" -msgstr "_Додај приврзок" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Preferences" +msgstr "Преференци" -#: ../libseahorse/seahorse-prefs.glade.h:14 +#: ../libseahorse/seahorse-prefs.xml.h:5 msgid "_Find keys via:" msgstr "_Најди клучеви преку:" -#: ../libseahorse/seahorse-prefs.glade.h:15 -msgid "_Location for application passwords:" -msgstr "_Локација за лозинките на апликацијата:" - -#: ../libseahorse/seahorse-prefs.glade.h:16 +#: ../libseahorse/seahorse-prefs.xml.h:6 msgid "_Publish keys to:" msgstr "_Објави клучеви на:" -#: ../libseahorse/seahorse-prefs.glade.h:17 -msgid "_Remove Keyring" -msgstr "_Отстрани го приврзокот" - -#: ../libseahorse/seahorse-prefs.glade.h:18 -msgid "_Share my keys with others on my network" -msgstr "_Сподели ги моите клучеви со други на мојата мрежа" - -#: ../libseahorse/seahorse-progress.glade.h:1 -msgid "Progress Title" -msgstr "Наслов на напредувањето" - -#: ../libseahorse/seahorse-unknown-key.c:70 -msgid "Unavailable" -msgstr "Недостапно" - -#: ../libseahorse/seahorse-unknown-key.c:90 -#, c-format -msgid "Unknown Key: %s" -msgstr "Непознат клуч: %s" - -#: ../libseahorse/seahorse-unknown-key.c:122 -msgid "Unknown Key" -msgstr "Непознат клуч" - -#: ../libseahorse/seahorse-unknown-source.c:118 -msgid "Unavailable Key" -msgstr "Недостапен клуч" - -#: ../libseahorse/seahorse-util.c:203 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:436 -msgid "Key Data" -msgstr "Податоци на клучот" - -#: ../libseahorse/seahorse-util.c:438 -msgid "Multiple Keys" -msgstr "Повеќе клучеви" - -#: ../libseahorse/seahorse-util.c:694 -msgid "Couldn't run file-roller" -msgstr "Не можам да го извршам file-roller" - -#: ../libseahorse/seahorse-util.c:700 -msgid "Couldn't package files" -msgstr "Не можам да ги спакувам датотеките" - -#: ../libseahorse/seahorse-util.c:701 -msgid "The file-roller process did not complete successfully" -msgstr "Процесот file-roller не заврши успешно" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:810 -msgid "All key files" -msgstr "Сите датотеки со клучеви" - -#: ../libseahorse/seahorse-util.c:821 ../libseahorse/seahorse-util.c:861 -#: ../pgp/seahorse-pgp-photos.c:242 -msgid "All files" -msgstr "Сите датотеки" - -#: ../libseahorse/seahorse-util.c:854 -msgid "Archive files" -msgstr "Архивирај ги датотеките" - -#: ../libseahorse/seahorse-util.c:903 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Веќе постои датотека со тоа име.\n" -"\n" -"Дали сакате да ја замените со ново име?" - -#: ../libseahorse/seahorse-util.c:906 -msgid "_Replace" -msgstr "_Замени" - -#: ../libseahorse/seahorse-validity.c:32 ../pgp/seahorse-pgp-key.c:665 -#: ../pgp/seahorse-pgp-key-properties.c:1171 +#: ../libseahorse/seahorse-validity.c:40 +#: ../pgp/seahorse-gpgme-subkey.c:197 +#: ../pgp/seahorse-pgp-key-properties.c:1248 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Непознато" -#: ../libseahorse/seahorse-validity.c:34 -#: ../pgp/seahorse-pgp-key-properties.c:1177 +#: ../libseahorse/seahorse-validity.c:42 +#: ../pgp/seahorse-pgp-key-properties.c:1254 msgctxt "Validity" msgid "Never" msgstr "Никогаш" -#: ../libseahorse/seahorse-validity.c:36 -#: ../pgp/seahorse-pgp-key-properties.c:1184 +#: ../libseahorse/seahorse-validity.c:44 +#: ../pgp/seahorse-pgp-key-properties.c:1261 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 msgid "Marginal" msgstr "Маргини" -#: ../libseahorse/seahorse-validity.c:38 -#: ../pgp/seahorse-pgp-key-properties.c:1190 +#: ../libseahorse/seahorse-validity.c:46 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 msgid "Full" msgstr "Цела" -#: ../libseahorse/seahorse-validity.c:40 -#: ../pgp/seahorse-pgp-key-properties.c:1196 +#: ../libseahorse/seahorse-validity.c:48 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 msgid "Ultimate" msgstr "Универзално" -#: ../libseahorse/seahorse-validity.c:42 +#: ../libseahorse/seahorse-validity.c:50 +#: ../pgp/seahorse-pgp-key-properties.c:1463 msgid "Disabled" msgstr "Оневозможено" -#: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1377 +#: ../libseahorse/seahorse-validity.c:52 +#: ../pgp/seahorse-pgp-key-properties.c:1459 msgid "Revoked" msgstr "Отповикана" -#: ../libseahorse/seahorse-widget.c:363 +#: ../libseahorse/seahorse-widget.c:473 #, c-format msgid "Could not display help: %s" msgstr "Не можам да прикажам помош: %s" -#: ../libcryptui/cryptui.c:211 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"Не се пронајдени клучеви со кои ќе се изврши операцијата која ја побаравте. " -"Ќе се стартува програмата Лозинки и клучеви за енкрипција за да " -"внесите или креирате клуч." - -#. TODO: Calculate something from the subject? -#: ../pkcs11/seahorse-pkcs11-certificate.vala:28 -msgid "Certificate" -msgstr "Сертификат" - -#: ../pkcs11/seahorse-pkcs11-source.vala:33 -msgid "X509 Certificate" -msgstr "X509 сертификат" - -#: ../pkcs11/seahorse-pkcs11-source.vala:120 -msgid "Loading..." -msgstr "Вчитувам..." - -#: ../pkcs11/seahorse-pkcs11-source.vala:381 -msgid "Invalid or unrecognized object." -msgstr "Невалиден или непрепознаен предмет." - -#: ../pkcs11/seahorse-pkcs11-source.vala:398 -msgid "Exporting is not yet supported." -msgstr "Извезувањето не е сѐ уште поддржано." - -#: ../pgp/seahorse-add-subkey.glade.h:1 +#: ../pgp/seahorse-add-subkey.xml.h:1 msgid "Expiration Date:" msgstr "Рок на траење:" -#: ../pgp/seahorse-add-subkey.glade.h:2 +#: ../pgp/seahorse-add-subkey.xml.h:2 msgid "Generate a new subkey" msgstr "Генерирај нов подклуч" -#: ../pgp/seahorse-add-subkey.glade.h:3 +#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Дали клучот никогаш не истекува" -#: ../pgp/seahorse-add-subkey.glade.h:4 +#: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Големина на _клучот:" -#: ../pgp/seahorse-add-subkey.glade.h:5 +#: ../pgp/seahorse-add-subkey.xml.h:5 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 msgid "Key _Type:" msgstr "Тип на _клуч:" -#: ../pgp/seahorse-add-subkey.glade.h:6 +#: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Големина на клуч" -#: ../pgp/seahorse-add-subkey.glade.h:7 +#: ../pgp/seahorse-add-subkey.xml.h:7 msgid "Never E_xpires" msgstr "Никогаш не и_стекува" -#: ../pgp/seahorse-add-uid.glade.h:1 +#: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Идентификација на корисник" -#: ../pgp/seahorse-add-uid.glade.h:2 +#: ../pgp/seahorse-add-uid.xml.h:2 msgid "Create the new user ID" msgstr "Креирај нова идентификација на нов корисник" -#: ../pgp/seahorse-add-uid.glade.h:3 ../pgp/seahorse-pgp-generate.glade.h:8 +#: ../pgp/seahorse-add-uid.xml.h:3 +#: ../pgp/seahorse-pgp-generate.xml.h:7 msgid "Full _Name:" msgstr "Цело _име" -#: ../pgp/seahorse-add-uid.glade.h:4 +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Key Co_mment:" msgstr "Ко_ментар на клуч:" -#: ../pgp/seahorse-add-uid.glade.h:5 +#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Море да биде најмалце 5 карактери долг" -#: ../pgp/seahorse-add-uid.glade.h:6 +#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Optional comment describing key" msgstr "Изборен коментар кој што го опишува клучот" -#: ../pgp/seahorse-add-uid.glade.h:7 +#: ../pgp/seahorse-add-uid.xml.h:7 msgid "Optional email address" msgstr "Додатна адреса за е-пошта" -#: ../pgp/seahorse-add-uid.glade.h:8 ../pgp/seahorse-pgp-generate.glade.h:14 +#: ../pgp/seahorse-add-uid.xml.h:8 +#: ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Email Address:" msgstr "_Адреса за е-пошта:" -#: ../pgp/seahorse-expires.glade.h:1 +#: ../pgp/seahorse-expires.xml.h:1 msgid "C_hange" msgstr "П_ромени" -#: ../pgp/seahorse-expires.glade.h:2 ../pgp/seahorse-revoke.glade.h:4 +#: ../pgp/seahorse-expires.xml.h:2 +#: ../pgp/seahorse-revoke.xml.h:4 msgid "Revoke key" msgstr "Отповикај го клучот" -#: ../pgp/seahorse-expires.glade.h:3 +#: ../pgp/seahorse-expires.xml.h:3 msgid "_Never expires" msgstr "_Никогаш не истекува" -#: ../pgp/seahorse-gpgmex-util.c:55 -msgid "Decryption failed. You probably do not have the decryption key." -msgstr "Декриптирањето не успеа. Најверојатно го немате клучот за декриптирање." - -#: ../pgp/seahorse-hkp-source.c:331 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Пребарувањето не беше доволно јасно. Серверот „%s“ најде премногу клучеви." - -#: ../pgp/seahorse-hkp-source.c:333 -#, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Не можам да комуницирам со серверот „%s“: %s" - -#: ../pgp/seahorse-hkp-source.c:553 -msgid "Searching for keys..." -msgstr "Барам клучеви..." - -#: ../pgp/seahorse-hkp-source.c:624 -msgid "Uploading keys..." -msgstr "Ги качувам клучевите..." - -#: ../pgp/seahorse-hkp-source.c:702 -msgid "Retrieving keys..." -msgstr "Земам клучеви..." - -#: ../pgp/seahorse-hkp-source.c:735 ../pgp/seahorse-ldap-source.c:1276 -#: ../pgp/seahorse-pgp-generator.vala:29 ../pgp/seahorse-pgp-source.c:443 -#: ../pgp/seahorse-server-source.c:209 -msgid "PGP Key" -msgstr "PGP клуч" - -#: ../pgp/seahorse-hkp-source.c:769 -#, c-format -msgid "Searching for keys on: %s" -msgstr "Пребарувам клучеви на: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:866 ../pgp/seahorse-hkp-source.c:939 -#: ../pgp/seahorse-ldap-source.c:665 -#, c-format -msgid "Connecting to: %s" -msgstr "Се поврзувам со: %s" - -#: ../pgp/seahorse-hkp-source.c:975 -msgid "HTTP Key Server" -msgstr "Сервер за HTTP клуч" - -#: ../pgp/seahorse-ldap-source.c:456 -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "Не можев да комуницирам со „%s“: %s" - -#: ../pgp/seahorse-ldap-source.c:638 -#, c-format -msgid "Couldn't resolve address: %s" -msgstr "Не можам да ја добијам адресата: %s" - -#: ../pgp/seahorse-ldap-source.c:716 -#, c-format -msgid "Resolving server address: %s" -msgstr "Добивам адреса на серверот: %s" - -#: ../pgp/seahorse-ldap-source.c:920 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "Пребарувам клучеви кои содржат „%s“" - -#: ../pgp/seahorse-ldap-source.c:947 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "Пребарувам клучеви со Ид. „%s“..." - -#: ../pgp/seahorse-ldap-source.c:1052 -msgid "Retrieving remote keys..." -msgstr "Земам оддалечени клучеви..." - -#: ../pgp/seahorse-ldap-source.c:1184 -msgid "Sending keys to key server..." -msgstr "Испраќам клучеви до серверот за клучеви..." - -#: ../pgp/seahorse-ldap-source.c:1416 -msgid "LDAP Key Server" -msgstr "Сервер за LDAP клуч" - -#: ../pgp/seahorse-pgp-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "Не можам да додадам подклуч" -#: ../pgp/seahorse-pgp-add-subkey.c:187 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "Додај подклуч во %s" -#: ../pgp/seahorse-pgp-add-subkey.c:204 ../pgp/seahorse-pgp-generate.c:51 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 +#: ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (запиши само)" -#: ../pgp/seahorse-pgp-add-subkey.c:212 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (криптирај само)" -#: ../pgp/seahorse-pgp-add-subkey.c:218 ../pgp/seahorse-pgp-generate.c:52 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 +#: ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (само запишани)" -#: ../pgp/seahorse-pgp-add-subkey.c:224 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (само криптирани)" -#: ../pgp/seahorse-pgp-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "Не можам да додадам Ид. на корисник" -#: ../pgp/seahorse-pgp-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "Додај идентификација на корисник %s" -#: ../pgp/seahorse-pgp-commands.vala:29 -msgid "_Sign Key..." -msgstr "_Потпиши клуч..." - -#: ../pgp/seahorse-pgp-commands.vala:30 -msgid "Sign public key" -msgstr "Потпиши јавен клуч" - -#: ../pgp/seahorse-pgp-commands.vala:110 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Дали сте сигурни дека перманентно сакате да го избришето %s?" - -#: ../pgp/seahorse-pgp-commands.vala:114 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Дали сте сигурни дека сакате трајно да избришете %d клучеви и идентитети?" - -#: ../pgp/seahorse-pgp-commands.vala:116 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Дали сте сигурни дека сакате трајно да избришете %d клучеви?" +#: ../pgp/seahorse-gpgme.c:69 +msgid "Decryption failed. You probably do not have the decryption key." +msgstr "Декриптирањето не успеа. Најверојатно го немате клучот за декриптирање." -#: ../pgp/seahorse-pgp-commands.vala:118 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Дали сте сигурни дека сакате трајно да избришете %d идентитети?" +#: ../pgp/seahorse-gpgme-expires.c:65 +#| msgid "Invalid Signature" +msgid "Invalid expiry date" +msgstr "Невалиден датум на истекување" + +#: ../pgp/seahorse-gpgme-expires.c:66 +msgid "The expiry date must be in the future" +msgstr "Датумот на истекување мора да биде во иднината" -#: ../pgp/seahorse-pgp-expires.c:70 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "Не можам да го променам датумот на истекување" -#: ../pgp/seahorse-pgp-expires.c:134 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format -msgid "Expiry for Subkey %d of %s" -msgstr "Истекување на подклучот %d од %s" +#| msgid "Expiry for %s" +msgid "Expiry: %s" +msgstr "Истекува на: %s" -#: ../pgp/seahorse-pgp-expires.c:136 -#, c-format -msgid "Expiry for %s" -msgstr "Истекување за %s" +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Повеќе клучеви" -#: ../pgp/seahorse-pgp-generate.c:50 -msgid "DSA Elgamal" -msgstr "DSA Elgamal" +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Податоци на клучот" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +#| msgid "Imported keys" +msgid "Armored PGP keys" +msgstr "Заштитени PGP клучеви" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +#| msgid "PGP Key" +msgid "PGP keys" +msgstr "PGP клучеви" + +#: ../pgp/seahorse-gpgme-generate.c:95 +msgid "PGP Key" +msgstr "PGP клуч" + +#: ../pgp/seahorse-gpgme-generate.c:96 +msgid "Used to encrypt email and files" +msgstr "Користен за енкриптирање на е-пошта и датотеки" + +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +msgid "RSA" +msgstr "RSA" + +#: ../pgp/seahorse-gpgme-generate.c:133 +msgid "DSA Elgamal" +msgstr "DSA Elgamal" -#: ../pgp/seahorse-pgp-generate.c:61 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Не можев да генерирам PGP клуч" -#: ../pgp/seahorse-pgp-generate.c:168 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "Тајна фраза за новиот PGP клуч" -#: ../pgp/seahorse-pgp-generate.c:169 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "Внесете ја новата тајна фраза за Вашиот нов клуч двапати." -#: ../pgp/seahorse-pgp-generate.c:178 -msgid "Couldn't generate key" -msgstr "Не можев да генерирам клуч" - -#: ../pgp/seahorse-pgp-generate.c:180 +#: ../pgp/seahorse-gpgme-generate.c:223 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Генерирам клуч" -#: ../pgp/seahorse-pgp-generate.glade.h:1 -#: ../ssh/seahorse-ssh-generate.glade.h:1 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Дали сте сигурни дека перманентно сакате да го избришето %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +#| msgid "Are you sure you want to permanently delete %d keys?" +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Дали сте сигурни дека сакате трајно да избришете %d клуч?" +msgstr[1] "Дали сте сигурни дека сакате трајно да избришете %d клучеви?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +#| msgid "Show pass_word" +msgid "Wrong password" +msgstr "Грешна лозинка" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +msgid "This was the third time you entered a wrong password. Please try again." +msgstr "Ова е трет пат како внесувате грешна лозинка. Пробајте пак." + +#: ../pgp/seahorse-gpgme-keyring.c:90 +#, c-format +msgid "Wrong passphrase." +msgstr "Грешна тајна фраза." + +#: ../pgp/seahorse-gpgme-keyring.c:94 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Внесете нова тајна фраза за „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:96 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Внесете тајна фраза за „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:99 +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Enter new passphrase" +msgstr "Внеси нова лозинка" + +#: ../pgp/seahorse-gpgme-keyring.c:101 +msgid "Enter passphrase" +msgstr "Внесете тајна фраза" + +#: ../pgp/seahorse-gpgme-keyring.c:106 +msgid "Passphrase" +msgstr "Тајна фраза" + +#: ../pgp/seahorse-gpgme-keyring.c:307 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Вчитан е %d клуч" +msgstr[1] "Вчитани се %d клучеви" + +#: ../pgp/seahorse-gpgme-keyring.c:654 +msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." +msgstr "Невалидни податоци за клучот (недостасуваат UID). Ова може да биде поради тоа што датумот на компјутерот е поставен во иднината или нема самопотпишување." + +#: ../pgp/seahorse-gpgme-keyring.c:814 +msgid "GnuPG keyring" +msgstr "GnuPG приврзок" + +#: ../pgp/seahorse-gpgme-keyring.c:817 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: стандарден директориум за приврзок" + +#: ../pgp/seahorse-gpgme-photos.c:73 +#, c-format +msgid "" +"The photo is too large\n" +"The recommended size for a photo on your key is %d x %d pixels." +msgstr "" +"Сликата е преголема\n" +"Препорачливата големина на сликата е %d x %d пиксели." + +#: ../pgp/seahorse-gpgme-photos.c:78 +msgid "_Don't Resize" +msgstr "_Не променувај големина" + +#: ../pgp/seahorse-gpgme-photos.c:79 +msgid "_Resize" +msgstr "_Промени големина" + +#: ../pgp/seahorse-gpgme-photos.c:128 +#, c-format +msgid "This is not a image file, or an unrecognized kind of image file. Try to use a JPEG image." +msgstr "" +"Ова не е датотека со слика или препознатлив вид на датотека со слика. Обидете се со \n" +"JPEG слика." + +#: ../pgp/seahorse-gpgme-photos.c:224 +msgid "All image files" +msgstr "Сите датотеки со слики" + +#: ../pgp/seahorse-gpgme-photos.c:237 +msgid "All JPEG files" +msgstr "Сите JPEG датотеки" + +#: ../pgp/seahorse-gpgme-photos.c:242 +#: ../src/seahorse-key-manager.c:283 +msgid "All files" +msgstr "Сите датотеки" + +#: ../pgp/seahorse-gpgme-photos.c:263 +msgid "Choose Photo to Add to Key" +msgstr "Одберете фотографија за да ја додадете на клучот" + +#: ../pgp/seahorse-gpgme-photos.c:285 +#| msgid "Couldn't add photo" +msgid "Couldn't prepare photo" +msgstr "Не можев да подготван фотографија" + +#: ../pgp/seahorse-gpgme-photos.c:295 +#: ../pgp/seahorse-gpgme-photos.c:298 +msgid "Couldn't add photo" +msgstr "Не можам да ја додадам фотографијата" + +#: ../pgp/seahorse-gpgme-photos.c:296 +msgid "The file could not be loaded. It may be in an invalid format" +msgstr "Датотеката не може да се вчита. Може да е во невалиден формат" + +#: ../pgp/seahorse-gpgme-photos.c:322 +msgid "Are you sure you want to remove the current photo from your key?" +msgstr "Дали сте сигурни дека сакате да ја отстраните тековната фотографија од Вашиот клуч?" + +#: ../pgp/seahorse-gpgme-photos.c:335 +msgid "Couldn't delete photo" +msgstr "Не можам да ја избришам фотографијата" + +#: ../pgp/seahorse-gpgme-revoke.c:75 +msgid "Couldn't revoke subkey" +msgstr "Не можам да го отповикам подклучот" + +#: ../pgp/seahorse-gpgme-revoke.c:96 +#, c-format +#| msgid "Revoke %s" +msgid "Revoke: %s" +msgstr "Повлечи: %s" + +#: ../pgp/seahorse-gpgme-revoke.c:107 +msgid "No reason" +msgstr "Без причина" + +#: ../pgp/seahorse-gpgme-revoke.c:108 +msgid "No reason for revoking key" +msgstr "Нема причина за отповикувањето на клучот" + +#: ../pgp/seahorse-gpgme-revoke.c:114 +msgid "Compromised" +msgstr "Откриен" + +#: ../pgp/seahorse-gpgme-revoke.c:115 +msgid "Key has been compromised" +msgstr "Клучот беше откриен" + +#: ../pgp/seahorse-gpgme-revoke.c:121 +msgid "Superseded" +msgstr "Заменет" + +#: ../pgp/seahorse-gpgme-revoke.c:122 +msgid "Key has been superseded" +msgstr "Клучот беше заменет" + +#: ../pgp/seahorse-gpgme-revoke.c:128 +msgid "Not Used" +msgstr "Неупотребен" + +#: ../pgp/seahorse-gpgme-revoke.c:129 +msgid "Key is no longer used" +msgstr "Клучот веќе не се употребува" + +#: ../pgp/seahorse-gpgme-revoke.c:166 +#, c-format +msgid "You are about to add %s as a revoker for %s. This operation cannot be undone! Are you sure you want to continue?" +msgstr "Вие сте за додавање за %s како подвлекувач за %s. Оваа операција не може да биде незавршена!Дали сте сигурни дека сакате да продолжите?" + +#: ../pgp/seahorse-gpgme-revoke.c:178 +msgid "Couldn't add revoker" +msgstr "Не можам да додадам отповикувач" + +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 +#: ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Разбирам дека овој таен клуч ќе биде избришан засекогаш." + +#: ../pgp/seahorse-gpgme-sign.c:100 +#, c-format +msgid "" +"This key was already signed by\n" +"\"%s\"" +msgstr "" +"Овој клуч е веќе потпишан од\n" +"„%s“" + +#: ../pgp/seahorse-gpgme-sign.c:105 +msgid "Couldn't sign key" +msgstr "Не можам да го потпишам клучот" + +#. TODO: We should be giving an error message that allows them to +#. generate or import a key +#: ../pgp/seahorse-gpgme-sign.c:164 +#: ../pgp/seahorse-signer.c:62 +msgid "No keys usable for signing" +msgstr "Нема употребливи клучеви за потпишување" + +#: ../pgp/seahorse-gpgme-sign.c:165 +msgid "You have no personal PGP keys that can be used to indicate your trust of this key." +msgstr "Немате лични PGP клучеви кои можат да бидат користени за откривање на доверливоста на овој клуч." + +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" + +#: ../pgp/seahorse-hkp-source.c:603 +#, c-format +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "Пребарувањето не беше доволно јасно. Серверот „%s“ најде премногу клучеви." + +#: ../pgp/seahorse-hkp-source.c:606 +#, c-format +msgid "Couldn't communicate with server '%s': %s" +msgstr "Не можам да комуницирам со серверот „%s“: %s" + +#: ../pgp/seahorse-hkp-source.c:1129 +msgid "HTTP Key Server" +msgstr "Сервер за HTTP клуч" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Не можам да увезам клучеви" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Увезувам клучеви од сервери за клучеви" + +#: ../pgp/seahorse-keyserver-results.c:243 +#: ../src/seahorse-key-manager.c:499 +msgid "_Remote" +msgstr "_Оддалечено" + +#: ../pgp/seahorse-keyserver-results.c:245 +msgid "Close this window" +msgstr "Затвори го овој прозорец" + +#: ../pgp/seahorse-keyserver-results.c:249 +#: ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Пребарај оддалечени клучеви..." + +#: ../pgp/seahorse-keyserver-results.c:250 +#: ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Пребарувај за клучеви на сервер за клучеви" + +#: ../pgp/seahorse-keyserver-results.c:254 +#: ../src/seahorse-key-manager.xml.h:5 +msgid "_Import" +msgstr "_Внеси" + +#: ../pgp/seahorse-keyserver-results.c:255 +msgid "Import selected keys to local key ring" +msgstr "Увези ги избраните клучеви во локален приврзок" + +#: ../pgp/seahorse-keyserver-results.c:285 +msgid "Remote Keys" +msgstr "Оддалечени клучеви" + +#: ../pgp/seahorse-keyserver-results.c:287 +#, c-format +msgid "Remote Keys Containing '%s'" +msgstr "Оддалечени клучеви кои содржат „%s“" + +#: ../pgp/seahorse-keyserver-results.c:484 +#| msgid "Searching for keys..." +msgid "The search for keys failed." +msgstr "Барањето клучеви не успеа." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Key Servers:" +msgstr "Сервери со клучеви:" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "Shared Keys Near Me:" +msgstr "Споделени клучеви близу до мене:" + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "Find Remote Keys" +msgstr "Најди оддалечени клучеви" + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." +msgstr "Ова ќе пребарува клучеви од други на интернет. Овие клучеви тогаш ќе можат да бидат увезени во локалниот приврзок." + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Where to search:" +msgstr "Каде да барам:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "_Search" +msgstr "_Барај" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search for keys containing: " +msgstr "_Барај клучеви кои содржат: " + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Не можам да објавам клучеви на серверот" + +#: ../pgp/seahorse-keyserver-sync.c:76 +#, c-format +msgid "Couldn't retrieve keys from server: %s" +msgstr "Не можам да добијам клучеви од серверот: %s" + +#: ../pgp/seahorse-keyserver-sync.c:160 +#, c-format +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d клуч е избран за синхронизација" +msgstr[1] "%d клучеви се избрани за синхронизација" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Ги синхронизирам клучевите..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Ги синхронизирам клучевите" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." +msgstr "ОВа ќе ги објави клучевите во Вашиот приврзок така што ќе бидат достапни за користење од други. Исто така ќе ги добивате измените што ги прават другите, бидејќи ќе ги имате добиено и нивните клучеви." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." +msgstr "Ова ќе ги земи сите промени што другите ги направиле отакако сте ги добиле нивните клучеви. Не е избран сервер за објавување, па ниту еден Ваш клуч нема да биде достапен до другите." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Сервери за _клучеви" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Синх." + +#: ../pgp/seahorse-ldap-source.c:440 +#, c-format +msgid "Couldn't communicate with '%s': %s" +msgstr "Не можев да комуницирам со „%s“: %s" + +#: ../pgp/seahorse-ldap-source.c:651 +#, c-format +msgid "Connecting to: %s" +msgstr "Се поврзувам со: %s" + +#: ../pgp/seahorse-ldap-source.c:657 +#, c-format +msgid "Couldn't resolve address: %s" +msgstr "Не можам да ја добијам адресата: %s" + +#: ../pgp/seahorse-ldap-source.c:701 +#, c-format +msgid "Resolving server address: %s" +msgstr "Добивам адреса на серверот: %s" + +#: ../pgp/seahorse-ldap-source.c:1446 +msgid "LDAP Key Server" +msgstr "Сервер за LDAP клуч" + +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Синхронизирај и објави клучеви..." + +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Објавете ги и/или синхронизирајте ги Вашите клучеви со тие онлајн." + +#: ../pgp/seahorse-pgp-backend.c:174 +#| msgid "PGP Key" +msgid "PGP Keys" +msgstr "PGP клучеви" + +#: ../pgp/seahorse-pgp-backend.c:177 +#| msgid "Used to encrypt email and files" +msgid "PGP keys are for encrypting email or files" +msgstr "PGP клучевите се користат за е-пошта или датотеки" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "_Advanced key options" msgstr "_Напредни опции за клуч" -#: ../pgp/seahorse-pgp-generate.glade.h:2 +#: ../pgp/seahorse-pgp-generate.xml.h:2 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "PGP клучот Ви овозможува да енкриптирате е-пошта или датотеки за други луѓе." -#: ../pgp/seahorse-pgp-generate.glade.h:3 +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "Algorithms here" msgstr "Алгоритмите овде" -#: ../pgp/seahorse-pgp-generate.glade.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:4 msgid "C_reate" msgstr "К_реирај" -#: ../pgp/seahorse-pgp-generate.glade.h:5 -msgid "Create a PGP Key" -msgstr "Креирај нов PGP клуч" - -#: ../pgp/seahorse-pgp-generate.glade.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:5 msgid "E_xpiration Date:" msgstr "Р_ок на траење:" -#: ../pgp/seahorse-pgp-generate.glade.h:7 -#: ../ssh/seahorse-ssh-generate.glade.h:7 +#: ../pgp/seahorse-pgp-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:4 msgid "Encryption _Type:" msgstr "_Тип на енкриптирање:" -#: ../pgp/seahorse-pgp-generate.glade.h:9 +#: ../pgp/seahorse-pgp-generate.xml.h:8 msgid "Generate a new key" msgstr "Направи нов клуч" -#: ../pgp/seahorse-pgp-generate.glade.h:10 -#: ../ssh/seahorse-ssh-generate.glade.h:10 +#: ../pgp/seahorse-pgp-generate.xml.h:9 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:6 msgid "Key _Strength (bits):" msgstr "_Јачина на клуч (битови):" -#: ../pgp/seahorse-pgp-generate.glade.h:11 +#: ../pgp/seahorse-pgp-generate.xml.h:10 msgid "Ne_ver Expires" msgstr "Ни_когаш не истекува" -#: ../pgp/seahorse-pgp-generate.glade.h:12 -msgid "New PGP Key" -msgstr "Нов PGP клуч" - -#: ../pgp/seahorse-pgp-generate.glade.h:13 +#: ../pgp/seahorse-pgp-generate.xml.h:11 msgid "_Comment:" msgstr "_Коментар:" -#: ../pgp/seahorse-pgp-generator.vala:30 -msgid "Used to encrypt email and files" -msgstr "Користен за енкриптирање на е-пошта и датотеки" - -#: ../pgp/seahorse-pgp-key.c:234 -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:36 -msgid "Private PGP Key" -msgstr "Приватен PGP клуч" - -#: ../pgp/seahorse-pgp-key.c:237 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:32 -msgid "Public PGP Key" -msgstr "Јавен PGP клуч" - -#: ../pgp/seahorse-pgp-key.c:397 ../pgp/seahorse-pgp-key-properties.c:1378 -msgid "Expired" -msgstr "Помина" - -#: ../pgp/seahorse-pgp-key.c:667 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-pgp-key.c:353 +#| msgid "My _Personal Keys" +msgid "Personal PGP key" +msgstr "Личен PGP клуч" + +#: ../pgp/seahorse-pgp-key.c:355 +#| msgid "PGP Key" +msgid "PGP key" +msgstr "PGP клуч" -#: ../pgp/seahorse-pgp-key-properties.c:215 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Не можам да го променам примарното Ид. на корисникот" -#: ../pgp/seahorse-pgp-key-properties.c:234 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Дали сте сигурни дека сакате трајно да го избришете Ид. на корисникот „%s“?" -#: ../pgp/seahorse-pgp-key-properties.c:245 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "Не можам да избришам кориснички ID" -#: ../pgp/seahorse-pgp-key-properties.c:336 -#: ../pgp/seahorse-pgp-key-properties.c:1494 +#: ../pgp/seahorse-pgp-key-properties.c:428 +#: ../pgp/seahorse-pgp-key-properties.c:1564 msgid "[Unknown]" msgstr "[Непознато]" -#: ../pgp/seahorse-pgp-key-properties.c:434 -#: ../pgp/seahorse-pgp-key-properties.c:1770 +#: ../pgp/seahorse-pgp-key-properties.c:535 +#: ../pgp/seahorse-pgp-key-properties.c:1846 msgid "Name/Email" msgstr "Име/е-пошта" -#: ../pgp/seahorse-pgp-key-properties.c:439 +#: ../pgp/seahorse-pgp-key-properties.c:540 msgid "Signature ID" msgstr "Ид. на потпис" -#: ../pgp/seahorse-pgp-key-properties.c:591 +#: ../pgp/seahorse-pgp-key-properties.c:673 msgid "Couldn't change primary photo" msgstr "Не можам да ја променам примарната слика" -#: ../pgp/seahorse-pgp-key-properties.c:839 +#: ../pgp/seahorse-pgp-key-properties.c:906 msgid "(unknown)" msgstr "(непознато)" -#: ../pgp/seahorse-pgp-key-properties.c:842 +#: ../pgp/seahorse-pgp-key-properties.c:909 #, c-format msgid "This key expired on: %s" msgstr "Овој клуч истече на: %s" -#: ../pgp/seahorse-pgp-key-properties.c:996 +#: ../pgp/seahorse-pgp-key-properties.c:972 +msgid "Name" +msgstr "Име" + +#: ../pgp/seahorse-pgp-key-properties.c:1085 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Дали сте сигурни дека пернаментно сакате да го избришете подклучот %d од %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1008 +#: ../pgp/seahorse-pgp-key-properties.c:1094 msgid "Couldn't delete subkey" msgstr "Не можев да го избришам подклучот" -#: ../pgp/seahorse-pgp-key-properties.c:1044 -#: ../pgp/seahorse-pgp-key-properties.c:1458 +#: ../pgp/seahorse-pgp-key-properties.c:1134 +#: ../pgp/seahorse-pgp-key-properties.c:1539 msgid "Unable to change trust" msgstr "Не можам да добијам доверба" -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:214 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Не можам да го извезам клучот во \"%s\"" +#: ../pgp/seahorse-pgp-key-properties.c:1147 +#: ../ssh/seahorse-ssh-key-properties.c:202 +#| msgid "Couldn't export key." +msgid "Couldn't export key" +msgstr "Не можев да го извезам клучот" -#: ../pgp/seahorse-pgp-key-properties.c:1085 -#: ../ssh/seahorse-ssh-key-properties.c:238 -msgid "Export Complete Key" -msgstr "Извези го целосниот клуч" - -#: ../pgp/seahorse-pgp-key-properties.c:1110 -#: ../ssh/seahorse-ssh-key-properties.c:260 -msgid "Couldn't export key." -msgstr "Не можев да извезам клуч." - -#: ../pgp/seahorse-pgp-key-properties.c:1309 -#: ../pgp/seahorse-pgp-key-properties.c:1381 +#: ../pgp/seahorse-pgp-key-properties.c:1379 +#: ../pgp/seahorse-pgp-key-properties.c:1468 msgctxt "Expires" msgid "Never" msgstr "Никогаш" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1426 msgid "ID" msgstr "Ид." -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1356 -#: ../src/seahorse-key-manager-store.c:848 +#: ../pgp/seahorse-pgp-key-properties.c:1429 msgid "Type" msgstr "Тип" -#: ../pgp/seahorse-pgp-key-properties.c:1359 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "Created" msgstr "Креирано" -#: ../pgp/seahorse-pgp-key-properties.c:1362 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Expires" msgstr "Истекува" -#: ../pgp/seahorse-pgp-key-properties.c:1365 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Status" msgstr "Статус" -#: ../pgp/seahorse-pgp-key-properties.c:1368 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Strength" msgstr "Јачина" -#: ../pgp/seahorse-pgp-key-properties.c:1377 -#: ../pgp/seahorse-pgp-key-properties.c:1378 +#: ../pgp/seahorse-pgp-key-properties.c:1461 +msgid "Expired" +msgstr "Помина" + +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Good" msgstr "Добро" -#: ../pgp/seahorse-pgp-photos.c:73 -#, c-format -msgid "" -"The photo is too large\n" -"The recommended size for a photo on your key is %d x %d pixels." -msgstr "" -"Сликата е преголема\n" -"Препорачливата големина на сликата е %d x %d пиксели." - -#: ../pgp/seahorse-pgp-photos.c:78 -msgid "_Don't Resize" -msgstr "_Не променувај големина" - -#: ../pgp/seahorse-pgp-photos.c:79 -msgid "_Resize" -msgstr "_Промени големина" - -#: ../pgp/seahorse-pgp-photos.c:128 -#, c-format -msgid "" -"This is not a image file, or an unrecognized kind of image file. Try to use " -"a JPEG image." -msgstr "" -"Ова не е датотека со слика или препознатлив вид на датотека со слика. " -"Обидете се со \n" -"JPEG слика." - -#: ../pgp/seahorse-pgp-photos.c:224 -msgid "All image files" -msgstr "Сите датотеки со слики" - -#: ../pgp/seahorse-pgp-photos.c:237 -msgid "All JPEG files" -msgstr "Сите JPEG датотеки" - -#: ../pgp/seahorse-pgp-photos.c:261 -msgid "Choose Photo to Add to Key" -msgstr "Одберете фотографија за да ја додадете на клучот" - -#: ../pgp/seahorse-pgp-photos.c:290 ../pgp/seahorse-pgp-photos.c:294 -msgid "Couldn't add photo" -msgstr "Не можам да ја додадам фотографијата" - -#: ../pgp/seahorse-pgp-photos.c:291 -msgid "The file could not be loaded. It may be in an invalid format" -msgstr "Датотеката не може да се вчита. Може да е во невалиден формат" - -#: ../pgp/seahorse-pgp-photos.c:321 -msgid "Are you sure you want to remove the current photo from your key?" -msgstr "" -"Дали сте сигурни дека сакате да ја отстраните тековната фотографија од " -"Вашиот клуч?" - -#: ../pgp/seahorse-pgp-photos.c:334 -msgid "Couldn't delete photo" -msgstr "Не можам да ја избришам фотографијата" +#: ../pgp/seahorse-pgp-key-properties.c:1849 +msgid "Key ID" +msgstr "Идентификациј на клуч" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:1 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 msgid "Actions" msgstr "Дејства" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:1 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 msgid "Comment:" msgstr "Коментар:" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:3 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Dates" msgstr "Датуми" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:3 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 msgid "Email:" msgstr "Е-пошта:" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:5 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Fingerprint" msgstr "Отпечаток" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:6 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 msgid "Key ID:" msgstr "Ид. на клуч:" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:7 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 msgid "Key Names and Signatures" msgstr "Имиња на клучеви и потписи" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:7 -#: ../ssh/seahorse-ssh-key-properties.glade.h:7 -msgid "Name:" -msgstr "Име:" - -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:9 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:8 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 msgid "Photo " msgstr "Фотографија " -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:10 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 msgid "Technical Details" msgstr "Технички детали" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:10 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 msgid "This key has been revoked" msgstr "Овој клуч беше отповикан" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:11 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 msgid "This key has expired" msgstr "Овој клуч истече" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:13 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:12 -#: ../ssh/seahorse-ssh-key-properties.glade.h:11 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 msgid "Type:" msgstr "Тип:" #. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:14 -#: ../ssh/seahorse-ssh-key-properties.glade.h:13 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Use:" msgstr "Употреба:" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:16 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:18 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 msgid "_Subkeys" msgstr "_Подклучеви" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:17 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 msgid "Add" msgstr "Додај" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:18 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 msgid "Add a photo to this key" msgstr "Додај слика на овој клуч" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:19 -#: ../ssh/seahorse-ssh-key-properties.glade.h:16 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 msgid "Change _Passphrase" msgstr "Промени ја _тајната фраза" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:20 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:19 -msgid "Created:" -msgstr "Креирано:" - -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:21 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 msgid "Decrypt files and email sent to you." msgstr "Декриптирај датотеки и е-пошта испратена до Вас." -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:22 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 msgid "Delete" msgstr "Избриши" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:24 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 msgid "Expire" msgstr "Истече" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:25 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:22 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 msgid "Expires:" msgstr "Истекува:" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:26 -msgid "Export" -msgstr "Извези" - -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:27 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 msgid "Go to next photo" msgstr "Оди до следната фотографија" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:28 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 msgid "Go to previous photo" msgstr "Оди до претходната фотографија" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:29 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 msgid "Key ID:" msgstr "Идентификација на клуч" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:31 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 msgid "Make this photo the primary photo" msgstr "Направи ја оваа фотографија примарна" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:32 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 msgid "Names and Signatures" msgstr "Имиња и потписи" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:33 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 +#| msgctxt "Validity" +#| msgid "Never" +msgid "Never" +msgstr "Никогаш" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 msgid "Override Owner _Trust:" msgstr "Игнорирај ја _довербата на корисникот:" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:31 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 msgid "Owner" msgstr "Сопственик" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:35 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 msgid "Primary" msgstr "Примарно" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:37 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +msgid "Private PGP Key" +msgstr "Приватен PGP клуч" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 msgid "Remove this photo from this key" msgstr "Отстранете ја оваа фотографија од овој клуч" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:38 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 msgid "Revoke" msgstr "Отповикај" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:39 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 msgid "Sign" msgstr "Потпиши" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:40 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:33 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 msgid "Strength:" msgstr "Јачина:" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:41 -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:34 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 msgid "The owner of the key revoked the key. It can no longer be used." msgstr "Сопственикот на клучот го отповика клучот. Повеќе не може да се користи." -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:43 -msgid "" -"Unknown\n" -"Never\n" -"Marginal\n" -"Full\n" -"Ultimate" -msgstr "" -"Непознато\n" -"Никогаш\n" -"Малку\n" -"Потполна\n" -"Целосна" - -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Add Name" msgstr "_Додај име" -#: ../pgp/seahorse-pgp-private-key-properties.glade.h:49 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 msgid "_Export Complete Key:" msgstr "_Извези комплетен клуч:" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:2 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +#| msgid "Name:" +msgctxt "name-of-key" +msgid "Name:" +msgstr "Име:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 msgid "Dates:" msgstr "Датуми:" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:4 -#: ../ssh/seahorse-ssh-key-properties.glade.h:4 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Fingerprint:" msgstr "Отпечаток:" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:5 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 msgid "Indicate Trust:" msgstr "Одреди доверливост:" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 msgid "Your trust of this key" msgstr "Вашата доверливост за овој клуч" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:16 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 msgid "_Other Names:" msgstr "_Други имиња:" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:17 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 msgid "_People who have signed this key:" msgstr "_Луѓе кои го потпишале овој клуч:" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:21 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 msgid "Encrypt files and email to the key's owner " msgstr "Енкриптирајте ги датотеките и е-поштата со клучот на сопственикот " -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:24 -#, no-c-format -msgid "I trust signatures from '%s' on other keys" -msgstr "Им верувам на потписите од „%s“ на другите клучеви" - -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:26 -#, no-c-format -msgid "" -"If you believe that the person that owns this key is '%s', sign this " -"key:" -msgstr "" -"Ако верувате дека личноста која го поседува овој клуч е „%s“, потпишете го овој клуч:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 +#| msgid "Full" +msgid "Fully" +msgstr "Цела" -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 #, no-c-format -msgid "If you no longer trust that '%s' owns this key, revoke your signature:" -msgstr "" -"Ако верувате дека личноста која го поседува овој клуч не е „%s“, " -"отповикајте го овој клуч:" - -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:35 -#: ../src/seahorse-key-manager-store.c:842 -msgid "Trust" -msgstr "Верба" - -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:37 -msgid "" -"Unknown\n" -"Never\n" -"Marginally\n" -"Fully\n" -"Ultimately" -msgstr "" -"Непознато\n" -"Никогаш\n" -"Малку\n" -"Потполна\n" -"Целосна" - -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:42 -msgid "You _Trust the Owner:" -msgstr "Имате _доверба во сопственикот:" - -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:43 -msgid "Your trust is manually specified on the Details tab." -msgstr "Вашата доверба е рачно одредена на јазичето Детали." - -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:44 -msgid "_Only display the signatures of people I trust" -msgstr "_Прикажувај само потписи од луѓе Во кои имам доверба" - -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:45 -msgid "_Revoke Signature" -msgstr "_Отповикај потпис" - -#: ../pgp/seahorse-pgp-public-key-properties.glade.h:46 -msgid "_Sign this Key" -msgstr "_Потпиши го овој клуч" - -#: ../pgp/seahorse-pgp-revoke.c:75 -msgid "Couldn't revoke subkey" -msgstr "Не можам да го отповикам подклучот" - -#: ../pgp/seahorse-pgp-revoke.c:102 -#, c-format -msgid "Revoke Subkey %d of %s" -msgstr "Отповикувам подклуч %d од %s" - -#: ../pgp/seahorse-pgp-revoke.c:104 -#, c-format -msgid "Revoke %s" -msgstr "Повлечи %s" - -#: ../pgp/seahorse-pgp-revoke.c:115 -msgid "No reason" -msgstr "Без причина" - -#: ../pgp/seahorse-pgp-revoke.c:116 -msgid "No reason for revoking key" -msgstr "Нема причина за отповикувањето на клучот" - -#: ../pgp/seahorse-pgp-revoke.c:122 -msgid "Compromised" -msgstr "Откриен" - -#: ../pgp/seahorse-pgp-revoke.c:123 -msgid "Key has been compromised" -msgstr "Клучот беше откриен" - -#: ../pgp/seahorse-pgp-revoke.c:129 -msgid "Superseded" -msgstr "Заменет" - -#: ../pgp/seahorse-pgp-revoke.c:130 -msgid "Key has been superseded" -msgstr "Клучот беше заменет" - -#: ../pgp/seahorse-pgp-revoke.c:136 -msgid "Not Used" -msgstr "Неупотребен" - -#: ../pgp/seahorse-pgp-revoke.c:137 -msgid "Key is no longer used" -msgstr "Клучот веќе не се употребува" - -#: ../pgp/seahorse-pgp-revoke.c:176 -#, c-format -msgid "" -"You are about to add %s as a revoker for %s. This operation cannot be " -"undone! Are you sure you want to continue?" -msgstr "" -"Вие сте за додавање за %s како подвлекувач за %s. Оваа операција не може да " -"биде незавршена!Дали сте сигурни дека сакате да продолжите?" +msgid "I trust signatures from '%s' on other keys" +msgstr "Им верувам на потписите од „%s“ на другите клучеви" -#: ../pgp/seahorse-pgp-revoke.c:191 -msgid "Couldn't add revoker" -msgstr "Не можам да додадам отповикувач" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#, no-c-format +msgid "If you believe that the person that owns this key is '%s', sign this key:" +msgstr "Ако верувате дека личноста која го поседува овој клуч е „%s“, потпишете го овој клуч:" -#: ../pgp/seahorse-pgp-sign.c:96 -msgid "Couldn't sign key" -msgstr "Не можам да го потпишам клучот" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#, no-c-format +msgid "If you no longer trust that '%s' owns this key, revoke your signature:" +msgstr "Ако верувате дека личноста која го поседува овој клуч не е „%s“, отповикајте го овој клуч:" -#. TODO: We should be giving an error message that allows them to -#. generate or import a key -#: ../pgp/seahorse-pgp-sign.c:159 ../pgp/seahorse-signer.c:61 -msgid "No keys usable for signing" -msgstr "Нема употребливи клучеви за потпишување" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +#| msgid "Marginal" +msgid "Marginally" +msgstr "Маргинално" -#: ../pgp/seahorse-pgp-sign.c:160 -msgid "" -"You have no personal PGP keys that can be used to indicate your trust of " -"this key." -msgstr "" -"Немате лични PGP клучеви кои можат да бидат користени за откривање на " -"доверливоста на овој клуч." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "Public PGP Key" +msgstr "Јавен PGP клуч" -#: ../pgp/seahorse-pgp-source.c:100 -#, c-format -msgid "Wrong passphrase." -msgstr "Грешна тајна фраза." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 +msgid "Trust" +msgstr "Верба" -#: ../pgp/seahorse-pgp-source.c:104 -#, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Внесете нова тајна фраза за „%s“" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +#| msgid "Ultimate" +msgid "Ultimately" +msgstr "Крајно" -#: ../pgp/seahorse-pgp-source.c:106 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Внесете тајна фраза за „%s“" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "You _Trust the Owner:" +msgstr "Имате _доверба во сопственикот:" -#: ../pgp/seahorse-pgp-source.c:109 -#: ../src/seahorse-change-passphrase.glade.h:4 -msgid "Enter new passphrase" -msgstr "Внеси нова лозинка" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 +msgid "Your trust is manually specified on the Details tab." +msgstr "Вашата доверба е рачно одредена на јазичето Детали." -#: ../pgp/seahorse-pgp-source.c:111 -msgid "Enter passphrase" -msgstr "Внесете тајна фраза" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 +msgid "_Only display the signatures of people I trust" +msgstr "_Прикажувај само потписи од луѓе Во кои имам доверба" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-pgp-source.c:802 -#, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Вчитан е %d клуч" -msgstr[1] "Вчитани се %d клучеви" -msgstr[2] "Вчитани се %d клучеви" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "_Revoke Signature" +msgstr "_Отповикај потпис" -#: ../pgp/seahorse-pgp-source.c:857 -msgid "Loading Keys..." -msgstr "Вчитувам клучеви..." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "_Sign this Key" +msgstr "_Потпиши го овој клуч" -#: ../pgp/seahorse-pgp-source.c:900 -msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "" -"Невалидни податоци за клучот (недостасуваат UID). Ова може да биде поради " -"тоа што датумот на компјутерот е поставен во иднината или нема " -"самопотпишување." - -#: ../pgp/seahorse-pgp-source.c:1000 ../src/seahorse-key-manager.vala:549 -msgid "Importing Keys" -msgstr "Увезувам клучеви" - -#: ../pgp/seahorse-pgp-source.c:1036 -msgid "Exporting Keys" -msgstr "Извезувам клучеви" +#: ../pgp/seahorse-pgp-subkey.c:371 +#, c-format +#| msgid "Revoke Subkey %d of %s" +msgid "Subkey %d of %s" +msgstr "Потклуч %d од %s" -#: ../pgp/seahorse-revoke.glade.h:1 +#: ../pgp/seahorse-revoke.xml.h:1 msgid "Optional description of revocation" msgstr "Опционален опис за отпишувањето" -#: ../pgp/seahorse-revoke.glade.h:2 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "Re_voke" msgstr "От_пис" -#: ../pgp/seahorse-revoke.glade.h:3 +#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Причина за отповикувањето на клучот" -#: ../pgp/seahorse-revoke.glade.h:6 +#: ../pgp/seahorse-revoke.xml.h:6 msgid "_Reason:" msgstr "_Причина" -#: ../pgp/seahorse-sign.glade.h:1 +#: ../pgp/seahorse-signer.c:63 +msgid "You have no personal PGP keys that can be used to sign a document or message." +msgstr "Немате лични PGP клучеви кои можат да се употребат за потпишување на документ или на порака." + +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Потпиши ја пораката со клучот:" + +#: ../pgp/seahorse-sign.xml.h:1 msgid "How carefully have you checked this key?" msgstr "Колку претпазливо го проверивте овој клуч?" -#: ../pgp/seahorse-sign.glade.h:2 +#: ../pgp/seahorse-sign.xml.h:2 msgid "How others will see this signature:" msgstr "Како другите ќе го гледаат овој потпис:" -#: ../pgp/seahorse-sign.glade.h:3 +#: ../pgp/seahorse-sign.xml.h:3 msgid "Sign key as:" msgstr "Потпиши го клучот како:" -#: ../pgp/seahorse-sign.glade.h:4 -msgid "" -"Casually: means you have done a casual verification that the key\n" -"is owned by the person who claims to own it. For example, you could\n" -"read the key fingerprint to the owner over the phone. " +#: ../pgp/seahorse-sign.xml.h:4 +#| msgid "" +#| "Casually: means you have done a casual verification that the key\n" +#| "is owned by the person who claims to own it. For example, you could\n" +#| "read the key fingerprint to the owner over the phone. " +msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. " msgstr "" "Вообичаено: значи дека имате направено вообичаена проверка дека\n" -"клучот е поседуван од личност која тврди дека го поседува. На пример, " -"можете\n" +"клучот е поседуван од личност која тврди дека го поседува. На пример, можете\n" "да го прочитате отпечатокот на сопственикот преку телефон. " -#: ../pgp/seahorse-sign.glade.h:7 +#: ../pgp/seahorse-sign.xml.h:5 msgid "Key Name" msgstr "Име на клуч" -#: ../pgp/seahorse-sign.glade.h:8 -msgid "" -"Not at all: means you believe the key is owned by the person who \n" -"claims to own it, but you could not or did not verify this to be a fact." +#: ../pgp/seahorse-sign.xml.h:6 +#| msgid "" +#| "Not at all: means you believe the key is owned by the person who \n" +#| "claims to own it, but you could not or did not verify this to be a fact." +msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." msgstr "" "Воопшто не: значи дека верувате дека клучот е на личност која тврди \n" "дека го поседува, но не можите или не проверивте дали е точно тоа." -#: ../pgp/seahorse-sign.glade.h:10 -msgid "" -"Very Carefully: Select this only if you are absolutely sure that " -"this\n" -"key is genuine." +#: ../pgp/seahorse-sign.xml.h:7 +#| msgid "" +#| "Very Carefully: Select this only if you are absolutely sure that " +#| "this\n" +#| "key is genuine." +msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." msgstr "" -"Многу претпазливо: Одберете го ова само ако сте апсолутно сигурни " -"дека овој\n" +"Многу претпазливо: Одберете го ова само ако сте апсолутно сигурни дека овој\n" "клуч е автентичен." -#: ../pgp/seahorse-sign.glade.h:12 +#: ../pgp/seahorse-sign.xml.h:8 msgid "By signing you indicate your trust that this key belongs to:" msgstr "Со потпишувањето ја прикажувате доверливоста дека овој клуч припаѓа на:" -#: ../pgp/seahorse-sign.glade.h:13 +#: ../pgp/seahorse-sign.xml.h:9 msgid "I can _revoke this signature at a later date." msgstr "Можам да го _отповикам овој потпис подоцна." -#: ../pgp/seahorse-sign.glade.h:14 -msgid "" -"You could use a hard to forge photo identification (such as a passport) \n" -"to personally check that the name on the key is correct. You should \n" -"have also used email to check that the email address belongs to the\n" -"owner." +#: ../pgp/seahorse-sign.xml.h:10 +#| msgid "_Sign Key..." +msgid "Sign Key" +msgstr "Потпиши клуч" + +#: ../pgp/seahorse-sign.xml.h:11 +#| msgid "" +#| "You could use a hard to forge photo identification (such as a passport) \n" +#| "to personally check that the name on the key is correct. You should \n" +#| "have also used email to check that the email address belongs to the\n" +#| "owner." +msgid "You could use a hard to forge photo identification (such as a passport) to personally check that the name on the key is correct. You should have also used email to check that the email address belongs to the owner." msgstr "" -"Можете да користите фотографија која е тешко да се фалсификува (како што е " -"од пасош) \n" -"за да проверите лично дали името на клучот одговара. Исто така, треба да ја " -"имате искористено\n" +"Можете да користите фотографија која е тешко да се фалсификува (како што е од пасош) \n" +"за да проверите лично дали името на клучот одговара. Исто така, треба да ја имате искористено\n" "е-поштата за проверите дали адресата за е-пошта припаѓа на\n" "сопственикот." -#: ../pgp/seahorse-sign.glade.h:18 +#: ../pgp/seahorse-sign.xml.h:12 msgid "_Casually" msgstr "_Вообичаено" -#: ../pgp/seahorse-sign.glade.h:19 +#: ../pgp/seahorse-sign.xml.h:13 msgid "_Not at all" msgstr "_Ни најмалку" -#: ../pgp/seahorse-sign.glade.h:20 +#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Другите може да не го видат овој потпис" -#: ../pgp/seahorse-sign.glade.h:21 +#: ../pgp/seahorse-sign.xml.h:15 msgid "_Sign" msgstr "_Потпиши" -#: ../pgp/seahorse-sign.glade.h:22 +#: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Потпишувач:" -#: ../pgp/seahorse-sign.glade.h:23 +#: ../pgp/seahorse-sign.xml.h:17 msgid "_Very Carefully" msgstr "_Многу претпазливо" -#: ../pgp/seahorse-signer.c:62 -msgid "You have no personal PGP keys that can be used to sign a document or message." -msgstr "" -"Немате лични PGP клучеви кои можат да се употребат за потпишување на " -"документ или на порака." +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +#| msgid "Exporting Keys" +msgid "Exporting data" +msgstr "Извезувам податоци" + +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +#| msgid "Retrieving key" +msgid "Retrieving data" +msgstr "Земам податоци" + +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +#| msgid "Importing Keys" +msgid "Importing data" +msgstr "Увезувам податоци" + +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Испраќам податоци" -#: ../pgp/seahorse-signer.glade.h:1 -msgid "_Sign message with key:" -msgstr "_Потпиши ја пораката со клучот:" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Недостапно" + +#: ../pkcs11/seahorse-certificate.c:435 +#| msgid "Generate a new key" +msgid "Personal certificate and key" +msgstr "Личен сертификат и клуч" + +#: ../pkcs11/seahorse-certificate.c:438 +#| msgid "Certificate" +msgid "Personal certificate" +msgstr "Личен сертификат" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Сертификат" + +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Сертификати (DER енкодирани)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +#| msgid "Certificate" +msgid "Certificates" +msgstr "Сертификати" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 сертификати и поврзани клучеви" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +#| msgid "Are you sure you want to permanently delete %d identities?" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Дали сте сигурни дека сакате трајно да избришете %d сертификат?" +msgstr[1] "Дали сте сигурни дека сакате трајно да избришете %d сертификати?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +#| msgid "Couldn't generate key" +msgid "Couldn't generate private key" +msgstr "Не можев да генерирам приватен клуч" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +#| msgid "C_reate" +msgid "Create" +msgstr "Креирај" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +#| msgid "Private PGP Key" +msgid "Private key" +msgstr "Приватен клуч" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Се користи за барање на сертификат" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +#| msgid "Create a new personal key" +msgid "Create a new private key" +msgstr "Креирај нов личен клуч" -#: ../src/main.c:70 -msgid "Encryption Key Manager" -msgstr "Менаџер на клучеви за енкрипција" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +msgid "Label:" +msgstr "Ознака:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#| msgid "Strength:" +msgid "Stored at:" +msgstr "Зачуван на:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Разбирам дека овој клуч ќе биде трајно избришан." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Неименуван" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Не успеав да го извезам сертификатот" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 +#: ../src/seahorse-sidebar.c:875 +#| msgid "Couldn't delete photo" +msgid "Couldn't delete" +msgstr "Не можев да избришам" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +#| msgid "Export" +msgid "_Export" +msgstr "_Извези" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +#| msgid "Certificate" +msgid "Export the certificate" +msgstr "Извези го сертификатот" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Избриши го овој сертификат или клуч" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#| msgid "Certificate" +msgid "Request _Certificate" +msgstr "Побарај _сертификат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +#| msgid "No private key file is available for this key." +msgid "Create a certificate request file for this key" +msgstr "Креирај датотека со барање за сертификат за овој клуч" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +#| msgid "Couldn't verify signature." +msgid "Couldn't save certificate request" +msgstr "Не можев да го зачувам барањето за сертификатот" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Зачувај го барањето за сертификат" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +#| msgid "Certificate" +msgid "Certificate request" +msgstr "Барање за сертификат" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM енкодирано барање" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +#| msgid "couldn't create new process group" +msgid "Couldn't create certificate request" +msgstr "Не можев да креирам барање за сертификат" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Креирај датотека со барање за сертификат." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "Name (CN):" +msgstr "Име (CN):" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "The common name (CN) placed in the certificate request." +msgstr "Општо име (CN) поставено во барањето за сертификат." + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Неименуван приватен клуч" -#: ../src/seahorse-change-passphrase.glade.h:1 +#: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Смени лозинка" -#: ../src/seahorse-change-passphrase.glade.h:2 +#: ../src/seahorse-change-passphrase.xml.h:2 msgid "Con_firm Passphrase:" msgstr "Потврди лозинка" -#: ../src/seahorse-change-passphrase.glade.h:3 +#: ../src/seahorse-change-passphrase.xml.h:3 msgid "Confirm new passphrase" msgstr "Потврди ја новата лозинка" -#: ../src/seahorse-change-passphrase.glade.h:5 +#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "Нова лозинка" @@ -2252,602 +2226,871 @@ msgid "Manage your passwords and encryption keys" msgstr "Менаџирајте ги Вашите лозинки и клучеви за енкриптирање" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.vala:142 -msgid "Passwords and Encryption Keys" -msgstr "Лозинки и клучеви за енкриптирање" - -#: ../src/seahorse-generate-select.glade.h:1 -msgid "_Select the kind of key you wish to create:" -msgstr "_Одберете го типот на клуч кој сакате да го креирате:" - -#: ../src/seahorse-generate-select.glade.h:2 -msgid "C_ontinue" -msgstr "П_родолжи" - -#: ../src/seahorse-generate-select.glade.h:3 -msgid "Create a New Key" -msgstr "Креирај нов клуч" - -#: ../src/seahorse-key-manager.glade.h:1 -msgid "First time options:" -msgstr "Почетни опции:" - -#: ../src/seahorse-key-manager.glade.h:2 -msgid "Generate a new key of your own: " -msgstr "Генерирајте нов клуч од Вашиот сопствен клуч: " - -#: ../src/seahorse-key-manager.glade.h:3 -msgid "Import existing keys from a file:" -msgstr "Увези ги постоечките клучеви од датотека." - -#: ../src/seahorse-key-manager.glade.h:4 -msgid "My _Personal Keys" -msgstr "Моите _лични клучеви" - -#: ../src/seahorse-key-manager.glade.h:5 -msgid "Other _Collected Keys" -msgstr "Други _собрани клучеви" - -#: ../src/seahorse-key-manager.glade.h:6 -msgid "To get started with encryption you will need keys." -msgstr "За да започнете со енкриптирање ќе ви требаат клучеви." - -#: ../src/seahorse-key-manager.glade.h:7 -#: ../src/seahorse-keyserver-results.vala:53 -msgid "_Import" -msgstr "_Внеси" +#: ../src/seahorse-generate-select.c:229 +#| msgid "C_ontinue" +msgid "Continue" +msgstr "Продолжи" + +#: ../src/seahorse-generate-select.xml.h:1 +#| msgid "_Select the kind of key you wish to create:" +msgid "_Select the type of item to create:" +msgstr "_Одберете го типот на предмет кој сакате да го креирате:" + +#: ../src/seahorse-import-dialog.c:98 +#| msgid "Import Key" +msgid "Import failed" +msgstr "Увезувањето не успеа" + +#: ../src/seahorse-import-dialog.c:116 +#| msgid "_Import" +msgid "Import" +msgstr "Увези" + +#: ../src/seahorse-import-dialog.c:129 +#| msgid "Dates:" +msgid "Data to be imported:" +msgstr "Податоци за увезување:" -#: ../src/seahorse-key-manager.glade.h:8 -msgid "_Passwords" -msgstr "_Лозинки" - -#: ../src/seahorse-key-manager.glade.h:9 -msgid "_Trusted Keys" -msgstr "_Доверливи клучеви" +#: ../src/seahorse-key-manager.c:237 +#: ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Увези клуч" -#: ../src/seahorse-key-manager.vala:105 -#: ../src/seahorse-keyserver-results.vala:37 -msgid "_Remote" -msgstr "_Оддалечено" +#: ../src/seahorse-key-manager.c:249 +msgid "All key files" +msgstr "Сите датотеки со клучеви" -#: ../src/seahorse-key-manager.vala:107 -msgid "_Quit" -msgstr "_Напушти" +#: ../src/seahorse-key-manager.c:350 +msgid "Dropped text" +msgstr "Испуштен текст" + +#: ../src/seahorse-key-manager.c:373 +msgid "Clipboard text" +msgstr "Текст од табла со исечоци" + +#: ../src/seahorse-key-manager.c:500 +msgid "_New" +msgstr "_Нов" -#: ../src/seahorse-key-manager.vala:108 +#: ../src/seahorse-key-manager.c:502 msgid "Close this program" msgstr "Затвори ја оваа програма" -#: ../src/seahorse-key-manager.vala:110 -msgid "_Create New Key..." -msgstr "_Креирај нови клучеви..." - -#: ../src/seahorse-key-manager.vala:111 -msgid "Create a new personal key" -msgstr "Креирај нов личен клуч" +#: ../src/seahorse-key-manager.c:503 +#: ../src/seahorse-key-manager.c:505 +msgid "_New..." +msgstr "_Нов..." + +#: ../src/seahorse-key-manager.c:504 +#| msgid "Create a New Key" +msgid "Create a new key or item" +msgstr "Креирај нов клуч или предмет" + +#: ../src/seahorse-key-manager.c:506 +msgid "Add a new key or item" +msgstr "Додај нов клуч или предмет" -#: ../src/seahorse-key-manager.vala:112 +#: ../src/seahorse-key-manager.c:507 msgid "_Import..." msgstr "_Увези..." -#: ../src/seahorse-key-manager.vala:113 -msgid "Import keys into your key ring from a file" -msgstr "Увезете клучеви во Вашиот приврзок од датотека" - -#: ../src/seahorse-key-manager.vala:114 -msgid "Paste _Keys" -msgstr "Вметни _клучеви" - -#: ../src/seahorse-key-manager.vala:115 -msgid "Import keys from the clipboard" -msgstr "Увези клучеви од таблата со иссечоци" +#: ../src/seahorse-key-manager.c:508 +#| msgid "Import existing keys from a file:" +msgid "Import from a file" +msgstr "Увези од датотека" + +#: ../src/seahorse-key-manager.c:510 +#| msgid "Import keys from the clipboard" +msgid "Import from the clipboard" +msgstr "Увези од таблата со иссечоци" + +#: ../src/seahorse-key-manager.c:514 +#| msgid "_Replace" +msgid "P_laces" +msgstr "М_еста" + +#: ../src/seahorse-key-manager.c:515 +#| msgid "Show pass_word" +msgid "Show places sidebar" +msgstr "Покажи странична лента со места" + +#: ../src/seahorse-key-manager.c:519 +#| msgid "Show type column" +msgid "Show _personal" +msgstr "Покажи ги _личните" + +#: ../src/seahorse-key-manager.c:520 +msgid "Only show personal keys, certificates and passwords" +msgstr "Покажи ги само личните клучеви, сертификати и лозинки" + +#: ../src/seahorse-key-manager.c:521 +msgid "Show _trusted" +msgstr "Покажи ги _доверливите" + +#: ../src/seahorse-key-manager.c:522 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Покажи ги само доверливите клучеви, сертификати и лозинки" + +#: ../src/seahorse-key-manager.c:523 +msgid "Show _any" +msgstr "Покажи _било што" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show all keys, certificates and passwords" +msgstr "Покажи ги сите клучеви, сертификати и лозинки" + +#: ../src/seahorse-key-manager.c:729 +#| msgid "Filter:" +msgid "Filter" +msgstr "Филтер" -#: ../src/seahorse-key-manager.vala:119 -#: ../src/seahorse-keyserver-results.vala:48 -msgid "_Find Remote Keys..." -msgstr "_Пребарај оддалечени клучеви..." - -#: ../src/seahorse-key-manager.vala:120 -#: ../src/seahorse-keyserver-results.vala:49 -msgid "Search for keys on a key server" -msgstr "Пребарувај за клучеви на сервер за клучеви" - -#: ../src/seahorse-key-manager.vala:121 -msgid "_Sync and Publish Keys..." -msgstr "_Синхронизирај и објави клучеви..." - -#: ../src/seahorse-key-manager.vala:122 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Објавете ги и/или синхронизирајте ги Вашите клучеви со тие онлајн." - -#: ../src/seahorse-key-manager.vala:126 -msgid "T_ypes" -msgstr "Т_ипови" - -#: ../src/seahorse-key-manager.vala:126 -msgid "Show type column" -msgstr "Прикажи колона за тип" - -#: ../src/seahorse-key-manager.vala:127 -msgid "_Expiry" -msgstr "_Истекува" - -#: ../src/seahorse-key-manager.vala:127 -msgid "Show expiry column" -msgstr "Прикажи колона за истекување" - -#: ../src/seahorse-key-manager.vala:128 -msgid "_Trust" -msgstr "_Доверба" - -#: ../src/seahorse-key-manager.vala:128 -msgid "Show owner trust column" -msgstr "Прикажи колона за довербата на сопственикот" - -#: ../src/seahorse-key-manager.vala:129 -msgid "_Validity" -msgstr "_Валидно" - -#: ../src/seahorse-key-manager.vala:129 -msgid "Show validity column" -msgstr "Прикажи колона за валидност" - -#: ../src/seahorse-key-manager.vala:225 -msgid "Filter:" -msgstr "Филтер:" - -#: ../src/seahorse-key-manager.vala:463 ../src/seahorse-key-manager.vala:510 -#: ../src/seahorse-key-manager.vala:537 -#: ../src/seahorse-keyserver-results.vala:211 -msgid "Couldn't import keys" -msgstr "Не можам да увезам клучеви" - -#: ../src/seahorse-key-manager.vala:467 -#: ../src/seahorse-keyserver-results.vala:215 -msgid "Imported keys" -msgstr "Увезени клучеви" - -#: ../src/seahorse-key-manager.vala:505 -msgid "Importing keys" -msgstr "Увезувам клучеви" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Почетни опции:" -#: ../src/seahorse-key-manager.vala:514 ../ssh/seahorse-ssh-operation.c:1094 -msgid "Import Key" -msgstr "Увези клуч" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Генерирајте нов клуч од Вашиот сопствен клуч: " -#: ../src/seahorse-key-manager.vala:538 -msgid "Unrecognized key type, or invalid data format" -msgstr "Непрепознат тип на клуч или невалиден формат на податоци" - -#: ../src/seahorse-key-manager.vala:682 -#: ../src/seahorse-keyserver-results.vala:247 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Избран е %d клуч" -msgstr[1] "Избран е %d клуч" -msgstr[2] "Избран е %d клуч" +#: ../src/seahorse-key-manager.xml.h:3 +msgid "Import existing keys from a file:" +msgstr "Увези ги постоечките клучеви од датотека." -#: ../src/seahorse-key-manager-store.c:644 -msgid "Couldn't export keys" -msgstr "Не можев да увезам клучеви" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "To get started with encryption you will need keys." +msgstr "За да започнете со енкриптирање ќе ви требаат клучеви." -#: ../src/seahorse-key-manager-store.c:835 -msgid "Validity" -msgstr "Валидност" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:854 -msgid "Expiration Date" -msgstr "Рок на трење" - -#: ../src/seahorse-keyserver-results.vala:39 -msgid "_Close" -msgstr "_Затвори" +#: ../src/seahorse-main.c:54 +msgid "Version of this application" +msgstr "Верзија на оваа апликација" + +#: ../src/seahorse-sidebar.c:799 +#| msgid "Couldn't export key." +msgid "Couldn't lock" +msgstr "Не можев да заклучам" + +#: ../src/seahorse-sidebar.c:836 +#| msgid "Couldn't sign key" +msgid "Couldn't unlock" +msgstr "Не можам да отклучам" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Заклучи" + +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Отклучи" + +#: ../src/seahorse-sidebar.c:968 +#| msgid "Key Properties" +msgid "_Properties" +msgstr "_Својства" -#: ../src/seahorse-keyserver-results.vala:40 -msgid "Close this window" -msgstr "Затвори го овој прозорец" +#: ../ssh/seahorse-ssh-actions.c:88 +msgid "Configure Key for _Secure Shell..." +msgstr "Конфигурирај клуч за _безбедна школка..." -#: ../src/seahorse-keyserver-results.vala:41 -msgid "_Expand All" -msgstr "_Прошири се" - -#: ../src/seahorse-keyserver-results.vala:42 -msgid "Expand all listings" -msgstr "Потрошиги сите листења" - -#: ../src/seahorse-keyserver-results.vala:43 -msgid "_Collapse All" -msgstr "_Колапсирајги сите" - -#: ../src/seahorse-keyserver-results.vala:44 -msgid "Collapse all listings" -msgstr "Колапсирај ги сите листи" +#: ../ssh/seahorse-ssh-actions.c:89 +msgid "Send public Secure Shell key to another machine, and enable logins using that key." +msgstr "Испрати го клучот од безбедната школка на друга машина и овозможи најавувања со тој клуч." -#: ../src/seahorse-keyserver-results.vala:54 -msgid "Import selected keys to local key ring" -msgstr "Увези ги избраните клучеви во локален приврзок" +#: ../ssh/seahorse-ssh-askpass.c:60 +#: ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Внесете ја Вашата тајна фраза на безбедна школка:" -#: ../src/seahorse-keyserver-results.vala:65 -msgid "Remote Keys" -msgstr "Оддалечени клучеви" +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Стара тајна фраза" -#: ../src/seahorse-keyserver-results.vala:67 +#: ../ssh/seahorse-ssh-askpass.c:83 #, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Оддалечени клучеви кои содржат „%s“" - -#: ../src/seahorse-keyserver-results.vala:226 -msgid "Importing keys from key servers" -msgstr "Увезувам клучеви од сервери за клучеви" - -#: ../src/seahorse-keyserver-search.glade.h:1 -msgid "Key Servers:" -msgstr "Сервери со клучеви:" - -#: ../src/seahorse-keyserver-search.glade.h:2 -msgid "Shared Keys Near Me:" -msgstr "Споделени клучеви близу до мене:" - -#: ../src/seahorse-keyserver-search.glade.h:3 -msgid "Find Remote Keys" -msgstr "Најди оддалечени клучеви" - -#: ../src/seahorse-keyserver-search.glade.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Ова ќе пребарува клучеви од други на интернет. Овие клучеви тогаш ќе можат " -"да бидат увезени во локалниот приврзок." - -#: ../src/seahorse-keyserver-search.glade.h:5 -msgid "Where to search:" -msgstr "Каде да барам:" - -#: ../src/seahorse-keyserver-search.glade.h:6 -msgid "_Search" -msgstr "_Барај" - -#: ../src/seahorse-keyserver-search.glade.h:7 -msgid "_Search for keys containing: " -msgstr "_Барај клучеви кои содржат: " +msgid "Enter the old passphrase for: %s" +msgstr "Внесете ја старата тајна фраза за: %s" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "Не можам да објавам клучеви на серверот" +#: ../ssh/seahorse-ssh-askpass.c:87 +#: ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Нова тајна фраза" -#: ../src/seahorse-keyserver-sync.c:61 +#: ../ssh/seahorse-ssh-askpass.c:88 #, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Не можам да добијам клучеви од серверот: %s" +msgid "Enter the new passphrase for: %s" +msgstr "Внесете нова тајна фраза за: %s" -#: ../src/seahorse-keyserver-sync.c:155 +#: ../ssh/seahorse-ssh-askpass.c:93 #, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d клуч е избран за синхронизација" -msgstr[1] "%d клучеви се избрани за синхронизација" -msgstr[2] "%d клучеви се избрани за синхронизација" - -#: ../src/seahorse-keyserver-sync.c:221 -msgid "Synchronizing keys" -msgstr "Ги синхронизирам клучевите" - -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:253 -msgid "Synchronizing keys..." -msgstr "Ги синхронизирам клучевите..." - -#: ../src/seahorse-keyserver-sync.glade.h:1 -msgid "X keys are selected for synchronizing" -msgstr "X клучеви се избрани за синхронизација" - -#: ../src/seahorse-keyserver-sync.glade.h:2 -msgid "Sync Keys" -msgstr "Ги синхронизирам клучевите" - -#: ../src/seahorse-keyserver-sync.glade.h:3 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"ОВа ќе ги објави клучевите во Вашиот приврзок така што ќе бидат достапни за " -"користење од други. Исто така ќе ги добивате измените што ги прават другите, " -"бидејќи ќе ги имате добиено и нивните клучеви." - -#: ../src/seahorse-keyserver-sync.glade.h:4 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Ова ќе ги земи сите промени што другите ги направиле отакако сте ги добиле " -"нивните клучеви. Не е избран сервер за објавување, па ниту еден Ваш клуч " -"нема да биде достапен до другите." - -#: ../src/seahorse-keyserver-sync.glade.h:5 -msgid "_Key Servers" -msgstr "Сервери за _клучеви" - -#: ../src/seahorse-keyserver-sync.glade.h:6 -msgid "_Sync" -msgstr "_Синх." - -#: ../ssh/seahorse-ssh-askpass.c:101 -msgid "Enter your Secure Shell passphrase:" -msgstr "Внесете ја Вашата тајна фраза на безбедна школка:" - -#: ../ssh/seahorse-ssh-commands.vala:29 -msgid "Configure Key for _Secure Shell..." -msgstr "Конфигурирај клуч за _безбедна школка..." - -#: ../ssh/seahorse-ssh-commands.vala:30 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Испрати го клучот од безбедната школка на друга машина и овозможи најавувања " -"со тој клуч." +#| msgid "Enter the new passphrase for: %s" +msgid "Enter the new passphrase again: %s" +msgstr "Повторно внесете нова тајна фраза: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +#| msgid "Secure Shell Key" +msgid "Secure Shell" +msgstr "Сигурносна школка" + +#: ../ssh/seahorse-ssh-backend.c:94 +#| msgid "Used to connect to other computers." +msgid "Keys used to connect securely to other computers" +msgstr "Клучеви кои се користат за поврзување на други компјутери" -#: ../ssh/seahorse-ssh-commands.vala:77 +#: ../ssh/seahorse-ssh-deleter.c:81 +#: ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Дали сте сигурни дека сакате трајно да го избришете клучот од школката „%s“?" -#: ../ssh/seahorse-ssh-commands.vala:79 +#: ../ssh/seahorse-ssh-deleter.c:91 +#: ../ssh/seahorse-ssh-deleter.c:92 #, c-format msgid "Are you sure you want to delete %d secure shell keys?" msgstr "Дали сте сигурни дека сакате трајно да избришете %d клучеви за школката?" -#: ../ssh/seahorse-ssh-generate.c:47 +#: ../ssh/seahorse-ssh-exporter.c:92 +#| msgid "Sync Keys" +msgid "Ssh Key" +msgstr "Ssh клуч" + +#: ../ssh/seahorse-ssh-exporter.c:122 +#| msgid "Secure Shell key" +msgid "Secret SSH keys" +msgstr "Тајни SSH клучеви" + +#: ../ssh/seahorse-ssh-exporter.c:126 +#| msgid "Public PGP Key" +msgid "Public SSH keys" +msgstr "Јавни SSH клучеви" + +#: ../ssh/seahorse-ssh-exporter.c:290 +#| msgid "No private key file is available for this key." +msgid "No public key file is available for this key." +msgstr "Нема достапни датотеки со јавни клучеви за овој клуч." + +#: ../ssh/seahorse-ssh-generate.c:55 +#: ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Secure Shell Key" +msgstr "Клуч на сигурносна школка" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "Користен за пристапување на други компјутери (пр: преку терминал)" + +#: ../ssh/seahorse-ssh-generate.c:110 +#: ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Не можам да генерирам клуч за безбедна школка" -#: ../ssh/seahorse-ssh-generate.c:154 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Креирам клуч за сигурната школка" -#: ../ssh/seahorse-ssh-generate.glade.h:2 -msgid "" -"Use your email address, and any other reminder\n" -" you need about what this key is for." -msgstr "" -"Користете ја Вашата адреса за е-пошта и друг потсетник\n" -" што ќе Ви треба за знаете за што е овој клуч." - -#: ../ssh/seahorse-ssh-generate.glade.h:4 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted\n" -"computers using SSH, without entering a different password \n" -"for each of them." -msgstr "" -"Клучот на безбедната школка (SSH) Ви овозможува да се поврзете безбедно до\n" -"доверливи компјутери со користење на SSH, без да внесувате различни лозинки\n" -"за секој од нив." - -#: ../ssh/seahorse-ssh-generate.glade.h:8 -msgid "" -"If there is already a computer you want to use this key with, you \n" -"can set up that computer to recognize your key now. " -msgstr "" -"Ако веќе има компкутер со кој што сакате да го користите овој клуч, сега " -"можете \n" -"да го поставите тој компјутер да го препознае Вашиот клуч." +#: ../ssh/seahorse-ssh-generate.xml.h:2 +#| msgid "" +#| "Use your email address, and any other reminder\n" +#| " you need about what this key is for." +msgid "Your email address, or a reminder of what this key is for." +msgstr "Вашата адреса за е-пошта или друг потсетник за тоа што е овој клуч." + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +#| msgid "" +#| "A Secure Shell (SSH) key lets you connect securely to trusted\n" +#| "computers using SSH, without entering a different password \n" +#| "for each of them." +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "Клучот на безбедната школка (SSH) Ви овозможува безбедно да се поврзете со други компјутери." + +#: ../ssh/seahorse-ssh-generate.xml.h:5 +#| msgid "" +#| "If there is already a computer you want to use this key with, you \n" +#| "can set up that computer to recognize your key now. " +msgid "If there is a computer you want to use this key with, you can set up that computer to recognize your new key." +msgstr "Ако веќе има компкутер со кој што сакате да го користите овој клуч, сега можете да го поставите тој компјутер да го препознае Вашиот клуч." -#: ../ssh/seahorse-ssh-generate.glade.h:11 +#: ../ssh/seahorse-ssh-generate.xml.h:7 msgid "New Secure Shell Key" msgstr "Нов клуч за безбедната школка" -#: ../ssh/seahorse-ssh-generate.glade.h:12 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "_Create and Set Up" msgstr "_Креирај и постави" -#: ../ssh/seahorse-ssh-generate.glade.h:13 +#: ../ssh/seahorse-ssh-generate.xml.h:10 msgid "_Just Create Key" msgstr "_Само креирај клуч" -#: ../ssh/seahorse-ssh-generate.glade.h:14 -msgid "_Key Description:" -msgstr "_Опис на клуч:" - -#: ../ssh/seahorse-ssh-generator.vala:29 ../ssh/seahorse-ssh-key.c:97 -#: ../ssh/seahorse-ssh-key.c:101 ../ssh/seahorse-ssh-key-properties.glade.h:21 -#: ../ssh/seahorse-ssh-source.c:726 -msgid "Secure Shell Key" -msgstr "Клуч на сигурносна школка" - -#: ../ssh/seahorse-ssh-generator.vala:30 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "Користен за пристапување на други компјутери (пр: преку терминал)" - -#: ../ssh/seahorse-ssh-key.c:93 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Нечитлив клуч за сигурносна школка)" -#: ../ssh/seahorse-ssh-key.c:129 -msgid "Private Secure Shell Key" -msgstr "Приватен клуч на сигурносна школка" - -#: ../ssh/seahorse-ssh-key.c:132 -msgid "Public Secure Shell Key" -msgstr "Јавен клуч на сигурносна школка" +#: ../ssh/seahorse-ssh-key.c:218 +#| msgid "My _Personal Keys" +msgid "Personal SSH key" +msgstr "Личен SSH клуч" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH клуч" -#: ../ssh/seahorse-ssh-key-properties.c:118 +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Не можам да го преименувам клучот." -#: ../ssh/seahorse-ssh-key-properties.c:159 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Не можам да ја променам авторизацијата за клучот." -#: ../ssh/seahorse-ssh-key-properties.c:174 -msgid "Couldn't change passhrase for key." +#: ../ssh/seahorse-ssh-key-properties.c:170 +#| msgid "Couldn't change passhrase for key." +msgid "Couldn't change passphrase for key." msgstr "Не можам да ја променам тајната фраза за клучот." -#: ../ssh/seahorse-ssh-key-properties.glade.h:1 -msgid "/home/nate/.ssh/blah_rsa" -msgstr "/home/nate/.ssh/blah_rsa" - -#: ../ssh/seahorse-ssh-key-properties.glade.h:2 -msgid "00:00:00:00:00" -msgstr "00:00:00:00:00" - -#: ../ssh/seahorse-ssh-key-properties.glade.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 msgid "Algorithm:" msgstr "Алгоритам:" -#: ../ssh/seahorse-ssh-key-properties.glade.h:5 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 msgid "Identifier:" msgstr "Идентификатор:" -#: ../ssh/seahorse-ssh-key-properties.glade.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Location:" msgstr "Локација:" -#: ../ssh/seahorse-ssh-key-properties.glade.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +msgid "Name:" +msgstr "Име:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 msgid "Strength:" msgstr "Јачина:" -#: ../ssh/seahorse-ssh-key-properties.glade.h:10 +#: ../ssh/seahorse-ssh-key-properties.xml.h:8 msgid "Trust" msgstr "Доверба" -#: ../ssh/seahorse-ssh-key-properties.glade.h:15 +#: ../ssh/seahorse-ssh-key-properties.xml.h:13 #, no-c-format msgid "This only applies to the '%s' account." msgstr "Ова се однесува само на'%s' сметката." -#: ../ssh/seahorse-ssh-key-properties.glade.h:18 +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 msgid "E_xport Complete Key" msgstr "И_звези целосен клуч" -#: ../ssh/seahorse-ssh-key-properties.glade.h:22 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 msgid "The owner of this key is _authorized to connect to this computer" msgstr "Сопственикот на овој клуч е _авторизиран да се поврзи на овој компјутер" -#: ../ssh/seahorse-ssh-key-properties.glade.h:23 +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 msgid "Used to connect to other computers." msgstr "Користен за поврзување на други компјутери." -#: ../ssh/seahorse-ssh-operation.c:138 ../ssh/seahorse-ssh-operation.c:700 -#, c-format +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH командата беше прекината неочекувано." -#: ../ssh/seahorse-ssh-operation.c:146 ../ssh/seahorse-ssh-operation.c:707 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH командата не успеа." -#: ../ssh/seahorse-ssh-operation.c:444 -msgid "Secure Shell key" -msgstr "клуч на безбедна школка" - -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "Тајна фраза:" - -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:730 -msgid "Secure Shell Passphrase" -msgstr "Тајна фраза на безбедна школка" - -#: ../ssh/seahorse-ssh-operation.c:818 -msgid "Old Key Passphrase" -msgstr "Стара тајна фраза" - -#: ../ssh/seahorse-ssh-operation.c:819 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "Внесете ја старата тајна фраза за: %s" - -#: ../ssh/seahorse-ssh-operation.c:823 -msgid "New Key Passphrase" -msgstr "Нова тајна фраза" - -#: ../ssh/seahorse-ssh-operation.c:824 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "Внесете нова тајна фраза за: %s" +#: ../ssh/seahorse-ssh-operation.c:502 +#| msgid "Network Password" +msgid "Remote Host Password" +msgstr "Лозинка на оддалечен хост" -#: ../ssh/seahorse-ssh-operation.c:832 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Внесете тајна фраза" -#: ../ssh/seahorse-ssh-operation.c:900 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Тајна фраза за клучот на новата безбедна школка" -#: ../ssh/seahorse-ssh-operation.c:901 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "Внесете тајна фраза за Вашиот нов клуч на безбедната школка" - -#: ../ssh/seahorse-ssh-operation.c:1036 -msgid "Secure Shell Key Passphrase" -msgstr "Тајна фраза за клуч на безбедната школка" - -#: ../ssh/seahorse-ssh-operation.c:1036 -#, c-format -msgid "Enter the passphrase for: %s" -msgstr "Внесете ја тајната фраза за: %s" - -#: ../ssh/seahorse-ssh-operation.c:1037 -msgid "Save this passphrase in my keyring" -msgstr "Зачувај ја оваа тајна фраза во мојот приврзок" - -#: ../ssh/seahorse-ssh-operation.c:1090 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Увезувам клуч: %s" -#: ../ssh/seahorse-ssh-operation.c:1092 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Увезувам клуч. Внесете тајна фраза" -#: ../ssh/seahorse-ssh-source.c:945 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH directory" +msgstr "OpenSSH директориум" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Нема достапни датотеки со приватни клучеви за овој клуч." -#: ../ssh/seahorse-ssh-upload.c:45 +#: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "" -"Не можам да ги конфигурирам клучевите за безбедна школка на оддалечениот " -"компјутер." +msgstr "Не можам да ги конфигурирам клучевите за безбедна школка на оддалечениот компјутер." -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 +#: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." msgstr "Ги конфигурирам клучевите за безбедна школка..." -#: ../ssh/seahorse-ssh-upload.glade.h:1 -msgid "eg: fileserver.example.com" -msgstr "пр: fileserver.example.com" +#: ../ssh/seahorse-ssh-upload.xml.h:1 +#| msgid "eg: fileserver.example.com" +msgid "eg: fileserver.example.com:port" +msgstr "пр.: fileserver.example.com:port" -#: ../ssh/seahorse-ssh-upload.glade.h:2 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Постави го компјутерот за SSH врска" -#: ../ssh/seahorse-ssh-upload.glade.h:4 -msgid "" -"To use your Secure Shell key with another computer that\n" -"uses SSH, you must already have a login account on that \n" -"computer." -msgstr "" -"За да го користите Вашиот клуч за безбедна школка на друг компјутер, кој\n" -"користи SSH, мора да имате веќе сметка за најава на тој\n" -"компјутер." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +#| msgid "" +#| "To use your Secure Shell key with another computer that\n" +#| "uses SSH, you must already have a login account on that \n" +#| "computer." +msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." +msgstr "За да го користите Вашиот клуч за безбедна школка на друг компјутер, кој користи SSH, мора да имате веќе сметка за најава на тој компјутер." -#: ../ssh/seahorse-ssh-upload.glade.h:7 +#: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Име на _компјутерот:" -#: ../ssh/seahorse-ssh-upload.glade.h:8 +#: ../ssh/seahorse-ssh-upload.xml.h:6 msgid "_Login Name:" msgstr "Име за _најава:" -#: ../ssh/seahorse-ssh-upload.glade.h:9 +#: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" msgstr "_Постави" +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "Не го извршувај seahorse-daemon како демон" +#~ msgid "couldn't fork process" +#~ msgstr "не можам да го разделам процесот" +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "Демон за енкриптирање (Seahorse)" +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "Невалиден или непрепознаен тип на клуч: %s" +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "Невалиден или непрепознаен клуч: %s" +#~ msgid "Signed by expired on %s." +#~ msgstr "Потпишано од <Ид. на клуч='%s'/> истечено на %s." +#~ msgid "Signed by on %s Expired." +#~ msgstr "Потпишано од <Ид. на клуч='%s'/> на %s Истечено." +#~ msgid "Expired Signature" +#~ msgstr "Истечен потпис" +#~ msgid "Signed by Revoked on %s." +#~ msgstr "Потпишано од <Ид. на клуч='%s'/> Отповикано на %s." +#~ msgid "Revoked Signature" +#~ msgstr "Отповикан потпис" +#~ msgid "Signed by on %s." +#~ msgstr "Потпишано од <Ид. на клуч='%s'/> на %s." +#~ msgid "Good Signature" +#~ msgstr "Добар потпис" +#~ msgid "Signing key not in keyring." +#~ msgstr "Клучот за потпис не е во приврзокот." +#~ msgid "Unknown Signature" +#~ msgstr "Непознат потпис" +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "Лош или фалсификуван потпис. Потпишаните податоци беа изменети." +#~ msgid "Bad Signature" +#~ msgstr "Лош потпис" +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "Невалиден или непрепознаен потпишувач: %s" +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "Овој клуч не е валиден за потпишување: %s" +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "Невалиден или непрепознаен примач: %s" +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "Клучот не е валиден примач за енкрипција: %s" +#~ msgid "No recipients specified" +#~ msgstr "Не се одредени примачи" +#~ msgid "No signer specified" +#~ msgstr "Не е одреден примач" +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "Невалиден тип на клуч за декриптирање: %s" +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "Невалиден тип на клуч за проверка: %s" +#~ msgid "Invalid key id: %s" +#~ msgstr "Невалидно Ид. на клуч: %s" +#~ msgid "Couldn't share keys" +#~ msgstr "Не можам да споделам клучеви" +#~ msgid "Can't publish discovery information on the network." +#~ msgstr "Не можам да ги објавам откриените информации на мрежата." +#~ msgid "%s's encryption keys" +#~ msgstr "Клучевите за енкриптирање на %s" +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "Листа со URI на сервери за клучеви за оддалечени PGP клучеви. Во поновите " +#~ "верзии ќе биде вклучено и име на приказ, со додавање на празен простор, " +#~ "па името." +#~ msgid "Auto Retrieve Keys" +#~ msgstr "Автоматско земање на клучеви" +#~ msgid "Auto Sync Keys" +#~ msgstr "Автоматски синхронизирани клучеви" +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "" +#~ "Ја контролира видливоста на колоната за истекување на менаџерот на " +#~ "клучеви." +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "" +#~ "Ја контролира видливоста на колоната за доверливост на менаџерот на " +#~ "клучеви." +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "" +#~ "Ја контролира видливоста на колоната за тип на менаџерот на клучеви." +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "" +#~ "Ја контролира видливоста на колоната за валидност на менаџерот на клучеви." +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "Овозможи DNS-SD споделување" +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "Овозможува DNS-SD (Apple Bonjour) споделување на клучеви. seahorse-daemon " +#~ "мора да се извршува и мора да е компајлиран со HKP и DNS-SD поддршка." +#~ msgid "ID of the default key" +#~ msgstr "Ид. на стандарниот клуч" +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "Ако е поставено на точно, тогаш датотеките енкриптирани со seahorse ќе " +#~ "бидат енкриптирани со ASCII штит." +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "Ако е поддесено на вистинско, тогаш стандардниот клуч секогаш ќе биде " +#~ "додаден во енкрипцијата на примачот на листата" +#~ msgid "Last key server search pattern" +#~ msgstr "Последниот шаблон за пребарување на сервер за клучеви" +#~ msgid "Last key servers used" +#~ msgstr "Последните употребувани сервери" +#~ msgid "Last key used to sign a message." +#~ msgstr "Последниот клуч употребен за потпишување на порака." +#~ msgid "PGP Key servers" +#~ msgstr "Сервери за PGP клучеви" +#~ msgid "Publish keys to this key server." +#~ msgstr "Објави ги клучевите на овој сервер за клучеви." +#~ msgid "Show expires column in key manager" +#~ msgstr "Покажи истекувачка колона во менаџерот на клучеви" +#~ msgid "Show trust column in key manager" +#~ msgstr "Покажи trust колона во менаџерот на копчиња" +#~ msgid "Show type column in key manager" +#~ msgstr "Покажи тип на колони во менаџерот на копчиња" +#~ msgid "Show validity column in key manager" +#~ msgstr "Покажи валидна колона во менаџерот на копчиња" +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "Одреди ја колоната за сортирање на примачите по прозорец. Колоните се: " +#~ "„име“ и „Ид.“. Ставете „-“ пред името на колоната за сортирање во обратен " +#~ "редослед." +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "Одреди ја колоната за сортирање на seahorse менаџерот на клучеви по " +#~ "прозорец. Колоните се: „име“, „Ид.“, „валидност“, „истекува“, „доверливо“ " +#~ "и „тип“. Ставете „-“ пред името на колоната за сортирање во обратен " +#~ "редослед." +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "Ид. на последниот таен клуч користен за потпишување на порака." +#~ msgid "The column to sort the recipients by" +#~ msgstr "Колоната по која ќе се сортираат примачите" +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "Колоната по која ќе се сортираат клучевите на seahorse" +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "Серверот за клучеви на кој што ќе се објавуваат PGP клучевите. Празно за " +#~ "да не се објавуваат PGP клучевите." +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "" +#~ "Последниот сервер за клучеви на кој што се извршуваше пребарување или " +#~ "празно за сите сервери за клучеви." +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "Последниот шаблон за пребарување на сервер за клучеви." +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "Ова го одредува стандардниот клуч кој ќе се користи за одредени операции, " +#~ "најчесто за потпишување." +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "Дали клучевите автоматски да се земаат од серверите за клучеви." +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "" +#~ "Дали изменетите клучеви автоматски да се синхронизираат со стандардниот " +#~ "сервер на клучеви." +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "Дали секогаш да го енкриптира стандардниот клуч" +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "Дали да користи ASCII Оклоп" +#~ msgid "Invalid" +#~ msgstr "Невалидно" +#~ msgid "Web Password" +#~ msgstr "Web лозинка" +#~ msgid "Couldn't set application access." +#~ msgstr "Не можам да го поставам пристапот на апликацијата." +#~ msgid "Path:" +#~ msgstr "Патека:" +#~ msgid "Permissions:" +#~ msgstr "Пермисии:" +#~ msgid "Applications" +#~ msgstr "Апликации" +#~ msgid "_Read" +#~ msgstr "_Прочитај" +#~ msgid "_Write" +#~ msgstr "_Запиши" +#~ msgid "Saving item..." +#~ msgstr "Зачувувам предмет..." +#~ msgid "Removing item" +#~ msgstr "Отстранувам предмет" +#~ msgid "All Keys" +#~ msgstr "Сите клучеви" +#~ msgid "Selected Recipients" +#~ msgstr "Избрани примачи" +#~ msgid "Search Results" +#~ msgstr "Резултати од пребарувањето" +#~ msgid "Search _for:" +#~ msgstr "_Пребарувај:" +#~ msgid "None (Don't Sign)" +#~ msgstr "Ништо (не потпишувај)" +#~ msgid "Sign this message as %s" +#~ msgstr "Потпиши ја пораката како %s" +#~ msgid "_Sign message as:" +#~ msgstr "_Потпиши ја пораката како:" +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "Клучот е увезен" +#~ msgstr[1] "Клучевите се увезени" +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "Увезен е %i клуч" +#~ msgstr[1] "Увезени се %i клучеви" +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "Увезoв клуч за" +#~ msgstr[1] "Увезoв клучеви за" +#~ msgid "Notification Messages" +#~ msgstr "Пораки за известување" +#~ msgid "Couldn't get default password keyring" +#~ msgstr "Не можам да го добијам стандардниот приврзок на лозинки" +#~ msgid "Couldn't get list of password keyrings" +#~ msgstr "Не можам да добијам листа на приврзоци со лозинки" +#~ msgid "Couldn't remove keyring" +#~ msgstr "Не можам да го отстранам приврзокот" +#~ msgid "Are you sure you want to permanently delete the '%s' keyring?" +#~ msgstr "" +#~ "Дали сте сигурни дека сакате трајно да го избришете приврзокот „%s“?" +#~ msgid "Default Keyring" +#~ msgstr "Стандарден приврзок" +#~ msgid "Password Keyrings" +#~ msgstr "Приврзоци со лозинки:" +#~ msgid "Password and Encryption Settings" +#~ msgstr "Лозинки и поставувања за енкрипција" +#~ msgid "" +#~ "Sharing your keys allows other people on your network to use the keys " +#~ "you've collected. This means they can automatically encrypt things for " +#~ "you or those you know, without you having to send them your key.\n" +#~ "\n" +#~ "Note: Your personal keys will not be compromised." +#~ msgstr "" +#~ "Споделувањето на Вашите клучеви им овозможува на другите луѓе на мрежата " +#~ "да ги користат клучевите кои сте ги собрале. Ова значи дека тие ќе можат " +#~ "автоматски да енкриптираат нешта за Вас или за тие што ги познавате, без " +#~ "да мора да им го испраќате Вашиот клуч.\n" +#~ "\n" +#~ "Белешка: Вашите лични клучеви нема да се земат во предвид." +#~ msgid "_Remove Keyring" +#~ msgstr "_Отстрани го приврзокот" +#~ msgid "_Share my keys with others on my network" +#~ msgstr "_Сподели ги моите клучеви со други на мојата мрежа" +#~ msgid "Progress Title" +#~ msgstr "Наслов на напредувањето" +#~ msgid "Unknown Key: %s" +#~ msgstr "Непознат клуч: %s" +#~ msgid "Unknown Key" +#~ msgstr "Непознат клуч" +#~ msgid "Unavailable Key" +#~ msgstr "Недостапен клуч" +#~ msgid "Couldn't run file-roller" +#~ msgstr "Не можам да го извршам file-roller" +#~ msgid "Couldn't package files" +#~ msgstr "Не можам да ги спакувам датотеките" +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "Процесот file-roller не заврши успешно" +#~ msgid "Archive files" +#~ msgstr "Архивирај ги датотеките" +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Веќе постои датотека со тоа име.\n" +#~ "\n" +#~ "Дали сакате да ја замените со ново име?" +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "Не се пронајдени клучеви со кои ќе се изврши операцијата која ја " +#~ "побаравте. Ќе се стартува програмата Лозинки и клучеви за енкрипција за да внесите или креирате клуч." +#~ msgid "X509 Certificate" +#~ msgstr "X509 сертификат" +#~ msgid "Loading..." +#~ msgstr "Вчитувам..." +#~ msgid "Invalid or unrecognized object." +#~ msgstr "Невалиден или непрепознаен предмет." +#~ msgid "Exporting is not yet supported." +#~ msgstr "Извезувањето не е сѐ уште поддржано." +#~ msgid "Uploading keys..." +#~ msgstr "Ги качувам клучевите..." +#~ msgid "Retrieving keys..." +#~ msgstr "Земам клучеви..." +#~ msgid "Searching for keys on: %s" +#~ msgstr "Пребарувам клучеви на: %s" +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "Пребарувам клучеви кои содржат „%s“" +#~ msgid "Searching for key id '%s'..." +#~ msgstr "Пребарувам клучеви со Ид. „%s“..." +#~ msgid "Retrieving remote keys..." +#~ msgstr "Земам оддалечени клучеви..." +#~ msgid "Sending keys to key server..." +#~ msgstr "Испраќам клучеви до серверот за клучеви..." +#~ msgid "Sign public key" +#~ msgstr "Потпиши јавен клуч" +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Дали сте сигурни дека сакате трајно да избришете %d клучеви и идентитети?" +#~ msgid "Expiry for Subkey %d of %s" +#~ msgstr "Истекување на подклучот %d од %s" +#~ msgid "Create a PGP Key" +#~ msgstr "Креирај нов PGP клуч" +#~ msgid "New PGP Key" +#~ msgstr "Нов PGP клуч" +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Не можам да го извезам клучот во \"%s\"" +#~ msgid "Export Complete Key" +#~ msgstr "Извези го целосниот клуч" +#~ msgid "" +#~ "Unknown\n" +#~ "Never\n" +#~ "Marginal\n" +#~ "Full\n" +#~ "Ultimate" +#~ msgstr "" +#~ "Непознато\n" +#~ "Никогаш\n" +#~ "Малку\n" +#~ "Потполна\n" +#~ "Целосна" +#~ msgid "" +#~ "Unknown\n" +#~ "Never\n" +#~ "Marginally\n" +#~ "Fully\n" +#~ "Ultimately" +#~ msgstr "" +#~ "Непознато\n" +#~ "Никогаш\n" +#~ "Малку\n" +#~ "Потполна\n" +#~ "Целосна" +#~ msgid "Loading Keys..." +#~ msgstr "Вчитувам клучеви..." +#~ msgid "Other _Collected Keys" +#~ msgstr "Други _собрани клучеви" +#~ msgid "_Trusted Keys" +#~ msgstr "_Доверливи клучеви" +#~ msgid "_Create New Key..." +#~ msgstr "_Креирај нови клучеви..." +#~ msgid "Import keys into your key ring from a file" +#~ msgstr "Увезете клучеви во Вашиот приврзок од датотека" +#~ msgid "Paste _Keys" +#~ msgstr "Вметни _клучеви" +#~ msgid "T_ypes" +#~ msgstr "Т_ипови" +#~ msgid "_Expiry" +#~ msgstr "_Истекува" +#~ msgid "Show expiry column" +#~ msgstr "Прикажи колона за истекување" +#~ msgid "_Trust" +#~ msgstr "_Доверба" +#~ msgid "Show owner trust column" +#~ msgstr "Прикажи колона за довербата на сопственикот" +#~ msgid "_Validity" +#~ msgstr "_Валидно" +#~ msgid "Show validity column" +#~ msgstr "Прикажи колона за валидност" +#~ msgid "Importing keys" +#~ msgstr "Увезувам клучеви" +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Непрепознат тип на клуч или невалиден формат на податоци" +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Избран е %d клуч" +#~ msgstr[1] "Избран е %d клуч" +#~ msgid "Validity" +#~ msgstr "Валидност" +#~ msgid "Expiration Date" +#~ msgstr "Рок на трење" +#~ msgid "_Close" +#~ msgstr "_Затвори" +#~ msgid "_Expand All" +#~ msgstr "_Прошири се" +#~ msgid "Expand all listings" +#~ msgstr "Потрошиги сите листења" +#~ msgid "_Collapse All" +#~ msgstr "_Колапсирајги сите" +#~ msgid "Collapse all listings" +#~ msgstr "Колапсирај ги сите листи" +#~ msgid "Synchronizing keys" +#~ msgstr "Ги синхронизирам клучевите" +#~ msgid "X keys are selected for synchronizing" +#~ msgstr "X клучеви се избрани за синхронизација" +#~ msgid "_Key Description:" +#~ msgstr "_Опис на клуч:" +#~ msgid "Private Secure Shell Key" +#~ msgstr "Приватен клуч на сигурносна школка" +#~ msgid "Public Secure Shell Key" +#~ msgstr "Јавен клуч на сигурносна школка" +#~ msgid "/home/nate/.ssh/blah_rsa" +#~ msgstr "/home/nate/.ssh/blah_rsa" +#~ msgid "00:00:00:00:00" +#~ msgstr "00:00:00:00:00" +#~ msgid "Passphrase:" +#~ msgstr "Тајна фраза:" +#~ msgid "Secure Shell Passphrase" +#~ msgstr "Тајна фраза на безбедна школка" +#~ msgid "Enter a passphrase for your new Secure Shell key." +#~ msgstr "Внесете тајна фраза за Вашиот нов клуч на безбедната школка" +#~ msgid "Secure Shell Key Passphrase" +#~ msgstr "Тајна фраза за клуч на безбедната школка" +#~ msgid "Enter the passphrase for: %s" +#~ msgstr "Внесете ја тајната фраза за: %s" +#~ msgid "Save this passphrase in my keyring" +#~ msgstr "Зачувај ја оваа тајна фраза во мојот приврзок" + diff -Nru seahorse-3.2.2/po/ml.po seahorse-3.6.3/po/ml.po --- seahorse-3.2.2/po/ml.po 2011-09-14 17:04:58.000000000 +0200 +++ seahorse-3.6.3/po/ml.po 2012-10-15 05:54:41.000000000 +0200 @@ -2,418 +2,190 @@ # translation of seahorse.HEAD.ml.po to # Copyright (C) 2003-2008 seahorse'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# # FSF-India , 2003. # Ani Peter , 2007, 2009. # Jeffrey|ജെഫ്രി Antony|ആന്റണി , 2008. # Praveen Arimbrathodiyil , 2008 +# Anish A , 2012. msgid "" msgstr "" "Project-Id-Version: seahorse.master.ml\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&component=general\n" -"POT-Creation-Date: 2009-09-14 19:43+0000\n" -"PO-Revision-Date: 2009-09-15 18:05+0530\n" -"Last-Translator: \n" -"Language-Team: \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-10-01 12:40+0000\n" +"PO-Revision-Date: 2012-10-04 23:12+0530\n" +"Last-Translator: Anish A \n" +"Language-Team: Swatantra Malayalam Computing\n" +"Language: ml\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" +"X-Generator: Virtaal 0.6.1\n" -#: ../daemon/seahorse-daemon.c:69 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "സീഹോഴ്സ്-ഡെമണ്‍ നിരന്തരപ്രക്രിയയായി പ്രവര്‍ത്തിപ്പിക്കരുതു്" - -#: ../daemon/seahorse-daemon.c:87 -msgid "couldn't fork process" -msgstr "പ്രക്രിയ ഫോര്‍ക്ക് ചെയ്യുവാന്‍ സാധിച്ചില്ല" - -#: ../daemon/seahorse-daemon.c:93 -msgid "couldn't create new process group" -msgstr "പ്രക്രിയയ്ക്കുള്ള പുതിയ കൂട്ടം ഉണ്ടാക്കുവാന്‍ സാധിച്ചില്ല" - -#: ../daemon/seahorse-daemon.c:207 -msgid "Encryption Daemon (Seahorse)" -msgstr "എന്‍ക്രിപ്ഷനുള്ള നിരന്തരപ്രവൃത്തി (സീഹോഴ്സ്)" - -#: ../daemon/seahorse-daemon.desktop.in.in.h:1 -msgid "Seahorse Daemon" -msgstr "Seahorse ഡെമണ്‍" - -#: ../daemon/seahorse-service.c:151 ../daemon/seahorse-service.c:175 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "%s: തെറ്റായ അല്ലെങ്കില്‍ തിരിച്ചറിയാത്ത ചാവിയുടെ തരം" - -#: ../daemon/seahorse-service.c:224 ../daemon/seahorse-service-keyset.c:135 -#: ../daemon/seahorse-service-keyset.c:164 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "തെറ്റായ അല്ലെങ്കില്‍ തിരിച്ചറിയാത്ത ചാവി: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:160 -#, c-format -msgid "Signed by expired on %s." -msgstr "ഒപ്പിട്ടത് സമാപിച്ചത് %s-ന്." - -#: ../daemon/seahorse-service-crypto.c:161 -msgid "Invalid Signature" -msgstr "അസാധുവായ ഒപ്പു്" - -#: ../daemon/seahorse-service-crypto.c:167 -#, c-format -msgid "Signed by on %s Expired." -msgstr "ഒപ്പിട്ടത് %s-ന് സമാപിച്ചു." - -#: ../daemon/seahorse-service-crypto.c:168 -msgid "Expired Signature" -msgstr "കാലാവധി അവസാനിച്ച ഒപ്പു്" - -#: ../daemon/seahorse-service-crypto.c:174 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "ഒപ്പിട്ടത് പിന്‍വലിച്ചതു്%s-ന് ." - -#: ../daemon/seahorse-service-crypto.c:175 -msgid "Revoked Signature" -msgstr "പിന്‍വലിച്ച ഒപ്പു്" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:181 -#, c-format -msgid "Signed by on %s." -msgstr "ഒപ്പിട്ടത് %s-ന് ." - -#: ../daemon/seahorse-service-crypto.c:182 -msgid "Good Signature" -msgstr "നല്ല ഒപ്പു്" - -#: ../daemon/seahorse-service-crypto.c:187 -msgid "Signing key not in keyring." -msgstr "ഒപ്പിടുന്ന ചാവി ചാവിക്കൂട്ടത്തില്‍ ഇല്ല" - -#: ../daemon/seahorse-service-crypto.c:188 -msgid "Unknown Signature" -msgstr "അറിയപ്പെടാത്ത ഒപ്പു്" - -#: ../daemon/seahorse-service-crypto.c:192 -msgid "Bad or forged signature. The signed data was modified." -msgstr "തെറ്റായ അല്ലെങ്കില്‍ കള്ള ഒപ്പു്. ഒപ്പിട്ട വിവരങ്ങള്‍ തിരുത്തിയിട്ടുണ്ടു്." - -#: ../daemon/seahorse-service-crypto.c:193 -msgid "Bad Signature" -msgstr "തെറ്റായ ഒപ്പു്" - -#: ../daemon/seahorse-service-crypto.c:201 -msgid "Couldn't verify signature." -msgstr "ഒപ്പു് ഉറപ്പാക്കാന്‍ സാധ്യമായില്ല" - -#: ../daemon/seahorse-service-crypto.c:257 -#: ../daemon/seahorse-service-crypto.c:364 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "%s :ഇടുന്നത് തെറ്റായ അല്ലെങ്കില്‍ തിരിച്ചറിയാത്ത ഒപ്പു്" - -#: ../daemon/seahorse-service-crypto.c:264 -#: ../daemon/seahorse-service-crypto.c:371 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "%s :ഒപ്പിടുന്നതിനായി ചാവി അസാധുവാണ്" - -#: ../daemon/seahorse-service-crypto.c:276 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "അസാധു അല്ലെങ്കില്‍ അപരിചിതമായ സ്വീകരിക്കുന്നയാള്‍ : %s" - -#: ../daemon/seahorse-service-crypto.c:284 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "എന്‍ക്രിപ്ഷനുള്ള ശരിയായ റസിപ്യന്റല്ല കീ: %s" - -#: ../daemon/seahorse-service-crypto.c:293 -#, c-format -msgid "No recipients specified" -msgstr "റെസീപ്യന്റുകള്‍ വ്യക്തമാക്കിയിട്ടില്ല" - -#: ../daemon/seahorse-service-crypto.c:359 -#, c-format -msgid "No signer specified" -msgstr "ഒപ്പിടുന്ന ആള് വ്യക്തമായിട്ടില്ല" - -#: ../daemon/seahorse-service-crypto.c:414 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "%s: ഡീക്രിപ്റ്റ്ചെയ്യുന്നതിനായി തെറ്റായ ചാവിയുടെ തരം" - -#: ../daemon/seahorse-service-crypto.c:477 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "ഉറപ്പാക്കുന്നതിനു് തെറ്റായ കീ തരം: %s" - -#: ../daemon/seahorse-service-keyset.c:200 -#, c-format -msgid "Invalid key id: %s" -msgstr "തെറ്റായ key id: %s" - -#: ../daemon/seahorse-sharing.c:72 ../daemon/seahorse-sharing.c:216 -msgid "Couldn't share keys" -msgstr "ചാവികള്‍ പങ്ക് വയ്ക്കുവാന്‍ കഴിഞ്ഞില്ല" - -#: ../daemon/seahorse-sharing.c:73 -msgid "Can't publish discovery information on the network." -msgstr "നെറ്റ്‌വര്‍ക്കില്‍ കണ്ടുപിടിച്ച വിവരങ്ങള്‍ പ്രസിദ്ധീകരിക്കുവാന്‍ സാധ്യമല്ല." - -#. Translators: The %s will get filled in with the user name -#. of the user, to form a genitive. If this is difficult to -#. translate correctly so that it will work correctly in your -#. language, you may use something equivalent to -#. "Shared keys of %s". -#: ../daemon/seahorse-sharing.c:93 -#, c-format -msgid "%s's encryption keys" -msgstr "%s-ന്റെ എന്‍ക്രിപ്ഷന്‍ ചാവികള്‍" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"വിദൂര PGP കീകള്‍ തെരയുന്നതിനുള്ള കീ സര്‍വറുകളുടെ യുആര്‍ഐകളുടെ ലിസ്റ്റ്. പിന്നീടുള്ള " -"പതിപ്പുകളില്‍, ഒരു സ്പെയിസ് നല്‍കി പേരു് ചേര്‍ത്തു് ഒരു നാമം നല്‍കുവാന്‍ സാധിക്കുന്നു." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "ചാവികള്‍ സ്വയം ലഭ്യമാക്കുക" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "ഓട്ടോ സിംക് ചാവികള്‍" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "കീ പാലകനുള്ള കാലാവധിയുടെ അവസാനത്തിനുള്ള നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "കീ പാലകനുള്ള വിശ്വസ്തതയ്ക്കുള്ള നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "കീ പാലകനുള്ള ഏതു് തരം നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "കീ പാലകനുള്ള കാലാവധി നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "DNS-SD പങ്കുവയ്ക്കല്‍ സാധ്യമാക്കുക" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"കീകളുടെ DNS-SD (Apple Bonjour) പങ്കിടല്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുന്നു. seahorse-daemon " -"പ്രവര്‍ത്തനത്തിലായിരിക്കണം. കൂടാതെ, HKP, DNS-SD പിന്തുണയുണ്ടായിരിക്കണം." - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "സഹജമായ ചാവിയുടെ ഐഡി" - -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" -"true ആയി സജ്ജമാക്കിയാല്‍, seahorse ഉപയോഗിച്ചു് എന്‍ക്രിപ്റ്റ് ചെയ്ത ഫയലുകള്‍ " -"ASCII ആര്‍മര്‍ എന്‍കോഡഡായിരിക്കും." - -#: ../data/seahorse.schemas.in.h:12 -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "" -"true ആയി സജ്ജമാക്കിയാല്‍, എന്‍ക്രിപ്ഷന്‍ റെസിപ്യന്റുകളുടെ പട്ടികയിലേക്ക് " -"സ്വതവേയുള്ള കീ എപ്പോഴും ചേര്‍ക്കുന്നു." - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "അവസാന ചാവി സെര്‍വറിന്റെ തിരച്ചില്‍ മാതൃക" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "അവസാനമായി ഉപയോഗിച്ച ചാവി സെര്‍വറുകള്‍" - -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "അവസാനമായി സന്ദേശം ഒപ്പു് വയ്ക്കാന്‍ ഉപയോഗിച്ച ചാവി" - -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "PGP ചാവി സെര്‍വറുകള്‍" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "ഈ ചാവി സെര്‍വറിലേക്ക് ചാവികള്‍ അറിയിക്കുക." - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "കീ പാലകനില്‍ കാലാവധി തീരുന്നതിനുള്ള നിര കാണിക്കുക" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "കീ പാലകനില്‍ വിശ്വസ്തതയുടെ നിര കാണിക്കുക" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "കീ പാലകനില്‍ ഏതു് തരം എന്നതിനുള്ള നിര കാണിക്കുക" - -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "കീ പാലകനില്‍ കാലാവധിയ്ക്കുള്ള നിര കാണിക്കുക" - -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"റെസിപ്യെന്റ് ജാലകം ക്രമത്തിലാക്കുവാനുള്ള നിര വ്യക്തമാക്കുക. നിരകള്‍: 'പേരു്' and 'id'. " -"കൂടുതലില്‍ നിന്നും കുറവിലേക്കെന്ന ക്രമത്തിലാക്കുന്നതിനായി നിരയുടെ പേരിനു് മുമ്പു് '-' ചേര്‍ക്കുക." +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "അടയാളവാക്കിന്റെ ചാവിക്കൂട്ടം ചേര്‍ക്കുക" -#: ../data/seahorse.schemas.in.h:23 +#: ../gkr/seahorse-add-keyring.xml.h:2 msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." msgstr "" -"seahorse കീ മാനേജര്‍ പ്രധാന ജാലകം ക്രമത്തിലാക്കുന്നതിനുള്ള നിര വ്യക്തമാക്കുക. നിരകള്‍: " -"'പേരു്', 'id', 'കാലാവധി', 'കാലാവധിയുടെ അവസാനം', 'വിശ്വാസ്യത', 'ഏതു് തരം'. കൂടുതലില്‍ " -"നിന്നും കുറവിലേക്കെന്ന ക്രമത്തിലാക്കുന്നതിനായി നിരയുടെ പേരിനു് മുമ്പു് '-' ചേര്‍ക്കുക." - -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "അവസാനമായി സന്ദേശം ഒപ്പു് വയ്ക്കാന്‍ ഉപയോഗിച്ച രഹസ്യ ചാവിയുടെ ID" +"പുതിയ കീറിങിനുള്ള ഒരു പേരു് ദയവായി തെരഞ്ഞെടുക്കുക. പൂട്ട് തുറക്കുന്നതിനുള്ള ഒരു അടയാളവാക്ക് " +"ആവശ്യപ്പെടുന്നു." -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "റെസിപ്യെന്റുകള്‍ ഏതു് നിരയനുസരിച്ചു് ക്രമത്തിലാക്കണം" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "പുതിയ ചാവിക്കൂട്ടത്തിന്റെ പേര്:" -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "seahorse കീകള്‍ ഏതു് നിരയനുസരിച്ചു് ക്രമത്തിലാക്കണം" +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "സെര്‍വറിന്റെ വിലാസം അല്ലെങ്കില്‍ ഹോസ്റ്റിന്റെ പേര്." -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"PGP കീകള്‍ പബ്ലിഷ് ചെയ്യേണ്ട കീ സര്‍വര്‍. അല്ലെങ്കില്‍, PGP കീകളുടെ പബ്ലിഷിങ് " -"നിര്‍ത്തുന്നതിനായി കാലിയാക്കുക." +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "പുതിയ രഹസ്യവാക്കുള്ള ചാവിക്കൂട്ടം" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "" -"അവസാന തെരച്ചില്‍ നടത്തിയ കീ സര്‍വര്‍ അല്ലെങ്കില്‍ എല്ലാ കീ സര്‍വറുകളും " -"കാലിയാക്കുക." +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "പ്രയോഗവും നെറ്റ്‌വര്‍ക്ക് അടയാളവാക്കുകളും സൂക്ഷിക്കുന്നതിനായി ഉപയോഗിക്കുന്നു" -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "ഒരു കീ സര്‍വറിനായി തെരയുന്ന അവസാന തെരച്ചില്‍ മാതൃക." +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "പുതിയ രഹസ്യവാക്ക്..." -#: ../data/seahorse.schemas.in.h:30 -msgid "This specifies the default key to use for certain operations, mainly signing." -msgstr "ഒപ്പിടല്‍ പോലുള്ള ചില പ്രക്രിയകള്‍ക്കുപയോഗിക്കുന്ന സ്വതവേയുള്ള കീ ഇതു് വ്യക്തമാക്കുന്നു." +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "സുരക്ഷിതമായി ഒരു അടയാളവാക്ക് അല്ലെങ്കില്‍ രഹസ്യം സൂക്ഷിക്കുക" -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "കീ സര്‍വറുളില്‍ നിന്നും കീകള്‍ സ്വയമായി ലഭ്യമാക്കണമോ എന്നു്" +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "പാസ്‌വേര്‍ഡ് കീറിങ്" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." -msgstr "" -"മാറ്റം വരുത്തിയ കീകള്‍ സ്വയമായി സ്വതവേയുള്ള കീ സര്‍വറുമായി സിന്‍ക് ചെയ്യണമോ " -"വേണ്ടയോ എന്നു്" +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "സൂക്ഷിച്ചിട്ടുള്ള അടയാളവാക്കു്" -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "എപ്പോഴും സ്വതവേയുള്ള കീ എന്‍ക്രിപ്റ്റ് ചെയ്യണമോ എന്നു്" +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "സ്വതവേയുള്ള കീറിങ് സജ്ജമാക്കുവാന്‍ സാധിച്ചില്ല" -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "ASCII ആര്‍മര്‍ ഉപയോഗിക്കണമോ എന്നു്" +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "ചാവിക്കൂട്ടത്തിന്റെ അടയാളവാക്കു് മാറ്റുവാന്‍ സാധിച്ചില്ല" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "അടയാളവാക്കിന്റെ ചാവിക്കൂട്ടം ചേര്‍ക്കുക" +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "സഹജമായി _സജ്ജമാക്കുക" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "പുതിയ ചാവിക്കൂട്ടത്തിന്റെ പേര്:" +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "പ്രയോഗങ്ങള്‍ സാധാരണ സ്വതവേയുള്ള കീറിങില്‍ പുതിയ അടയാളവാക്കുകള്‍ സൂക്ഷിക്കുന്നു." -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"പുതിയ കീറിങിനുള്ള ഒരു പേരു് ദയവായി തെരഞ്ഞെടുക്കുക. പൂട്ട് തുറക്കുന്നതിനുള്ള ഒരു " -"അടയാളവാക്ക് ആവശ്യപ്പെടുന്നു." +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "_അടയാളവാക്കു് മാറ്റുക" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "സെര്‍വറിന്റെ വിലാസം അല്ലെങ്കില്‍ ഹോസ്റ്റിന്റെ പേര്." +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "അടയാളവാക്കിനുള്ള സംഭരണ കീറിങിലുള്ള അണ്‍ലോക്ക് അടയാളവാക്ക് മാറ്റുക" -#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:59 -msgid "Couldn't add keyring" -msgstr "ചാവിക്കൂട്ടം ചേര്‍ക്കുവാന്‍ കഴിഞ്ഞില്ല" +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "കാര്യം ചേര്‍ക്കുവാനായില്ല" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "അടയാളവാക്കു് ചേര്‍ക്കുക" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "വിവരണം:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_കീറിങ്:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_അടയാളവാക്കു്:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "അടയാളവാക്കു് _കാണിക്കുക" -#: ../gkr/seahorse-gkr-item.c:470 -msgid "Web Password" -msgstr "വെബ് അടയാളവാക്കു്" - -#: ../gkr/seahorse-gkr-item.c:472 -msgid "Network Password" -msgstr "ശൃംഖല അടയാളവാക്കു്" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_കീറിങ്:" -#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "അടയാളവാക്കു്" +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "ചാവിക്കൂട്ടം ചേര്‍ക്കുവാന്‍ കഴിഞ്ഞില്ല" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "രഹസ്യവാക്കുകള്‍" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "സുക്ഷിച്ച് വെച്ചിട്ടുള്ള സ്വകാര്യ രഹസ്യവാക്കുകള്‍, വിവരങ്ങള്‍, രഹസ്യങ്ങള്‍" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "ലെ ചാറ്റ് അക്കൌണ്ട് രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "രഹസ്യവാക്ക് അല്ലെങ്കില്‍ രഹസ്യം" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "ശൃംഖല രഹസ്യവാക്കു്" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "സൂക്ഷിച്ച രേഖ" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "ചാവിക്കുട്ടത്തിന്റെ രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "എന്‍ക്രിപ്ഷന്‍ ചാവി രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "ചാവിയുടെ സൂക്ഷിക്കല്‍ രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "ഗൂഗിള്‍ ക്രോം രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "ഗ്നോം ഓണ്‍ലൈന്‍ അക്കൌണ്ടിന്റെ രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "ടെലിപ്പതി രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "ചാറ്റ് രഹസ്യവാക്ക്" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "ശ്രംഖല പരിപാലകന്‍ രഹസ്യം" -#: ../gkr/seahorse-gkr-item-commands.c:78 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "നിങ്ങള്‍ക്ക് '%s' അടയാളവാക്കു് എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -#: ../gkr/seahorse-gkr-item-commands.c:81 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -444,469 +216,269 @@ msgid "Network Credentials" msgstr "നെറ്റ്‌വര്‍ക്ക് യോഗ്യതകള്‍" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "അടയാളവാക്കു്" + +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "അടയാളവാക്കു് മാറ്റുവാന്‍ കഴിഞ്ഞില്ല" -#: ../gkr/seahorse-gkr-item-properties.c:347 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 +msgid "Updating password" +msgstr "രഹസ്യവാക്ക് പുതുക്കുന്നു" + +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "വിവരണം നേരേയാക്കാന്‍ കഴിഞ്ഞില്ല." -#: ../gkr/seahorse-gkr-item-properties.c:641 -msgid "Couldn't set application access." -msgstr "പ്രയോഗത്തിലേക്കുള്ള പ്രവേശനം സജ്ജമാക്കുവാന്‍ സാധ്യമായില്ല." - #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "അടയാളവാക്കു്:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "വഴി:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "അനുവാദങ്ങള്‍:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "ചാവിയുടെ ഗുണഗണങ്ങള്‍" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Technical Details:" -msgstr "സാങ്കേതിക വിവരങ്ങള്‍:" +msgid "Use:" +msgstr "ഉപയോഗം:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "പ്രയോഗങ്ങള്‍" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "തരം:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:72 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Details" -msgstr "വിവരങ്ങള്‍" +msgid "Server:" +msgstr "സെര്‍വര്‍:" #: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Key" -msgstr "ചാവി" +msgid "Login:" +msgstr "ഉപയോക്താവിന്റെ പേരു്:" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "Key Properties" -msgstr "ചാവിയുടെ ഗുണഗണങ്ങള്‍" +msgid "Show pass_word" +msgstr "അടയാള_വാക്കു് കാണിക്കുക" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "ഉപയോക്താവിന്റെ പേരു്:" +msgid "Password:" +msgstr "അടയാളവാക്കു്:" #: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "സെര്‍വര്‍:" +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "ചാവി" #: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "അടയാള_വാക്കു് കാണിക്കുക" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "സാങ്കേതിക വിവരങ്ങള്‍:" #: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Type:" -msgstr "തരം:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "ഉപയോഗം:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "വിവരങ്ങള്‍" -#. To translators: This is the infinitive not the imperative. This string refers to the ability of an application to delete this secret from its key ring. -#: ../gkr/seahorse-gkr-item-properties.xml.h:16 -msgid "_Delete" -msgstr "_വെട്ടി മാറ്റുക" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "പ്രവേശിക്കുമ്പോള്‍ തനിയെ തുറക്കുന്ന ചാവിക്കൂട്ടം" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "രഹസ്യവാക്ക് സൂക്ഷിക്കുന്നതിനുള്ള ചാവിക്കുട്ടം" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Read" -msgstr "_വായിക്കുക" +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "നിങ്ങള്‍ക്ക് '%s' പാസ്‌വേര്‍ഡ് കീറിങ് എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:21 -msgid "_Write" -msgstr "_എഴുതുക" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "എല്ലാ കാര്യങ്ങളും സ്ഥിരമായി ഇല്ലാതാക്കുമെന്നെനിക്കറിയാം" -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "പാസ്‌വേര്‍ഡുകള്‍ നിരത്തുന്നു" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "ചാവികൂട്ടത്തിന്റെ ഗുണഗണങ്ങള്‍" -#: ../gkr/seahorse-gkr-keyring.c:354 -#, c-format -msgid "Passwords: %s" -msgstr "പാസ്‌വേര്‍ഡുകള്‍: %s" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "പേര്:" -#: ../gkr/seahorse-gkr-keyring.c:355 -#, c-format -msgid "Passwords: %s" -msgstr "അടയാളവാക്കു്: %s" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "ഉണ്ടാക്കിയതു്:" -#: ../gkr/seahorse-gkr-keyring-commands.c:112 -msgid "Password Keyring" -msgstr "പാസ്‌വേര്‍ഡ് കീറിങ്" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "ചാവികൂട്ടം" -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Used to store application and network passwords" -msgstr "പ്രയോഗവും നെറ്റ്‌വര്‍ക്ക് അടയാളവാക്കുകളും സൂക്ഷിക്കുന്നതിനായി ഉപയോഗിക്കുന്നു" +#: ../libegg/egg-datetime.c:317 +msgid "Display flags" +msgstr "ഫ്ലാഗുകള്‍ പ്രദര്‍ശിപ്പിക്കുക" -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Stored Password" -msgstr "സൂക്ഷിച്ചിട്ടുള്ള അടയാളവാക്കു്" +#: ../libegg/egg-datetime.c:318 +msgid "Displayed date and/or time properties" +msgstr "തീയതി/സമയം ഗുണഗണങ്ങള്‍ പ്രദര്‍ശിപ്പിച്ചു" -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Safely store a password or secret." -msgstr "സുരക്ഷിതമായി ഒരു അടയാളവാക്ക് അല്ലെങ്കില്‍ രഹസ്യം സൂക്ഷിക്കുക" +#: ../libegg/egg-datetime.c:323 +msgid "Lazy mode" +msgstr "ലേസി മോഡ്" -#: ../gkr/seahorse-gkr-keyring-commands.c:129 -msgid "Couldn't unlock keyring" -msgstr "കീറിങ് അണ്‍ലോക്ക് ചെയ്യുവാന്‍ സാധിച്ചില്ല" - -#: ../gkr/seahorse-gkr-keyring-commands.c:170 -msgid "Couldn't lock keyring" -msgstr "കീറിങ് പൂട്ടുവാന്‍ സാധിച്ചില്ല" +#: ../libegg/egg-datetime.c:324 +msgid "Lazy mode doesn't normalize entered date and time values" +msgstr "നല്‍കിയ തീയതിയും സമയ മൂല്ല്യങ്ങളും ലേസി മോഡ് നോര്‍മലൈസ് ചെയ്യുന്നില്ല" -#: ../gkr/seahorse-gkr-keyring-commands.c:211 -msgid "Couldn't set default keyring" -msgstr "സ്വതവേയുള്ള കീറിങ് സജ്ജമാക്കുവാന്‍ സാധിച്ചില്ല" - -#: ../gkr/seahorse-gkr-keyring-commands.c:250 -msgid "Couldn't change keyring password" -msgstr "ചാവിക്കൂട്ടത്തിന്റെ അടയാളവാക്കു് മാറ്റുവാന്‍ സാധിച്ചില്ല" - -#: ../gkr/seahorse-gkr-keyring-commands.c:281 -msgid "_Lock" -msgstr "_ലോക്ക് ചെയ്യുക" - -#: ../gkr/seahorse-gkr-keyring-commands.c:282 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"അടയാളവാക്കിനുള്ള സംഭരണ കീറിങ് പൂട്ടി അതു് തുറക്കുന്നതിനായി ഒരു പ്രധാന അടയാളവാക്ക് " -"ഉപയോഗിക്കുക." - -#: ../gkr/seahorse-gkr-keyring-commands.c:283 -msgid "_Unlock" -msgstr "_അണ്‍ലോക്ക് ചെയ്യുക" - -#: ../gkr/seahorse-gkr-keyring-commands.c:284 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"അടയാളവാക്കിനുള്ള സംഭരണ കീറിങ് ഒരു പ്രധാന അടയാളവാക്കുപയോഗിച്ചു് " -"അണ്‍ലോക്ക് ചെയ്യുക, അങ്ങനെ അവ ഉപയോഗിക്കുവാന്‍ സാധിക്കുന്നു." - -#: ../gkr/seahorse-gkr-keyring-commands.c:285 -msgid "_Set as default" -msgstr "സഹജമായി _സജ്ജമാക്കുക" - -#: ../gkr/seahorse-gkr-keyring-commands.c:286 -msgid "Applications usually store new passwords in the default keyring." -msgstr "പ്രയോഗങ്ങള്‍ സാധാരണ സ്വതവേയുള്ള കീറിങില്‍ പുതിയ അടയാളവാക്കുകള്‍ സൂക്ഷിക്കുന്നു." - -#: ../gkr/seahorse-gkr-keyring-commands.c:287 -msgid "Change _Password" -msgstr "_അടയാളവാക്കു് മാറ്റുക" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "Change the unlock password of the password storage keyring" -msgstr "അടയാളവാക്കിനുള്ള സംഭരണ കീറിങിലുള്ള അണ്‍ലോക്ക് അടയാളവാക്ക് മാറ്റുക" - -#: ../gkr/seahorse-gkr-keyring-commands.c:353 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "നിങ്ങള്‍ക്ക് '%s' പാസ്‌വേര്‍ഡ് കീറിങ് എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -msgid "Created:" -msgstr "ഉണ്ടാക്കിയതു്:" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "കീറിങ്" - -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "കീറിങ് ഗുണഗണങ്ങള്‍" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_പേരു്:" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "ചാവിക്കൂട്ടത്തിലേക്കുള്ള പ്രവേശനം നിഷേധിച്ചിരിക്കുന്നു" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "ഗ്നോം-ചാവിക്കൂട്ടം പ്രവര്‍ത്തിക്കുന്നില്ല" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "ഈ ചാവിക്കൂട്ടം ഇതിനുമുമ്പേ തുറന്നിട്ടുണ്ടു്" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "ഇങ്ങനെ ഒരു ചാവിക്കൂട്ടം നിലവിലില്ല" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "ചാവിക്കൂട്ടത്തിനുള്ള നിരന്തരപ്രക്രിയയുമായി ആശയവിനിമയം നടത്താന്‍ സാധിക്കുന്നില്ല" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "ഈ ഇനം ഇതിനു് മുമ്പേ നിലവിലുണ്ടു്" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "ഗ്നോം-ചാവിക്കൂട്ടത്തിലേക്ക് പ്രവേശിയ്ക്കുമ്പോള്‍ ആന്തരികമായ തെറ്റ്" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "ഇനം സൂക്ഷിക്കുന്നു..." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "വസ്തു വെട്ടിനീക്കുന്നു..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "കീറിങ് വെട്ടിനീക്കുന്നു..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "പാസ്‌വേര്‍ഡ് കീറിങുകള്‍ ലഭ്യമാക്കുന്നു" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"നിങ്ങള്‍ ആവശ്യപ്പെട്ടതു് നടത്തുന്നതിനുള്ള എന്‍ക്രിപ്ഷന്‍ കീകള്‍ ലഭ്യമായില്ല. " -"അടയാളവാക്കുകളും എന്‍ക്രിപ്ഷന്‍ കീകളും എന്ന പ്രോഗ്രം ഇപ്പോള്‍ ആരംഭിക്കുന്നു. " -"അങ്ങനെ നിങ്ങള്‍ക്കു് ഒരു കീ ഉണ്ടാക്കാം അല്ലെങ്കില്‍ ഒരെണ്ണം ഇംപോര്‍ട്ട് ചെയ്യക." - -#: ../libcryptui/cryptui-key-chooser.c:173 -msgid "All Keys" -msgstr "എല്ലാ ചാവികളും" - -#: ../libcryptui/cryptui-key-chooser.c:174 -msgid "Selected Recipients" -msgstr "തെരഞ്ഞെടുത്ത റെസീപ്യന്റുകള്‍" - -#: ../libcryptui/cryptui-key-chooser.c:175 -msgid "Search Results" -msgstr "ഫലങ്ങള്‍ തെരയുക" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:185 -msgid "Search _for:" -msgstr "തെരയേണ്ട_തു്:" - -#: ../libcryptui/cryptui-key-chooser.c:243 -msgid "None (Don't Sign)" -msgstr "ഒന്നുമില്ല (ഒപ്പിടരുത്)" - -#: ../libcryptui/cryptui-key-chooser.c:256 -#, c-format -msgid "Sign this message as %s" -msgstr "ഈ സന്ദേശം %s ആയി ഒപ്പിടുക" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:278 -msgid "_Sign message as:" -msgstr "ഈ സന്ദേശം _ഒപ്പിടേണ്ടതു്:" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:828 -msgid "Name" -msgstr "പേരു്" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1743 -#: ../src/seahorse-key-manager-store.c:840 -msgid "Key ID" -msgstr "ചാവിയുടെ ID" - -#: ../libegg/egg-datetime.c:313 -msgid "Display flags" -msgstr "ഫ്ലാഗുകള്‍ പ്രദര്‍ശിപ്പിക്കുക" - -#: ../libegg/egg-datetime.c:314 -msgid "Displayed date and/or time properties" -msgstr "തീയതി/സമയം ഗുണഗണങ്ങള്‍ പ്രദര്‍ശിപ്പിച്ചു" - -#: ../libegg/egg-datetime.c:319 -msgid "Lazy mode" -msgstr "ലേസി മോഡ്" - -#: ../libegg/egg-datetime.c:320 -msgid "Lazy mode doesn't normalize entered date and time values" -msgstr "നല്‍കിയ തീയതിയും സമയ മൂല്ല്യങ്ങളും ലേസി മോഡ് നോര്‍മലൈസ് ചെയ്യുന്നില്ല" - -#: ../libegg/egg-datetime.c:325 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "വര്‍ഷം" -#: ../libegg/egg-datetime.c:326 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "പ്രദര്‍ശിപ്പിച്ച വര്‍ഷം" -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "മാസം" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "പ്രദര്‍ശിപ്പിച്ച മാസം" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "ദിവസം" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "പ്രദര്‍ശിപ്പിച്ച മാസത്തിലെ ദിനം" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "മണിക്കൂര്‍" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "പ്രദര്‍ശിപ്പിച്ച മണിക്കൂര്‍" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "മിനിട്ട്" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "പ്രദര്‍ശിപ്പിച്ച മിനിട്ട്" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "സെക്കന്‍ഡ്" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "പ്രദര്‍ശിപ്പിച്ച സെക്കന്‍ഡ്" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "ലോവര്‍ ലിമിറ്റ് വര്‍ഷം" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "കുറഞ്ഞ തീയതി പരിധിയുടെ വര്‍ഷ ഭാഗം" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "അപ്പര്‍ ലിമിറ്റ് വര്‍ഷം" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "കൂടിയ തീയതി പരിധിയുടെ വര്‍ഷ ഭാഗം" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "ലോവര്‍ ലിമിറ്റ് മാസം" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "കുറഞ്ഞ തീയതി പരിധിയുടെ മാസ ഭാഗം" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "അപ്പര്‍ ലിമിറ്റ് മാസം" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "കൂടിയ തീയതി പരിധിയുടെ മാസ ഭാഗം" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "ലോവര്‍ ലിമിറ്റ് ഡേ" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "കുറഞ്ഞ സമയ പരിധിയുടെ മാസത്തിലുള്ള ദിവസ ഭാഗം" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "അപ്പര്‍ ലിമിറ്റ് ഡേ" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "കൂടിയ സമയ പരിധിയുടെ മാസത്തിലുള്ള ദിവസ ഭാഗം" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "ലോവര്‍ ലിമിറ്റ് മണിക്കൂര്‍" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "കുറഞ്ഞ സമയ പരിധിയുടെ മണിക്കൂര്‍ ഭാഗം" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "അപ്പര്‍ ലിമിറ്റ് മണിക്കൂര്‍" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "കൂടിയ സമയ പരിധിയുടെ മണിക്കൂര്‍ ഭാഗം" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "ലോവര്‍ ലിമിറ്റ് മിനിറ്റ്" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "കുറഞ്ഞ സമയ പരിധിയുടെ മിനിറ്റ് ഭാഗം" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "അപ്പര്‍ ലിമിറ്റ് മിനിറ്റ്" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "കൂടിയ സമയ പരിധിയുടെ മിനിറ്റ് ഭാഗം" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "ലോവര്‍ ലിമിറ്റ് സെക്കന്‍ഡ്" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "കുറഞ്ഞ സമയ പരിധിയുടെ സെക്കന്‍ഡ് ഭാഗം" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "അപ്പര്‍ ലിമിറ്റ് സെക്കന്‍ഡ്" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "കൂടിയ സമയ പരിധിയുടെ സെക്കന്‍ഡ് ഭാഗം" @@ -915,251 +487,250 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:470 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:0" -#: ../libegg/egg-datetime.c:492 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "തീയതി" -#: ../libegg/egg-datetime.c:492 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "തീയതി നേരിട്ട് നല്‍കുക" -#: ../libegg/egg-datetime.c:499 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "ദിവസം തിരങ്ങെടുക്കുക" -#: ../libegg/egg-datetime.c:499 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "ഒരു കലണ്ടറില്‍ നിന്നും തീയതി തെരഞ്ഞെടുക്കുക" -#: ../libegg/egg-datetime.c:517 ../libegg/egg-datetime.c:2192 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "സമയം" -#: ../libegg/egg-datetime.c:517 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "സമയം നേരിട്ടു് നല്‍കുക" -#: ../libegg/egg-datetime.c:524 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "സമയം തിരങ്ങെടുക്കുക" -#: ../libegg/egg-datetime.c:524 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "ലിസ്റ്റില്‍ നിന്നും സമയം തെരഞ്ഞെടുക്കുക" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:791 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: no" -#: ../libegg/egg-datetime.c:795 ../libegg/egg-datetime.c:1253 -#: ../libegg/egg-datetime.c:1257 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "AM" -#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1254 -#: ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "PM" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:805 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:808 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:812 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:815 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1169 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1234 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ഫയല്‍ ഒരു ശരിയായ .desktop ഫയല്‍ അല്ല" +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "പ്രാരംഭ താല്‍ക്കാലിക വസ്തു" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "അപരിചിതമായ പണിയിട ഫയല്‍ പതിപ്പു് '%s'" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "ചാവി സെര്‍വര്‍ ചേര്‍ക്കുക" -#: ../libegg/eggdesktopfile.c:958 -#, c-format -msgid "Starting %s" -msgstr "%s ആരംഭിക്കുന്നു" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "കീ സര്‍വര്‍ തരം:" -#: ../libegg/eggdesktopfile.c:1100 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "കമാന്‍ഡ് ലൈനില്‍ പ്രയോഗങ്ങള്‍ രേഖകള്‍ സ്വീകരിക്കുന്നില്ല" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "ഹോസ്റ്റ്:" -#: ../libegg/eggdesktopfile.c:1168 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "അപരിചിതമായ ലഭ്യമാക്കുന്ന ഉപാധി: %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1373 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "'Type=Link' പണിയിട എന്‍ട്രിയിലേക്ക് രേഖകളുടെ യുആര്‍ഐകള്‍ നല്‍കുവാന്‍ സാധ്യമല്ല" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "സര്‍വര്‍ ലഭ്യമാക്കേണ്ട പോര്‍ട്ട്." -#: ../libegg/eggdesktopfile.c:1392 -#, c-format -msgid "Not a launchable item" -msgstr "ലഭ്യമാക്കുവാന്‍ സാധിക്കുന്ന വസ്തു അല്ല" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "ഈ പ്രയോഗത്തിന്റെ പതിപ്പു്" -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "സെഷന്‍ മാനേജറിലേക്കുള്ള കണക്ഷന്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- സിസ്റ്റം ക്രമീകരണങ്ങള്‍" -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "സൂക്ഷിച്ചിട്ടുള്ള ക്രമീകരണം അടങ്ങുന്ന ഫയല്‍ നല്‍കുക" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "സംഭാവന ചെയ്തവര്‍:" -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "FILE" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "രഹസ്യവാക്കുകളും ചാവികളും" -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "സെഷന്‍ മാനേജ്മെന്റ് ID നല്‍കുക" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Ani Peter|അനി പീറ്റര്‍ \n" +"Anish A | അനീഷ് എ " -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1312 -msgid "ID" -msgstr "ID" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse സംരംഭത്തിനുള്ള പ്രധാനതാള്‍" -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "സെഷന്‍ മാനേജ്മെന്റ് ഉപാധികള്‍:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "സെഷന്‍ മാനേജ്മെന്റ് ഉപാധികള്‍ കാണിക്കുക" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "നീക്കം ചെയ്യുവാന്‍ സാധിക്കില്ല" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "ചാവികള്‍ പുറത്തെടുക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "ചാവി സെര്‍വര്‍ ചേര്‍ക്കുക" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "വിവരങ്ങള്‍ പുറത്തെടുക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "ഹോസ്റ്റ്:" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_ഫയല്‍" -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "കീ സര്‍വര്‍ തരം:" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_എക്സ്പോര്‍ട്ട് ചെയ്യുക..." -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "സര്‍വര്‍ ലഭ്യമാക്കേണ്ട പോര്‍ട്ട്." +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ഒരു ഫയലിലേക്കു് എക്സ്പോര്‍ട്ട് ചെയ്യുക" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "പ്രാരംഭ താല്‍ക്കാലിക വസ്തു" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_ചിട്ടപ്പെടുത്തുക" -#: ../libseahorse/seahorse-notification.c:566 -#: ../libseahorse/seahorse-notification.c:594 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "എടുത്ത ചാവി" -msgstr[1] "എടുത്ത ചാവികള്‍" - -#: ../libseahorse/seahorse-notification.c:570 -#: ../libseahorse/seahorse-notification.c:593 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "എടുത്ത %i ചാവി" -msgstr[1] "എടുത്ത %i ചാവികള്‍" - -#: ../libseahorse/seahorse-notification.c:572 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "ഒരു കീ ഇംപോര്‍ട്ട് ചെയ്തു" -msgstr[1] "കീകള്‍ ഇംപോര്‍ട്ട് ചെയ്തു" - -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "അറിയിപ്പു് സന്ദേശങ്ങള്‍" - -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "സിമ്മട്രിക് കീ" - -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "പബ്ലിക് കീ" - -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "സ്വകാര്യ കീ" - -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "യോഗ്യതകള്‍" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "ക്ലിപ്പ്ബോര്‍ഡിലേക്കു് പകര്‍ത്തുക" -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "ഐഡന്റിറ്റി" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_വെട്ടി മാറ്റുക" -#: ../libseahorse/seahorse-passphrase.c:194 -msgid "Passphrase" -msgstr "അടയാളവാക്ക്യം" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "തെരഞ്ഞെടുത്ത വസ്തുക്കള്‍ വെട്ടിനീക്കുക" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "ഇതിന്റെ ഗുണഗണങ്ങള്‍ കാണിക്കുക" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "ഈ ചാവികൂട്ടത്തിന്റെ ഗുണഗണങ്ങള്‍ കാണിക്കുക" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_മുന്‍ഗണനകള്‍" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "ഈ പ്രോഗ്രാമിനുള്ള മുന്‍ഗണനകള്‍ മാറ്റുക" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_കാഴ്ച" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_സഹായം" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "ഈ പ്രോഗ്രാമിനെക്കുറിച്ചു്" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_ഉള്ളടക്കം" -#: ../libseahorse/seahorse-passphrase.c:197 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Seahorse സഹായം കാണിക്കുക" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "പുറത്തെടുക്കുക" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr " %s: വേണ്ടിയുള്ള PIN അല്ലെങ്കില്‍ രഹസ്യവാക്ക് നല്‍കുക" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "അടയാളവാക്കു്:" -#: ../libseahorse/seahorse-passphrase.c:260 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" msgstr "ഉറപ്പാക്കുക:" -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "തെറ്റായ കീ സര്‍വര്‍ വിലാസം." -#: ../libseahorse/seahorse-prefs.c:64 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." @@ -1167,330 +738,368 @@ "സഹായത്തിനായി നിങ്ങളുടെ സിസ്റ്റം അഡ്മിനിസ്ട്രേറ്റര്‍ അല്ലെങ്കില്‍ കീ സര്‍വറിന്റെ " "അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക." -#: ../libseahorse/seahorse-prefs.c:173 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:353 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" msgstr "ഇഷ്ടാനുസൃതം തയ്യാറാക്കുക" -#: ../libseahorse/seahorse-prefs.c:420 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" msgstr "ഒന്നുമില്ല: കീകള്‍ പബ്ലിഷ് ചെയ്യേണ്ട" #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "_ചാവി സെര്‍വറുകളില്‍ നിന്നും ചാവികള്‍ സ്വയം ലഭ്യമാക്കുക" - -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "കീ സര്‍വറുകളുമായി ഓട്ടോമാറ്റിക്കായി _മാറ്റം വരുത്തിയ കീകള്‍ സിന്‍ക്രൊണൈസ് ചെയ്യുക" - -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "ചാവി സെര്‍വറുകള്‍" - -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Key Sharing" -msgstr "കീ പങ്കിടല്‍" - -#: ../libseahorse/seahorse-prefs.xml.h:5 msgid "Preferences" msgstr "മുന്‍ഗണനകള്‍" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "" -"Sharing your keys allows other people on your network to use the keys you've " -"collected. This means they can automatically encrypt things for you or those " -"you know, without you having to send them your key.\n" -"\n" -"Note: Your personal keys will not be compromised." -msgstr "" -"നിങ്ങളുടെ നെറ്റ്‌വര്‍ക്കിലുള്ള വ്യക്തികള്‍ക്കു് നിങ്ങള്‍ ശേഖരിച്ച കീകള്‍ ഉപയോഗിക്കുന്നതിനായി " -"നിങ്ങളുടെ കീകള്‍ പങ്കിടുന്നതു് അനുവദിക്കുന്നു. അതായതു്, നിങ്ങള്‍ കീ അയച്ചു " -"കൊടുക്കാതെ തന്നെ സ്വയമായി നിങ്ങള്‍ക്കുവേണ്ടി എന്‍ക്രിപ്റ്റ് ചെയ്യുന്നു.\n" -"\n" -"കുറിപ്പു്: നിങ്ങളുടെ സ്വകാര്യ കീകള്‍ ഒത്തുതീര്‍പ്പാക്കുന്നില്ല." - -#: ../libseahorse/seahorse-prefs.xml.h:9 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "കീകള്‍ _കണ്ടുപിടിക്കേണ്ട വഴി:" -#: ../libseahorse/seahorse-prefs.xml.h:10 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "കീകള്‍ എങ്ങോട്ട് _പബ്ലിഷ് ചെയ്യണം:" -#: ../libseahorse/seahorse-prefs.xml.h:11 -msgid "_Share my keys with others on my network" -msgstr "എന്റെ നെറ്റ്‌വര്‍ക്കില്‍ മറ്റുള്ളവരുമായി എന്റെ കീകള്‍ _പങ്കിടുക" - -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "പുരോഗതിയ്ക്കുള്ള തലക്കെട്ട്" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "_ചാവി സെര്‍വറുകളില്‍ നിന്നും ചാവികള്‍ സ്വയം ലഭ്യമാക്കുക" -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "ലഭ്യമല്ല" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "കീ സര്‍വറുകളുമായി ഓട്ടോമാറ്റിക്കായി _മാറ്റം വരുത്തിയ കീകള്‍ സിന്‍ക്രൊണൈസ് ചെയ്യുക" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "ചാവി സെര്‍വറുകള്‍" -#: ../libseahorse/seahorse-util.c:237 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:513 -msgid "Key Data" -msgstr "കീ ഡേറ്റാ" - -#: ../libseahorse/seahorse-util.c:515 -msgid "Multiple Keys" -msgstr "ഒന്നിലധികം ചാവികള്‍" - -#: ../libseahorse/seahorse-util.c:771 -msgid "Couldn't run file-roller" -msgstr "ഫയല്‍-റോളര്‍ പ്രവര്‍ത്തിക്കുവാന്‍ സാധ്യമായില്ല" - -#: ../libseahorse/seahorse-util.c:777 -msgid "Couldn't package files" -msgstr "ഫയലുകള്‍ പാക്കേജ് ചെയ്യുവാന്‍ സാധിച്ചില്ല" - -#: ../libseahorse/seahorse-util.c:778 -msgid "The file-roller process did not complete successfully" -msgstr "ഫയല്‍-റോളര്‍ പ്രക്രിയ വിജയകരമായി പൂര്‍ത്തിയായില്ല." - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:943 -msgid "All key files" -msgstr "എല്ലാം ചാവി ഫയലുകളും" - -#: ../libseahorse/seahorse-util.c:954 ../libseahorse/seahorse-util.c:1002 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "എല്ലാം ഫയലുകളും" - -#: ../libseahorse/seahorse-util.c:995 -msgid "Archive files" -msgstr "ആര്‍ക്കൈവ് ഫയലുകള്‍" - -#: ../libseahorse/seahorse-util.c:1065 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"ഈ പേരില്‍ ഒരു ഫയല്‍ നിലവിലുണ്ടു്.\n" -"\n" -"ഒരു പുതിയ ഫയല്‍ ഉപയോഗിച്ചു് ഇതു് മാറ്റി എഴുതണമോ?" - -#: ../libseahorse/seahorse-util.c:1068 -msgid "_Replace" -msgstr "_മാറ്റിവയ്ക്കുക" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1131 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "അറിയപ്പെടാത്ത" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1137 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "ഒരിക്കലും" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1144 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "മാര്‍ജിനല്‍" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1150 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "മുഴുവനും" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1156 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "അത്യന്തികമായ" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1349 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "പ്രവര്‍ത്തനരഹിതം" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1345 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "പിന്‍വലിച്ചതു്" -#: ../libseahorse/seahorse-widget.c:362 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "സഹായം ലഭ്യമാക്കുവാന്‍ സാധിച്ചില്ല: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "കാലാവധി അവസാനിക്കുന്ന തീയതി:" +msgid "Never E_xpires" +msgstr "ഒരിക്കലും _കാലാവധി തീരില്ല" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "ഒരു പുതിയ ചെറുചാവി ഉണ്ടാക്കുക" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "കീയുടെ കാലാവധി ഒരിക്കലും കഴിഞ്ഞില്ലെങ്കില്‍" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_ഏതു് തരത്തിലുള്ള കീ:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "കീയുടെ _നീളം:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_ഏതു് തരത്തിലുള്ള കീ:" +msgid "Expiration Date:" +msgstr "കാലാവധി അവസാനിക്കുന്ന തീയതി:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "കീയുടെ വ്യാപ്തി" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "ഒരിക്കലും _കാലാവധി തീരില്ല" +msgid "Generate a new subkey" +msgstr "ഒരു പുതിയ ചെറുചാവി ഉണ്ടാക്കുക" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "ഉപയോക്താവിന്റെ ID കൂട്ടിച്ചേര്‍ക്കുക" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "പുതിയ ഉപയോക്താവിന്റെ ID ഉണ്ടാക്കുക" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "മുഴുവന്‍ പേര്" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "കീ സംബന്ധിച്ചുള്ള അ_ഭിപ്രായം:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "5 അക്ഷരം നീളമെങ്കിലും ഉണ്ടായിരിക്കണം" -#: ../pgp/seahorse-add-uid.xml.h:6 -msgid "Optional comment describing key" -msgstr "കീ വിശദീകരിക്കുന്ന അഭിപ്രായം (നിര്‍ബന്ധമില്ലാത്ത)" - -#: ../pgp/seahorse-add-uid.xml.h:7 +#: ../pgp/seahorse-add-uid.xml.h:3 msgid "Optional email address" msgstr "ഐഛികമായ ഈമെയില്‍ വിലാസം" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 -msgid "_Email Address:" +#: ../pgp/seahorse-add-uid.xml.h:4 +msgid "Optional comment describing key" +msgstr "കീ വിശദീകരിക്കുന്ന അഭിപ്രായം (നിര്‍ബന്ധമില്ലാത്ത)" + +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "മുഴുവന്‍ പേര്" + +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 +msgid "_Email Address:" msgstr "_ഈമെയില്‍ വിലാസം:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "കീ സംബന്ധിച്ചുള്ള അ_ഭിപ്രായം:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "പുതിയ ഉപയോക്താവിന്റെ ID ഉണ്ടാക്കുക" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_മാറ്റുക" +msgid "_Never expires" +msgstr "കാലാവധി _ഒരിക്കലും അവസാനിക്കുകയില്ല" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "പിന്‍വലിച്ച ചാവി" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "കാലാവധി _ഒരിക്കലും അവസാനിക്കുകയില്ല" +msgid "C_hange" +msgstr "_മാറ്റുക" -#: ../pgp/seahorse-gpgme-add-subkey.c:144 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "ചെറുചാവി കൂട്ടിചേര്‍ക്കുവാന്‍ കഴിഞ്ഞില്ല" -#: ../pgp/seahorse-gpgme-add-subkey.c:163 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "%s ലേക്ക് ചെറുചാവികള്‍ കൂട്ടിചേര്‍ക്കുക" -#: ../pgp/seahorse-gpgme-add-subkey.c:179 ../pgp/seahorse-gpgme-generate.c:96 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (ഒപ്പു് മാത്രം)" -#: ../pgp/seahorse-gpgme-add-subkey.c:187 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (എന്‍ക്രിപ്ഷന്‍ മാത്രം)" -#: ../pgp/seahorse-gpgme-add-subkey.c:193 ../pgp/seahorse-gpgme-generate.c:97 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (ഒപ്പു് മാത്രം)" -#: ../pgp/seahorse-gpgme-add-subkey.c:199 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (എന്‍ക്രിപ്ഷന്‍ മാത്രം)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "ഉപയോക്താവിന്റെ ID കൂട്ടിച്ചേര്‍ക്കുവാന്‍ കഴിഞ്ഞില്ല" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "%s ലേക്ക് ഉപയോക്താവിന്റെ ID കൂട്ടിചേര്‍ക്കുക" -#: ../pgp/seahorse-gpgme.c:51 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "ഡീക്രിപ്ഷന്‍ പരാജയപ്പെട്ടു. ഒരു പക്ഷേ, നിങ്ങള്‍ക്കു് ഡീക്രിപ്ഷന്‍ കീ ലഭ്യമല്ലായിരിക്കാം." -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "ഈ പ്രവര്‍ത്തനം റദ്ദാക്കി" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "തെറ്റായവായ കാലാവധി അവസാനിക്കുന്ന തീയതി" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "കാലാവധി തീരുന്ന തീയതി ഭാവിയിലാണു്" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "കാലാവധി തീരുന്ന ദിവസം മാറ്റുവാന്‍ സാധിച്ചില്ല" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "കാലാവധി തീരുന്ന ദിവസം: %s" -#: ../pgp/seahorse-gpgme-generate.c:65 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "ഒന്നിലധികം ചാവികള്‍" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "കീ ഡേറ്റാ" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "കാവലുള്ള PGP ചാവികള്‍" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP ചാവികള്‍" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP ചാവി" -#: ../pgp/seahorse-gpgme-generate.c:66 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "ഈമെയിലും ഫയലും എന്‍ക്രിപ്റ്റ് ചെയ്യാന്‍ ഉപയോഗിക്കുന്നു" -#: ../pgp/seahorse-gpgme-generate.c:95 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:91 +#: ../ssh/seahorse-ssh-generate.xml.h:9 +msgid "RSA" +msgstr "RSA" + +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:106 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "PGP ചാവി ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല" -#: ../pgp/seahorse-gpgme-generate.c:213 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "പുതിയ PGP ചാവിയ്ക്കുള്ള അടയാളവാക്ക്യം" -#: ../pgp/seahorse-gpgme-generate.c:214 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "നിങ്ങളുടെ പുതിയ ചാവിയ്ക്കുള്ള അടയാളവാക്ക്യം രണ്ട് തവണ നല്‍കുക." -#: ../pgp/seahorse-gpgme-generate.c:223 -msgid "Couldn't generate key" -msgstr "ചാവി ഉണ്ടാക്കുവാനായില്ല" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"കീ ഉണ്ടാക്കുമ്പോള്‍ കുറേ ചപ്പ് ചവറ് ഡാറ്റ വോണം. അതിന് താങ്കളുടെ സഹയം വേണം.\n" +"വേറെ എന്തെങ്കിലും കാര്യങ്ങളായ കീബോര്‍ഡില്‍ ടൈപ്പ് ചെയ്യുക, മൌസ് അനക്കുക,\n" +"സോഫ്റ്റ്‌വെയറുകള്‍ ഉപയോഗിക്കുക തുടങ്ങിയവ ചെയ്യുന്നത്\n" +"നന്നായിരിക്കും. ഇത് സിസ്റ്റത്തിനാവശ്യമായ ചപ്പ്ചവറുകള്‍ കിട്ടാന്‍\n" +"സഹായിക്കും" -#: ../pgp/seahorse-gpgme-generate.c:225 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:459 msgid "Generating key" msgstr "ചാവി ഉണ്ടാക്കുന്നു" +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "നിങ്ങള്‍ക്ക് '%s' എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "നിങ്ങള്‍ക്ക് %d ചാവികള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +msgstr[1] "നിങ്ങള്‍ക്ക് %d ചാവികള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +msgid "Wrong password" +msgstr "തെറ്റായ രഹസ്യവാക്ക്" + +#: ../pgp/seahorse-gpgme-key-op.c:381 +msgid "This was the third time you entered a wrong password. Please try again." +msgstr "" +"ഇത് മൂന്നാമത്തെ പ്രാവശ്യമാണ് താങ്കള്‍ തെറ്റായ രഹസ്യവാക്ക് ഉപയോഗിക്കുന്നത്. ദയവായി വീണ്ടും ശ്രമിക്കുക" + +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "തെറ്റായ അടയാളവാക്ക്യം." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s'-നുള്ള പുതിയ അടയാളവാക്ക്യം" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s'-നുള്ള അടയാളവാക്ക്യം നല്‍കുക" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "പുതിയ അടയാളവാക്ക്യം നല്‍കുക" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "അടയാളവാക്ക്യം നല്‍കുക" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "അടയാളവാക്ക്യം" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d ചാവി ചേര്‍ത്തിരിയ്ക്കുന്നു" +msgstr[1] "%d ചാവികള്‍ ചേര്‍ത്തിരിയ്ക്കുന്നു" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"തെറ്റായ കീ ഡേറ്റാ (UID ലഭ്യമല്ല). ഭാവിയിലുള്ളൊരു തീയതി സജ്ജമാക്കിയിരിക്കുന്ന കമ്പ്യൂട്ടര്‍ " +"അല്ലെങ്കില്‍ ഒപ്പു് ലഭ്യമല്ലാത്തതിനാല്‍ ഇങ്ങനെ സംഭവിക്കാം." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG ചാവികള്‍" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: സ്വതവേയുള്ള ചാവിക്കുട്ടത്തിന്റെ ഡറക്ടറി" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1514,8 +1123,8 @@ "This is not a image file, or an unrecognized kind of image file. Try to use " "a JPEG image." msgstr "" -"ഇതൊരു ഇമേജ് ഫയല്‍ അല്ലെങ്കില്‍ അപരിചിതമായ തരത്തിലുള്ള ഇമേജ് ഫയലല്ല. ഒരു " -"JPEG ഇമേജുപയോഗിക്കുവാന്‍ ശ്രമിക്കുക." +"ഇതൊരു ഇമേജ് ഫയല്‍ അല്ലെങ്കില്‍ അപരിചിതമായ തരത്തിലുള്ള ഇമേജ് ഫയലല്ല. ഒരു JPEG " +"ഇമേജുപയോഗിക്കുവാന്‍ ശ്രമിക്കുക." #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" @@ -1525,679 +1134,729 @@ msgid "All JPEG files" msgstr "എല്ലാ JPEG ഫയലുകളും" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "എല്ലാം ഫയലുകളും" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "ചാവിയില്‍ ചേര്‍ക്കുന്നതിനായി ഫോട്ടോ തിരഞ്ഞെടുക്കുക" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +msgid "Couldn't prepare photo" +msgstr "ഫോട്ടോ തയ്യാറാക്കാന്‍ സാധ്യമായില്ല" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "ഫോട്ടോ ചേര്‍ക്കുവാനായില്ല" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "ഫയല്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല. അത് ഒരു പക്ഷേ തെറ്റായ രീതിയിലാവാം." -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "നിങ്ങളുടെ ചാവിയില്‍ നിന്നും നിലവിലുള്ള ഫോട്ടോ നീക്കം ചെയ്യണം എന്നുറപ്പാണോ?" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "ഫോട്ടോ വെട്ടി നീക്കുവാന്‍ സാധ്യമായില്ല" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "സബ്കീ പിന്‍വലിക്കുവാന്‍ സാധ്യമായില്ല" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "പിന്‍വലിയ്ക്കുക: %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "കാരണം വ്യക്തമല്ല" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "ചാവി പിന്‍വലിയ്ക്കുവാനുള്ള കാരണം വ്യക്തമല്ല" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "ഒത്തുതീര്‍പ്പാക്കി" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "കീ ഒത്തുതീര്‍പ്പാക്കി" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "അസാധുവാക്കി" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "കീ അസാധുവാക്കി" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "ഉപയോഗിക്കുന്നില്ല" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "ചാവി ഉപയോഗത്തിലില്ല" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " "undone! Are you sure you want to continue?" msgstr "" -"%s %s-നുള്ള റിവോക്കറായി നിങ്ങള്‍ ചേര്‍ക്കുന്നു. ഈ പ്രവര്‍ത്തി തിരിച്ചെടുക്കുവാന്‍ സാധ്യമല്ല! " -"നിങ്ങള്‍ക്കു് തുടരണമെന്നുറപ്പാണോ?" +"%s %s-നുള്ള റിവോക്കറായി നിങ്ങള്‍ ചേര്‍ക്കുന്നു. ഈ പ്രവര്‍ത്തി തിരിച്ചെടുക്കുവാന്‍ സാധ്യമല്ല! നിങ്ങള്‍ക്കു് " +"തുടരണമെന്നുറപ്പാണോ?" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "റിവോക്കര്‍ ചേര്‍ക്കുവാന്‍ സാധ്യമായില്ല" -#: ../pgp/seahorse-gpgme-sign.c:96 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "ഈ രഹസ്യ ചാവി സ്ഥിരമായി ഇല്ലാതാക്കുമെന്നെനിക്കറിയാം" + +#: ../pgp/seahorse-gpgme-sign.c:100 +#, c-format +msgid "" +"This key was already signed by\n" +"\"%s\"" +msgstr "" +"\"%s\"\n" +"ഈ ചാവിയില്‍ നേരത്തെ തന്നെ ഒപ്പിട്ടതാണ്" + +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "ചാവി ഒപ്പിടുവാന്‍ സാധ്യമായില്ല" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:149 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "ഒപ്പിനുള്ള കീകള്‍ ലഭ്യമല്ല" -#: ../pgp/seahorse-gpgme-sign.c:150 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." -msgstr "" -"ഈ കീയുടെ വിശ്വാസ്യത തെളിയിക്കുന്നതിനുള്ള സ്വകാര്യ PGP കീകള്‍ നിങ്ങള്‍ക്കു് " -"ലഭ്യമല്ല." +msgstr "ഈ കീയുടെ വിശ്വാസ്യത തെളിയിക്കുന്നതിനുള്ള സ്വകാര്യ PGP കീകള്‍ നിങ്ങള്‍ക്കു് ലഭ്യമല്ല." -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "തെറ്റായ അടയാളവാക്ക്യം." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s'-നുള്ള പുതിയ അടയാളവാക്ക്യം" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "തെരച്ചില്‍ വ്യക്തമായിരുന്നില്ല. സര്‍വര്‍ '%s' അനവധി കീകള്‍ കണ്ടുപിടിച്ചു." -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s'-നുള്ള അടയാളവാക്ക്യം നല്‍കുക" +msgid "Couldn't communicate with server '%s': %s" +msgstr "സര്‍വര്‍ '%s'-മായി ബന്ധപ്പെടുവാന്‍ സാധിച്ചില്ല: %s" -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "പുതിയ അടയാളവാക്ക്യം നല്‍കുക" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP ചാവി സെര്‍വര്‍" -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "അടയാളവാക്ക്യം നല്‍കുക" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "ചാവി എടുക്കുവാന്‍ സാധിച്ചില്ല" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "ചാവി സെര്‍വറുകളില്‍ നിന്നും ചാവി എടുക്കുന്നു" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_ദൂരെയുള്ള" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "ഈ ജാലകം അടയ്ക്കുക" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "ദൂരെയുള്ള ചാവികള്‍ _കണ്ടുപിടിക്കുക..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "ചാവി സെര്‍വറില്‍ ചാവി തെരയുക" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_എടുക്കുക" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "തിരഞ്ഞെടുത്ത ചാവികള്‍ പ്രാദേശിക ചാവിക്കൂട്ടത്തിലേയ്ക്കു് എടുക്കുക" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "ദൂരെയുള്ള ചാവികള്‍" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d ചാവി ചേര്‍ത്തിരിയ്ക്കുന്നു" -msgstr[1] "%d ചാവികള്‍ ചേര്‍ത്തിരിയ്ക്കുന്നു" +msgid "Remote Keys Containing '%s'" +msgstr "'%s' ഉള്ള റിമോട്ട് കീകള്‍" -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "ചാവി ചേര്‍ക്കുന്നു..." +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "ചാവികള്‍ക്കായി തെരയുന്നത് പരാജയം." -#: ../pgp/seahorse-gpgme-source.c:820 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "റിമോട്ട് ആയ ചാവി കണ്ടുപിടിക്കുക" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"തെറ്റായ കീ ഡേറ്റാ (UID ലഭ്യമല്ല). ഭാവിയിലുള്ളൊരു തീയതി സജ്ജമാക്കിയിരിക്കുന്ന കമ്പ്യൂട്ടര്‍ " -"അല്ലെങ്കില്‍ ഒപ്പു് ലഭ്യമല്ലാത്തതിനാല്‍ ഇങ്ങനെ സംഭവിക്കാം." +"ഇന്റര്‍നെറ്റില്‍ മറ്റുള്ളവര്‍ക്കുള്ള കീകള്‍ ഇതു് ലഭ്യമാക്കുന്നു. ഇവ പിന്നീടു് നിങ്ങളുടെ ലോക്കല്‍ കീറിങിലേക്ക് " +"ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധിക്കുന്നു." -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:538 -msgid "Importing Keys" -msgstr "ചാവി എടുക്കുന്നു" - -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "ചാവി പുറത്തെടുക്കുന്നു" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "ഇതടങ്ങുന്ന കീകള്‍ക്കായി _തെരയുക: " -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "ചാവി സെര്‍വറുകള്‍:" -#: ../pgp/seahorse-hkp-source.c:330 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "തെരച്ചില്‍ വ്യക്തമായിരുന്നില്ല. സര്‍വര്‍ '%s' അനവധി കീകള്‍ കണ്ടുപിടിച്ചു." +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "അടുത്തുള്ള പങ്കിടുന്ന കീകള്‍:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "എവിടെ തിരയണം:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_തെരയുക" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "സെര്‍വറില്‍ ചാവികള്‍ അറിയിക്കുവാനായില്ല" -#: ../pgp/seahorse-hkp-source.c:332 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "സര്‍വര്‍ '%s'-മായി ബന്ധപ്പെടുവാന്‍ സാധിച്ചില്ല: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "സെര്‍വറില്‍ നിന്നും ചാവി ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല: %s" -#: ../pgp/seahorse-hkp-source.c:576 -msgid "Searching for keys..." -msgstr "ചാവികള്‍ക്കായി തെരയുന്നു..." - -#: ../pgp/seahorse-hkp-source.c:647 -msgid "Uploading keys..." -msgstr "കീകള്‍ അപ്‌ലോഡ് ചെയ്യുന്നു..." - -#: ../pgp/seahorse-hkp-source.c:725 -msgid "Retrieving keys..." -msgstr "ചാവികള്‍ ലഭ്യമാക്കുന്നു..." - -#: ../pgp/seahorse-hkp-source.c:831 -#, c-format -msgid "Searching for keys on: %s" -msgstr "കീകള്‍ തെരയുന്നു: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:908 ../pgp/seahorse-hkp-source.c:981 -#: ../pgp/seahorse-ldap-source.c:668 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Connecting to: %s" -msgstr "ബന്ധിപ്പിയ്ക്കുന്നു: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "സിന്‍ക്രൊണൈസ് ചെയ്യുന്നതിനായി %d കീ തെരഞ്ഞെടുത്തു" +msgstr[1] "സിന്‍ക്രൊണൈസ് ചെയ്യുന്നതിനായി %d കീകള്‍ തെരഞ്ഞെടുത്തു" -#: ../pgp/seahorse-hkp-source.c:1005 -msgid "HTTP Key Server" -msgstr "HTTP ചാവി സെര്‍വര്‍" +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "കീകള്‍ സിന്‍ക്രണൈസ് ചെയ്യുന്നു..." -#: ../pgp/seahorse-ldap-source.c:459 +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "ചാവികള്‍ സിംക് ചെയ്യുക" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"ഇതു് നിങ്ങളുടെ കീറിങില്‍ കീകള്‍ പബ്ലിഷ് ചെയ്യുന്നു. അങ്ങനെ അവ മറ്റുള്ളവര്‍ക്കുപയോഗത്തിനായി ലഭിക്കുന്നു. " +"അവരുടെ കീകള്‍ നിങ്ങള്‍ ലഭിച്ചതിനു് ശേഷം അവര്‍ വരുത്തിയ മാറ്റങ്ങളും നിങ്ങള്‍ക്കു് ലഭിക്കുന്നു." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"മറ്റുള്ളവരുടെ കീകള്‍ നിങ്ങള്‍ക്കു് ലഭ്യമായതിനു് ശേഷം അവര്‍ വരുത്തിയ മാറ്റങ്ങള്‍ ഇതു് ലഭ്യമാക്കുന്നു. പബ്ലിഷ് " +"ചെയ്യുന്നതിനായി ഒരു കീ സര്‍വറും തെരഞ്ഞെടുത്തിട്ടില്ല, അതിനാല്‍ നിങ്ങളുടെ കീ മറ്റുള്ളവര്‍ക്ക് " +"ലഭ്യമാകുന്നതല്ല." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_ചാവി സെര്‍വറുകള്‍" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_സിംക് ചെയ്യുക" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "'%s'-മായി ബന്ധപ്പെടുവാന്‍ സാധിച്ചില്ല: %s" -#: ../pgp/seahorse-ldap-source.c:641 +#: ../pgp/seahorse-ldap-source.c:652 +#, c-format +msgid "Connecting to: %s" +msgstr "ബന്ധിപ്പിയ്ക്കുന്നു: %s" + +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "വിലാസം പരിഹരിക്കുവാന്‍ സാധ്യമായില്ല: %s" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "സര്‍വര്‍ വിലാസം പരിഹരിക്കുന്നു: %s" -#: ../pgp/seahorse-ldap-source.c:955 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "'%s' അടങ്ങുന്ന കീകള്‍ തെരയുന്നു..." - -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "കീ id ആയ'%s'-നായി തെരയുന്നു..." - -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "ദൂരെയുള്ള ചാവികള്‍ ലഭ്യമാക്കുന്നു..." - -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "ചാവി സെര്‍വറിലേക്ക് ചാവി അയയ്ക്കുന്നു..." - -#: ../pgp/seahorse-ldap-source.c:1423 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP ചാവി സെര്‍വര്‍" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "കീ _ഒപ്പിടുക..." - -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "മറ്റുള്ളവര്‍ക്കുള്ള ചാവി ഒപ്പിടുക" - -#: ../pgp/seahorse-pgp-commands.c:171 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "നിങ്ങള്‍ക്ക് '%s' എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" - -#: ../pgp/seahorse-pgp-commands.c:176 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "നിങ്ങള്‍ക്ക് %d കീകളും ഐഡന്റിറ്റികളും എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "കീകള്‍ _സിന്‍ക് ചെയ്തു് പബ്ലിഷ് ചെയ്യുക..." -#: ../pgp/seahorse-pgp-commands.c:178 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "നിങ്ങള്‍ക്ക് %d കീകള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "ഓണ്‍ലൈനുള്ളവയുമായി നിങ്ങളുടെ കീകള്‍ പബ്ലിഷ് അല്ലെങ്കില്‍ സിന്‍ക്രൊണൈസ് ചെയ്യുക." -#: ../pgp/seahorse-pgp-commands.c:180 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "നിങ്ങള്‍ക്ക് %d ഐഡന്റിറ്റികള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP ചാവികള്‍" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "ഈമെയിലും ഫയലും എന്‍ക്രിപ്റ്റ് ചെയ്യാന്‍ PGP ചാവി ഉപയോഗിക്കുന്നു" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_അധികമായ കീ ഉപാധികള്‍" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_ഉണ്ടാക്കുക" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "മറ്റുള്ളവര്‍ക്ക് ഈമെയില്‍ അല്ലെങ്കില്‍ ഫയലുകള്‍ എന്‍ക്രിപ്റ്റ് ചെയ്യുന്നതിനായി ഒരു PGP കീ അനുവദിക്കുന്നു." +msgid "Generate a new key" +msgstr "ഒരു പുതിയ ചാവി ഉണ്ടാക്കുക" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "അല്‍ഗോരിതങ്ങള്‍ ഇവിടെ" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "" +"മറ്റുള്ളവര്‍ക്ക് ഈമെയില്‍ അല്ലെങ്കില്‍ ഫയലുകള്‍ എന്‍ക്രിപ്റ്റ് ചെയ്യുന്നതിനായി ഒരു PGP കീ അനുവദിക്കുന്നു." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_ഉണ്ടാക്കുക" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_അഭിപ്രായം:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "കാലാവധി _തീരുന്നത്:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "കാലാവധി _അവസാനിക്കുകയില്ല" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "ഏത് _തരം എന്‍ക്രിപ്ഷന്‍:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "ഒരു പുതിയ ചാവി ഉണ്ടാക്കുക" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "ചാവിയുടെ _ശക്തി (bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "കാലാവധി _അവസാനിക്കുകയില്ല" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "പുതിയ PGP ചാവി" +msgid "E_xpiration Date:" +msgstr "കാലാവധി _തീരുന്നത്:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_അഭിപ്രായം:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_അധികമായ കീ ഉപാധികള്‍" -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Private PGP Key" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" msgstr "സ്വകാര്യ PGP ചാവി" -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Public PGP Key" -msgstr "മറ്റുള്ളവര്‍ക്കുള്ള PGP ചാവി" - -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1347 -msgid "Expired" -msgstr "കാലാവധി അവസാനിച്ചു" +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP ചാവി" -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "പ്രാഥമിക ഉപയോക്താവിന്റെ ID മാറ്റുവാന്‍ സാധ്യമായില്ല" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "'%s' ഉപയോക്താവിന്റെ ID എന്നേക്കുമായി വെട്ടി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "ഉപയോക്താവിന്റെ ID വെട്ടി നീക്കുവാന്‍ സാധ്യമായില്ല" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1462 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[അറിയപ്പെടാത്ത]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1740 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "പേര്/ഈമെയില്‍" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ഒപ്പിന്റെ ID" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "പ്രാഥമിക ഫോട്ടോ മാറ്റുവാന്‍ സാധ്യമായില്ല" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(അറിയപ്പെടാത്ത)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "ഈ ചാവിയുടെ കാലാവധി അവസാനിച്ചത്: %s" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "പേരു്" + +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "നിങ്ങള്‍ക്ക് %2$s ചെറുചാവിയുടെ %1$d എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "ചെറുചാവി നീക്കുവാന്‍ കഴിഞ്ഞില്ല" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1425 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "വിശ്വാസ്യത മാറ്റുവാന്‍ സാധ്യമല്ല" -#: ../pgp/seahorse-pgp-key-properties.c:1005 ../src/seahorse-viewer.c:315 -#: ../ssh/seahorse-ssh-key-properties.c:167 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "\"%s\" -നുള്ള ചാവി പുറത്തെടുക്കാന്‍ കഴിഞ്ഞില്ല" - -#: ../pgp/seahorse-pgp-key-properties.c:1033 -#: ../ssh/seahorse-ssh-key-properties.c:191 -msgid "Export Complete Key" -msgstr "പൂര്‍ണ്ണമായ ചാവി പുറത്തെടുക്കുക" - -#: ../pgp/seahorse-pgp-key-properties.c:1058 -#: ../ssh/seahorse-ssh-key-properties.c:213 -msgid "Couldn't export key." -msgstr "കീ എക്സ്പോര്‍ട്ട് സാധ്യമായില്ല" +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "ചാവി എക്സ്പോര്‍ട്ട് സാധ്യമായില്ല" -#: ../pgp/seahorse-pgp-key-properties.c:1265 -#: ../pgp/seahorse-pgp-key-properties.c:1354 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "ഒരിക്കലും" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1315 -#: ../src/seahorse-key-manager-store.c:859 +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "ID" + +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "തരം" -#: ../pgp/seahorse-pgp-key-properties.c:1318 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "ഉണ്ടാക്കിയത്" -#: ../pgp/seahorse-pgp-key-properties.c:1321 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "കാലാവധി അവസാനിക്കുന്നു" -#: ../pgp/seahorse-pgp-key-properties.c:1324 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "അവസ്ഥ" -#: ../pgp/seahorse-pgp-key-properties.c:1327 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "ശക്തി" -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "കാലാവധി അവസാനിച്ചു" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "നല്ലത്" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "പ്റവര്‍ത്തികള്‍" +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "ചാവിയുടെ ID" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "അഭിപ്രായം:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "തീയതികള്‍" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "ഈമെയില്‍:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "വിരലടയാളം" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ചാവി ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "ഒരിക്കലുമില്ല" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "ചാവിയുടെ പേരുകളും ഒപ്പുകളും" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "ഈ ചാവി പിന്‍വലിച്ചതാണു് " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Name:" -msgstr "പേര്:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "കീയുടെ ഉടമസ്ഥന്‍ കീ പിന്‍വലിച്ചു. ഇനി ഇതുപയോഗിക്കുവാന്‍ ലഭ്യമല്ല." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -msgid "Photo " -msgstr "ഫോട്ടോ " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "ഈ ചാവിയുടെ കാലാവധി തീര്‍ന്നു" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -msgid "Technical Details" -msgstr "സാങ്കേതിക വിവരങ്ങള്‍" +msgid "Add a photo to this key" +msgstr "ഈ ചാവിയില്‍ ഒരു ഫോട്ടോ ചേര്‍ക്കുക" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has been revoked" -msgstr "ഈ ചാവി പിന്‍വലിച്ചതാണു് " +msgid "Remove this photo from this key" +msgstr "ഈ ചാവിയില്‍ നിന്നും ഫോട്ടോ നീക്കം ചെയ്യുക" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -msgid "This key has expired" -msgstr "ഈ ചാവിയുടെ കാലാവധി തീര്‍ന്നു" +msgid "Make this photo the primary photo" +msgstr "ഈ ഫോട്ടോ പ്രാഥമിക ഫോട്ടോ ആക്കുക" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Type:" -msgstr "ഏത് തരം:" +msgid "Go to previous photo" +msgstr "മുമ്പുള്ള ഫോട്ടോയിലേക്ക് പോകുക" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -msgid "Use:" -msgstr "ഉപയോഗം:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "അടുത്ത ഫോട്ടോയിലേക്ക് പോകുക" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "_Subkeys" -msgstr "_ചെറുചാവികള്‍" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "ഫോട്ടോ " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add" -msgstr "ചേര്‍ക്കുക" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -msgid "Add a photo to this key" -msgstr "ഈ ചാവിയില്‍ ഒരു ഫോട്ടോ ചേര്‍ക്കുക" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ചാവി ID:" +#. Name of key, usually a persons name #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "Change _Passphrase" -msgstr "_അടയാളവാക്ക്യം മാറ്റുക" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "പേര്:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "ഈമെയില്‍:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Decrypt files and email sent to you." -msgstr "നിങ്ങള്‍ക്ക് അയച്ച ഫയലുകളും ഈമെയിലും ഡീക്രിപ്റ്റ് ചെയ്യുക" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "അഭിപ്രായം:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -msgid "Delete" -msgstr "വെട്ടി മാറ്റുക" +#. To translators: This is the noun not the verb. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "ഉപയോഗം:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -msgid "Expire" -msgstr "കാലാവധി തീരുന്നത്" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "ഏത് തരം:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Expires:" -msgstr "കാലാവധി തീരുന്നത്:" +msgid "Decrypt files and email sent to you." +msgstr "നിങ്ങള്‍ക്ക് അയച്ച ഫയലുകളും ഈമെയിലും ഡീക്രിപ്റ്റ് ചെയ്യുക" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 -msgid "Export" -msgstr "പുറത്തെടുക്കുക" +msgid "Private PGP Key" +msgstr "സ്വകാര്യ PGP ചാവി" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "_അടയാളവാക്ക്യം മാറ്റുക" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to next photo" -msgstr "അടുത്ത ഫോട്ടോയിലേക്ക് പോകുക" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "ഉടമസ്ഥന്‍" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -msgid "Go to previous photo" -msgstr "മുമ്പുള്ള ഫോട്ടോയിലേക്ക് പോകുക" +msgid "Key Names and Signatures" +msgstr "ചാവിയുടെ പേരുകളും ഒപ്പുകളും" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -msgid "Key ID:" -msgstr "ചാവി ID:" +msgid "Primary" +msgstr "പ്രാഥമികം" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +msgid "Sign" +msgstr "ഒപ്പു്" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 -msgid "Make this photo the primary photo" -msgstr "ഈ ഫോട്ടോ പ്രാഥമിക ഫോട്ടോ ആക്കുക" +msgid "Delete" +msgstr "വെട്ടി മാറ്റുക" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -msgid "Names and Signatures" -msgstr "പേരുകളും ഒപ്പുകളും" +msgid "_Add Name" +msgstr "പേര് _ചേര്‍ക്കുക" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Never" -msgstr "ഒരിക്കലുമില്ല" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -msgid "Override Owner _Trust:" -msgstr "ഉടമസ്ഥന്റെ _വിശ്വാസം മറികടക്കുക:" +msgid "Revoke" +msgstr "പിന്‍വലിച്ച" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Owner" -msgstr "ഉടമസ്ഥന്‍" +msgid "Names and Signatures" +msgstr "പേരുകളും ഒപ്പുകളും" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Primary" -msgstr "പ്രാഥമികം" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ചാവി ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Remove this photo from this key" -msgstr "ഈ ചാവിയില്‍ നിന്നും ഫോട്ടോ നീക്കം ചെയ്യുക" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "ശക്തി" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Revoke" -msgstr "പിന്‍വലിച്ച" +msgid "Technical Details" +msgstr "സാങ്കേതിക വിവരങ്ങള്‍" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -msgid "Sign" -msgstr "ഒപ്പു്" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "Strength:" -msgstr "ശക്തി" +msgid "Fingerprint" +msgstr "വിരലടയാളം" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "കീയുടെ ഉടമസ്ഥന്‍ കീ പിന്‍വലിച്ചു. ഇനി ഇതുപയോഗിക്കുവാന്‍ ലഭ്യമല്ല." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "കാലാവധി തീരുന്നത്:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 -msgid "_Add Name" -msgstr "പേര് _ചേര്‍ക്കുക" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "തീയതികള്‍" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "ഉടമസ്ഥന്റെ _വിശ്വാസം മറികടക്കുക:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "പൂര്‍ണ്ണമായ ചാവി _പുറത്തെടുക്കുക:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "തീയതികള്‍:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +msgid "Actions" +msgstr "പ്റവര്‍ത്തികള്‍" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Fingerprint:" -msgstr "വിരലടയാളം:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "ചേര്‍ക്കുക" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "വിശ്വാസം കാണിക്കുക:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "കാലാവധി തീരുന്നത്" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "Your trust of this key" -msgstr "ഈ ചാവിയിലെ നിങ്ങളുടെ വിശ്വാസം" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_ചെറുചാവികള്‍" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_Other Names:" -msgstr "_മറ്റു് പേരുകള്‍:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "മാര്‍ജിനലി" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_People who have signed this key:" -msgstr "ഈ കീയില്‍ ഒപ്പിട്ട _വ്യക്തികള്‍:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 +msgid "Fully" +msgstr "മുഴുവന്‍" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 +msgid "Ultimately" +msgstr "അത്യന്തികമായി" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +msgid "Encrypt files and email to the key's owner" +msgstr "ചാവിയുടെ ഉടമസ്ഥന് ഫയലുകള്‍ എന്‍ക്രിപ്റ്റ് ചെയ്തു് ഈമെയില്‍ അയയ്ക്കുക" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Encrypt files and email to the key's owner " -msgstr "കീയുടെ ഉടമസ്ഥനു് ഫയലുകള്‍ എന്‍ക്രിപ്റ്റ് ചെയ്തു് ഈമെയില്‍ അയയ്ക്കുക" +msgid "Public PGP Key" +msgstr "മറ്റുള്ളവര്‍ക്കുള്ള PGP ചാവി" +#. Names set on the PGP key. #: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 -msgid "Fully" -msgstr "മുഴുവന്‍" +msgid "_Other Names:" +msgstr "_മറ്റു് പേരുകള്‍:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "ഈ ചാവിയിലെ നിങ്ങളുടെ വിശ്വാസം" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "നിങ്ങളുടെ വിശ്വാസ്യത മാനുവലായി വിശദീകരണങ്ങള്‍ക്കുള്ള റ്റാബില്‍ നല്‍കുന്നു." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "മറ്റുള്ള കീകളില്‍ '%s'-ല്‍ നിന്നുള്ള ഒപ്പുകള്‍ വിശ്വസിക്കുന്നു" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "" -"'%s' ആണു് ഈ കീയുടെ ഉടമസ്ഥനെന്നു് നിങ്ങള്‍ വിശ്വസിക്കുന്നെങ്കില്‍, ഈ കീയില്‍ " -"ഒപ്പിടുക:" +"'%s' ആണു് ഈ കീയുടെ ഉടമസ്ഥനെന്നു് നിങ്ങള്‍ വിശ്വസിക്കുന്നെങ്കില്‍, ഈ കീയില്‍ ഒപ്പിടുക:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "ഈ ചാവിയില്‍ _ഒപ്പിടുക" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format -msgid "If you no longer trust that '%s' owns this key, revoke your signature:" -msgstr "'%s' ഈ കീയുടെ ഉടമസ്ഥനല്ലെന്നു് നിങ്ങള്‍ വിശ്വസിക്കുന്നെങ്കില്‍, നിങ്ങളുടെ ഒപ്പു് പിന്‍വലിക്കുക:" +msgid "" +"If you no longer trust that '%s' owns this key, revoke your signature:" +msgstr "" +"'%s' ഈ കീയുടെ ഉടമസ്ഥനല്ലെന്നു് നിങ്ങള്‍ വിശ്വസിക്കുന്നെങ്കില്‍, നിങ്ങളുടെ ഒപ്പു് പിന്‍വലിക്കുക:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Marginally" -msgstr "മാര്‍ജിനലി" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "ഒപ്പു് _പിന്‍വലിയ്ക്കുക" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -#: ../src/seahorse-key-manager-store.c:853 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "ഈ കീയില്‍ ഒപ്പിട്ട _വ്യക്തികള്‍:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "വിശ്വസിക്കുന്ന വ്യക്തികളുടെ ഒപ്പുകള്‍ മാത്രം _പ്രദര്‍ശിപ്പിക്കുക." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 msgid "Trust" msgstr "വിശ്വാസം" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 -msgid "Ultimately" -msgstr "അത്യന്തികമായി" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "You _Trust the Owner:" -msgstr "നിങ്ങള്‍ ഉടമസ്ഥനെ _വിശ്വസിക്കുന്നു:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "വിരലടയാളം:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "Your trust is manually specified on the Details tab." -msgstr "നിങ്ങളുടെ വിശ്വാസ്യത മാനുവലായി വിശദീകരണങ്ങള്‍ക്കുള്ള റ്റാബില്‍ നല്‍കുന്നു." - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Only display the signatures of people I trust" -msgstr "വിശ്വസിക്കുന്ന വ്യക്തികളുടെ ഒപ്പുകള്‍ മാത്രം _പ്രദര്‍ശിപ്പിക്കുക." - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Revoke Signature" -msgstr "ഒപ്പു് _പിന്‍വലിയ്ക്കുക" +msgid "Dates:" +msgstr "തീയതികള്‍:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgid "_Sign this Key" -msgstr "ഈ ചാവിയില്‍ _ഒപ്പിടുക" +msgid "Indicate Trust:" +msgstr "വിശ്വാസം കാണിക്കുക:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "നിങ്ങള്‍ ഉടമസ്ഥനെ _വിശ്വസിക്കുന്നു:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -2205,78 +1864,82 @@ msgstr "Subkey %d of %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Optional description of revocation" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "പിന്‍വ_ലിയ്ക്കുക" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "ചാവി പിന്‍വലിയ്ക്കുവാനുള്ള കാരണം" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_കാരണം:" -#: ../pgp/seahorse-signer.c:62 -msgid "You have no personal PGP keys that can be used to sign a document or message." +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Optional description of revocation" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "പിന്‍വ_ലിയ്ക്കുക" + +#: ../pgp/seahorse-signer.c:63 +msgid "" +"You have no personal PGP keys that can be used to sign a document or message." msgstr "ഒരു വിവരണം അല്ലെങ്കില്‍ സന്ദേശം ഒപ്പിടുന്നതിനുള്ള സ്വകാര്യ PGP കീകള്‍ ലഭ്യമല്ല." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "സന്ദേശം _ഒപ്പിടാനുപയോഗിയ്ക്കേണ്ട ചാവി:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "നിങ്ങള്‍ എത്രമാത്രം ഈ ചാവി പരിശോധിച്ചിട്ടുണ്ട്?" +msgid "Sign Key" +msgstr "കീ ഒപ്പിടുക..." #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "ഈ ഒപ്പു് മറ്റുള്ളവര്‍ എങ്ങനെ കാണുന്നു:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "ഒപ്പിട്ടുകൊണ്ടു് നിങ്ങള്‍ നിങ്ങളുടെ കീയുടെ വിശ്വാസ്യത സൂചിപ്പിക്കുന്നു:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "ചാവി ഒപ്പിടേണ്ടത്:" +msgid "Key Name" +msgstr "ചാവിയുടെ പേര്" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"സാധാരണയായി: നിങ്ങള്‍ ഈ കീയുടെ ഉടമസ്ഥതയെപ്പറ്റി പൊതുവേ ഒരു " -"ഉറപ്പാക്കല്‍ നടത്തിയിരിക്കുന്നു. ഉദാഹരണത്തിനു്, ഫോണിലൂടെ ഉടമസ്ഥനോടു് " -"നിങ്ങളുടെ കീ ഫിംഗര്‍പ്രിന്റ് വായിച്ചു കേള്‍പ്പിക്കാം." +msgid "How carefully have you checked this key?" +msgstr "നിങ്ങള്‍ എത്രമാത്രം ഈ ചാവി പരിശോധിച്ചിട്ടുണ്ട്?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "ചാവിയുടെ പേര്" +msgid "_Not at all" +msgstr "_ഒരിക്കലുമില്ല" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_അലസമായി" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_വളരെ സൂക്ഷ്മതയോടെ" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." msgstr "" -"ഒട്ടുമല്ല: അതായതു് ഈ കീയുടെ ഉടമസ്ഥനെ നിങ്ങള്‍ വിശ്വസിക്കുന്നു, " -"പക്ഷേ നിങ്ങള്‍ക്കിതുറപ്പാക്കുവാന്‍ സാധ്യമല്ല." +"ഒട്ടുമല്ല: അതായതു് ഈ കീയുടെ ഉടമസ്ഥനെ നിങ്ങള്‍ വിശ്വസിക്കുന്നു, പക്ഷേ " +"നിങ്ങള്‍ക്കിതുറപ്പാക്കുവാന്‍ സാധ്യമല്ല." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 msgid "" -"Very Carefully: Select this only if you are absolutely sure that this " -"key is genuine." +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." msgstr "" -"പ്രത്യേകം ശ്രദ്ധിച്ചു്: ഈ കീ ശരിയാണെന്നുറപ്പുണ്ടെങ്കില്‍ മാത്രം ഈ കീ " -"തെരഞ്ഞെടുക്കുക." - -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "ഒപ്പിട്ടുകൊണ്ടു് നിങ്ങള്‍ നിങ്ങളുടെ കീയുടെ വിശ്വാസ്യത സൂചിപ്പിക്കുന്നു:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "ഈ ഒപ്പു് പിന്നീടൊരിക്കല്‍ _പിന്‍വലിക്കാം." +"സാധാരണയായി: നിങ്ങള്‍ ഈ ചാവിയുടെ ഉടമസ്ഥതയെപ്പറ്റി പൊതുവേ ഒരു ഉറപ്പാക്കല്‍ " +"നടത്തിയിരിക്കുന്നു. ഉദാഹരണത്തിനു്, ഫോണിലൂടെ ഉടമസ്ഥനോടു് നിങ്ങളുടെ കീ ഫിംഗര്‍പ്രിന്റ് വായിച്ചു " +"കേള്‍പ്പിച്ചതാവാം." #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "കീ ഒപ്പിടുക..." +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "" +"പ്രത്യേകം ശ്രദ്ധിച്ചു്: ഈ കീ ശരിയാണെന്നുറപ്പുണ്ടെങ്കില്‍ മാത്രം ഈ കീ തെരഞ്ഞെടുക്കുക." #: ../pgp/seahorse-sign.xml.h:11 msgid "" @@ -2284,754 +1947,1197 @@ "personally check that the name on the key is correct. You should have also " "used email to check that the email address belongs to the owner." msgstr "" -"കീയിലുള്ള പേരു് ശരിയെന്നുറപ്പിക്കുന്നതിനായി ഒരു ഫോട്ടോ തിരിച്ചറിയല്‍ സംവിധാനം " -"നടത്തുക (പാസ്പോര്‍ട്ട്). ഈമെയില്‍ വിലാസം ശരിയെന്നുറപ്പിക്കുന്നതിനായി " -"അതും ഉപയോഗിച്ചു നോക്കുക." +"കീയിലുള്ള പേരു് ശരിയെന്നുറപ്പിക്കുന്നതിനായി ഒരു ഫോട്ടോ തിരിച്ചറിയല്‍ സംവിധാനം നടത്തുക " +"(പാസ്പോര്‍ട്ട്). ഈമെയില്‍ വിലാസം ശരിയെന്നുറപ്പിക്കുന്നതിനായി അതും ഉപയോഗിച്ചു നോക്കുക." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_അലസമായി" +msgid "How others will see this signature:" +msgstr "ഈ ഒപ്പു് മറ്റുള്ളവര്‍ എങ്ങനെ കാണുന്നു:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_ഒരിക്കലുമില്ല" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_മറ്റുള്ളവര്‍ ഒരു പക്ഷേ ഈ ഒപ്പു് കാണുന്നുണ്ടാവില്ല" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "ഈ ഒപ്പു് പിന്നീടൊരിക്കല്‍ _പിന്‍വലിക്കാം." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_ഒപ്പു്" +msgid "Sign key as:" +msgstr "ചാവി ഒപ്പിടേണ്ടത്:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_ഒപ്പിടുന്ന ആള്‍:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_വളരെ സൂക്ഷ്മതയോടെ" +msgid "_Sign" +msgstr "_ഒപ്പു്" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "സന്ദേശം _ഒപ്പിടാനുപയോഗിയ്ക്കേണ്ട ചാവി:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "വിവരം പുറത്തെടുക്കുന്നു" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നു" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "വിവരം ഇമ്പോര്‍ട്ട് ചെയ്യുന്നു" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "വിവരങ്ങള്‍ അയയ്ക്കുന്നു" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "ലഭ്യമല്ല" -#: ../pkcs11/seahorse-pkcs11-certificate.c:107 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:68 +#: ../pkcs11/seahorse-certificate.c:434 +msgid "Personal certificate and key" +msgstr "സ്വകാര്യ സാക്ഷ്യപത്രവും ചാവിയും" + +#: ../pkcs11/seahorse-certificate.c:437 +msgid "Personal certificate" +msgstr "സ്വകാര്യ സാക്ഷ്യപത്രം" + +#: ../pkcs11/seahorse-certificate.c:439 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "സാക്ഷ്യപത്രം" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "നിങ്ങള്‍ക്ക് '%s' സര്‍ട്ടീഫിക്കേറ്റ് എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:111 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "നിങ്ങള്‍ക്ക് %d സര്‍ട്ടീഫിക്കേറ്റ് എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -msgstr[1] "നിങ്ങള്‍ക്ക് %d സര്‍ട്ടീഫിക്കേറ്റുകള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "സാക്ഷ്യപത്രങ്ങള്‍ (DER രീതിയിലുള്ളത്)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "സാക്ഷ്യപത്രങ്ങള്‍" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 സാക്ഷ്യപത്രങ്ങളും ബന്ധപ്പെട്ട ചാവികളും" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "നിങ്ങള്‍ക്ക് %d സാക്ഷ്യപത്രം എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +msgstr[1] "നിങ്ങള്‍ക്ക് %d സാക്ഷ്യപത്രങ്ങള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:114 +msgid "Couldn't generate private key" +msgstr "സ്വകാര്യ ചാവി ഉണ്ടാക്കുവാനായില്ല" + +#: ../pkcs11/seahorse-pkcs11-generate.c:413 +#: ../pkcs11/seahorse-pkcs11-request.c:255 +msgid "Create" +msgstr "ഉണ്ടാക്കുക" + +#: ../pkcs11/seahorse-pkcs11-generate.c:506 +#: ../pkcs11/seahorse-private-key.c:178 +msgid "Private key" +msgstr "സ്വകാര്യ ചാവി" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +msgid "Used to request a certificate" +msgstr "ഒരു സാക്ഷ്യപത്രം ചോദിക്കാന്‍ ഉപയോഗിക്കുന്നു" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "ഒരു പുതിയ സ്വകാര്യ ചാവി ഉണ്ടാക്കുക" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "ലേബല്‍:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "സൂക്ഷിച്ച സ്ഥലം:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "ഈ ചാവി സ്ഥിരമായി ഇല്ലാതാക്കുമെന്നെനിക്കറിയാം" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "പേരില്ലാത്ത" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "സാക്ഷ്യപത്രം പുറത്തെടുക്കാന്‍ പറ്റുന്നില്ല" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "വെട്ടി നീക്കുവാന്‍ സാധ്യമായില്ല" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_പുറത്തെടുക്കുക" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "സാക്ഷ്യപത്രം പൂറത്തെടുക്കുക" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "ഈ സാക്ഷ്യപത്രമോ ചാവിയോ നീക്കം ചെയ്യുക" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "_സാക്ഷ്യപത്രം ചോദിക്കുക" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "സാക്ഷ്യപത്ര അപേക്ഷ തയ്യാറാക്കുക" + +#: ../pkcs11/seahorse-pkcs11-request.c:103 +msgid "Couldn't save certificate request" +msgstr "സാക്ഷ്യപത്ര അപേക്ഷ സൂക്ഷിക്കാന്‍ പറ്റിയില്ല" + +#: ../pkcs11/seahorse-pkcs11-request.c:126 +msgid "Save certificate request" +msgstr "സാക്ഷ്യപത്ര അപേക്ഷ സൂക്ഷിക്കുക" + +#: ../pkcs11/seahorse-pkcs11-request.c:137 +msgid "Certificate request" +msgstr "സാക്ഷ്യപത്ര അപേക്ഷ" + +#: ../pkcs11/seahorse-pkcs11-request.c:145 +msgid "PEM encoded request" +msgstr "PEM രീതിയിലുള്ള അപേക്ഷ" + +#: ../pkcs11/seahorse-pkcs11-request.c:193 +msgid "Couldn't create certificate request" +msgstr "സാക്ഷ്യപത്ര അപേക്ഷ ഉണ്ടാക്കാന്‍ പറ്റിയില്ല" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "സാക്ഷ്യപത്ര അപേക്ഷ രേഖ തയ്യാറാക്കുക" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "സാക്ഷ്യപത്രത്തിന്റെ അപേക്ഷയില്‍ വെച്ച പൊതു നാമം (CN)." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "പേരു് (പൊതു നാമം):" + +#: ../pkcs11/seahorse-private-key.c:131 +msgid "Unnamed private key" +msgstr "പേരില്ലാത്ത സ്വകാര്യ ചാവി" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" -msgstr "അടയാളവാക്ക്യം മാറ്റുക" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "അടയാളവാക്ക്യം ഉറപ്പാക്കുക" +msgstr "രഹസ്യവാക്ക്യം മാറ്റുക" #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "പുതിയ _രഹസ്യവാക്ക്യം" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" -msgstr "പുതിയ അടയാളവാക്ക്യം ഉറപ്പാക്കുക" +msgstr "പുതിയ രഹസ്യവാക്ക്യം ഉറപ്പാക്കുക" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "പുതിയ _അടയാളവാക്ക്യം" +msgid "Con_firm Passphrase:" +msgstr "_രഹസ്യവാക്ക്യം ഉറപ്പാക്കുക:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" -msgstr "നിങ്ങളുടെ അടയാളവാക്കും എന്‍ക്രിപ്ഷന്‍ കീകളും കൈകാര്യം ചെയ്യുക" +msgstr "നിങ്ങളുടെ രഹസ്യവാക്കും എന്‍ക്രിപ്ഷന്‍ കീകളും കൈകാര്യം ചെയ്യുക" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:853 -msgid "Passwords and Encryption Keys" -msgstr "അടയാളവാക്കും എന്‍ക്രിപ്ഷന്‍ കീകളും" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "മുന്നോട്ട് പോവുക" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "ഉണ്ടാക്കുവാനുള്ള വസ്തു ഏതു് തരമെന്നു് _തെരഞ്ഞെടുക്കുക:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "തു_ടരുക" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "പുതിയതു് ഉണ്ടാക്കുക..." - -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "തെരഞ്ഞെടുത്ത %d കീ" -msgstr[1] "തെരഞ്ഞെടുത്ത %d കീകള്‍" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "ഇംപോര്‍ട്ട് പരാജയം" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "എടുക്കുക" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "എടുക്കേണ്ട തീയതികള്‍:" -#: ../src/seahorse-key-manager.c:404 ../src/seahorse-key-manager.c:464 -#: ../src/seahorse-key-manager.c:527 ../src/seahorse-viewer.c:482 -msgid "Couldn't import keys" -msgstr "ചാവി എടുക്കുവാന്‍ സാധിച്ചില്ല" - -#: ../src/seahorse-key-manager.c:409 ../src/seahorse-viewer.c:487 -msgid "Imported keys" -msgstr "എടുത്ത ചാവികള്‍" - -#: ../src/seahorse-key-manager.c:458 -msgid "Importing keys" -msgstr "ചാവികള്‍ എടുക്കുന്നു" - -#: ../src/seahorse-key-manager.c:481 ../ssh/seahorse-ssh-operation.c:1017 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "ചാവി എടുക്കുക" -#: ../src/seahorse-key-manager.c:527 -msgid "Unrecognized key type, or invalid data format" -msgstr "അപരിചിതമായ തരത്തിലുള്ള കീ, അല്ലെങ്കില്‍ തെറ്റായ ഡേറ്റാ ശൈലി" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "എല്ലാം ചാവി ഫയലുകളും" -#: ../src/seahorse-key-manager.c:721 ../src/seahorse-keyserver-results.c:207 -msgid "_Remote" -msgstr "_ദൂരെയുള്ള" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "കളഞ്ഞ ടെക്സ്റ്റ്" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "ക്ലിപ്പ് ബോര്‍ഡിലുള്ള ടെക്സ്റ്റ്" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_പുതിയ" -#: ../src/seahorse-key-manager.c:723 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "ഈ പ്രോഗ്രാം അടയ്ക്കുക" -#: ../src/seahorse-key-manager.c:724 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_പുതിയ..." -#: ../src/seahorse-key-manager.c:725 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "ഒരു പുതിയ കീ അല്ലെങ്കില്‍ വസ്തു ഉണ്ടാക്കുക" -#: ../src/seahorse-key-manager.c:726 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "ഒരു പുതിയ കീ അല്ലെങ്കില്‍ വസ്തു ചേര്‍ക്കുക" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "എടുക്കുക..." -#: ../src/seahorse-key-manager.c:727 -msgid "Import from a file" -msgstr "ഒരു ഫയലില്‍ നിന്നും ഇംപോര്‍ട്ട് ചെയ്യുക" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "ഒരു ഫയലില്‍ നിന്നും ഇംപോര്‍ട്ട് ചെയ്യുക" + +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "ക്ലിപ്പ്ബോര്‍ഡില്‍ നിന്നും ഇംപോര്‍ട്ട് ചെയ്യുക" + +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "ചാവിക്കൂട്ടം _ഉപയോഗിച്ച്:" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "സൈഡ്ബാറില്‍ കാണിക്കുന്ന ചാവിക്കൂട്ടം കാണിക്കുക" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "സ്വകാര്യമായത് കാണിക്കുക" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "സ്വകാര്യ ചാവികള്‍, സാക്ഷ്യപത്രങ്ങള്‍, രഹസ്യവാക്കുകള്‍ മാത്രം കാണിക്കുക" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "_വിശ്വസ്ഥമായത് കാണിക്കുക" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "വിശ്വസ്ഥമായ ചാവികള്‍, സാക്ഷ്യപത്രങ്ങള്‍, രഹസ്യവാക്കുകള്‍ മാത്രം കാണിക്കുക" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "_എല്ലാം കാണിക്കുക" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "എല്ലാ ചാവികള്‍, സാക്ഷ്യപത്രങ്ങള്‍, രഹസ്യവാക്കുകള്‍ എന്നിവ കാണിക്കുക" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "അരിപ്പ" + +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "ആദ്യത്തെ തവണ ലഭ്യമാകുന്ന ഉപാധികള്‍:" + +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "നിങ്ങള്‍ക്ക് സ്വന്തമായി ഒരു ചാവി ഉണ്ടാക്കുക:" + +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "ഒരു ഫയലില്‍ നിന്നും നിലവിലുള്ള ചാവി എടുക്കുക:" + +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "എന്‍ക്രിപ്ഷന്‍ തുടങ്ങുന്നതിനായി നിങ്ങള്‍ക്കു് കീകള്‍ ആവശ്യമുണ്ടു്." + +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "പൂട്ടുവാന്‍ സാധിച്ചില്ല" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "തുറക്കാന്‍ സാധിച്ചില്ല" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_ലോക്ക് ചെയ്യുക" + +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_അണ്‍ലോക്ക് ചെയ്യുക" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_ഗുണഗണങ്ങള്‍" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "_സെക്യൂര്‍ ഷെല്‍ ചാവി ക്രമികരിക്കുക..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"മറ്റൊരു സിസ്റ്റത്തിലേക്ക് പബ്ലിക് സെക്യുര്‍ ഷെല്‍ കീ അയയ്ക്കുക. ആ കീ ഉപയോഗിച്ചു് പ്രവേശനം സജ്ജമാക്കുക." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "നിങ്ങളുടെ സെക്യൂര്‍ ഷെല്‍ അടയാളവാക്ക്യം നല്‍കുക" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "പഴയ ചാവി അടയാളവാക്ക്യം " + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr " %s: വേണ്ടി പഴയ അടയാളവാക്ക്യം നല്‍കുക" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "പുതിയ ചാവി അടയാളവാക്ക്യം " + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "%s: വേണ്ടി പുതിയ അടയാളവാക്ക്യം നല്‍കുക" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "%s: വേണ്ടി പുതിയ അടയാളവാക്ക്യം ഒരിക്കല്‍കൂടി നല്‍കുക" + +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "സുരക്ഷിത ഷെല്‍ ചാവി" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "മറ്റ് കമ്പ്യൂട്ടറുകളിലേയ്ക്കു് സുരക്ഷിതമായി ബന്ധിപ്പിക്കുന്നതിനായി ഉപയോഗിക്കുന്നു." + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "നിങ്ങള്‍ക്ക് '%s' സെക്യൂര്‍ ഷെല്‍ കീ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "നിങ്ങള്‍ക്ക് %d സുരക്ഷിത ഷെല്‍ ചാവികള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +msgstr[1] "നിങ്ങള്‍ക്ക് %d സുരക്ഷിത ഷെല്‍ ചാവികള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH ചാവി" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "രഹസ്യ സെക്യൂര്‍ ഷെല്‍ ചാവികള്‍" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "പൊതു SSH ചാവികള്‍" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "ഈ ചാവിക്ക് ഒരു പൊതു ചാവി പോലു ലഭ്യമല്ല." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "മറ്റ് കമ്പ്യൂട്ടറുകളിലേയ്ക്ക് പ്രവേശിക്കാന്‍ ഉപയോഗിക്കുന്നു (ഉദാ: ടെര്‍മിനല്‍ വഴി)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി ഉണ്ടാക്കുന്നു" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "പുതിയ സെക്യൂര്‍ ഷെല്‍ ചാവി" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "ചാവി ഉണ്ടാക്കിയാല്‍ _മാത്രം മതി" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_ഉണ്ടാക്കി സജ്ജീകരിക്കുക" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"SSH വഴി വിശ്വസനീയമായ കമ്പ്യൂട്ടറുകളിലേക്ക് സുരക്ഷിതമായി കണക്ട് ചെയ്യുന്നതിനു് ഒരു സെക്യുര്‍ ഷെല്‍ " +"(SSH) കീ സഹായിക്കുന്നു." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"നിങ്ങളുടെ ഈമെയില്‍ വിലാസം, ഈ കീ എന്തിനാണെന്നുള്ളതിനുള്ള റിമെയിണ്ടര്‍ എന്നിവ ഉപയോഗിക്കുക." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"നിങ്ങള്‍ക്കീ കീ ഉപയോഗിക്കുവാനുള്ള കമ്പ്യൂട്ടര്‍ നിലവിലുണ്ടെങ്കില്‍, നിങ്ങളുടെ കീ " +"തിരിച്ചറിയുന്നതിനായി ഇപ്പോള്‍ ആ കമ്പ്യൂട്ടര്‍ സജ്ജീകരിക്കാം." + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(ലഭ്യമല്ലാത്ത സെക്യുര്‍ ഷെല്‍ കീ)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "സ്വകാര്യ SSH ചാവി" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH ചാവി" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "ചാവിയുടെ പേര് മാറ്റുവാന്‍ സാധ്യമായില്ല." + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "ചാവിയ്ക്കുള്ള ആധികാരികത മാറ്റുവാന്‍ സാധ്യമായില്ല" + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "കീയ്ക്കുള്ള അടയാളവാക്ക്യം മാറ്റുവാന്‍ സാധ്യമായില്ല." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "ഐഡന്റിഫയര്‍:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "പേര്:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "മറ്റ് കമ്പ്യൂട്ടറുകളിലേയ്ക്കു് കണക്ട് ചെയ്യുന്നതിനായി ഉപയോഗിക്കുന്നു." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "വിശ്വാസം" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "ഈ കീയുടെ ഉടമസ്ഥനു് ഈ കമ്പ്യൂട്ടറിലേക്കു് കണക്ട് ചെയ്യുവാനുള്ള അധികാരമുണ്ടു്." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "ഇതു് %s അക്കൌണ്ടിനു് മാത്രമേ ബാധകമാകുകയുള്ളു ." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "ആല്‍ഗോരിതം:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "ശക്തി:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "സ്ഥാനം:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "പൂര്‍ണ്ണമായ ചാവി _പുറത്തെടുക്കുക" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH കമാന്‍ഡ് അപ്രതീക്ഷിതമായി അവസാനിച്ചു." + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH കമാന്‍ഡ് പരാജയപ്പെട്ടു." + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "റിമോട്ട് ഹോസ്റ്റ് അടയാളവാക്ക്" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "ചാവി അടയാളവാക്ക്യം നല്‍കുക" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "പുതിയ സെക്യൂര്‍ ഷെല്‍ ചാവിക്ക് വേണ്ടി അടയാളവാക്ക്യം " + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "ചാവി എടുക്കുന്നു: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "ചാവി എടുക്കുന്നു. അടയാളവാക്ക്യം നല്‍കുക" + +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH ചാവികള്‍" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "ഈ കീയ്ക്ക് ഒരു സ്വകാര്യ കീ ഫയലും ലഭ്യമല്ല." + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "റിമോട്ട് കമ്പ്യൂട്ടറില്‍ സെക്യൂര്‍ ഷെല്‍ ചാവി ക്രമികരിയ്ക്കുവാന്‍ സാധ്യമായില്ല." + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി ക്രമികരിക്കുക..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "SSH കണക്ഷനു വേണ്ടി കമ്പ്യൂട്ടര്‍ സജ്ജീകരിക്കുക" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"SSH ഉപയോഗിക്കുന്ന മറ്റൊരു കമ്പ്യൂട്ടറിലേക്കു് നിങ്ങളുടെ സെക്യുര്‍ ഷെല്‍ കീ ഉപയോഗിക്കണമെങ്കില്‍, " +"നിങ്ങള്‍ക്കു് ആ കമ്പ്യൂട്ടറില്‍ ഒരു ലോഗിന്‍ അക്കൌണ്ടു് ഉണ്ടായിരിക്കണം" + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "ഉദാ: fileserver.example.com:port" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "_കമ്പ്യൂട്ടറിന്റെ പേരു്:" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "_അകത്തുകയറുന്നതിനുള്ള പേരു്:" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "_സജ്ജീകരണം" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "സീഹോഴ്സ്-ഡെമണ്‍ നിരന്തരപ്രക്രിയയായി പ്രവര്‍ത്തിപ്പിക്കരുതു്" + +#~ msgid "couldn't fork process" +#~ msgstr "പ്രക്രിയ ഫോര്‍ക്ക് ചെയ്യുവാന്‍ സാധിച്ചില്ല" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "എന്‍ക്രിപ്ഷനുള്ള നിരന്തരപ്രവൃത്തി (സീഹോഴ്സ്)" + +#~ msgid "Seahorse Daemon" +#~ msgstr "Seahorse ഡെമണ്‍" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "%s: തെറ്റായ അല്ലെങ്കില്‍ തിരിച്ചറിയാത്ത ചാവിയുടെ തരം" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "തെറ്റായ അല്ലെങ്കില്‍ തിരിച്ചറിയാത്ത ചാവി: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr "ഒപ്പിട്ടത് സമാപിച്ചത് %s-ന്." + +#~ msgid "Invalid Signature" +#~ msgstr "അസാധുവായ ഒപ്പു്" + +#~ msgid "Signed by on %s Expired." +#~ msgstr "ഒപ്പിട്ടത് %s-ന് സമാപിച്ചു." + +#~ msgid "Expired Signature" +#~ msgstr "കാലാവധി അവസാനിച്ച ഒപ്പു്" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr "ഒപ്പിട്ടത് പിന്‍വലിച്ചതു്%s-ന് ." + +#~ msgid "Revoked Signature" +#~ msgstr "പിന്‍വലിച്ച ഒപ്പു്" + +#~ msgid "Signed by on %s." +#~ msgstr "ഒപ്പിട്ടത് %s-ന് ." + +#~ msgid "Good Signature" +#~ msgstr "നല്ല ഒപ്പു്" + +#~ msgid "Signing key not in keyring." +#~ msgstr "ഒപ്പിടുന്ന ചാവി ചാവിക്കൂട്ടത്തില്‍ ഇല്ല" + +#~ msgid "Unknown Signature" +#~ msgstr "അറിയപ്പെടാത്ത ഒപ്പു്" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "തെറ്റായ അല്ലെങ്കില്‍ കള്ള ഒപ്പു്. ഒപ്പിട്ട വിവരങ്ങള്‍ തിരുത്തിയിട്ടുണ്ടു്." + +#~ msgid "Bad Signature" +#~ msgstr "തെറ്റായ ഒപ്പു്" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "%s :ഇടുന്നത് തെറ്റായ അല്ലെങ്കില്‍ തിരിച്ചറിയാത്ത ഒപ്പു്" + +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "%s :ഒപ്പിടുന്നതിനായി ചാവി അസാധുവാണ്" + +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "അസാധു അല്ലെങ്കില്‍ അപരിചിതമായ സ്വീകരിക്കുന്നയാള്‍ : %s" + +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "എന്‍ക്രിപ്ഷനുള്ള ശരിയായ റസിപ്യന്റല്ല കീ: %s" + +#~ msgid "No recipients specified" +#~ msgstr "റെസീപ്യന്റുകള്‍ വ്യക്തമാക്കിയിട്ടില്ല" + +#~ msgid "No signer specified" +#~ msgstr "ഒപ്പിടുന്ന ആള് വ്യക്തമായിട്ടില്ല" + +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "%s: ഡീക്രിപ്റ്റ്ചെയ്യുന്നതിനായി തെറ്റായ ചാവിയുടെ തരം" + +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "ഉറപ്പാക്കുന്നതിനു് തെറ്റായ കീ തരം: %s" + +#~ msgid "Invalid key id: %s" +#~ msgstr "തെറ്റായ key id: %s" + +#~ msgid "Couldn't share keys" +#~ msgstr "ചാവികള്‍ പങ്ക് വയ്ക്കുവാന്‍ കഴിഞ്ഞില്ല" + +#~ msgid "Can't publish discovery information on the network." +#~ msgstr "നെറ്റ്‌വര്‍ക്കില്‍ കണ്ടുപിടിച്ച വിവരങ്ങള്‍ പ്രസിദ്ധീകരിക്കുവാന്‍ സാധ്യമല്ല." + +#~ msgid "%s's encryption keys" +#~ msgstr "%s-ന്റെ എന്‍ക്രിപ്ഷന്‍ ചാവികള്‍" + +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "വിദൂര PGP കീകള്‍ തെരയുന്നതിനുള്ള കീ സര്‍വറുകളുടെ യുആര്‍ഐകളുടെ ലിസ്റ്റ്. പിന്നീടുള്ള " +#~ "പതിപ്പുകളില്‍, ഒരു സ്പെയിസ് നല്‍കി പേരു് ചേര്‍ത്തു് ഒരു നാമം നല്‍കുവാന്‍ സാധിക്കുന്നു." + +#~ msgid "Auto Retrieve Keys" +#~ msgstr "ചാവികള്‍ സ്വയം ലഭ്യമാക്കുക" + +#~ msgid "Auto Sync Keys" +#~ msgstr "ഓട്ടോ സിംക് ചാവികള്‍" + +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "കീ പാലകനുള്ള കാലാവധിയുടെ അവസാനത്തിനുള്ള നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." + +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "കീ പാലകനുള്ള വിശ്വസ്തതയ്ക്കുള്ള നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." + +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "കീ പാലകനുള്ള ഏതു് തരം നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." + +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "കീ പാലകനുള്ള കാലാവധി നിരയുടെ ദൃശ്യത നിയന്ത്രിക്കുന്നു." + +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "DNS-SD പങ്കുവയ്ക്കല്‍ സാധ്യമാക്കുക" + +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "കീകളുടെ DNS-SD (Apple Bonjour) പങ്കിടല്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുന്നു. seahorse-daemon " +#~ "പ്രവര്‍ത്തനത്തിലായിരിക്കണം. കൂടാതെ, HKP, DNS-SD പിന്തുണയുണ്ടായിരിക്കണം." + +#~ msgid "ID of the default key" +#~ msgstr "സഹജമായ ചാവിയുടെ ഐഡി" + +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "true ആയി സജ്ജമാക്കിയാല്‍, seahorse ഉപയോഗിച്ചു് എന്‍ക്രിപ്റ്റ് ചെയ്ത ഫയലുകള്‍ ASCII ആര്‍മര്‍ " +#~ "എന്‍കോഡഡായിരിക്കും." -#: ../src/seahorse-key-manager.c:729 -msgid "Import from the clipboard" -msgstr "ക്ലിപ്പ്ബോര്‍ഡില്‍ നിന്നും ഇംപോര്‍ട്ട് ചെയ്യുക" +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "true ആയി സജ്ജമാക്കിയാല്‍, എന്‍ക്രിപ്ഷന്‍ റെസിപ്യന്റുകളുടെ പട്ടികയിലേക്ക് സ്വതവേയുള്ള കീ " +#~ "എപ്പോഴും ചേര്‍ക്കുന്നു." -#: ../src/seahorse-key-manager.c:734 ../src/seahorse-keyserver-results.c:217 -msgid "_Find Remote Keys..." -msgstr "ദൂരെയുള്ള ചാവികള്‍ _കണ്ടുപിടിക്കുക..." +#~ msgid "Last key server search pattern" +#~ msgstr "അവസാന ചാവി സെര്‍വറിന്റെ തിരച്ചില്‍ മാതൃക" -#: ../src/seahorse-key-manager.c:735 ../src/seahorse-keyserver-results.c:218 -msgid "Search for keys on a key server" -msgstr "ചാവി സെര്‍വറില്‍ ചാവി തെരയുക" +#~ msgid "Last key servers used" +#~ msgstr "അവസാനമായി ഉപയോഗിച്ച ചാവി സെര്‍വറുകള്‍" -#: ../src/seahorse-key-manager.c:736 -msgid "_Sync and Publish Keys..." -msgstr "കീകള്‍ _സിന്‍ക് ചെയ്തു് പബ്ലിഷ് ചെയ്യുക..." +#~ msgid "Last key used to sign a message." +#~ msgstr "അവസാനമായി സന്ദേശം ഒപ്പു് വയ്ക്കാന്‍ ഉപയോഗിച്ച ചാവി" -#: ../src/seahorse-key-manager.c:737 -msgid "Publish and/or synchronize your keys with those online." -msgstr "ഓണ്‍ലൈനുള്ളവയുമായി നിങ്ങളുടെ കീകള്‍ പബ്ലിഷ് അല്ലെങ്കില്‍ സിന്‍ക്രൊണൈസ് ചെയ്യുക." +#~ msgid "PGP Key servers" +#~ msgstr "PGP ചാവി സെര്‍വറുകള്‍" -#: ../src/seahorse-key-manager.c:742 -msgid "T_ypes" -msgstr "ത_രങ്ങള്‍" - -#: ../src/seahorse-key-manager.c:742 -msgid "Show type column" -msgstr "തരങ്ങള്‍ക്കുള്ള നിര കാണിക്കുക" - -#: ../src/seahorse-key-manager.c:744 -msgid "_Expiry" -msgstr "_കലാവധി തീരുന്നതു്" - -#: ../src/seahorse-key-manager.c:744 -msgid "Show expiry column" -msgstr "കാലാവധി തീരുന്നതിനുള്ള നിര കാണിക്കുക" - -#: ../src/seahorse-key-manager.c:746 -msgid "_Trust" -msgstr "_വിശ്വാസ്യത" - -#: ../src/seahorse-key-manager.c:746 -msgid "Show owner trust column" -msgstr "ഉടമസ്ഥ വിശ്വാസ്യതയ്ക്കുള്ള നിര കാണിക്കുക" - -#: ../src/seahorse-key-manager.c:748 -msgid "_Validity" -msgstr "_കാലാവധി" - -#: ../src/seahorse-key-manager.c:748 -msgid "Show validity column" -msgstr "കാലാവധിയ്ക്കുള്ള നിര കാണിക്കുക" - -#: ../src/seahorse-key-manager.c:922 -msgid "Filter:" -msgstr "ഫില്‍‌റ്റര്‍:" +#~ msgid "Publish keys to this key server." +#~ msgstr "ഈ ചാവി സെര്‍വറിലേക്ക് ചാവികള്‍ അറിയിക്കുക." -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "ആദ്യത്തെ തവണ ലഭ്യമാകുന്ന ഉപാധികള്‍:" +#~ msgid "Show expires column in key manager" +#~ msgstr "കീ പാലകനില്‍ കാലാവധി തീരുന്നതിനുള്ള നിര കാണിക്കുക" -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "നിങ്ങള്‍ക്ക് സ്വന്തമായി ഒരു ചാവി ഉണ്ടാക്കുക:" +#~ msgid "Show trust column in key manager" +#~ msgstr "കീ പാലകനില്‍ വിശ്വസ്തതയുടെ നിര കാണിക്കുക" -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "ഒരു ഫയലില്‍ നിന്നും നിലവിലുള്ള ചാവി എടുക്കുക:" +#~ msgid "Show type column in key manager" +#~ msgstr "കീ പാലകനില്‍ ഏതു് തരം എന്നതിനുള്ള നിര കാണിക്കുക" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "എന്റെ _സ്വകാര്യ ചാവികള്‍" +#~ msgid "Show validity column in key manager" +#~ msgstr "കീ പാലകനില്‍ കാലാവധിയ്ക്കുള്ള നിര കാണിക്കുക" -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "മറ്റുള്ള _ചാവികള്‍" +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "റെസിപ്യെന്റ് ജാലകം ക്രമത്തിലാക്കുവാനുള്ള നിര വ്യക്തമാക്കുക. നിരകള്‍: 'പേരു്' and 'id'. " +#~ "കൂടുതലില്‍ നിന്നും കുറവിലേക്കെന്ന ക്രമത്തിലാക്കുന്നതിനായി നിരയുടെ പേരിനു് മുമ്പു് '-' ചേര്‍ക്കുക." -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "എന്‍ക്രിപ്ഷന്‍ തുടങ്ങുന്നതിനായി നിങ്ങള്‍ക്കു് കീകള്‍ ആവശ്യമുണ്ടു്." +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "seahorse കീ മാനേജര്‍ പ്രധാന ജാലകം ക്രമത്തിലാക്കുന്നതിനുള്ള നിര വ്യക്തമാക്കുക. നിരകള്‍: " +#~ "'പേരു്', 'id', 'കാലാവധി', 'കാലാവധിയുടെ അവസാനം', 'വിശ്വാസ്യത', 'ഏതു് തരം'. കൂടുതലില്‍ " +#~ "നിന്നും കുറവിലേക്കെന്ന ക്രമത്തിലാക്കുന്നതിനായി നിരയുടെ പേരിനു് മുമ്പു് '-' ചേര്‍ക്കുക." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:546 -msgid "_Import" -msgstr "_എടുക്കുക" +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "അവസാനമായി സന്ദേശം ഒപ്പു് വയ്ക്കാന്‍ ഉപയോഗിച്ച രഹസ്യ ചാവിയുടെ ID" -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_അടയാളവാക്കുകള്‍" +#~ msgid "The column to sort the recipients by" +#~ msgstr "റെസിപ്യെന്റുകള്‍ ഏതു് നിരയനുസരിച്ചു് ക്രമത്തിലാക്കണം" -#: ../src/seahorse-key-manager-store.c:648 ../src/seahorse-viewer.c:282 -msgid "Couldn't export keys" -msgstr "ചാവികള്‍ പുറത്തെടുക്കാന്‍ കഴിഞ്ഞില്ല" +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "seahorse കീകള്‍ ഏതു് നിരയനുസരിച്ചു് ക്രമത്തിലാക്കണം" -#: ../src/seahorse-key-manager-store.c:846 -msgid "Validity" -msgstr "കാലാവധി" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:865 -msgid "Expiration Date" -msgstr "കാലാവധി തീരുന്നത്" +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "PGP കീകള്‍ പബ്ലിഷ് ചെയ്യേണ്ട കീ സര്‍വര്‍. അല്ലെങ്കില്‍, PGP കീകളുടെ പബ്ലിഷിങ് " +#~ "നിര്‍ത്തുന്നതിനായി കാലിയാക്കുക." -#: ../src/seahorse-keyserver-results.c:209 -msgid "Close this window" -msgstr "ഈ ജാലകം അടയ്ക്കുക" +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "അവസാന തെരച്ചില്‍ നടത്തിയ കീ സര്‍വര്‍ അല്ലെങ്കില്‍ എല്ലാ കീ സര്‍വറുകളും കാലിയാക്കുക." -#: ../src/seahorse-keyserver-results.c:210 -msgid "_Expand All" -msgstr "എല്ലാം _വികസിപ്പിയ്ക്കുക" - -#: ../src/seahorse-keyserver-results.c:211 -msgid "Expand all listings" -msgstr "എല്ലാ പട്ടികകളും വികസിപ്പിക്കുക" - -#: ../src/seahorse-keyserver-results.c:212 -msgid "_Collapse All" -msgstr "എല്ലാം _കൂട്ടിച്ചേ‌ര്‍ക്കുക" - -#: ../src/seahorse-keyserver-results.c:213 -msgid "Collapse all listings" -msgstr "എല്ലാ ലിസ്റ്റിങുകളും കൂട്ടിചേര്‍ക്കുക" +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "ഒരു കീ സര്‍വറിനായി തെരയുന്ന അവസാന തെരച്ചില്‍ മാതൃക." -#: ../src/seahorse-keyserver-results.c:275 -msgid "Remote Keys" -msgstr "ദൂരെയുള്ള ചാവികള്‍" +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "ഒപ്പിടല്‍ പോലുള്ള ചില പ്രക്രിയകള്‍ക്കുപയോഗിക്കുന്ന സ്വതവേയുള്ള കീ ഇതു് വ്യക്തമാക്കുന്നു." -#: ../src/seahorse-keyserver-results.c:277 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "'%s' ഉള്ള റിമോട്ട് കീകള്‍" +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "കീ സര്‍വറുളില്‍ നിന്നും കീകള്‍ സ്വയമായി ലഭ്യമാക്കണമോ എന്നു്" -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "ചാവി സെര്‍വറുകള്‍:" +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "" +#~ "മാറ്റം വരുത്തിയ കീകള്‍ സ്വയമായി സ്വതവേയുള്ള കീ സര്‍വറുമായി സിന്‍ക് ചെയ്യണമോ വേണ്ടയോ എന്നു്" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "അടുത്തുള്ള പങ്കിടുന്ന കീകള്‍:" +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "എപ്പോഴും സ്വതവേയുള്ള കീ എന്‍ക്രിപ്റ്റ് ചെയ്യണമോ എന്നു്" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "റിമോട്ട് ആയ ചാവി കണ്ടുപിടിക്കുക" +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "ASCII ആര്‍മര്‍ ഉപയോഗിക്കണമോ എന്നു്" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"ഇന്റര്‍നെറ്റില്‍ മറ്റുള്ളവര്‍ക്കുള്ള കീകള്‍ ഇതു് ലഭ്യമാക്കുന്നു. ഇവ പിന്നീടു് നിങ്ങളുടെ " -"ലോക്കല്‍ കീറിങിലേക്ക് ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധിക്കുന്നു." +#~ msgid "Web Password" +#~ msgstr "വെബ് അടയാളവാക്കു്" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "എവിടെ തിരയണം:" +#~ msgid "Couldn't set application access." +#~ msgstr "പ്രയോഗത്തിലേക്കുള്ള പ്രവേശനം സജ്ജമാക്കുവാന്‍ സാധ്യമായില്ല." -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_തെരയുക" +#~ msgid "Path:" +#~ msgstr "വഴി:" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "ഇതടങ്ങുന്ന കീകള്‍ക്കായി _തെരയുക: " +#~ msgid "Permissions:" +#~ msgstr "അനുവാദങ്ങള്‍:" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "സെര്‍വറില്‍ ചാവികള്‍ അറിയിക്കുവാനായില്ല" +#~ msgid "Applications" +#~ msgstr "പ്രയോഗങ്ങള്‍" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "സെര്‍വറില്‍ നിന്നും ചാവി ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല: %s" +#~ msgid "_Read" +#~ msgstr "_വായിക്കുക" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "സിന്‍ക്രൊണൈസ് ചെയ്യുന്നതിനായി %d കീ തെരഞ്ഞെടുത്തു" -msgstr[1] "സിന്‍ക്രൊണൈസ് ചെയ്യുന്നതിനായി %d കീകള്‍ തെരഞ്ഞെടുത്തു" +#~ msgid "_Write" +#~ msgstr "_എഴുതുക" -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "കീകള്‍ സിന്‍ക്രണൈസ് ചെയ്യുന്നു" +#~ msgid "Passwords: %s" +#~ msgstr "പാസ്‌വേര്‍ഡുകള്‍: %s" -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "കീകള്‍ സിന്‍ക്രണൈസ് ചെയ്യുന്നു..." +#~ msgid "Passwords: %s" +#~ msgstr "അടയാളവാക്കു്: %s" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "X keys are selected for synchronizing" -msgstr "സിന്‍ക്രൊണൈസ് ചെയ്യുന്നതിനായി X കീകള്‍ തെരഞ്ഞെടുത്തു" +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "അടയാളവാക്കിനുള്ള സംഭരണ കീറിങ് പൂട്ടി അതു് തുറക്കുന്നതിനായി ഒരു പ്രധാന അടയാളവാക്ക് " +#~ "ഉപയോഗിക്കുക." -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "Sync Keys" -msgstr "ചാവികള്‍ സിംക് ചെയ്യുക" +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "അടയാളവാക്കിനുള്ള സംഭരണ കീറിങ് ഒരു പ്രധാന അടയാളവാക്കുപയോഗിച്ചു് അണ്‍ലോക്ക് ചെയ്യുക, അങ്ങനെ " +#~ "അവ ഉപയോഗിക്കുവാന്‍ സാധിക്കുന്നു." -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"ഇതു് നിങ്ങളുടെ കീറിങില്‍ കീകള്‍ പബ്ലിഷ് ചെയ്യുന്നു. അങ്ങനെ അവ മറ്റുള്ളവര്‍ക്കുപയോഗത്തിനായി " -"ലഭിക്കുന്നു. അവരുടെ കീകള്‍ നിങ്ങള്‍ ലഭിച്ചതിനു് ശേഷം അവര്‍ വരുത്തിയ മാറ്റങ്ങളും നിങ്ങള്‍ക്കു് " -"ലഭിക്കുന്നു." +#~ msgid "Access to the key ring was denied" +#~ msgstr "ചാവിക്കൂട്ടത്തിലേക്കുള്ള പ്രവേശനം നിഷേധിച്ചിരിക്കുന്നു" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"മറ്റുള്ളവരുടെ കീകള്‍ നിങ്ങള്‍ക്കു് ലഭ്യമായതിനു് ശേഷം അവര്‍ വരുത്തിയ മാറ്റങ്ങള്‍ " -"ഇതു് ലഭ്യമാക്കുന്നു. പബ്ലിഷ് ചെയ്യുന്നതിനായി ഒരു കീ സര്‍വറും തെരഞ്ഞെടുത്തിട്ടില്ല, " -"അതിനാല്‍ നിങ്ങളുടെ കീ മറ്റുള്ളവര്‍ക്ക് ലഭ്യമാകുന്നതല്ല." +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "ഗ്നോം-ചാവിക്കൂട്ടം പ്രവര്‍ത്തിക്കുന്നില്ല" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Key Servers" -msgstr "_ചാവി സെര്‍വറുകള്‍" +#~ msgid "The key ring has already been unlocked" +#~ msgstr "ഈ ചാവിക്കൂട്ടം ഇതിനുമുമ്പേ തുറന്നിട്ടുണ്ടു്" -#: ../src/seahorse-keyserver-sync.xml.h:6 -msgid "_Sync" -msgstr "_സിംക് ചെയ്യുക" +#~ msgid "No such key ring exists" +#~ msgstr "ഇങ്ങനെ ഒരു ചാവിക്കൂട്ടം നിലവിലില്ല" -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "ഈ പ്രയോഗത്തിന്റെ പതിപ്പു്" +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "ചാവിക്കൂട്ടത്തിനുള്ള നിരന്തരപ്രക്രിയയുമായി ആശയവിനിമയം നടത്താന്‍ സാധിക്കുന്നില്ല" -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:170 -msgid "Encryption Key Manager" -msgstr "എന്‍ക്രിപ്ഷന്‍ കീ മാനേജര്‍‌" +#~ msgid "The item already exists" +#~ msgstr "ഈ ഇനം ഇതിനു് മുമ്പേ നിലവിലുണ്ടു്" -#: ../src/seahorse-viewer.c:141 -msgid "Contributions:" -msgstr "സംഭാവന ചെയ്തവര്‍:" +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "ഗ്നോം-ചാവിക്കൂട്ടത്തിലേക്ക് പ്രവേശിയ്ക്കുമ്പോള്‍ ആന്തരികമായ തെറ്റ്" -#: ../src/seahorse-viewer.c:172 -msgid "translator-credits" -msgstr "Ani Peter|അനി പീറ്റര്‍ " +#~ msgid "Saving item..." +#~ msgstr "ഇനം സൂക്ഷിക്കുന്നു..." -#: ../src/seahorse-viewer.c:175 -msgid "Seahorse Project Homepage" -msgstr "Seahorse സംരംഭത്തിനുള്ള പ്രധാനതാള്‍" +#~ msgid "Deleting item..." +#~ msgstr "വസ്തു വെട്ടിനീക്കുന്നു..." -#. Top menu items -#: ../src/seahorse-viewer.c:194 -msgid "_File" -msgstr "_ഫയല്‍" +#~ msgid "Deleting keyring..." +#~ msgstr "കീറിങ് വെട്ടിനീക്കുന്നു..." -#: ../src/seahorse-viewer.c:195 -msgid "_Edit" -msgstr "_ചിട്ടപ്പെടുത്തുക" +#~ msgid "Listing password keyrings" +#~ msgstr "പാസ്‌വേര്‍ഡ് കീറിങുകള്‍ ലഭ്യമാക്കുന്നു" -#: ../src/seahorse-viewer.c:196 -msgid "_View" -msgstr "_കാഴ്ച" +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "നിങ്ങള്‍ ആവശ്യപ്പെട്ടതു് നടത്തുന്നതിനുള്ള എന്‍ക്രിപ്ഷന്‍ കീകള്‍ ലഭ്യമായില്ല. അടയാളവാക്കുകളും " +#~ "എന്‍ക്രിപ്ഷന്‍ കീകളും എന്ന പ്രോഗ്രം ഇപ്പോള്‍ ആരംഭിക്കുന്നു. അങ്ങനെ നിങ്ങള്‍ക്കു് ഒരു കീ " +#~ "ഉണ്ടാക്കാം അല്ലെങ്കില്‍ ഒരെണ്ണം ഇംപോര്‍ട്ട് ചെയ്യക." -#: ../src/seahorse-viewer.c:197 -msgid "_Help" -msgstr "_സഹായം" +#~ msgid "All Keys" +#~ msgstr "എല്ലാ ചാവികളും" -#: ../src/seahorse-viewer.c:199 -msgid "Prefere_nces" -msgstr "_മുന്‍ഗണനകള്‍" +#~ msgid "Selected Recipients" +#~ msgstr "തെരഞ്ഞെടുത്ത റെസീപ്യന്റുകള്‍" -#: ../src/seahorse-viewer.c:200 -msgid "Change preferences for this program" -msgstr "ഈ പ്രോഗ്രാമിനുള്ള മുന്‍ഗണനകള്‍ മാറ്റുക" +#~ msgid "Search Results" +#~ msgstr "ഫലങ്ങള്‍ തെരയുക" -#: ../src/seahorse-viewer.c:203 -msgid "About this program" -msgstr "ഈ പ്രോഗ്രാമിനെക്കുറിച്ചു്" +#~ msgid "Search _for:" +#~ msgstr "തെരയേണ്ട_തു്:" -#: ../src/seahorse-viewer.c:204 -msgid "_Contents" -msgstr "_ഉള്ളടക്കം" +#~ msgid "None (Don't Sign)" +#~ msgstr "ഒന്നുമില്ല (ഒപ്പിടരുത്)" -#: ../src/seahorse-viewer.c:205 -msgid "Show Seahorse help" -msgstr "Seahorse സഹായം കാണിക്കുക" +#~ msgid "Sign this message as %s" +#~ msgstr "ഈ സന്ദേശം %s ആയി ഒപ്പിടുക" -#: ../src/seahorse-viewer.c:302 -msgid "Export public key" -msgstr "പബ്ലിക് കീ എക്സ്പോര്‍ട്ട് ചെയ്യുക" +#~ msgid "_Sign message as:" +#~ msgstr "ഈ സന്ദേശം _ഒപ്പിടേണ്ടതു്:" -#: ../src/seahorse-viewer.c:320 -msgid "Exporting keys" -msgstr "കീകള്‍ എക്സ്പോര്‍ട്ട് ചെയ്യുന്നു" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ഫയല്‍ ഒരു ശരിയായ .desktop ഫയല്‍ അല്ല" -#: ../src/seahorse-viewer.c:345 -msgid "Couldn't retrieve data from key server" -msgstr "കീ സെര്‍വറില്‍ നിന്നും ഡേറ്റാ ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "അപരിചിതമായ പണിയിട ഫയല്‍ പതിപ്പു് '%s'" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:364 -msgid "Copied keys" -msgstr "പകര്‍ത്തിയ കീകള്‍" +#~ msgid "Starting %s" +#~ msgstr "%s ആരംഭിക്കുന്നു" -#: ../src/seahorse-viewer.c:384 -msgid "Retrieving keys" -msgstr "കീകള്‍ ലഭ്യമാക്കുന്നു" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "കമാന്‍ഡ് ലൈനില്‍ പ്രയോഗങ്ങള്‍ രേഖകള്‍ സ്വീകരിക്കുന്നില്ല" -#: ../src/seahorse-viewer.c:399 -msgid "Couldn't delete." -msgstr "വെട്ടി നീക്കുവാന്‍ സാധ്യമായില്ല." +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "അപരിചിതമായ ലഭ്യമാക്കുന്ന ഉപാധി: %d" -#: ../src/seahorse-viewer.c:433 -msgid "Deleting..." -msgstr "വെട്ടി നീക്കുന്നു..." +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "'Type=Link' പണിയിട എന്‍ട്രിയിലേക്ക് രേഖകളുടെ യുആര്‍ഐകള്‍ നല്‍കുവാന്‍ സാധ്യമല്ല" -#: ../src/seahorse-viewer.c:459 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s ഒരു സ്വകാര്യ കീയാണു്. നിങ്ങള്‍ക്കു് തുടരണമെന്നു് ഉറപ്പാണോ?" +#~ msgid "Not a launchable item" +#~ msgstr "ലഭ്യമാക്കുവാന്‍ സാധിക്കുന്ന വസ്തു അല്ല" -#: ../src/seahorse-viewer.c:507 -msgid "Importing keys from key servers" -msgstr "ചാവി സെര്‍വറുകളില്‍ നിന്നും ചാവി എടുക്കുന്നു" +#~ msgid "Disable connection to session manager" +#~ msgstr "സെഷന്‍ മാനേജറിലേക്കുള്ള കണക്ഷന്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക" -#: ../src/seahorse-viewer.c:533 -msgid "Show properties" -msgstr "ഗുണഗണങ്ങള്‍ കാണിക്കുക" +#~ msgid "Specify file containing saved configuration" +#~ msgstr "സൂക്ഷിച്ചിട്ടുള്ള ക്രമീകരണം അടങ്ങുന്ന ഫയല്‍ നല്‍കുക" -#: ../src/seahorse-viewer.c:534 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_വെട്ടി മാറ്റുക" +#~ msgid "FILE" +#~ msgstr "FILE" -#: ../src/seahorse-viewer.c:535 -msgid "Delete selected items" -msgstr "തെരഞ്ഞെടുത്ത വസ്തുക്കള്‍ വെട്ടിനീക്കുക" +#~ msgid "Specify session management ID" +#~ msgstr "സെഷന്‍ മാനേജ്മെന്റ് ID നല്‍കുക" -#: ../src/seahorse-viewer.c:539 -msgid "E_xport..." -msgstr "_എക്സ്പോര്‍ട്ട് ചെയ്യുക..." +#~ msgid "Session management options:" +#~ msgstr "സെഷന്‍ മാനേജ്മെന്റ് ഉപാധികള്‍:" -#: ../src/seahorse-viewer.c:540 -msgid "Export to a file" -msgstr "ഒരു ഫയലിലേക്കു് എക്സ്പോര്‍ട്ട് ചെയ്യുക" +#~ msgid "Show session management options" +#~ msgstr "സെഷന്‍ മാനേജ്മെന്റ് ഉപാധികള്‍ കാണിക്കുക" -#: ../src/seahorse-viewer.c:542 -msgid "Copy to the clipboard" -msgstr "ക്ലിപ്പ്ബോര്‍ഡിലേക്കു് പകര്‍ത്തുക" +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "എടുത്ത ചാവി" +#~ msgstr[1] "എടുത്ത ചാവികള്‍" -#: ../src/seahorse-viewer.c:547 -msgid "Import selected keys to local key ring" -msgstr "തിരഞ്ഞെടുത്ത ചാവികള്‍ പ്രാദേശിക ചാവിക്കൂട്ടത്തിലേയ്ക്കു് എടുക്കുക" +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "എടുത്ത %i ചാവി" +#~ msgstr[1] "എടുത്ത %i ചാവികള്‍" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "നിങ്ങളുടെ സെക്യൂര്‍ ഷെല്‍ അടയാളവാക്ക്യം നല്‍കുക" +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "ഒരു കീ ഇംപോര്‍ട്ട് ചെയ്തു" +#~ msgstr[1] "കീകള്‍ ഇംപോര്‍ട്ട് ചെയ്തു" -#: ../ssh/seahorse-ssh-commands.c:85 -msgid "Configure Key for _Secure Shell..." -msgstr "_സെക്യൂര്‍ ഷെല്‍ ചാവി ക്രമികരിക്കുക..." +#~ msgid "Notification Messages" +#~ msgstr "അറിയിപ്പു് സന്ദേശങ്ങള്‍" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"മറ്റൊരു സിസ്റ്റത്തിലേക്ക് പബ്ലിക് സെക്യുര്‍ ഷെല്‍ കീ അയയ്ക്കുക. ആ കീ ഉപയോഗിച്ചു് " -"പ്രവേശനം സജ്ജമാക്കുക." +#~ msgid "Symmetric Key" +#~ msgstr "സിമ്മട്രിക് കീ" -#: ../ssh/seahorse-ssh-commands.c:115 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "നിങ്ങള്‍ക്ക് '%s' സെക്യൂര്‍ ഷെല്‍ കീ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +#~ msgid "Credentials" +#~ msgstr "യോഗ്യതകള്‍" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "നിങ്ങള്‍ക്ക് %d സെക്യൂര്‍ ഷെല്‍ കീകള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +#~ msgid "Identity" +#~ msgstr "ഐഡന്റിറ്റി" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Secure Shell Key" -msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി" +#~ msgid "Key Sharing" +#~ msgstr "കീ പങ്കിടല്‍" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "മറ്റ് കമ്പ്യൂട്ടറുകളിലേയ്ക്ക് പ്രവേശിക്കാന്‍ ഉപയോഗിക്കുന്നു (ഉദാ: ടെര്‍മിനല്‍ വഴി)" +#~ msgid "" +#~ "Sharing your keys allows other people on your network to use the keys " +#~ "you've collected. This means they can automatically encrypt things for " +#~ "you or those you know, without you having to send them your key.\n" +#~ "\n" +#~ "Note: Your personal keys will not be compromised." +#~ msgstr "" +#~ "നിങ്ങളുടെ നെറ്റ്‌വര്‍ക്കിലുള്ള വ്യക്തികള്‍ക്കു് നിങ്ങള്‍ ശേഖരിച്ച കീകള്‍ ഉപയോഗിക്കുന്നതിനായി " +#~ "നിങ്ങളുടെ കീകള്‍ പങ്കിടുന്നതു് അനുവദിക്കുന്നു. അതായതു്, നിങ്ങള്‍ കീ അയച്ചു കൊടുക്കാതെ തന്നെ " +#~ "സ്വയമായി നിങ്ങള്‍ക്കുവേണ്ടി എന്‍ക്രിപ്റ്റ് ചെയ്യുന്നു.\n" +#~ "\n" +#~ "കുറിപ്പു്: നിങ്ങളുടെ സ്വകാര്യ കീകള്‍ ഒത്തുതീര്‍പ്പാക്കുന്നില്ല." -#: ../ssh/seahorse-ssh-generate.c:90 -msgid "Couldn't generate Secure Shell key" -msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല" +#~ msgid "_Share my keys with others on my network" +#~ msgstr "എന്റെ നെറ്റ്‌വര്‍ക്കില്‍ മറ്റുള്ളവരുമായി എന്റെ കീകള്‍ _പങ്കിടുക" -#: ../ssh/seahorse-ssh-generate.c:205 -msgid "Creating Secure Shell Key" -msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി ഉണ്ടാക്കുന്നു" +#~ msgid "Progress Title" +#~ msgstr "പുരോഗതിയ്ക്കുള്ള തലക്കെട്ട്" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"നിങ്ങളുടെ ഈമെയില്‍ വിലാസം, ഈ കീ എന്തിനാണെന്നുള്ളതിനുള്ള റിമെയിണ്ടര്‍ എന്നിവ " -"ഉപയോഗിക്കുക." +#~ msgid "Couldn't run file-roller" +#~ msgstr "ഫയല്‍-റോളര്‍ പ്രവര്‍ത്തിക്കുവാന്‍ സാധ്യമായില്ല" -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"SSH വഴി വിശ്വസനീയമായ കമ്പ്യൂട്ടറുകളിലേക്ക് സുരക്ഷിതമായി കണക്ട് ചെയ്യുന്നതിനു് " -"ഒരു സെക്യുര്‍ ഷെല്‍ (SSH) കീ സഹായിക്കുന്നു. ഓരോ കമ്പ്യൂട്ടറിനും നിങ്ങള്‍ വെവ്വേറെ " -"അടയാളവാക്കുകള്‍ നല്‍കേണ്ടതില്ല." +#~ msgid "Couldn't package files" +#~ msgstr "ഫയലുകള്‍ പാക്കേജ് ചെയ്യുവാന്‍ സാധിച്ചില്ല" -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "ഫയല്‍-റോളര്‍ പ്രക്രിയ വിജയകരമായി പൂര്‍ത്തിയായില്ല." -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"നിങ്ങള്‍ക്കീ കീ ഉപയോഗിക്കുവാനുള്ള കമ്പ്യൂട്ടര്‍ നിലവിലുണ്ടെങ്കില്‍, നിങ്ങളുടെ കീ തിരിച്ചറിയുന്നതിനായി " -"ഇപ്പോള്‍ ആ കമ്പ്യൂട്ടര്‍ സജ്ജീകരിക്കാം." +#~ msgid "Archive files" +#~ msgstr "ആര്‍ക്കൈവ് ഫയലുകള്‍" -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" -msgstr "പുതിയ സെക്യൂര്‍ ഷെല്‍ ചാവി" +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "ഈ പേരില്‍ ഒരു ഫയല്‍ നിലവിലുണ്ടു്.\n" +#~ "\n" +#~ "ഒരു പുതിയ ഫയല്‍ ഉപയോഗിച്ചു് ഇതു് മാറ്റി എഴുതണമോ?" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "RSA" -msgstr "RSA" +#~ msgid "_Replace" +#~ msgstr "_മാറ്റിവയ്ക്കുക" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "_ഉണ്ടാക്കി സജ്ജീകരിക്കുക" +#~ msgid "Loading Keys..." +#~ msgstr "ചാവി ചേര്‍ക്കുന്നു..." -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "ചാവി ഉണ്ടാക്കിയാല്‍ _മാത്രം മതി" +#~ msgid "Uploading keys..." +#~ msgstr "കീകള്‍ അപ്‌ലോഡ് ചെയ്യുന്നു..." -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "_ചാവിയുടെ വിവരണം:" +#~ msgid "Retrieving keys..." +#~ msgstr "ചാവികള്‍ ലഭ്യമാക്കുന്നു..." -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(ലഭ്യമല്ലാത്ത സെക്യുര്‍ ഷെല്‍ കീ)" +#~ msgid "Searching for keys on: %s" +#~ msgstr "കീകള്‍ തെരയുന്നു: %s" -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "അസാധുവായതു്" - -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "സ്വകാര്യ സെക്യൂര്‍ ഷെല്‍ ചാവി" - -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "മറ്റുള്ളവര്‍ക്കുള്ള സെക്യൂര്‍ ഷെല്‍ ചാവി" +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "'%s' അടങ്ങുന്ന കീകള്‍ തെരയുന്നു..." -#: ../ssh/seahorse-ssh-key-properties.c:71 -msgid "Couldn't rename key." -msgstr "ചാവിയുടെ പേര് മാറ്റുവാന്‍ സാധ്യമായില്ല." +#~ msgid "Searching for key id '%s'..." +#~ msgstr "കീ id ആയ'%s'-നായി തെരയുന്നു..." -#: ../ssh/seahorse-ssh-key-properties.c:112 -msgid "Couldn't change authorization for key." -msgstr "ചാവിയ്ക്കുള്ള ആധികാരികത മാറ്റുവാന്‍ സാധ്യമായില്ല" +#~ msgid "Retrieving remote keys..." +#~ msgstr "ദൂരെയുള്ള ചാവികള്‍ ലഭ്യമാക്കുന്നു..." -#: ../ssh/seahorse-ssh-key-properties.c:127 -msgid "Couldn't change passphrase for key." -msgstr "കീയ്ക്കുള്ള അടയാളവാക്ക്യം മാറ്റുവാന്‍ സാധ്യമായില്ല." +#~ msgid "Sending keys to key server..." +#~ msgstr "ചാവി സെര്‍വറിലേക്ക് ചാവി അയയ്ക്കുന്നു..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "/home/nate/.ssh/blah_rsa" -msgstr "/home/nate/.ssh/blah_rsa" +#~ msgid "_Sign Key..." +#~ msgstr "കീ _ഒപ്പിടുക..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "00:00:00:00:00" -msgstr "00:00:00:00:00" +#~ msgid "Sign public key" +#~ msgstr "മറ്റുള്ളവര്‍ക്കുള്ള ചാവി ഒപ്പിടുക" -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Algorithm:" -msgstr "ആല്‍ഗോരിതം:" +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "നിങ്ങള്‍ക്ക് %d കീകളും ഐഡന്റിറ്റികളും എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Identifier:" -msgstr "ഐഡന്റിഫയര്‍:" +#~ msgid "Algorithms here" +#~ msgstr "അല്‍ഗോരിതങ്ങള്‍ ഇവിടെ" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Location:" -msgstr "സ്ഥാനം:" +#~ msgid "New PGP Key" +#~ msgstr "പുതിയ PGP ചാവി" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Strength:" -msgstr "ശക്തി:" +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "\"%s\" -നുള്ള ചാവി പുറത്തെടുക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../ssh/seahorse-ssh-key-properties.xml.h:10 -msgid "Trust" -msgstr "വിശ്വാസം" +#~ msgid "Export Complete Key" +#~ msgstr "പൂര്‍ണ്ണമായ ചാവി പുറത്തെടുക്കുക" -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "ഇതു് '%s' അക്കൌണ്ടിനു് മാത്രമേ ബാധകമാകുകയുള്ളു ." +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "നിങ്ങള്‍ക്ക് '%s' സര്‍ട്ടീഫിക്കേറ്റ് എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "E_xport Complete Key" -msgstr "പൂര്‍ണ്ണമായ ചാവി _പുറത്തെടുക്കുക" +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "നിങ്ങള്‍ക്ക് %d സര്‍ട്ടീഫിക്കേറ്റ് എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" +#~ msgstr[1] "നിങ്ങള്‍ക്ക് %d സര്‍ട്ടീഫിക്കേറ്റുകള്‍ എന്നേക്കുമായി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:22 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "ഈ കീയുടെ ഉടമസ്ഥനു് ഈ കമ്പ്യൂട്ടറിലേക്കു് കണക്ട് ചെയ്യുവാനുള്ള അധികാരമുണ്ടു്." +#~ msgid "Create New ..." +#~ msgstr "പുതിയതു് ഉണ്ടാക്കുക..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:23 -msgid "Used to connect to other computers." -msgstr "മറ്റ് കമ്പ്യൂട്ടറുകളിലേയ്ക്കു് കണക്ട് ചെയ്യുന്നതിനായി ഉപയോഗിക്കുന്നു." +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "തെരഞ്ഞെടുത്ത %d കീ" +#~ msgstr[1] "തെരഞ്ഞെടുത്ത %d കീകള്‍" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH കമാന്‍ഡ് അപ്രതീക്ഷിതമായി അവസാനിച്ചു." +#~ msgid "Importing keys" +#~ msgstr "ചാവികള്‍ എടുക്കുന്നു" -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 -msgid "The SSH command failed." -msgstr "SSH കമാന്‍ഡ് പരാജയപ്പെട്ടു." +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "അപരിചിതമായ തരത്തിലുള്ള കീ, അല്ലെങ്കില്‍ തെറ്റായ ഡേറ്റാ ശൈലി" -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി" +#~ msgid "T_ypes" +#~ msgstr "ത_രങ്ങള്‍" -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "അടയാളവാക്ക്യം:" +#~ msgid "Show type column" +#~ msgstr "തരങ്ങള്‍ക്കുള്ള നിര കാണിക്കുക" -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 -msgid "Remote Host Password" -msgstr "റിമോട്ട് ഹോസ്റ്റ് അടയാളവാക്ക്" +#~ msgid "_Expiry" +#~ msgstr "_കലാവധി തീരുന്നതു്" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "പഴയ ചാവി അടയാളവാക്ക്യം " +#~ msgid "Show expiry column" +#~ msgstr "കാലാവധി തീരുന്നതിനുള്ള നിര കാണിക്കുക" -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr " %s: വേണ്ടി പഴയ അടയാളവാക്ക്യം നല്‍കുക" +#~ msgid "_Trust" +#~ msgstr "_വിശ്വാസ്യത" -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "പുതിയ ചാവി അടയാളവാക്ക്യം " +#~ msgid "Show owner trust column" +#~ msgstr "ഉടമസ്ഥ വിശ്വാസ്യതയ്ക്കുള്ള നിര കാണിക്കുക" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "%s: വേണ്ടി പുതിയ അടയാളവാക്ക്യം നല്‍കുക" +#~ msgid "_Validity" +#~ msgstr "_കാലാവധി" -#: ../ssh/seahorse-ssh-operation.c:864 -msgid "Enter Key Passphrase" -msgstr "ചാവി അടയാളവാക്ക്യം നല്‍കുക" +#~ msgid "Show validity column" +#~ msgstr "കാലാവധിയ്ക്കുള്ള നിര കാണിക്കുക" -#: ../ssh/seahorse-ssh-operation.c:931 -msgid "Passphrase for New Secure Shell Key" -msgstr "പുതിയ സെക്യൂര്‍ ഷെല്‍ ചാവിക്ക് വേണ്ടി അടയാളവാക്ക്യം " +#~ msgid "Other _Keys" +#~ msgstr "മറ്റുള്ള _ചാവികള്‍" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "പുതിയ സെക്യൂര്‍ ഷെല്‍ ചാവിക്ക് വേണ്ടി അടയാളവാക്ക്യം നല്‍കുക" +#~ msgid "Validity" +#~ msgstr "കാലാവധി" -#: ../ssh/seahorse-ssh-operation.c:1013 -#, c-format -msgid "Importing key: %s" -msgstr "ചാവി എടുക്കുന്നു: %s" +#~ msgid "Expiration Date" +#~ msgstr "കാലാവധി തീരുന്നത്" -#: ../ssh/seahorse-ssh-operation.c:1015 -msgid "Importing key. Enter passphrase" -msgstr "ചാവി എടുക്കുന്നു. അടയാളവാക്ക്യം നല്‍കുക" +#~ msgid "_Expand All" +#~ msgstr "എല്ലാം _വികസിപ്പിയ്ക്കുക" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." -msgstr "ഈ കീയ്ക്ക് ഒരു സ്വകാര്യ കീ ഫയലും ലഭ്യമല്ല." +#~ msgid "Expand all listings" +#~ msgstr "എല്ലാ പട്ടികകളും വികസിപ്പിക്കുക" -#: ../ssh/seahorse-ssh-upload.c:45 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "റിമോട്ട് കമ്പ്യൂട്ടറില്‍ സെക്യൂര്‍ ഷെല്‍ ചാവി ക്രമികരിയ്ക്കുവാന്‍ സാധ്യമായില്ല." +#~ msgid "_Collapse All" +#~ msgstr "എല്ലാം _കൂട്ടിച്ചേ‌ര്‍ക്കുക" -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 -msgid "Configuring Secure Shell Keys..." -msgstr "സെക്യൂര്‍ ഷെല്‍ ചാവി ക്രമികരിക്കുക..." +#~ msgid "Collapse all listings" +#~ msgstr "എല്ലാ ലിസ്റ്റിങുകളും കൂട്ടിചേര്‍ക്കുക" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "ഉദാ: fileserver.example.com:port" +#~ msgid "Synchronizing keys" +#~ msgstr "കീകള്‍ സിന്‍ക്രണൈസ് ചെയ്യുന്നു" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "SSH കണക്ഷനു വേണ്ടി കമ്പ്യൂട്ടര്‍ സജ്ജീകരിക്കുക" +#~ msgid "X keys are selected for synchronizing" +#~ msgstr "സിന്‍ക്രൊണൈസ് ചെയ്യുന്നതിനായി X കീകള്‍ തെരഞ്ഞെടുത്തു" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "" -"SSH ഉപയോഗിക്കുന്ന മറ്റൊരു കമ്പ്യൂട്ടറിലേക്കു് നിങ്ങളുടെ സെക്യുര്‍ ഷെല്‍ കീ ഉപയോഗിക്കണമെങ്കില്‍, " -"നിങ്ങള്‍ക്കു് ആ കമ്പ്യൂട്ടറില്‍ ഒരു ലോഗിന്‍ അക്കൌണ്ടു് ഉണ്ടായിരിക്കണം" +#~ msgid "Export public key" +#~ msgstr "പബ്ലിക് കീ എക്സ്പോര്‍ട്ട് ചെയ്യുക" -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "_കമ്പ്യൂട്ടറിന്റെ പേരു്:" +#~ msgid "Exporting keys" +#~ msgstr "കീകള്‍ എക്സ്പോര്‍ട്ട് ചെയ്യുന്നു" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "_അകത്തുകയറുന്നതിനുള്ള പേരു്:" +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "കീ സെര്‍വറില്‍ നിന്നും ഡേറ്റാ ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല" -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "_സജ്ജീകരണം" +#~ msgid "Deleting..." +#~ msgstr "വെട്ടി നീക്കുന്നു..." +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s ഒരു സ്വകാര്യ കീയാണു്. നിങ്ങള്‍ക്കു് തുടരണമെന്നു് ഉറപ്പാണോ?" diff -Nru seahorse-3.2.2/po/nb.po seahorse-3.6.3/po/nb.po --- seahorse-3.2.2/po/nb.po 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/nb.po 2012-08-21 12:23:19.000000000 +0200 @@ -1,15 +1,15 @@ -# Norwegian translation of seahorse. +# Norwegian bokmål translation of seahorse. # Copyright (C) 2000-2004 Free Software Foundation, Inc. -# Kjartan Maraas , 2000-2011. +# Kjartan Maraas , 2000-2012. # msgid "" msgstr "" -"Project-Id-Version: seahorse 3.1.x\n" +"Project-Id-Version: seahorse 3.5.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 11:50+0200\n" -"PO-Revision-Date: 2011-09-17 11:50+0200\n" +"POT-Creation-Date: 2012-07-10 08:07+0200\n" +"PO-Revision-Date: 2012-07-10 08:09+0200\n" "Last-Translator: Kjartan Maraas \n" -"Language-Team: Norwegian \n" +"Language-Team: Norwegian bokmål \n" "Language: no\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,10 +21,6 @@ msgstr "Legg til nøkkelring for passord" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nytt navn på nøkkelring:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -32,303 +28,293 @@ "Vennligst velg et navn for den nye nøkkelringen. Du vil bli spurt om et " "passord for å låse den opp." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nytt navn på nøkkelring:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Vertsnavnet eller adressen til tjeneren." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Kunne ikke legge til nøkkelring" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Ny nøkkelring for passord" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Brukes til å lagre passord for programmer og nettverk" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nytt passord …" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Lagre et passord eller en hemmelighet på en trygg måte." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Nøkkelringer for passord" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Lagret passord" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Kunne ikke sette forvalgt nøkkelring" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Kunne ikke endre passord for nøkkelring" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Sett som forvalg" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Programmer lagrer vanligvis nye passord i forvalgt nøkkelring." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Bytt _passord" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Endre passord for å låse opp nøkkelring for lagring av passord" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Kunne ikke legge til oppføring" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Legg til passord" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Beskrivelse:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "Nø_kkelring:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Passord:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Vi_s passord" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Kunne ikke slette oppføring" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "Nø_kkelring:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Kunne ikke legge til nøkkelring" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Passord" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Lagrede personlige passord, påloggingsinformasjon og hemmeligheter" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Passord for IM-konto for " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Passord eller hemmelighet" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Nettverkspassord" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Lagret notat" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Passord for nøkkelring" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Passord for krypteringsnøkkel" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Passord for nøkkellager" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Passord for Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Passord for GNOME kontoer på nettet" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Passord for Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Passord for lynmeldinger" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Hemmelighet for Network Manager" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Er du sikker på at du vil slette passordet «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Er du sikker på at du vil slette %d passord?" msgstr[1] "Er du sikker på at du vil slette %d passord?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Sletter oppføring" -msgstr[1] "Sletter oppføringer" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Aksesser en delt nettverksressurs" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Aksesser et nettsted" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Låser opp en GPG-nøkkel" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Låser opp en nøkkel for sikkert skall" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Lagret passord eller pålogging" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Påloggingsinformasjon for nettverk" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Passord" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Kunne ikke endre passord" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Oppdaterer passord" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Kunne ikke sette beskrivelse" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Passord:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Tekniske detaljer:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detaljer" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Egenskaper for nøkkel" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Nøkkel" +msgid "Use:" +msgstr "Bruk:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Egenskaper for nøkkel" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Type:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Pålogging:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Tjener:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Pålogging:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Vis pass_ord" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Type:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Bruk:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Passord: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Passord: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Nøkkelringer for passord" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Brukes til å lagre passord for programmer og nettverk" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Lagret passord" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Lagre et passord eller en hemmelighet på en trygg måte." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Kunne ikke låse opp nøkkelring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Kunne ikke låse nøkkelring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Kunne ikke sette forvalgt nøkkelring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Kunne ikke endre passord for nøkkelring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Lås" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Lås nøkkelring for passordlager og krev et hovedpassord for å låse den opp." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "Lås _opp" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Lås opp nøkkelring for passordlager slik at den er tilgjengelig for bruk." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Sett som forvalg" +msgid "Password:" +msgstr "Passord:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Programmer lagrer vanligvis nye passord i forvalgt nøkkelring." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Nøkkel" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Bytt _passord" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Tekniske detaljer:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Endre passord for å låse opp nøkkelring for lagring av passord" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detaljer" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Kunne ikke slette nøkkelring" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "En nøkkelring som låses opp automatisk ved innlogging" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "En nøkkelring som brukes til å lagre passord" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "Er du sikker på at du vil slette passordnøkkelring «%s»?" +msgstr "Er du sikker på at du vil slette passordnøkkelringen «%s»?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Sletter nøkkelring" -msgstr[1] "Sletter nøkkelringer" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Jeg forstår at alle oppføringer vil bli slettet permanent." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Egenskaper for nøkkelring" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Navn:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Opprettet:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Nøkkelring" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Egenskaper for nøkkelring" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Navn:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Operasjonen ble avbrutt" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Tilgang til nøkkelringen ble nektet" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring-tjenesten kjører ikke" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Nøkkelringen er allerede låst opp" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Nøkkelringen eksisterer ikke" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Kunne ikke kommunisere med nøkkelringtjenesten" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Oppføringen eksisterer allerede" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Intern feil ved aksess til gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Vis flagg" @@ -585,268 +571,326 @@ msgstr "%u.%u.%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "opprinnelig midlertidig oppføring" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Legg til nøkkeltjener" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Vert:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Type nøkkeltjener:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Vert:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Port som tjeneren skal aksesseres på." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "opprinnelig midlertidig oppføring" +msgid "The port to access the server on." +msgstr "Port som tjeneren skal aksesseres på." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Passord" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versjon av dette programmet" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Passord:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Systeminnstillinger" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Bekreft:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Bidrag:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Ikke en gyldig adresse til nøkkeltjener." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Passord og nøkler" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"For hjelp, kontakt din systemadministrator eller nøkkeltjenerens " -"administrator." +"Kjartan Maraas \n" +"Espen Stefansen " -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Hjemmesiden til Seahorse-prosjektet" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Egendefinert" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Kan ikke slette" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Ingen: Ikke publiser nøkler" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Kunne ikke eksportere nøkler" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Hent nøkler fra nø_kkeltjenere automatisk." +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Kunne ikke eksportere data" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Synkroniser _endrede nøkler med nøkkeltjenere automatisk." +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Fil" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Nøkkeltjenere" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_ksporter …" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Eksporter til en fil" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "R_ediger" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopier til utklippstavlen" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Slett" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Slett valgte oppføringer" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Vis egenskaper for denne oppføringen" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Vis egenskaper for denne nøkkelringen" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Innstillinger" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Endre brukervalg for dette programmet" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Vis" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Hjelp" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Om dette programmet" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Innhold" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Vis hjelp for Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Eksporter" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Oppgi PIN eller passord for: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Passord:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Bekreft:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Ikke en gyldig adresse til nøkkeltjener." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"For hjelp, kontakt din systemadministrator eller nøkkeltjenerens " +"administrator." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Egendefinert" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Ingen: Ikke publiser nøkler" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Brukervalg" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Finn nøkler via:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Publiser nøkler til:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Henter data" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Eksporterer data" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importerer data" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Hent nøkler fra nø_kkeltjenere automatisk." -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Sender data" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Synkroniser _endrede nøkler med nøkkeltjenere automatisk." -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Ikke tilgjengelig" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Nøkkeltjenere" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d-%m-%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Nøkkeldata" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Flere nøkler" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Alle nøkkelfiler" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Alle filer" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arkivfiler" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"En fil eksisterer allerede med dette navnet.\n" -"\n" -"Vil du erstatte den med en ny fil?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "E_rstatt" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Ukjent" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Aldri" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginal" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Full" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Ultimat" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Deaktivert" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Tilbakekalt" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Kunne ikke vise hjelp: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Utløpsdato:" +msgid "Never E_xpires" +msgstr "Går _aldri ut" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Generer en ny undernøkkel" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Hvis nøkkelen aldri utgår" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Nøkkel_type:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Nøkkel_lengde:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Nøkkel_type:" +msgid "Expiration Date:" +msgstr "Utløpsdato:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Lengde på nøkkel" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Går _aldri ut" +msgid "Generate a new subkey" +msgstr "Generer en ny undernøkkel" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Legg til bruker-ID" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Opprett ny bruker-ID" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Fullt _navn:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Nøkkel-ko_mmentar:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Må være minst 5 tegn langt" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Alternativ e-postadresse" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Valgfri kommentar som beskriver nøkkelen" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Alternativ e-postadresse" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Fullt _navn:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_E-postadresse:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Nøkkel-ko_mmentar:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Opprett ny bruker-ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "E_ndre" +msgid "_Never expires" +msgstr "_Går aldri ut" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Trekk tilbake nøkkel" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Går aldri ut" +msgid "C_hange" +msgstr "E_ndre" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -857,7 +901,7 @@ msgid "Add subkey to %s" msgstr "Legg til undernøkkel til %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (kun signering)" @@ -865,7 +909,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (kun kryptering)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (kun signering)" @@ -886,6 +930,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Dekryptering feilet. Du har muligens ikke dekrypteringsnøkkelen." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Operasjonen ble avbrutt" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Ugyldig utløpsdato" @@ -903,47 +952,147 @@ msgid "Expiry: %s" msgstr "Utgår: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Flere nøkler" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Nøkkeldata" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Beskyttede PGP-nøkler" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP-nøkler" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP-nøkkel" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Brukes til å kryptere e-post og filer" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Kunne ikke opprette PGP-nøkkel" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Passordfrase for ny PGP-nøkkel" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Oppgi passordfrasen for din nye nøkkel to ganger." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Når en nøkkel lages må det genereres en masse\n" +"tilfeldige data og vi trenger din hjelp. Det er bra\n" +"å utføre en eller annen handling som å skrive på\n" +"tastaturet, bevege musen eller bruke programmer.\n" +"Dette gir systemet de tilfeldige data det trenger." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Genererer nøkkel" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Er du sikker på at du vil slette %s permanent?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Er du sikker på at du vil slette %d nøkkel permanent?" +msgstr[1] "Er du sikker på at du vil slette %d nøkler permanent?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Feil passord" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Dette er tredje gang du skrev inn et feil passord. Vennligst prøv igjen." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Feil passordfrase." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Oppgi ny passordfrase for «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Oppgi passordfrase for «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Oppgi nytt passord" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Oppgi passordfrase" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Passord" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Lastet %d nøkkel" +msgstr[1] "Lastet %d nøkler" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Ugyldige nøkkeldata (mangler UIDer). Dette kan være forårsaket av en " +"datamaskin med datoen satt i fremtiden eller en manglende selvsignering." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG-nøkler" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: katalog for forvalgt nøkkelring" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -978,27 +1127,31 @@ msgid "All JPEG files" msgstr "Alle JPEG-filer" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Alle filer" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Velg bilde som skal legges til nøkkelen" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Kunne ikke forberede bilde" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Kunne ikke legge til bilde" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Filen kunne ikke bli lastet. Den kan være i et ugyldig format" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Er du sikker på at du vil fjerne det nåværende bildet fra din nøkkel?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Kunne ikke slette bilde" @@ -1056,7 +1209,11 @@ msgid "Couldn't add revoker" msgstr "Kunne ikke legge til tilbakekaller" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Jeg forstår at denne hemmelige nøkkelen vil bli slettet permanent." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1071,11 +1228,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Ingen nøkler tilgjengelig for signering" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1083,508 +1240,570 @@ "Du har ingen personlige PGP-nøkler som kan brukes for å indikere din tillit " "til denne nøkkelen." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Feil passordfrase." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Oppgi ny passordfrase for «%s»" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "Søket var ikke spesifikt nok. Serveren '%s' fant for mange nøkler." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Oppgi passordfrase for «%s»" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Oppgi nytt passord" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Kunne ikke kommunisere med tjener «%s»: %s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Oppgi passordfrase" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP nøkkeltjener" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Kunne ikke importere nøkler" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importerer nøkler fra nøkkeltjenere" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Ekstern" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Lukk dette vinduet" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Finn eksterne nøkler …" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Søker etter nøkler på en nøkkeltjener" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importer" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importer valgte nøkler til lokal nøkkelring" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Eksterne nøkler" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Lastet %d nøkkel" -msgstr[1] "Lastet %d nøkler" +msgid "Remote Keys Containing '%s'" +msgstr "Eksterne nøkler som inneholder «%s»" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Søk etter nøkler feilet." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Finn eksterne nøkler" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Ugyldige nøkkeldata (mangler UIDer). Dette kan være forårsaket av en " -"datamaskin med datoen satt i fremtiden eller en manglende selvsignering." +"Finn andres nøkler på internett. Disse nøklene kan så importeres i din " +"lokale nøkkelring." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Søk etter nøkler som inneholder:" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP nøkkeltjener" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Nøkkeltjenere:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Delte nøkler nær meg:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Hvor skal det søkes:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Søk" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Kunne ikke publisere nøkler til tjener" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Søket var ikke spesifikt nok. Serveren '%s' fant for mange nøkler." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Kunne ikke motta nøkler fra nøkkeltjener: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Kunne ikke kommunisere med tjener «%s»: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d nøkkel er valgt for synkronisering" +msgstr[1] "%d nøkler er valgt for synkronisering" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synkroniserer nøkler …" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Synkroniser nøkler" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Dette vil publisere nøklene i din nøkkelring, slik de er tilgjengelig for " +"andre. Du vil også få de endringene andre har gjort, siden du mottok deres " +"nøkler." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Dette vil hente de endringer andre har gjort siden du hentet deres nøkler. " +"Ingen nøkkeltjenere har blitt valgt for publisering, så dine nøkler vil ikke " +"bli gjort tilgjengelig for andre." -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Nø_kkeltjenere" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Synkroniser" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Kunne ikke kommunisere med «%s»: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Kobler til: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Kunne ikke slå opp adresse: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Slår opp tjeneradresse: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP nøkkeltjener" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Signer nøkkel …" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Signer offentlig nøkkel" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Er du sikker på at du vil slette %s for godt?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Er du sikker på at du vil slette %d nøkler og identiteter for godt?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Er du sikker på at du vil slette %d nøkler for godt?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Er du sikker på at du vil slette %d identiteter for godt?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Synkroniser og publiser nøkler …" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Kunne ikke slette bruker-ID" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publiser og/eller synkroniser dine nøkler med nøkler på nettet." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Kunne ikke slette privat nøkkel" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Kunne ikke slette offentlig nøkkel" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP-nøkler" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP-nøkler brukes til å kryptere e-post og filer" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Avanserte nøkkelvalg" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "O_pprett" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "En PGP-nøkkel lar deg kryptere e-post eller filer til andre personer." +msgid "Generate a new key" +msgstr "Generer en ny nøkkel" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmer her" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "En PGP-nøkkel lar deg kryptere e-post eller filer til andre personer." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "O_pprett" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Kommentar:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Utløpsdato:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Utløper _aldri" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Krypteringstype:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Generer en ny nøkkel" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Nøkkel_styrke (biter):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Utløper _aldri" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Ny PGP-nøkkel" +msgid "E_xpiration Date:" +msgstr "_Utløpsdato:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Kommentar:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Avanserte nøkkelvalg" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Utgått" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Personlig PGP-nøkkel" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP-nøkkel" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Kunne ikke endre primær bruker-ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Er du sikker på at du vil slette bruker-IDen «%s» for godt?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Kunne ikke slette bruker-ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Ukjent]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Navn/e-post" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Signatur-ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Kunne ikke endre hovedbilde" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(ukjent)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Denne nøkkelen gikk ut: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Navn" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Er du sikker på at du vil slette undernøkkelen %d av %s for godt?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Kunne ikke slette undernøkkel" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Kan ikke endre tillitsforhold" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Kunne ikke eksportere nøkkel til «%s»" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Eksporter hele nøkkelen" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Kunne ikke eksportere nøkkel." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Kunne ikke eksportere nøkkel" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Aldri" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Type" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Opprettet" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Utgår" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Status" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Styrke" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Utgått" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "God" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Nøkkel-ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Handlinger" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Kommentar:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datoer" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-postadresse:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Fingeravtrykk:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Nøkkel-ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Aldri" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nøkkelnavn og signaturer" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Denne nøkkelen har blitt tilbakekalt" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Bilde " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"Eieren av denne nøkkelen har trukket tilbake nøkkelen. Den kan ikke lenger " +"bli brukt." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Tekniske detaljer" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Denne nøkkelen har utløpt" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Denne nøkkelen har blitt tilbakekalt" +msgid "Add a photo to this key" +msgstr "Legg til et bilde for denne nøkkelen" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Denne nøkkelen har utløpt" +msgid "Remove this photo from this key" +msgstr "Fjern dette bildet fra denne nøkkelen" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Type:" +msgid "Make this photo the primary photo" +msgstr "Bruk dette som hovedbilde" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Bruk:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Gå til forrige bilde" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "Un_dernøkler" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Gå til neste bilde" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Legg til" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Bilde " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Legg til et bilde for denne nøkkelen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Nøkkel-ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Endre _passordfrase" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Navn:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Dekrypter filer og e-poster sendt til deg." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-postadresse:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Slett" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Kommentar:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Utløpt" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Bruk:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Utgår:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Type:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Eksporter" +msgid "Decrypt files and email sent to you." +msgstr "Dekrypter filer og e-poster sendt til deg." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Privat PGP-nøkkel" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Gå til neste bilde" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Endre _passordfrase" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Gå til forrige bilde" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Eier" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Nøkkel-ID:" +msgid "Key Names and Signatures" +msgstr "Nøkkelnavn og signaturer" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primær" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Bruk dette som hovedbilde" +msgid "Sign" +msgstr "Signer" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Navn og signaturer" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Slett" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Aldri" +msgid "_Add Name" +msgstr "_Legg til navn" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Overstyr _tillit til eier:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Eier" +msgid "Revoke" +msgstr "Trekk tilbake" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primær" +msgid "Names and Signatures" +msgstr "Navn og signaturer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Privat PGP-nøkkel" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Nøkkel-ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Fjern dette bildet fra denne nøkkelen" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Trekk tilbake" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Styrke:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Signer" +msgid "Technical Details" +msgstr "Tekniske detaljer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Styrke:" +msgid "Fingerprint" +msgstr "Fingeravtrykk:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" -"Eieren av denne nøkkelen har trukket tilbake nøkkelen. Den kan ikke lenger " -"bli brukt." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Utgår:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Legg til navn" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datoer" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Overstyr _tillit til eier:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Eksporter hele nøkkelen:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Navn:" +msgid "Actions" +msgstr "Handlinger" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datoer:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Legg til" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Utløpt" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "Un_dernøkler" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginalt" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Fingeravtrykk:" +msgid "Fully" +msgstr "Fullt ut" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indiker tillit:" +msgid "Ultimately" +msgstr "Ultimat" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Din tillit til denne nøkkelen" +msgid "Encrypt files and email to the key's owner" +msgstr "Krypter filer og e-post til eieren av nøkkelen " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Offentlig PGP-nøkkel" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Andre navn:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Personer som har signert denne nøkkelen:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Krypter filer og e-poster til eieren av nøkkelen " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Din tillit til denne nøkkelen" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Fullt ut" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Din tillit er manuelt spesifisert på detalj-fanen." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Jeg stoler på signaturer fra «%s» på andre nøkler" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1593,7 +1812,11 @@ "Hvis du tror at personen som eier denne nøkkelen er «%s», signer " "denne nøkkelen:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Signer denne nøkkelen" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1601,43 +1824,38 @@ "Hvis du ikke lenger stoler på at «%s» eier denne nøkkelen kan du trekke " "tilbake signaturen din:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginalt" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Offentlig PGP-nøkkel" +msgid "_Revoke Signature" +msgstr "_Tilbakekall signatur" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Personer som har signert denne nøkkelen:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Bare vis signaturer til personer jeg stoler på" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Tillit" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Ultimat" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Du s_toler på eieren:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Din tillit er manuelt spesifisert på detalj-fanen." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Fingeravtrykk:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Bare vis signaturer til personer jeg stoler på" +msgid "Dates:" +msgstr "Datoer:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Tilbakekall signatur" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indiker tillit:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Signer denne nøkkelen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Du s_toler på eieren:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1645,55 +1863,61 @@ msgstr "Undernøkkel %d av %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Alternativ beskrivelse for tilbaketrekking" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Trekk tilbake" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Grunn til å tilbakekalle nøkkelen" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "Å_rsak:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Alternativ beskrivelse for tilbaketrekking" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Trekk tilbake" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Du har ingen personlige PGP-nøkler som kan brukes til å signere et dokument " "eller beskjed." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Signer melding med nøkkel:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Hvor nøye har du sjekket denne nøkkelen?" +msgid "Sign Key" +msgstr "Signer nøkkel" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Hvordan andre vil se denne signaturen:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Bed å signere indikerer du at du stoler på at denne nøkkelen tilhører:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Signer nøkkel som:" +msgid "Key Name" +msgstr "Navn på nøkkel" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Tilfeldig: betyr at du har gjort en rask verifisering av at nøkkelen " -"eies av personen som hevder at de eier den. Du kan for eksempel ha lest " -"nøkkelens fingeravtrykk til eieren over telefonen." +msgid "How carefully have you checked this key?" +msgstr "Hvor nøye har du sjekket denne nøkkelen?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Navn på nøkkel" +msgid "_Not at all" +msgstr "_Ikke i det hele tatt" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Tilfeldig" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Meget nøye" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1701,7 +1925,17 @@ "Ikke i det hele tatt: betyr at du tror denne nøkkelen eies av " "personen som hevder å eie den, men du har ikke verifisert at dette stemmer." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Tilfeldig: betyr at du har gjort en rask verifisering av at nøkkelen " +"eies av personen som hevder at de eier den. Du kan for eksempel ha lest " +"nøkkelens fingeravtrykk til eieren over telefonen." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1709,18 +1943,6 @@ "Meget nøye: Velg dette kun hvis du er helt sikker på at denne " "nøkkelen er ekte." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Bed å signere indikerer du at du stoler på at denne nøkkelen tilhører:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Jeg kan t_rekke tilbake denne signaturen senere." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Signer nøkkel" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1732,478 +1954,355 @@ "post for å sjekke at e-postadressen tilhører eieren." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Tilfeldig" +msgid "How others will see this signature:" +msgstr "Hvordan andre vil se denne signaturen:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Ikke i det hele tatt" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Andre kan muligens ikke se denne signaturen" -#: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Signer" - -#: ../pgp/seahorse-sign.xml.h:16 -msgid "_Signer:" -msgstr "_Signeringspart:" - -#: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Meget nøye" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Signer melding med nøkkel:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Sertifikat" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Kunne ikke slette" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Er du sikker på at du vil slette sertifikatet «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Er du sikker på at du vil slette %d sertifikat?" -msgstr[1] "Er du sikker på at du vil slette %d sertifikater?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Sletter" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Endre passord" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Bekre_ft passord:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Bekreft nytt passord" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Nytt _passord:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Håndter dine passord og krypteringsnøkler" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Passord og nøkler" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Velg type oppføring du ønsker å opprettte:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "F_ortsett" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Lag ny …" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Valgte %d nøkkel" -msgstr[1] "Valgte %d nøkler" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Kunne ikke importere nøkler" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importerte nøkler" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importerer nøkler" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importer nøkkel" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Ikke gjenkjent nøkkeltype eller ugyldig dataformat" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importerer nøkler" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Ekstern" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Lukk dette programmet" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Ny …" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Lag en ny nøkkel eller oppføring" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importer …" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importer fra en fil" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importer fra utklippstavlen" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Finn eksterne nøkler …" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Søker etter nøkler på en nøkkeltjener" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Synkroniser og publiser nøkler …" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publiser og/eller synkroniser dine nøkler med nøkler på nettet." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_yper" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Vis typekolonnen" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Utløp" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Vis utløpskolonnen" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Tillit" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Vis tillitskolonnen" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validitet" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Vis gyldighetskolonnen" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filter:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Førstegangsalternativ:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Generer en ny nøkkel til deg selv: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importer eksisterende nøkler fra en fil:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Mine _personlige nøkler" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Andre nø_kler" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "For å komme i gang med kryptering må du ha nøkler." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importer" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Passord" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Kunne ikke eksportere nøkler" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validitet" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Utløpsdato" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Lukk dette vinduet" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Utvid alle" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Utvid alle lister" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "S_lå sammen alle" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Slå sammen alle lister" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Eksterne nøkler" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Eksterne nøkler som inneholder «%s»" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Nøkkeltjenere:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Delte nøkler nær meg:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Finn eksterne nøkler" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Jeg kan t_rekke tilbake denne signaturen senere." -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Finn andres nøkler på internett. Disse nøklene kan så importeres i din " -"lokale nøkkelring." +#: ../pgp/seahorse-sign.xml.h:15 +msgid "Sign key as:" +msgstr "Signer nøkkel som:" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Hvor skal det søkes:" +#: ../pgp/seahorse-sign.xml.h:16 +msgid "_Signer:" +msgstr "_Signeringspart:" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Søk" +#: ../pgp/seahorse-sign.xml.h:17 +msgid "_Sign" +msgstr "_Signer" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Søk etter nøkler som inneholder:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Eksporterer data" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Kunne ikke publisere nøkler til tjener" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Henter data" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Kunne ikke motta nøkler fra nøkkeltjener: %s" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importerer data" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d nøkkel er valgt for synkronisering" -msgstr[1] "%d nøkler er valgt for synkronisering" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Sender data" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Synkroniserer nøkler …" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Ikke tilgjengelig" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Synkroniser nøkler" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Personlig sertifikat og nøkkel" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Personlig sertifikat" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Dette vil publisere nøklene i din nøkkelring, slik de er tilgjengelig for " -"andre. Du vil også få de endringene andre har gjort, siden du mottok deres " -"nøkler." +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Sertifikat" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Dette vil hente de endringer andre har gjort siden du hentet deres nøkler. " -"Ingen nøkkeltjenere har blitt valgt for publisering, så dine nøkler vil ikke " -"bli gjort tilgjengelig for andre." +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Sertifikater (DER-kodet)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Sertifikater" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509-sertifikater og relaterte nøkler" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Er du sikker på at du vil slette %d sertifikat permanent?" +msgstr[1] "Er du sikker på at du vil slette %d sertifikater permanent?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Kunne ikke lage privat nøkkel" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Lag" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Privat nøkkel" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Brukes til å forespørre et sertifikat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Lag en ny privat nøkkel" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etikett:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Lagret i:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Jeg forstår at denne nøkkelen vil bli slettet permanent." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Uten navn" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Klarte ikke å eksportere sertifikat" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Nø_kkeltjenere" +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Kunne ikke slette" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Synkroniser" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Eksporter" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Eksporter sertifikatet" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Slett sertifikatet eller nøkkelen" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Forespør sertifikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Lag en sertifikatforespørselsfil for denne nøkkelen" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Kunne ikke lagre sertifikatforespørsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Lagre sertifikatforespørsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Sertifikatforespørsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM-kodet forespørsel" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Kunne ikke lage sertifikatforespørsel" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Lag en sertifikatforespørselsfil." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Common Name (CN) som settes inn i sertifikatforespørselen." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Navn (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Privat nøkkel uten navn" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versjon av dette programmet" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Endre passord" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Bidrag:" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Nytt _passord:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Kjartan Maraas \n" -"Espen Stefansen " +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Bekreft nytt passord" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Hjemmesiden til Seahorse-prosjektet" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Bekre_ft passord:" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Fil" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Håndter dine passord og krypteringsnøkler" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "R_ediger" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Fortsett" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Vis" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Velg type oppføring du ønsker å opprettte:" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Hjelp" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Import feilet" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importer" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Data som skal importeres:" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Innstillinger" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importer nøkkel" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Endre brukervalg for dette programmet" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Alle nøkkelfiler" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Om dette programmet" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Sluppet tekst" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Tekst fra utklippstavle" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Ny" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Innhold" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Lukk dette programmet" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Vis hjelp for Seahorse" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Ny …" + +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Lag en ny nøkkel eller oppføring" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Eksporter offentlig nøkkel" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Legg til en ny nøkkel eller oppføring" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Eksporterer nøkler" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importer …" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Kunne ikke hente data fra nøkkeltjener" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importer fra en fil" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Kopierte nøkler" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importer fra utklippstavlen" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Henter nøkler" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Etter nø_kkelring" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Vis sidelinje med nøkkelringlister" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Vis _personlige" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Kun vis personlige nøkler, sertifikater og passord" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Vis innhold med _tillit" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Vis kun nøkler, sertifikater og passord som med tillitsforhold" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Vis _alle" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Vis alle nøkler, sertifikater og passord" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filter" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s er en privat nøkkel. Er du sikker på at du vil fortsette?" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Førstegangsalternativ:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importerer nøkler fra nøkkeltjenere" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Generer en ny nøkkel til deg selv: " -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Vis egenskaper" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importer eksisterende nøkler fra en fil:" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Slett" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "For å komme i gang med kryptering må du ha nøkler." -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Slett valgte oppføringer" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Kunne ikke låse" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Kunne ikke låse opp" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_ksporter …" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Lås" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Eksporter til en fil" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "Lås _opp" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopier til utklippstavlen" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "Egenska_per" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importer valgte nøkler til lokal nøkkelring" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Konfigurerer nøkkel for _Secure Shell …" + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Send offentlig nøkkel for sikkert skall til en annen maskin og aktiver " +"pålogging med denne nøkkelen." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2232,177 +2331,202 @@ msgid "Enter the new passphrase again: %s" msgstr "Oppgi den nye passordfrasen igjen: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Konfigurerer nøkkel for _Secure Shell …" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Send offentlig nøkkel for sikkert skall til en annen maskin og aktiver " -"pålogging med denne nøkkelen." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Sikkert skall" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Nøkler som brukes til å koble til andre datamaskiner på en sikker måte" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Er du sikker på at du vil slette nøkkel for secure shell «%s»?" +msgstr "Er du sikker på at du vil slette SSH-nøkkel «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Er du sikker på at du vil slette %d nøkler for secure shell?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Er du sikker på at du vil slette %d SSH-nøkkel?" +msgstr[1] "Er du sikker på at du vil slette %d SSH-nøkler?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH-nøkkel" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Kunne ikke slette nøkkel" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Hemmelige SSH-nøkler" -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Offentlige SSH-nøkler" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Ingen offentlig nøkkelfil er tilgjengelig for denne nøkkelen." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Nøkkel for sikkert skall" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Brukes til å aksessere andre datamaskiner (f.eks via en terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Kunne ikke generere Secure Shell-nøkkel" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Oppretter Secure Shell-nøkkel" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Bruk e-postadressen din og noe annet som minner deg hva denne nøkkelen er " -"for." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"En Secure Shell(SSH)-nøkkel lar deg koble deg sikkert til pålitelige " -"datamaskiner med SSH, uten å angi et passord for hver og en av dem." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Hvis det allerede er en datamaskin du vil bruke denne nøkkelen på, kan du " -"sette opp den datamaskinen til å kjenne igjen nøkkelen nå." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Ny Secure Shell-nøkkel" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Bare opprett nøkkel" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Opprett og sett opp" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Bare opprett nøkkel" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"En Secure Shell (SSH)-nøkkel lar deg koble deg sikkert til pålitelige " +"datamaskiner på en sikker måte." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"E-postadressen din eller noe annet som minner deg hva denne nøkkelen er " +"til." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "Nø_kkelbeskrivelse:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Hvis du vil bruke denne nøkkelen på en bestemt datamaskin kan du sette opp " +"den datamaskinen til å kjenne igjen den nye nøkkelen." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Uleslig Secure Shell-nøkkel)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Personlig SSH-nøkkel" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH-nøkkel" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Kunne ikke endre navn på nøkkel." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Kunne ikke endre autorisasjon for nøkkelen." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Kunne ikke endre passordfrasen for nøkkel." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritme:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identifikator:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Lokasjon:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Navn:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Styrke:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Brukt til å koble til andre datamaskiner." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Tillit" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"Eieren av denne nøkkelen er _autorisert til å koble til denne datamaskinen" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Dette gjelder kun «%s»-kontoen" +msgid "This only applies to the %s account." +msgstr "Dette gjelder kun «%s»-kontoen." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_ksporter hele nøkkelen" +msgid "Algorithm:" +msgstr "Algoritme:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"Eieren av denne nøkkelen er _autorisert til å koble til denne datamaskinen" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Styrke:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Lokasjon:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Brukt til å koble til andre datamaskiner." +msgid "E_xport Complete Key" +msgstr "E_ksporter hele nøkkelen" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH-kommando terminerte uventet." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH-kommando feilet" -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Passord for ekstern vert" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Oppgi passordfrase for nøkkel" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Passordfrase for ny Secure Shell-nøkkel" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importerer nøkkel: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importerer nøkkel. Oppgi passord" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH-nøkler" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Ingen privat nøkkelfil er tilgjengelig for denne nøkkelen." @@ -2415,14 +2539,10 @@ msgstr "Konfigurerer Secure Shell-nøkler …" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "f.eks: filserver.eksempel.no:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Setter opp datamaskin for SSH-tilkobling" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2430,6 +2550,10 @@ "Du må en påloggingskonto allerede for å bruke din nøkkel for sikkert skall " "på en annen datamaskin som bruker SSH." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "f.eks: filserver.eksempel.no:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Navn på _datamaskin:" diff -Nru seahorse-3.2.2/po/pa.po seahorse-3.6.3/po/pa.po --- seahorse-3.2.2/po/pa.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/pa.po 2012-09-03 10:44:42.000000000 +0200 @@ -4,20 +4,20 @@ # # ASB , 2004, 2007. # Amanpreet Singh Alam , 2008. -# A S Alam , 2009, 2010, 2011. +# A S Alam , 2009, 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: seahorse.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-23 15:52+0530\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-08-22 07:42+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "Language: pa\n" @@ -26,316 +26,300 @@ msgstr "ਕੀਰਿੰਗ ਪਾਸਵਰਡ ਸ਼ਾਮਲ" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "ਨਵਾਂ ਕੀਰਿੰਗ ਨਾਂ:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "" "ਨਵੇਂ ਕੀਰਿੰਗ ਲਈ ਇੱਕ ਨਾਂ ਦਿਓ। ਤੁਹਾਨੂੰ ਇੱਕ ਅਣ-ਲਾਕ ਪਾਸਵਰਡ ਲਈ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "ਨਵਾਂ ਕੀਰਿੰਗ ਨਾਂ:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "ਸਰਵਰ ਦਾ ਹੋਸਟ ਨਾਂ ਜਾਂ ਐਡਰੈੱਸ।" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "ਕੀਰਿੰਗ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਕੀਰਿੰਗ" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "ਐਪਲੀਕੇਸ਼ਨ ਅਤੇ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ ਸੰਭਾਲਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "ਨਵਾਂ ਪਾਸਵਰਡ..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "ਪਾਸਵਰਡ ਜਾਂ ਭੇਦ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਸਟੋਰ ਕਰੋ।" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "ਪਾਸਵਰਡ ਕੀਰਿੰਗ" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "ਸਟੋਰ ਕੀਤੇ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "ਡਿਫਾਲਟ ਕੀਰਿੰਗ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "ਕੀਰਿੰਗ ਪਾਸਵਰਡ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "ਡਿਫਾਲਟ ਸੈੱਟ ਕਰੋ(_S)" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "ਐਪਲੀਕੇਸ਼ਨਾਂ ਅਕਸਰ ਨਵੇਂ ਪਾਸਵਰਡ ਡਿਫਾਲਟ ਕੀਰਿੰਗ ਵਿੱਚ ਸੰਭਾਲਦੀਆਂ ਹਨ।" + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "ਪਾਸਵਰਡ ਬਦਲੋ(_P)" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "ਪਾਸਵਰਡ ਸਟੋਰੇਜ਼ ਕੀਰਿੰਗ ਲਈ ਅਣ-ਲਾਕ ਪਾਸਵਰਡ ਬਦਲੋ" + +#: ../gkr/seahorse-gkr-add-item.c:58 +#| msgid "Couldn't delete item" +msgid "Couldn't add item" +msgstr "ਆਈਟਮ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "ਪਾਸਵਰਡ ਸ਼ਾਮਲ" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "ਵੇਰਵਾ(_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "ਕੀਰਿੰਗ(_K):" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "ਪਾਸਵਰਡ(_P):" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_S)" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "ਆਈਟਮ ਨਹੀਂ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "ਕੀਰਿੰਗ(_K):" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "ਕੀਰਿੰਗ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "ਸੰਭਾਲੇ ਹੋਏ ਨਿੱਜੀ ਪਾਸਵਰਡ, ਸਨਦ (credential) ਅਤੇ ਭੇਦ" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "ਇਸ ਲਈ IM ਅਕਾਊਂਟ ਪਾਸਵਰਡ " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "ਪਾਸਵਰਡ ਜਾਂ ਭੇਦ" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "ਸੰਭਾਲਿਆ ਨੋਟ" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "ਕੀਰਿੰਗ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "ਕੁੰਜੀ ਸਟੋਰੇਜ਼ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "ਗੂਗਲ ਕਰੋਮ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "ਗਨੋਮ ਆਨਲਾਈਨ ਅਕਾਊਂਟ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "ਟੈਲੀਪੈਥੀ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "ਤੁਰੰਤ ਮੈਸਜ਼ਿੰਗ ਪਾਸਵਰਡ" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ ਭੇਦ" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "ਕੀ ਤੁਸੀਂ '%s' ਪਾਸਵਰਡ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "ਕੀ ਤੁਸੀਂ %d ਪਾਸਵਰਡਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" msgstr[1] "ਕੀ ਤੁਸੀਂ %d ਪਾਸਵਰਡਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "ਆਈਟਮ ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ" -msgstr[1] "ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "ਇੱਕ ਨੈੱਟਵਰਕ ਸਾਂਝ ਜਾਂ ਸਰੋਤ ਵਰਤੋਂ" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "ਇੱਕ ਵੈੱਬਸਾਇਟ ਵਰਤੋਂ" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "ਇੱਕ PGP ਕੁੰਜੀ ਅਣ-ਲਾਕ ਕਰੋ" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "ਇੱਕ ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ (SSH) ਕੁੰਜੀ" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "ਸੰਭਾਲਿਆ ਪਾਸਵਰਡ ਜਾਂ ਲਾਗਇਨ" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "ਨੈੱਟਵਰਕ ਕਰਿਡਿਨਟੀਸ" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "ਪਾਸਵਰਡ" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "ਪਾਸਵਰਡ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "ਪਾਸਵਰਡ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "ਵੇਰਵਾ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "ਪਾਸਵਰਡ:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "ਵੇਰਵਾ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "ਕੁੰਜੀ ਵਿਸ਼ੇਸ਼ਤਾ" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "ਕੁੰਜੀ" +msgid "Use:" +msgstr "ਵਰਤੋਂ:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "ਕੁੰਜੀ ਵਿਸ਼ੇਸ਼ਤਾ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "ਟਾਈਪ:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "ਲਾਗਇਨ:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "ਸਰਵਰ:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "ਲਾਗਇਨ:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "ਟਾਈਪ:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "ਵਰਤੋਂ:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "ਪਾਸਵਰਡ: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "ਪਾਸਵਰਡ: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "ਪਾਸਵਰਡ ਕੀਰਿੰਗ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "ਐਪਲੀਕੇਸ਼ਨ ਅਤੇ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ ਸੰਭਾਲਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "ਸਟੋਰ ਕੀਤੇ ਪਾਸਵਰਡ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "ਪਾਸਵਰਡ ਜਾਂ ਭੇਦ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਸਟੋਰ ਕਰੋ।" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "ਕੀਰਿੰਗ ਅਣ-ਲਾਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "ਕੀਰਿੰਗ ਲਾਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "ਡਿਫਾਲਟ ਕੀਰਿੰਗ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "ਕੀਰਿੰਗ ਪਾਸਵਰਡ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "ਲਾਕ ਕਰੋ(_L)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"ਪਾਸਵਰਡ ਸਟੋਰੇਜ਼ ਕੀਰਿੰਗ ਲਾਕ ਕਰੋ ਤਾਂ ਕਿ ਇਸ ਨੂੰ ਅਣ-ਲਾਕ ਕਰਨ ਲਈ ਮਾਸਟਰ ਪਾਸਵਰਡ ਦੀ ਲੋੜ " -"ਹੋਵੇ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "ਅਣ-ਲਾਕ(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"ਪਾਸਵਰਡ ਸਟੋਰੇਜ਼ ਕੀਰਿੰਗ ਨੂੰ ਇੱਕ ਮਾਸਟਰ ਪਾਸਵਰਡ ਨਾਲ ਅਣ-ਲਾਕ ਕਰੋ ਤਾਂ ਕਿ ਇਸ ਨੂੰ ਵਰਤਣ " -"ਲਈ ਉਪਲੱਬਧ " -"ਕਰਵਾਇਆ ਜਾ ਸਕੇ।" - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "ਡਿਫਾਲਟ ਸੈੱਟ ਕਰੋ(_S)" +msgid "Password:" +msgstr "ਪਾਸਵਰਡ:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "ਐਪਲੀਕੇਸ਼ਨਾਂ ਅਕਸਰ ਨਵੇਂ ਪਾਸਵਰਡ ਡਿਫਾਲਟ ਕੀਰਿੰਗ ਵਿੱਚ ਸੰਭਾਲਦੀਆਂ ਹਨ।" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "ਕੁੰਜੀ" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "ਪਾਸਵਰਡ ਬਦਲੋ(_P)" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "ਪਾਸਵਰਡ ਸਟੋਰੇਜ਼ ਕੀਰਿੰਗ ਲਈ ਅਣ-ਲਾਕ ਪਾਸਵਰਡ ਬਦਲੋ" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "ਵੇਰਵਾ" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "ਕੀਰਿੰਗ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "ਇੱਕ ਕੀਰਿੰਗ, ਜੋ ਕਿ ਲਾਗਇਨ ਸਮੇਂ ਆਪਣੇ ਆਪ ਹੀ ਅਣ-ਲਾਕ ਹੋਵੇ" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "ਪਾਸਵਰਡ ਸੰਭਾਲਣ ਲਈ ਵਰਤਣ ਲਈ ਕੀਰਿੰਗ" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "ਕੀ ਤੁਸੀਂ '%s' ਕੀਰਿੰਗ ਪਾਸਵਰਡ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "ਕੀਰਿੰਗ ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ" -msgstr[1] "ਕੀਰਿੰਗਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "ਮੈਂ ਸਮਝਦਾ/ਸਮਝਦੀ ਹਾਂ ਕਿ ਸਭ ਆਈਟਮਾਂ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਈਆਂ ਜਾਣਗੀਆਂ।" + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "ਕੀਰਿੰਗ ਵਿਸ਼ੇਸ਼ਤਾ" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "ਨਾਂ:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "ਬਣਾਇਆ:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "ਕੀਰਿੰਗ" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "ਕੀਰਿੰਗ ਵਿਸ਼ੇਸ਼ਤਾ" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "ਨਾਂ(_N):" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ ਗਈ" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "ਕੁੰਜੀ ਰਿੰਗ ਲਈ ਅਸੈੱਸ ਵਾਸਤੇ ਪਾਬੰਦੀ ਹੈ" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "ਗਨੋਮ-ਕੀਰਿੰਗ ਡੈਮਨ ਨਹੀਂ ਚੱਲਦੀ ਹੈ" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "ਕੁੰਜੀ ਰਿੰਗ ਪਹਿਲਾਂ ਹੀ ਅਣ-ਲਾਕ ਹੈ" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "ਏਦਾਂ ਦੀ ਕੋਈ ਕੀ ਰਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "ਕੁੰਜੀ ਰਿੰਗ ਡੈਮਨ ਨਾਲ ਸੰਪਰਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "ਆਈਟਮ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "ਗਨੋਮ-ਕੀਰਿੰਗ ਨੂੰ ਅਸੈੱਸ ਕਰਨ ਦੌਰਾਨ ਅੰਦਰੂਨੀ ਗਲਤੀ" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "ਡਿਸਪਲੇਅ ਨਿਸ਼ਾਨ" @@ -592,266 +576,325 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "ਸ਼ੁਰੂਆਤੀ ਆਰਜ਼ੀ ਆਈਟਮ" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "ਕੁੰਜੀ ਸਰਵਰ ਸ਼ਾਮਿਲ" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "ਹੋਸਟ:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "ਕੁੰਜੀ ਸਰਵਰ ਟਾਈਪ:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "ਹੋਸਟ:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "ਸਰਵਰ ਦੀ ਵਰਤੋਂ ਲਈ ਪੋਰਟ ਹੈ।" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "ਸ਼ੁਰੂਆਤੀ ਆਰਜ਼ੀ ਆਈਟਮ" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "ਇਸ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਵਰਜਨ" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "ਪ੍ਹੈਰਾ" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- ਸਿਸਟਮ ਸੈਟਿੰਗ" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "ਪਾਸਵਰਡ:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "ਯੋਗਦਾਨ:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "ਪੁਸ਼ਟੀ:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "ਪਾਸਵਰਡ ਅਤੇ ਕੁੰਜੀਆਂ" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "ਇੱਕ ਠੀਕ ਕੁੰਜੀ ਸਰਵਰ ਐਡਰੈੱਸ ਨਹੀਂ ਹੈ।" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n" +"ਪੰਜਾਬ ਓਪਨ ਸੋਰਸ ਟੀਮ ਦਾ ਉੱਦਮ\n" +"http://www.satluj.com/" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "ਮੱਦਦ ਲਈ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਜਾਂ ਕੁੰਜੀ ਸਰਵਰ ਦੇ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "ਸੀ-ਹਾਰਸ ਪ੍ਰੋਜੈਕਟ ਮੇਨ ਪੇਜ਼" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "ਕਸਟਮ" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "ਕੁੰਜੀ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "ਕੋਈ ਨਹੀਂ: ਕੁੰਜੀਆਂ ਪਬਲਿਸ਼ ਨਾ ਕਰੋ" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "ਡਾਟਾ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "ਕੁੰਜੀ ਸਰਵਰ ਤੋਂ ਕੁੰਜੀਆਂ ਆਟੋਮੈਟਿਕ ਹੀ ਲਵੋ(_k)" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "ਫਾਇਲ(_F)" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "ਸੋਧੀਆਂ ਕੁੰਜੀਆਂ ਨੂੰ ਕੁੰਜੀ ਸਰਵਰ ਨਾਲ ਆਟੋਮੈਟਿਕ ਸਮਕਾਲੀ ਕਰੋ(_m)" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "ਐਕਸਪੋਰਟ(_x)..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "ਕੁੰਜੀ ਸਰਵਰ" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ਫਾਇਲ ਵਿੱਚ ਐਕਸਪੋਰਟ" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "ਸੋਧ(_E)" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "ਹਟਾਓ(_D)" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਓ" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "ਇਹ ਆਈਟਮ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ ਵੇਖਾਓ" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "ਇਹ ਕੀਰਿੰਗ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ ਵੇਖਾਓ" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "ਮੇਰੀ ਪਸੰਦ(_n)" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "ਇਹ ਪਰੋਗਰਾਮ ਲਈ ਪਸੰਦ ਬਦਲੋ" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "ਵੇਖੋ(_V)" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "ਮੱਦਦ(_H)" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "ਇਹ ਪਰੋਗਰਾਮ ਬਾਰੇ" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "ਸਮੱਗਰੀ(_C)" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "ਸੀ-ਹਾਰਸ ਮੱਦਦ ਵੇਖੋ" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "ਐਕਸਪੋਰਟ" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "%s: ਲਈ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਦਿਓ" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "ਪਾਸਵਰਡ:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "ਪੁਸ਼ਟੀ:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "ਇੱਕ ਠੀਕ ਕੁੰਜੀ ਸਰਵਰ ਐਡਰੈੱਸ ਨਹੀਂ ਹੈ।" + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "ਮੱਦਦ ਲਈ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਜਾਂ ਕੁੰਜੀ ਸਰਵਰ ਦੇ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।" + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "ਕਸਟਮ" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "ਕੋਈ ਨਹੀਂ: ਕੁੰਜੀਆਂ ਪਬਲਿਸ਼ ਨਾ ਕਰੋ" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "ਮੇਰੀ ਪਸੰਦ" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "ਕੁੰਜੀ ਖੋਜੋ ਰਾਹੀਂ(_F):" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "ਕੁੰਜੀਆਂ ਪਬਲਿਸ਼ ਕਰੋ(_P):" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "ਡਾਟਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "ਡਾਟਾ ਐਕਸਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "ਕੁੰਜੀ ਸਰਵਰ ਤੋਂ ਕੁੰਜੀਆਂ ਆਟੋਮੈਟਿਕ ਹੀ ਲਵੋ(_k)" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "ਡਾਟਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "ਸੋਧੀਆਂ ਕੁੰਜੀਆਂ ਨੂੰ ਕੁੰਜੀ ਸਰਵਰ ਨਾਲ ਆਟੋਮੈਟਿਕ ਸਮਕਾਲੀ ਕਰੋ(_m)" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "ਨਾ-ਉਪਲੱਬਧ" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "ਕੁੰਜੀ ਸਰਵਰ" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d-%m-%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "ਕੁੰਜੀ ਡਾਟਾ" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "ਕਈ ਕੁੰਜੀਆਂ" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "ਸਭ ਕੁੰਜੀ ਫਾਇਲਾਂ" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "ਸਭ ਫਾਇਲਾਂ" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "ਅਕਾਇਵ ਫਾਇਲਾਂ" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"ਇਸ ਨਾਂ ਨਾਲ ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।\n" -"\n" -"ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਨਵੀਂ ਫਾਇਲ ਨਾਲ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "ਬਦਲੋ(_R)" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "ਅਣਜਾਣ" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "ਕਦੇ ਨਹੀਂ" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "ਅਧੂਰਾ" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "ਪੂਰਾ" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "ਬੇਅੰਤ" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "ਆਯੋਗ" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "ਮਨਸੂਖ" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "ਮੱਦਦ ਵੇਖਾਈ ਨਹੀਂ ਜਾ ਸਕੀ: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "ਮਿਆਦ:" +msgid "Never E_xpires" +msgstr "ਕਦੇ ਮਿਆਦ ਨਾ ਪੁੱਗੇ(_x)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "ਇੱਕ ਨਵੀਂ ਸਬ-ਕੁੰਜੀ ਬਣਾਓ" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "ਜੇ ਕੁੰਜੀ ਦੀ ਮਿਆਦ ਕਦੇ ਨਾ ਪੁੱਗੇ" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "ਕੁੰਜੀ ਕਿਸਮ(_T):" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "ਕੁੰਜੀ ਲੰਬਾਈ(_L):" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "ਕੁੰਜੀ ਕਿਸਮ(_T):" +msgid "Expiration Date:" +msgstr "ਮਿਆਦ:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "ਕੁੰਜੀ ਦੀ ਲੰਬਾਈ" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "ਕਦੇ ਮਿਆਦ ਨਾ ਪੁੱਗੇ(_x)" +msgid "Generate a new subkey" +msgstr "ਇੱਕ ਨਵੀਂ ਸਬ-ਕੁੰਜੀ ਬਣਾਓ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "ਯੂਜ਼ਰ ID ਸ਼ਾਮਲ" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "ਨਵਾਂ ਯੂਜ਼ਰ ID ਬਣਾਓ" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "ਪੂਰਾ ਨਾਂ(_N):" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "ਕੁੰਜੀ ਟਿੱਪਣੀ(_m):" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "ਘੱਟੋ-ਘੱਟ 5 ਅੱਖਰ ਹੋਣੇ ਲਾਜ਼ਮੀ ਹਨ" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "ਚੋਣਵਾਂ ਈ-ਮੇਲ ਐਡਰੈੱਸ" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "ਚੋਣਵੀਂ ਕੁੰਜੀ ਵੇਰਵਾ ਟਿੱਪਣੀ" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "ਚੋਣਵਾਂ ਈ-ਮੇਲ ਐਡਰੈੱਸ" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "ਪੂਰਾ ਨਾਂ(_N):" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ(_E):" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "ਕੁੰਜੀ ਟਿੱਪਣੀ(_m):" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "ਨਵਾਂ ਯੂਜ਼ਰ ID ਬਣਾਓ" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "ਬਦਲੋ(_h)" +msgid "_Never expires" +msgstr "ਕਦੇ ਨਹੀਂ ਮਿਆਦ ਪੁੱਗਦੀ(_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "ਕੁੰਜੀ ਮਨਸੂਖ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "ਕਦੇ ਨਹੀਂ ਮਿਆਦ ਪੁੱਗਦੀ(_N)" +msgid "C_hange" +msgstr "ਬਦਲੋ(_h)" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -862,7 +905,7 @@ msgid "Add subkey to %s" msgstr "%s ਵਿੱਚ ਸਬ-ਕੁੰਜੀ ਸ਼ਾਮਲ" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (ਸਿਰਫ਼ ਸਾਇਨ)" @@ -870,7 +913,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (ਸਿਰਫ਼ ਇੰਕ੍ਰਿਪਟ)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (ਕੇਵਲ ਸਾਇਨ)" @@ -891,6 +934,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "ਡਿ-ਕ੍ਰਿਪਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ। ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਕੋਲ ਡਿ-ਕ੍ਰਿਪਟ ਕੁੰਜੀ ਨਹੀਂ ਹੈ।" +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ ਗਈ" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "ਅਢੁੱਕਵੀਂ ਮਿਆਦ" @@ -908,46 +956,147 @@ msgid "Expiry: %s" msgstr "ਮਿਆਦ: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "ਕਈ ਕੁੰਜੀਆਂ" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "ਕੁੰਜੀ ਡਾਟਾ" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "ਅਰਮੋਰ PGP ਕੁੰਜੀਆਂ" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP ਕੁੰਜੀਆਂ" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP ਕੁੰਜੀ" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "ਈ-ਮੇਲ ਅਤੇ ਫਾਇਲਾਂ ਦੀ ਇੰਕ੍ਰਿਪਸ਼ਨ ਲਈ ਵਰਤੀ ਜਾਂਦੀ" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "PGP ਕੁੰਜੀ ਤਿਆਰ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "ਨਵੀਂ PGP ਕੁੰਜੀ ਲਈ ਪ੍ਹੈਰਾ" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "ਆਪਣੀ ਨਵੀਂ ਕੁੰਜੀ ਲਈ ਪ੍ਹੈਰਾ ਦੋ ਵਾਰ ਦਿਓ।" -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"ਜਦੋਂ ਕੁੰਜੀ ਬਣਾਉਣੀ ਹੋਵੇ ਤਾਂ ਸਾਨੂੰ ਬਹੁਤ ਸਾਰਾ ਰਲਵਾਂ ਡਾਟਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ\n" +"ਤੁਹਾਡੀ ਮੱਦਦ ਵੀ ਚਾਹੀਦੀ ਹੈ। ਕੁਝ ਹੋਰ ਕੰਮ ਕਰਨੇ ਚੰਗਾ\n" +"ਵਿਚਾਰ ਹੋ ਸਕਦਾ ਹੈ ਕਿਵੇਂ ਕਿ ਕੀਬੋਰਡ ਤੋਂ ਲਿਖਣਾ, ਮਾਊਸ\n" +"ਨੂੰ ਹਿਲਾਉਣਾ, ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨਾ।\n" +"ਇਸ ਨਾਲ ਸਿਸਟਮ ਨੂੰ ਰਲਵਾਂ ਡਾਟਾ ਮਿਲਦਾ ਹੈ, ਜਿਸ ਦੀ ਕਿ ਲੋੜ ਹੈ।" + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "ਕੁੰਜੀ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "ਕੀ ਤੁਸੀਂ %d ਕੁੰਜੀ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" +msgstr[1] "ਕੀ ਤੁਸੀਂ %d ਕੁੰਜੀਆਂ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "ਗਲਤ ਪਾਸਵਰਡ" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "ਇਹ ਤੁਸੀਂ ਤੀਜੀ ਵਾਰ ਗਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ। ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।" +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "ਗਲਤ ਪ੍ਹੈਰਾ" + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' ਲਈ ਨਵਾਂ ਪ੍ਹੈਰਾ ਦਿਓ" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' ਲਈ ਪ੍ਹੈਰਾ ਦਿਓ" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "ਨਵਾਂ ਪ੍ਹੈਰਾ ਦਿਓ" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "ਪ੍ਹੈਰਾ ਦਿਓ" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "ਪ੍ਹੈਰਾ" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d ਕੁੰਜੀ ਲੋਡ ਹੋਈ" +msgstr[1] "%d ਕੁੰਜੀਆਂ ਲੋਡ ਹੋਈਆਂ" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"ਗਲਤ ਕੁੰਜੀ ਡਾਟਾ (ਗੁੰਮ UID)। ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਆਉਣ ਵਾਲੇ ਸਮੇਂ ਦੀ ਮਿਤੀ ਸੈੱਟ ਕਰਨ " +"ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ " +"ਜਾਂ ਖੁਦ-ਦਸਤਖਤ ਗੁੰਮ ਹੋਣ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।" + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG ਕੁੰਜੀਆਂ" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: ਡਿਫਾਲਟ ਕੀਰਿੰਗ ਡਾਇਰੈਕਟਰੀ" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -982,27 +1131,31 @@ msgid "All JPEG files" msgstr "ਸਭ JPEG ਫਾਇਲਾਂ" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "ਸਭ ਫਾਇਲਾਂ" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "ਕੁੰਜੀ 'ਚ ਜੋੜਨ ਲਈ ਫੋਟੋ ਚੁਣੋ" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "ਫੋਟੋ ਤਿਆਰ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "ਫੋਟੋ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "ਫਾਇਲ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ। ਸ਼ਾਇਦ ਗਲਤ ਫਾਰਮੈਟ ਹੈ" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "ਕੀ ਤੁਸੀਂ ਆਪਣੀ ਕੁੰਜੀ ਨਾਲੋਂ ਮੌਜੂਦਾ ਫੋਟੋ ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "ਫੋਟੋ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ" @@ -1061,7 +1214,11 @@ msgid "Couldn't add revoker" msgstr "ਮਨਸੂਖਕਰਤਾ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "ਮੈਂ ਸਮਝਦਾ/ਸਮਝਦੀ ਹਾਂ ਕਿ ਇਹ ਗੁਪਤ ਕੁੰਜੀ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਈ ਜਾਵੇਗੀ।" + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1076,11 +1233,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "ਸਾਇਨ ਕਰਨ ਲਈ ਕੁੰਜੀ ਵਰਤੋਂ ਯੋਗ ਨਹੀਂ ਹੈ" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1088,509 +1245,573 @@ "ਤੁਹਾਡੀ ਕੋਈ ਨਿੱਜੀ PGP ਕੁੰਜੀ ਨਹੀਂ ਹੈ, ਜੋ ਕਿ ਇਸ ਕੁੰਜੀ ਉੱਤੇ ਤੁਹਾਡੇ ਟਰੱਸਟ ਨੂੰ " "ਵੇਖਾਉਣ ਲਈ ਵਰਤੀ ਜਾ ਸਕੇ।" -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "ਗਲਤ ਪ੍ਹੈਰਾ" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s' ਲਈ ਨਵਾਂ ਪ੍ਹੈਰਾ ਦਿਓ" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "ਖੋਜ ਬਹੁਤ ਸੰਖੇਪ ਨਹੀਂ ਹੈ। ਸਰਵਰ '%s' ਨੇ ਬਹੁਤ ਸਾਰੀਆਂ ਕੁੰਜੀਆਂ ਲੱਭੀਆਂ ਹਨ।" -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s' ਲਈ ਪ੍ਹੈਰਾ ਦਿਓ" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "ਨਵਾਂ ਪ੍ਹੈਰਾ ਦਿਓ" +msgid "Couldn't communicate with server '%s': %s" +msgstr "'%s' ਸਰਵਰ ਨਾਲ ਸੰਚਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "ਪ੍ਹੈਰਾ ਦਿਓ" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP ਕੁੰਜੀ ਸਰਵਰ" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "ਕੁੰਜੀ ਸਰਵਰ ਤੋਂ ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "ਰਿਮੋਟ(_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ ਖੋਜ(_F)..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "ਇੱਕ ਕੁੰਜੀ ਸਰਵਰ ਉੱਤੇ ਕੁੰਜੀਆਂ ਲਈ ਖੋਜ" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "ਇੰਪੋਰਟ(_I)" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "ਚੁਣੀਆਂ ਕੁੰਜੀਆਂ ਲੋਕਲ ਕੀਰਿੰਗ ਵਿੱਚ ਇੰਪੋਰਟ ਕਰੋ" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d ਕੁੰਜੀ ਲੋਡ ਹੋਈ" -msgstr[1] "%d ਕੁੰਜੀਆਂ ਲੋਡ ਹੋਈਆਂ" +msgid "Remote Keys Containing '%s'" +msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ 'ਚ '%s' ਹੈ" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "ਕੁੰਜੀਆਂ ਦੀ ਖੋਜ ਫੇਲ੍ਹ ਹੈ।" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ ਖੋਜ" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"ਗਲਤ ਕੁੰਜੀ ਡਾਟਾ (ਗੁੰਮ UID)। ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਆਉਣ ਵਾਲੇ ਸਮੇਂ ਦੀ ਮਿਤੀ ਸੈੱਟ ਕਰਨ " -"ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ " -"ਜਾਂ ਖੁਦ-ਦਸਤਖਤ ਗੁੰਮ ਹੋਣ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।" +"ਇਹ ਇੰਟਰਨੈੱਟ ਤੋਂ ਹੋਰਾਂ ਲਈ ਕੁੰਜੀਆਂ ਲੱਭੇਗਾ। ਇਹ ਕੁੰਜੀਆਂ ਤੁਹਾਨੂੰ ਲੋਕਲ ਕੀਰਿੰਗ ਵਿੱਚ " +"ਇੰਪੋਰਟ ਵੀ ਕੀਤਾ ਜਾ ਸਕਦਾ " +"ਹੈ।" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "ਇਹ ਰੱਖਣ ਵਾਲੀਆਂ ਕੁੰਜੀਆਂ ਦੀ ਖੋਜ(_S):" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP ਕੁੰਜੀ ਸਰਵਰ" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "ਕੁੰਜੀ ਸਰਵਰ:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "ਕੁੰਜੀਆਂ ਮੇਰੇ ਨੇੜੇ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "ਕਿੱਥੇ ਖੋਜਣਾ:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "ਖੋਜ(_S)" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "ਕੁੰਜੀਆਂ ਸਰਵਰ ਉੱਤੇ ਪਬਲਿਸ਼ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "ਖੋਜ ਬਹੁਤ ਸੰਖੇਪ ਨਹੀਂ ਹੈ। ਸਰਵਰ '%s' ਨੇ ਬਹੁਤ ਸਾਰੀਆਂ ਕੁੰਜੀਆਂ ਲੱਭੀਆਂ ਹਨ।" +msgid "Couldn't retrieve keys from server: %s" +msgstr "ਸਰਵਰ ਤੋਂ ਕੁੰਜੀਆਂ ਲਈਆਂ ਨਹੀਂ ਜਾ ਸਕੀਆਂ: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "'%s' ਸਰਵਰ ਨਾਲ ਸੰਚਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d ਕੁੰਜੀ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਚੁਣੀ ਗਈ।" +msgstr[1] "%d ਕੁੰਜੀਆਂ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਚੁਣੀਆਂ ਗਈਆਂ।" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "ਕੁੰਜੀਆਂ ਸਿਕਰੋਨਾਈਜ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "ਕੁੰਜੀਆਂ ਸਿਕਰੋਨਾਈਜ਼" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਕੀਰਿੰਗ ਵਿੱਚੋਂ ਕੁੰਜੀਆਂ ਨੂੰ ਪਬਲਿਸ਼ ਕੀਤਾ ਜਾਵੇਗਾ ਤਾਂ ਕਿ ਉਹਨਾਂ ਨੂੰ " +"ਹੋਰਾਂ ਨੂੰ ਵਰਤਣ ਵਾਸਤੇ " +"ਉਪਲੱਬਧ ਕਰਵਾਇਆ ਜਾਵੇ। ਤੁਸੀਂ ਹੋਰਾਂ ਵਲੋਂ ਕੀਤੇ ਬਦਲਾਅ ਵੀ ਵੇਖ ਸਕੋਗੇ, ਜਦੋਂ ਤੁਸੀਂ " +"ਉਨ੍ਹਾਂ ਦੀਆਂ ਕੁੰਜੀਆਂ ਲੈ ਲਈਆਂ।" + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"ਇਹ ਹੋਰਾਂ ਵਲੋਂ ਕੀਤੇ ਕੋਈ ਵੀ ਬਦਲਾਅ ਲਵੇਗਾ, ਜਦੋਂ ਤੋਂ ਤੁਸੀ ਉਨ੍ਹਾਂ ਦੀਆਂ ਕੁੰਜੀਆਂ ਲਈਆਂ " +"ਹਨ। ਪਬਲਿਸ਼ ਕਰਨ ਲਈ " +"ਕੋਈ ਕੁੰਜੀ ਸਰਵਰ ਨਹੀਂ ਚੁਣਿਆ ਗਿਆ, ਇਸ ਕਰਕੇ ਤੁਹਾਡੀਆਂ ਕੁੰਜੀਆਂ ਨੂੰ ਹੋਰਾਂ ਲਈ ਉਪਲੱਬਧ " +"ਨਹੀਂ ਕਰਵਾਇਆ ਜਾਵੇਗਾ।" + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "ਕੁੰਜੀ ਸਰਵਰ(_K)" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "ਸੈਕਰੋ(_S)" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "'%s' ਨਾਲ ਸੰਚਾਰ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਿਆ: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "ਕੁਨੈਕਟ ਜਾ ਰਿਹਾ ਹੈ: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "ਐਡਰੈੱਸ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "ਸਰਵਰ ਐਡਰੈੱਸ ਹੱਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP ਕੁੰਜੀ ਸਰਵਰ" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "ਸਾਇਨ ਕੁੰਜੀ(_S)..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਸਾਇਨ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "ਕੀ ਤੁਸੀਂ %d ਕੁੰਜੀਆਂ ਅਤੇ ਪਛਾਣ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "ਕੀ ਤੁਸੀਂ %d ਕੁੰਜੀ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "ਕੀ ਤੁਸੀਂ %d ਪਛਾਣਾਂ ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "ਕੁੰਜੀਆਂ ਸਮਕਾਲੀ ਅਤੇ ਪਬਲਿਸ਼ ਕਰੋ(_S)..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "ਯੂਜ਼ਰ ID ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "ਉਨ੍ਹਾਂ ਆਨਲਾਇਨ ਨਾਲ ਆਪਣੀਆਂ ਕੁੰਜੀਆਂ ਪਬਲਿਸ਼ ਕਰੋ ਅਤੇ/ਜਾਂ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ।" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP ਕੁੰਜੀਆਂ" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "ਈ-ਮੇਲ ਅਤੇ ਫਾਇਲਾਂ ਦੀ ਇੰਕ੍ਰਿਪਸ਼ਨ ਲਈ PGP ਕੁੰਜੀਆਂ" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "ਤਕਨੀਕੀ ਕੁੰਜੀ ਚੋਣਾਂ(_A)" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "ਬਣਾਓ(_r)" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "ਇੱਕ ਨਵੀਂ ਕੁੰਜੀ ਬਣਾਓ" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "ਇੱਕ PGP ਕੁੰਜੀ ਤੁਹਾਨੂੰ ਹੋਰ ਲੋਕਾਂ ਨੂੰ ਈ-ਮੇਲ ਅਤੇ ਫਾਇਲਾਂ ਨੂੰ ਇੰਕ੍ਰਿਪਟ ਕਰਨ ਲਈ " "ਸਹਾਇਕ ਹੈ।" -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "ਐਲੋਗਰਿਥਮ ਇੱਥੇ" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "ਬਣਾਓ(_r)" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "ਟਿੱਪਣੀ(_C):" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "ਮਿਆਦ ਮਿਤੀ(_x):" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "ਕਦੇਂ ਮਿਆਦ ਖਤਮ ਨਹੀਂ(_v)" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਿਸਮ(_T):" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "ਇੱਕ ਨਵੀਂ ਕੁੰਜੀ ਬਣਾਓ" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "ਕੁੰਜੀ ਤਾਕਤ ਬਿੱਟ(_S):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "ਕਦੇਂ ਮਿਆਦ ਖਤਮ ਨਹੀਂ(_v)" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "ਨਵੀਂ PGP ਕੁੰਜੀ" +msgid "E_xpiration Date:" +msgstr "ਮਿਆਦ ਮਿਤੀ(_x):" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "ਟਿੱਪਣੀ(_C):" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "ਤਕਨੀਕੀ ਕੁੰਜੀ ਚੋਣਾਂ(_A)" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "ਮਿਆਦ ਪੁੱਗੀ" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "ਨਿੱਜੀ PGP ਕੁੰਜੀ" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP ਕੁੰਜੀ" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "ਪ੍ਰਾਇਮਰੀ ਯੂਜ਼ਰ ID ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "ਕੀ ਤੁਸੀਂ '%s' ਯੂਜ਼ਰ ID ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "ਯੂਜ਼ਰ ID ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[ਅਣਜਾਣ]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "ਨਾਂ/ਈ-ਮੇਲ" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ਦਸਤਖਤ ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "ਪ੍ਰਾਇਮਰੀ ਫੋਟੋ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕੀ" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(ਅਣਜਾਣ)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "ਇਹ ਕੁੰਜੀ ਦੀ ਮਿਆਦ ਹੈ: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "ਨਾਂ" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" -msgstr "ਕੀ ਤੁਸੀਂ %2$s ਦੀ ਸਬ-ਕੁੰਝੀ %1$d ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" +msgstr "ਕੀ ਤੁਸੀਂ %2$s ਦੀ ਸਬ-ਕੁੰਜੀ %1$d ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "ਸਬ-ਕੁੰਜੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "ਟਰੱਸਟ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "\"%s\" ਲਈ ਕੁੰਜੀ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "ਪੂਰੀ ਕੁੰਜੀ ਐਕਸਪੋਰਟ" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "ਕੁੰਜੀ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।" +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "ਕੁੰਜੀ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "ਕਦੇ ਨਹੀਂ" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "ਕਿਸਮ" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "ਬਣਾਈ" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "ਮਿਆਦ" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "ਹਾਲਤ" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "ਤਾਕਤ" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "ਮਿਆਦ ਪੁੱਗੀ" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "ਉੱਤਮ" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ਕੁੰਜੀ ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "ਐਕਸ਼ਨ" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "ਟਿੱਪਣੀ:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "ਤਾਰੀਖ" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "ਈ-ਮੇਲ:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "ਫਿੰਗਰ-ਪ੍ਰਿੰਟ" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ਕੁੰਜੀ ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "ਕਦੇ ਨਹੀਂ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "ਕੁੰਜੀ ਨਾਂ ਅਤੇ ਦਸਤਖਤ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "ਇਹ ਕੁੰਜੀ ਮਨਸੂਖ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "ਫੋਟੋ " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "ਕੁੰਜੀ ਦੇ ਓਨਰ ਨੇ ਕੁੰਜੀ ਮਨਸੂਖ ਕਰ ਦਿੱਤੀ ਹੈ। ਇਹ ਵਰਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "ਇਹ ਕੁੰਜੀ ਦੀ ਮਿਆਦ ਪੁੱਗੀ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "ਇਹ ਕੁੰਜੀ ਮਨਸੂਖ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ" +msgid "Add a photo to this key" +msgstr "ਇਹ ਕੁੰਜੀ ਲਈ ਇੱਕ ਫੋਟੋ ਜੋੜੋ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "ਇਹ ਕੁੰਜੀ ਦੀ ਮਿਆਦ ਪੁੱਗੀ" +msgid "Remove this photo from this key" +msgstr "ਇਹ ਕੁੰਜੀ ਤੋਂ ਇਹ ਫੋਟੋ ਹਟਾਓ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "ਕਿਸਮ:" +msgid "Make this photo the primary photo" +msgstr "ਇਹ ਫੋਟੋ ਪ੍ਰਾਇਮਰੀ ਫੋਟੋ ਬਣਾਓ" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "ਵਰਤੋਂ:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "ਪਿਛਲੀ ਫੋਟੋ 'ਤੇ ਜਾਓ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "ਸਬ-ਕੁੰਜੀ(_S)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "ਅਗਲੀ ਫੋਟੋ 'ਤੇ ਜਾਓ" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "ਸ਼ਾਮਲ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "ਫੋਟੋ " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "ਇਹ ਕੁੰਜੀ ਲਈ ਇੱਕ ਫੋਟੋ ਜੋੜੋ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ਕੁੰਜੀ ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "ਪ੍ਹੈਰਾ ਬਦਲੋ(_P)" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "ਨਾਂ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "ਡਿਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਅਤੇ ਈ-ਮੇਲ ਤੁਹਾਨੂੰ ਭੇਜੀ ਗਈ।" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "ਈ-ਮੇਲ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "ਹਟਾਓ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "ਟਿੱਪਣੀ:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "ਮਿਆਦ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "ਵਰਤੋਂ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "ਮਿਆਦ:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "ਕਿਸਮ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "ਐਕਸਪੋਰਟ" +msgid "Decrypt files and email sent to you." +msgstr "ਡਿਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਅਤੇ ਈ-ਮੇਲ ਤੁਹਾਨੂੰ ਭੇਜੀ ਗਈ।" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "ਪ੍ਰਾਈਵੇਟ PGP ਕੁੰਜੀ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "ਅਗਲੀ ਫੋਟੋ 'ਤੇ ਜਾਓ" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "ਪ੍ਹੈਰਾ ਬਦਲੋ(_P)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "ਪਿਛਲੀ ਫੋਟੋ 'ਤੇ ਜਾਓ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "ਮਾਲਕ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ਕੁੰਜੀ ID:" +msgid "Key Names and Signatures" +msgstr "ਕੁੰਜੀ ਨਾਂ ਅਤੇ ਦਸਤਖਤ" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "ਪ੍ਰਾਇਮਰੀ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "ਇਹ ਫੋਟੋ ਪ੍ਰਾਇਮਰੀ ਫੋਟੋ ਬਣਾਓ" +msgid "Sign" +msgstr "ਸਾਇਨ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "ਨਾਂ ਅਤੇ ਦਸਤਖਤ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "ਹਟਾਓ" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "ਕਦੇ ਨਹੀਂ" +msgid "_Add Name" +msgstr "ਨਾਂ ਜੋੜੋ(_A)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "ਓਨਰ ਟਰੱਸਟ ਅਣਡਿੱਠਾ(_T):" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "ਮਾਲਕ" +msgid "Revoke" +msgstr "ਵਾਪਿਸ" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "ਪ੍ਰਾਇਮਰੀ" +msgid "Names and Signatures" +msgstr "ਨਾਂ ਅਤੇ ਦਸਤਖਤ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "ਪ੍ਰਾਈਵੇਟ PGP ਕੁੰਜੀ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ਕੁੰਜੀ ID:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "ਇਹ ਕੁੰਜੀ ਤੋਂ ਇਹ ਫੋਟੋ ਹਟਾਓ" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "ਵਾਪਿਸ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "ਸ਼ਕਤੀ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "ਸਾਇਨ" +msgid "Technical Details" +msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "ਸ਼ਕਤੀ:" +msgid "Fingerprint" +msgstr "ਫਿੰਗਰ-ਪ੍ਰਿੰਟ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "ਕੁੰਜੀ ਦੇ ਓਨਰ ਨੇ ਕੁੰਜੀ ਮਨਸੂਖ ਕਰ ਦਿੱਤੀ ਹੈ। ਇਹ ਵਰਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "ਮਿਆਦ:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "ਨਾਂ ਜੋੜੋ(_A)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "ਤਾਰੀਖ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "ਓਨਰ ਟਰੱਸਟ ਅਣਡਿੱਠਾ(_T):" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "ਪੂਰੀ ਕੁੰਜੀ ਐਕਸਪੋਰਟ(_E):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "ਨਾਂ:" +msgid "Actions" +msgstr "ਐਕਸ਼ਨ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "ਤਾਰੀਖ:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "ਸ਼ਾਮਲ" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "ਮਿਆਦ" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "ਸਬ-ਕੁੰਜੀ(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "ਅਧੂਰਾ" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "ਫਿੰਗਰ-ਪ੍ਰਿੰਟ:" +msgid "Fully" +msgstr "ਪੂਰਾ" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "ਭਰੋਸਾ ਵੇਖਾਉਦਾ ਹੈ:" +msgid "Ultimately" +msgstr "ਬੇਅੰਤ" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "ਇਹ ਕੁੰਜੀ ਲਈ ਤੁਹਾਡਾ ਭਰੋਸਾ" +msgid "Encrypt files and email to the key's owner" +msgstr "ਕੁੰਜੀ ਦੇ ਓਨਰ ਲਈ ਇੰਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਅਤੇ ਈਮੇਲ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "ਪਬਲਿਕ PGP ਕੁੰਜੀ" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "ਹੋਰ ਨਾਂ(_O):" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "ਲੋਕ, ਜਿੰਨ੍ਹਾਂ ਇਸ ਕੁੰਜੀ ਉੱਤੇ ਦਸਤਖਤ ਕੀਤੇ ਹਨ(_P):" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "ਕੁੰਜੀ ਦੇ ਓਨਰ ਤੋਂ ਇੰਕ੍ਰਿਪਟ ਫਾਇਲਾਂ ਅਤੇ ਈਮੇਲ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "ਇਹ ਕੁੰਜੀ ਲਈ ਤੁਹਾਡਾ ਭਰੋਸਾ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "ਪੂਰਾ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "ਤੁਹਾਡਾ ਟਰੱਸਟ ਖੁਦ ਵੇਰਵਾ ਟੈਬ ਵਿੱਚ ਦਿੱਤਾ ਗਿਆ ਹੈ।" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "ਮੈਂ '%s' ਵਲੋਂ ਹੋਰ ਕੁੰਜੀਆਂ ਉੱਤੇ ਦਸਤਖਤਾਂ ਉੱਤੇ ਭਰੋਸਾ ਕਰਦਾ ਹਾਂ " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1599,7 +1820,11 @@ "ਜੇ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ ਕਿ ਉਹ ਵਿਅਕਤੀ ਇਹ '%s' ਕੁੰਜੀ ਰੱਖਦਾ ਹੈ ਤਾਂ ਇਸ ਕੁੰਜੀ ਲਈ " "ਸਾਈਨ ਕਰੋ।" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "ਇਹ ਕੁੰਜੀ ਉੱਤੇ ਸਾਇਨ(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1607,43 +1832,38 @@ "ਜੇ ਤੁਸੀਂ ਇਹ ਭਰੋਸਾ ਨਹੀਂ ਕਰਦੇ ਹੋ ਕਿ '%s' ਇਹ ਕੁੰਜੀ ਰੱਖਦਾ ਹੈ ਤਾਂ ਆਪਣੇ ਦਸਤਖਤ " "ਮਨਸੂਖ ਕਰੋ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "ਅਧੂਰਾ" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "ਪਬਲਿਕ PGP ਕੁੰਜੀ" +msgid "_Revoke Signature" +msgstr "ਦਸਤਖਤ ਮਨਸੂਖ(_R)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "ਲੋਕ, ਜਿੰਨ੍ਹਾਂ ਇਸ ਕੁੰਜੀ ਉੱਤੇ ਦਸਤਖਤ ਕੀਤੇ ਹਨ(_P):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "ਸਿਰਫ਼ ਉਨ੍ਹਾਂ ਲੋਕਾਂ ਦਾ ਭਰੋਸਾ ਹੀ ਵੇਖਾਓ, ਜਿੰਨ੍ਹਾਂ ਉੱਤੇ ਮੈਨੂੰ ਭਰੋਸਾ ਹੈ(_O)" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "ਟਰੱਸਟ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "ਬੇਅੰਤ" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "ਤੁਸੀਂ ਓਨਰ ਉੱਤੇ ਟਰੱਸਟ ਕਰ ਸਕਦੇ ਹੋ(_T):" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "ਤੁਹਾਡਾ ਟਰੱਸਟ ਖੁਦ ਵੇਰਵਾ ਟੈਬ ਵਿੱਚ ਦਿੱਤਾ ਗਿਆ ਹੈ।" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "ਫਿੰਗਰ-ਪ੍ਰਿੰਟ:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "ਸਿਰਫ਼ ਉਨ੍ਹਾਂ ਲੋਕਾਂ ਦਾ ਭਰੋਸਾ ਹੀ ਵੇਖਾਓ, ਜਿੰਨ੍ਹਾਂ ਉੱਤੇ ਮੈਨੂੰ ਭਰੋਸਾ ਹੈ(_O)" +msgid "Dates:" +msgstr "ਤਾਰੀਖ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "ਦਸਤਖਤ ਮਨਸੂਖ(_R)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "ਭਰੋਸਾ ਵੇਖਾਉਦਾ ਹੈ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "ਇਹ ਕੁੰਜੀ ਉੱਤੇ ਸਾਇਨ(_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "ਤੁਸੀਂ ਓਨਰ ਉੱਤੇ ਟਰੱਸਟ ਕਰ ਸਕਦੇ ਹੋ(_T):" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1651,57 +1871,61 @@ msgstr "%2$s ਦੀ %1$d ਸਬਕੁੰਜੀ" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "ਮਨਸੂਖ ਕਰਨ ਲਈ ਚੋਣਵਾਂ ਵੇਰਵਾ" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "ਮਨਸੂਖ(_v)" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "ਕੁੰਜੀ ਮਨਸੂਖ ਕਰਨ ਲਈ ਕਾਰਨ" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "ਕਾਰਨ(_R):" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "ਮਨਸੂਖ ਕਰਨ ਲਈ ਚੋਣਵਾਂ ਵੇਰਵਾ" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "ਮਨਸੂਖ(_v)" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ PGP ਕੁੰਜੀਆਂ ਨਹੀਂ ਹਨ, ਜੋ ਕਿ ਇੱਕ ਡੌਕੂਮੈਂਟ ਜਾਂ ਸੁਨੇਹਾ ਨੂੰ ਸਾਇਨ " "ਕਰਨ ਲਈ ਵਰਤੀਆਂ ਜਾ ਸਕਣ।" +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "ਸੁਨੇਹੇ ਉੱਤੇ ਕੁੰਜੀ ਨਾਲ ਸਾਇਨ ਕਰੋ(_S):" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "ਕਿੰਨੇ ਧਿਆਨ ਨਾਲ ਤੁਸੀਂ ਇਹ ਕੁੰਜੀ ਚੈੱਕ ਕੀਤੀ ਹੈ?" +msgid "Sign Key" +msgstr "ਕੁੰਜੀ ਸਾਈਨ" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "ਹੋਰ ਇਸ ਦਸਤਖਤ ਕਿਵੇਂ ਵੇਖ ਸਕਦੇ ਹਨ:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "ਇਹ ਸਾਇਨ ਕਰਨ ਨਾਲ ਤੁਸੀਂ ਇਹ ਵੇਖਾ ਰਹੇ ਹੋ ਕਿ ਇਹ ਕੁੰਜੀ ਸਬੰਧਿਤ ਹੈ:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "ਸਾਇਨ ਕੁੰਜੀ ਉੱਤੇ ਇੰਝ:" +msgid "Key Name" +msgstr "ਕੁੰਜੀ ਨਾਂ" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"ਅਸਾਵਧਾਨ: ਮਤਲਬ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਧਾਰਨ ਜੇਹੀ ਜਾਂਚ ਹੀ ਕੀਤੀ ਹੈ, ਜੋ ਕਿ ਕੁੰਜੀ ਦੇ " -"ਮਾਲਕ ਵਲੋਂ " -"ਆਪਣਾ ਹੋਣ ਦੇ ਦਾਅਵੇ ਲਈ ਕੀਤੀ ਗਈ ਹੈ। ਉਦਾਹਰਨ ਲਈ ਤੁਸੀਂ ਕੁੰਜੀ ਫਿੰਗਰਪਰਿੰਟ ਲਈ ਓਨਰ ਨਾਲ " -"ਫੋਨ ਉੱਤੇ " -"ਗੱਲਬਾਤ ਕੀਤੀ ਹੈ।" +msgid "How carefully have you checked this key?" +msgstr "ਕਿੰਨੇ ਧਿਆਨ ਨਾਲ ਤੁਸੀਂ ਇਹ ਕੁੰਜੀ ਚੈੱਕ ਕੀਤੀ ਹੈ?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "ਕੁੰਜੀ ਨਾਂ" +msgid "_Not at all" +msgstr "ਕੁਝ ਵੀ ਨਹੀਂ(_N)" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "ਅਸਾਵਧਾਨੀ ਨਾਲ(_C)" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "ਧਿਆਨ ਨਾਲ ਜਾਂਚ(_V)" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1710,7 +1934,19 @@ "ਰੱਖਣ ਦਾ ਦਾਅਵਾ " "ਕਰਦਾ ਹੈ, ਪਰ ਤੁਸੀਂ ਇਸ ਤੱਥ ਦੀ ਜਾਂਚ ਕਰ ਨਹੀਂ ਸਕੇ ਜਾਂ ਨਹੀਂ ਕੀਤੀ ਹੈ।" -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"ਅਸਾਵਧਾਨ: ਮਤਲਬ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਧਾਰਨ ਜੇਹੀ ਜਾਂਚ ਹੀ ਕੀਤੀ ਹੈ, ਜੋ ਕਿ ਕੁੰਜੀ ਦੇ " +"ਮਾਲਕ ਵਲੋਂ " +"ਆਪਣਾ ਹੋਣ ਦੇ ਦਾਅਵੇ ਲਈ ਕੀਤੀ ਗਈ ਹੈ। ਉਦਾਹਰਨ ਲਈ ਤੁਸੀਂ ਕੁੰਜੀ ਫਿੰਗਰਪਰਿੰਟ ਲਈ ਓਨਰ ਨਾਲ " +"ਫੋਨ ਉੱਤੇ " +"ਗੱਲਬਾਤ ਕੀਤੀ ਹੈ।" + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1718,18 +1954,6 @@ "ਬਹੁਤ ਧਿਆਨ ਨਾਲ: ਇਹ ਤਾਂ ਹੀ ਚੁਣੋ, ਜੇ ਤੁਸੀਂ ਇਹ ਜਾਣਦੇ ਹੋ ਕਿ ਇਹ ਕੁੰਜੀ " "ਬਿਲਕੁੱਲ ਠੀਕ ਹੈ।" -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "ਇਹ ਸਾਇਨ ਕਰਨ ਨਾਲ ਤੁਸੀਂ ਇਹ ਵੇਖਾ ਰਹੇ ਹੋ ਕਿ ਇਹ ਕੁੰਜੀ ਸਬੰਧਿਤ ਹੈ:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "ਮੈਂ ਇਹ ਦਸਤਖਤ ਬਾਅਦ ਵਿੱਚ ਵਾਪਸ ਲੈ ਸਕਦਾ ਹਾਂ(_r)" - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "ਕੁੰਜੀ ਸਾਈਨ" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1743,482 +1967,355 @@ "ਨਾਲ ਹੀ ਸਬੰਧਿਤ ਹੈ।" #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "ਅਸਾਵਧਾਨੀ ਨਾਲ(_C)" +msgid "How others will see this signature:" +msgstr "ਹੋਰ ਇਸ ਦਸਤਖਤ ਕਿਵੇਂ ਵੇਖ ਸਕਦੇ ਹਨ:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "ਕੁਝ ਵੀ ਨਹੀਂ(_N)" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "ਹੋਰ ਇਹ ਦਸਤਖਤ ਸ਼ਾਇਦ ਨਹੀਂ ਵੇਖ ਸਕਦੇ(_O)" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "ਮੈਂ ਇਹ ਦਸਤਖਤ ਬਾਅਦ ਵਿੱਚ ਵਾਪਸ ਲੈ ਸਕਦਾ ਹਾਂ(_r)" + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "ਸਾਇਨ(_S)" +msgid "Sign key as:" +msgstr "ਸਾਇਨ ਕੁੰਜੀ ਉੱਤੇ ਇੰਝ:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "ਸਾਇਨਰ(_S):" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "ਧਿਆਨ ਨਾਲ ਜਾਂਚ(_V)" +msgid "_Sign" +msgstr "ਸਾਇਨ(_S)" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "ਸੁਨੇਹੇ ਉੱਤੇ ਕੁੰਜੀ ਨਾਲ ਸਾਇਨ ਕਰੋ(_S):" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "ਡਾਟਾ ਐਕਸਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "ਡਾਟਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "ਡਾਟਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "ਨਾ-ਉਪਲੱਬਧ" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "ਨਿੱਜੀ ਸਰਟੀਫਿਕੇਟ ਅਤੇ ਕੁੰਜੀ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "ਨਿੱਜੀ ਸਰਟੀਫਿਕੇਟ" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "ਸਰਟੀਫਿਕੇਟ" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "ਸਰਟੀਫਿਕੇਟ (DER ਇੰਕੋਡ)" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "ਕੀ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ '%s' ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "ਸਰਟੀਫਿਕੇਟ" -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "ਕੀ ਤੁਸੀਂ %d ਸਰਟੀਫਿਕੇਟ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -msgstr[1] "ਕੀ ਤੁਸੀਂ %d ਪਾਸਵਰਡਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 ਸਰਟੀਫਿਕੇਟ ਅਤੇ ਸਬੰਧਿਤ ਕੁੰਜੀਆਂ" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "ਕੀ ਤੁਸੀਂ %d ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" +msgstr[1] "ਕੀ ਤੁਸੀਂ %d ਸਰਟੀਫਿਕੇਟਾਂ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਤਿਆਰ ਨਹੀਂ ਜਾ ਸਕੀ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "ਬਣਾਓ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "ਸਰਟੀਫਿਕੇਟ ਮੰਗਣ ਲਈ ਵਰਤਿਆ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "ਇੱਕ ਨਵੀਂ ਨਿੱਜੀ (ਪ੍ਰਾਈਵੇਟ) ਕੁੰਜੀ ਬਣਾਓ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "ਲੇਬਲ:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "ਸਟੋਰ:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "ਮੈਂ ਸਮਝਦਾ/ਸਮਝਦੀ ਹਾਂ ਕਿ ਇਹ ਕੁੰਜੀ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਈ ਜਾਵੇਗੀ।" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "ਬਿਨ-ਨਾਂ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "ਸਰਟੀਫਿਕੇਟ ਐਕਸਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ" -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ" +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "ਐਕਸਪੋਰਟ(_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "ਸਰਟੀਫਿਕੇਟ ਐਕਸਪੋਰਟ ਕਰੋ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਜਾਂ ਕੁੰਜੀ ਹਟਾਓ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮੰਗ(_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "ਇਸ ਕੁੰਜੀ ਲਈ ਇੱਕ ਸਰਟੀਫਿਕੇਟ ਮੰਗ ਫਾਇਲ ਬਣਾਓ" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "ਸਰਟੀਫਿਕੇਟ ਮੰਗ ਸੰਭਾਲੀ ਜਾ ਸਕੀ" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "ਸਰਟੀਫਿਕੇਟ ਮੰਗ ਸੰਭਾਲੋ" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "ਸਰਟੀਫਿਕੇਟ ਮੰਗ" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM ਨਾਲ ਇੰਕੋਡ ਕੀਤੀ ਮੰਗ" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "ਸਰਟੀਫਿਕੇਟ ਮੰਗ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "ਇੱਕ ਸਰਟੀਫਿਕੇਟ ਮੰਗ ਫਾਇਲ ਬਣਾਉ।" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "ਸਰਟੀਫਿਕੇਟ ਮੰਗ ਵਿੱਚ ਮੌਜੂਦ ਕਾਮਨ ਨੇਮ (CN)।" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "ਨਾਂ (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "ਬਿਨਾਂ-ਨਾਂ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "ਪ੍ਹੈਰਾ ਬਦਲੋ" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "ਪ੍ਹੈਰਾ ਪੁਸ਼ਟੀ(_f):" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "ਨਵਾਂ ਪ੍ਹੈਰਾ ਪੁਸ਼ਟੀ" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "ਨਵਾਂ ਪ੍ਹੈਰਾ(_P):" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "ਆਪਣੇ ਪਾਸਵਰਡ ਅਤੇ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਦੇਖਭਾਲ ਕਰੋ" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "ਪਾਸਵਰਡ ਅਤੇ ਕੁੰਜੀਆਂ" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "ਬਣਾਉਣ ਲਈ ਆਈਟਮ ਦੀ ਕਿਸਮ ਚੁਣੋ(_S):" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "ਜਾਰੀ ਰੱਖੋ(_o)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "ਨਵੀਂ ਬਣਾਓ..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "ਚੁਣੀ %d ਕੁੰਜੀ" -msgstr[1] "ਚੁਣੀਆਂ %d ਕੁੰਜੀਆਂ" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਕੁੰਜੀਆਂ" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr " ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "ਬੇਪਛਾਣ ਕੁੰਜੀ ਕਿਸਮ ਹੈ ਜਾਂ ਗਲਤ ਡਾਟਾ ਫਾਰਮੈਟ" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "ਰਿਮੋਟ(_R)" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "ਇਹ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰੋ" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "ਨਵਾਂ(_N)..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "ਨਵੀਂ ਕੁੰਜੀ ਜਾਂ ਆਈਟਮ ਬਣਾਓ" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "ਇੰਪੋਰਟ(_I)" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "ਫਾਇਲ ਤੋਂ ਇੰਪੋਰਟ ਕਰੋ" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਇੰਪੋਰਟ ਕਰੋ" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ ਖੋਜ(_F)..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "ਇੱਕ ਕੁੰਜੀ ਸਰਵਰ ਉੱਤੇ ਕੁੰਜੀਆਂ ਲਈ ਖੋਜ" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "ਕੁੰਜੀਆਂ ਸਮਕਾਲੀ ਅਤੇ ਪਬਲਿਸ਼ ਕਰੋ(_S)..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "ਉਨ੍ਹਾਂ ਆਨਲਾਇਨ ਨਾਲ ਆਪਣੀਆਂ ਕੁੰਜੀਆਂ ਪਬਲਿਸ਼ ਕਰੋ ਅਤੇ/ਜਾਂ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ।" - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "ਟਾਈਪ(_y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "ਟਾਈਪ ਕਾਲਮ ਵੇਖੋ" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "ਮਿਆਦ(_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "ਮਿਆਦ ਕਾਲਮ ਵੇਖੋ" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "ਟਰੱਸਟ(_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "ਓਨਰ ਟਰੱਸਟ ਕਾਲਮ ਵੇਖੋ" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "ਵੈਧਤਾ(_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "ਵੈਧਤਾ ਕਾਲਮ ਵੇਖੋ" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "ਫਿਲਟਰ:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "ਪਹਿਲੀਂ ਵਾਰ ਚੋਣਾਂ:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "ਆਪਣੀ ਖੁਦ ਦੀ ਇੱਕ ਨਵੀਂ ਕੁੰਜੀ ਬਣਾਓ:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "ਇੱਕ ਫਾਇਲ ਤੋਂ ਕੁੰਜੀ ਇੰਪੋਰਟ ਕਰੋ:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "ਮੇਰੀਆਂ ਨਿੱਜੀਆਂ ਕੁੰਜੀਆਂ(_P)" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "ਹੋਰ ਕੁੰਜੀਆਂ(_K)" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਰਨਈ ਲਈ ਤੁਹਾਨੂੰ ਕੁੰਜੀਆਂ ਦੀ ਲੋੜ ਹੈ।" - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "ਇੰਪੋਰਟ(_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "ਪਾਸਵਰਡ(_P)" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "ਕੁੰਜੀ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "ਵੈਧਤਾ" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "ਮਿਆਦ" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "ਸਭ ਫੈਲਾਓ(_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "ਸਭ ਲਿਸਟਿੰਗ ਫੈਲਾਓ" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "ਸਭ ਸਮੇਟੋ(_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "ਸਭ ਲਿਸਟਿੰਗ ਸਮੇਟੋ" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ 'ਚ '%s' ਹੈ" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "ਕੁੰਜੀ ਸਰਵਰ:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "ਕੁੰਜੀਆਂ ਮੇਰੇ ਨੇੜੇ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "ਰਿਮੋਟ ਕੁੰਜੀਆਂ ਖੋਜ" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"ਇਹ ਇੰਟਰਨੈੱਟ ਤੋਂ ਹੋਰਾਂ ਲਈ ਕੁੰਜੀਆਂ ਲੱਭੇਗਾ। ਇਹ ਕੁੰਜੀਆਂ ਤੁਹਾਨੂੰ ਲੋਕਲ ਕੀਰਿੰਗ ਵਿੱਚ " -"ਇੰਪੋਰਟ ਵੀ ਕੀਤਾ ਜਾ ਸਕਦਾ " -"ਹੈ।" - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "ਕਿੱਥੇ ਖੋਜਣਾ:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "ਖੋਜ(_S)" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "ਇਹ ਰੱਖਣ ਵਾਲੀਆਂ ਕੁੰਜੀਆਂ ਦੀ ਖੋਜ(_S):" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "ਕੁੰਜੀਆਂ ਸਰਵਰ ਉੱਤੇ ਪਬਲਿਸ਼ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "ਸਰਵਰ ਤੋਂ ਕੁੰਜੀਆਂ ਲਈਆਂ ਨਹੀਂ ਜਾ ਸਕੀਆਂ: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d ਕੁੰਜੀ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਚੁਣੀ ਗਈ।" -msgstr[1] "%d ਕੁੰਜੀਆਂ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਚੁਣੀਆਂ ਗਈਆਂ।" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "ਕੁੰਜੀਆਂ ਸਿਕਰੋਨਾਈਜ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "ਕੁੰਜੀਆਂ ਸਿਕਰੋਨਾਈਜ਼" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਕੀਰਿੰਗ ਵਿੱਚੋਂ ਕੁੰਜੀਆਂ ਨੂੰ ਪਬਲਿਸ਼ ਕੀਤਾ ਜਾਵੇਗਾ ਤਾਂ ਕਿ ਉਹਨਾਂ ਨੂੰ " -"ਹੋਰਾਂ ਨੂੰ ਵਰਤਣ ਵਾਸਤੇ " -"ਉਪਲੱਬਧ ਕਰਵਾਇਆ ਜਾਵੇ। ਤੁਸੀਂ ਹੋਰਾਂ ਵਲੋਂ ਕੀਤੇ ਬਦਲਾਅ ਵੀ ਵੇਖ ਸਕੋਗੇ, ਜਦੋਂ ਤੁਸੀਂ " -"ਉਨ੍ਹਾਂ ਦੀਆਂ ਕੁੰਜੀਆਂ ਲੈ ਲਈਆਂ।" - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"ਇਹ ਹੋਰਾਂ ਵਲੋਂ ਕੀਤੇ ਕੋਈ ਵੀ ਬਦਲਾਅ ਲਵੇਗਾ, ਜਦੋਂ ਤੋਂ ਤੁਸੀ ਉਨ੍ਹਾਂ ਦੀਆਂ ਕੁੰਜੀਆਂ ਲਈਆਂ " -"ਹਨ। ਪਬਲਿਸ਼ ਕਰਨ ਲਈ " -"ਕੋਈ ਕੁੰਜੀ ਸਰਵਰ ਨਹੀਂ ਚੁਣਿਆ ਗਿਆ, ਇਸ ਕਰਕੇ ਤੁਹਾਡੀਆਂ ਕੁੰਜੀਆਂ ਨੂੰ ਹੋਰਾਂ ਲਈ ਉਪਲੱਬਧ " -"ਨਹੀਂ ਕਰਵਾਇਆ ਜਾਵੇਗਾ।" - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "ਕੁੰਜੀ ਸਰਵਰ(_K)" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "ਸੈਕਰੋ(_S)" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "ਇਸ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਵਰਜਨ" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "ਨਵਾਂ ਪ੍ਹੈਰਾ ਪੁਸ਼ਟੀ" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "ਯੋਗਦਾਨ:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "ਪ੍ਹੈਰਾ ਪੁਸ਼ਟੀ(_f):" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n" -"ਪੰਜਾਬ ਓਪਨ ਸੋਰਸ ਟੀਮ ਦਾ ਉੱਦਮ\n" -"http://www.satluj.com/" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "ਆਪਣੇ ਪਾਸਵਰਡ ਅਤੇ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਦੇਖਭਾਲ ਕਰੋ" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "ਸੀ-ਹਾਰਸ ਪ੍ਰੋਜੈਕਟ ਮੇਨ ਪੇਜ਼" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "ਜਾਰੀ ਰੱਖੋ" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "ਫਾਇਲ(_F)" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "ਬਣਾਉਣ ਲਈ ਆਈਟਮ ਦੀ ਕਿਸਮ ਚੁਣੋ(_S):" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "ਸੋਧ(_E)" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "ਇੰਪੋਰਟ ਫੇਲ੍ਹ ਹੈ" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "ਇੰਪੋਰਟ" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "ਇੰਪੋਰਟ ਕਰਨ ਵਾਲਾ ਡਾਟਾ:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "ਵੇਖੋ(_V)" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "ਮੱਦਦ(_H)" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "ਸਭ ਕੁੰਜੀ ਫਾਇਲਾਂ" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "ਮੇਰੀ ਪਸੰਦ(_n)" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "ਛੱਡਿਆ ਟੈਕਸਟ" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "ਕਲਿੱਪਬੋਰਡ ਟੈਕਸਟ" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "ਨਵਾਂ(_N)" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "ਇਹ ਪਰੋਗਰਾਮ ਲਈ ਪਸੰਦ ਬਦਲੋ" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "ਇਹ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰੋ" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "ਇਹ ਪਰੋਗਰਾਮ ਬਾਰੇ" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "ਨਵਾਂ(_N)..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "ਸਮੱਗਰੀ(_C)" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "ਨਵੀਂ ਕੁੰਜੀ ਜਾਂ ਆਈਟਮ ਬਣਾਓ" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "ਸੀ-ਹਾਰਸ ਮੱਦਦ ਵੇਖੋ" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "ਨਵੀਂ ਕੁੰਜੀ ਜਾਂ ਆਈਟਮ ਸ਼ਾਮਲ" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਐਕਸਪੋਰਟ" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "ਇੰਪੋਰਟ(_I)" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "ਕੁੰਜੀਆਂ ਐਕਸਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "ਫਾਇਲ ਤੋਂ ਇੰਪੋਰਟ ਕਰੋ" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "ਕੁੰਜੀ ਸਰਵਰ ਤੋਂ ਡਾਟਾ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਇੰਪੋਰਟ ਕਰੋ" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "ਕੁੰਜੀਆਂ ਕਾਪੀ ਕੀਤੀਆਂ" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "ਕੀਰਿੰਗ(_k)" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "ਕੀਰਿੰਗ ਰੱਖਣ ਵਾਲੀ ਬਾਹੀ ਵੇਖਾਓ" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "ਨਿੱਜੀ ਵੇਖਾਓ(_p)" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "ਕੇਵਲ ਨਿੱਜੀ ਫਾਇਲਾਂ, ਸਰਟੀਫਿਕੇਟ ਅਤੇ ਪਾਸਵਰਡ ਹੀ ਵੇਖਾਓ" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "ਭਰੋਸੇਯੋਗ ਹੀ ਵੇਖਾਓ(_t)" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "ਕੇਵਲ ਭਰੋਸੇਯੋਗ ਕੁੰਜੀਆਂ, ਸਰਟੀਫਿਕੇਟ ਅਤੇ ਪਾਸਵਰਡ ਹੀ ਵੇਖਾਓ" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "ਕੋਈ ਵੀ ਵੇਖਾਓ(_a)" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "ਸਭ ਕੁੰਜੀਆਂ, ਸਰਟੀਫਿਕੇਟ ਅਤੇ ਪਾਸਵਰਡ ਵੇਖਾਓ" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "ਫਿਲਟਰ" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "ਕੁੰਜੀਆਂ ਲਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "ਪਹਿਲੀਂ ਵਾਰ ਚੋਣਾਂ:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s ਇੱਕ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "ਆਪਣੀ ਖੁਦ ਦੀ ਇੱਕ ਨਵੀਂ ਕੁੰਜੀ ਬਣਾਓ:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "ਕੁੰਜੀ ਸਰਵਰ ਤੋਂ ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "ਇੱਕ ਫਾਇਲ ਤੋਂ ਕੁੰਜੀ ਇੰਪੋਰਟ ਕਰੋ:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "ਵਿਸ਼ੇਸ਼ਤਾ ਵੇਖੋ" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਰਨਈ ਲਈ ਤੁਹਾਨੂੰ ਕੁੰਜੀਆਂ ਦੀ ਲੋੜ ਹੈ।" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "ਹਟਾਓ(_D)" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "ਲਾਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "ਅਣ-ਲਾਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਓ" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "ਲਾਕ ਕਰੋ(_L)" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "ਐਕਸਪੋਰਟ(_x)..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "ਅਣ-ਲਾਕ(_U)" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "ਫਾਇਲ ਵਿੱਚ ਐਕਸਪੋਰਟ" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀਆਂ ਦੀ ਸੰਰਚਨਾ(_S)..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "ਚੁਣੀਆਂ ਕੁੰਜੀਆਂ ਲੋਕਲ ਕੀਰਿੰਗ ਵਿੱਚ ਇੰਪੋਰਟ ਕਰੋ" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"ਪਬਲਿਕ ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕੁੰਜੀ ਨੂੰ ਹੋਰ ਮਸ਼ੀਨ ਉੱਤੇ ਭੇਜੋ ਅਤੇ ਉਸ ਕੁੰਜੀ ਨਾਲ ਲਾਗਇਨ ਕਰਨ " +"ਲਈ ਤਿਆਰ ਹੋਵੋ।" #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2244,183 +2341,206 @@ #: ../ssh/seahorse-ssh-askpass.c:93 #, c-format -#| msgid "Enter the new passphrase for: %s" msgid "Enter the new passphrase again: %s" msgstr "ਨਵਾਂ ਪ੍ਹੈਰਾ ਫੇਰ ਦਿਓ ਜੀ: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀਆਂ ਦੀ ਸੰਰਚਨਾ(_S)..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"ਪਬਲਿਕ ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕੁੰਜੀ ਨੂੰ ਹੋਰ ਮਸ਼ੀਨ ਉੱਤੇ ਭੇਜੋ ਅਤੇ ਉਸ ਕੁੰਜੀ ਨਾਲ ਲਾਗਇਨ ਕਰਨ " -"ਲਈ ਤਿਆਰ ਹੋਵੋ।" +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "ਹੋਰ ਕੰਪਿਊਟਰਾਂ ਨਾਲ ਸੁਰੱਖਿਅਤ ਜੁੜਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਕੁੰਜੀਆਂ" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "ਕੀ ਤੁਸੀਂ '%s' ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕੀ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "ਕੀ ਤੁਸੀਂ %d ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਸਵਿੱਚਾਂ ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "" +"ਕੀ ਤੁਸੀਂ %d ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕੁੰਜੀ ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" +msgstr[1] "" +"ਕੀ ਤੁਸੀਂ %d ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕੁੰਜੀਆਂ ਨੂੰ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ssh ਕੁੰਜੀ" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "ਗੁਪਤ SSH ਕੁੰਜੀਆਂ" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "ਪਬਲਿਕ SSH ਕੁੰਜੀਆਂ" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "ਇਸ ਕੁੰਜੀ ਲਈ ਕੋਈ ਪਬਲਿਕ ਕੁੰਜੀ ਫਾਇਲ ਨਹੀਂ ਹੈ।" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "ਕੁੰਜੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" - -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀ" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "ਹੋਰ ਕੰਪਿਊਟਰ ਦੀ ਵਰਤੋਂ ਲਈ ਵਰਤੀ ਜਾਂਦੀ (ਜਿਵੇਂ: ਟਰਮੀਨਲ ਰਾਹੀਂ)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀਆਂ ਨਹੀਂ ਬਣਾਈਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "ਨਵੀਂ ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀ" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"ਤੁਸੀਂ ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਜਾਂ ਕੋਈ ਵੀ ਹੋਰ ਰੀਮਾਈਡਰ ਵਰਤ ਸਕਦੇ ਹੋ, ਜਿਸ ਲਈ ਤੁਹਾਨੂੰ " -"ਇਸ ਕੀ (ਕੁੰਜੀ) " -"ਦੀ ਲੋੜ ਹੈ।" +msgid "_Just Create Key" +msgstr "ਹਾਲੇ ਕੁੰਜੀ ਬਣਾਓ(_J)" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "ਬਣਾਓ ਅਤੇ ਸੈੱਟਅੱਪ ਕਰੋ(_C)" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"ਇੱਕ ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ (SSH) ਤੁਹਾਨੂੰ ਭਰੋਸੇਯੋਗ ਕੰਪਿਊਟਰਾਂ ਨਾਲ SSH ਰਾਹੀਂ ਸੁਰੱਖਿਅਤ " -"ਤਰੀਕੇ ਨਾਲ ਹਰੇਕ ਲਈ " -"ਵੱਖਰਾ ਪਾਸਵਰਡ ਦਿੱਤੇ ਬਿਨਾਂ ਜੁੜਨ ਦਿੰਦੀ ਹੈ।" +"ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ (SSH) ਕੁੰਜੀ ਤੁਹਾਨੂੰ ਹੋਰ ਕੰਪਿਊਟਰਾਂ ਨਾਲ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਕੁਨੈਕਟ " +"ਕਰਨ ਦਿੰਦੀ ਹੈ।" -#: ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"ਇਹ ਕੁੁੰਜੀ ਲਈ ਤੁਸੀਂ ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਜਾਂ ਕੋਈ ਵੀ ਹੋਰ ਰੀਮਾਈਡਰ ਵਰਤ ਸਕਦੇ ਹੋ" + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਕੰਪਿਊਟਰ ਹੈ, ਜਿਸ ਉੱਤੇ ਤੁਸੀਂ ਕੁੰਜੀ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਤੁਸੀਂ " "ਉਸ ਕੰਪਿਊਟਰ ਨੂੰ ਹੁਣ " -"ਤੁਹਾਡੀ ਕੁੰਜੀ ਪਛਾਣਨ ਲਈ ਸੈੱਟ ਅੱਪ ਕਰ ਸਕਦੇ ਹੋ।" - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "ਨਵੀਂ ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀ" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "ਬਣਾਓ ਅਤੇ ਸੈੱਟਅੱਪ ਕਰੋ(_C)" +"ਤੁਹਾਡੀ ਨਵੀਂ ਕੁੰਜੀ ਪਛਾਣਨ ਲਈ ਸੈੱਟ ਅੱਪ ਕਰ ਸਕਦੇ ਹੋ।" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "ਹਾਲੇ ਕੁੰਜੀ ਬਣਾਓ(_J)" - -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "ਕੁੰਜੀ ਵੇਰਵਾ(_K):" - -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(ਨਾ-ਪੜ੍ਹਨਯੋਗ ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕੁੰਜੀ)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "ਨਿੱਜੀ SSH ਕੁੰਜੀ" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH ਕੁੰਜੀ" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "ਕੁੰਜੀ ਨਾਂ ਨਹੀਂ ਬਦਲਿਆ ਜਾ ਸਕਿਆ ਹੈ।" -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "ਕੁੰਜੀ ਲਈ ਪਰਮਾਣਕਿਤਾ ਨਹੀਂ ਬਦਲੀ ਜਾ ਸਕੀ ਹੈ।" -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "ਕੁੰਜੀ ਲਈ ਪ੍ਹੈਰਾ ਨਹੀਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "ਐਲੋਗਰਥਿਮ:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "ਪਛਾਣਕਰਤਾ:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "ਟਿਕਾਣਾ:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "ਨਾਂ:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "ਤਾਕਤ:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "ਹੋਰ ਕੰਪਿਊਟਰਾਂ ਨਾਲ ਜੁੜਨ ਲਈ ਵਰਤੋਂ।" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "ਟਰੱਸਟ" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "ਇਹ ਕੁੰਜੀ ਦਾ ਮਾਲਕ ਇਹ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜ ਸਕਦਾ ਹੈ(_a)" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "ਇਹ ਸਿਰਫ਼ %s ਅਕਾਊਂਟ ਉੱਤੇ ਹੀ ਲਾਗੂ ਹੁੰਦਾ ਹੈ।" +msgid "This only applies to the %s account." +msgstr "ਇਹ ਸਿਰਫ਼ %s ਅਕਾਊਂਟ ਉੱਤੇ ਹੀ ਲਾਗੂ ਹੁੰਦਾ ਹੈ।" #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "ਪੂਰੀ ਕੁੰਜੀ ਐਕਸਪੋਰਟ(_x)" +msgid "Algorithm:" +msgstr "ਐਲੋਗਰਥਿਮ:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "ਇਹ ਕੁੰਜੀ ਦਾ ਮਾਲਕ ਇਹ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜ ਸਕਦਾ ਹੈ(_a)" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "ਤਾਕਤ:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "ਟਿਕਾਣਾ:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "ਹੋਰ ਕੰਪਿਊਟਰਾਂ ਨਾਲ ਜੁੜਨ ਲਈ ਵਰਤੋਂ।" +msgid "E_xport Complete Key" +msgstr "ਪੂਰੀ ਕੁੰਜੀ ਐਕਸਪੋਰਟ(_x)" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH ਕਮਾਂਡ ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਈ ਹੈ।" -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH ਕਮਾਂਡ ਫੇਲ੍ਹ ਹੋਈ।" -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "ਰਿਮੋਟ ਹੋਸਟ ਪਾਸਵਰਡ" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "ਕੁੰਜੀ ਪ੍ਹੈਰਾ ਦਿਓ" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "ਨਵੀਂ ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀ ਲਈ ਪ੍ਹੈਰਾ" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ: ਪ੍ਹੈਰਾ ਦਿਓ" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH ਕੁੰਜੀਆਂ" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "ਇਸ ਕੁੰਜੀ ਲਈ ਕੋਈ ਪਰਾਈਵੇਟ ਕੁੰਜੀ ਫਾਇਲ ਨਹੀਂ ਹੈ।" @@ -2433,14 +2553,10 @@ msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀਆਂ ਦੀ ਸੰਰਚਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "ਜਿਵੇਂ: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "SSH ਕੁਨੈਕਸ਼ਨ ਲਈ ਕੰਪਿਊਟਰ ਸੈੱਟਅੱਪ" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2449,6 +2565,10 @@ "ਉਸ ਕੰਪਿਊਟਰ " "ਉੱਤੇ ਇੱਕ ਲਾਗਇਨ ਅਕਾਊਂਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।" +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "ਜਿਵੇਂ: fileserver.example.com:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "ਕੰਪਿਊਟਰ ਨਾਂ(_C):" @@ -2461,11 +2581,192 @@ msgid "_Set Up" msgstr "ਸੈੱਟਅੱਪ(_S)" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "ਲਾਗਇਨ ਕੀਰਿੰਗ" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "ਕੁੰਜੀ ਰਿੰਗ ਲਈ ਅਸੈੱਸ ਵਾਸਤੇ ਪਾਬੰਦੀ ਹੈ" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "ਗਨੋਮ-ਕੀਰਿੰਗ ਡੈਮਨ ਨਹੀਂ ਚੱਲਦੀ ਹੈ" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "ਕੁੰਜੀ ਰਿੰਗ ਪਹਿਲਾਂ ਹੀ ਅਣ-ਲਾਕ ਹੈ" + +#~ msgid "No such key ring exists" +#~ msgstr "ਏਦਾਂ ਦੀ ਕੋਈ ਕੀ ਰਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "ਕੁੰਜੀ ਰਿੰਗ ਡੈਮਨ ਨਾਲ ਸੰਪਰਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" + +#~ msgid "The item already exists" +#~ msgstr "ਆਈਟਮ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "ਗਨੋਮ-ਕੀਰਿੰਗ ਨੂੰ ਅਸੈੱਸ ਕਰਨ ਦੌਰਾਨ ਅੰਦਰੂਨੀ ਗਲਤੀ" + +#~ msgid "Algorithms here" +#~ msgstr "ਐਲੋਗਰਿਥਮ ਇੱਥੇ" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "ਆਈਟਮ ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ" +#~ msgstr[1] "ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" + +#~ msgid "Passwords: %s" +#~ msgstr "ਪਾਸਵਰਡ: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "ਪਾਸਵਰਡ: %s" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "ਕੀਰਿੰਗ ਲਾਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "ਪਾਸਵਰਡ ਸਟੋਰੇਜ਼ ਕੀਰਿੰਗ ਲਾਕ ਕਰੋ ਤਾਂ ਕਿ ਇਸ ਨੂੰ ਅਣ-ਲਾਕ ਕਰਨ ਲਈ ਮਾਸਟਰ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੋਵੇ" + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "ਪਾਸਵਰਡ ਸਟੋਰੇਜ਼ ਕੀਰਿੰਗ ਨੂੰ ਇੱਕ ਮਾਸਟਰ ਪਾਸਵਰਡ ਨਾਲ ਅਣ-ਲਾਕ ਕਰੋ ਤਾਂ ਕਿ ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ " +#~ "ਉਪਲੱਬਧ ਕਰਵਾਇਆ ਜਾ ਸਕੇ।" + +#~ msgid "Couldn't delete keyring" +#~ msgstr "ਕੀਰਿੰਗ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" + +#~ msgid "Archive files" +#~ msgstr "ਅਕਾਇਵ ਫਾਇਲਾਂ" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "ਇਸ ਨਾਂ ਨਾਲ ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।\n" +#~ "\n" +#~ "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਨਵੀਂ ਫਾਇਲ ਨਾਲ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#~ msgid "_Replace" +#~ msgstr "ਬਦਲੋ(_R)" + +#~ msgid "_Sign Key..." +#~ msgstr "ਸਾਇਨ ਕੁੰਜੀ(_S)..." + +#~ msgid "Sign public key" +#~ msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਸਾਇਨ" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "ਕੀ ਤੁਸੀਂ %d ਕੁੰਜੀਆਂ ਅਤੇ ਪਛਾਣ ਹਮੇਸ਼ਾਂ ਲਈ ਹਟਾਉਣ ਵਾਸਤੇ ਤਿਆਰ ਹੋ?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" + +#~ msgid "New PGP Key" +#~ msgstr "ਨਵੀਂ PGP ਕੁੰਜੀ" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "\"%s\" ਲਈ ਕੁੰਜੀ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" + +#~ msgid "Export Complete Key" +#~ msgstr "ਪੂਰੀ ਕੁੰਜੀ ਐਕਸਪੋਰਟ" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "ਕੀ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ '%s' ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "ਕੀ ਤੁਸੀਂ %d ਸਰਟੀਫਿਕੇਟ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" +#~ msgstr[1] "ਕੀ ਤੁਸੀਂ %d ਪਾਸਵਰਡਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#~ msgid "Deleting" +#~ msgstr "ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ" + +#~ msgid "Create New ..." +#~ msgstr "ਨਵੀਂ ਬਣਾਓ..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "ਚੁਣੀ %d ਕੁੰਜੀ" +#~ msgstr[1] "ਚੁਣੀਆਂ %d ਕੁੰਜੀਆਂ" + +#~ msgid "Importing keys" +#~ msgstr " ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "ਬੇਪਛਾਣ ਕੁੰਜੀ ਕਿਸਮ ਹੈ ਜਾਂ ਗਲਤ ਡਾਟਾ ਫਾਰਮੈਟ" + +#~ msgid "Importing Keys" +#~ msgstr "ਕੁੰਜੀਆਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" + +#~ msgid "T_ypes" +#~ msgstr "ਟਾਈਪ(_y)" + +#~ msgid "Show type column" +#~ msgstr "ਟਾਈਪ ਕਾਲਮ ਵੇਖੋ" + +#~ msgid "_Expiry" +#~ msgstr "ਮਿਆਦ(_E)" -#~ msgid "Secure Shell key" -#~ msgstr "ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀ" +#~ msgid "Show expiry column" +#~ msgstr "ਮਿਆਦ ਕਾਲਮ ਵੇਖੋ" + +#~ msgid "_Trust" +#~ msgstr "ਟਰੱਸਟ(_T)" + +#~ msgid "Show owner trust column" +#~ msgstr "ਓਨਰ ਟਰੱਸਟ ਕਾਲਮ ਵੇਖੋ" + +#~ msgid "_Validity" +#~ msgstr "ਵੈਧਤਾ(_V)" + +#~ msgid "Show validity column" +#~ msgstr "ਵੈਧਤਾ ਕਾਲਮ ਵੇਖੋ" + +#~ msgid "Other _Keys" +#~ msgstr "ਹੋਰ ਕੁੰਜੀਆਂ(_K)" + +#~ msgid "Validity" +#~ msgstr "ਵੈਧਤਾ" + +#~ msgid "Expiration Date" +#~ msgstr "ਮਿਆਦ" + +#~ msgid "_Expand All" +#~ msgstr "ਸਭ ਫੈਲਾਓ(_E)" + +#~ msgid "Expand all listings" +#~ msgstr "ਸਭ ਲਿਸਟਿੰਗ ਫੈਲਾਓ" + +#~ msgid "_Collapse All" +#~ msgstr "ਸਭ ਸਮੇਟੋ(_C)" + +#~ msgid "Collapse all listings" +#~ msgstr "ਸਭ ਲਿਸਟਿੰਗ ਸਮੇਟੋ" + +#~ msgid "Export public key" +#~ msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਐਕਸਪੋਰਟ" + +#~ msgid "Exporting keys" +#~ msgstr "ਕੁੰਜੀਆਂ ਐਕਸਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "ਕੁੰਜੀ ਸਰਵਰ ਤੋਂ ਡਾਟਾ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" + +#~ msgid "Retrieving keys" +#~ msgstr "ਕੁੰਜੀਆਂ ਲਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s ਇੱਕ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#~ msgid "Couldn't delete key" +#~ msgstr "ਕੁੰਜੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕੀ" + +#~ msgid "_Key Description:" +#~ msgstr "ਕੁੰਜੀ ਵੇਰਵਾ(_K):" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "ਆਪਣੀ ਨਵੀਂ ਸੁਰੱਖਿਅਤ ਸ਼ੈਲ ਕੁੰਜੀ ਲਈ ਪ੍ਹੈਰਾ ਦਿਓ।" @@ -2476,9 +2777,6 @@ #~ msgid "couldn't fork process" #~ msgstr "ਕਾਰਜ ਅੱਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#~ msgid "couldn't create new process group" -#~ msgstr "ਨਵਾਂ ਕਾਰਜ ਗਰੁੱਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਡੈਮਨ (ਸੀ-ਹਾਰਸ)" @@ -2530,9 +2828,6 @@ #~ msgid "Bad Signature" #~ msgstr "ਗਲਤ ਦਸਤਖਤ" -#~ msgid "Couldn't verify signature." -#~ msgstr "ਦਸਤਖਤਾਂ ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕਦੀ" - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "ਅਵੈਧ ਜਾਂ ਬੇਪਛਾਣ ਸਾਇਨਰ: %s" @@ -2711,9 +3006,6 @@ #~ msgid "Web Password" #~ msgstr "ਵੈੱਬ ਪਾਸਵਰਡ" -#~ msgid "Network Password" -#~ msgstr "ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ" - #~ msgid "Couldn't set application access." #~ msgstr "ਐਪਲੀਕੇਸ਼ਨ ਅਸੈੱਸ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।" @@ -2833,12 +3125,6 @@ #~ msgid "Symmetric Key" #~ msgstr "ਸਿਮੈਟਰਿਕ ਕੁੰਜੀ" -#~ msgid "Public Key" -#~ msgstr "ਪਬਲਿਕ ਕੁੰਜੀ" - -#~ msgid "Private Key" -#~ msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ" - #~ msgid "Credentials" #~ msgstr "ਕਰਿਡਿਨਟੀਸ" @@ -2860,9 +3146,6 @@ #~ msgid "Loading Keys..." #~ msgstr "ਕੁੰਜੀਆਂ ਲੋਡ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." -#~ msgid "Searching for keys..." -#~ msgstr "ਕੁੰਜੀਆਂ ਦੀ ਖੋਜ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..." - #~ msgid "Uploading keys..." #~ msgstr "ਕੁੰਜੀਆਂ ਅੱਪਲੋਡ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." @@ -2887,9 +3170,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "ਕੁੰਜੀਆਂ ਸਿਕਰੋਨਾਈਜ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" -#~ msgid "Encryption Key Manager" -#~ msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਮੈਨੇਜਰ" - #~ msgid "Invalid" #~ msgstr "ਗਲਤ" @@ -2986,9 +3266,6 @@ #~ msgid "Removing item" #~ msgstr "ਆਈਟਮ ਸੰਭਾਲੀ ਜਾਂਦੀ ਹੈ" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਅਣਲਾਕ ਕਰੋ।" - #~ msgid "Couldn't get default password keyring" #~ msgstr "ਡਿਫਾਲਟ ਪਾਸਵਰਡ ਕੀਰਿੰਗ ਲਈ ਨਹੀਂ ਜਾ ਸਕੀ" @@ -3043,9 +3320,6 @@ #~ msgid "_Quit" #~ msgstr "ਬੰਦ ਕਰੋ(_Q)" -#~ msgid "Create a new personal key" -#~ msgstr "ਇੱਕ ਨਵੀਂ ਨਿੱਜੀ ਕੁੰਜੀ ਬਣਾਓ" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "ਆਪਣੇ ਕੀ ਰਿੰਗ ਵਿੱਚ ਇੱਕ ਫਾਇਲ ਤੋਂ ਕੁੰਜੀ ਇੰਪੋਰਟ ਕਰੋ" @@ -3058,9 +3332,6 @@ #~ msgid "_About" #~ msgstr "ਇਸ ਬਾਰੇ(_A)" -#~ msgid "P_roperties" -#~ msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_r)" - #~ msgid "E_xport Public Key..." #~ msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਐਕਸਪੋਰਟ ਕਰੋ(_x)..." @@ -3286,9 +3557,6 @@ #~ msgid "Couldn't set permissions on backup file." #~ msgstr "ਬੈਕਅੱਪ ਫਾਇਲ ਉੱਤੇ ਅਧਿਕਾਰ ਸੈੱਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ।" -#~ msgid "Clipboard Text Encryption" -#~ msgstr "ਕਲਿੱਪਬੋਰਡ ਟੈਕਸਟ ਇੰਕ੍ਰਿਪਸ਼ਨ" - #~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." #~ msgstr "ਕਲਿੱਪਬੋਰਡ 'ਚ ਇੰਕ੍ਰਿਪਟ, ਡਿ-ਕ੍ਰਿਪਟ ਜਾਂ ਸਾਇਨ (PGP ਕਿਸਮ ਇੰਕ੍ਰਿਪਸ਼ਨ ਵਰਤੋਂ)।" @@ -3328,9 +3596,6 @@ #~ msgid "The clipboard could not be Signed." #~ msgstr "ਕਲਿੱਪਬੋਰਡ ਉੱਤੇ ਸਾਇਨ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ।" -#~ msgid "Import Failed" -#~ msgstr "ਇੰਪੋਰਟ ਫੇਲ੍ਹ" - #~ msgid "Keys were found but not imported." #~ msgstr "ਕੁੰਜੀਆਂ ਲੱਭੀਆਂ, ਪਰ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤੀਆਂ ਗਈਆਂ।" @@ -3412,9 +3677,6 @@ #~ msgid "No encrypted or signed text is selected." #~ msgstr "ਕੋਈ ਇੰਕ੍ਰਿਪਟ ਜਾਂ ਸਾਇਨ ਕੀਤਾ ਟੈਕਸਟ ਨਹੀਂ ਚੁਣਿਆ।" -#~ msgid "Decrypted text" -#~ msgstr "ਡਿਕ੍ਰਿਪਟਡ ਟੈਕਸਟ" - #~ msgid "Verified text" #~ msgstr "ਜਾਂਚਿਆ ਟੈਕਸਟ" @@ -3508,9 +3770,6 @@ #~ msgid "Choose Recipients" #~ msgstr "ਪ੍ਰਾਪਤ-ਕਰਤਾ ਚੁਣੋ" -#~ msgid "Couldn't load keys" -#~ msgstr "ਕੁੰਜੀਆਂ ਲੋਡ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ" - #~ msgid "Choose Encrypted File Name for '%s'" #~ msgstr "'%s' ਲਈ ਇੰਕ੍ਰਿਪਟਡ ਫਾਇਲ ਨਾਂ ਚੁਣੋ" diff -Nru seahorse-3.2.2/po/pl.po seahorse-3.6.3/po/pl.po --- seahorse-3.2.2/po/pl.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/pl.po 2012-09-25 14:50:51.000000000 +0200 @@ -4,12 +4,18 @@ # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: # gnomepl@aviary.pl # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Artur Flinta , 2003-2006. +# Andrzej Polatyński , 2007. +# Tomasz Dominikowski , 2007-2009. +# Piotr Zaryk , 2009. +# Piotr Drąg , 2010-2012. +# Aviary.pl , 2007-2012. msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-15 13:40+0200\n" -"PO-Revision-Date: 2011-09-15 13:41+0200\n" +"POT-Creation-Date: 2012-09-18 16:12+0200\n" +"PO-Revision-Date: 2012-09-18 16:14+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -26,10 +32,6 @@ msgstr "Dodawanie bazy kluczy z hasłami" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nazwa nowej bazy kluczy:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -37,47 +39,157 @@ "Proszę wybrać nazwę dla nowej bazy kluczy. Użytkownik będzie proszony o " "hasło odblokowujące." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nazwa nowej bazy kluczy:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Nazwa lub adres serwera." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Nie można dodać bazy kluczy" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Nowa baza haseł" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Używane do przechowywania haseł programów i haseł sieciowych" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nowe hasło..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Bezpieczne przechowywanie haseł programów i haseł sieciowych." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Baza kluczy" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Przechowywane hasło" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Nie można ustawić domyślnej bazy kluczy" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Nie można zmienić hasła bazy kluczy" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Ustaw jako domyślne" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Programy nowe hasła przechowują zazwyczaj w domyślnej bazie kluczy." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Zmień _hasło" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Zmiana hasła odblokowującego bazę haseł" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Nie można dodać elementu" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Dodanie hasła" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Opis:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "Baza _kluczy:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Hasło:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Wyświetlanie hasła" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Nie można usunąć elementu." +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "Baza _kluczy:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Nie można dodać bazy kluczy" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Hasła" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Przechowywane osobiste hasła i inne dane uwierzytelniające" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Hasło konta komunikatora dla " -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Hasło" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Hasło sieciowe" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Przechowywana notatka" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Hasło bazy kluczy" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Hasło klucza szyfrowania" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Hasło przechowalni kluczy" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Hasło programu Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Hasło kont online GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Hasło Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Hasło komunikatora" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Hasło menedżera sieci" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Na pewno usunąć hasło \"%s\"?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -85,260 +197,136 @@ msgstr[1] "Na pewno usunąć %d hasła?" msgstr[2] "Na pewno usunąć %d haseł?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Usuwanie elementu" -msgstr[1] "Usuwanie elementów" -msgstr[2] "Usuwanie elementów" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Otwiera dostęp do udziału sieciowego lub zasobu" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Otwiera dostęp do witryny WWW" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Odblokowuje klucz PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Odblokowuje klucz SSH" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Zapisane hasło lub login" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Sieciowe dane uwierzytelniające" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Hasło" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Nie można zmienić hasła." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Aktualizowanie hasła" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Nie można ustawić opisu." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Hasło:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Szczegóły techniczne:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Szczegóły" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Właściwości klucza" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Klucz" +msgid "Use:" +msgstr "Zastosowanie:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Właściwości klucza" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Typ:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Login:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Serwer:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Login:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "_Wyświetlanie hasła" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Typ:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Zastosowanie:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Hasła: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Hasła: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Baza kluczy" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Używane do przechowywania haseł programów i haseł sieciowych" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Przechowywane hasło" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Bezpieczne przechowywanie haseł programów i haseł sieciowych." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Nie można odblokować bazy kluczy" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Nie można zablokować bazy kluczy" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Nie można ustawić domyślnej bazy kluczy" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Nie można zmienić hasła bazy kluczy" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Zablokuj" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Zablokowanie bazy haseł tak, by główne hasło było wymagane do jej " -"odblokowania." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Odblokuj" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Odblokowanie bazy haseł za pomocą głównego hasła tak, by było możliwe jej " -"użycie." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Ustaw jako domyślne" +msgid "Password:" +msgstr "Hasło:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Programy nowe hasła przechowują zazwyczaj w domyślnej bazie kluczy." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Klucz" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Zmień _hasło" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Szczegóły techniczne:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Zmiana hasła odblokowującego bazę haseł" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Szczegóły" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Nie można usunąć bazy kluczy" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Baza kluczy automatycznie odblokowywana podczas logowania" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Baza kluczy używana do przechowywania haseł" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Na pewno usunąć bazę kluczy \"%s\"?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Usuwanie bazy kluczy" -msgstr[1] "Usuwanie baz kluczy" -msgstr[2] "Usuwanie baz kluczy" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Rozumiem, że wszystkie elementy zostaną trwale usunięte." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Właściwości bazy kluczy" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nazwa:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Utworzona:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Baza kluczy" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Właściwości bazy kluczy" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nazwa:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Anulowano działanie" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Odmowa dostępu do bazy kluczy" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Usługa gnome-keyring nie jest uruchomiona" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Baza kluczy została już odblokowana" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Nie istnieje taka baza kluczy" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Nie można połączyć się z usługą bazy kluczy" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Element już istnieje" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Błąd wewnętrzny podczas próby dostępu do programu gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Wyświetlanie flag" @@ -595,268 +583,330 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "początkowy element tymczasowy" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Dodanie serwera kluczy" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Komputer:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Typ serwera kluczy:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Komputer:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Numer portu serwera." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "początkowy element tymczasowy" +msgid "The port to access the server on." +msgstr "Numer portu serwera." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Hasło" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Wersja tego programu" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Hasło:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- ustawienia systemu" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Potwierdzenie:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Współtwórcy:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Nieprawidłowy adres serwera kluczy." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Hasła i klucze" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Aby uzyskać pomoc, należy skontaktować się z administratorem systemu lub " -"administratorem serwera kluczy." +"Artur Flinta , 2003-2006\n" +"Andrzej Polatyński , 2007\n" +"Tomasz Dominikowski , 2007-2009\n" +"Piotr Zaryk , 2009\n" +"Piotr Drąg , 2010-2012\n" +"Aviary.pl , 2007-2012" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "Adres URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Witryna projektu Seahorse" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Własny" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Nie można usunąć" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Brak: bez publikowania kluczy" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Nie można wyeksportować kluczy" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Automatyczna synchronizacja kluczy z serwerami _kluczy" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Nie można wyeksportować danych" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Automatyczna synchronizacja _zmodyfikowanych kluczy z serwerami kluczy" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Plik" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Serwery kluczy" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "Wye_ksportuj..." -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Eksportuje do pliku" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Edycja" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopiuje do schowka" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Usuń" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Usuwa zaznaczone elementy" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Wyświetla właściwości tego elementu" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Wyświetla właściwości tej bazy kluczy" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "P_referencje" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Zmienia preferencje tego programu" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Widok" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Pomo_c" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Informacje o tym programie" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Spis treści" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Wyświetla pomoc programu Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Wyeksportuj" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Kod PIN lub hasło dla: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Hasło:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Potwierdzenie:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Nieprawidłowy adres serwera kluczy." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Aby uzyskać pomoc, należy skontaktować się z administratorem systemu lub " +"administratorem serwera kluczy." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "Adres URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Własny" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Brak: bez publikowania kluczy" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Preferencje" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Wyszukiwanie kluczy poprzez:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Publikowanie kluczy na:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Pobieranie danych" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Eksportowanie danych" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importowanie danych" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Automatyczna synchronizacja kluczy z serwerami _kluczy" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Wysyłanie danych" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Automatyczna synchronizacja z_modyfikowanych kluczy z serwerami kluczy" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Niedostępny" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Serwery kluczy" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d-%m-%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Dane klucza" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Wiele kluczy" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Wszystkie pliki kluczy" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Wszystkie pliki" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Pliki archiwów" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Plik o tej nazwie już istnieje.\n" -"\n" -"Zastąpić go nowym plikiem?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Zastąp" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Nieznane" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nigdy" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Niewielkie" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Pełne" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Ostateczne" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Niedostępny" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Unieważniony" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Nie można wyświetlić pomocy: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Data wygaśnięcia:" +msgid "Never E_xpires" +msgstr "Nigdy nie _wygasa" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Tworzy nowy podklucz" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Jeśli klucz nigdy nie wygasa" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Typ klucza:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Długość k_lucza:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Typ klucza:" +msgid "Expiration Date:" +msgstr "Data wygaśnięcia:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Długość klucza" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nigdy nie _wygasa" +msgid "Generate a new subkey" +msgstr "Tworzy nowy podklucz" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Dodaje identyfikator użytkownika" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Tworzy nowy identyfikator użytkownika" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Imię i _nazwisko:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Ko_mentarz do klucza:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Musi mieć długość przynajmniej 5 znaków" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Opcjonalny adres e-mail" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Opcjonalny komentarz opisujący klucz" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Opcjonalny adres e-mail" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Imię i _nazwisko:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "Adres _e-mail:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Ko_mentarz do klucza:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Tworzy nowy identyfikator użytkownika" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Z_mień" +msgid "_Never expires" +msgstr "_Nigdy nie wygasa" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Unieważnia klucz" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Nigdy nie wygasa" +msgid "C_hange" +msgstr "Z_mień" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -867,7 +917,7 @@ msgid "Add subkey to %s" msgstr "Dodaje podklucz do %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (tylko podpisywanie)" @@ -875,7 +925,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (tylko szyfrowanie)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (tylko podpisywanie)" @@ -897,6 +947,11 @@ msgstr "" "Deszyfrowanie nie powiodło się. Prawdopodobnie brak klucza deszyfrującego." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Anulowano działanie" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Nieprawidłowa data wygaśnięcia" @@ -914,46 +969,149 @@ msgid "Expiry: %s" msgstr "Data wygaśnięcia: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Wiele kluczy" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Dane klucza" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Opakowane klucze PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Klucze PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Klucz PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Używany do szyfrowania poczty i plików" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Nie można wygenerować klucza PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Hasło dla nowego klucza PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Należy dwukrotnie wpisać hasło dla nowego klucza." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Podczas tworzenia klucza wymagane jest wygenerowanie\n" +"wiele losowych danych i potrzebna jest do tego pomoc\n" +"użytkownika. Proszę wykonywać różne działania, takie\n" +"jak pisanie na klawiaturze, poruszanie kursorem myszy,\n" +"używanie programów. Dostarcza to komputerowi losowe\n" +"dane, których potrzebuje." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Generowanie klucza" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Na pewno trwale usunąć %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Na pewno trwale usunąć %d klucz?" +msgstr[1] "Na pewno trwale usunąć %d klucze?" +msgstr[2] "Na pewno trwale usunąć %d kluczy?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Błędne hasło" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Po raz trzeci wprowadzono błędne hasło. Proszę spróbować ponownie." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Błędne hasło." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Nowe hasło dla \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Hasło dla \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Nowe hasło" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Hasło" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Hasło" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Wczytano %d klucz" +msgstr[1] "Wczytano %d klucze" +msgstr[2] "Wczytano %d kluczy" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Nieprawidłowe dane klucza (brakujące UID). Przyczyną tego może być " +"nieprawidłowo ustawiona data w systemie lub brak podpisu własnego." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Klucze GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: domyślny katalog bazy kluczy" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -988,29 +1146,33 @@ msgid "All JPEG files" msgstr "Wszystkie pliki JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Wszystkie pliki" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Wybór zdjęcia dla klucza" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Nie można przygotować zdjęcia" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Nie można dodać zdjęcia" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "" "Plik nie może zostać wczytany. Prawdopodobnie jest on zapisany w " "nieprawidłowym formacie" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Na pewno usunąć bieżące zdjęcie z klucza?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Nie można usunąć zdjęcia" @@ -1068,7 +1230,11 @@ msgid "Couldn't add revoker" msgstr "Nie można dodać unieważnienia" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Rozumiem, że ten tajny klucz zostanie trwale usunięty." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1083,11 +1249,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Brak kluczy zdolnych do podpisywania" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1095,511 +1261,574 @@ "Brak osobistych kluczy PGP, które mogłyby być użyte do wskazania twojego " "zaufania do tego klucza." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Błędne hasło." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Nowe hasło dla \"%s\"" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Kryterium wyszukiwania nie było dostatecznie sprecyzowane. Serwer \"%s\" " +"znalazł zbyt wiele pasujących kluczy." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Hasło dla \"%s\"" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Nowe hasło" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Nie można połączyć się z serwerem \"%s\": %s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Hasło" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Serwer HTTP kluczy" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Nie można zaimportować kluczy" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importowanie kluczy z serwera kluczy" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Zdalne" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Zamyka to okno" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "Wyszukaj zdalne _klucze..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Wyszukuje klucze na serwerze kluczy" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "Za_importuj" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importuje zaznaczone klucze do lokalnej bazy kluczy" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Klucze zdalne" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Wczytano %d klucz" -msgstr[1] "Wczytano %d klucze" -msgstr[2] "Wczytano %d kluczy" +msgid "Remote Keys Containing '%s'" +msgstr "Klucze zdalne zawierające \"%s\"" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Wyszukanie kluczy się nie powiodło." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Wyszukiwanie kluczy zdalnych" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Nieprawidłowe dane klucza (brakujące UID). Przyczyną tego może być " -"nieprawidłowo ustawiona data w systemie lub brak podpisu własnego." +"Internetowe wyszukiwanie kluczy innych osób. Klucze te można importować do " +"swojej bazy kluczy." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Wyszukiwanie kluczy zawierających: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Serwer HTTP kluczy" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Serwery kluczy:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Klucze udostępnione w otoczeniu:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Miejsce wyszukiwania:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "Wy_szukaj" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Nie można opublikować kluczy na serwerze" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Kryterium wyszukiwania nie było dostatecznie sprecyzowane. Serwer \"%s\" " -"znalazł zbyt wiele pasujących kluczy." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Nie można pobrać kluczy z serwera: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Nie można połączyć się z serwerem \"%s\": %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d klucz wybrany do synchronizacji" +msgstr[1] "%d klucze wybrane do synchronizacji" +msgstr[2] "%d kluczy wybranych do synchronizacji" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synchronizowanie kluczy..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Synchronizowanie kluczy" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Synchronizacja spowoduje opublikowanie kluczy z tej bazy kluczy. Zostaną " +"także pobrane wszystkie zmiany w kluczach, jakie zostały wprowadzone przez " +"ich właścicieli od momentu ich zaimportowania." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Synchronizacja spowoduje pobranie wszystkich zmian kluczy, jakie zostały " +"wprowadzone przez ich właścicieli od momentu ich zaimportowania. Nie wybrano " +"żadnego serwera do publikowania kluczy, przez co klucze użytkownika nie będą " +"dostępne dla innych." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Serwery _kluczy" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "Z_synchronizuj" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Nie można połączyć się z \"%s\": %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Łączenie z: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Nie można pobrać adresu IP dla nazwy: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Pobieranie adresu IP serwera: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Serwer LDAP kluczy" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Podpisz klucz..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Podpisuje klucz publiczny" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Na pewno trwale usunąć %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Na pewno trwale usunąć %d kluczy i tożsamości?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Na pewno trwale usunąć %d kluczy?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Na pewno trwale usunąć %d tożsamości?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "Zsy_nchronizuj i opublikuj klucze..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Nie można usunąć identyfikatora użytkownika" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publikuje i/lub synchronizuje klucze lokalne z kluczami zdalnymi." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Nie można usunąć prywatnego klucza" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Nie można usunąć klucza publicznego" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Klucze PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Klucze PGP są używane do szyfrowania poczty i plików" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Zaawansowane opcje klucza" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Utwórz" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "Klucz PGP umożliwia szyfrowanie poczty i plików." +msgid "Generate a new key" +msgstr "Tworzy nowy klucz" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algorytmy" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "Klucz PGP umożliwia szyfrowanie poczty i plików." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Utwórz" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Komentarz:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Data _wygaśnięcia:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Nie wygasa" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Typ _szyfrowania:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Tworzy nowy klucz" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Długość klucza (w bitach):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Nie wygasa" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nowy klucz PGP" +msgid "E_xpiration Date:" +msgstr "Data _wygaśnięcia:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Komentarz:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Zaawansowane opcje klucza" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Wygasł" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Osobisty klucz PGP" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Klucz PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Nie można zmienić identyfikatora głównego użytkownika" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Na pewno trwale usunąć identyfikator użytkownika \"%s\"?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Nie można usunąć identyfikatora użytkownika" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Nieznany]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nazwa/e-mail" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Identyfikator podpisu" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Nie można zmienić podstawowego zdjęcia" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(nieznany)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Ten klucz wygasł dnia: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nazwa" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Na pewno trwale usunąć podklucz %d klucza %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Nie można usunąć podklucza" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Nie można zmienić zaufania" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Niemożna wyeksportować klucza do \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Eksportowanie całego klucza" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Nie można wyeksportować klucza." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Nie można wyeksportować klucza" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nigdy" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "Identyfikator" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Typ" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Utworzony" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Wygasa" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Stan" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Długość" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Wygasł" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Prawdziwy" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Identyfikator klucza" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Działania" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Komentarz:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Daty" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Adres e-mail:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Odcisk palca" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Identyfikator klucza:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nigdy" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nazwy kluczy i podpisy" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Ten klucz został unieważniony" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Zdjęcie" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "" +"Ten klucz został unieważniony przez właściciela. Klucz nie może być dłużej " +"używany." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Szczegóły techniczne" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Ten klucz wygasł" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Ten klucz został unieważniony" +msgid "Add a photo to this key" +msgstr "Dodaje zdjęcie do tego klucza" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Ten klucz wygasł" +msgid "Remove this photo from this key" +msgstr "Usuwa to zdjęcie z tego klucza" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Typ:" +msgid "Make this photo the primary photo" +msgstr "Ustawia to zdjęcie jako podstawowe" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Zastosowanie:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Przechodzi do poprzedniego zdjęcia" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Podklucze" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Przechodzi do następnego zdjęcia" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Dodaj" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Zdjęcie" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Dodaje zdjęcie do tego klucza" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Identyfikator klucza:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Zmień _hasło" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nazwa:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Deszyfruje odebrane pliki i wiadomości." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Adres e-mail:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Usuń" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Komentarz:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Wygasanie" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Zastosowanie:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Wygasa:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Typ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Wyeksportuj" +msgid "Decrypt files and email sent to you." +msgstr "Deszyfruje odebrane pliki i wiadomości." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Prywatny klucz PGP" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Przechodzi do następnego zdjęcia" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Zmień _hasło" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Przechodzi do poprzedniego zdjęcia" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Właściciel" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Identyfikator klucza:" +msgid "Key Names and Signatures" +msgstr "Nazwy kluczy i podpisy" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Główny" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Ustawia to zdjęcie jako podstawowe" +msgid "Sign" +msgstr "Podpisz" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nazwy i podpisy" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Usuń" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nigdy" +msgid "_Add Name" +msgstr "_Dodaj nazwę" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Zmi_ana zaufania do właściciela:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Właściciel" +msgid "Revoke" +msgstr "Unieważnij" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Główny" +msgid "Names and Signatures" +msgstr "Nazwy i podpisy" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Prywatny klucz PGP" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Identyfikator klucza:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Usuwa to zdjęcie z tego klucza" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Unieważnij" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Długość:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Podpisz" +msgid "Technical Details" +msgstr "Szczegóły techniczne" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Długość:" +msgid "Fingerprint" +msgstr "Odcisk palca" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" -"Ten klucz został unieważniony przez właściciela. Klucz nie może być dłużej " -"używany." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Wygasa:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Dodaj nazwę" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Daty" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Zmi_ana zaufania do właściciela:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Eksportowanie całego klucza:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nazwa:" +msgid "Actions" +msgstr "Działania" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Daty:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Dodaj" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Wygasanie" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Podklucze" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Częściowe" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Odcisk palca:" +msgid "Fully" +msgstr "Pełne" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Wskaźnik zaufania:" +msgid "Ultimately" +msgstr "Bezwzględne" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Zaufanie do tego klucza" +msgid "Encrypt files and email to the key's owner" +msgstr "Szyfrowanie plików i wiadomości do właściciela klucza" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Publiczny klucz PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "I_nne nazwy:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Osoby, które podpisały ten klucz:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Szyfrowanie plików i wiadomości do właściciela klucza " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Zaufanie do tego klucza" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Pełne" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Twoje zaufanie jest określane ręcznie w karcie Szczegóły." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Zaufanie do podpisów złożonych przez \"%s\" pod innymi kluczami" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1608,7 +1837,11 @@ "Jeśli istnieje pewność, że posiadaczem klucza jest \"%s\", proszę " "podpisać ten klucz:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Podpisz ten klucz" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1616,43 +1849,38 @@ "Jeśli nie ma już pewności co do tożsamości osoby \"%s\", można " "unieważnić własny podpis:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Niewielkie" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Publiczny klucz PGP" +msgid "_Revoke Signature" +msgstr "_Unieważnij podpis" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Osoby, które podpisały ten klucz:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Wyświetlanie tylko podpisów od osób, do których mam zaufanie" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Zaufanie" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Ostateczne" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "_Zaufanie do właściciela:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Twoje zaufanie jest określane ręcznie w karcie Szczegóły." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Odcisk palca:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Wyświetlanie tylko podpisów od osób, do których mam zaufanie" +msgid "Dates:" +msgstr "Daty:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Unieważnij podpis" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Wskaźnik zaufania:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Podpisz ten klucz" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Zaufanie do właściciela:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1660,56 +1888,61 @@ msgstr "Podklucz %d klucza %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Opcjonalny opis unieważnienia" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Unie_ważnij" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Powód unieważnienia klucza" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Powód:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Opcjonalny opis unieważnienia" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Unie_ważnij" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Brak osobistych kluczy PGP umożliwiających podpisywanie dokumentów i " "wiadomości." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Podpisanie wiadomości kluczem:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Jak dokładnie był sprawdzany ten klucz?" +msgid "Sign Key" +msgstr "Podpisywanie klucza" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Ustawienia podpisu:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Podpisanie wyraża przekonanie, że ten klucz należy do:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Podpis:" +msgid "Key Name" +msgstr "Nazwa klucza" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Pobieżnie: oznacza, że wykonano pobieżne sprawdzenie, czy " -"właścicielem klucza jest osoba, która się za niego podaje. Przykładowo, " -"takiego sprawdzenia można dokonać telefonicznie, odczytując odcisk palca " -"klucza właścicielowi. " +msgid "How carefully have you checked this key?" +msgstr "Jak dokładnie był sprawdzany ten klucz?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nazwa klucza" +msgid "_Not at all" +msgstr "_Wcale" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "Pobi_eżnie" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Bardzo dokładnie" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1718,7 +1951,18 @@ "osoba, która się za niego podaje, ale nie było sprawdzane lub nie było " "możliwe sprawdzenie, czy tak jest faktycznie." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Pobieżnie: oznacza, że wykonano pobieżne sprawdzenie, czy " +"właścicielem klucza jest osoba, która się za niego podaje. Przykładowo, " +"takiego sprawdzenia można dokonać telefonicznie, odczytując odcisk palca " +"klucza właścicielowi." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1726,18 +1970,6 @@ "Bardzo dokładnie: Wybierane tylko wtedy, gdy istnieje absolutna " "pewność, że klucz ten jest autentyczny." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Podpisanie wyraża przekonanie, że ten klucz należy do:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Możliwość _unieważnienia tego podpisu w późniejszym czasie." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Podpisywanie klucza" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1750,480 +1982,356 @@ "należy do właściciela klucza." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "Pobi_eżnie" +msgid "How others will see this signature:" +msgstr "Ustawienia podpisu:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Wcale" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "I_nni nie mogą oglądać tego podpisu" -#: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Podpisz" - -#: ../pgp/seahorse-sign.xml.h:16 -msgid "_Signer:" -msgstr "_Osoba podpisująca:" - -#: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Bardzo dokładnie" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Podpisanie wiadomości kluczem:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Certyfikat" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Nie można usunąć" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Na pewno usunąć certyfikat \"%s\"?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Na pewno usunąć %d certyfikat?" -msgstr[1] "Na pewno usunąć %d certyfikaty?" -msgstr[2] "Na pewno usunąć %d certyfikatów?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Usuwanie" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Zmień hasło" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Potwierdzenie hasła:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Proszę potwierdzić nowe hasło" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Nowe _hasło:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Zarządzanie hasłami i kluczami szyfrującymi" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Hasła i klucze" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Wybór typu elementu do utworzenia:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "K_ontynuuj" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Utwórz nowy..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Zaznaczono %d klucz" -msgstr[1] "Zaznaczono %d klucze" -msgstr[2] "Zaznaczono %d kluczy" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Nie można zaimportować kluczy" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Zaimportowane klucze" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importowanie kluczy" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importowanie klucza" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Nierozpoznany typ klucza lub nieprawidłowy format danych" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importowanie kluczy" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Zdalne" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Kończy działanie programu" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nowy..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Tworzy nowy klucz lub element" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "Zai_mportuj..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importuje z pliku" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importuje ze schowka" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "Wyszukaj _kluczy zdalnych..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Wyszukuje klucze na serwerze kluczy" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "Zsy_nchronizuj i opublikuj klucze..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publikuje i/lub synchronizuje klucze lokalne z kluczami zdalnymi." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Typy" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Wyświetla kolumnę typu" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Wygaśnięcie" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Wyświetla kolumnę terminu wygaśnięcia" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Zaufanie" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Wyświetla kolumnę zaufania" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Poprawność" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Wyświetla kolumny poprawności" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtr:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opcje początkowe:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Tworzenie nowego własnego klucza: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importowanie istniejących kluczy z pliku:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Osobiste klucze" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Inne _klucze" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Aby rozpocząć szyfrowanie, potrzebne są klucze." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "Za_importuj" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Hasła" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Nie można wyeksportować kluczy" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Poprawność" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Data wygaśnięcia" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Zamyka to okno" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Rozwiń wszystko" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Rozwija wszystko" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Zwiń wszystko" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Zwija wszystko" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Klucze zdalne" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Klucze zdalne zawierające \"%s\"" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Serwery kluczy:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Klucze udostępnione w otoczeniu:" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Możliwość _unieważnienia tego podpisu w późniejszym czasie." -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Wyszukiwanie kluczy zdalnych" +#: ../pgp/seahorse-sign.xml.h:15 +msgid "Sign key as:" +msgstr "Podpis:" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Internetowe wyszukiwanie kluczy innych osób. Klucze te można importować do " -"swojej bazy kluczy." +#: ../pgp/seahorse-sign.xml.h:16 +msgid "_Signer:" +msgstr "_Osoba podpisująca:" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Miejsce wyszukiwania:" +#: ../pgp/seahorse-sign.xml.h:17 +msgid "_Sign" +msgstr "_Podpisz" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "Wy_szukaj" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Eksportowanie danych" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Wyszukaj klucze zawierające: " +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Pobieranie danych" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Nie można opublikować kluczy na serwerze" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importowanie danych" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Nie można pobrać kluczy z serwera: %s" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Wysyłanie danych" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d klucz wybrany do synchronizacji" -msgstr[1] "%d klucze wybrane do synchronizacji" -msgstr[2] "%d kluczy wybranych do synchronizacji" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Niedostępny" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Synchronizowanie kluczy..." +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Osobisty certyfikat i klucz" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Osobisty certyfikat" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Synchronizowanie kluczy" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Certyfikat" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Synchronizacja spowoduje opublikowanie kluczy z tej bazy kluczy. Zostaną " -"także pobrane wszystkie zmiany w kluczach, jakie zostały wprowadzone przez " -"ich właścicieli od momentu ich zaimportowania." +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certyfikaty (zakodowane za pomocą DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certyfikaty" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certyfikaty i powiązane klucze X.509" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Na pewno trwale usunąć %d certyfikat?" +msgstr[1] "Na pewno trwale usunąć %d certyfikaty?" +msgstr[2] "Na pewno trwale usunąć %d certyfikatów?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Nie można utworzyć prywatnego klucza" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Utwórz" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Klucz prywatny" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Używane do żądania certyfikatu" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Tworzy nowy klucz prywatny" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etykieta:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Przechowywane w:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Rozumiem, że ten klucz zostanie trwale usunięty." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Bez nazwy" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Wyeksportowanie certyfikatu się nie powiodło" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Synchronizacja spowoduje pobranie wszystkich zmian kluczy, jakie zostały " -"wprowadzone przez ich właścicieli od momentu ich zaimportowania. Nie wybrano " -"żadnego serwera do publikowania kluczy, przez co klucze użytkownika nie będą " -"dostępne dla innych." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Nie można usunąć" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Serwery _kluczy" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "Wy_eksportuj" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Eksportuje certyfikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Usuwa ten certyfikat lub klucz" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Zażądaj _certyfikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Tworzy plik żądania certyfikatu dla tego klucza" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Nie można zapisać żądania certyfikatu" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Zapisuje żądanie certyfikatu" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Żądanie certyfikatu" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Żądanie zakodowane za pomocą PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Nie można utworzyć żądania certyfikatu" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Tworzy plik żądania certyfikatu." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Wspólna nazwa (CN) umieszczona w żądaniu certyfikatu." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nazwa (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Klucz prywatny bez nazwy" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "Z_synchronizuj" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Zmień hasło" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Wersja tego programu" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Nowe _hasło:" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Współpraca:" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Proszę potwierdzić nowe hasło" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "Aviary.pl 2007, 2008, 2009, 2010, 2011" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "_Potwierdzenie hasła:" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Witryna projektu Seahorse" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Zarządzanie hasłami i kluczami szyfrującymi" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Plik" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Kontynuuj" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Edycja" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Wybór typu elementu do utworzenia:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Widok" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Zaimportowanie się nie powiodło" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Zaimportuj" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Dane do zaimportowania:" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Pomo_c" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importowanie klucza" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "P_referencje" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Wszystkie pliki kluczy" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Zmienia preferencje tego programu" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Upuszczony tekst" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Tekst ze schowka" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nowy" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Informacje o tym programie" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Zamyka ten program" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Spis treści" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nowy..." -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Wyświetla pomoc programu Seahorse" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Tworzy nowy klucz lub element" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Eksportowanie klucza publicznego" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Dodaje nowy klucz lub element" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Eksportowanie kluczy" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "Zai_mportuj..." -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Nie można pobrać danych z serwera kluczy" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importuje z pliku" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Skopiowano klucze" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importuje ze schowka" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Pobieranie kluczy" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Według bazy _kluczy" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Wyświetla pasek boczny z listą baz kluczy" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Wyświetlanie _osobistych" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Wyświetla tylko osobiste klucze, certyfikaty i hasła" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Wyświetlanie _zaufanych" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Wyświetla tylko zaufane klucze, certyfikaty i hasła" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Wyświetlanie _wszystkiego" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Wyświetla wszystkie klucze, certyfikaty i hasła" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtrowanie" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s jest kluczem prywatnym. Na pewno kontynuować?" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opcje początkowe:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importowanie kluczy z serwera kluczy" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Tworzenie nowego własnego klucza: " -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Wyświetla właściwości" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importowanie istniejących kluczy z pliku:" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Usuń" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Aby rozpocząć szyfrowanie, potrzebne są klucze." -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Usuwa zaznaczone elementy" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Nie można zablokować" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Nie można odblokować" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "Wye_ksportuj..." +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "Za_blokuj" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Eksportuje do pliku" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Odblokuj" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopiuje do schowka" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Właściwości" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importuje zaznaczone klucze do lokalnej bazy kluczy" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Skonfiguruj klucz _dla SSH..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Wysyła publiczny klucz SSH na inny komputer i włącza możliwość zdalnego " +"logowania za pomocą tego klucza." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2252,178 +2360,202 @@ msgid "Enter the new passphrase again: %s" msgstr "Ponownie nowe hasło dla: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Skonfiguruj klucz _dla SSH..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Wysyła publiczny klucz SSH na inny komputer i włącza możliwość zdalnego " -"logowania za pomocą tego klucza." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Powłoka SSH" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Klucze używane do łączenia się z innymi komputerami" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Na pewno trwale usunąć klucz SSH \"%s\"?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Na pewno trwale usunąć %d kluczy SSH?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Na pewno trwale usunąć %d klucz SSH?" +msgstr[1] "Na pewno trwale usunąć %d klucze SSH?" +msgstr[2] "Na pewno trwale usunąć %d kluczy SSH?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Klucz SSH" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Nie można usunąć klucza" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Tajne klucze SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Publiczne klucze SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Brak dostępnego klucza publicznego dla tego klucza." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Klucz SSH" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Używany do połączeń ze zdalnymi komputerami (np. przez terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Nie można utworzyć klucza SSH" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Tworzenie klucza SSH" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Nowy klucz SSH" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Można użyć adresu e-mail i dowolnych innych informacji opisujących ten " -"klucz." +msgid "_Just Create Key" +msgstr "Utwórz _tylko klucz" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Utwórz i przygotuj" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"Klucz bezpiecznej powłoki (SSH) umożliwia bezpieczne połączenia z zaufanymi " -"komputerami, bez konieczności podawania różnych haseł dla każdego z nich." +"Klucz bezpiecznej powłoki (SSH) umożliwia bezpieczne połączenia z innymi " +"komputerami." -#: ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Adres e-mail lub inna informacja opisujących ten klucz." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "Jeżeli tworzony klucz ma być używany do łączenia się z konkretnym " "komputerem, można w tej chwili przygotować ten komputer do rozpoznawania " -"tworzonego klucza. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Nowy klucz SSH" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Utwórz i przygotuj" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "Utwórz _tylko klucz" - -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Opis klucza:" +"nowego klucza. " -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Nieczytelny klucz SSH)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Osobisty klucz SSH" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Klucz SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Nie można zmienić nazwy klucza." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Nie można zmienić upoważnienia dla klucza." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Nie można zmienić hasła dla klucza." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algorytm:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identyfikator:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Położenie:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nazwa:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Długość:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Używany do łączenia się z innymi komputerami." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Zaufanie" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "" +"Właściciel _tego klucza jest uprawniony do łączenia się z tym komputerem" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Ma zastosowanie tylko do konta \"%s\"." +msgid "This only applies to the %s account." +msgstr "Ma zastosowanie tylko do konta %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "Wyeksportuj cały _klucz" +msgid "Algorithm:" +msgstr "Algorytm:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" -"Właściciel _tego klucza jest uprawniony do łączenia się z tym komputerem" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Długość:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Położenie:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Używany do łączenia się z innymi komputerami." +msgid "E_xport Complete Key" +msgstr "Wyeksportuj cały _klucz" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Polecenie SSH zostało nieoczekiwanie zakończone." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Polecenie SSH się nie powiodło." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Hasło do zdalnego komputera" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Hasło klucza" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Hasło dla nowego klucza SSH" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importowanie klucza: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importowanie klucza. Proszę wprowadzić hasło" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Klucze OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Brak klucza prywatnego dla tego klucza." @@ -2436,14 +2568,10 @@ msgstr "Konfigurowanie kluczy SSH..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "np.: serwer_plików.domena.pl:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Przygotowywanie komputera do połączeń SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2451,6 +2579,10 @@ "Aby możliwe było używanie tego klucza SSH do połączeń z innym komputerem, " "musi być na nim utworzone konto z możliwością logowania." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "np.: serwer-plików.domena.pl:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Nazwa komputera:" diff -Nru seahorse-3.2.2/po/POTFILES.in seahorse-3.6.3/po/POTFILES.in --- seahorse-3.2.2/po/POTFILES.in 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/POTFILES.in 2012-08-21 12:23:18.000000000 +0200 @@ -1,30 +1,31 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. [type: gettext/glade]gkr/seahorse-add-keyring.xml +gkr/seahorse-gkr-actions.c gkr/seahorse-gkr-add-item.c [type: gettext/glade]gkr/seahorse-gkr-add-item.xml gkr/seahorse-gkr-add-keyring.c +gkr/seahorse-gkr-backend.c gkr/seahorse-gkr-item.c -gkr/seahorse-gkr-item-commands.c +gkr/seahorse-gkr-item-deleter.c gkr/seahorse-gkr-item-properties.c [type: gettext/glade]gkr/seahorse-gkr-item-properties.xml gkr/seahorse-gkr-keyring.c -gkr/seahorse-gkr-keyring-commands.c -[type: gettext/glade]gkr/seahorse-gkr-keyring.xml +gkr/seahorse-gkr-keyring-deleter.c gkr/seahorse-gkr-keyring-properties.c -gkr/seahorse-gkr-operation.c -gkr/seahorse-gkr-source.c +[type: gettext/glade]gkr/seahorse-gkr-keyring.xml libegg/egg-datetime.c [type: gettext/glade]libseahorse/seahorse-add-keyserver.xml -libseahorse/seahorse-context.c +libseahorse/seahorse-application.c +libseahorse/seahorse-catalog.c +libseahorse/seahorse-exportable.c +libseahorse/seahorse-interaction.c +libseahorse/seahorse-key-manager-store.c libseahorse/seahorse-object.c libseahorse/seahorse-passphrase.c libseahorse/seahorse-prefs.c [type: gettext/glade]libseahorse/seahorse-prefs.xml [type: gettext/glade]libseahorse/seahorse-progress.xml -libseahorse/seahorse-transfer.c -libseahorse/seahorse-unknown.c -libseahorse/seahorse-unknown-source.c libseahorse/seahorse-util.c libseahorse/seahorse-validity.c libseahorse/seahorse-widget.c @@ -35,18 +36,28 @@ pgp/seahorse-gpgme-add-uid.c pgp/seahorse-gpgme.c pgp/seahorse-gpgme-expires.c +pgp/seahorse-gpgme-exporter.c pgp/seahorse-gpgme-generate.c pgp/seahorse-gpgme-key.c +pgp/seahorse-gpgme-key-deleter.c pgp/seahorse-gpgme-key-op.c +pgp/seahorse-gpgme-keyring.c pgp/seahorse-gpgme-photos.c pgp/seahorse-gpgme-revoke.c +pgp/seahorse-gpgme-secret-deleter.c pgp/seahorse-gpgme-sign.c -pgp/seahorse-gpgme-source.c pgp/seahorse-gpgme-subkey.c pgp/seahorse-gpg-options.c pgp/seahorse-hkp-source.c +pgp/seahorse-keyserver-results.c +[type: gettext/glade]pgp/seahorse-keyserver-results.xml +pgp/seahorse-keyserver-search.c +[type: gettext/glade]pgp/seahorse-keyserver-search.xml +pgp/seahorse-keyserver-sync.c +[type: gettext/glade]pgp/seahorse-keyserver-sync.xml pgp/seahorse-ldap-source.c -pgp/seahorse-pgp-commands.c +pgp/seahorse-pgp-actions.c +pgp/seahorse-pgp-backend.c [type: gettext/glade]pgp/seahorse-pgp-generate.xml pgp/seahorse-pgp-key.c pgp/seahorse-pgp-key-properties.c @@ -56,27 +67,37 @@ [type: gettext/glade]pgp/seahorse-revoke.xml pgp/seahorse-server-source.c pgp/seahorse-signer.c -[type: gettext/glade]pgp/seahorse-sign.xml [type: gettext/glade]pgp/seahorse-signer.xml -pkcs11/seahorse-pkcs11-certificate.c -pkcs11/seahorse-pkcs11-certificate-props.c -pkcs11/seahorse-pkcs11-commands.c +[type: gettext/glade]pgp/seahorse-sign.xml +pgp/seahorse-transfer.c +pgp/seahorse-unknown.c +pgp/seahorse-unknown-source.c +pkcs11/seahorse-certificate.c +pkcs11/seahorse-certificate-der-exporter.c +pkcs11/seahorse-pkcs11-backend.c +pkcs11/seahorse-pkcs11-deleter.c +pkcs11/seahorse-pkcs11-generate.c +[type: gettext/glade]pkcs11/seahorse-pkcs11-generate.xml +pkcs11/seahorse-pkcs11-key-deleter.c +pkcs11/seahorse-pkcs11-properties.c +pkcs11/seahorse-pkcs11-request.c +[type: gettext/glade]pkcs11/seahorse-pkcs11-request.xml +pkcs11/seahorse-private-key.c +pkcs11/seahorse-token.c [type: gettext/glade]src/seahorse-change-passphrase.xml src/seahorse.desktop.in.in +src/seahorse-generate-select.c [type: gettext/glade]src/seahorse-generate-select.xml +src/seahorse-import-dialog.c src/seahorse-key-manager.c [type: gettext/glade]src/seahorse-key-manager.xml -src/seahorse-key-manager-store.c -src/seahorse-keyserver-results.c -[type: gettext/glade]src/seahorse-keyserver-results.xml -src/seahorse-keyserver-search.c -[type: gettext/glade]src/seahorse-keyserver-search.xml -src/seahorse-keyserver-sync.c -[type: gettext/glade]src/seahorse-keyserver-sync.xml src/seahorse-main.c -src/seahorse-viewer.c +src/seahorse-sidebar.c +ssh/seahorse-ssh-actions.c ssh/seahorse-ssh-askpass.c -ssh/seahorse-ssh-commands.c +ssh/seahorse-ssh-backend.c +ssh/seahorse-ssh-deleter.c +ssh/seahorse-ssh-exporter.c ssh/seahorse-ssh-generate.c [type: gettext/glade]ssh/seahorse-ssh-generate.xml ssh/seahorse-ssh-key.c diff -Nru seahorse-3.2.2/po/pt_BR.po seahorse-3.6.3/po/pt_BR.po --- seahorse-3.2.2/po/pt_BR.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/pt_BR.po 2012-09-18 13:10:35.000000000 +0200 @@ -1,6 +1,7 @@ # Brazilian Portuguese translation of Seahorse. -# Copyright (C) 2000-2008 the Seahorse authors. +# Copyright (C) 2000-2012 the Seahorse authors. # This file is distributed under the same license as the seahorse package. +# # Fábio Rafael da Rosa , 2003. # Max Reinhold Jahnke , 2004. # Luiz Armesto , 2007. @@ -11,32 +12,31 @@ # Carlos José Pereira , 2009. # André Gondim , 2009, 2010. # Antonio Fernandes C. Neto , 2011. +# Gabriel Speckhahn , 2012. +# Rafael Ferreira , 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-16 08:41-0400\n" -"PO-Revision-Date: 2011-09-13 23:03-0300\n" -"Last-Translator: Antonio Fernandes C. Neto \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-12 09:22+0000\n" +"PO-Revision-Date: 2012-09-12 15:37-0300\n" +"Last-Translator: Rafael Ferreira \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.2\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: Brazil\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Adicionar chaveiro de senha" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nome do novo chaveiro:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -44,307 +44,293 @@ "Por favor, escolha um nome para o novo chaveiro. Será solicitada uma senha " "para desbloquear." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nome do novo chaveiro:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "O nome da máquina ou endereço do servidor." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Não foi possível adicionar o chaveiro" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Novo chaveiro de senhas" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Usada para armazenar senhas de aplicativos e de redes" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nova senha..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Armazena uma senha ou segredo com segurança." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Senha do chaveiro" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Senha armazenada" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Não foi possível definir o chaveiro padrão" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Não foi possível alterar a senha do chaveiro" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Definir como padrão" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Aplicativos geralmente armazenam senhas no chaveiro padrão." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Alterar _senha" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Alterar a senha de desbloqueio da senha armazenada no chaveiro" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Não foi possível adicionar item" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Adicionar senha" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Descrição:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "Cha_veiro:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Senha:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Mostrar _senha" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Não foi possível excluir item" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "Cha_veiro:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Não foi possível adicionar o chaveiro" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Senhas" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Senhas, credenciais e segredos pessoais armazenados" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Senha de conta de MI para " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Senha ou segredo" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Senha de rede" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Nota armazenada" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Senha de chaveiro" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Senha de chave de criptografia" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Senha de armazenamento de chave" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Senha do Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Senha do Gnome Online Accounts" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Senha do Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Senha de mensageiro instantâneo" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Segredo do Network Manager" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Você tem certeza de que deseja excluir a senha \"%s\"?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "Você tem certeza de que quer excluir %d senhas?" +msgstr[0] "Você tem certeza de que quer excluir %d senha?" msgstr[1] "Você tem certeza de que quer excluir %d senhas?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Excluindo item" -msgstr[1] "Excluindo itens" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Acessar compartilhamento ou recurso de rede" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Acessar uma página na web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Desbloqueia uma chave PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Desbloqueia uma chave de SSH" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Senha ou nome de usuário salvo" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Credenciais de rede" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Senha" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Não foi possível alterar a senha." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Atualizando senha" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Não foi possível definir descrição." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Senha:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Detalhes técnicos:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalhes" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Propriedades da chave" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Chave" +msgid "Use:" +msgstr "Uso:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Propriedades da chave" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipo:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Usuário:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Servidor:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Usuário:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Mostrar _senha" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Type:" -msgstr "Tipo:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Senhas: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Senhas: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Senha do chaveiro" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Usada para armazenar senhas de aplicativos e de redes" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Senha armazenada" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Armazena uma senha ou segredo com segurança." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Não foi possível desbloquear o chaveiro" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Não foi possível bloquear o chaveiro" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Não foi possível definir o chaveiro padrão" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Não foi possível alterar a senha do chaveiro" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "B_loquear" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Bloquear a senha armazenada no chaveiro de forma que seja necessária a senha " -"mestre para desbloqueá-la." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "Desbloq_uear" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Desbloqueia o chaveiro de armazenamento de senhas com uma senha mestre para " -"que ele esteja disponível para uso." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Definir como padrão" +msgid "Password:" +msgstr "Senha:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Aplicativos geralmente armazenam senhas no chaveiro padrão." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Chave" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Alterar _senha" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Detalhes técnicos:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Alterar a senha de desbloqueio da senha armazenada no chaveiro" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalhes" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Não foi possível excluir o chaveiro" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Um chaveiro que é desbloqueado automaticamente no login" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Um chaveiro usado para armazenar senhas" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Você tem certeza de que deseja excluir a senha do chaveiro \"%s\"?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Excluindo chaveiro" -msgstr[1] "Excluindo chaveiros" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Eu compreendo que todos os itens serão permanentemente excluídos." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Propriedades do Chaveiro" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Name:" +msgstr "Nome:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Criada:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Chaveiro" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Propriedades do Chaveiro" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nome:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "A operação foi cancelada" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Acesso ao chaveiro foi negado" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "O daemon do gnome-keyring não está em execução" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "O chaveiro já foi desbloqueado" - -# "chaveiro deste"? -# Deste o que? -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Não existe tal chaveiro" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Não foi possível comunicar com o daemon de chaveiro" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "O item já existe" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Erro interno ao acessar o chaveiro do GNOME" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Exibir bandeiras" @@ -601,277 +587,344 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "item temporário inicial" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Adicionar servidor de chaves" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Host:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Tipo de servidor de chaves:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Servidor:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "A porta para acessar o servidor." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "ítem temporário inicial" +msgid "The port to access the server on." +msgstr "A porta para acessar o servidor." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Frase secreta" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versão deste aplicativo" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Senha:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Configurações do sistema" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirmar:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Contribuições:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Endereço do servidor de chaves é inválido." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Senhas e chaves" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Para ajuda, contate seu administrador de sistemas ou o administrador do " -"servidor de chaves." - -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +"Fábio Rafael da Rosa \n" +"Max Reinhold Jahnke \n" +"Raphael Higino \n" +"Luiz Armesto \n" +"Djavan Fagundes \n" +"Leonardo Ferreira Fontenelle \n" +"Henrique P. Machado \n" +"André Gondim \n" +"Carlos José Pereira \n" +"Antonio Fernandes C. Neto \n" +"Rafael Ferreira A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Um arquivo com esse nome já existe.\n" -"\n" -"Deseja substituí-lo por um novo arquivo?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Substituir" - # Grau de confiança no dono dessa chave (se ele confere direito as chaves # dos outros antes de assinar.) #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Desconhecido" # Validade da chave #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nunca" # Validade da chave #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginal" # Validade da chave #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Completa" # Validade da chave #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Plena" # Validade da chave #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Desabilitado" # Validade da chave #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revogada" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Não foi possível exibir ajuda: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Data de expiração:" +msgid "Never E_xpires" +msgstr "Nunca e_xpira" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Gerar uma nova subchave" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Se a chave nunca expira" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipo de chave:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "T_amanho da chave:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipo de chave:" +msgid "Expiration Date:" +msgstr "Data de expiração:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Tamanho da chave" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nunca e_xpira" +msgid "Generate a new subkey" +msgstr "Gerar uma nova subchave" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Adicionar ID de usuário" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Criar nova ID de usuário" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nome completo:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Co_mentário da chave:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Deve ter no mínimo 5 caracteres" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Endereço de e-mail opcional" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Comentário opcional descrevendo a chave" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Endereço de e-mail opcional" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nome completo:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Endereço de email:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Co_mentário da chave:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Criar nova ID de usuário" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Alterar" +msgid "_Never expires" +msgstr "_Nunca expira" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revogar chave" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Nunca expira" +msgid "C_hange" +msgstr "_Alterar" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -882,7 +935,7 @@ msgid "Add subkey to %s" msgstr "Adicionar subchave a %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (somente assinatura)" @@ -890,7 +943,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (somente criptografia)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (somente assinatura)" @@ -913,6 +966,11 @@ "Falha na descriptografia. Você provavelmente não tem a chave de " "descriptografia." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "A operação foi cancelada" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Data de expiração é inválida" @@ -930,48 +988,149 @@ msgid "Expiry: %s" msgstr "Expiração: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Chaves múltiplas" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Dados da chave" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Chaves PGP blindadas" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Chaves PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Usada para criptografar e-mail e arquivos" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Não foi possível gerar chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Frase secreta para nova chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Digite a frase secreta para a sua nova chave duas vezes." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Quando estamos criando uma chave, nós precisamos\n" +"gerar muitos dados aleatórios e precisamos de sua\n" +"ajuda. É uma boa idéia realizar algumas ações como\n" +"digitar no teclado, mover o mouse, usar aplicativos.\n" +"Isto fornece ao sistema os dados aleatórios que são\n" +"necessários." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" -msgstr "Gerando chave" +msgstr "Gerando a chave" + +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Você tem certeza de que deseja excluir %s permanentemente?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Você tem certeza de que deseja excluir permanentemente %d chave?" +msgstr[1] "Você tem certeza de que deseja excluir permanentemente %d chaves?" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Senha incorreta" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Essa foi a terceira vez que você digitou uma senha incorreta. Por favor, " "tente novamente." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Frase secreta incorreta." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Digite a nova frase secreta para \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Digite a frase secreta para \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Digite a nova frase secreta" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Digite a frase secreta" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Frase secreta" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d chave carregada" +msgstr[1] "%d chaves carregadas" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Dados da chave inválidos (faltando UIDs). Isso pode ser devido a um " +"computador com a data adiantada ou faltando auto-assinatura." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Chaves GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: diretório de chaveiros padrão" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -979,7 +1138,7 @@ "The recommended size for a photo on your key is %d x %d pixels." msgstr "" "A foto é muito grande\n" -"O tamanho recomendado para foto na sua chave é %d ✕ %d pixels." +"O tamanho recomendado para foto na sua chave é %d x %d pixels." #: ../pgp/seahorse-gpgme-photos.c:78 msgid "_Don't Resize" @@ -1006,27 +1165,31 @@ msgid "All JPEG files" msgstr "Todos os arquivos JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Todos os arquivos" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Escolha a foto para incluir na chave" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Não foi possível preparar foto" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Não foi possível adicionar foto" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Não foi possível ler o arquivo. Ele deve estar em um formato inválido" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Você tem certeza de que deseja excluir a foto atual da sua chave?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Não foi possível excluir a foto" @@ -1084,7 +1247,11 @@ msgid "Couldn't add revoker" msgstr "Não foi possível adicionar o revogador" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Eu compreendo que essa chave secreta será permanentemente excluída." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1099,11 +1266,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nenhuma chave utilizável para assinar" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1111,518 +1278,582 @@ "Você não possui chaves PGP pessoais que possam ser usadas para indicar sua " "confiança nesta chave." -#: ../pgp/seahorse-gpgme-source.c:86 +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" + +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Wrong passphrase." -msgstr "Frase secreta incorreta." +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"A pesquisa não foi suficientemente específica. O servidor \"%s\" localizou " +"muitas chaves." -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Digite a nova frase secreta para \"%s\"" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Não foi possível comunicar com o servidor \"%s\": %s" -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "Digite a frase secreta para \"%s\"" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Servidor de chave HTTP" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Digite a nova frase secreta" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Não foi possível importar as chaves" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Digite a frase secreta" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importando chaves dos servidores" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remoto" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Fechar esta janela" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Localizar chaves remotas..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Pesquisa por chaves em um servidor" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importar" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importar chaves selecionadas para o chaveiro local" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Chaves remotas" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d chave carregada" -msgstr[1] "%d chaves carregadas" +msgid "Remote Keys Containing '%s'" +msgstr "Chaves remotas contendo \"%s\"" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "A pesquisa por chaves falhou." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Localizar chaves remotas" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Dados da chave inválidos (faltando UIDs). Isso pode ser devido a um " -"computador com a data adiantada ou faltando auto-assinatura." +"Isto localizará chaves de terceiros na Internet. Essas chaves podem ser " +"importadas para o seu chaveiro local." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Pesquisar por chaves contendo: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Servidor de chave HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Servidores de chaves:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Chaves compartilhadas perto de mim:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Onde pesquisar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Pesquisar" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Não foi possível publicar chaves para o servidor" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"A pesquisa não foi suficientemente específica. O servidor \"%s\" localizou " -"muitas chaves." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Não foi possível recuperar chaves do servidor: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Não foi possível comunicar com o servidor \"%s\": %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d chave foi selecionada para sincronização" +msgstr[1] "%d chaves foram selecionadas para sincronização" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Sincronizando chaves..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronizar chaves" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Publica as chaves em seu chaveiro para que elas estejam disponíveis para " +"outros usarem. Você também receberá quaisquer alterações feitas por outros " +"desde que recebeu suas chaves." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Isto recupera quaisquer alterações de terceiros desde que você recebeu suas " +"chaves. Nenhum servidor foi escolhido para publicação, então suas chaves não " +"serão disponibilizadas para outros." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Servidores de _chaves" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronizar" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Não foi possível comunicar com \"%s\": %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Conectando a: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Não foi possível resolver o endereço: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Resolvendo o endereço do servidor: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Servidor de chave LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Assinar chave..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Assina uma chave pública" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Você tem certeza de que deseja excluir %s permanentemente?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" -"Você tem certeza de que deseja excluir permanentemente %d chaves e " -"identidades?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Você tem certeza de que deseja excluir permanentemente %d chaves?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Você tem certeza de que deseja excluir permanentemente %d identidades?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronizar e publicar chaves..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Não foi possível excluir a id de usuário" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publicar e/ou sincronizar suas chaves com aquelas on-line." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Não foi possível excluir a chave privada" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Não foi possível excluir a chave pública" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Chaves PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Chaves PGP são usadas para criptografar e-mails ou arquivos" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opções _avançadas de chave" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_riar" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Gerar uma nova chave" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Uma chave PGP permite a você criptografar e-mail ou arquivos para outras " "pessoas." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmos aqui" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_riar" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Comentário:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Data de e_xpiração:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Nu_nca expira" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Tipo de criptografia:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Gerar uma nova chave" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Força da chave (bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Nu_nca expira" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nova chave PGP" +msgid "E_xpiration Date:" +msgstr "Data de e_xpiração:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Comentário:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opções _avançadas de chave" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Expirada" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Chave PGP pessoal" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Chave PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Não foi possível alterar a ID de usuário primária" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Você tem certeza que deseja excluir permanentemente a ID de usuário \"%s\"?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Não foi possível excluir a id de usuário" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Desconhecido]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nome/E-mail" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Assinatura" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Não foi possível alterar a foto primária" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(desconhecido)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Esta chave expirou em: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nome" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "" "Você tem certeza de que deseja excluir permanentemente a subchave %d de %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Não foi possível excluir a subchave" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Não foi possível alterar a confiança" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Não foi possível exportar a chave para \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exportar chave completa" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Não foi possível exportar chave." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Não foi possível exportar a chave" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nunca" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipo" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Criado" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Expira" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Estado" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Força" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Expirada" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Bom" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID da chave" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Ações" - +# Grau de confiança no dono dessa chave (se ele confere direito as chaves +# dos outros antes de assinar.) #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Comentário:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datas" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-mail:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Impressão digital:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID da chave:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nunca" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nomes de chaves e assinaturas" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Esta chave foi revogada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "Nome:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "O dono revogou a chave. Ela não pode mais ser usada." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -msgid "Photo " -msgstr "Foto " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Esta chave expirou" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -msgid "Technical Details" -msgstr "Detalhes técnicos" +msgid "Add a photo to this key" +msgstr "Adicionar uma foto a esta chave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has been revoked" -msgstr "Esta chave foi revogada" +msgid "Remove this photo from this key" +msgstr "Remover a foto dessa chave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -msgid "This key has expired" -msgstr "Esta chave expirou" +msgid "Make this photo the primary photo" +msgstr "Fazer desta a foto primária" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipo:" +msgid "Go to previous photo" +msgstr "Ir para foto anterior" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Uso:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Ir para próxima foto" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "_Subkeys" -msgstr "_Subchaves" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Foto " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add" -msgstr "Adicionar" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -msgid "Add a photo to this key" -msgstr "Adicionar uma foto a esta chave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID da chave:" +#. Name of key, usually a persons name #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Alterar _frase secreta" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nome:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-mail:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Decrypt files and email sent to you." -msgstr "Descriptografar arquivos e e-mail enviados para você." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Comentário:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -msgid "Delete" -msgstr "Excluir" +#. To translators: This is the noun not the verb. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Uso:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -msgid "Expire" -msgstr "Expirar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipo:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Expires:" -msgstr "Expira:" +msgid "Decrypt files and email sent to you." +msgstr "Descriptografar arquivos e e-mail enviados para você." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 -msgid "Export" -msgstr "Exportar" +msgid "Private PGP Key" +msgstr "Chave privada PGP" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Alterar _frase secreta" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to next photo" -msgstr "Ir para próxima foto" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Dono" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -msgid "Go to previous photo" -msgstr "Ir para foto anterior" +msgid "Key Names and Signatures" +msgstr "Nomes de chaves e assinaturas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -msgid "Key ID:" -msgstr "ID da chave:" +msgid "Primary" +msgstr "Primária" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +msgid "Sign" +msgstr "Assinar" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 -msgid "Make this photo the primary photo" -msgstr "Fazer desta a foto primária" +msgid "Delete" +msgstr "Excluir" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -msgid "Names and Signatures" -msgstr "Nomes e assinaturas" +msgid "_Add Name" +msgstr "_Adicionar nome" -# Grau de confiança no dono dessa chave (se ele confere direito as chaves -# dos outros antes de assinar.) #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Never" -msgstr "Nunca" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -msgid "Override Owner _Trust:" -msgstr "Substituir _confiança do dono:" +msgid "Revoke" +msgstr "Revogar" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Owner" -msgstr "Dono" +msgid "Names and Signatures" +msgstr "Nomes e assinaturas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Primary" -msgstr "Primária" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID da chave:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Private PGP Key" -msgstr "Chave privada PGP" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Remove this photo from this key" -msgstr "Remover a foto dessa chave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Força:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Revoke" -msgstr "Revogar" +msgid "Technical Details" +msgstr "Detalhes técnicos" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -msgid "Sign" -msgstr "Assinar" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "Strength:" -msgstr "Força:" +msgid "Fingerprint" +msgstr "Impressão digital:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "O dono revogou a chave. Ela não pode mais ser usada." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Expira:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 -msgid "_Add Name" -msgstr "_Adicionar nome" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datas" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Substituir _confiança do dono:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Exportar chave completa:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datas:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Impressão digital:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indicar confiança:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +msgid "Actions" +msgstr "Ações" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "Your trust of this key" -msgstr "Sua confiança nesta chave" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Adicionar" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_Other Names:" -msgstr "_Outros nomes:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Expirar" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_People who have signed this key:" -msgstr "_Pessoas que assinaram esta chave:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Subchaves" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Encrypt files and email to the key's owner " -msgstr "Criptografar arquivos e e-mail para o dono da chave " +# Grau de confiança no dono dessa chave (se ele confere direito as chaves +# dos outros antes de assinar.) +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginalmente" # Grau de confiança no dono dessa chave (se ele confere direito as chaves # dos outros antes de assinar.) -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 msgid "Fully" msgstr "Completamente" +# Grau de confiança no dono dessa chave (se ele confere direito as chaves +# dos outros antes de assinar.) +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 +msgid "Ultimately" +msgstr "Plenamente" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +msgid "Encrypt files and email to the key's owner" +msgstr "Criptografar arquivos e e-mail para o dono da chave" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Chave pública PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +msgid "_Other Names:" +msgstr "_Outros nomes:" + #: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Sua confiança nesta chave" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Sua confiança é especificada manualmente na aba Detalhes." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Eu confio em assinaturas de \"%s\" em outras chaves" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1631,7 +1862,11 @@ "Se você acredita que a pessoa que possui esta chave é \"%s\", assine " "esta chave:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "A_ssinar esta chave" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1639,47 +1874,38 @@ "Se você não confia mais que \"%s\" possui esta chave, revogue sua " "assinatura:" -# Grau de confiança no dono dessa chave (se ele confere direito as chaves -# dos outros antes de assinar.) -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Marginally" -msgstr "Marginalmente" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "_Revogar assinatura" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Public PGP Key" -msgstr "Chave pública PGP" +msgid "_People who have signed this key:" +msgstr "_Pessoas que assinaram esta chave:" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -#: ../src/seahorse-key-manager-store.c:827 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Só exibir as assinaturas de pessoas em quem eu confio" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 msgid "Trust" msgstr "Confiança" -# Grau de confiança no dono dessa chave (se ele confere direito as chaves -# dos outros antes de assinar.) -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 -msgid "Ultimately" -msgstr "Plenamente" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "You _Trust the Owner:" -msgstr "Você _confia no dono:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Impressão digital:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "Your trust is manually specified on the Details tab." -msgstr "Sua confiança é especificada manualmente na aba Detalhes." - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Only display the signatures of people I trust" -msgstr "_Só exibir as assinaturas de pessoas em quem eu confio" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Revoke Signature" -msgstr "_Revogar assinatura" +msgid "Dates:" +msgstr "Datas:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgid "_Sign this Key" -msgstr "A_ssinar esta chave" +msgid "Indicate Trust:" +msgstr "Indicar confiança:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Você _confia no dono:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1687,55 +1913,62 @@ msgstr "Subchave %d de %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Descrição opcional da revogação" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_vogar" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Razão para revogar a chave" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Razão:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Descrição opcional da revogação" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Re_vogar" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Você não possui uma chave PGP pessoal que pode ser usada para assinar um " "documento ou mensagem." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Assinar mensagem com chave:" + +# Este é o título do diálogo, não o item de menu. #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Quão cuidadosamente você verificou essa chave?" +msgid "Sign Key" +msgstr "Assinar chave" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Como outros verão essa assinatura:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Ao assinar, você indica que confia que esta chave pertence a:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Assinar chave como:" +msgid "Key Name" +msgstr "Nome da chave" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Casualmente: significa que você fez uma verificação casual de que a " -"chave pertence à pessoa que afirma ser sua dona. Por exemplo, você poderia " -"ler a impressão digital da chave para o dono pelo telefone. " +msgid "How carefully have you checked this key?" +msgstr "Quão cuidadosamente você verificou essa chave?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nome da chave" +msgid "_Not at all" +msgstr "De _modo algum" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Despreocupadamente" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Cuidadosamente" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1743,7 +1976,17 @@ "De modo algum: significa que você acredita que a chave pertence a " "quem diz ser dona dela, mas você não pôde ou não verificou se é verdade." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Casualmente: significa que você fez uma verificação casual de que a " +"chave pertence à pessoa que afirma ser sua dona. Por exemplo, você poderia " +"ler a impressão digital da chave para o dono pelo telefone." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1751,19 +1994,6 @@ "Muito cuidado: selecione esta opção apenas se você estiver " "absolutamente certo de que esta chave é genuína." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Ao assinar, você indica que confia que esta chave pertence a:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Eu posso _revogar esta assinatura mais tarde." - -# Este é o título do diálogo, não o item de menu. -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Assinar chave" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1776,487 +2006,358 @@ "mail pertence ao dono." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Despreocupadamente" +msgid "How others will see this signature:" +msgstr "Como outros verão essa assinatura:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "De _modo algum" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Outros não podem ver essa assinatura" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Eu posso _revogar esta assinatura mais tarde." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Assinar" +msgid "Sign key as:" +msgstr "Assinar chave como:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Signatário:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Cuidadosamente" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Assinar mensagem com chave:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Certificado" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Não foi possível excluir" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Você tem certeza de que deseja excluir o certificado \"%s\"?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Você tem certeza de que deseja excluir %d certificado?" -msgstr[1] "Você tem certeza de que deseja excluir %d certificados?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Excluindo" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Alterar frase secreta" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firmar frase secreta:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Confirma a nova frase secreta" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Nova _frase secreta:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Gerenciar suas senhas e chaves de criptografia" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Senhas e chaves" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Selecione o tipo de item para criar:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "C_ontinuar" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Criar nova..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d chave selecionada" -msgstr[1] "%d chaves selecionadas" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Não foi possível importar as chaves" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Chaves importadas" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importando chaves" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importar chave" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Tipo de chave irreconhecível, ou formato inválido" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importando chaves" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remoto" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Fecha este programa" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Novo..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Criar uma nova chave ou item" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importar..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importar de um arquivo" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Copiar da área de transferência" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Localizar chaves remotas..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Pesquisa por chaves em um servidor" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronizar e publicar chaves..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publicar e/ou sincronizar suas chaves com aquelas on-line." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Tipos" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Mostrar coluna Tipo" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Expiração" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Mostrar coluna Expiração" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Confiança" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Mostrar coluna Confiança" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validade" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Mostrar coluna Validade" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtro:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opções de primeira execução:" - -# Deixar como está? -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Gerar uma nova chave própria: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importar chaves existentes do arquivo:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Minhas chaves _pessoais" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Outra _chaves" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Para começar a criptografar você precisará de chaves." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importar" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Senhas" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Não foi possível exportar chaves" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validade" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Data de expiração" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Fechar esta janela" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Expandir tudo" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Expandir todas as listas" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Recolher tudo" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Recolher todas as listas" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Chaves remotas" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Chaves remotas contendo \"%s\"" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servidores de chaves:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Chaves compartilhadas perto de mim:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Localizar chaves remotas" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Isto localizará chaves de terceiros na Internet. Essas chaves podem ser " -"importadas para o seu chaveiro local." +msgid "_Sign" +msgstr "_Assinar" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Onde pesquisar:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Exportando dados" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Pesquisar" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Recuperando dados" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Pesquisar por chaves contendo: " +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importando dados" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Não foi possível publicar chaves para o servidor" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Enviando dados" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Não foi possível recuperar chaves do servidor: %s" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Não disponível" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d chave foi selecionada para sincronização" -msgstr[1] "%d chaves foram selecionadas para sincronização" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Certificiado e chave pessoais" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificado pessoal" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Sincronizando chaves..." +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Certificado" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronizar chaves" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificados (codificados com DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificados" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificados X.509 e chaves relacionadas" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "" +"Você tem certeza de que deseja excluir permanentemente %d certificado?" +msgstr[1] "" +"Você tem certeza de que deseja excluir permanentemente %d certificados?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Não foi possível gerar a chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Criar" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Usada para solicitar um certificado" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Criar uma nova chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Rótulo:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Armazenada em:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Eu compreendo que essa chave será permanentemente excluída." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Sem nome" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Falha ao exportar o certificado" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Publica as chaves em seu chaveiro para que elas estejam disponíveis para " -"outros usarem. Você também receberá quaisquer alterações feitas por outros " -"desde que recebeu suas chaves." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Não foi possível excluir" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Isto recupera quaisquer alterações de terceiros desde que você recebeu suas " -"chaves. Nenhum servidor foi escolhido para publicação, então suas chaves não " -"serão disponibilizadas para outros." +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exportar" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exporta o certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Exclui esse certificado ou chave" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Solicitar _certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Cria um arquivo de solicitação de certificado para essa chave" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Não foi possível salvar a solicitação de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Salvar solicitação de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Solicitação de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Solicitação codificada com PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Não foi possível criar a solicitação de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Cria um arquivo de solicitação de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "O nome comum (CN) colocado na requisição de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nome (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Chave privada sem nome" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Servidores de _chaves" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Alterar frase secreta" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronizar" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Nova _frase secreta:" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versão deste aplicativo" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Confirma a nova frase secreta" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Contribuições:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Con_firmar frase secreta:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Fábio Rafael da Rosa \n" -"Max Reinhold Jahnke \n" -"Raphael Higino \n" -"Luiz Armesto \n" -"Djavan Fagundes \n" -"Leonardo Ferreira Fontenelle \n" -"Henrique P. Machado \n" -"André Gondim \n" -"Carlos José Pereira \n" -"Antonio Fernandes C. Neto " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Gerenciar suas senhas e chaves de criptografia" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Página do Projeto Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continuar" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Arquivo" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Selecione o tipo de item para criar:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Editar" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "A importação falhou" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importar" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Dados a serem importados:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Ver" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importar chave" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Aj_uda" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Todos os arquivos de chave" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Preferências" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Texto arrastado" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Texto da área de transferência" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Novo" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Altera as preferências para este programa" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Fecha este programa" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Sobre este programa" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Novo..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "S_umário" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Criar uma nova chave ou item" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Mostra a ajuda do Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Adicionar uma nova chave ou item" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exportar chave pública" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importar..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Exportando chaves" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importar de um arquivo" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Não foi possível recuperar dados do servidor" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Copiar da área de transferência" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Chave copiada" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Por cha_veiro" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Mostrar barra lateral com a listagem de chaveiros" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Mostrar _pessoais" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Mostra apenas as chaves, certificados e senhas pessoais" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Mostrar _confiados" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Mostra apenas as chaves, certificados e senhas confiados" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Mostrar _todos" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Mostra todas as chaves, certificados e senhas" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtro" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Recuperando chaves" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opções de primeira execução:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s é uma chave privada. Você tem certeza de que deseja continuar?" +# Deixar como está? +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Gerar uma nova chave própria: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importando chaves dos servidores" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importar chaves existentes do arquivo:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Mostra as propriedades" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Para começar a criptografar você precisará de chaves." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "E_xcluir" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Não foi possível bloquear" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Não foi possível desbloquear" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Excluir itens selecionados" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "B_loquear" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xportar..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "Desbloq_uear" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exportar para um arquivo" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propriedades" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copiar para a área de transferência" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "_Configurar chave para SSH..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importar chaves selecionadas para o chaveiro local" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Envia chave pública de SSH para outra máquina e habilita seu uso para " +"iniciar sessões de SSH." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2285,173 +2386,201 @@ msgid "Enter the new passphrase again: %s" msgstr "Digite a nova frase secreta novemente: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "_Configurar chave para SSH..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Envia chave pública de SSH para outra máquina e habilita seu uso para " -"iniciar sessões de SSH." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Shell seguro" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Chaves usadas para conectar com segurança a outros computadores" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Você tem certeza de que deseja excluir a chave de SSH \"%s\"?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Você tem certeza de que deseja excluir %d chaves de SSH?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Você tem certeza de que deseja excluir %d chave de SSH?" +msgstr[1] "Você tem certeza de que deseja excluir %d chaves de SSH?" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Não foi possível excluir a chave" +# Este é o título do diálogo, não o item de menu. +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Chave SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Chaves SSH secretas" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Chaves SSH públicas" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Nenhum arquivo de chave pública está disponível para esta chave." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Chave de SSH" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Usada para acessar outros computadores (ex: por um terminal)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Não foi possível gerar chave de SSH" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Criando chave de SSH" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Use o seu endereço de e-mail, e qualquer outro lembrete para saber para o " -"que esta chave serve." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Uma chave de Shell Seguro (SSH) permite que você se conecte de forma segura " -"a computadores confiáveis usando SSH, sem digitar senhas diferentes para " -"cada um deles." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Se já existe um computador com o qual você queira usar esta chave, você pode " -"configurá-lo para reconhecê-la agora. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Nova chave de SSH" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Apenas criar chave" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Criar e configurar" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Apenas criar chave" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Uma chave de shell seguro (SSH) permite que você se conecte de forma segura " +"a computadores." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Seu endereço de e-mail, ou um lembrete para o que essa chave serve." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Descrição da chave:" +msgid "DSA" +msgstr "DSA" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Se existe um computador com o qual você queira usar esta chave, você pode " +"configurá-lo para reconhecer sua nova chave." + +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Chave de SSH ilegível)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Chave SSH pessoal" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Chave SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Não foi possível renomear a chave." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Não foi possível alterar a autorização para chave." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Não foi possível alterar a frase secreta para a chave." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritmo:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identificador:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Localização:" - +#. Name of key, often a persons name #: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Força:" +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "Nome:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Usada para conectar a outros computadores." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Confiança" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "O dono desta chave está _autorizado a conectar a este computador" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Só se aplica à conta \"%s\"." +msgid "This only applies to the %s account." +msgstr "Isto só é aplicável à conta %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xportar chave completa" +msgid "Algorithm:" +msgstr "Algoritmo:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "O dono desta chave está _autorizado a conectar a este computador" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Força:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Localização:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Usada para conectar a outros computadores." +msgid "E_xport Complete Key" +msgstr "E_xportar chave completa" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "O comando SSH terminou inesperadamente." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "O comando SSH falhou." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Senha da rede remota" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Digite a frase secreta" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Frase secreta para nova chave de SSH" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Importando chave: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Importando chave. Digite a frase secreta" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Chaves OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Nenhum arquivo de chave privada está disponível para esta chave." @@ -2464,14 +2593,10 @@ msgstr "Configurando chaves de SSH..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "ex.: servidor.exemplo.com.br:porta" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configurando computador para conexão SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2479,6 +2604,10 @@ "Para usar a sua chave de SSH com outro computador que use SSH, você precisa " "já ter uma conta de usuário naquele computador." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "ex.: servidor.exemplo.com.br:porta" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Nome do _computador:" @@ -2491,60 +2620,14 @@ msgid "_Set Up" msgstr "C_onfigurar" -#~ msgctxt "name-of-key" -#~ msgid "Name:" -#~ msgstr "Nome:" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Secure Shell key" -#~ msgstr "Chave de SSH" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "Digite um frase secreta para a sua nova chave de SSH." - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "Não inicia o seahorse-daemon como daemon" - -#~ msgid "couldn't fork process" -#~ msgstr "não foi possível dividir o processo" - -#~ msgid "couldn't create new process group" -#~ msgstr "não foi possível criar o novo grupo de processo" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "Serviço de criptografia (Seahorse)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "Tipo de chave inválida ou não reconhecida: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "Esse tipo de chave não é suportado: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "Suporte para este recurso não foi habilitado na compilação" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "Chave inválida ou não reconhecida: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "Assinado por expirada em %s." - -#~ msgid "Invalid Signature" -#~ msgstr "Assinatura inválida" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "Assinado por em %s expirou." - -#~ msgid "Expired Signature" -#~ msgstr "Assinatura expirada" +#~ msgid "Login keyring" +#~ msgstr "Chaveiro de login" -#~ msgid "Signed by Revoked on %s." -#~ msgstr "Assinado por e revogado em %s." +#~ msgid "Access to the key ring was denied" +#~ msgstr "Acesso ao chaveiro foi negado" -#~ msgid "Revoked Signature" -#~ msgstr "Assinatura revogada" +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "O daemon do gnome-keyring não está em execução" -#~ msgid "Signed by on %s." -#~ msgstr "Assinado por em %s." +#~ msgid "The key ring has already been unlocked" +#~ msgstr "O chaveiro já foi desbloqueado" diff -Nru seahorse-3.2.2/po/pt.po seahorse-3.6.3/po/pt.po --- seahorse-3.2.2/po/pt.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/pt.po 2012-09-03 10:44:42.000000000 +0200 @@ -1,14 +1,14 @@ # seahorse's Portuguese translation. -# Copyright © 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 seahorse +# Copyright © 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 seahorse # This file is distributed under the same license as the seahorse package. -# Duarte Loreto , 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011. +# Duarte Loreto , 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012. # msgid "" msgstr "" -"Project-Id-Version: 3.2\n" +"Project-Id-Version: 3.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 00:56+0100\n" -"PO-Revision-Date: 2011-09-17 00:57+0000\n" +"POT-Creation-Date: 2012-09-01 01:45+0100\n" +"PO-Revision-Date: 2012-09-01 01:50+0000\n" "Last-Translator: Duarte Loreto \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -22,10 +22,6 @@ msgstr "Adicionar Chaveiro de Senhas" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nome do Novo Chaveiro:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -33,308 +29,296 @@ "Seleccione um nome para o novo cgaveiro. Ser-lhe-á pedida uma senha para o " "destrancar." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nome do Novo Chaveiro:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "O nome ou endereço da máquina." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Incapaz de adicionar o chaveiro" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Novo chaveiro de senhas" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Utilizado para armazenar as senhas de aplicações e rede" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nova senha..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Armazene facilmente uma senha ou segredo." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Chaveiro de Senhas" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Senha Armazenada" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Incapaz de definir o chaveiro por omissão" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Incapaz de alterar a senha do chaveiro" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Definir como omissão" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"As aplicações normalmente armazenam novas senhas no chaveiro por omissão." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Alterar a _Senha" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "" +"Alterar a senha utilizada para destrancar o chaveiro de armazenamento de " +"senhas" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Incapaz de adicionar o item" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Adicionar Senha" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Descrição:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Chaveiro:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Senha:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "_Apresentar Senha" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Incapaz de apagar o item" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Chaveiro:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Incapaz de adicionar o chaveiro" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Senhas" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Senhas, segredos e credenciais armazenadas" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Senha de conta de MI para " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Senha ou segredo" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Senha de rede" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Nota armazenada" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Senha do chaveiro" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Senha da chave de encriptação" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Senha do armazenamento de chaves" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Senha do Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Senha das Gnome Online Accounts" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Senha do Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Senha das mensagens instantâneas" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Segredo do Gestor de Rede" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Tem a certeza de que deseja apagar a senha '%s'?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Tem a certeza de que deseja apagar %d senha?" msgstr[1] "Tem a certeza de que deseja apagar %d senhas?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "A apagar o item" -msgstr[1] "A apagar os itens" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Aceder a uma partilha ou recurso de rede" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Aceder a um servidor web" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Destranca uma chave PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Destrancar uma chave de Consola Segura" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Senha ou utilizador gravados" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Credenciais de Rede" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Senha" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Incapaz de alterar a senha." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "A actualizar a senha" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Incapaz de definir a descrição." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Senha:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Detalhes Técnicos:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalhes" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Propriedades da Chave" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Chave" +msgid "Use:" +msgstr "Utilização:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Propriedades da Chave" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tipo:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Utilizador:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Servidor:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Utilizador:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Apresentar sen_ha" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tipo:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Utilização:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Senhas: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Senhas: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Chaveiro de Senhas" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Utilizado para armazenar as senhas de aplicações e rede" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Senha Armazenada" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Armazene facilmente uma senha ou segredo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Incapaz de destrancar o chaveiro" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Incapaz de trancar o chaveiro" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Incapaz de definir o chaveiro por omissão" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Incapaz de alterar a senha do chaveiro" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Trancar" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Trancar o chaveiro de armazenamento de senhas de forma a que seja necessária " -"uma senha mestra para o destrancar." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Destrancar" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Destrancar o chaveiro de armazenamento de senhas com uma senha mestra para " -"que esteja disponível para utilizar." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Definir como omissão" +msgid "Password:" +msgstr "Senha:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"As aplicações normalmente armazenam novas senhas no chaveiro por omissão." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Chave" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Alterar a _Senha" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Detalhes Técnicos:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "" -"Alterar a senha utilizada para destrancar o chaveiro de armazenamento de " -"senhas" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalhes" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Incapaz de apagar o chaveiro" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Um chaveiro que é destrancado automaticamente ao iniciar uma sessão" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Um chaveiro utilizado para armazenar senhas" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Tem a certeza de que deseja apagar o chaveiro de senhas '%s'?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "A apagar o chaveiro" -msgstr[1] "A apagar os chaveiros" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Eu compreendo que todos os itens serão definitivamente apagados." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Propriedades do Chaveiro" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Nome:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Criada:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Chaveiro" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Propriedades do Chaveiro" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Nome:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "A operação foi cancelada" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "O acesso ao chaveiro foi negado" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "O daemon gnome-keyring não se encontra em execução" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "O chaveiro já foi destrancado" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Chaveiro inexistente" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Incapaz de comunicar com o daemon de chaveiro" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "O item já existe" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Erro interno ao aceder ao gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Apresentar marcas" @@ -591,269 +575,325 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "item inicial temporário" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Adicionar Servidor de Chaves" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Máquina:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Tipo de Servidor de Chaves:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Máquina:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "O porto no qual o servidor escuta." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "item inicial temporário" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Versão desta aplicação" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Frase-Senha" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Definições de Sistema" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Senha:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Contribuições:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Confirmar:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Senhas e Chaves" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Endereço de Servidor de Chaves inválido." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "Duarte Loreto " -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "" -"Para ajuda contacte o administrador do seu sistema ou o administrador do " -"servidor de chaves." +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Página do Projecto Seahorse" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Incapaz de apagar" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Personalizado" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Incapaz de exportar as chaves" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Nenhum: Não publicar as chaves" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Incapaz de exportar os dados" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "_Obter automaticamente as chaves dos servidores de chaves" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Ficheiro" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xportar..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exportar para um ficheiro" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Editar" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Copiar para a área de transferência" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Apagar" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Apagar os itens seleccionados" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Apresentar as propriedades deste item" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Apresentar as propriedades deste chaveiro" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Preferê_ncias" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Alterar as preferências desta aplicação" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Ver" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Ajuda" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Sobre esta aplicação" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Conteúdo" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Apresentar a ajuda Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Exportar" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Introduza o PIN ou a senha para: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Senha:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Confirmar:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Endereço de Servidor de Chaves inválido." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"_Sincronizar automaticamente as chaves alteradas com os servidores de chaves" +"Para ajuda contacte o administrador do seu sistema ou o administrador do " +"servidor de chaves." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Servidores de Chaves" +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Personalizado" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Nenhum: Não publicar as chaves" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Preferências" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "_Procurar chaves utilizando:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Publicar as chaves em:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "A obter os dados" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "A exportar os dados" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "A importar os dados" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "_Obter automaticamente as chaves dos servidores de chaves" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "A enviar os dados" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "" +"_Sincronizar automaticamente as chaves alteradas com os servidores de chaves" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Indisponível" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Servidores de Chaves" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Dados da Chave" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Múltiplas Chaves" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Todos os ficheiros de chaves" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Todos os ficheiros" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arquivar os ficheiros" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Já existe um ficheiro com este nome.\n" -"\n" -"Deseja substituí-lo por um novo ficheiro?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Substituir" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Desconhecido" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nunca" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginal" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Completa" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Principal" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Inactivo" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revogada" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Incapaz de apresentar ajuda: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Data de Expiração:" +msgid "Never E_xpires" +msgstr "Nunca E_xpira" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Gerar uma nova subchave" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Se a chave nunca expira" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Tipo de Chave:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Comprimento da C_have:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Tipo de Chave:" +msgid "Expiration Date:" +msgstr "Data de Expiração:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Comprimento da Chave" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nunca E_xpira" +msgid "Generate a new subkey" +msgstr "Gerar uma nova subchave" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Adicionar ID de Utilizador" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Criar o novo ID de utilizador" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Nome Completo:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Co_mentário da Chave:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Tem de ter pelo menos 5 caracteres de comprimento" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Endereço de email opcional" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Comentário opcional para descrever a chave" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Endereço de email opcional" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Nome Completo:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Endereço de Email:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Co_mentário da Chave:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Criar o novo ID de utilizador" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Alterar" +msgid "_Never expires" +msgstr "_Nunca expira" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Revogar a chave" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Nunca expira" +msgid "C_hange" +msgstr "_Alterar" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -864,7 +904,7 @@ msgid "Add subkey to %s" msgstr "Adicionar subchave a %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (apenas assinar)" @@ -872,7 +912,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (apenas encriptar)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (apenas assinar)" @@ -894,6 +934,11 @@ msgstr "" "Falha ao desencriptar. Provavelmente não possui a chave de desencriptação." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "A operação foi cancelada" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Data de expiração inválida" @@ -911,47 +956,147 @@ msgid "Expiry: %s" msgstr "Expiração: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Múltiplas Chaves" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Dados da Chave" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Chaves PGP blindadas" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Chaves PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Utilizada para encriptar correio e ficheiros" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Incapaz de gerar a chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Frase-senha para a Nova Chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Introduza duas vezes a frase-senha para a sua nova chave." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Ao criar uma chave é necessário gerar uma quantidade\n" +"grande de dados aleatórios e a sua ajuda é necessária.\n" +"É recomendado que realize outra acção qualquer tal como\n" +"escrever com o teclado, mover o rato ou utilizar aplicações.\n" +"Isto fornece ao sistema os dados aleatórios de que necessita." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "A gerar a chave" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Tem a certeza de que deseja apagar definitivamente %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Tem a certeza de que deseja apagar definitivamente %d chave?" +msgstr[1] "Tem a certeza de que deseja apagar definitivamente %d chaves?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Senha incorrecta" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Esta foi a terceira vez que introduziu uma senha incorrecta. Tente novamente." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Frase-senha incorrecta." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Introduza uma nova frase-senha para '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Introduza a frase-senha para '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Introduza a nova frase-senha" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Introduza a frase-senha" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Frase-Senha" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d chave lida" +msgstr[1] "%d chaves lidas" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Dados de chave inválidos (faltam UIDs). Isto pode dever-se a um computador " +"com a data definida para o futuro ou uma assinatura pessoal em falta." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Chaves GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: directório de chaveiros por omissão" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -986,27 +1131,31 @@ msgid "All JPEG files" msgstr "Todos os ficheiros JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Todos os ficheiros" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Seleccionar a Foto a Adicionar à Chave" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Incapaz de preparar a foto" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Incapaz de adicionar a foto" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Incapaz de ler o ficheiro. Poderá ter um formato inválido" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Tem a certeza de que deseja remover a foto actual da sua chave?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Incapaz de apagar a foto" @@ -1064,7 +1213,11 @@ msgid "Couldn't add revoker" msgstr "Incapaz de adicionar revogador" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Eu compreendo que este segredo será definitivamente apagado." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1079,11 +1232,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nenhuma chave utilizável para assinar" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1091,520 +1244,587 @@ "Não possui chaves PGP pessoais que possam ser utilizadas para indicar a sua " "confiança nesta chave." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Frase-senha incorrecta." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Introduza uma nova frase-senha para '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"A procura não foi suficientemente específica. O servidor '%s' devolveu " +"demasiadas chaves." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Introduza a frase-senha para '%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Incapaz de comunicar com o servidor '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Introduza a nova frase-senha" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Servidor de Chaves HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Introduza a frase-senha" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Incapaz de importar as chaves" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "A importar chaves de um servidor de chaves" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Remoto" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Fechar esta janela" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Procurar Chaves Remotas..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Procurar chaves num servidor de chaves" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importar" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importar as chaves seleccionadas para o chaveiro local" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Chaves Remotas" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d chave lida" -msgstr[1] "%d chaves lidas" +msgid "Remote Keys Containing '%s'" +msgstr "Chaves Remotas que Contenham '%s'" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Falha ao procurar por chaves." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Procurar Chaves Remotas" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Dados de chave inválidos (faltam UIDs). Isto pode dever-se a um computador " -"com a data definida para o futuro ou uma assinatura pessoal em falta." +"Esta funcionalidade irá procurar na Internet chaves de outras pessoas. Estas " +"chaves poderão depois ser importadas para o seu chaveiro local." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Procurar chaves que contenham: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Servidor de Chaves HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Servidores de Chaves:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Chaves Partilhadas Próximas:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Onde procurar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Procurar" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Incapaz de publicar as chaves no servidor" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"A procura não foi suficientemente específica. O servidor '%s' devolveu " -"demasiadas chaves." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Incapaz de obter as chaves do servidor: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Incapaz de comunicar com o servidor '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d chave seleccionada para sincronização" +msgstr[1] "%d chaves seleccionadas para sincronização" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "A sincronizar as chaves..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronizar Chaves" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Esta funcionalidade irá publicar as chaves que estão no seu chaveiro para " +"que estejam disponíveis para serem utilizadas por outros. Irá também receber " +"quaisquer alterações feitas por terceiros desde que recebeu as suas chaves." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Esta funcionalidade irá obter quaisquer alterações que terceiros tenham " +"realizado desde que recebeu as suas chaves. Não foi seleccionado nenhum " +"servidor de chaves para publicação pelo que as suas chaves não serão " +"disponibilizadas a terceiros." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Servidores de C_haves" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronizar" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Incapaz de comunicar com '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "A ligar-se a: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Incapaz de resolver o endereço: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "A resolver o endereço do servidor: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Servidor de Chaves LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "A_ssinar Chave..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Assinar a chave pública" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Tem a certeza de que deseja apagar definitivamente %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" -"Tem a certeza de que deseja apagar definitivamente %d chaves e identidades?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Tem a certeza de que deseja apagar definitivamente %d chaves?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Tem a certeza de que deseja apagar definitivamente %d identidades?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronizar e Publicar Chaves..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Incapaz de apagar o ID de utilizador" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publicar e/ou sincronizar as suas chaves com as online." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Incapaz de apagar a chave privada" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Incapaz de apagar a chave pública" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Chaves PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Chaves PGP utilizada para encriptar correio ou ficheiros" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Opções _avançadas de chave" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "C_riar" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Gerar uma nova chave" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Uma chave PGP permite-lhe encriptar o correio ou ficheiros enviados a outras " "pessoas." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algorítmos aqui" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "C_riar" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Comentário:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Data de E_xpiração:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "N_unca Expira" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Tipo de Encriptação:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Gerar uma nova chave" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Resistência da Chave (bits):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "N_unca Expira" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nova Chave PGP" +msgid "E_xpiration Date:" +msgstr "Data de E_xpiração:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Comentário:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Opções _avançadas de chave" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Expirada" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Chave PGP pessoal" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Chave PGP" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Incapaz de alterar o ID principal de utilizador" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Tem a certeza de que deseja remover definitivamente o ID de utilizador '%s'?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Incapaz de apagar o ID de utilizador" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Desconhecido]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nome/Email" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID da Assinatura" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Incapaz de alterar a foto principal" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(desconhecido)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Esta chave expirou a: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Nome" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "" "Tem a certeza de que deseja apagar definitivamente a subchave %d de %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Incapaz de apagar a subchave" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Incapaz de alterar confiança" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Incapaz de exportar a chave para \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exportar a Chave Completa" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Incapaz de exportar a chave." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Incapaz de exportar a chave" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nunca" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipo" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Criada" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Expira" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Estado" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Resistência" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Expirada" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Bom" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID da Chave" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Acções" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Comentário:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datas" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Correio:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Impressão Digital" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID de Chave:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nunca" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nomes e Assinaturas de Chaves" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Esta chave foi revogada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotografia " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "O dono da chave revogou-a. Não pode mais ser utilizada." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Detalhes Técnicos" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Esta chave expirou" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Esta chave foi revogada" +msgid "Add a photo to this key" +msgstr "Adicionar uma fotografia a esta chave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Esta chave expirou" +msgid "Remove this photo from this key" +msgstr "Remover esta foto desta chave" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tipo:" +msgid "Make this photo the primary photo" +msgstr "Tornar esta foto na foto primária" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Ir para a foto anterior" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Utiliza:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Subchaves" +msgid "Go to next photo" +msgstr "Ir para a foto seguinte" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Adicionar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotografia " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Adicionar uma fotografia a esta chave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID de Chave:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Alterar a _Frase-Senha" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Nome:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Desencriptar os ficheiros e correio que lhe foram enviados." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Correio:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Apagar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Comentário:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Expirar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Utiliza:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Expira:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tipo:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exportar" +msgid "Decrypt files and email sent to you." +msgstr "Desencriptar os ficheiros e correio que lhe foram enviados." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Chave PGP Privada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Ir para a foto seguinte" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Alterar a _Frase-Senha" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Ir para a foto anterior" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Dono" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ID de Chave:" +msgid "Key Names and Signatures" +msgstr "Nomes e Assinaturas de Chaves" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primária" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Tornar esta foto na foto primária" +msgid "Sign" +msgstr "Assinar" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nomes e Assinaturas" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Apagar" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nunca" +msgid "_Add Name" +msgstr "_Adicionar Nome" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Ignorar a Confiança no _Dono:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Dono" +msgid "Revoke" +msgstr "Revogar" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primária" +msgid "Names and Signatures" +msgstr "Nomes e Assinaturas" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Chave PGP Privada" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID de Chave:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Remover esta foto desta chave" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Revogar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Resistência:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Assinar" +msgid "Technical Details" +msgstr "Detalhes Técnicos" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Resistência:" +msgid "Fingerprint" +msgstr "Impressão Digital" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "O dono da chave revogou-a. Não pode mais ser utilizada." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Expira:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Adicionar Nome" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datas" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Ignorar a Confiança no _Dono:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Exportar a Chave Completa:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Nome:" +msgid "Actions" +msgstr "Acções" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datas:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Adicionar" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Expirar" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Subchaves" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginalmente" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Impressão Digital:" +msgid "Fully" +msgstr "Completamente" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indicar Confiança:" +msgid "Ultimately" +msgstr "Acima de Tudo" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "A sua confiança nesta chave" +msgid "Encrypt files and email to the key's owner" +msgstr "Encriptar ficheiros e correio destinados ao dono da chave" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Chave PGP Pública" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Outros Nomes:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Pessoas que assinaram esta chave:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Encriptar ficheiros e correio destinados ao dono da chave " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "A sua confiança nesta chave" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Completamente" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "" +"A sua confiança é manualmente especificada no separador de Detalhes." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Confio em assinaturas de '%s' em outras chaves" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "Se acredita que a pessoa que detém esta chave é '%s', assine-a:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "A_ssinar esta Chave" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1612,44 +1832,38 @@ "Se não mais confia que esta chave é possuída por '%s', revoge a sua " "assinatura:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginalmente" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Chave PGP Pública" +msgid "_Revoke Signature" +msgstr "_Revogar Assinatura" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Pessoas que assinaram esta chave:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Apenas apresentar as assinaturas de pessoas em quem confio" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Confiar" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Acima de Tudo" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Confia no _Dono:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "" -"A sua confiança é manualmente especificada no separador de Detalhes." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Impressão Digital:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Apenas apresentar as assinaturas de pessoas em quem confio" +msgid "Dates:" +msgstr "Datas:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Revogar Assinatura" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Indicar Confiança:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "A_ssinar esta Chave" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Confia no _Dono:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1657,55 +1871,61 @@ msgstr "Subchave %d de %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Descrição opcional da revogação" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Re_vogar" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Motivo para revogar a chave" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Motivo:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Descrição opcional da revogação" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Re_vogar" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Não possui chaves PGP pessoais que possam ser utilizadas para assinar um " "documento ou mensagem." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Assinar a mensagem com a chave:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Quão cuidadosamente validou esta chave?" +msgid "Sign Key" +msgstr "Assinar Chave" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Como irão os outros ver esta assinatura:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Ao assinar indica que confia que esta chave pertence a:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Assinar a chave como:" +msgid "Key Name" +msgstr "Nome da Chave" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Casualmente: significa que realizou uma verificação casual de que a " -"chave é detida pela pessoa que reclama possuí-la. Por exemplo, poderia ler a " -"impressão digital da chave ao dono pelo telefone. " +msgid "How carefully have you checked this key?" +msgstr "Quão cuidadosamente validou esta chave?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nome da Chave" +msgid "_Not at all" +msgstr "_Nenhuma" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Casualmente" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Muito Cuidadosamente" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1713,7 +1933,17 @@ "Nenhuma: significa que confia que a chave é detida pela pessoa que " "reclama possuí-la, mas não validou este facto." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Casualmente: significa que realizou uma verificação casual de que a " +"chave é detida pela pessoa que reclama possuí-la. Por exemplo, poderia ler a " +"impressão digital da chave ao dono pelo telefone." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1721,18 +1951,6 @@ "Muito Cuidadosamente: Seleccione esta opção apenas se estiver " "absolutamente certo de que esta chave é genuína." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Ao assinar indica que confia que esta chave pertence a:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Posso futuramente _revogar esta assinatura." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Assinar Chave" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1745,477 +1963,355 @@ "dono." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Casualmente" +msgid "How others will see this signature:" +msgstr "Como irão os outros ver esta assinatura:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Nenhuma" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Outros poderão não ver esta assinatura" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Posso futuramente _revogar esta assinatura." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "A_ssinar" +msgid "Sign key as:" +msgstr "Assinar a chave como:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Assinante:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Muito Cuidadosamente" +msgid "_Sign" +msgstr "A_ssinar" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Assinar a mensagem com a chave:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "A exportar os dados" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "A obter os dados" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "A importar os dados" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "A enviar os dados" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Indisponível" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Certificado e chave pessoais" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Certificado pessoal" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certificado" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certificados (codificados com DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificados" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificados X.509 e chaves relacionadas" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Tem a certeza de que deseja apagar definitivamente %d certificado?" +msgstr[1] "Tem a certeza de que deseja apagar definitivamente %d certificados?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Incapaz de gerar a chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Criar" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Utilizado para pedir um certificado" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Criar uma nova chave privada" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etiqueta:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Armazenada em:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Eu compreendo que esta chave será definitivamente apagada." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Sem nome" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Falha ao exportar o certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Incapaz de apagar" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Tem a certeza de que deseja apagar o certificado '%s'?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Tem a certeza de que deseja apagar %d certificado?" -msgstr[1] "Tem a certeza de que deseja apagar %d certificados?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "A apagar" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Exportar" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exportar o certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Apagar este certificado ou chave" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Pedir _Certificado" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Criar um ficheiro de pedido de certificado para esta chave" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Incapaz de gravar o pedido de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Gravar o pedido de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Pedido de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Pedido codificado com PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Incapaz de criar o pedido de certificado" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Criar um ficheiro de pedido de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "O nome comum (CN) colocado no pedido de certificado." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Nome (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Chave privada sem nome" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Alterar a Frase-Senha" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Con_firmar a Frase-Senha:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Confirmar a nova frase-senha" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "Nova _Frase-Senha:" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Efectue a gestão das suas senhas e chaves de encriptação" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Senhas e Chaves" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Seleccione o tipo de item a criar:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "Pr_osseguir" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Criar Nova ..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d chave seleccionada" -msgstr[1] "%d chaves seleccionadas" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Incapaz de importar as chaves" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Chaves importadas" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "A importar chaves" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Importar Chave" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Tipo de chave desconhecido, ou formato de dados inválido" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "A Importar Chaves" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Remoto" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Fechar esta aplicação" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Nova..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Criar uma nova chave ou item" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Importar..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Importar de um ficheiro" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Importar da área de transferência" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Procurar Chaves Remotas..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Procurar chaves num servidor de chaves" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronizar e Publicar Chaves..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publicar e/ou sincronizar as suas chaves com as online." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_ipos" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Apresentar a coluna de tipo" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Expira" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Apresentar a coluna de expiração" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Confiar" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Apresentar a coluna de confiança no detentor" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Validade" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Apresentar a coluna de validade" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filtro:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opções de primeira utilização:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Gerar uma nova chave de si próprio: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importar chaves existentes de um ficheiro:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "As Minhas Chaves _Pessoais" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Outras C_haves" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Para se iniciar na encriptação necessita de chaves." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importar" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "Sen_has" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Incapaz de exportar as chaves" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Validade" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Data de Expiração" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Fechar esta janela" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Expandir Todas" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Expandir todas as listagens" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "Re_colher Todos" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Agregar todas as listagens" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Chaves Remotas" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Chaves Remotas que Contenham '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servidores de Chaves:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Chaves Partilhadas Próximas:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Procurar Chaves Remotas" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Esta funcionalidade irá procurar na Internet chaves de outras pessoas. Estas " -"chaves poderão depois ser importadas para o seu chaveiro local." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Onde procurar:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Procurar" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Procurar chaves que contenham: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Incapaz de publicar as chaves no servidor" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Incapaz de obter as chaves do servidor: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d chave seleccionada para sincronização" -msgstr[1] "%d chaves seleccionadas para sincronização" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "A sincronizar as chaves..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronizar Chaves" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Esta funcionalidade irá publicar as chaves que estão no seu chaveiro para " -"que estejam disponíveis para serem utilizadas por outros. Irá também receber " -"quaisquer alterações feitas por terceiros desde que recebeu as suas chaves." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Esta funcionalidade irá obter quaisquer alterações que terceiros tenham " -"realizado desde que recebeu as suas chaves. Não foi seleccionado nenhum " -"servidor de chaves para publicação pelo que as suas chaves não serão " -"disponibilizadas a terceiros." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Servidores de C_haves" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronizar" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versão desta aplicação" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Confirmar a nova frase-senha" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Contribuições:" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Con_firmar a Frase-Senha:" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "Duarte Loreto " +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Efectue a gestão das suas senhas e chaves de encriptação" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Página do Projecto Seahorse" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Prosseguir" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Ficheiro" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Seleccione o tipo de item a criar:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Editar" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Falha ao importar" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importar" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Dados a serem importados:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Ver" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Importar Chave" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Ajuda" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Todos os ficheiros de chaves" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Preferê_ncias" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Texto resultante" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Texto da área de transferência" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Nova" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Alterar as preferências desta aplicação" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Fechar esta aplicação" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Sobre esta aplicação" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Nova..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Conteúdo" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Criar uma nova chave ou item" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Apresentar a ajuda Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Adicionar uma nova chave ou item" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exportar chave pública" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Importar..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "A exportar chaves" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Importar de um ficheiro" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Incapaz de obter os dados do servidor de chaves" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Importar da área de transferência" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Chaves copiadas" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Por _chaveiro" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Apresentar a lista de chaveiros na barra lateral" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Apresentar _pessoais" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Apenas apresentar as chaves, certificados e senhas pessoais" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Apresentar de _confiança" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Apenas apresentar as chaves, certificados e senhas de confiança" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Apresentar _todas" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Apresentar todas as chaves, certificados e senhas" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtro" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "A obter as chaves" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opções de primeira utilização:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s é uma chave privada. Tem a certeza de que deseja continuar?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Gerar uma nova chave de si próprio: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "A importar chaves de um servidor de chaves" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Importar chaves existentes de um ficheiro:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Apresentar as propriedades" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Para se iniciar na encriptação necessita de chaves." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Apagar" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Incapaz de trancar" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Incapaz de destrancar" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Apagar os itens seleccionados" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Trancar" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xportar..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Destrancar" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exportar para um ficheiro" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Propriedades" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Copiar para a área de transferência" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Configurar a Chave para Consola _Segura..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importar as chaves seleccionadas para o chaveiro local" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Enviar a chave pública de Consola Segura para outra máquina, e permitir " +"inícios de sessão utilizando essa chave." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2244,178 +2340,201 @@ msgid "Enter the new passphrase again: %s" msgstr "Introduza novamente a nova frase-senha: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Configurar a Chave para Consola _Segura..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Enviar a chave pública de Consola Segura para outra máquina, e permitir " -"inícios de sessão utilizando essa chave." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Consola Segura" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Chaves utilizadas para se ligar em segurança a outros computadores" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Tem a certeza de que deseja apagar a chave de consola segura '%s'?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Tem a certeza de que deseja apagar %d chaves de consola segura?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Incapaz de apagar a chave" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Tem a certeza de que deseja apagar %d chave de consola segura?" +msgstr[1] "Tem a certeza de que deseja apagar %d chaves de consola segura?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Chave SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Chaves secretas de SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Chaves pública de SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Não está disponível nenhuma chave pública para esta chave." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Chave de Consola Segura" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "" "Utilizada para aceder a outros computadores (por ex: através de uma consola)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Incapaz de gerar a chave de Consola Segura" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "A Criar a Chave de Consola Segura" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Nova Chave de Consola Segura" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Utilize o seu endereço de email, e um outro lembrete que necessite para " -"saber a que se destina esta chave." +msgid "_Just Create Key" +msgstr "_Apenas Criar a Chave" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "_Create and Set Up" +msgstr "_Criar e Configurar" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" "Uma chave de Consola Segura (SSH) permite-lhe ligar-se de forma segura a " -"computadores de confiança utilizando SSH, sem ter de introduzir uma senha " -"diferente em cada um deles." +"outros computadores." -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"Se já existir um computador onde queira utilizar esta chave, pode agora " -"configurar esse computador para reconhecer a sua chave. " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Nova Chave de Consola Segura" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Criar e Configurar" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Apenas Criar a Chave" +"O seu endereço de email ou um lembrete de a que se destina esta chave." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Descrição da Chave:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Se já existir um computador onde queira utilizar esta chave, pode configurar " +"esse computador para reconhecer a sua chave." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Chave de Consola Segura Ilegível)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Chave SSH pessoal" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Chave SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Incapaz de renomear a chave." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Incapaz de alterar a autorização da chave." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Incapaz de alterar a frase-senha da chave." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algorítmo:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identificador:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Localização:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Nome:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Resistência:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Utilizada para se ligar a outros computadores." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Confiança" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "O dono desta chave está _autorizado a ligar-se a este computador" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Isto apenas se aplica à conta '%s'." +msgid "This only applies to the %s account." +msgstr "Isto apenas se aplica à conta %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xportar a Chave Completa" +msgid "Algorithm:" +msgstr "Algorítmo:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "O dono desta chave está _autorizado a ligar-se a este computador" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Resistência:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Localização:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Utilizada para se ligar a outros computadores." +msgid "E_xport Complete Key" +msgstr "E_xportar a Chave Completa" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "O comando SSH terminou inesperadamente." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "O comando SSH falhou." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Senha da Máquina Remota" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Introduza a Frase-Senha da Chave" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Frase-senha para a Nova Chave de Consola Segura" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "A importar a chave: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "A importar a chave. Introduza a frase-senha" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Chaves OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Não está disponível nenhum ficheiro de chave privada para esta chave." @@ -2428,14 +2547,10 @@ msgstr "A Configurar Chaves de Consola Segura..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "por ex: servidor.exemplo.com:porto" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Configurar Computador para Ligação SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2443,6 +2558,10 @@ "Para utilizar a chave de Consola Segura com outro computador que utilize " "SSH, tem de já possuir uma conta para iniciar sessão nesse computador." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "por ex: servidor.exemplo.com:porto" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Nome do _Computador:" @@ -2455,11 +2574,195 @@ msgid "_Set Up" msgstr "_Configurar" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "Chaveiro de início de sessão" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "O acesso ao chaveiro foi negado" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "O daemon gnome-keyring não se encontra em execução" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "O chaveiro já foi destrancado" + +#~ msgid "No such key ring exists" +#~ msgstr "Chaveiro inexistente" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Incapaz de comunicar com o daemon de chaveiro" + +#~ msgid "The item already exists" +#~ msgstr "O item já existe" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Erro interno ao aceder ao gnome-keyring" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "A apagar o item" +#~ msgstr[1] "A apagar os itens" + +#~ msgid "Passwords: %s" +#~ msgstr "Senhas: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Senhas: %s" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "Incapaz de trancar o chaveiro" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Trancar o chaveiro de armazenamento de senhas de forma a que seja " +#~ "necessária uma senha mestra para o destrancar." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Destrancar o chaveiro de armazenamento de senhas com uma senha mestra " +#~ "para que esteja disponível para utilizar." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Incapaz de apagar o chaveiro" + +#~ msgid "Archive files" +#~ msgstr "Arquivar os ficheiros" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Já existe um ficheiro com este nome.\n" +#~ "\n" +#~ "Deseja substituí-lo por um novo ficheiro?" + +#~ msgid "_Replace" +#~ msgstr "_Substituir" + +#~ msgid "_Sign Key..." +#~ msgstr "A_ssinar Chave..." + +#~ msgid "Sign public key" +#~ msgstr "Assinar a chave pública" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Tem a certeza de que deseja apagar definitivamente %d chaves e " +#~ "identidades?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Incapaz de apagar a chave pública" + +#~ msgid "Algorithms here" +#~ msgstr "Algorítmos aqui" + +#~ msgid "New PGP Key" +#~ msgstr "Nova Chave PGP" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Incapaz de exportar a chave para \"%s\"" + +#~ msgid "Export Complete Key" +#~ msgstr "Exportar a Chave Completa" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Tem a certeza de que deseja apagar o certificado '%s'?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Tem a certeza de que deseja apagar %d certificado?" +#~ msgstr[1] "Tem a certeza de que deseja apagar %d certificados?" + +#~ msgid "Deleting" +#~ msgstr "A apagar" + +#~ msgid "Create New ..." +#~ msgstr "Criar Nova ..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "%d chave seleccionada" +#~ msgstr[1] "%d chaves seleccionadas" + +#~ msgid "Importing keys" +#~ msgstr "A importar chaves" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Tipo de chave desconhecido, ou formato de dados inválido" + +#~ msgid "Importing Keys" +#~ msgstr "A Importar Chaves" + +#~ msgid "T_ypes" +#~ msgstr "T_ipos" + +#~ msgid "Show type column" +#~ msgstr "Apresentar a coluna de tipo" + +#~ msgid "_Expiry" +#~ msgstr "_Expira" + +#~ msgid "Show expiry column" +#~ msgstr "Apresentar a coluna de expiração" -#~ msgid "Secure Shell key" -#~ msgstr "Chave de Consola Segura" +#~ msgid "_Trust" +#~ msgstr "_Confiar" + +#~ msgid "Show owner trust column" +#~ msgstr "Apresentar a coluna de confiança no detentor" + +#~ msgid "_Validity" +#~ msgstr "_Validade" + +#~ msgid "Show validity column" +#~ msgstr "Apresentar a coluna de validade" + +#~ msgid "Other _Keys" +#~ msgstr "Outras C_haves" + +#~ msgid "Validity" +#~ msgstr "Validade" + +#~ msgid "Expiration Date" +#~ msgstr "Data de Expiração" + +#~ msgid "_Expand All" +#~ msgstr "_Expandir Todas" + +#~ msgid "Expand all listings" +#~ msgstr "Expandir todas as listagens" + +#~ msgid "_Collapse All" +#~ msgstr "Re_colher Todos" + +#~ msgid "Collapse all listings" +#~ msgstr "Agregar todas as listagens" + +#~ msgid "Export public key" +#~ msgstr "Exportar chave pública" + +#~ msgid "Exporting keys" +#~ msgstr "A exportar chaves" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Incapaz de obter os dados do servidor de chaves" + +#~ msgid "Retrieving keys" +#~ msgstr "A obter as chaves" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s é uma chave privada. Tem a certeza de que deseja continuar?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Incapaz de apagar a chave" + +#~ msgid "_Key Description:" +#~ msgstr "_Descrição da Chave:" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "Introduza uma frase-senha para a sua nova chave de Consola Segura." @@ -2470,9 +2773,6 @@ #~ msgid "couldn't fork process" #~ msgstr "incapaz de efectuar o fork do processo" -#~ msgid "couldn't create new process group" -#~ msgstr "incapaz de criar um novo grupo de processo" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Daemon de Encriptação (Seahorse)" @@ -2526,9 +2826,6 @@ #~ msgid "Bad Signature" #~ msgstr "Assinatura Inválida" -#~ msgid "Couldn't verify signature." -#~ msgstr "Incapaz de verificar a assinatura." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Assinante inválida ou não reconhecida: %s" @@ -2722,9 +3019,6 @@ #~ msgid "Web Password" #~ msgstr "Senha Web" -#~ msgid "Network Password" -#~ msgstr "Senha de Rede" - #~ msgid "Couldn't set application access." #~ msgstr "Incapaz de definir o acesso da aplicação." @@ -2844,12 +3138,6 @@ #~ msgid "Symmetric Key" #~ msgstr "Chave Simétrica" -#~ msgid "Public Key" -#~ msgstr "Chave Pública" - -#~ msgid "Private Key" -#~ msgstr "Chave Privada" - #~ msgid "Credentials" #~ msgstr "Credenciais" @@ -2871,9 +3159,6 @@ #~ msgid "Loading Keys..." #~ msgstr "A Ler as Chaves..." -#~ msgid "Searching for keys..." -#~ msgstr "A procurar chaves..." - #~ msgid "Uploading keys..." #~ msgstr "A enviar chaves..." @@ -2898,9 +3183,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "A sincronizar as chaves" -#~ msgid "Encryption Key Manager" -#~ msgstr "Gestor de Chaves de Encriptação" - #~ msgid "Invalid" #~ msgstr "Inválida" @@ -2999,10 +3281,6 @@ #~ msgid "Removing item" #~ msgstr "A remover o item" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "" -#~ "Destrancar automaticamente quando o utilizador inicia uma sessão." - #~ msgid "Couldn't get default password keyring" #~ msgstr "Incapaz de obter o chaveiro de senhas por omissão" @@ -3058,9 +3336,6 @@ #~ msgid "_Quit" #~ msgstr "_Sair" -#~ msgid "Create a new personal key" -#~ msgstr "Criar uma nova chave pessoal" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "Importar chaves de um ficheiro para o seu chaveiro" @@ -3085,9 +3360,6 @@ #~ msgid "_About" #~ msgstr "_Sobre" -#~ msgid "P_roperties" -#~ msgstr "P_ropriedades" - #~ msgid "E_xport Public Key..." #~ msgstr "E_xportar a Chave Pública..." @@ -3313,9 +3585,6 @@ #~ msgid "Couldn't set permissions on backup file." #~ msgstr "Incapaz de definir as permissões do ficheiro de cópia de segurança." -#~ msgid "Clipboard Text Encryption" -#~ msgstr "Encriptação do Texto da Área de Transferência" - #~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." #~ msgstr "" #~ "Encriptar, desencriptar ou assinar a área de transferência (utiliza " @@ -3359,9 +3628,6 @@ #~ msgid "The clipboard could not be Signed." #~ msgstr "Incapaz de Assinar a área de transferência." -#~ msgid "Import Failed" -#~ msgstr "Falha ao Importar" - #~ msgid "Keys were found but not imported." #~ msgstr "Foram encontradas chaves mas não importadas." @@ -3444,9 +3710,6 @@ #~ msgid "No encrypted or signed text is selected." #~ msgstr "Não foi seleccionado nenhum texto encriptado ou assinado." -#~ msgid "Decrypted text" -#~ msgstr "Texto desencriptado" - #~ msgid "Verified text" #~ msgstr "Texto verificado" @@ -3540,9 +3803,6 @@ #~ msgid "Choose Recipients" #~ msgstr "Seleccionar os Destinatários" -#~ msgid "Couldn't load keys" -#~ msgstr "Incapaz de ler chaves" - #~ msgid "Choose Encrypted File Name for '%s'" #~ msgstr "Seleccione o Nome de Ficheiro Encriptado para '%s'" diff -Nru seahorse-3.2.2/po/ro.po seahorse-3.6.3/po/ro.po --- seahorse-3.2.2/po/ro.po 2011-09-14 17:14:57.000000000 +0200 +++ seahorse-3.6.3/po/ro.po 2012-08-21 12:23:19.000000000 +0200 @@ -2,390 +2,194 @@ # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 # This file is distributed under the same license as the seahorse package. # Lucian Adrian Grijincu , 2009, 2010, 2011. +# Devill , 2011. msgid "" msgstr "" "Project-Id-Version: seahorse\n" -"Report-Msgid-Bugs-To: " -"http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&component=general\n" -"POT-Creation-Date: 2011-01-19 20:34+0000\n" -"PO-Revision-Date: 2011-03-16 23:06+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-11-26 12:41+0000\n" +"PO-Revision-Date: 2011-11-26 15:32+0300\n" "Last-Translator: Lucian Adrian Grijincu \n" "Language-Team: Romanian Gnome Team \n" -"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" -"X-Generator: Virtaal 0.6.1\n" +"X-Generator: Virtaal 0.7.0\n" "X-Launchpad-Export-Date: 2009-10-03 17:48+0000\n" +"X-Project-Style: gnome\n" -#: ../daemon/seahorse-daemon.c:64 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "Nu executa seahorse-daemon ca serviciu" - -#: ../daemon/seahorse-daemon.c:94 -msgid "couldn't fork process" -msgstr "nu s-a putut crea procesul" - -#: ../daemon/seahorse-daemon.c:100 -msgid "couldn't create new process group" -msgstr "nu s-a putut crea un nou grup de procese" - -#: ../daemon/seahorse-daemon.c:250 -msgid "Encryption Daemon (Seahorse)" -msgstr "Serviciu de criptare (Seahorse)" - -#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "Tip cheie nevalid sau nerecunoscut: %s" - -#: ../daemon/seahorse-service.c:234 -#, c-format -msgid "This keytype is not supported: %s" -msgstr "Aceast tip de cheie nu este suportat: %s" - -#: ../daemon/seahorse-service.c:241 -#, c-format -msgid "Support for this feature was not enabled at build time" -msgstr "Suportul pentru această funcționalitate nu a fost activat la compilare" - -#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180 -#: ../daemon/seahorse-service-keyset.c:223 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "Cheie nevalidă sau nerecunoscută: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:204 -#, c-format -msgid "Signed by expired on %s." -msgstr "Semnat de expirat pe %s." - -#: ../daemon/seahorse-service-crypto.c:205 -msgid "Invalid Signature" -msgstr "Semnătură nevalidă" - -#: ../daemon/seahorse-service-crypto.c:211 -#, c-format -msgid "Signed by on %s Expired." -msgstr "Semnat de pe %s A expirat." - -#: ../daemon/seahorse-service-crypto.c:212 -msgid "Expired Signature" -msgstr "Semnătură expirată" - -#: ../daemon/seahorse-service-crypto.c:218 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "Semnat de Revocat pe %s." - -#: ../daemon/seahorse-service-crypto.c:219 -msgid "Revoked Signature" -msgstr "Semnătură revocată" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:225 -#, c-format -msgid "Signed by on %s." -msgstr "Semnat de pe %s." - -#: ../daemon/seahorse-service-crypto.c:226 -msgid "Good Signature" -msgstr "Semnătură bună" - -#: ../daemon/seahorse-service-crypto.c:231 -msgid "Signing key not in keyring." -msgstr "Cheia de semnare nu se află în inelul de chei." - -#: ../daemon/seahorse-service-crypto.c:232 -msgid "Unknown Signature" -msgstr "Semnătură necunoscută" - -#: ../daemon/seahorse-service-crypto.c:236 -msgid "Bad or forged signature. The signed data was modified." -msgstr "Semnătură greșită sau fraudată. Datele semnate au fost modificate." - -#: ../daemon/seahorse-service-crypto.c:237 -msgid "Bad Signature" -msgstr "Semnătură greșită" - -#: ../daemon/seahorse-service-crypto.c:245 -msgid "Couldn't verify signature." -msgstr "Nu s-a putut verifica semnătura." - -#: ../daemon/seahorse-service-crypto.c:317 -#: ../daemon/seahorse-service-crypto.c:646 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "Semnatar nevalid sau nerecunoscut: %s" - -#: ../daemon/seahorse-service-crypto.c:324 -#: ../daemon/seahorse-service-crypto.c:653 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "Cheia nu este validă pentru semnare: %s" - -#: ../daemon/seahorse-service-crypto.c:335 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "Destinatar nevalid sau nerecunoscut: %s" - -#: ../daemon/seahorse-service-crypto.c:343 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "Cheia nu este o intrare validă pentru criptare: %s" - -#: ../daemon/seahorse-service-crypto.c:352 -#, c-format -msgid "No recipients specified" -msgstr "Nici o intrare nu este specificată" - -#: ../daemon/seahorse-service-crypto.c:434 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "Tip cheie nevalid pentru decriptare: %s" - -#: ../daemon/seahorse-service-crypto.c:548 -#: ../daemon/seahorse-service-crypto.c:746 -#, c-format -msgid "Please set clearuri" -msgstr "Configurați clearuri" - -#: ../daemon/seahorse-service-crypto.c:554 -#: ../daemon/seahorse-service-crypto.c:752 -#, c-format -msgid "Please set crypturi" -msgstr "Configurați crypturi" - -#: ../daemon/seahorse-service-crypto.c:564 -#, c-format -msgid "Error opening clearuri" -msgstr "Eroare la deschiderea clearuri" - -#: ../daemon/seahorse-service-crypto.c:641 -#, c-format -msgid "No signer specified" -msgstr "Nici un semnatar nu este specificat" - -#: ../daemon/seahorse-service-crypto.c:830 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "Tip cheie nevalid pentru verificare: %s" +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "Adaugă un inel de chei pentru parole" -#: ../daemon/seahorse-service-keyset.c:273 -#, c-format -msgid "Invalid key id: %s" -msgstr "ID cheie nevalid: %s" +#: ../gkr/seahorse-add-keyring.xml.h:2 +msgid "New Keyring Name:" +msgstr "Numele noului inel de chei:" -#: ../data/seahorse.schemas.in.h:1 +#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"O listă cu URI-uri de server-e de chei pentru a căuta chei PGP aflate la " -"distanță. În versiunile ulterioare poate fi inclus un nume generic, adăugând " -"un spațiu și apoi numele." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "Descărcare automată chei" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "Sincronizare automată chei" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "" -"Controlează vizibilitatea coloanei de expirări din administratorul de chei." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "" -"Controlează vizibilitatea coloanei cu nivele de încredere din " -"administratorul de chei." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "" -"Controlează vizibilitatea coloanei de tipuri din administratorul de chei." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." msgstr "" -"Controlează vizibilitatea coloanei de validitate din administratorul de chei." +"Alegeți un nume pentru noul inel de chei. Vi se va solicita o parolă de " +"deblocare." -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "Permite partajarea DNS-SD" +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "Numele sau adresa serverului." -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"Permite folosirea cheilor DNS-SD (Apple Bonjour). seahorse-daemon trebuie să " -"fie în execuție și trebuie să fie compilat cu suport pentru HKP și DNS-SD." +#: ../gkr/seahorse-gkr-actions.c:80 +msgid "New password keyring" +msgstr "Un nou inel de chei pentru parole" -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "ID-ul cheii implicite" +#: ../gkr/seahorse-gkr-actions.c:81 ../gkr/seahorse-gkr-actions.c:88 +msgid "Used to store application and network passwords" +msgstr "Folosit pentru a stoca parole de aplicație și rețea" -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" -"Dacă este definat ca adevărat, atunci fișierele criptate cu seahorse vor fi " -"codate cu armură ASCII." +#: ../gkr/seahorse-gkr-actions.c:82 +msgid "New password..." +msgstr "Parolă nouă..." -#: ../data/seahorse.schemas.in.h:12 -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "" -"Dacă este adevărat, cheia implicită va fi întotdeauna adăugată la o listă cu " -"destinatari de encripție." +#: ../gkr/seahorse-gkr-actions.c:83 ../gkr/seahorse-gkr-actions.c:90 +msgid "Safely store a password or secret." +msgstr "Stochează în siguranță o parolă sau un secret." -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "Ultimul șablon de căutare a unui server de chei" +#: ../gkr/seahorse-gkr-actions.c:87 +msgid "Password Keyring" +msgstr "Inel de chei pentru parole" -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "Ultimele servere de chei folosite" +#: ../gkr/seahorse-gkr-actions.c:89 +msgid "Stored Password" +msgstr "Parolă stocată" -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "Ultima cheie folosită la semnarea unui mesaj." +#: ../gkr/seahorse-gkr-actions.c:169 +msgid "Couldn't unlock keyring" +msgstr "Nu s-a putut debloca inelul de chei" -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "Servere de chei PGP" +#: ../gkr/seahorse-gkr-actions.c:209 +msgid "Couldn't lock keyring" +msgstr "Nu s-a putut bloca inelul de chei" -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "Publică cheile pe acest server de chei." +#: ../gkr/seahorse-gkr-actions.c:250 +msgid "Couldn't set default keyring" +msgstr "Nu s-a putut defini inelul de chei implicit" -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "Arată coloana expirate în managerul de chei" +#: ../gkr/seahorse-gkr-actions.c:276 +msgid "Couldn't change keyring password" +msgstr "Nu s-a putut schimba parola inelului de chei" -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "Afișează coloana cu nivele de încredere în managerul de chei" +#: ../gkr/seahorse-gkr-actions.c:310 +msgid "Couldn't delete keyring" +msgstr "Nu s-a putut șterge inelul de chei" -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "Afișează coloana cu tipuri în managerul de chei" +#: ../gkr/seahorse-gkr-actions.c:330 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "Sigur doriți să ștergeți inelul de chei de parole „%s”?" -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "Afișează coloana de validitate în managerul de chei" +#: ../gkr/seahorse-gkr-actions.c:340 +msgid "Deleting keyring" +msgid_plural "Deleting keyrings" +msgstr[0] "Se șterge inelul de chei" +msgstr[1] "Se șterg inelele de chei" +msgstr[2] "Se șterg inelele de chei" -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"Specifică coloana după care se sortează fereastra destinatarilor. Coloanele " -"sunt: „nume” și „id”. Puneți un „-” în fața numelui coloanei pentru a o " -"sorta descrescător." +#: ../gkr/seahorse-gkr-actions.c:351 +msgid "_Lock" +msgstr "B_lochează" -#: ../data/seahorse.schemas.in.h:23 +#: ../gkr/seahorse-gkr-actions.c:352 msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." +"Lock the password storage keyring so a master password is required to unlock " +"it." msgstr "" -"Specifică coloana după care se sortează fereastra de administrare a cheilor. " -"Coloanele sunt: „nume”, „id”, „validitate”, „dată expirare”, „încredere” și " -"„tip”. Puneți un „-” în fața numelui coloanei pentru a o sorta descrescător." - -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "Identificatorul ultimei chei secrete folosite pentru a semna un mesaj." - -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "Coloana după care se sortează destinatarii" - -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "Coloana după care se sortează cheile" +"Blochează inelul de chei de stocare a parolelor astfel încât să fie nevoie " +"de o parolă-principală pentru a-l debloca." -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"Serverul de chei către care se publică cheile PGP. Lăsați-l gol pentru a " -"împiedica publicarea de chei PGP." +#: ../gkr/seahorse-gkr-actions.c:353 +msgid "_Unlock" +msgstr "_Deblochează" -#: ../data/seahorse.schemas.in.h:28 +#: ../gkr/seahorse-gkr-actions.c:354 msgid "" -"The last key server a search was performed against or empty for all key " -"servers." +"Unlock the password storage keyring with a master password so it is " +"available for use." msgstr "" -"Ultimul server de chei folosit pentru a căuta o cheie sau gol pentru toate " -"serverele de chei." +"Deblochează inelul de chei de stocare a parolelor cu o parolă-principală " +"pentru a fi disponibil pentru folosire." -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "Ultimul șablon de căutare folosit pentru a căuta pe un server de chei." +#: ../gkr/seahorse-gkr-actions.c:356 +msgid "Delete the keyring." +msgstr "Șterge inelul de chei." -#: ../data/seahorse.schemas.in.h:30 -msgid "" -"This specifies the default key to use for certain operations, mainly signing." -msgstr "" -"Specifică cheia implicită ce va fi folosită în anumite operații, în " -"principal pentru semnare." - -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "Dacă să se primească automat sau nu chei de la servere de chei." +#: ../gkr/seahorse-gkr-actions.c:360 +msgid "_Set as default" +msgstr "Definește ca i_mplicit" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." +#: ../gkr/seahorse-gkr-actions.c:361 +msgid "Applications usually store new passwords in the default keyring." msgstr "" -"Dacă să se sincronizeze automat sau nu cheile modificate cu serverul de chei " -"implicit." +"De obicei, aplicațiile stochează parolele noi în inelul de chei implicit." -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "Dacă să se cripteze întotdeauna cu cheia implicită sau nu" +#: ../gkr/seahorse-gkr-actions.c:362 +msgid "Change _Password" +msgstr "Schimbă _parola" -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "Dacă să se folosească armura ASCII" +#: ../gkr/seahorse-gkr-actions.c:363 +msgid "Change the unlock password of the password storage keyring" +msgstr "Schimbă parola de deblocare a inelului de chei de stocare a parolelor" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "Adaugă un inel de chei pentru parole" +#: ../gkr/seahorse-gkr-actions.c:365 +msgid "Properties of the keyring." +msgstr "Proprietățile inelului de chei." + +#: ../gkr/seahorse-gkr-actions.c:369 +msgid "Lock the password storage keyring." +msgstr "Blochează inelul de chei de stocare a parolelor." + +#: ../gkr/seahorse-gkr-actions.c:371 +msgid "Unlock the password storage keyring." +msgstr "Deschide inelul de chei de stocare a parolelor." + +#: ../gkr/seahorse-gkr-actions.c:508 +msgid "Couldn't delete item" +msgstr "Nu s-a putut șterge elementul" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Numele noului inel de chei:" +#: ../gkr/seahorse-gkr-actions.c:532 +#, c-format +msgid "Are you sure you want to delete the password '%s'?" +msgstr "Sigur doriți să ștergeți parola „%s”?" -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"Alegeți un nume pentru noul inel de chei. Vi se va solicita o parolă de " -"deblocare." +#: ../gkr/seahorse-gkr-actions.c:535 +#, c-format +msgid "Are you sure you want to delete %d password?" +msgid_plural "Are you sure you want to delete %d passwords?" +msgstr[0] "Sigur doriți să ștergeți %d parolă?" +msgstr[1] "Sigur doriți să ștergeți %d parole?" +msgstr[2] "Sigur doriți să ștergeți %d de parole?" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "Numele sau adresa serverului." +#: ../gkr/seahorse-gkr-actions.c:546 +msgid "Deleting item" +msgid_plural "Deleting items" +msgstr[0] "Se șterge elementul" +msgstr[1] "Se șterg elementele" +msgstr[2] "Se șterg elementele" + +#: ../gkr/seahorse-gkr-actions.c:558 +msgid "Properties of the password." +msgstr "Proprietățile parolei." + +#: ../gkr/seahorse-gkr-actions.c:563 +msgid "Delete the password." +msgstr "Șterge parola." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73 +#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:71 msgid "Couldn't add keyring" msgstr "Nu s-a putut adăuga inelul de chei" @@ -394,7 +198,8 @@ msgstr "Adaugă o parolă" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:15 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "_Description:" msgstr "_Descriere:" @@ -410,243 +215,169 @@ msgid "_Show Password" msgstr "Ara_tă parola" -#: ../gkr/seahorse-gkr-item.c:470 -msgid "Web Password" -msgstr "Parolă web" - -#: ../gkr/seahorse-gkr-item.c:472 -msgid "Network Password" -msgstr "Parola de rețea" - -#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "Parolă" - -#: ../gkr/seahorse-gkr-item-commands.c:78 -#, c-format -msgid "Are you sure you want to delete the password '%s'?" -msgstr "Sigur doriți să ștergeți parola „%s”?" - -#: ../gkr/seahorse-gkr-item-commands.c:81 -#, c-format -msgid "Are you sure you want to delete %d password?" -msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "Sigur doriți să ștergeți %d parolă?" -msgstr[1] "Sigur doriți să ștergeți %d parole?" -msgstr[2] "Sigur doriți să ștergeți %d de parole?" +#: ../gkr/seahorse-gkr-backend.c:101 +msgid "Passwords" +msgstr "Parole" + +#: ../gkr/seahorse-gkr-backend.c:104 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Parole, certificări și secrete personale stocate" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:313 +msgid "IM account password for " +msgstr "Parola contului de IM pentru" + +#: ../gkr/seahorse-gkr-item.c:379 +msgid "Password or secret" +msgstr "Parola sau secretul" + +#: ../gkr/seahorse-gkr-item.c:380 +msgid "Network password" +msgstr "Parola rețelei" + +#: ../gkr/seahorse-gkr-item.c:381 +msgid "Stored note" +msgstr "Note salvate" + +#: ../gkr/seahorse-gkr-item.c:382 +msgid "Keyring password" +msgstr "Parola inelului de chei" + +#: ../gkr/seahorse-gkr-item.c:383 +msgid "Encryption key password" +msgstr "Parola cheii de criptare" + +#: ../gkr/seahorse-gkr-item.c:384 +msgid "Key storage password" +msgstr "Parola pentru stocarea cheilor" + +#: ../gkr/seahorse-gkr-item.c:385 +msgid "Google Chrome password" +msgstr "Parola pentru Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:386 +msgid "Gnome Online Accounts password" +msgstr "Parola pentru conturile online Gnome" + +#: ../gkr/seahorse-gkr-item.c:387 +msgid "Telepathy password" +msgstr "Parola pentru Telepathy" + +#: ../gkr/seahorse-gkr-item.c:388 +msgid "Instant messaging password" +msgstr "Parola pentru mesagerie instant" + +#: ../gkr/seahorse-gkr-item.c:389 +msgid "Network Manager secret" +msgstr "Secretul pentru Network Manager" -#: ../gkr/seahorse-gkr-item-properties.c:66 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a network share or resource" msgstr "Accesează un dosar partajat sau o resursă din rețea" -#: ../gkr/seahorse-gkr-item-properties.c:69 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Access a website" msgstr "Accesează o pagină web" -#: ../gkr/seahorse-gkr-item-properties.c:72 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a PGP key" msgstr "Deblochează o cheie PGP" -#: ../gkr/seahorse-gkr-item-properties.c:75 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Unlocks a Secure Shell key" msgstr "Deblochează o cheie de shell securizat (SSH)" -#: ../gkr/seahorse-gkr-item-properties.c:78 +#: ../gkr/seahorse-gkr-item-properties.c:81 msgid "Saved password or login" msgstr "Parolă sau autentificare salvată " -#: ../gkr/seahorse-gkr-item-properties.c:102 +#: ../gkr/seahorse-gkr-item-properties.c:105 msgid "Network Credentials" msgstr "Autorizări de rețea" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:110 +msgid "Password" +msgstr "Parolă" + +#: ../gkr/seahorse-gkr-item-properties.c:210 msgid "Couldn't change password." msgstr "Nu s-a putut schimba parola." -#: ../gkr/seahorse-gkr-item-properties.c:350 +#: ../gkr/seahorse-gkr-item-properties.c:255 +#: ../gkr/seahorse-gkr-item-properties.c:376 +msgid "Updating password" +msgstr "Se actualizează parola" + +#: ../gkr/seahorse-gkr-item-properties.c:336 msgid "Couldn't set description." msgstr "Nu s-a putut defini descrierea." -#: ../gkr/seahorse-gkr-item-properties.c:654 -msgid "Couldn't set application access." -msgstr "Nu s-a putut defini accesul aplicațiilor." - #: ../gkr/seahorse-gkr-item-properties.xml.h:1 msgid "Password:" msgstr "Parola:" #: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "Cale:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "Permisiuni:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:4 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 #: ../ssh/seahorse-ssh-key-properties.xml.h:7 msgid "Technical Details:" msgstr "Detalii tehnice:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "Aplicații" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:6 +#: ../gkr/seahorse-gkr-item-properties.xml.h:3 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 #: ../ssh/seahorse-ssh-key-properties.xml.h:15 msgid "Details" msgstr "Detalii" -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 #: ../pgp/seahorse-pgp-subkey.c:366 #: ../ssh/seahorse-ssh-key-properties.xml.h:17 msgid "Key" msgstr "Cheie" -#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +#: ../gkr/seahorse-gkr-item-properties.xml.h:5 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #: ../ssh/seahorse-ssh-key-properties.xml.h:18 msgid "Key Properties" msgstr "Proprietăți cheie" -#: ../gkr/seahorse-gkr-item-properties.xml.h:9 +#: ../gkr/seahorse-gkr-item-properties.xml.h:6 msgid "Login:" msgstr "Autentificare:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Arată _parola" -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../gkr/seahorse-gkr-item-properties.xml.h:9 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 msgid "Type:" msgstr "Tip:" #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 msgid "Use:" msgstr "Utilizare:" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 -msgid "_Read" -msgstr "_Citire" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Write" -msgstr "_Scriere" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:20 -#| msgid "_Delete" -msgctxt "infinitive" -msgid "_Delete" -msgstr "Ș_tergere" - -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "Listare parole" - -#: ../gkr/seahorse-gkr-keyring.c:354 -#, c-format -msgid "Passwords: %s" -msgstr "Parole: %s" - -#: ../gkr/seahorse-gkr-keyring.c:355 -#, c-format -msgid "Passwords: %s" -msgstr "Parole: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:119 -msgid "Password Keyring" -msgstr "Inel de chei pentru parole" - -#: ../gkr/seahorse-gkr-keyring-commands.c:120 -msgid "Used to store application and network passwords" -msgstr "Folosit pentru a stoca parole de aplicație și rețea" - -#: ../gkr/seahorse-gkr-keyring-commands.c:121 -msgid "Stored Password" -msgstr "Parolă stocată" +#: ../gkr/seahorse-gkr-keyring.c:131 +msgid "Login keyring" +msgstr "Inelul de chei pentru autentificare" + +#: ../gkr/seahorse-gkr-keyring.c:545 +msgid "A keyring that is automatically unlocked on login" +msgstr "Un inel de chei care este deblocat automat la autentificare" + +#: ../gkr/seahorse-gkr-keyring.c:546 +msgid "A keyring used to store passwords" +msgstr "Un inel de chei folosit pentru stocarea parolelor" -#: ../gkr/seahorse-gkr-keyring-commands.c:122 -msgid "Safely store a password or secret." -msgstr "Stochează în siguranță o parolă sau un secret." - -#: ../gkr/seahorse-gkr-keyring-commands.c:136 -msgid "Couldn't unlock keyring" -msgstr "Nu s-a putut debloca inelul de chei" - -#: ../gkr/seahorse-gkr-keyring-commands.c:177 -msgid "Couldn't lock keyring" -msgstr "Nu s-a putut bloca inelul de chei" - -#: ../gkr/seahorse-gkr-keyring-commands.c:218 -msgid "Couldn't set default keyring" -msgstr "Nu s-a putut defini inelul de chei implicit" - -#: ../gkr/seahorse-gkr-keyring-commands.c:257 -msgid "Couldn't change keyring password" -msgstr "Nu s-a putut schimba parola inelului de chei" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "_Lock" -msgstr "B_lochează" - -#: ../gkr/seahorse-gkr-keyring-commands.c:289 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Blochează inelul de chei de stocare a parolelor astfel încât să fie nevoie " -"de o parolă-principală pentru a-l debloca." - -#: ../gkr/seahorse-gkr-keyring-commands.c:290 -msgid "_Unlock" -msgstr "_Deblochează" - -#: ../gkr/seahorse-gkr-keyring-commands.c:291 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Deblochează inelul de chei de stocare a parolelor cu o parolă-principală " -"pentru a fi disponibil pentru folosire." - -#: ../gkr/seahorse-gkr-keyring-commands.c:292 -msgid "_Set as default" -msgstr "Definește ca i_mplicit" - -#: ../gkr/seahorse-gkr-keyring-commands.c:293 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"De obicei, aplicațiile stochează parolele noi în inelul de chei implicit." - -#: ../gkr/seahorse-gkr-keyring-commands.c:294 -msgid "Change _Password" -msgstr "Schimbă _parola" - -#: ../gkr/seahorse-gkr-keyring-commands.c:295 -msgid "Change the unlock password of the password storage keyring" -msgstr "Schimbă parola de deblocare a inelului de chei de stocare a parolelor" - -#: ../gkr/seahorse-gkr-keyring-commands.c:360 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "Sigur doriți să ștergeți inelul de chei de parole „%s”?" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. #. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 @@ -666,266 +397,196 @@ msgid "_Name:" msgstr "_Nume:" -#: ../gkr/seahorse-gkr-operation.c:168 +#: ../gkr/seahorse-gkr-operation.c:54 ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:585 ../ssh/seahorse-ssh-operation.c:193 +msgid "The operation was cancelled" +msgstr "Operația a fost anulată" + +#: ../gkr/seahorse-gkr-operation.c:59 msgid "Access to the key ring was denied" msgstr "Accesul la inelul de chei a fost refuzat" -#: ../gkr/seahorse-gkr-operation.c:171 +#: ../gkr/seahorse-gkr-operation.c:62 msgid "The gnome-keyring daemon is not running" msgstr "Serviciul gnome-keyring nu este în execuție." -#: ../gkr/seahorse-gkr-operation.c:174 +#: ../gkr/seahorse-gkr-operation.c:65 msgid "The key ring has already been unlocked" msgstr "Inelul de chei a fost deja deblocat." -#: ../gkr/seahorse-gkr-operation.c:177 +#: ../gkr/seahorse-gkr-operation.c:68 msgid "No such key ring exists" msgstr "Nu există un astfel de inel de chei" -#: ../gkr/seahorse-gkr-operation.c:180 +#: ../gkr/seahorse-gkr-operation.c:71 msgid "Couldn't communicate with key ring daemon" msgstr "Nu s-a putut comunica cu serviciul de inele de chei" -#: ../gkr/seahorse-gkr-operation.c:183 +#: ../gkr/seahorse-gkr-operation.c:74 msgid "The item already exists" msgstr "Elementul există deja" -#: ../gkr/seahorse-gkr-operation.c:189 +#: ../gkr/seahorse-gkr-operation.c:80 msgid "Internal error accessing gnome-keyring" msgstr "Eroare internă la accesul la gnome-keyring" -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "Se salvează elementul..." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "Se șterge elementul..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "Se șterge inelul de chei..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "Se listează inelele de chei pentru parole" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"Nu s-au găsit chei de criptare cu care să se execute operația cerută. " -"Programul Parole și chei de criptare va fi pornit pentru a vă permite " -"să creați o cheie sau să importați una." - -#: ../libcryptui/cryptui-key-chooser.c:174 -#: ../libcryptui/cryptui-key-chooser.c:179 -msgid "All Keys" -msgstr "Toate cheile" - -#: ../libcryptui/cryptui-key-chooser.c:175 -#: ../libcryptui/cryptui-key-chooser.c:180 -msgid "Selected Recipients" -msgstr "Destinatari aleși" - -#: ../libcryptui/cryptui-key-chooser.c:176 -#: ../libcryptui/cryptui-key-chooser.c:181 -msgid "Search Results" -msgstr "Rezultate căutare" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:192 -msgid "Search _for:" -msgstr "Caută _după:" - -#: ../libcryptui/cryptui-key-chooser.c:250 -msgid "None (Don't Sign)" -msgstr "Nimic (Nu semna)" - -#: ../libcryptui/cryptui-key-chooser.c:263 -#, c-format -msgid "Sign this message as %s" -msgstr "Semnează acest mesaj ca %s" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:285 -msgid "_Sign message as:" -msgstr "_Semnează mesaj ca:" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:865 -msgid "Name" -msgstr "Nume" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1745 -#: ../src/seahorse-key-manager-store.c:877 -msgid "Key ID" -msgstr "ID cheie" - -#: ../libegg/egg-datetime.c:325 +#: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Marcaje de afișaj" -#: ../libegg/egg-datetime.c:326 +#: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" msgstr "Proprietăți dată și/sau oră afișate" -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "Modul leneș" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "Modul leneș nu normalizează valorile datelor și orelor introduse" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "An" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "An afișat" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "Lună" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "Lună afișată" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "Zi" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "Zi afișată" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "Oră" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "Oră afișată" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "Minut" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "Minut afișat" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "Secundă" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "Secundă afișată" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "Anul limitei inferioare" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "Anul din limita inferioară a datei" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "Anul limitei superioare" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "Anul din limita superioară a datei" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "Luna limitei inferioare" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "Luna din limita inferioară a datei" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "Luna limitei superioare" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "Luna din limita superioară a datei" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "Ziua limitei inferioare" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "Ziua din limita inferioară a datei" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "Ziua limitei superioare" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "Ziua din limita superioară a datei" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "Ora limitei inferioare" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "Ora din limita inferioară a datei" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "Ora limitei superioare" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "Ora din limita superioară a datei" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "Minutele limitei inferioare" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "Minutele din limita inferioară a datei" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "Minutele limitei superioare" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "Minutele din limita superioară a datei" -#: ../libegg/egg-datetime.c:433 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "Secundele limitei inferioare" -#: ../libegg/egg-datetime.c:434 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "Secundele din limita inferioară a datei" -#: ../libegg/egg-datetime.c:439 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "Secundele limitei superioare" -#: ../libegg/egg-datetime.c:440 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "Secundele din limita superioară a datei" @@ -934,161 +595,96 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:482 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:1" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "Data" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "Introduceți direct data" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "Alegeți data" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "Alegeți data dintr-un calendar" -#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Ora" -#: ../libegg/egg-datetime.c:529 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "Introduceți direct ora" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "Alegeți ora" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "Alegeți ora dintr-o listă" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:810 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: yes" -#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274 -#: ../libegg/egg-datetime.c:1278 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "AM" -#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275 -#: ../libegg/egg-datetime.c:1282 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "PM" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:824 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:827 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:831 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:834 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1190 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1255 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Fișierul nu este un fișier .desktop valid" - -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Versiune fișier desktop nerecunoscută „%s”" - -#: ../libegg/eggdesktopfile.c:968 -#, c-format -msgid "Starting %s" -msgstr "Se pornește %s" - -#: ../libegg/eggdesktopfile.c:1110 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Aplicația nu acceptă documente în linia de comandă" - -#: ../libegg/eggdesktopfile.c:1178 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Opțiune de lansare necunoscută: %d" - -#: ../libegg/eggdesktopfile.c:1383 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Nu se pot trimite URI-uri de documente către o intrare de desktop de tip " -"„Type=Link”" - -#: ../libegg/eggdesktopfile.c:1404 -#, c-format -msgid "Not a launchable item" -msgstr "Nu este un element ce poate fi lansat" - -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "Dezactivează conexiunea la administratorul de sesiuni" - -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "Specifică fișierul ce conține configurația salvată" - -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "FIȘIER" - -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "Specificați ID-ul administratorului de sesiune" - -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314 -msgid "ID" -msgstr "ID" - -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "Opțiuni de administrare a sesiunii:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "Afișează opțiunile de administrare a sesiunii" - #: ../libseahorse/seahorse-add-keyserver.xml.h:1 msgid ":" msgstr ":" @@ -1113,77 +709,25 @@ msgid "initial temporary item" msgstr "element inițial temporar" -#: ../libseahorse/seahorse-notification.c:576 -#: ../libseahorse/seahorse-notification.c:604 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "Cheia importată" -msgstr[1] "Chei importate" -msgstr[2] "Chei importate" - -#: ../libseahorse/seahorse-notification.c:580 -#: ../libseahorse/seahorse-notification.c:603 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "S-a importat %i cheie" -msgstr[1] "S-au importat %i chei" -msgstr[2] "S-au importat %i de chei" - -#: ../libseahorse/seahorse-notification.c:582 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "S-a importat o cheie pentru" -msgstr[1] "S-au importat chei pentru" -msgstr[2] "S-au importat chei pentru" - -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "Mesaje de notifcare" - -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "Cheie simetrică" - -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "Cheie publică" - -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "Cheie privată" - -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "Autorizații" - -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "Identitate" - -#: ../libseahorse/seahorse-passphrase.c:200 -msgid "Passphrase" -msgstr "Frază secretă" +#: ../libseahorse/seahorse-key-manager-store.c:476 +#: ../libseahorse/seahorse-viewer.c:259 +msgid "Couldn't export keys" +msgstr "Nu s-au putut exporta cheile" -#: ../libseahorse/seahorse-passphrase.c:203 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-passphrase.c:182 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "Parolă:" -#: ../libseahorse/seahorse-passphrase.c:269 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:244 msgid "Confirm:" msgstr "Confirmă:" -#: ../libseahorse/seahorse-prefs.c:62 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "Nu este o adresă validă pentru un server de chei." -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." @@ -1191,7 +735,7 @@ "Pentur ajutor contactați administratorul de sistem sau administratorul " "serverului de chei." -#: ../libseahorse/seahorse-prefs.c:172 +#: ../libseahorse/seahorse-prefs.c:182 msgid "URL" msgstr "URL" @@ -1199,7 +743,7 @@ msgid "Custom" msgstr "Personalizat" -#: ../libseahorse/seahorse-prefs.c:425 +#: ../libseahorse/seahorse-prefs.c:405 msgid "None: Don't publish keys" msgstr "Niciunul: nu publica cheile" @@ -1227,109 +771,207 @@ msgid "_Publish keys to:" msgstr "_Publică chei via:" -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "Titlu progres" - -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "Indisponibil" - -#: ../libseahorse/seahorse-util.c:240 +#: ../libseahorse/seahorse-util.c:216 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:516 +#: ../libseahorse/seahorse-util.c:399 msgid "Key Data" msgstr "Datele cheii" -#: ../libseahorse/seahorse-util.c:518 +#: ../libseahorse/seahorse-util.c:401 msgid "Multiple Keys" msgstr "Chei multiple" -#: ../libseahorse/seahorse-util.c:774 -msgid "Couldn't run file-roller" -msgstr "Nu s-a putut găsi file-roller" - -#: ../libseahorse/seahorse-util.c:780 -msgid "Couldn't package files" -msgstr "Nu s-au putut împacheta fișierele" - -#: ../libseahorse/seahorse-util.c:781 -msgid "The file-roller process did not complete successfully" -msgstr "Procesul file-roller nu s-a terminat cu succes" - #. Filter for PGP keys. We also include *.asc, as in many #. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:957 +#: ../libseahorse/seahorse-util.c:691 msgid "All key files" msgstr "Toate fișierele chei" -#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016 +#: ../libseahorse/seahorse-util.c:702 ../libseahorse/seahorse-util.c:750 #: ../pgp/seahorse-gpgme-photos.c:242 msgid "All files" msgstr "Toate fișierele" -#: ../libseahorse/seahorse-util.c:1009 +#: ../libseahorse/seahorse-util.c:743 msgid "Archive files" msgstr "Arhivează fișierele" -#: ../libseahorse/seahorse-util.c:1079 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Deja există un fișier cu acest nume.\n" -"\n" -"Doriți să-l înlocuiți cu noul fișier?" +#: ../libseahorse/seahorse-util.c:814 +msgid "" +"A file already exists with this name.\n" +"\n" +"Do you want to replace it with a new file?" +msgstr "" +"Deja există un fișier cu acest nume.\n" +"\n" +"Doriți să-l înlocuiți cu noul fișier?" + +#: ../libseahorse/seahorse-util.c:817 +msgid "_Replace" +msgstr "În_locuiește" + +#: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 +#: ../pgp/seahorse-pgp-key-properties.c:1277 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pkcs11/seahorse-token.c:581 +msgid "Unknown" +msgstr "Necunoscut" + +#: ../libseahorse/seahorse-validity.c:42 +#: ../pgp/seahorse-pgp-key-properties.c:1283 +msgctxt "Validity" +msgid "Never" +msgstr "Niciodată" + +#: ../libseahorse/seahorse-validity.c:44 +#: ../pgp/seahorse-pgp-key-properties.c:1290 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Marginal" +msgstr "Marginală" + +#: ../libseahorse/seahorse-validity.c:46 +#: ../pgp/seahorse-pgp-key-properties.c:1296 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Full" +msgstr "Deplină" + +#: ../libseahorse/seahorse-validity.c:48 +#: ../pgp/seahorse-pgp-key-properties.c:1302 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Ultimate" +msgstr "Fără echivoc" + +#: ../libseahorse/seahorse-validity.c:50 +#: ../pgp/seahorse-pgp-key-properties.c:1492 +msgid "Disabled" +msgstr "Dezactivat" + +#: ../libseahorse/seahorse-validity.c:52 +#: ../pgp/seahorse-pgp-key-properties.c:1488 +msgid "Revoked" +msgstr "Revocat" + +#: ../libseahorse/seahorse-viewer.c:83 +msgid "Contributions:" +msgstr "Contribuții:" + +#: ../libseahorse/seahorse-viewer.c:107 ../src/seahorse.desktop.in.in.h:2 +#: ../src/seahorse-key-manager.c:590 ../src/seahorse-main.c:68 +msgid "Passwords and Keys" +msgstr "Parole și chei" + +#: ../libseahorse/seahorse-viewer.c:109 +msgid "translator-credits" +msgstr "" +"Lucian Adrian Grijincu\n" +"\n" +"Launchpad Contributions:\n" +" Adi Roiban https://launchpad.net/~adiroiban\n" +" Alex Eftimie https://launchpad.net/~alexeftimie\n" +" Andrei Coman https://launchpad.net/~comandrei\n" +" Bogdan Bădic-Spătariu https://launchpad.net/~thelad33\n" +" Ionuț Jula https://launchpad.net/~ionutjula\n" +" Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu\n" +" ProMIX https://launchpad.net/~promix89-gmail" + +#: ../libseahorse/seahorse-viewer.c:112 +msgid "Seahorse Project Homepage" +msgstr "Pagina proiectului Seahorse" + +#. Top menu items +#: ../libseahorse/seahorse-viewer.c:229 +msgid "_File" +msgstr "_Fișier" + +#: ../libseahorse/seahorse-viewer.c:230 +msgid "_Edit" +msgstr "_Editare" + +#. Translators: This text refers to deleting an item from its type's backing store +#: ../libseahorse/seahorse-viewer.c:232 +#: ../pkcs11/seahorse-pkcs11-properties.c:249 +msgid "_Delete" +msgstr "Ș_terge" + +#: ../libseahorse/seahorse-viewer.c:233 +msgid "Delete selected items" +msgstr "Șterge elementele selectate" + +#: ../libseahorse/seahorse-viewer.c:235 +msgid "Show the properties of this item" +msgstr "Afișează proprietățile acestui element" + +#: ../libseahorse/seahorse-viewer.c:237 +msgid "Show the properties of this place" +msgstr "Afișează proprietățile acestui loc" + +#: ../libseahorse/seahorse-viewer.c:238 +msgid "Prefere_nces" +msgstr "Preferi_nțe" + +#: ../libseahorse/seahorse-viewer.c:239 +msgid "Change preferences for this program" +msgstr "Schimbă preferințele pentru acest program" + +#: ../libseahorse/seahorse-viewer.c:240 +msgid "_View" +msgstr "_Vizualizare" + +#: ../libseahorse/seahorse-viewer.c:241 +msgid "_Help" +msgstr "_Ajutor" + +#: ../libseahorse/seahorse-viewer.c:243 +msgid "About this program" +msgstr "Despre acest program" + +#: ../libseahorse/seahorse-viewer.c:244 +msgid "_Contents" +msgstr "_Conținut" -#: ../libseahorse/seahorse-util.c:1082 -msgid "_Replace" -msgstr "În_locuiește" +#: ../libseahorse/seahorse-viewer.c:245 +msgid "Show Seahorse help" +msgstr "Afișează ajutorul pentru Seahorse" -#: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1133 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 -msgid "Unknown" -msgstr "Necunoscut" +#: ../libseahorse/seahorse-viewer.c:280 +msgid "Export public key" +msgstr "Exportă chei publice" -#: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1139 -msgctxt "Validity" -msgid "Never" -msgstr "Niciodată" +#: ../libseahorse/seahorse-viewer.c:294 +#: ../pgp/seahorse-pgp-key-properties.c:1143 +#: ../ssh/seahorse-ssh-key-properties.c:201 +#, c-format +msgid "Couldn't export key to \"%s\"" +msgstr "Nu s-a putut exporta cheia către „%s”" -#: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1146 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 -msgid "Marginal" -msgstr "Marginală" +#: ../libseahorse/seahorse-viewer.c:301 +msgid "Exporting keys" +msgstr "Se exportă chei" -#: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1152 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 -msgid "Full" -msgstr "Deplină" +#: ../libseahorse/seahorse-viewer.c:330 +msgid "Couldn't retrieve data from key server" +msgstr "Nu s-au putut obține date de la serverul de chei" -#: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1158 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -msgid "Ultimate" -msgstr "Fără echivoc" +#: ../libseahorse/seahorse-viewer.c:364 +msgid "Retrieving keys" +msgstr "Se obțin cheile" -#: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1351 -msgid "Disabled" -msgstr "Dezactivat" +#: ../libseahorse/seahorse-viewer.c:372 +msgid "E_xport..." +msgstr "E_xportă..." -#: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1347 -msgid "Revoked" -msgstr "Revocat" +#: ../libseahorse/seahorse-viewer.c:373 +msgid "Export to a file" +msgstr "Exportă într-un fișier" -#: ../libseahorse/seahorse-widget.c:480 +#: ../libseahorse/seahorse-viewer.c:375 +msgid "Copy to the clipboard" +msgstr "Copiază în clipboard" + +#: ../libseahorse/seahorse-widget.c:473 #, c-format msgid "Could not display help: %s" msgstr "Nu s-a putut afișa ajutorul: %s" @@ -1351,6 +993,7 @@ msgstr "_Lungime cheie:" #: ../pgp/seahorse-add-subkey.xml.h:5 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 msgid "Key _Type:" msgstr "_Tip cheie:" @@ -1390,7 +1033,7 @@ msgid "Optional email address" msgstr "Adresă e-mail opțională" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Email Address:" msgstr "Adresă _email:" @@ -1406,107 +1049,157 @@ msgid "_Never expires" msgstr "Nu expiră _niciodată" -#: ../pgp/seahorse-gpgme-add-subkey.c:147 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "Nu s-a putut adăuga cheia" -#: ../pgp/seahorse-gpgme-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "Adaugă subcheia la %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (doar pentru semnare)" -#: ../pgp/seahorse-gpgme-add-subkey.c:190 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (doar pentru criptare)" -#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (doar pentru semnare)" -#: ../pgp/seahorse-gpgme-add-subkey.c:202 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (doar pentru criptare)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "Nu s-a putut adăuga identificatorul de utilizator" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "Adaugă ID de utilizator la %s" -#: ../pgp/seahorse-gpgme.c:72 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "Decriptarea a eșuat. Probabil nu dețineți cheia de decriptare." -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Dată de expirare nevalidă" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "Data de expirare trebuie să fie în viitor" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "Nu s-a putut schimba data de expirare" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "Expirare: %s" -#: ../pgp/seahorse-gpgme-generate.c:79 +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Cheie PGP" -#: ../pgp/seahorse-gpgme-generate.c:80 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Folosită pentru a cripta emailuri și fișiere" -#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:117 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Nu s-a putut genera cheia PGP" -#: ../pgp/seahorse-gpgme-generate.c:195 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "Fraza secretă pentru noua cheie PGP" -#: ../pgp/seahorse-gpgme-generate.c:196 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "Introduceți de două ori fraza secretă pentru noua cheie." -#: ../pgp/seahorse-gpgme-generate.c:205 -msgid "Couldn't generate key" -msgstr "Nu s-a putut genera cheia" - -#: ../pgp/seahorse-gpgme-generate.c:207 +#: ../pgp/seahorse-gpgme-generate.c:223 +#: ../pkcs11/seahorse-pkcs11-generate.c:457 msgid "Generating key" msgstr "Se generează cheia" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Arată parola" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "Aceasta a fost a treia încercare în care ați introdus o parolă greșită. " "Încercați din nou." +#: ../pgp/seahorse-gpgme-keyring.c:90 +#, c-format +msgid "Wrong passphrase." +msgstr "Frază secretă greșită." + +#: ../pgp/seahorse-gpgme-keyring.c:94 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Introduceți fraza secretă nouă pentru „%s”" + +#: ../pgp/seahorse-gpgme-keyring.c:96 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Introduceți fraza secretă nouă pentru „%s”" + +#: ../pgp/seahorse-gpgme-keyring.c:99 +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Enter new passphrase" +msgstr "Introduceți fraza secretă nouă" + +#: ../pgp/seahorse-gpgme-keyring.c:101 +msgid "Enter passphrase" +msgstr "Introduceți fraza secretă" + +#: ../pgp/seahorse-gpgme-keyring.c:106 +msgid "Passphrase" +msgstr "Frază secretă" + +#: ../pgp/seahorse-gpgme-keyring.c:307 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "S-a încărcat %d cheie" +msgstr[1] "S-au încărcat %d chei" +msgstr[2] "S-au încărcat %d de chei" + +#: ../pgp/seahorse-gpgme-keyring.c:653 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Datele cheii nu sunt valide (lipsesc UID-urile). Motivul poate fi data " +"calculatorului este definită în viitor sau auto-semnătura lipsește." + +#: ../pgp/seahorse-gpgme-keyring.c:962 +msgid "GnuPG keyring" +msgstr "Inel de chei GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:965 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: dosarul implicit al inelului de chei" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1545,64 +1238,68 @@ msgid "Choose Photo to Add to Key" msgstr "Alegeți fotografia de adăugat la cheie" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:278 +msgid "Couldn't prepare photo" +msgstr "Nu s-a putut prepara fotografia" + +#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 msgid "Couldn't add photo" msgstr "Nu s-a putut adăuga fotografia" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:289 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Fișierul nu a putut fi încărcat. S-ar putea să aibă un format nevalid" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:318 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Sigur doriți să ștergeți fotografia curentă din cheie?" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:331 msgid "Couldn't delete photo" msgstr "Nu s-a putut șterge fotografia" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "Nu s-a putut revoca cheia" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "Revocă: %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "Niciun motiv" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "Nu s-a dat niciun motiv pentru revocarea cheii" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "Compromisă" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "Cheia a fost compromisă" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "Înlocuită" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "Cheia a fost înlocuită" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "Neutilizată" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "Cheia nu mai este folosită" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " @@ -1611,11 +1308,11 @@ "Sunteți pe cale de a adăuga %s ca un revocator pentru %s. Această operație " "nu poate fi anulată! Sigur doriți să continuați?" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "Nu s-a putut adăuga revocatorul" -#: ../pgp/seahorse-gpgme-sign.c:99 +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1624,17 +1321,17 @@ "Această cheie a fost deja semnată de către\n" "„%s”" -#: ../pgp/seahorse-gpgme-sign.c:103 +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "Nu s-a putut semna cheia" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nu există chei ce pot fi folosite la semnare" -#: ../pgp/seahorse-gpgme-sign.c:158 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1642,168 +1339,247 @@ "Nu aveți chei PGP personale care pot fi folosite pentru a indica încrederea " "în această cheie" -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "Frază secretă greșită." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:603 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Introduceți fraza secretă nouă pentru „%s”" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Căutarea nu a fost destul de precisă. Serverul „%s” a găsit prea multe chei." -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:606 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Introduceți fraza secretă nouă pentru „%s”" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Nu s-a putut comunica cu serverul „%s”: %s" -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Introduceți fraza secretă nouă" +#: ../pgp/seahorse-hkp-source.c:1134 +msgid "HTTP Key Server" +msgstr "Server HTTP de chei" -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "Introduceți fraza secretă" +#: ../pgp/seahorse-keyserver-results.c:176 +msgid "Couldn't import keys" +msgstr "Nu s-au putut importa cheile" + +#: ../pgp/seahorse-keyserver-results.c:219 +msgid "Importing keys from key servers" +msgstr "Se importă chei de la serverele de chei" + +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:439 +msgid "_Remote" +msgstr "La di_stanță" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Închide această fereastră" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:101 +msgid "_Find Remote Keys..." +msgstr "Cau_tă chei la distanță..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:102 +msgid "Search for keys on a key server" +msgstr "Caută chei pe un server de chei" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:5 +msgid "_Import" +msgstr "_Importă" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Importă cheile selectate în inelul de chei local" + +#: ../pgp/seahorse-keyserver-results.c:294 +msgid "Remote Keys" +msgstr "Chei la distanță" + +#: ../pgp/seahorse-keyserver-results.c:296 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "S-a încărcat %d cheie" -msgstr[1] "S-au încărcat %d chei" -msgstr[2] "S-au încărcat %d de chei" +msgid "Remote Keys Containing '%s'" +msgstr "Chei la distanță ce conține „%s”" + +#: ../pgp/seahorse-keyserver-results.c:496 +msgid "The search for keys failed." +msgstr "Căutarea cheilor a eșuat." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Key Servers:" +msgstr "Servere de chei:" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "Shared Keys Near Me:" +msgstr "Chei partajate în apropiere:" -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "Se încarcă cheile..." +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "Find Remote Keys" +msgstr "Caută chei la distanță" -#: ../pgp/seahorse-gpgme-source.c:820 +#: ../pgp/seahorse-keyserver-search.xml.h:4 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Datele cheii nu sunt valide (lipsesc UID-urile). Motivul poate fi data " -"calculatorului este definită în viitor sau auto-semnătura lipsește." +"Aceasta va căuta chei la distanță pe Internet. Aceste chei pot fi apoi " +"importate în inelul de chei local." -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544 -msgid "Importing Keys" -msgstr "Se importă chei" +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Where to search:" +msgstr "Unde să se caute:" -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "Se exportă chei" +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "_Search" +msgstr "_Caută" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search for keys containing: " +msgstr "Cau_tă chei ce conțin:" -#: ../pgp/seahorse-hkp-source.c:387 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Căutarea nu a fost destul de precisă. Serverul „%s” a găsit prea multe chei." +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Nu s-au putut publica cheile către server" -#: ../pgp/seahorse-hkp-source.c:389 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Nu s-a putut comunica cu serverul „%s”: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "Nu s-au putut descărca cheile de pe server: %s" -#: ../pgp/seahorse-hkp-source.c:671 -msgid "Searching for keys..." -msgstr "Se caută cheile..." - -#: ../pgp/seahorse-hkp-source.c:759 -msgid "Uploading keys..." -msgstr "Se încarcă cheile..." - -#: ../pgp/seahorse-hkp-source.c:857 -msgid "Retrieving keys..." -msgstr "Se obțin cheile..." - -#: ../pgp/seahorse-hkp-source.c:987 -#, c-format -msgid "Searching for keys on: %s" -msgstr "Se caută cheile pe: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154 -#: ../pgp/seahorse-ldap-source.c:668 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Connecting to: %s" -msgstr "Se conectează la: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d cheie este selectată pentru sincronizare" +msgstr[1] "%d chei sunt selectate pentru sincronizare" +msgstr[2] "%d de chei sunt selectate pentru sincronizare" -#: ../pgp/seahorse-hkp-source.c:1184 -msgid "HTTP Key Server" -msgstr "Server HTTP de chei" +#: ../pgp/seahorse-keyserver-sync.c:229 +msgid "Synchronizing keys..." +msgstr "Se sincronizează cheile..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Sincronizează cheile" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Va publica cheile din inelul dumneavoastră de chei astfel încât să fie " +"disponibile altora. De asemenea, veți primi și toate modificările pe care " +"alții le-au făcut de când ați primit cheile lor." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Veți primi toate modificările pe care alții le-au făcut de când ați primit " +"cheile lor. Niciun server de chei nu este selectat pentru publicare, prin " +"urmare cheile dumneavoastră nu vor fi făcute publice." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Servere de c_hei" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Sincronizează" -#: ../pgp/seahorse-ldap-source.c:459 +#: ../pgp/seahorse-ldap-source.c:440 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Nu s-a putut comunica cu „%s”: %s" -#: ../pgp/seahorse-ldap-source.c:641 +#: ../pgp/seahorse-ldap-source.c:651 +#, c-format +msgid "Connecting to: %s" +msgstr "Se conectează la: %s" + +#: ../pgp/seahorse-ldap-source.c:657 #, c-format msgid "Couldn't resolve address: %s" msgstr "Nu s-a putut rezolva adresa: %s" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-ldap-source.c:701 #, c-format msgid "Resolving server address: %s" msgstr "Se rezolvă adresa serverului: %s" -#: ../pgp/seahorse-ldap-source.c:955 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "Se caută chei ce conțin „%s”..." - -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "Se caută cheia cu id-ul „%s”..." - -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "Se descarcă cheile..." - -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "Se trimit cheile către serverul de chei..." - -#: ../pgp/seahorse-ldap-source.c:1423 +#: ../pgp/seahorse-ldap-source.c:1450 msgid "LDAP Key Server" msgstr "Server LDAP de chei" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "_Semnează cheia..." +#: ../pgp/seahorse-pgp-actions.c:106 +msgid "_Sync and Publish Keys..." +msgstr "_Sincronizează și publică cheile..." -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "Semnează cheia publică" +#: ../pgp/seahorse-pgp-actions.c:107 +msgid "Publish and/or synchronize your keys with those online." +msgstr "" +"Publică și/sau sincronizează cheile dumneavoastră cu cele de pe internet." -#: ../pgp/seahorse-pgp-commands.c:171 +#: ../pgp/seahorse-pgp-actions.c:251 #, c-format msgid "Are you sure you want to permanently delete %s?" msgstr "Sigur doriți să ștergeți permanent %s?" -#: ../pgp/seahorse-pgp-commands.c:176 +#: ../pgp/seahorse-pgp-actions.c:256 ../pgp/seahorse-pgp-actions.c:257 #, c-format msgid "Are you sure you want to permanently delete %d keys and identities?" msgstr "Sigur doriți să ștergeți permanent %d chei și identități?" -#: ../pgp/seahorse-pgp-commands.c:178 +#: ../pgp/seahorse-pgp-actions.c:261 ../pgp/seahorse-pgp-actions.c:262 #, c-format msgid "Are you sure you want to permanently delete %d keys?" msgstr "Sigur doriți să ștergeți permanent %d chei?" -#: ../pgp/seahorse-pgp-commands.c:180 +#: ../pgp/seahorse-pgp-actions.c:266 ../pgp/seahorse-pgp-actions.c:267 #, c-format msgid "Are you sure you want to permanently delete %d identities?" msgstr "Sigur doriți să ștergeți permanent %d identități?" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 +#: ../pgp/seahorse-pgp-actions.c:288 ../pgp/seahorse-pgp-key-properties.c:352 +msgid "Couldn't delete user ID" +msgstr "Nu s-a putut șterge identificatorul utilizatorului" + +#: ../pgp/seahorse-pgp-actions.c:292 +msgid "Couldn't delete private key" +msgstr "Nu s-a putut șterge cheia privată" + +#: ../pgp/seahorse-pgp-actions.c:295 +msgid "Couldn't delete public key" +msgstr "Nu s-a putut șterge cheia publică" + +#: ../pgp/seahorse-pgp-actions.c:307 +msgid "_Sign Key..." +msgstr "_Semnează cheia..." + +#: ../pgp/seahorse-pgp-actions.c:308 +msgid "Sign public key" +msgstr "Semnează cheia publică" + +#: ../pgp/seahorse-pgp-actions.c:310 ../ssh/seahorse-ssh-actions.c:145 +msgid "Properties of the key." +msgstr "Proprietățile cheii." + +#: ../pgp/seahorse-pgp-actions.c:315 ../ssh/seahorse-ssh-actions.c:140 +msgid "Delete the key." +msgstr "Șterge cheia." + +#: ../pgp/seahorse-pgp-backend.c:174 +msgid "PGP Keys" +msgstr "Chei PGP" + +#: ../pgp/seahorse-pgp-backend.c:177 +msgid "PGP keys are for encrypting email or files" +msgstr "Cheile PGP sunt folosite pentru a cripta emailuri și fișiere" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "_Advanced key options" msgstr "Opțiuni _avansate pentru chei" @@ -1825,7 +1601,7 @@ msgid "E_xpiration Date:" msgstr "Data e_xpirării:" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 msgid "Encryption _Type:" msgstr "_Tip criptare:" @@ -1833,7 +1609,9 @@ msgid "Generate a new key" msgstr "Generează o nouă cheie" -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../pgp/seahorse-pgp-generate.xml.h:9 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:6 msgid "Key _Strength (bits):" msgstr "Com_plexitate cheie (biți):" @@ -1842,129 +1620,123 @@ msgstr "Nu e_xpiră niciodată" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Cheie PGP nouă" - -#: ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Comment:" msgstr "_Comentariu:" -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Cheie PGP privată" - -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Cheie PGP publică" +#: ../pgp/seahorse-pgp-key.c:347 +msgid "Personal PGP key" +msgstr "Cheie PGP personală" -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349 -msgid "Expired" -msgstr "Expirată" +#: ../pgp/seahorse-pgp-key.c:349 +msgid "PGP key" +msgstr "Cheie PGP" -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:323 msgid "Couldn't change primary user ID" msgstr "Nu s-a putut schimba identificatorul utilizatorului principal" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:342 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Sigur doriți să ștergeți permanent identificatorul de utilizator „%s”?" -#: ../pgp/seahorse-pgp-key-properties.c:251 -msgid "Couldn't delete user ID" -msgstr "Nu s-a putut șterge identificatorul utilizatorului" - -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1464 +#: ../pgp/seahorse-pgp-key-properties.c:426 +#: ../pgp/seahorse-pgp-key-properties.c:1593 msgid "[Unknown]" msgstr "[Nescunoscut]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1742 +#: ../pgp/seahorse-pgp-key-properties.c:529 +#: ../pgp/seahorse-pgp-key-properties.c:1872 msgid "Name/Email" msgstr "Nume/Email" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:534 msgid "Signature ID" msgstr "ID semnătură" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:667 msgid "Couldn't change primary photo" msgstr "Nu s-a putut schimba fotografia principală" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#: ../pgp/seahorse-pgp-key-properties.c:900 msgid "(unknown)" msgstr "(necunoscut)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:903 #, c-format msgid "This key expired on: %s" msgstr "Această cheie expiră la data: %s" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:966 +msgid "Name" +msgstr "Nume" + +#: ../pgp/seahorse-pgp-key-properties.c:1079 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Sigur doriți să ștergeți permanent subcheia %d din %s?" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1088 msgid "Couldn't delete subkey" msgstr "Nu s-a putut șterge subcheia" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1427 +#: ../pgp/seahorse-pgp-key-properties.c:1128 +#: ../pgp/seahorse-pgp-key-properties.c:1568 msgid "Unable to change trust" msgstr "Nu s-a putut modifica nivelul de încredere" -#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290 -#: ../ssh/seahorse-ssh-key-properties.c:168 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Nu s-a putut exporta cheia către „%s”" - -#: ../pgp/seahorse-pgp-key-properties.c:1035 -#: ../ssh/seahorse-ssh-key-properties.c:193 +#: ../pgp/seahorse-pgp-key-properties.c:1173 +#: ../ssh/seahorse-ssh-key-properties.c:225 msgid "Export Complete Key" msgstr "Exportă cheie completă" -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:215 +#: ../pgp/seahorse-pgp-key-properties.c:1201 +#: ../ssh/seahorse-ssh-key-properties.c:247 msgid "Couldn't export key." msgstr "Nu s-a putut exporta cheia." -#: ../pgp/seahorse-pgp-key-properties.c:1267 -#: ../pgp/seahorse-pgp-key-properties.c:1356 +#: ../pgp/seahorse-pgp-key-properties.c:1408 +#: ../pgp/seahorse-pgp-key-properties.c:1497 msgctxt "Expires" msgid "Never" msgstr "Niciodată" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1317 -#: ../src/seahorse-key-manager-store.c:896 +#: ../pgp/seahorse-pgp-key-properties.c:1455 +msgid "ID" +msgstr "ID" + +#: ../pgp/seahorse-pgp-key-properties.c:1458 msgid "Type" msgstr "Tip" -#: ../pgp/seahorse-pgp-key-properties.c:1320 +#: ../pgp/seahorse-pgp-key-properties.c:1461 msgid "Created" msgstr "Creat" -#: ../pgp/seahorse-pgp-key-properties.c:1323 +#: ../pgp/seahorse-pgp-key-properties.c:1464 msgid "Expires" msgstr "Expiră" -#: ../pgp/seahorse-pgp-key-properties.c:1326 +#: ../pgp/seahorse-pgp-key-properties.c:1467 msgid "Status" msgstr "Stare" -#: ../pgp/seahorse-pgp-key-properties.c:1329 +#: ../pgp/seahorse-pgp-key-properties.c:1470 msgid "Strength" msgstr "Complexitate" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1490 +msgid "Expired" +msgstr "Expirată" + +#: ../pgp/seahorse-pgp-key-properties.c:1494 msgid "Good" msgstr "Bună" +#: ../pgp/seahorse-pgp-key-properties.c:1875 +msgid "Key ID" +msgstr "ID cheie" + #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 msgid "Actions" msgstr "Acțiuni" @@ -2106,6 +1878,10 @@ msgid "Primary" msgstr "Primară" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +msgid "Private PGP Key" +msgstr "Cheie PGP privată" + #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 msgid "Remove this photo from this key" msgstr "Șterge această fotografie din această cheie" @@ -2138,7 +1914,6 @@ #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -#| msgid "Name:" msgctxt "name-of-key" msgid "Name:" msgstr "Nume:" @@ -2201,9 +1976,11 @@ msgid "Marginally" msgstr "Marginală" -#. Trust column +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "Public PGP Key" +msgstr "Cheie PGP publică" + #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:890 msgid "Trust" msgstr "Încredere" @@ -2252,13 +2029,17 @@ msgid "_Reason:" msgstr "Mot_iv:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Nu aveți chei PGP personale care pot fi folosite pentru a semna un document " "sau un mesaj." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Semnează mesajul cu cheia:" + #: ../pgp/seahorse-sign.xml.h:1 msgid "How carefully have you checked this key?" msgstr "Cât de atent ați verificat cheia aceasta?" @@ -2347,21 +2128,59 @@ msgid "_Very Carefully" msgstr "Cu multă a_tenție" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Semnează mesajul cu cheia:" +#: ../pgp/seahorse-transfer.c:200 +msgid "Exporting data" +msgstr "Se exportă date" + +#: ../pgp/seahorse-transfer.c:200 +msgid "Retrieving data" +msgstr "Se obțin date" + +#: ../pgp/seahorse-transfer.c:203 +msgid "Importing data" +msgstr "Se importă date" + +#: ../pgp/seahorse-transfer.c:203 +msgid "Sending data" +msgstr "Se trimit date" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Indisponibil" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:298 +msgid "Certificate and Key" +msgstr "Certificat și cheie" + +#: ../pkcs11/seahorse-certificate.c:300 msgid "Certificate" msgstr "Certificat" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 +#: ../pkcs11/seahorse-interaction.c:100 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Introduceți PIN-ul sau parola pentru: %s" + +#: ../pkcs11/seahorse-pkcs11-actions.c:118 +msgid "Lock this token" +msgstr "Blochează acest jeton" + +#: ../pkcs11/seahorse-pkcs11-actions.c:120 +msgid "Unlock this token" +msgstr "Deblochează acest jeton" + +#: ../pkcs11/seahorse-pkcs11-actions.c:218 +#: ../pkcs11/seahorse-pkcs11-properties.c:173 +msgid "Couldn't delete" +msgstr "Nu s-a putut șterge" + +#: ../pkcs11/seahorse-pkcs11-actions.c:239 +#: ../pkcs11/seahorse-pkcs11-properties.c:198 #, c-format msgid "Are you sure you want to delete the certificate '%s'?" msgstr "Sigur doriți să ștergeți certificatul „%s”?" -#: ../pkcs11/seahorse-pkcs11-commands.c:111 +#: ../pkcs11/seahorse-pkcs11-actions.c:243 #, c-format msgid "Are you sure you want to delete %d certificate?" msgid_plural "Are you sure you want to delete %d certificates?" @@ -2369,6 +2188,131 @@ msgstr[1] "Sigur doriți să ștergeți %d certificate?" msgstr[2] "Sigur doriți să ștergeți %d de certificate?" +#: ../pkcs11/seahorse-pkcs11-actions.c:256 +#: ../pkcs11/seahorse-pkcs11-properties.c:227 +msgid "Deleting" +msgstr "Se șterge" + +#: ../pkcs11/seahorse-pkcs11-actions.c:265 +msgid "Properties of the certificate." +msgstr "Proprietățile certificatului." + +#: ../pkcs11/seahorse-pkcs11-actions.c:270 +msgid "Delete the certificate." +msgstr "Ștergeți certificatul." + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certificate" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Certificate și chei asociate X.509" + +#: ../pkcs11/seahorse-pkcs11-generate.c:116 +msgid "Couldn't generate private key" +msgstr "Nu s-a putut genera cheia privată" + +#: ../pkcs11/seahorse-pkcs11-generate.c:411 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Creează" + +#: ../pkcs11/seahorse-pkcs11-generate.c:504 +#: ../pkcs11/seahorse-private-key.c:160 +msgid "Private key" +msgstr "Cheie privată" + +#: ../pkcs11/seahorse-pkcs11-generate.c:505 +msgid "Used to request a certificate" +msgstr "Folosit pentru a cere un certificat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Create a new private key" +msgstr "Creează o nouă cheie privată" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +msgid "Label:" +msgstr "Etichetă:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +msgid "Stored at:" +msgstr "Stocat la:" + +#: ../pkcs11/seahorse-pkcs11-properties.c:140 +#: ../pkcs11/seahorse-pkcs11-properties.c:144 +msgid "Unnamed" +msgstr "Nedenumit" + +#: ../pkcs11/seahorse-pkcs11-properties.c:204 +msgid "Also delete matching private key" +msgstr "Șterge și cheia privată asociată" + +#: ../pkcs11/seahorse-pkcs11-properties.c:211 +#, c-format +msgid "Are you sure you want to delete the private key '%s'?" +msgstr "Sigur doriți să ștergeți cheia privată „%s”?" + +#: ../pkcs11/seahorse-pkcs11-properties.c:217 +msgid "I understand that this action cannot be undone" +msgstr "Am înțeles că această acțiune nu poate fi anulată" + +#: ../pkcs11/seahorse-pkcs11-properties.c:247 +msgid "_Export" +msgstr "_Exportă" + +#: ../pkcs11/seahorse-pkcs11-properties.c:248 +msgid "Export the certificate" +msgstr "Exportă certificatul" + +#: ../pkcs11/seahorse-pkcs11-properties.c:250 +msgid "Delete this certificate or key" +msgstr "Șterge certificatul sau cheia" + +#: ../pkcs11/seahorse-pkcs11-properties.c:251 +msgid "Request _Certificate" +msgstr "Cere un _certificat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:252 +msgid "Create a certificate request file for this key" +msgstr "Creează un fișier pentru cererea certificatului acestei chei" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Nu s-a putut salva cererea certificatului" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Salvează cererea certificatului" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Cerere certificat" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Cerere codată PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Nu s-a putut crea cererea pentru certificat" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Creează un fișier pentru cererea certificatului." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "Name (CN):" +msgstr "Nume (CN):" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "The common name (CN) placed in the certificate request." +msgstr "Numele comun (CN) pus în cererea pentru certificat." + +#: ../pkcs11/seahorse-private-key.c:119 +msgid "Unnamed private key" +msgstr "Cheie privată nedenumită" + #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Schimbă frază secretă" @@ -2389,439 +2333,145 @@ msgid "Manage your passwords and encryption keys" msgstr "Administează parolele și cheile de criptare" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862 -msgid "Passwords and Encryption Keys" -msgstr "Parole și chei de criptare" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Continuă" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Alegeți tipul de element de creat:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "C_ontinuă" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Crează o nouă..." - -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d cheie selectată" -msgstr[1] "%d chei selectate" -msgstr[2] "%d de chei selectate" - -#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470 -#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458 -msgid "Couldn't import keys" -msgstr "Nu s-au putut importa cheile" - -#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463 -msgid "Imported keys" -msgstr "S-au importat cheiele" - -#: ../src/seahorse-key-manager.c:464 -msgid "Importing keys" -msgstr "Se importă chei" +#: ../src/seahorse-import-dialog.c:74 +msgid "Import failed" +msgstr "Importarea a eșuat" + +#: ../src/seahorse-import-dialog.c:95 +msgid "Import" +msgstr "Importă" + +#: ../src/seahorse-import-dialog.c:105 +msgid "Data to be imported:" +msgstr "Date de importat:" -#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017 +#: ../src/seahorse-key-manager.c:235 ../ssh/seahorse-ssh-operation.c:891 msgid "Import Key" msgstr "Importă chei" -#: ../src/seahorse-key-manager.c:533 -msgid "Unrecognized key type, or invalid data format" -msgstr "Tip de cheie nerecunoscut sau format nevalid de chei" - -#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245 -msgid "_Remote" -msgstr "La di_stanță" - -#: ../src/seahorse-key-manager.c:733 -msgid "Close this program" -msgstr "Închide acest program" - -#: ../src/seahorse-key-manager.c:734 -msgid "_New..." -msgstr "_Nouă..." - -#: ../src/seahorse-key-manager.c:735 -msgid "Create a new key or item" -msgstr "Crează o nouă cheie sau un nou element" - -#: ../src/seahorse-key-manager.c:736 -msgid "_Import..." -msgstr "_Importă..." - -#: ../src/seahorse-key-manager.c:737 -msgid "Import from a file" -msgstr "Importă dintr-un fișier" - -#: ../src/seahorse-key-manager.c:739 -msgid "Import from the clipboard" -msgstr "Importă din clipboard" - -#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255 -msgid "_Find Remote Keys..." -msgstr "Cau_tă chei la distanță..." - -#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256 -msgid "Search for keys on a key server" -msgstr "Caută chei pe un server de chei" - -#: ../src/seahorse-key-manager.c:746 -msgid "_Sync and Publish Keys..." -msgstr "_Sincronizează și publică cheile..." - -#: ../src/seahorse-key-manager.c:747 -msgid "Publish and/or synchronize your keys with those online." -msgstr "" -"Publică și/sau sincronizează cheile dumneavoastră cu cele de pe internet." - -#: ../src/seahorse-key-manager.c:752 -msgid "T_ypes" -msgstr "T_ipuri" - -#: ../src/seahorse-key-manager.c:752 -msgid "Show type column" -msgstr "Afișează coloana de tipuri" - -#: ../src/seahorse-key-manager.c:754 -msgid "_Expiry" -msgstr "_Expirare" - -#: ../src/seahorse-key-manager.c:754 -msgid "Show expiry column" -msgstr "Afișează coloana de expirare" - -#: ../src/seahorse-key-manager.c:756 -msgid "_Trust" -msgstr "Încre_dere" - -#: ../src/seahorse-key-manager.c:756 -msgid "Show owner trust column" -msgstr "Afișează coloana de încredere a proprietarului" - -#: ../src/seahorse-key-manager.c:758 -msgid "_Validity" -msgstr "_Valabilitate" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show validity column" -msgstr "Afișează coloana de validitate" - -#: ../src/seahorse-key-manager.c:931 -msgid "Filter:" -msgstr "Filtru:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Opțiuni la prima execuție:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Generează o nouă cheie personală:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Importă chei existente dintr-un fișiere:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Cheile mele _personale" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Alte c_hei" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Pentru a cripta veți avea nevoie de chei." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522 -msgid "_Import" -msgstr "_Importă" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Parole" - -#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256 -msgid "Couldn't export keys" -msgstr "Nu s-au putut exporta cheile" - -#: ../src/seahorse-key-manager-store.c:883 -msgid "Validity" -msgstr "Validitate" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:902 -msgid "Expiration Date" -msgstr "Data expirării" - -#: ../src/seahorse-keyserver-results.c:247 -msgid "Close this window" -msgstr "Închide această fereastră" - -#: ../src/seahorse-keyserver-results.c:248 -msgid "_Expand All" -msgstr "_Expandează toate" - -#: ../src/seahorse-keyserver-results.c:249 -msgid "Expand all listings" -msgstr "Expandează toate listările" - -#: ../src/seahorse-keyserver-results.c:250 -msgid "_Collapse All" -msgstr "_Pliază toate" - -#: ../src/seahorse-keyserver-results.c:251 -msgid "Collapse all listings" -msgstr "Pliază toate listările" - -#: ../src/seahorse-keyserver-results.c:322 -msgid "Remote Keys" -msgstr "Chei la distanță" - -#: ../src/seahorse-keyserver-results.c:324 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Chei la distanță ce conține „%s”" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Servere de chei:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Chei partajate în apropiere:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Caută chei la distanță" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Aceasta va căuta chei la distanță pe Internet. Aceste chei pot fi apoi " -"importate în inelul de chei local." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Unde să se caute:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Caută" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Cau_tă chei ce conțin:" - -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "Nu s-au putut publica cheile către server" - -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Nu s-au putut descărca cheile de pe server: %s" - -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d cheie este selectată pentru sincronizare" -msgstr[1] "%d chei sunt selectate pentru sincronizare" -msgstr[2] "%d de chei sunt selectate pentru sincronizare" - -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "Sincronizare chei" - -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "Se sincronizează cheile..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Sincronizează cheile" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Va publica cheile din inelul dumneavoastră de chei astfel încât să fie " -"disponibile altora. De asemenea, veți primi și toate modificările pe care " -"alții le-au făcut de când ați primit cheile lor." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Veți primi toate modificările pe care alții le-au făcut de când ați primit " -"cheile lor. Niciun server de chei nu este selectat pentru publicare, prin " -"urmare cheile dumneavoastră nu vor fi făcute publice." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Servere de c_hei" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Sincronizează" - -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "Versiunea aceastei aplicații" - -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144 -msgid "Encryption Key Manager" -msgstr "Administratorul cheilor de criptare" - -#: ../src/seahorse-viewer.c:120 -msgid "Contributions:" -msgstr "Contribuții:" - -#: ../src/seahorse-viewer.c:146 -msgid "translator-credits" -msgstr "" -"Lucian Adrian Grijincu\n" -"\n" -"Launchpad Contributions:\n" -" Adi Roiban https://launchpad.net/~adiroiban\n" -" Alex Eftimie https://launchpad.net/~alexeftimie\n" -" Andrei Coman https://launchpad.net/~comandrei\n" -" Bogdan Bădic-Spătariu https://launchpad.net/~thelad33\n" -" Ionuț Jula https://launchpad.net/~ionutjula\n" -" Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu\n" -" ProMIX https://launchpad.net/~promix89-gmail" - -#: ../src/seahorse-viewer.c:149 -msgid "Seahorse Project Homepage" -msgstr "Pagina proiectului Seahorse" - -#. Top menu items -#: ../src/seahorse-viewer.c:168 -msgid "_File" -msgstr "_Fișier" - -#: ../src/seahorse-viewer.c:169 -msgid "_Edit" -msgstr "_Editare" - -#: ../src/seahorse-viewer.c:170 -msgid "_View" -msgstr "_Vizualizare" - -#: ../src/seahorse-viewer.c:171 -msgid "_Help" -msgstr "_Ajutor" - -#: ../src/seahorse-viewer.c:173 -msgid "Prefere_nces" -msgstr "Preferi_nțe" - -#: ../src/seahorse-viewer.c:174 -msgid "Change preferences for this program" -msgstr "Schimbă preferințele pentru acest program" - -#: ../src/seahorse-viewer.c:177 -msgid "About this program" -msgstr "Despre acest program" - -#: ../src/seahorse-viewer.c:178 -msgid "_Contents" -msgstr "_Conținut" +#: ../src/seahorse-key-manager.c:298 +msgid "Dropped text" +msgstr "Text aruncat" + +#: ../src/seahorse-key-manager.c:321 +msgid "Clipboard text" +msgstr "Text clipboard" + +#: ../src/seahorse-key-manager.c:440 +msgid "_New" +msgstr "_Nou" -#: ../src/seahorse-viewer.c:179 -msgid "Show Seahorse help" -msgstr "Afișează ajutorul pentru Seahorse" +#: ../src/seahorse-key-manager.c:442 +msgid "Close this program" +msgstr "Închide acest program" -#: ../src/seahorse-viewer.c:276 -msgid "Export public key" -msgstr "Exportă chei publice" +#: ../src/seahorse-key-manager.c:443 ../src/seahorse-key-manager.c:445 +msgid "_New..." +msgstr "_Nouă..." -#: ../src/seahorse-viewer.c:296 -msgid "Exporting keys" -msgstr "Se exportă chei" +#: ../src/seahorse-key-manager.c:444 +msgid "Create a new key or item" +msgstr "Creează o nouă cheie sau un nou element" -#: ../src/seahorse-viewer.c:321 -msgid "Couldn't retrieve data from key server" -msgstr "Nu s-au putut obține date de la serverul de chei" +#: ../src/seahorse-key-manager.c:446 +msgid "Add a new key or item" +msgstr "Adaugă o nouă cheie sau element" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:340 -msgid "Copied keys" -msgstr "Cheile au fost copiate" +#: ../src/seahorse-key-manager.c:447 +msgid "_Import..." +msgstr "_Importă..." -#: ../src/seahorse-viewer.c:360 -msgid "Retrieving keys" -msgstr "Se obțin cheile" +#: ../src/seahorse-key-manager.c:448 +msgid "Import from a file" +msgstr "Importă dintr-un fișier" -#: ../src/seahorse-viewer.c:375 -msgid "Couldn't delete." -msgstr "Nu s-a putut șterge." +#: ../src/seahorse-key-manager.c:450 +msgid "Import from the clipboard" +msgstr "Importă din clipboard" -#: ../src/seahorse-viewer.c:409 -msgid "Deleting..." -msgstr "Se șterge..." +#: ../src/seahorse-key-manager.c:454 +msgid "P_laces" +msgstr "_Locuri" + +#: ../src/seahorse-key-manager.c:455 +msgid "Show places sidebar" +msgstr "Arată bara laterală cu locuri" + +#: ../src/seahorse-key-manager.c:459 +msgid "Show _personal" +msgstr "Arată-le pe cele _personale" + +#: ../src/seahorse-key-manager.c:460 +msgid "Only show personal keys, certificates and passwords" +msgstr "Arată doar cheile, certificatele și parolele personale" + +#: ../src/seahorse-key-manager.c:461 +msgid "Show _trusted" +msgstr "Arată-le pe cele de în_credere" + +#: ../src/seahorse-key-manager.c:462 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Arată doar cheile, certificatele și parolele de încredere" + +#: ../src/seahorse-key-manager.c:463 +msgid "_Show _any" +msgstr "_Arată-le pe to_ate" -#: ../src/seahorse-viewer.c:435 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s este o cheie privată. Sigur doriți să continuați?" +#: ../src/seahorse-key-manager.c:464 +msgid "Show all keys, certificates and passwords" +msgstr "Arată toate cheile, certificatele și parolele" -#: ../src/seahorse-viewer.c:483 -msgid "Importing keys from key servers" -msgstr "Se importă chei de la serverele de chei" +#: ../src/seahorse-key-manager.c:652 +msgid "Filter" +msgstr "Filtru" -#: ../src/seahorse-viewer.c:509 -msgid "Show properties" -msgstr "Afișează proprietăți" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Opțiuni la prima execuție:" -#: ../src/seahorse-viewer.c:510 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "Șter_ge" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Generează o nouă cheie personală:" -#: ../src/seahorse-viewer.c:511 -msgid "Delete selected items" -msgstr "Șterge elementele selectate" +#: ../src/seahorse-key-manager.xml.h:3 +msgid "Import existing keys from a file:" +msgstr "Importă chei existente dintr-un fișiere:" -#: ../src/seahorse-viewer.c:515 -msgid "E_xport..." -msgstr "E_xportă..." +#: ../src/seahorse-key-manager.xml.h:4 +msgid "To get started with encryption you will need keys." +msgstr "Pentru a cripta veți avea nevoie de chei." -#: ../src/seahorse-viewer.c:516 -msgid "Export to a file" -msgstr "Exportă într-un fișier" +#: ../src/seahorse-main.c:54 +msgid "Version of this application" +msgstr "Versiunea aceastei aplicații" -#: ../src/seahorse-viewer.c:518 -msgid "Copy to the clipboard" -msgstr "Copiază în clipboard" +#: ../ssh/seahorse-ssh-actions.c:110 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "Sigur doriți să ștergeți cheia de shell securizat (ssh) „%s”?" -#: ../src/seahorse-viewer.c:523 -msgid "Import selected keys to local key ring" -msgstr "Importă cheile selectate în inelul de chei local" +#: ../ssh/seahorse-ssh-actions.c:114 ../ssh/seahorse-ssh-actions.c:115 +#, c-format +msgid "Are you sure you want to delete %d secure shell keys?" +msgstr "Sigur doriți să ștergeți %d chei de shell securizat (ssh)?" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "Introduceți fraza secretă pentru Shell securizat (ssh):" +#: ../ssh/seahorse-ssh-actions.c:124 +msgid "Couldn't delete key" +msgstr "Nu s-a putut șterge cheia" -#: ../ssh/seahorse-ssh-commands.c:85 +#: ../ssh/seahorse-ssh-actions.c:136 msgid "Configure Key for _Secure Shell..." msgstr "Configurează cheia pentru _shell securizat (ssh)..." -#: ../ssh/seahorse-ssh-commands.c:86 +#: ../ssh/seahorse-ssh-actions.c:137 msgid "" "Send public Secure Shell key to another machine, and enable logins using " "that key." @@ -2829,103 +2479,111 @@ "Trimite cheile publice pentru shell securizat (ssh) pe altă mașină și " "permite autentificarea prin această metodă." -#: ../ssh/seahorse-ssh-commands.c:115 +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Introduceți fraza secretă pentru Shell securizat (ssh):" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Vechea frază secretă a cheii" + +#: ../ssh/seahorse-ssh-askpass.c:83 #, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Sigur doriți să ștergeți cheia de shell securizat (ssh) „%s”?" +msgid "Enter the old passphrase for: %s" +msgstr "Introduceți fraza secretă veche pentru: %s" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Noua frază secretă" + +#: ../ssh/seahorse-ssh-askpass.c:88 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Sigur doriți să ștergeți %d chei de shell securizat (ssh)?" +msgid "Enter the new passphrase for: %s" +msgstr "Introduceți noua frază secretă pentru: %s" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Introduceți noua frază secretă din nou: %s" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-backend.c:92 +msgid "Secure Shell" +msgstr "Shell securizat" + +#: ../ssh/seahorse-ssh-backend.c:95 +msgid "Keys used to connect securely to other computers" +msgstr "Chei folosite pentru conectarea securizată la alte calculatoare" + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:99 +#: ../ssh/seahorse-ssh-key.c:103 ../ssh/seahorse-ssh-key-properties.xml.h:19 msgid "Secure Shell Key" msgstr "Cheie pentru shell securizat (ssh)" -#: ../ssh/seahorse-ssh-generate.c:60 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Folosită pentru a accesa alte calculatoare (de ex. printr-un terminal)" -#: ../ssh/seahorse-ssh-generate.c:90 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Nu s-a putut genera cheia pentru shell securizat (ssh)" -#: ../ssh/seahorse-ssh-generate.c:213 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" -msgstr "Se crează cheia pentru shell securizat (ssh)" +msgstr "Se creează cheia pentru shell securizat (ssh)" #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." +msgid "Your email address, or a reminder of what this key is for." msgstr "" -"Folosiți adresa de email și orice alt memento de care aveți nevoie pentru " -"a ști pentru ce este această cheie." +"Folosiți adresa de email sau un alt memento pentru a ști pentru ce este " +"această cheie." #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"O cheie pentru shell securizat (ssh) vă permite să vă conectați în mod " -"securizat la calculatoare în care aveți încredere folosind SSH, fără a " -"introduce o parolă diferită pentru fiecare dintre ele." - -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +"Cheia pentru shellul securizat (SSH) vă permite să vă conectați în siguranță " +"la alte calculatoare." -#: ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "Dacă există deja un calculator pe care doriți să-l utilizați folosind " -"această cheie, puteți să-l configurați să recunoască cheia acum." +"această cheie, puteți să-l configurați să recunoască noua cheie." -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:7 msgid "New Secure Shell Key" msgstr "Cheie pentru shell securizat nouă" -#: ../ssh/seahorse-ssh-generate.xml.h:10 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "_Create and Set Up" msgstr "_Creează și configurează" -#: ../ssh/seahorse-ssh-generate.xml.h:11 +#: ../ssh/seahorse-ssh-generate.xml.h:10 msgid "_Just Create Key" msgstr "D_oar creează cheia" -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "Descriere c_heie:" - -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:95 msgid "(Unreadable Secure Shell Key)" msgstr "(cheie shell securizat necitibilă)" -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "Nevalid" - -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "Cheie pentru shell securizat privată" - -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "Cheie pentru shell securizat publică" +#: ../ssh/seahorse-ssh-key.c:203 +msgid "Personal SSH key" +msgstr "Cheie SSH personală" + +#: ../ssh/seahorse-ssh-key.c:205 +msgid "SSH key" +msgstr "Cheie SSH" -#: ../ssh/seahorse-ssh-key-properties.c:71 +#: ../ssh/seahorse-ssh-key-properties.c:79 msgid "Couldn't rename key." msgstr "Nu s-a putut redenumi cheia." -#: ../ssh/seahorse-ssh-key-properties.c:112 +#: ../ssh/seahorse-ssh-key-properties.c:132 msgid "Couldn't change authorization for key." msgstr "Nu s-a putut schimba autorizarea cheii." -#: ../ssh/seahorse-ssh-key-properties.c:127 +#: ../ssh/seahorse-ssh-key-properties.c:167 msgid "Couldn't change passphrase for key." msgstr "Nu s-a putut schimba fraza secretă a cheii." @@ -2972,80 +2630,55 @@ msgid "Used to connect to other computers." msgstr "Folosită pentru conectarea la alte calculatoare." -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format +#: ../ssh/seahorse-ssh-operation.c:198 msgid "The SSH command was terminated unexpectedly." msgstr "Comanda SSH s-a termina neașteptat." -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 +#: ../ssh/seahorse-ssh-operation.c:208 msgid "The SSH command failed." msgstr "Comanda SSH a eșuat." -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "Cheie pentru shell securizat " - -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "Frază secretă:" - -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 +#: ../ssh/seahorse-ssh-operation.c:518 msgid "Remote Host Password" msgstr "Parola calculatorului la distanță" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "Vechea frază secretă a cheii" - -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "Introduceți fraza secretă veche pentru: %s" - -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "Noua frază secretă" - -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "Introduceți noua fraza secretă pentru: %s" - -#: ../ssh/seahorse-ssh-operation.c:864 +#: ../ssh/seahorse-ssh-operation.c:634 msgid "Enter Key Passphrase" msgstr "Introduceți fraza secretă" -#: ../ssh/seahorse-ssh-operation.c:931 +#: ../ssh/seahorse-ssh-operation.c:724 msgid "Passphrase for New Secure Shell Key" msgstr "Fraza secretă pentru noua cheie pentru shell securizat (ssh)" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "" -"Introduceți o frază secretă pentru noua cheie pentru shell securizat (ssh)." - -#: ../ssh/seahorse-ssh-operation.c:1013 +#: ../ssh/seahorse-ssh-operation.c:908 #, c-format msgid "Importing key: %s" msgstr "Se importă cheia: %s" -#: ../ssh/seahorse-ssh-operation.c:1015 +#: ../ssh/seahorse-ssh-operation.c:910 msgid "Importing key. Enter passphrase" msgstr "Se importă cheia. Introduceți fraza secretă" -#: ../ssh/seahorse-ssh-source.c:825 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH directory" +msgstr "Dosarul OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:1022 msgid "No private key file is available for this key." msgstr "Nu există fișier cheie privată pentru această cheie." -#: ../ssh/seahorse-ssh-upload.c:45 +#: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." msgstr "" "Nu s-a putut configura cheia pentru shell securizat (ssh) pe calculatorul de " "la distanță." -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 +#: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." msgstr "Se configurează cheile pentru shell securizat (ssh)..." @@ -3078,6 +2711,537 @@ msgid "_Set Up" msgstr "C_onfigurează" +#~| msgid "Keyring" +#~ msgid "To do Keyring" +#~ msgstr "Inel de chei de făcut" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "Nu executa seahorse-daemon ca serviciu" + +#~ msgid "couldn't fork process" +#~ msgstr "nu s-a putut crea procesul" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "Serviciu de criptare (Seahorse)" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "Tip cheie nevalid sau nerecunoscut: %s" + +#~ msgid "This keytype is not supported: %s" +#~ msgstr "Aceast tip de cheie nu este suportat: %s" + +#~ msgid "Support for this feature was not enabled at build time" +#~ msgstr "" +#~ "Suportul pentru această funcționalitate nu a fost activat la compilare" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "Cheie nevalidă sau nerecunoscută: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr "Semnat de expirat pe %s." + +#~ msgid "Invalid Signature" +#~ msgstr "Semnătură nevalidă" + +#~ msgid "Signed by on %s Expired." +#~ msgstr "Semnat de pe %s A expirat." + +#~ msgid "Expired Signature" +#~ msgstr "Semnătură expirată" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr "Semnat de Revocat pe %s." + +#~ msgid "Revoked Signature" +#~ msgstr "Semnătură revocată" + +#~ msgid "Signed by on %s." +#~ msgstr "Semnat de pe %s." + +#~ msgid "Good Signature" +#~ msgstr "Semnătură bună" + +#~ msgid "Signing key not in keyring." +#~ msgstr "Cheia de semnare nu se află în inelul de chei." + +#~ msgid "Unknown Signature" +#~ msgstr "Semnătură necunoscută" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "Semnătură greșită sau fraudată. Datele semnate au fost modificate." + +#~ msgid "Bad Signature" +#~ msgstr "Semnătură greșită" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "Semnatar nevalid sau nerecunoscut: %s" + +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "Cheia nu este validă pentru semnare: %s" + +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "Destinatar nevalid sau nerecunoscut: %s" + +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "Cheia nu este o intrare validă pentru criptare: %s" + +#~ msgid "No recipients specified" +#~ msgstr "Nici o intrare nu este specificată" + +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "Tip cheie nevalid pentru decriptare: %s" + +#~ msgid "Please set clearuri" +#~ msgstr "Configurați clearuri" + +#~ msgid "Please set crypturi" +#~ msgstr "Configurați crypturi" + +#~ msgid "Error opening clearuri" +#~ msgstr "Eroare la deschiderea clearuri" + +#~ msgid "No signer specified" +#~ msgstr "Nici un semnatar nu este specificat" + +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "Tip cheie nevalid pentru verificare: %s" + +#~ msgid "Invalid key id: %s" +#~ msgstr "ID cheie nevalid: %s" + +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "O listă cu URI-uri de server-e de chei pentru a căuta chei PGP aflate la " +#~ "distanță. În versiunile ulterioare poate fi inclus un nume generic, " +#~ "adăugând un spațiu și apoi numele." + +#~ msgid "Auto Retrieve Keys" +#~ msgstr "Descărcare automată chei" + +#~ msgid "Auto Sync Keys" +#~ msgstr "Sincronizare automată chei" + +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "" +#~ "Controlează vizibilitatea coloanei de expirări din administratorul de " +#~ "chei." + +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "" +#~ "Controlează vizibilitatea coloanei cu nivele de încredere din " +#~ "administratorul de chei." + +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "" +#~ "Controlează vizibilitatea coloanei de tipuri din administratorul de chei." + +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "" +#~ "Controlează vizibilitatea coloanei de validitate din administratorul de " +#~ "chei." + +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "Permite partajarea DNS-SD" + +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "Permite folosirea cheilor DNS-SD (Apple Bonjour). seahorse-daemon trebuie " +#~ "să fie în execuție și trebuie să fie compilat cu suport pentru HKP și DNS-" +#~ "SD." + +#~ msgid "ID of the default key" +#~ msgstr "ID-ul cheii implicite" + +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "Dacă este definat ca adevărat, atunci fișierele criptate cu seahorse vor " +#~ "fi codate cu armură ASCII." + +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "Dacă este adevărat, cheia implicită va fi întotdeauna adăugată la o listă " +#~ "cu destinatari de encripție." + +#~ msgid "Last key server search pattern" +#~ msgstr "Ultimul șablon de căutare a unui server de chei" + +#~ msgid "Last key servers used" +#~ msgstr "Ultimele servere de chei folosite" + +#~ msgid "Last key used to sign a message." +#~ msgstr "Ultima cheie folosită la semnarea unui mesaj." + +#~ msgid "PGP Key servers" +#~ msgstr "Servere de chei PGP" + +#~ msgid "Publish keys to this key server." +#~ msgstr "Publică cheile pe acest server de chei." + +#~ msgid "Show expires column in key manager" +#~ msgstr "Arată coloana expirate în managerul de chei" + +#~ msgid "Show trust column in key manager" +#~ msgstr "Afișează coloana cu nivele de încredere în managerul de chei" + +#~ msgid "Show type column in key manager" +#~ msgstr "Afișează coloana cu tipuri în managerul de chei" + +#~ msgid "Show validity column in key manager" +#~ msgstr "Afișează coloana de validitate în managerul de chei" + +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "Specifică coloana după care se sortează fereastra destinatarilor. " +#~ "Coloanele sunt: „nume” și „id”. Puneți un „-” în fața numelui coloanei " +#~ "pentru a o sorta descrescător." + +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "Specifică coloana după care se sortează fereastra de administrare a " +#~ "cheilor. Coloanele sunt: „nume”, „id”, „validitate”, „dată expirare”, " +#~ "„încredere” și „tip”. Puneți un „-” în fața numelui coloanei pentru a o " +#~ "sorta descrescător." + +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "" +#~ "Identificatorul ultimei chei secrete folosite pentru a semna un mesaj." + +#~ msgid "The column to sort the recipients by" +#~ msgstr "Coloana după care se sortează destinatarii" + +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "Coloana după care se sortează cheile" + +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "Serverul de chei către care se publică cheile PGP. Lăsați-l gol pentru a " +#~ "împiedica publicarea de chei PGP." + +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "" +#~ "Ultimul server de chei folosit pentru a căuta o cheie sau gol pentru " +#~ "toate serverele de chei." + +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "" +#~ "Ultimul șablon de căutare folosit pentru a căuta pe un server de chei." + +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "Specifică cheia implicită ce va fi folosită în anumite operații, în " +#~ "principal pentru semnare." + +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "Dacă să se primească automat sau nu chei de la servere de chei." + +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "" +#~ "Dacă să se sincronizeze automat sau nu cheile modificate cu serverul de " +#~ "chei implicit." + +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "Dacă să se cripteze întotdeauna cu cheia implicită sau nu" + +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "Dacă să se folosească armura ASCII" + +#~ msgid "Web Password" +#~ msgstr "Parolă web" + +#~ msgid "Couldn't set application access." +#~ msgstr "Nu s-a putut defini accesul aplicațiilor." + +#~ msgid "Path:" +#~ msgstr "Cale:" + +#~ msgid "Permissions:" +#~ msgstr "Permisiuni:" + +#~ msgid "Applications" +#~ msgstr "Aplicații" + +#~ msgid "_Read" +#~ msgstr "_Citire" + +#~ msgid "_Write" +#~ msgstr "_Scriere" + +#~ msgid "Passwords: %s" +#~ msgstr "Parole: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Parole: %s" + +#~ msgid "Saving item..." +#~ msgstr "Se salvează elementul..." + +#~ msgid "Listing password keyrings" +#~ msgstr "Se listează inelele de chei pentru parole" + +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "Nu s-au găsit chei de criptare cu care să se execute operația cerută. " +#~ "Programul Parole și chei de criptare va fi pornit pentru a vă " +#~ "permite să creați o cheie sau să importați una." + +#~ msgid "All Keys" +#~ msgstr "Toate cheile" + +#~ msgid "Selected Recipients" +#~ msgstr "Destinatari aleși" + +#~ msgid "Search Results" +#~ msgstr "Rezultate căutare" + +#~ msgid "Search _for:" +#~ msgstr "Caută _după:" + +#~ msgid "None (Don't Sign)" +#~ msgstr "Nimic (Nu semna)" + +#~ msgid "Sign this message as %s" +#~ msgstr "Semnează acest mesaj ca %s" + +#~ msgid "_Sign message as:" +#~ msgstr "_Semnează mesaj ca:" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Fișierul nu este un fișier .desktop valid" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Versiune fișier desktop nerecunoscută „%s”" + +#~ msgid "Starting %s" +#~ msgstr "Se pornește %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Aplicația nu acceptă documente în linia de comandă" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Opțiune de lansare necunoscută: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Nu se pot trimite URI-uri de documente către o intrare de desktop de tip " +#~ "„Type=Link”" + +#~ msgid "Not a launchable item" +#~ msgstr "Nu este un element ce poate fi lansat" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Dezactivează conexiunea la administratorul de sesiuni" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Specifică fișierul ce conține configurația salvată" + +#~ msgid "FILE" +#~ msgstr "FIȘIER" + +#~ msgid "Specify session management ID" +#~ msgstr "Specificați ID-ul administratorului de sesiune" + +#~ msgid "Session management options:" +#~ msgstr "Opțiuni de administrare a sesiunii:" + +#~ msgid "Show session management options" +#~ msgstr "Afișează opțiunile de administrare a sesiunii" + +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "Cheia importată" +#~ msgstr[1] "Chei importate" +#~ msgstr[2] "Chei importate" + +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "S-a importat %i cheie" +#~ msgstr[1] "S-au importat %i chei" +#~ msgstr[2] "S-au importat %i de chei" + +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "S-a importat o cheie pentru" +#~ msgstr[1] "S-au importat chei pentru" +#~ msgstr[2] "S-au importat chei pentru" + +#~ msgid "Notification Messages" +#~ msgstr "Mesaje de notifcare" + +#~ msgid "Symmetric Key" +#~ msgstr "Cheie simetrică" + +#~ msgid "Public Key" +#~ msgstr "Cheie publică" + +#~ msgid "Credentials" +#~ msgstr "Autorizații" + +#~ msgid "Identity" +#~ msgstr "Identitate" + +#~ msgid "Progress Title" +#~ msgstr "Titlu progres" + +#~ msgid "Couldn't run file-roller" +#~ msgstr "Nu s-a putut găsi file-roller" + +#~ msgid "Couldn't package files" +#~ msgstr "Nu s-au putut împacheta fișierele" + +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "Procesul file-roller nu s-a terminat cu succes" + +#~ msgid "Loading Keys..." +#~ msgstr "Se încarcă cheile..." + +#~ msgid "Uploading keys..." +#~ msgstr "Se încarcă cheile..." + +#~ msgid "Retrieving keys..." +#~ msgstr "Se obțin cheile..." + +#~ msgid "Searching for keys on: %s" +#~ msgstr "Se caută cheile pe: %s" + +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "Se caută chei ce conțin „%s”..." + +#~ msgid "Searching for key id '%s'..." +#~ msgstr "Se caută cheia cu id-ul „%s”..." + +#~ msgid "Retrieving remote keys..." +#~ msgstr "Se descarcă cheile..." + +#~ msgid "Sending keys to key server..." +#~ msgstr "Se trimit cheile către serverul de chei..." + +#~ msgid "New PGP Key" +#~ msgstr "Cheie PGP nouă" + +#~ msgid "Create New ..." +#~ msgstr "Crează o nouă..." + +#~ msgid "Imported keys" +#~ msgstr "S-au importat cheiele" + +#~ msgid "Importing keys" +#~ msgstr "Se importă chei" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Tip de cheie nerecunoscut sau format nevalid de chei" + +#~ msgid "T_ypes" +#~ msgstr "T_ipuri" + +#~ msgid "Show type column" +#~ msgstr "Afișează coloana de tipuri" + +#~ msgid "_Expiry" +#~ msgstr "_Expirare" + +#~ msgid "Show expiry column" +#~ msgstr "Afișează coloana de expirare" + +#~ msgid "_Trust" +#~ msgstr "Încre_dere" + +#~ msgid "Show owner trust column" +#~ msgstr "Afișează coloana de încredere a proprietarului" + +#~ msgid "_Validity" +#~ msgstr "_Valabilitate" + +#~ msgid "Show validity column" +#~ msgstr "Afișează coloana de validitate" + +#~ msgid "Other _Keys" +#~ msgstr "Alte c_hei" + +#~ msgid "Validity" +#~ msgstr "Validitate" + +#~ msgid "Expiration Date" +#~ msgstr "Data expirării" + +#~ msgid "_Expand All" +#~ msgstr "_Expandează toate" + +#~ msgid "Expand all listings" +#~ msgstr "Expandează toate listările" + +#~ msgid "_Collapse All" +#~ msgstr "_Pliază toate" + +#~ msgid "Collapse all listings" +#~ msgstr "Pliază toate listările" + +#~ msgid "Synchronizing keys" +#~ msgstr "Sincronizare chei" + +#~ msgid "Copied keys" +#~ msgstr "Cheile au fost copiate" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s este o cheie privată. Sigur doriți să continuați?" + +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "Șter_ge" + +#~ msgid "DSA" +#~ msgstr "DSA" + +#~ msgid "_Key Description:" +#~ msgstr "Descriere c_heie:" + +#~ msgid "Invalid" +#~ msgstr "Nevalid" + +#~ msgid "Private Secure Shell Key" +#~ msgstr "Cheie pentru shell securizat privată" + +#~ msgid "Public Secure Shell Key" +#~ msgstr "Cheie pentru shell securizat publică" + +#~ msgid "Secure Shell key" +#~ msgstr "Cheie pentru shell securizat " + +#~ msgid "Passphrase:" +#~ msgstr "Frază secretă:" + +#~ msgid "Enter a passphrase for your new Secure Shell key." +#~ msgstr "" +#~ "Introduceți o frază secretă pentru noua cheie pentru shell securizat " +#~ "(ssh)." + #~ msgid "Couldn't share keys" #~ msgstr "Cheile nu s-au putut distribui" diff -Nru seahorse-3.2.2/po/ru.po seahorse-3.6.3/po/ru.po --- seahorse-3.2.2/po/ru.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/ru.po 2012-09-03 10:44:42.000000000 +0200 @@ -7,18 +7,23 @@ # Vasiliy Faronov , 2008. # Anisimov Victor , 2009. # Yuri Kozlov , 2010. +# Yuri Myasoedov , 2012. +# msgid "" msgstr "" "Project-Id-Version: seahorse trunk\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-17 15:02+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-17 10:17+0000\n" +"PO-Revision-Date: 2012-08-24 10:45+0400\n" "Last-Translator: Yuri Myasoedov \n" -"Language-Team: Russian \n" +"Language-Team: русский \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "X-Generator: KBabel 1.11.4\n" #: ../gkr/seahorse-add-keyring.xml.h:1 @@ -26,12 +31,16 @@ msgstr "Добавить связку ключей для паролей" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Имя новой связки ключей:" +msgid "" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "" +"Введите название новой связки ключей. Далее вас попросят ввести пароль для " +"разблокировки." #: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "Please choose a name for the new keyring. You will be prompted for an unlock password." -msgstr "Введите название новой связки ключей. Далее вас попросят ввести пароль для разблокировки." +msgid "New Keyring Name:" +msgstr "Имя новой связки ключей:" #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 @@ -39,43 +48,148 @@ msgid "The host name or address of the server." msgstr "Имя узла или адрес сервера." -#: ../gkr/seahorse-gkr-add-item.c:61 -#: ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Не удалось добавить связку ключей" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Новая связка ключей для паролей" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Используется для хранения паролей приложений и сетевых узлов" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Создать пароль…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Безопасно хранит пароль или секрет." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Связка ключей для паролей" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Сохраненный пароль" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Не удалось назначить связку ключей по умолчанию" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Не удалось изменить пароль к связке ключей" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Установить по умолчанию" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Приложения хранят свои пароли в связке ключей по умолчанию." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Изменить _пароль" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Изменить пароль, разблокирующий связку ключей для паролей" + +#: ../gkr/seahorse-gkr-add-item.c:58 +#| msgid "Couldn't delete item" +msgid "Couldn't add item" +msgstr "Не удалось удалить элемент" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Добавить пароль" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" -msgstr "О_писание:" +msgstr "_Описание:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Связка ключей:" +msgid "_Password:" +msgstr "_Пароль:" #: ../gkr/seahorse-gkr-add-item.xml.h:4 -msgid "_Password:" -msgstr "П_ароль:" +msgid "_Show Password" +msgstr "По_казывать пароль" #: ../gkr/seahorse-gkr-add-item.xml.h:5 -msgid "_Show Password" -msgstr "Показать _пароль" +msgid "_Keyring:" +msgstr "_Связка ключей:" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Не удалось удалить элемент" +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Не удалось добавить связку ключей" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Пароли" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Хранящиеся личные пароли, мандаты и секреты" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Пароль для уч. записи мессенджера" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Пароль или секрет" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Пароль для сети" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Хранящееся примечание" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Пароль для связки ключей" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Пароль для ключа шифрования" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Пароль для ключа хранилища" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Пароль для Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Пароль для сетевых уч. записей Gnome" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Пароль для Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Пароль для обмена мгновенными сообщениями" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Секрет NetworkManager" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Уверены, что хотите безвозвратно удалить пароль «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -83,254 +197,137 @@ msgstr[1] "Уверены, что хотите безвозвратно удалить %d пароля?" msgstr[2] "Уверены, что хотите безвозвратно удалить %d паролей?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Удаление элемента" -msgstr[1] "Удаление элементов" -msgstr[2] "Удаление элементов" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Даёт доступ к сетевому хранилищу или ресурсу" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Даёт доступ к веб-сайту" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Разблокирует ключ PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Разблокирует ключ SSH" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Сохранённый пароль или учётное имя" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Сетевые учётные сведения" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Пароль" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Не удалось изменить пароль." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Обновление пароля" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Не удалось установить описание." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Пароль:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Подробности:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Подробности" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Свойства ключа" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Ключ" +msgid "Use:" +msgstr "Назначение:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Свойства ключа" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Тип:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Учётное имя:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Сервер:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Учётное имя:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Показать _пароль" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Тип:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Назначение:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Пароли: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Пароли: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Связка ключей для паролей" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Используется для хранения паролей приложений и сетевых узлов" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Сохраненный пароль" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Безопасно хранит пароль или секрет." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Не удалось разблокировать связку ключей" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Не удалось заблокировать связку ключей" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Не удалось назначить связку ключей по умолчанию" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Не удалось изменить пароль к связке ключей" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Заблокировать" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "Lock the password storage keyring so a master password is required to unlock it." -msgstr "Заблокировать связку ключей для хранения паролей. Для разблокирования связки ключей нужно будет ввести главный пароль." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Разблокировать" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "Unlock the password storage keyring with a master password so it is available for use." -msgstr "Разблокировать связку ключей для хранения паролей с помощью главного пароля." +msgid "Password:" +msgstr "Пароль:" -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Установить по умолчанию" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Ключ" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Приложения хранят свои пароли в связке ключей по умолчанию." +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Подробности:" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Изменить _пароль" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Подробности" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Изменить пароль, разблокирующий связку ключей для паролей" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "" +"Связка ключей, которая автоматически разблокируется при входе в систему" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Не удалось удалить связку ключей" +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Связка ключей, используемая для хранения паролей" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Уверены, что хотите удалить связку ключей для паролей «%s»?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Удаление связки ключей" -msgstr[1] "Удаление связок ключей" -msgstr[2] "Удаление связок ключей" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Я понимаю, что все элементы будут безвозвратно удалены." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Свойства связки ключей" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Имя:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Создан:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Связка ключей" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Свойства связки ключей" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Имя:" - -#: ../gkr/seahorse-gkr-operation.c:52 -#: ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 -#: ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Действие было отменено" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Доступ к связке ключей запрещён" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Демон gnome-keyring не запущен" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Связка ключей уже разблокирована" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Нет такой связки ключей" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Не удалось связаться со службой управления связками ключей" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Элемент уже существует" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Произошла внутренняя ошибка при обращении к gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Флаги отображения" @@ -516,8 +513,7 @@ msgid "Select the date from a calendar" msgstr "Выберите дату с помощью календаря" -#: ../libegg/egg-datetime.c:521 -#: ../libegg/egg-datetime.c:2199 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Время" @@ -540,14 +536,12 @@ msgid "24hr: no" msgstr "24hr: yes" -#: ../libegg/egg-datetime.c:797 -#: ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 #: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "AM" -#: ../libegg/egg-datetime.c:799 -#: ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 #: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "PM" @@ -590,270 +584,327 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "временный элемент для инициализации" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Добавить сервер ключей" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Узел:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Тип сервера ключей:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Узел:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "Порт для доступа к серверу." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "временный элемент для инициализации" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Версия этого приложения" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Пароль" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "— системные параметры" -#: ../libseahorse/seahorse-passphrase.c:183 -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Пароль:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Помощники:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Подтверждение:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Пароли и ключи" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Недопустимый адрес сервера ключей." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Valek Filippov , 2000-2003\n" +"Yuri Kozlov , 2008\n" +"Vasiliy Faronov , 2008" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "For help contact your system adminstrator or the administrator of the key server." -msgstr "Для получения помощи обратитесь к вашему системному администратору или администратору сервера ключей." +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Домашняя страница проекта Seahorse" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Не удалось удалить" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Другой" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Не удалось экспортировать ключи" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Нет: не публиковать ключи" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Не удалось экспортировать данные" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Авто_матически загружать ключи с серверов" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Файл" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Автоматически син_хронизировать изменённые ключи с серверами ключей" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Экспортировать…" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Серверы ключей" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Экспортировать в файл" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Параметры" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Правка" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "Найти ключи с по_мощью:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Скопировать в буфер обмена" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Публиковать ключи на:" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Удалить" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Получение данных" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Удалить выделенные элементы" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Экспортирование данных" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Показать свойства этого элемента" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Показать свойства этой связки ключей" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Импортирование данных" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Параметры" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Отправка данных" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Настроить параметры приложения" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Недоступно" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Вид" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d.%m.%Y" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Справка" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Данные ключа" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "О программе" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Несколько ключей" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Содержание" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Все файлы ключей" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Показать справку по Seahorse" -#: ../libseahorse/seahorse-util.c:745 -#: ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Все файлы" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Экспортировать" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Архивные файлы" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Файл с таким именем уже существует.\n" -"\n" -"Заменить его новым файлом?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Заменить" +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Введите PIN-код или пароль: %s" -#: ../libseahorse/seahorse-validity.c:40 -#: ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Пароль:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Подтверждение:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Недопустимый адрес сервера ключей." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Для получения помощи обратитесь к вашему системному администратору или " +"администратору сервера ключей." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Другой" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Нет: не публиковать ключи" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Параметры" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "Найти ключи с по_мощью:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Публиковать ключи на:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Авто_матически загружать ключи с серверов" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Автоматически син_хронизировать изменённые ключи с серверами ключей" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Серверы ключей" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d.%m.%Y" + +#: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Неизвестно" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Не доверяю" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Слабо" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Полностью" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Безоговорочно" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Отключено" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Отозвано" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Не удалось показать справку: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Истекает:" +msgid "Never E_xpires" +msgstr "Никогда не истекает" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Создать новый подключ" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Если срок действия ключа никогда не истекает" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Тип ключа:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Длина ключа:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Тип ключа:" +msgid "Expiration Date:" +msgstr "Истекает:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Длина ключа" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Никогда не истекает" +msgid "Generate a new subkey" +msgstr "Создать новый подключ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Добавить идентификатор пользователя" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Создать новый идентификатор пользователя" +msgid "Must be at least 5 characters long" +msgstr "Должно быть не меньше 5 символов в длину" #: ../pgp/seahorse-add-uid.xml.h:3 -#: ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_Полное имя:" +msgid "Optional email address" +msgstr "Необязательный электронный адрес" #: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Комментарий к ключу:" - -#: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "Должно быть не меньше 5 символов в длину" - -#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Optional comment describing key" msgstr "Необязательный комментарий, описывающий ключ" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Необязательный электронный адрес" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Полное имя:" -#: ../pgp/seahorse-add-uid.xml.h:8 -#: ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Электронный адрес:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Комментарий к ключу:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Создать новый идентификатор пользователя" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Изменить" +msgid "_Never expires" +msgstr "Нико_гда не истекает" -#: ../pgp/seahorse-expires.xml.h:2 -#: ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Отозвать ключ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "Нико_гда не истекает" +msgid "C_hange" +msgstr "_Изменить" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -864,8 +915,7 @@ msgid "Add subkey to %s" msgstr "Добавить подключ к %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 -#: ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (только подписывание)" @@ -873,8 +923,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (только шифрование)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 -#: ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (только подписывание)" @@ -895,6 +944,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Не удалось расшифровать. Вероятно, у вас нет ключа для расшифровки." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Действие было отменено" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Недопустимый срок действия" @@ -912,46 +966,149 @@ msgid "Expiry: %s" msgstr "Годен до: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Несколько ключей" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Данные ключа" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Защищённые ключи PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Ключи PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Ключ PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Используется для шифрования почты и файлов" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Не удалось создать ключ PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Пароль для нового ключа PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Введите пароль для нового ключа два раза." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"При создании ключа необходимо сгенерировать большое\n" +"количество случайных данных. Мы советуем выполнять\n" +"некоторые другие действия: печать на клавиатуре,\n" +"перемещение курсора мыши, работа с приложениями.\n" +"Эти действия обеспечат случайные данные, необходимые системе." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Создание ключа" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Уверены, что хотите безвозвратно удалить %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Действительно безвозвратно удалить %d ключ?" +msgstr[1] "Действительно безвозвратно удалить %d ключа?" +msgstr[2] "Действительно безвозвратно удалить %d ключей?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Неправильный пароль" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Вы уже третий раз ввели неправильный пароль. Попробуйте ещё раз." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Неправильный пароль." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Введите новый пароль для «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Введите пароль для «%s»" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Введите новый пароль" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Введите пароль" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Пароль" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Загружен %d ключ" +msgstr[1] "Загружено %d ключа" +msgstr[2] "Загружено %d ключей" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Недопустимые данные ключа (отсутствуют идентификаторы пользователя). " +"Причиной может быть неправильно установленное на компьютере время (время в " +"будущем) или отсутствие собственной подписи." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Ключи GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: каталог по умолчанию для связки ключей" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -971,8 +1128,12 @@ #: ../pgp/seahorse-gpgme-photos.c:128 #, c-format -msgid "This is not a image file, or an unrecognized kind of image file. Try to use a JPEG image." -msgstr "Этот файл не содержит изображение, или содержит неизвестный тип изображения. Попробуйте использовать изображение в формате JPEG." +msgid "" +"This is not a image file, or an unrecognized kind of image file. Try to use " +"a JPEG image." +msgstr "" +"Этот файл не содержит изображение, или содержит неизвестный тип изображения. " +"Попробуйте использовать изображение в формате JPEG." #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" @@ -982,28 +1143,31 @@ msgid "All JPEG files" msgstr "Все файлы формата JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Все файлы" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Выберите фотографию для добавления к ключу" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Не удалось подготовить фотоснимок" -#: ../pgp/seahorse-gpgme-photos.c:288 -#: ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Не удалось добавить фотографию" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Не удалось загрузить файл. Может быть, он имеет недопустимый формат" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Уверены, что хотите удалить текущую фотографию из вашего ключа?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Не удалось удалить фотографию" @@ -1050,14 +1214,22 @@ #: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format -msgid "You are about to add %s as a revoker for %s. This operation cannot be undone! Are you sure you want to continue?" -msgstr "Вы собираетесь добавить %s в качестве отзывающего для %s. Это действие нельзя будет отменить! Вы хотите продолжить?" +msgid "" +"You are about to add %s as a revoker for %s. This operation cannot be " +"undone! Are you sure you want to continue?" +msgstr "" +"Вы собираетесь добавить %s в качестве отзывающего для %s. Это действие " +"нельзя будет отменить! Вы хотите продолжить?" #: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "Не удалось добавить отзывающего" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Я понимаю, что этот секретный ключ будет безвозвратно удалён." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1072,565 +1244,635 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 -#: ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Нет ключей, которыми можно подписать" -#: ../pgp/seahorse-gpgme-sign.c:162 -msgid "You have no personal PGP keys that can be used to indicate your trust of this key." -msgstr "У вас нет личных ключей PGP, с помощью которых можно было бы выразить доверие этому ключу." +#: ../pgp/seahorse-gpgme-sign.c:165 +msgid "" +"You have no personal PGP keys that can be used to indicate your trust of " +"this key." +msgstr "" +"У вас нет личных ключей PGP, с помощью которых можно было бы выразить " +"доверие этому ключу." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Неправильный пароль." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Введите новый пароль для «%s»" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Параметры поиска были недостаточно определёнными. Сервер «%s» нашёл по ним " +"слишком много ключей." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Введите пароль для «%s»" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Не удалось связаться с сервером «%s»: %s" -#: ../pgp/seahorse-gpgme-source.c:95 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Введите новый пароль" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Сервер ключей HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Введите пароль" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Не удалось импортировать ключи" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Идёт импорт ключей с сервера" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Сеть" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Закрыть это окно" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Найти удалённые ключи…" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Искать ключи на сервере ключей" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Импортировать" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Импортировать выделенные ключи в локальную связку ключей" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Ключи из сети" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Загружен %d ключ" -msgstr[1] "Загружено %d ключа" -msgstr[2] "Загружено %d ключей" +msgid "Remote Keys Containing '%s'" +msgstr "Ключи из сети, содержащие «%s»" -#: ../pgp/seahorse-gpgme-source.c:649 -msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." -msgstr "Недопустимые данные ключа (отсутствуют идентификаторы пользователя). Причиной может быть неправильно установленное на компьютере время (время в будущем) или отсутствие собственной подписи." +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Сбой при поиске ключей." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Найти ключи в сети" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Сервер ключей HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "" +"Так можно найти другие ключи в сети. Эти ключи будут импортированы в " +"локальную связку ключей." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "Иск_ать ключи, содержащие: " + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Серверы ключей:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Опубликованные ключи в моей сети:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Где искать:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Искать" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Не удалось опубликовать ключи на сервере" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Параметры поиска были недостаточно определёнными. Сервер «%s» нашёл по ним слишком много ключей." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Не удалось получить ключи с сервера: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Не удалось связаться с сервером «%s»: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d ключ выбран для синхронизации" +msgstr[1] "%d ключа выбрано для синхронизации" +msgstr[2] "%d ключей выбрано для синхронизации" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Синхронизация ключей…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Синхронизировать ключи" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Ключи из вашей связки ключей будут опубликованы на сервере и станут " +"доступными для других. Также вы получите сведения, обновившиеся с момента " +"последнего соединения с сервером ключей." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Все изменения, произведённые с момента последнего соединения с сервером, " +"будут перенесены на ваш компьютер. Серверов для публикации ключей выбрано не " +"было, поэтому ваши ключи не будут доступны другим." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Серверы ключей" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Синхронизировать" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Не удалось связаться с «%s»: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Устанавливается соединение с: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Не удалось определить адрес: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Идёт определение адреса сервера: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Сервер ключей LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Подписать _ключ…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Подписать открытый ключ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Уверены, что хотите безвозвратно удалить %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Уверены, что хотите безвозвратно удалить %d ключей и идентификаторов??" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Уверены, что хотите безвозвратно удалить %d ключей?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Уверены, что хотите безвозвратно удалить %d идентификаторов?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Синхронизировать и опубликовать ключи…" -#: ../pgp/seahorse-pgp-commands.c:201 -#: ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Не удалось удалить идентификатор пользователя" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Опубликовать ключи и синхронизироваться с серверами в сети." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Не удалось удалить закрытый ключ" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Не удалось удалить открытый ключ" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Ключи PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Ключи PGP используются для шифрования почты и файлов" #: ../pgp/seahorse-pgp-generate.xml.h:1 -#: ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Дополнительные параметры ключа" +msgid "C_reate" +msgstr "_Создать" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "Ключ PGP позволяет шифровать почту и файлы для других людей." +msgid "Generate a new key" +msgstr "Создать новый ключ" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Алгоритмы" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "Ключ PGP позволяет шифровать почту и файлы для других людей." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Создать" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Комментарий:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Ср_ок истечения:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Н_икогда не истекает" -#: ../pgp/seahorse-pgp-generate.xml.h:6 -#: ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Тип шифрования:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Создать новый ключ" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 -#: ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Прочность ключа (в битах):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Н_икогда не истекает" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Новый ключ PGP" +msgid "E_xpiration Date:" +msgstr "Ср_ок истечения:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Комментарий:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Дополнительные параметры ключа" -#: ../pgp/seahorse-pgp-key.c:572 -#: ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Истёк" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Личный ключ PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Ключ PGP" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Не удалось изменить главный идентификатор пользователя" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" -msgstr "Уверены, что хотите безвозвратно удалить идентификатор пользователя «%s»?" +msgstr "" +"Уверены, что хотите безвозвратно удалить идентификатор пользователя «%s»?" + +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Не удалось удалить идентификатор пользователя" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Неизвестно]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Имя/Электропочта" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Идентификатор подписи" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Не удалось изменить главную фотографию" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(неизвестно)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Этот ключ истёк %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Имя" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Уверены, что хотите безвозвратно удалить подключ %d ключа %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Не удалось удалить подключ" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Не удалось сменить уровень доверия" -#: ../pgp/seahorse-pgp-key-properties.c:1142 -#: ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Не удалось экспортировать ключ в «%s»" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Экспортировать ключ полностью" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Не удалось экспортировать ключ." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Не удалось экспортировать ключ" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Никогда" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "Идентификатор" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Тип" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Создан" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Истекает" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Состояние" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Прочность" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Истёк" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Хорошее" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Идентификатор ключа" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Действия" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Комментарий:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Даты" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Электронная почта:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Отпечаток" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Идентификатор ключа:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Никогда" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Имена и подписи ключа" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Этот ключ был отозван" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Фотография" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Владелец отозвал ключ. Его больше нельзя использовать." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Подробности" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Срок действия этого ключа истёк" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Этот ключ был отозван" +msgid "Add a photo to this key" +msgstr "Добавить фотографию" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Срок действия этого ключа истёк" +msgid "Remove this photo from this key" +msgstr "Удалить эту фотографию из этого ключа" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Тип:" +msgid "Make this photo the primary photo" +msgstr "Сделать эту фотографию главной" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Назначение:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Перейти к предыдущей фотографии" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Подключи" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Перейти к следующей фотографии" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Добавить" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Фотография" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Добавить фотографию" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Идентификатор ключа:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Изменить _пароль" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Имя:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Позволяет расшифровать файлы и почту." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Электронная почта:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Удалить" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Комментарий:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Истекает" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Назначение:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Истекает:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Тип:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Экспортировать" +msgid "Decrypt files and email sent to you." +msgstr "Позволяет расшифровать файлы и почту." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Секретный ключ PGP" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Перейти к следующей фотографии" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Изменить _пароль" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Перейти к предыдущей фотографии" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Владелец" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Идентификатор ключа:" +msgid "Key Names and Signatures" +msgstr "Имена и подписи ключа" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Главный" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Сделать эту фотографию главной" +msgid "Sign" +msgstr "Подписать" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Имена и подписи" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Удалить" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Никогда" +msgid "_Add Name" +msgstr "_Добавить имя" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Указать _доверие владельцу:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Владелец" +msgid "Revoke" +msgstr "Отозвать" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Главный" +msgid "Names and Signatures" +msgstr "Имена и подписи" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Секретный ключ PGP" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Идентификатор ключа:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Удалить эту фотографию из этого ключа" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Отозвать" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Прочность:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Подписать" +msgid "Technical Details" +msgstr "Подробности" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Прочность:" +msgid "Fingerprint" +msgstr "Отпечаток" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Владелец отозвал ключ. Его больше нельзя использовать." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Истекает:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Добавить имя" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Даты" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Указать _доверие владельцу:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "Экспортировать _полный ключ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Имя:" +msgid "Actions" +msgstr "Действия" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Даты:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Добавить" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Истекает" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Подключи" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Слабо" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Отпечаток:" +msgid "Fully" +msgstr "Полностью" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Уровень доверия:" +msgid "Ultimately" +msgstr "Безоговорочно" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Ваше доверие этому ключу" +#| msgid "Encrypt files and email to the key's owner " +msgid "Encrypt files and email to the key's owner" +msgstr "Шифровать файлы и электронную почту для владельца ключа " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Открытый ключ PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Другие имена:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Люди, подписавшие этот ключ:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Позволяет зашифровать файлы и почту для владельца ключа " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Ваше доверие этому ключу" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Полностью" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Можно вручную указать уровень доверия на вкладке Подробности." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Я доверяю подписям, поставленным «%s» ставит на других ключах" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format -msgid "If you believe that the person that owns this key is '%s', sign this key:" +msgid "" +"If you believe that the person that owns this key is '%s', sign this " +"key:" msgstr "Если вы уверены, что ключом владеет «%s», подпишите этот ключ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 -#, no-c-format -msgid "If you no longer trust that '%s' owns this key, revoke your signature:" -msgstr "Если вы больше не уверены, что «%s» владеет этим ключом, отзовите свою подпись:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Слабо" +msgid "_Sign this Key" +msgstr "_Подписать этот ключ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 +#, no-c-format +msgid "" +"If you no longer trust that '%s' owns this key, revoke your signature:" +msgstr "" +"Если вы больше не уверены, что «%s» владеет этим ключом, отзовите " +"свою подпись:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Открытый ключ PGP" +msgid "_Revoke Signature" +msgstr "_Отозвать подпись" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Люди, подписавшие этот ключ:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Показывать только по_дписи людей, которым я доверяю" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Доверие" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Безоговорочно" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Вы д_оверяете владельцу:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Можно вручную указать уровень доверия на вкладке Подробности." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Отпечаток:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Показывать только по_дписи людей, которым я доверяю" +msgid "Dates:" +msgstr "Даты:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Отозвать подпись" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Уровень доверия:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Подписать этот ключ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Вы д_оверяете владельцу:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1638,545 +1880,456 @@ msgstr "Подключ %d ключа %s" #: ../pgp/seahorse-revoke.xml.h:1 +msgid "Reason for revoking the key" +msgstr "Причина для отзыва ключа" + +#: ../pgp/seahorse-revoke.xml.h:2 +msgid "_Reason:" +msgstr "При_чина:" + +#: ../pgp/seahorse-revoke.xml.h:4 msgid "Optional description of revocation" msgstr "Необязательное описание отзыва" -#: ../pgp/seahorse-revoke.xml.h:2 +#: ../pgp/seahorse-revoke.xml.h:6 msgid "Re_voke" msgstr "Отозвать" -#: ../pgp/seahorse-revoke.xml.h:3 -msgid "Reason for revoking the key" -msgstr "Причина для отзыва ключа" - -#: ../pgp/seahorse-revoke.xml.h:6 -msgid "_Reason:" -msgstr "При_чина:" +#: ../pgp/seahorse-signer.c:63 +msgid "" +"You have no personal PGP keys that can be used to sign a document or message." +msgstr "" +"У вас нет личных ключей PGP, пригодных для подписывания документа или " +"сообщения." -#: ../pgp/seahorse-signer.c:62 -msgid "You have no personal PGP keys that can be used to sign a document or message." -msgstr "У вас нет личных ключей PGP, пригодных для подписывания документа или сообщения." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Подписать сообщение ключом:" #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Насколько тщательно вы проверили этот ключ?" +msgid "Sign Key" +msgstr "Подписать ключ" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Другие увидят эту подпись как:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"Подписывая ключ, вы заявляете о своей уверенности в том, что владелец этого " +"ключа:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Подписать ключ как:" +msgid "Key Name" +msgstr "Имя ключа" #: ../pgp/seahorse-sign.xml.h:4 -msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. " -msgstr "Поверхностно: означает, что вы провели поверхностную проверку того, что этот ключ принадлежит тому, кто записан владельцем. Например, вы с владельцем сверили отпечатки ключа по телефону." +msgid "How carefully have you checked this key?" +msgstr "Насколько тщательно вы проверили этот ключ?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Имя ключа" +msgid "_Not at all" +msgstr "_Никак" #: ../pgp/seahorse-sign.xml.h:6 -msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." -msgstr "Никак: означает, что вы верите, что этот ключ принадлежит тому, кто записан владельцем, но вы не проверили это." +msgid "_Casually" +msgstr "_Поверхностно" #: ../pgp/seahorse-sign.xml.h:7 -msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." -msgstr "Очень тщательно: Выбирайте этот вариант, только если вы полностью уверены, что этот ключ — подлинный." +msgid "_Very Carefully" +msgstr "Очень т_щательно" #: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Подписывая ключ, вы заявляете о своей уверенности в том, что владелец этого ключа:" +msgid "" +"Not at all: means you believe the key is owned by the person who " +"claims to own it, but you could not or did not verify this to be a fact." +msgstr "" +"Никак: означает, что вы верите, что этот ключ принадлежит тому, кто " +"записан владельцем, но вы не проверили это." #: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Я могу _отозвать эту подпись позднее." +#| msgid "" +#| "Casually: means you have done a casual verification that the key " +#| "is owned by the person who claims to own it. For example, you could read " +#| "the key fingerprint to the owner over the phone. " +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Поверхностно: означает, что вы провели поверхностную проверку того, " +"что этот ключ принадлежит тому, кто записан владельцем. Например, вы с " +"владельцем сверили отпечатки ключа по телефону." #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Подписать ключ" +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "" +"Очень тщательно: Выбирайте этот вариант, только если вы полностью " +"уверены, что этот ключ — подлинный." #: ../pgp/seahorse-sign.xml.h:11 -msgid "You could use a hard to forge photo identification (such as a passport) to personally check that the name on the key is correct. You should have also used email to check that the email address belongs to the owner." -msgstr "Вы можете использовать трудноподделываемый документ с фотографией (например, паспорт), чтобы лично удостовериться в правильности имени владельца ключа. Вам следует также проверить, что адрес электронной почты принадлежит владельцу, послав на него письмо." +msgid "" +"You could use a hard to forge photo identification (such as a passport) to " +"personally check that the name on the key is correct. You should have also " +"used email to check that the email address belongs to the owner." +msgstr "" +"Вы можете использовать трудноподделываемый документ с фотографией (например, " +"паспорт), чтобы лично удостовериться в правильности имени владельца ключа. " +"Вам следует также проверить, что адрес электронной почты принадлежит " +"владельцу, послав на него письмо." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Поверхностно" +msgid "How others will see this signature:" +msgstr "Другие увидят эту подпись как:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Никак" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Другие не могут видеть эту подпись" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Я могу _отозвать эту подпись позднее." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Подписать" +msgid "Sign key as:" +msgstr "Подписать ключ как:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Автор подписи:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "Очень т_щательно" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Подписать сообщение ключом:" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "Сертификат" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Не удалось удалить" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Уверены, что хотите безвозвратно удалить сертификат «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Уверены, что хотите безвозвратно удалить %d сертификат?" -msgstr[1] "Уверены, что хотите безвозвратно удалить %d сертификата?" -msgstr[2] "Уверены, что хотите безвозвратно удалить %d сертификатов?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Удаление" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "Изменить пароль" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Подтверждение п_ароля:" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Подтвердить новый пароль" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "_Новый пароль:" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Управление паролями и ключами шифрования" - -#: ../src/seahorse.desktop.in.in.h:2 -#: ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 -#: ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Пароли и ключи" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Выберите тип элемента, который хотите создать:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "Пр_одолжить" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Создать…" - -#: ../src/seahorse-key-manager.c:251 -#: ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Выбран %d ключ" -msgstr[1] "Выбрано %d ключа" -msgstr[2] "Выбрано %d ключей" - -#: ../src/seahorse-key-manager.c:431 -#: ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 -#: ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Не удалось импортировать ключи" - -#: ../src/seahorse-key-manager.c:433 -#: ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Ключи импортированы" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Импорт ключей" - -#: ../src/seahorse-key-manager.c:504 -#: ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Импортировать ключ" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Неизвестный тип ключа или недопустимый формат данных" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Импорт ключей" - -#: ../src/seahorse-key-manager.c:737 -#: ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Сеть" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Закрыть программу" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_Создать…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Создать новый ключ или элементы" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Импортировать…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Импортировать из файла" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Импортировать из буфера обмена" - -#: ../src/seahorse-key-manager.c:750 -#: ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Найти удалённые ключи…" - -#: ../src/seahorse-key-manager.c:751 -#: ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Искать ключи на сервере ключей" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Синхронизировать и опубликовать ключи…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Опубликовать ключи и синхронизироваться с серверами в сети." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Тип" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Показать столбец типа ключа" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Истекает" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Показать столбец срока действия" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Доверие" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Показать столбец доверия владельцу" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Достоверность" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Показать столбец достоверности" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Фильтр:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Первые шаги:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Создать новый ключ для себя: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Импортировать имеющиеся ключи из файла:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Мои _личные ключи" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Другие _ключи" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Чтобы работать с шифрованием, нужны ключи." - -#: ../src/seahorse-key-manager.xml.h:7 -#: ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Импортировать" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Пароли" - -#: ../src/seahorse-key-manager-store.c:610 -#: ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Не удалось экспортировать ключи" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Достоверность" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Истекает" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Закрыть это окно" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Раскрыть всё" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Раскрыть все списки" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Свернуть всё" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Свернуть все списки" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Ключи из сети" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Ключи из сети, содержащие «%s»" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Серверы ключей:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Опубликованные ключи в моей сети:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Найти ключи в сети" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." -msgstr "Так можно найти другие ключи в сети. Эти ключи будут импортированы в локальную связку ключей." +msgid "_Sign" +msgstr "_Подписать" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Где искать:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Экспортирование данных" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Искать" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Получение данных" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Иск_ать ключи, содержащие: " +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Импортирование данных" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Не удалось опубликовать ключи на сервере" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Отправка данных" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Не удалось получить ключи с сервера: %s" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Недоступно" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d ключ выбран для синхронизации" -msgstr[1] "%d ключа выбрано для синхронизации" -msgstr[2] "%d ключей выбрано для синхронизации" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Личный сертификат и ключ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Личный сертификат" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Синхронизация ключей…" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "Сертификат" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Синхронизировать ключи" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Сертификаты (закодировано DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Сертификаты" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Ключи и сертификаты X.509" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Действительно безвозвратно удалить %d сертификат?" +msgstr[1] "Действительно безвозвратно удалить %d сертификата?" +msgstr[2] "Действительно безвозвратно удалить %d сертификатов?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Не удалось сгенерировать закрытый ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Создать" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Секретный ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Используется для запроса сертификата" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Создать новый секретный ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Метка:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Расположение:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Я понимаю, что этот ключ будет безвозвратно удалён." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Безымянный" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Не удалось экспортировать сертификат" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." -msgstr "Ключи из вашей связки ключей будут опубликованы на сервере и станут доступными для других. Также вы получите сведения, обновившиеся с момента последнего соединения с сервером ключей." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." -msgstr "Все изменения, произведённые с момента последнего соединения с сервером, будут перенесены на ваш компьютер. Серверов для публикации ключей выбрано не было, поэтому ваши ключи не будут доступны другим." +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Не удалось удалить" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Серверы ключей" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Экспортировать" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Экспортировать сертификат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Удалить этот сертификат или ключ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Запрос _сертификата" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Создать файл с запросом сертификата для этого ключа" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Не удалось сохранить запрос сертификата" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Сохранить запрос сертификата" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Запрос сертификата" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Запрос, закодированный PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Не удалось создать запрос сертификата" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Создать файл запроса сертификата." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Имя сертификата (CN), помещённое в запрос сертификата." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Имя (сертификата):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Безымянный закрытый ключ" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Синхронизировать" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "Изменить пароль" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Версия этого приложения" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "_Новый пароль:" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Помощники:" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Подтвердить новый пароль" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Valek Filippov , 2000-2003\n" -"Yuri Kozlov , 2008\n" -"Vasiliy Faronov , 2008" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Подтверждение п_ароля:" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Домашняя страница проекта Seahorse" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Управление паролями и ключами шифрования" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Файл" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Продолжить" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Правка" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Выберите тип элемента, который хотите создать:" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Вид" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Сбой импортирования" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Импортировать" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Импортируемые данные:" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Справка" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Импортировать ключ" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Параметры" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Все файлы ключей" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Настроить параметры приложения" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Перетащенный текст" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Текст буфера обмена" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "О программе" +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Создать" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Содержание" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Закрыть программу" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Показать справку по Seahorse" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_Создать…" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Экспортировать открытый ключ" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Создать новый ключ или элементы" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Экспорт ключей" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Добавить новый ключ или элемент" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Не удалось получить данные с сервера ключей" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Импортировать…" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Скопированы ключи" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Импортировать из файла" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Получение ключей" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Импортировать из буфера обмена" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s является секретным ключом. Всё равно продолжить?" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "По _связке ключей" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Показывать боковую панель со связками ключей" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Показывать _личные" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Показывать только личные ключи, сертификаты и пароли" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Показывать _доверенные" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Показывать только доверенные ключи, сертификаты и пароли" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Показывать _все" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Показывать все ключи, сертификаты и пароли" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Идёт импорт ключей с сервера" +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Фильтр" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Показать свойства" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Первые шаги:" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Удалить" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Создать новый ключ для себя: " -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Удалить выделенные элементы" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Импортировать имеющиеся ключи из файла:" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_Экспортировать…" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Чтобы работать с шифрованием, нужны ключи." -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Экспортировать в файл" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Не удалось заблокировать" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Не удалось разблокировать" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Скопировать в буфер обмена" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Заблокировать" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Импортировать выделенные ключи в локальную связку ключей" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Разблокировать" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Свойства" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Настроить ключ для _SSH…" + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Послать открытый ключ SSH на другую машину и настроить на ней вход с " +"использованием этого ключа." -#: ../ssh/seahorse-ssh-askpass.c:60 -#: ../ssh/seahorse-ssh-askpass.c:68 +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" msgstr "Введите ваш пароль SSH:" @@ -2189,8 +2342,7 @@ msgid "Enter the old passphrase for: %s" msgstr "Введите старый пароль для: %s" -#: ../ssh/seahorse-ssh-askpass.c:87 -#: ../ssh/seahorse-ssh-askpass.c:92 +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 msgid "New Key Passphrase" msgstr "Новый пароль ключа" @@ -2201,167 +2353,208 @@ #: ../ssh/seahorse-ssh-askpass.c:93 #, c-format -#| msgid "Enter the new passphrase for: %s" msgid "Enter the new passphrase again: %s" msgstr "Введите новый пароль ещё раз: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Настроить ключ для _SSH…" +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Безопасная оболочка" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "Send public Secure Shell key to another machine, and enable logins using that key." -msgstr "Послать открытый ключ SSH на другую машину и настроить на ней вход с использованием этого ключа." +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "" +"Ключи, использующиеся для безопасного подключения к другим компьютерам." -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Уверены, что хотите безвозвратно удалить ключ SSH «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Уверены, что хотите безвозвратно удалить %d ключей SSH?" +#| msgid "Are you sure you want to delete %d secure shell keys?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Уверены, что хотите безвозвратно удалить %d ключ SSH?" +msgstr[1] "Уверены, что хотите безвозвратно удалить %d ключа SSH?" +msgstr[2] "Уверены, что хотите безвозвратно удалить %d ключей SSH?" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Не удалось удалить ключ" - -#: ../ssh/seahorse-ssh-generate.c:60 -#: ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 -#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ключ SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Секретные ключи SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Открытые ключи SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Для этого ключа нет ни одного доступного файла открытого ключа." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Ключ SSH" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" -msgstr "Используется для доступа к другим компьютерам (например, через терминал)" +msgstr "" +"Используется для доступа к другим компьютерам (например, через терминал)" -#: ../ssh/seahorse-ssh-generate.c:115 -#: ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Не удалось создать ключ SSH" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Создание ключа SSH" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "Use your email address, and any other reminder you need about what this key is for." -msgstr "Используйте ваш адрес электронной почты или другие сведения, которые помогут вам вспомнить назначение ключа." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "A Secure Shell (SSH) key lets you connect securely to trusted computers using SSH, without entering a different password for each of them." -msgstr "Ключи SSH позволяют безопасно соединяться с доверяемыми компьютерами по протоколу SSH, не вводя для каждого из них отдельный пароль." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "If there is already a computer you want to use this key with, you can set up that computer to recognize your key now. " -msgstr "Если уже есть компьютер, с которым вы хотите использовать этот ключ, можно прямо сейчас настроить этот компьютер на использование вашего ключа." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Новый ключ SSH" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Просто создать ключ" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "Создать и _установить" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Просто создать ключ" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Ключ для безопасной оболочки (SSH) позволяет безопасно подключаться к другим " +"компьютерам." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Адрес эл. почты или другое напоминание для назначения ключа." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Описание ключа:" +msgid "DSA" +msgstr "DSA" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Если есть компьютер, для которого вы хотите использовать этот ключ, вы " +"можете настроить удалённый компьютер для использования вашего нового ключа." + +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(нечитаемый ключ SSH)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Личный ключ SSH" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Ключ SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Не удалось переименовать ключ." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Не удалось изменить параметры авторизации для этого ключа." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Не удалось изменить пароль для этого ключа." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Алгоритм:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Идентификатор:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Местоположение:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +#| msgid "Name:" +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Имя:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Прочность:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Используется для соединения с другими компьютерами." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Доверие" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Вл_адельцу этого ключа разрешено соединяться с этим компьютером" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Это применимо только к учётной записи «%s»." +#| msgid "This only applies to the '%s' account." +msgid "This only applies to the %s account." +msgstr "Это применимо только к учётной записи %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_Экспортировать полный ключ" +msgid "Algorithm:" +msgstr "Алгоритм:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Вл_адельцу этого ключа разрешено соединяться с этим компьютером" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Прочность:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Местоположение:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Используется для соединения с другими компьютерами." +msgid "E_xport Complete Key" +msgstr "_Экспортировать полный ключ" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Команда SSH неожиданно завершилась." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Команда SSH завершилась с ошибкой." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Пароль удалённого сервера" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Введите пароль ключа" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Пароль для нового ключа SSH" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Импорт ключа: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Импорт ключа. Введите пароль" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Ключи OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Не удалось найти секретного ключа для этого публичного ключа." @@ -2374,16 +2567,20 @@ msgstr "Настройка ключей SSH…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "например: fileserver.example.com:порт" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Настроить компьютер для работы с SSH" +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"Чтобы использовать ваш ключ SSH с другим компьютером, использующим SSH, у " +"вас уже должна быть учётная запись на том компьютере." + #: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." -msgstr "Чтобы использовать ваш ключ SSH с другим компьютером, использующим SSH, у вас уже должна быть учётная запись на том компьютере." +msgid "eg: fileserver.example.com:port" +msgstr "например: fileserver.example.com:порт" #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" @@ -2397,3 +2594,191 @@ msgid "_Set Up" msgstr "_Установить" +#~ msgid "Login keyring" +#~ msgstr "Связка ключей уч. записи" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Доступ к связке ключей запрещён" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Демон gnome-keyring не запущен" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Связка ключей уже разблокирована" + +#~ msgid "No such key ring exists" +#~ msgstr "Нет такой связки ключей" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Не удалось связаться со службой управления связками ключей" + +#~ msgid "The item already exists" +#~ msgstr "Элемент уже существует" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Произошла внутренняя ошибка при обращении к gnome-keyring" + +#~ msgid "Algorithms here" +#~ msgstr "Алгоритмы" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Удаление элемента" +#~ msgstr[1] "Удаление элементов" +#~ msgstr[2] "Удаление элементов" + +#~ msgid "Passwords: %s" +#~ msgstr "Пароли: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Пароли: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Заблокировать связку ключей для хранения паролей. Для разблокирования " +#~ "связки ключей нужно будет ввести главный пароль." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Разблокировать связку ключей для хранения паролей с помощью главного " +#~ "пароля." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Не удалось удалить связку ключей" + +#~ msgid "Archive files" +#~ msgstr "Архивные файлы" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Файл с таким именем уже существует.\n" +#~ "\n" +#~ "Заменить его новым файлом?" + +#~ msgid "_Replace" +#~ msgstr "_Заменить" + +#~ msgid "_Sign Key..." +#~ msgstr "Подписать _ключ…" + +#~ msgid "Sign public key" +#~ msgstr "Подписать открытый ключ" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Уверены, что хотите безвозвратно удалить %d ключей и идентификаторов??" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Не удалось удалить открытый ключ" + +#~ msgid "New PGP Key" +#~ msgstr "Новый ключ PGP" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Не удалось экспортировать ключ в «%s»" + +#~ msgid "Export Complete Key" +#~ msgstr "Экспортировать ключ полностью" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Уверены, что хотите безвозвратно удалить сертификат «%s»?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Уверены, что хотите безвозвратно удалить %d сертификат?" +#~ msgstr[1] "Уверены, что хотите безвозвратно удалить %d сертификата?" +#~ msgstr[2] "Уверены, что хотите безвозвратно удалить %d сертификатов?" + +#~ msgid "Deleting" +#~ msgstr "Удаление" + +#~ msgid "Create New ..." +#~ msgstr "Создать…" + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Выбран %d ключ" +#~ msgstr[1] "Выбрано %d ключа" +#~ msgstr[2] "Выбрано %d ключей" + +#~ msgid "Importing keys" +#~ msgstr "Импорт ключей" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Неизвестный тип ключа или недопустимый формат данных" + +#~ msgid "Importing Keys" +#~ msgstr "Импорт ключей" + +#~ msgid "T_ypes" +#~ msgstr "_Тип" + +#~ msgid "Show type column" +#~ msgstr "Показать столбец типа ключа" + +#~ msgid "_Expiry" +#~ msgstr "_Истекает" + +#~ msgid "Show expiry column" +#~ msgstr "Показать столбец срока действия" + +#~ msgid "_Trust" +#~ msgstr "_Доверие" + +#~ msgid "Show owner trust column" +#~ msgstr "Показать столбец доверия владельцу" + +#~ msgid "_Validity" +#~ msgstr "_Достоверность" + +#~ msgid "Show validity column" +#~ msgstr "Показать столбец достоверности" + +#~ msgid "Other _Keys" +#~ msgstr "Другие _ключи" + +#~ msgid "Validity" +#~ msgstr "Достоверность" + +#~ msgid "Expiration Date" +#~ msgstr "Истекает" + +#~ msgid "_Expand All" +#~ msgstr "_Раскрыть всё" + +#~ msgid "Expand all listings" +#~ msgstr "Раскрыть все списки" + +#~ msgid "_Collapse All" +#~ msgstr "_Свернуть всё" + +#~ msgid "Collapse all listings" +#~ msgstr "Свернуть все списки" + +#~ msgid "Export public key" +#~ msgstr "Экспортировать открытый ключ" + +#~ msgid "Exporting keys" +#~ msgstr "Экспорт ключей" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Не удалось получить данные с сервера ключей" + +#~ msgid "Retrieving keys" +#~ msgstr "Получение ключей" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s является секретным ключом. Всё равно продолжить?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Не удалось удалить ключ" + +#~ msgid "_Key Description:" +#~ msgstr "_Описание ключа:" diff -Nru seahorse-3.2.2/po/sl.po seahorse-3.6.3/po/sl.po --- seahorse-3.2.2/po/sl.po 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/po/sl.po 2012-08-21 12:23:19.000000000 +0200 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the seahorse package. # # Andraž Tori , 2000. -# Matej Urbančič , 2007 - 2010. +# Matej Urbančič , 2007 - 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-17 09:51+0000\n" -"PO-Revision-Date: 2011-09-17 12:12+0100\n" +"POT-Creation-Date: 2012-07-17 07:28+0000\n" +"PO-Revision-Date: 2012-07-19 10:02+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: \n" @@ -27,56 +27,164 @@ msgstr "Dodaj zbirko ključev gesel" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Novo ime zbirke ključev:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "Please choose a name for the new keyring. You will be prompted for an unlock password." msgstr "Izberite ime za novo zbirko ključev. Vpisati boste morali geslo za odklepanje." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Novo ime zbirke ključev:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Ime gostitelja ali naslov strežnika." -#: ../gkr/seahorse-gkr-add-item.c:61 -#: ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Ni mogoče dodati zbirke ključev" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Nova zbirka ključev gesel" + +#: ../gkr/seahorse-gkr-actions.c:82 +#: ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Uporabno za hranjenje programskih in omrežnih gesel" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Novo geslo ..." + +#: ../gkr/seahorse-gkr-actions.c:84 +#: ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Varno shranjevanje gesla in drugih podatkov." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Geslo zbirke ključev" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Shranjeno geslo" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Ni mogoče določiti privzete zbirke ključev" + +#: ../gkr/seahorse-gkr-actions.c:225 +#: ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Ni mogoče spremeniti gesla zbirke ključev" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Nastavi kot privzeto" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Programi običajno shranijo nova gesla v privzeti zbirki ključev." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "_Spremeni geslo" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Spremeni geslo za odklepanje zbirke ključev za gesla" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Predmeta ni mogoče dodati" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Dodaj geslo" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 +#: ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Opis:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Zbirka ključev:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Geslo:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Pokaži _geslo" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Predmeta ni mogoče izbrisati" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Zbirka ključev:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Ni mogoče dodati zbirke ključev" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Gesla" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Shranjena osebna gesla, poverilnice in skrivnosti" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Geslo računa za hipno sporočanje za" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Geslo ali skrivnost" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Omrežno geslo" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Shranjeno sporočilce" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Geslo zbirke ključev" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Geslo šifrirnega ključa" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Geslo shrambe ključev" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Geslo za Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Geslo spletnih računov GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Geslo Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Geslo hipnega sporočanja" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Skrivnost upravljalnika omrežja" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Ali ste prepričani, da želite izbrisati geslo '%s'?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -85,256 +193,136 @@ msgstr[2] "Ali ste prepričani, da želite izbrisati %d gesli?" msgstr[3] "Ali ste prepričani, da želite izbrisati %d gesla?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Brisanje predmetov" -msgstr[1] "Brisanje predmeta" -msgstr[2] "Brisanje predmetaov" -msgstr[3] "Brisanje predmetov" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Dostop do skupnega omrežja ali vira" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Dostop do spletne strani" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" -msgstr "Odklene PGP ključ" +msgstr "Odklene ključ PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Odklene ključ varne lupine" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Shranjeno geslo ali prijava" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Omrežna poverila" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Geslo" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Ni mogoče spremeniti gesla." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Posodabljanje gesla" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Ni mogoče določiti opisa." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Geslo:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Tehnične podrobnosti:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Podrobnosti" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Lastnosti ključa" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Ključ" +msgid "Use:" +msgstr "Uporabi:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Lastnosti ključa" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Vrsta:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Prijava:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Strežnik:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Prijava:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Pokaži _geslo" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Vrsta:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Uporabi:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Gesla: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Gesla: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Geslo zbirke ključev" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Uporabno za hranjenje programskih in omrežnih gesel" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Shranjeno geslo" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Varno shranjevanje gesla in drugih podatkov." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Ni mogoče odkleniti zbirke ključev" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Ni mogoče zakleniti zbirke ključev" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Ni mogoče določiti privzete zbirke ključev" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Ni mogoče spremeniti gesla zbirke ključev" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Zakleni" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "Lock the password storage keyring so a master password is required to unlock it." -msgstr "Zakleni zbirko ključev za gesla z glavnim geslom" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Odkleni" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "Unlock the password storage keyring with a master password so it is available for use." -msgstr "Odkleni zbirko ključev za gesla z glavnim geslom za hitrejšo uporabo." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Nastavi kot privzeto" +msgid "Password:" +msgstr "Geslo:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Programi običajno shranijo nova gesla v privzeti zbirki ključev." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Ključ" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "_Spremeni geslo" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Tehnične podrobnosti:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Spremeni geslo za odklepanje zbirke ključev za gesla" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Podrobnosti" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Zbirke ključev ni mogoče izbrisati" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Zbirka ključev, ki je samodejno odklenjena ob prijavi" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Zbirka ključev, uporabljena za hranjenje gesel" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Ali zares želite trajno izbrisati zbirko ključev '%s'?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Brisanje zbirk ključev" -msgstr[1] "Brisanje zbirke ključev" -msgstr[2] "Brisanje zbirk ključev" -msgstr[3] "Brisanje zbirk ključev" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Razumem, da bodo vsi predmeti trajno izbrisani." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Lastnosti zbirke ključev" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Ime:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Ustvarjeno:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Zbirka ključev" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Lastnosti zbirke ključev" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Ime:" - -#: ../gkr/seahorse-gkr-operation.c:52 -#: ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 -#: ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Opravilo je bilo preklicano." - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Dostop do zbirke ključev je zavrnjen" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "GNOME ozadnji program zbirke ključev ni zagnan" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Zbirka ključev je že odklenjena" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Taka zbirka ključev ne obstaja" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Ni mogoča povezava z ozadnjim programom zbirke ključev" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Predmet že obstaja" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Napaka med dostopu do GNOME zbirke ključev" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Pokaži zastavice" @@ -594,270 +582,327 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "začetni začasni predmet" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Dodajanje strežnika ključev" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Gostitelj:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Vrsta strežnika ključev:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Gostitelj:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "Vrata preko katerih je mogoč dostop do strežnika." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "začetni začasni predmet" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Različica programa" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Šifrirno geslo" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- sistemske nastavitve" -#: ../libseahorse/seahorse-passphrase.c:183 -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Geslo:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Podpora:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Potrditev:" +#: ../libseahorse/seahorse-catalog.c:112 +#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Gesla in ključi" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Neveljaven naslov strežnika ključev." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "Matej Urbančič " -#: ../libseahorse/seahorse-prefs.c:69 -msgid "For help contact your system adminstrator or the administrator of the key server." -msgstr "Za pomoč se obrnite na skrbnika sistema ali skrbnika strežnika ključev." +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Spletna stran projekta Seahorse" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Ni mogoče izbrisati" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Po meri" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Ni mogoče izvoziti ključev" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Brez: Ne objavi ključev" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Ni mogoče izvoziti podatkov" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Samodejno prenesi ključe s strežnika _ključev." +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Datoteka" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Samodejno uskladi spremenjene _ključe s strežnikom ključev." +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Izvozi ..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Strežniki ključev" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Izvozi v datoteko" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Možnosti" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Uredi" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Poišči ključe preko:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopiraj v odložišče" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Objava ključev na:" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 +#: ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Izbriši" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Pridobivanje podatkov" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Izbriši izbrane predmete" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Izvažanje podatkov" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Pokaži lastnosti tega predmeta" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Pokaži lastnosti te zbirke ključev" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Uvažanje podatkov" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Lastnosti" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Pošiljanje podatkov" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Spremeni možnosti programa" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Nedostopno" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Pogled" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d.%m.%Y" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Pomo_č" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Podatki ključa" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "O programu" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Več ključev" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Vsebina" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Vse datoteke ključev" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Pokaži pomoč programa" -#: ../libseahorse/seahorse-util.c:745 -#: ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Vse datoteke" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Izvoz" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arhivske datoteke" +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Vnesite PIN ali geslo za: %s" -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Datoteka s tem imenom že obstaja.\n" -"\n" -"Ali želite obstoječo datoteko prepisati?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Zamenjaj" +#: ../libseahorse/seahorse-passphrase.c:183 +#: ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Geslo:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Potrditev:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Neveljaven naslov strežnika ključev." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "For help contact your system adminstrator or the administrator of the key server." +msgstr "Za pomoč se obrnite na skrbnika sistema ali skrbnika strežnika ključev." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "Naslov URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Po meri" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Brez: Ne objavi ključev" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Možnosti" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Poišči ključe preko:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Objava ključev na:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Samodejno prenesi ključe s strežnika _ključev." + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Samodejno uskladi spremenjene _ključe s strežnikom ključev." + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Strežniki ključev" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d.%m.%Y" #: ../libseahorse/seahorse-validity.c:40 #: ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Neznano" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nikoli" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Obrobno" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Polno" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Popolno" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Onemogočeno" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Preklicano" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Pomoči ni mogoče prikazati: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Datum preteka:" +msgid "Never E_xpires" +msgstr "Nikoli _ne preteče" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Ustvari novi podključ" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "V kolikor ključ nikoli ne poteče" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Vrsta ključa:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Dolžina ključa:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Vrsta ključa:" +msgid "Expiration Date:" +msgstr "Datum preteka:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Dolžina ključa" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nikoli _ne preteče" +msgid "Generate a new subkey" +msgstr "Ustvari novi podključ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Dodaj ID uporabnika" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Ustvari nov ID uporabnika" +msgid "Must be at least 5 characters long" +msgstr "Najmanjša dolžina je 5 znakov." #: ../pgp/seahorse-add-uid.xml.h:3 -#: ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Polno _Ime:" +msgid "Optional email address" +msgstr "Dodatni elektronski naslov" #: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Opomba ključa:" - -#: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "Najmanjša dolžina je 5 znakov." - -#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Optional comment describing key" msgstr "Izbirna opomba z opisom ključa" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Dodatni elektronski naslov" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Polno _Ime:" -#: ../pgp/seahorse-add-uid.xml.h:8 -#: ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 +#: ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Elektronski naslov:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Opomba ključa:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Ustvari nov ID uporabnika" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "S_premeni" +msgid "_Never expires" +msgstr "_Nikoli ne preteče" #: ../pgp/seahorse-expires.xml.h:2 -#: ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Prekliči ključ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Nikoli ne preteče" +msgid "C_hange" +msgstr "S_premeni" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -869,7 +914,7 @@ msgstr "Dodaj podključ v %s" #: ../pgp/seahorse-gpgme-add-subkey.c:197 -#: ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (le podpis)" @@ -878,7 +923,7 @@ msgstr "ElGamal (le šifriranje)" #: ../pgp/seahorse-gpgme-add-subkey.c:211 -#: ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (le podpis)" @@ -899,6 +944,12 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Odšifriranje ni uspelo. Najverjetneje manjka odšifrirni ključ." +#: ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Opravilo je bilo preklicano." + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Neveljavna vrednost datuma" @@ -916,46 +967,146 @@ msgid "Expiry: %s" msgstr "Poteče: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Več ključev" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Podatki ključa" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Zaščiteni ključi PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Ključi PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" -msgstr "PGP ključ" +msgstr "Ključ PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Uporablja se za šifriranje sporočil in datotek" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" -msgstr "Ni mogoče ustvariti PGP ključa" +msgstr "Ni mogoče ustvariti ključa PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" -msgstr "Šifrirno geslo za nov PGP ključ" +msgstr "Šifrirno geslo za nov ključ PGP" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Dvakrat vnesite šifrirno geslo za vaš novi ključ." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Med ustvarjanjem ključa je treba ustvariti čim več\n" +"naključnih podatkov. Med ustvarjanjem ključa je zaželeno\n" +"izvajati kakšrnekoli dejavnosti, kot so tipkanje, premikanje\n" +"miške, zaganjanje in zapiranje programov in podobno.\n" +"Na ta način se ustvarja naključnost." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Ustvari ključ" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Ali zares želite trajno izbrisati %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Ali zares želite trajno izbrisati %d ključev?" +msgstr[1] "Ali zares želite trajno izbrisati %d ključ?" +msgstr[2] "Ali zares želite trajno izbrisati %d ključa?" +msgstr[3] "Ali zares želite trajno izbrisati %d ključe?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Napačno geslo" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "To je bil tretji poskus prijave z napačnim geslom. Poskusite znova." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Napačno šifrirno geslo." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Vnesite novo šifrirno geslo za '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Vnesite šifrirno geslo za '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Vnesite novo šifrirno geslo" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Vnesite šifrirno geslo" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Šifrirno geslo" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Naloženih %d ključev" +msgstr[1] "Naložen %d ključ" +msgstr[2] "Naložena %d ključa" +msgstr[3] "Naloženi %d ključi" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." +msgstr "Neveljavni podatki ključa (manjkajoči UID). Morda je datum računalnika nastavljen nepravilno ali manjkajoče samodejno podpisovanje." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Ključi GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: privzeta mapa zbirke ključev" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -976,7 +1127,7 @@ #: ../pgp/seahorse-gpgme-photos.c:128 #, c-format msgid "This is not a image file, or an unrecognized kind of image file. Try to use a JPEG image." -msgstr "Ta datoteka ni slika ali pa je neprepoznavna oblika slike. Poskusite uporabiti JPEG sliko." +msgstr "Ta datoteka ni slika ali pa je neprepoznavna oblika slike. Poskusite uporabiti sliko JPEG." #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" @@ -984,30 +1135,35 @@ #: ../pgp/seahorse-gpgme-photos.c:237 msgid "All JPEG files" -msgstr "Vse JPEG datoteke" +msgstr "Vse datoteke JPEG" + +#: ../pgp/seahorse-gpgme-photos.c:242 +#: ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Vse datoteke" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Izbor slike kot del ključa" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Slike ni mogoče pripraviti" -#: ../pgp/seahorse-gpgme-photos.c:288 -#: ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 +#: ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Ni mogoče dodati slike" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Datoteke ni mogoče naložiti. Najverjetneje je neveljavna oblika." -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Ali zares želite odstraniti trenutno sliko iz vašega ključa?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Ni mogoče izbrisati slike" @@ -1061,7 +1217,12 @@ msgid "Couldn't add revoker" msgstr "Ni mogoče dodati preklicnika" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 +#: ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Razumem, da bo ta skrivni ključ trajno izbrisan." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1076,566 +1237,613 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 -#: ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 +#: ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Za podpisovanje ni uporabnih ključev" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "You have no personal PGP keys that can be used to indicate your trust of this key." -msgstr "Ni določenih vašega osebnega PGP ključa s katerim bi lahko potrdili zaupanje." +msgstr "Ni določenih vašega osebnega ključa PGP s katerim bi lahko potrdili zaupanje." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Napačno šifrirno geslo." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Vnesite novo šifrirno geslo za '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "Iskanje ni bilo dovolj podrobno. Strežnik '%s' je našel preveč ključev." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Vnesite šifrirno geslo za '%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Ni mogoča povezava s strežnikom '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Vnesite novo šifrirno geslo" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Strežnik ključev HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Vnesite šifrirno geslo" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Ni mogoče uvoziti ključev" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Uvoz ključev s strežnikov" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 +#: ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Oddaljeno" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Zapri to okno" + +#: ../pgp/seahorse-keyserver-results.c:250 +#: ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Poišči oddaljene ključe ..." + +#: ../pgp/seahorse-keyserver-results.c:251 +#: ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Poišči ključe na strežniku ključev" + +#: ../pgp/seahorse-keyserver-results.c:255 +#: ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Uvozi" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Uvozi izbrane ključe v osebno zbirko ključev" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Oddaljeni ključi" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Naloženih %d ključev" -msgstr[1] "Naložen %d ključ" -msgstr[2] "Naložena %d ključa" -msgstr[3] "Naloženi %d ključi" +msgid "Remote Keys Containing '%s'" +msgstr "Oddaljeni ključi ki vsebujejo '%s'" -#: ../pgp/seahorse-gpgme-source.c:649 -msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." -msgstr "Neveljavni podatki ključa (manjkajoči UID). Morda je datum računalnika nastavljen nepravilno ali manjkajoče samodejno podpisovanje." +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Iskanje ključev je spodletelo." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Poišči oddaljene ključe" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP strežnik ključev" +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." +msgstr "Program poišče ključe drugih oseb na spletu. Ključe lahko po tem uvozite v lastno zbirko ključev." -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Iskanje ključa, ki vsebuje: " + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Strežniki ključev:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Dostopni ključi:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Kje iskati:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "I_skanje" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Ni mogoče objaviti ključev na strežniku" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Iskanje ni bilo dovolj podrobno. Strežnik '%s' je našel preveč ključev." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Ni mogoče pridobiti ključa s strežnika: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Ni mogoča povezava s strežnikom '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d ključev je izbranih za usklajevanje" +msgstr[1] "%d ključ je izbran za usklajevanje" +msgstr[2] "%d ključa sta izbrana za usklajevanje" +msgstr[3] "%d ključi so izbrani za usklajevanje" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Usklajevanje ključev ..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Uskladi ključe" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." +msgstr "Možnost objavi ključe v zbirki ključev in omogoči drugim njihovo uporabo. Sprejeli boste tudi spremembe, ki so jih drugi naredili po tem, ko ste prejeli njihove ključe." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." +msgstr "Možnost posodobi spremembe, ki so jih drugi uporabniki naredili za svoje ključe. Ni izbranega strežnika za objavljanje, zato vaši ključi ne bodo na voljo drugim." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Strežniki ključev" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Usklajevanje" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Ni mogoča povezava z '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Povezovanje z: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Ni mogoče razrešiti naslova: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Razreševanje naslova strežnika: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" -msgstr "LDAP strežnik ključev" +msgstr "Strežnik LDAP ključev" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Podpis ključa ..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Podpiši javni ključ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Ali zares želite trajno izbrisati %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Ali zares želite trajno izbrisati %d ključev z osebnimi podatki?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Ali zares želite trajno izbrisati %d ključev?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Ali zares želite trajno izbrisati %d osebnih podatkov?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Uskladi in objavi ključe ..." -#: ../pgp/seahorse-pgp-commands.c:201 -#: ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Ni mogoče izbrisati ID uporabnika." +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Objavljanje in usklajevanje ključev s ključi v omrežju." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Zasebnega ključa ni mogoče izbrisati" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Javnega ključa ni mogoče izbrisati" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Ključi PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Ključi PGP se uporabljajo za šifriranje elektronskih sporočil in datotek" #: ../pgp/seahorse-pgp-generate.xml.h:1 -#: ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Napredne možnosti ključa" +msgid "C_reate" +msgstr "Ustva_ri" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "PGP ključ omogoča šifriranje elektronske pošte za druge uporabnike." +msgid "Generate a new key" +msgstr "Ustvari nov ključ" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmi" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "Ključ PGP omogoča šifriranje elektronske pošte za druge uporabnike." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "Ustva_ri" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Opombe:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Datum _preteka:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Nikoli ne preteče" -#: ../pgp/seahorse-pgp-generate.xml.h:6 -#: ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 +#: ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Vrsta šifriranja:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Ustvari nov ključ" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 -#: ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Jakost ključa (biti):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Nikoli ne preteče" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Nov PGP ključ" +msgid "E_xpiration Date:" +msgstr "Datum _preteka:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Opombe:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Napredne možnosti ključa" -#: ../pgp/seahorse-pgp-key.c:572 -#: ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Pretečeno" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Osebni ključ PGP" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Ključ PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Ni mogoče zamenjati ID osnovnega uporabnika" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Ali zares želite trajno izbrisati '%s' ID uporabnika?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Ni mogoče izbrisati ID uporabnika." + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[neznano]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Ime/Elektronski naslov" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID podpisa" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Ni mogoče zamenjati osnovne slike" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(neznano)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Ključ je pretekel na: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Ime" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Ali zares želite trajno izbrisati podključ %d ključa %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Ni mogoče izbrisati podključa" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Ni mogoče zamenjati zaupanja" -#: ../pgp/seahorse-pgp-key-properties.c:1142 -#: ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Ni mogoče izvoziti ključa v \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Izvozi celotni ključ" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" msgstr "Ni mogoče izvoziti ključa." -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nikoli" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Vrsta" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Ustvarjeno" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Preteče" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Stanje" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Jakost" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Pretečeno" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Dobro" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID ključa" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Dejanja" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Opomba:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datumi" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Elektronski naslov" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Prstni odtis" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID Ključa:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nikoli" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Imena ključev in podpisi" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Ta ključ je bil preklican" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotografija" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Lastnik ključa je ključ preklical. Ključ ni več uporaben." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Tehnične podrobnosti" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Ključ je pretekel" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Ta ključ je bil preklican" +msgid "Add a photo to this key" +msgstr "Dodaj ključu sliko" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Ključ je pretekel" +msgid "Remove this photo from this key" +msgstr "Odstrani sliko iz ključa" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Vrsta:" +msgid "Make this photo the primary photo" +msgstr "Naj bo ta fotografija osnovna fotografija." -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Uporabi:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Pojdi na predhodno fotografijo" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Podključi" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Pojdi na naslednjo sliko" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Dodaj" - +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotografija" + #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Dodaj ključu sliko" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID ključa:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Spremeni _šifrirno geslo" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Ime:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Odšifriranje datotek in elektronske pošte." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Elektronski naslov" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Izbriši" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Opomba:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Pretečen" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Uporabi:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Preteče dne:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Vrsta:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Izvoz" +msgid "Decrypt files and email sent to you." +msgstr "Odšifriranje datotek in elektronske pošte." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Osebni ključ PGP" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Pojdi na naslednjo sliko" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Spremeni _šifrirno geslo" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Pojdi na predhodno sliko" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Lastnik" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ID ključa:" +msgid "Key Names and Signatures" +msgstr "Imena ključev in podpisi" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Osnovni" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Naj bo ta slika osnovna slika." +msgid "Sign" +msgstr "Podpiši" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Imena in podpisi" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Izbriši" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nikoli" +msgid "_Add Name" +msgstr "_Dodaj ime" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Prepis _zaupanja lastniku:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Lastnik" +msgid "Revoke" +msgstr "Prekliči" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Osnovni" +msgid "Names and Signatures" +msgstr "Imena in podpisi" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Osebni PGP ključ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID ključa:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Odstrani sliko iz ključa" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Prekliči" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Jakost:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Podpiši" +msgid "Technical Details" +msgstr "Tehnične podrobnosti" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Jakost:" +msgid "Fingerprint" +msgstr "Prstni odtis" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Lastnik ključa je ključ preklical. Ključ ni več uporaben." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Preteče dne:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Dodaj ime" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datumi" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Prepis _zaupanja lastniku:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Izvozi celoten ključ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Ime:" +msgid "Actions" +msgstr "Dejanja" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datumi:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Dodaj" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Pretečen" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Podključi" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Obrobno" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Prstni odtis:" +msgid "Fully" +msgstr "Polno" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Določitev zaupanja:" +msgid "Ultimately" +msgstr "Popolno" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Zaupanje v ključ" +msgid "Encrypt files and email to the key's owner" +msgstr "Šifrira datoteke in sporočila za lastnika ključa" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Javni ključ PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Ostala imena:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Podpisniki tega ključa:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Šifrira datoteke in sporočila za lastnika ključa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Zaupanje v ključ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Polno" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Zaupanje je posamično določena med Podrobnostmi." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Zaupam podpisom '%s' tudi pri drugih ključih" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "If you believe that the person that owns this key is '%s', sign this key:" msgstr "V kolikor verjamete, da je '%s' lastnik ključa, podpišite ključ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Podpis ključa" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "V kolikor ne verjamete, da je '%s' lastnik ključa, prekličite vaš podpis:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Obrobno" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Javni PGP ključ" +msgid "_Revoke Signature" +msgstr "_Preklic podpisa" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Podpisniki tega ključa:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Pokaži le podpise uporabnikov, ki jim zaupam" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Zaupanje" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Popolno" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "_Zaupate lastniku:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Zaupanje je posamično določena med Podrobnostmi." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Prstni odtis:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Pokaži le podpise uporabnikov, ki jim zaupam" +msgid "Dates:" +msgstr "Datumi:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Preklic podpisa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Določitev zaupanja:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Podpis ključa" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Zaupate lastniku:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1643,542 +1851,428 @@ msgstr "Podključ %d od %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Opombe o razlogih za preklic" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Pre_kliči" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Razlog za preklic ključa" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Vzrok:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Opombe o razlogih za preklic" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Pre_kliči" + +#: ../pgp/seahorse-signer.c:63 msgid "You have no personal PGP keys that can be used to sign a document or message." -msgstr "Ni določenega osebnega PGP ključa za podpisovanje dokumentov in sporočil." +msgstr "Ni določenega osebnega ključa PGP za podpisovanje dokumentov in sporočil." + +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Podpis sporočila s ključem:" #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Kako podrobno je ključ preverjen?" +msgid "Sign Key" +msgstr "Podpis ključa" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Kako drugi vidijo podpis:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "S podpisom potrdite, da ta ključ pripada:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Podpiši ključ kot:" +msgid "Key Name" +msgstr "Ime ključa" #: ../pgp/seahorse-sign.xml.h:4 -msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. " -msgstr "Ravnodušno: je način, ki predstavlja ravnodušen način overitve ključa in njegovega lastnika. Primer, prstni odtis ste preverili preko telefona, zato ne morete biti prepričani, kdo je na drugi strani. " +msgid "How carefully have you checked this key?" +msgstr "Kako podrobno je ključ preverjen?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Ime ključa" +msgid "_Not at all" +msgstr "Sploh _ne" #: ../pgp/seahorse-sign.xml.h:6 -msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." -msgstr "Sploh ne: pomeni, da sploh niste preverili, kdo je lastnik ključa ali pa tega niste uspeli storiti." +msgid "_Casually" +msgstr "_Ravnodušno" #: ../pgp/seahorse-sign.xml.h:7 -msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." -msgstr "Zelo previdno: izberite izključno, če ste popolnoma prepričani, da je ključ pristen." +msgid "_Very Carefully" +msgstr "_Zelo previdno" #: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "S podpisom potrdite, da ta ključ pripada:" +msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." +msgstr "Sploh ne: pomeni, da sploh niste preverili, kdo je lastnik ključa ali pa tega niste uspeli storiti." #: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Podpis je lahko _preklican kasneje." +msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone." +msgstr "Ravnodušno: je način, ki predstavlja ravnodušen način overitve ključa in njegovega lastnika. Primer, lahko bi preverili prstni odtis lastnika preko telefona, zato ne morete biti prepričani, kdo je na drugi strani. " #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Podpis ključa" +msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." +msgstr "Zelo previdno: izberite izključno, če ste popolnoma prepričani, da je ključ pristen." #: ../pgp/seahorse-sign.xml.h:11 msgid "You could use a hard to forge photo identification (such as a passport) to personally check that the name on the key is correct. You should have also used email to check that the email address belongs to the owner." msgstr "Lahko uporabite overitev, ki jo je težko ponarediti (kot potni list) za osebno preverjanje imena in lastnika ključa. Preveriti bi morali tudi elektronski naslov lastnika in njegovo istovetnost." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Ravnodušno" +msgid "How others will see this signature:" +msgstr "Kako drugi vidijo podpis:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "Sploh _ne" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Drugi ne smejo videti podpisa" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Podpis je lahko _preklican kasneje." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Podpiši" +msgid "Sign key as:" +msgstr "Podpiši ključ kot:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Podpisnik:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Zelo previdno" +msgid "_Sign" +msgstr "_Podpiši" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Podpis sporočila s ključem:" +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Izvažanje podatkov" + +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Pridobivanje podatkov" + +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Uvažanje podatkov" + +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Pošiljanje podatkov" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Nedostopno" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Osebno potrdilo in ključ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Osebno potrdilo" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Potrdilo" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Potrdila (kodirana z DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Potrdila" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Potrdila X.509 in pripadajoči ključi" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Ali zares želite trajno izbrisati %d potrdil?" +msgstr[1] "Ali zares želite trajno izbrisati %d potrdilo?" +msgstr[2] "Ali zares želite trajno izbrisati %d potrdili?" +msgstr[3] "Ali zares želite trajno izbrisati %d potrdila?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "N mogoče ustvariti zasebnega ključa" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Ustvari" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Osebni ključ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Uporablja se za potrjevanje potrdil" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Ustvari nov osebni ključ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Naziv:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Shranjeno na:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Razumem, da bo ta ključ trajno izbrisan." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Neimenovano" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Izvoz potrdila je spodletel" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 +#: ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Ni mogoče izbrisati" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Ali ste prepričani, da želite izbrisati potrdilo '%s'?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Ali ste prepričani, da želite izbrisati %d potrdil?" -msgstr[1] "Ali ste prepričani, da želite izbrisati %d potrdilo?" -msgstr[2] "Ali ste prepričani, da želite izbrisati %d potrdiil?" -msgstr[3] "Ali ste prepričani, da želite izbrisati %d potrdila?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Brisanje" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Izvozi" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Izvozi potrdilo" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Izbriši to potrdilo ali ključ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Za_htevaj potrdilo" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Ustvari zahtevo po potrdilu za ta ključ" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Ni mogoče shraniti zahteve potrdila" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Shrani zahtevo potrdila" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Zahteva potrdila" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "S protokolom PEM kodirana zahteva" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Ni mogoče ustvari zahteve potrdila" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Ustvari datoteko zahteve potrdila." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Splošno ime (CN) za zahtevo potrdila." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Splošno ime (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Neimenovan osebni ključ" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Spremeni šifrirno geslo" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Potrdi šifrirno geslo:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Novo šifrirno _geslo:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Potrdi novo šifrirno geslo" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Novo šifrirno _geslo:" +msgid "Con_firm Passphrase:" +msgstr "_Potrdi šifrirno geslo:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Upravljanje z gesli in šifrirnimi ključi" -#: ../src/seahorse.desktop.in.in.h:2 -#: ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 -#: ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Gesla in ključi" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Nadaljuj" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Izbor vrste predmeta:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Nadaljuj" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Ustvari novo ..." - -#: ../src/seahorse-key-manager.c:251 -#: ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Izbranih %d ključev" -msgstr[1] "Izbran %d ključ" -msgstr[2] "Izbrana %d ključa" -msgstr[3] "Izbrani %d ključi" - -#: ../src/seahorse-key-manager.c:431 -#: ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 -#: ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Ni mogoče uvoziti ključev" - -#: ../src/seahorse-key-manager.c:433 -#: ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Uvoženi ključi" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Uvažanje ključev" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Uvoz je spodletel" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Uvozi" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Podatki za uvoz:" -#: ../src/seahorse-key-manager.c:504 -#: ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:262 +#: ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Uvozi ključ" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Neznana vrsta ključa ali neveljavna oblika podatkov" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Uvažanje ključev" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Vse datoteke ključev" -#: ../src/seahorse-key-manager.c:737 -#: ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Oddaljeno" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Izpisano besedilo" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Besedila odložišča" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Novo" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Izhod iz programa" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:512 +#: ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_Novo ..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Ustvari nov ključ ali predmet" -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Uvozi ..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Uvozi iz datoteke" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Uvozi iz odložišča" - -#: ../src/seahorse-key-manager.c:750 -#: ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Poišči oddaljene ključe ..." - -#: ../src/seahorse-key-manager.c:751 -#: ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Poišči ključe na strežniku ključev" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Uskladi in objavi ključe ..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Objavljanje in usklajevanje ključev s ključi v omrežju." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Vrste" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Pokaži stolpec vrste ključa" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Datum preteka ključa" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Pokaži stolpec preteka ključa" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Zaupanje" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Pokaži stolpec zaupanja lastniku" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Veljavnost" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Pokaži stolpec veljavnosti" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filter:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Možnosti ob prvem zagonu:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Ustvari nov lastni ključ :" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Uvozi obstoječe ključe iz datoteke:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Osebni ključi" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_Drugi ključi" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Za šifriranje je treba imeti ustrezne šifrirne ključe." - -#: ../src/seahorse-key-manager.xml.h:7 -#: ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Uvozi" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Gesla" - -#: ../src/seahorse-key-manager-store.c:610 -#: ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Ni mogoče izvoziti ključev" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Veljavnost" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Datum preteka" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Zapri to okno" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Razširi vse" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Razširi izpise" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Zloži vse" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Zloži izpise" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Oddaljeni ključi" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Oddaljeni ključi ki vsebujejo '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Strežniki ključev:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Dostopni ključi:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Poišči oddaljene ključe" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." -msgstr "Program poišče ključe drugih oseb na spletu. Ključe lahko po tem uvozite v lastno zbirko ključev." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Kje iskati:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "I_skanje" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Iskanje ključa, ki vsebuje: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Ni mogoče objaviti ključev na strežniku" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Ni mogoče pridobiti ključa s strežnika: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d ključev je izbranih za usklajevanje" -msgstr[1] "%d ključ je izbran za usklajevanje" -msgstr[2] "%d ključa sta izbrana za usklajevanje" -msgstr[3] "%d ključi so izbrani za usklajevanje" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Usklajevanje ključev ..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Uskladi ključe" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." -msgstr "Možnost objavi ključe v zbirki ključev in omogoči drugim njihovo uporabo. Sprejeli boste tudi spremembe, ki so jih drugi naredili po tem, ko ste prejeli njihove ključe." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." -msgstr "Možnost posodobi spremembe, ki so jih drugi uporabniki naredili za svoje ključe. Ni izbranega strežnika za objavljanje, zato vaši ključi ne bodo na voljo drugim." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Strežniki ključev" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Usklajevanje" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Različica programa" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Podpora:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "Matej Urbančič " - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Spletna stran projekta Seahorse" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Datoteka" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Uredi" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Pogled" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Pomo_č" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_Lastnosti" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Spremeni možnosti programa" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "O programu" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Vsebina" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Pokaži pomoč programa" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Dodaj nov ključ ali predmet" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Izvozi javni ključ" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Uvozi ..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Izvažanje ključev" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Uvozi iz datoteke" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Ni mogoče prebrati podatkov s strežnika" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Uvozi iz odložišča" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Kopirani ključi" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Po _zbirki ključev" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Pokaži stransko okno s ključi" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Pokaži _osebne" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Pokaži le osebne ključe, potrdila in gesla" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Pokaži _zaupljive" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Pokaži le zaupanja vredne ključe, potrdila in gesla" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Pokaži _kateregakoli" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Pokaži vse ključe, potrdila in gesla" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Pridobivanje ključev" +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filter" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s je osebni ključ. Ali zares želite ključ izbrisati?" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Možnosti ob prvem zagonu:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Uvoz ključev s strežnikov" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Ustvari nov lastni ključ :" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Pokaži lastnosti" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Uvozi obstoječe ključe iz datoteke:" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Izbriši" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Za šifriranje je treba imeti ustrezne šifrirne ključe." -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Izbriši izbrane predmete" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Ni mogoče zakleniti zbirke." + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Ni mogoče odkleniti zbirke." -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_Izvozi ..." +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Zakleni" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Izvozi v datoteko" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Odkleni" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopiraj v odložišče" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Lastnosti" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Uvozi izbrane ključe v osebno zbirko ključev" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Nastavitev ključa za novo _varno lupino ..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "Send public Secure Shell key to another machine, and enable logins using that key." +msgstr "Pošljite javne ključe varne lupine na drugi računalnik in omogočite prijavo z uporabo ključev." #: ../ssh/seahorse-ssh-askpass.c:60 #: ../ssh/seahorse-ssh-askpass.c:68 @@ -2209,163 +2303,199 @@ msgid "Enter the new passphrase again: %s" msgstr "Ponovno vnesite novo šifrirno geslo: '%s'" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Nastavitev ključa za novo _varno lupino ..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "Send public Secure Shell key to another machine, and enable logins using that key." -msgstr "Pošljite javne ključe varne lupine na drugi računalnik in omogočite prijavo z uporabo ključev." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Varna lupina" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Ključi uporabljeni za varno povezovanje z drugimi računalniki." -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 +#: ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Ali zares želite trajno izbrisati ključ seje varne lupine '%s'?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Ali zares želite trajno izbrisati %d ključev seje varne lupine?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Ključa ni mogoče izbrisati" - -#: ../ssh/seahorse-ssh-generate.c:60 -#: ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 -#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Ali zares želite trajno izbrisati %d ključev seje varne lupine?" +msgstr[1] "Ali zares želite trajno izbrisati %d ključ seje varne lupine?" +msgstr[2] "Ali zares želite trajno izbrisati %d ključa seje varne lupine?" +msgstr[3] "Ali zares želite trajno izbrisati %d ključe seje varne lupine?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ključ SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Skrivni ključi SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Javni ključi SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Za ta ključ ni na voljo nobenega javnega ključa." + +#: ../ssh/seahorse-ssh-generate.c:55 +#: ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 +#: ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Ključ varne lupine" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Uporabno pri dostopu do drugih računalnikov (npr.: preko terminala)" -#: ../ssh/seahorse-ssh-generate.c:115 -#: ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 +#: ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Ni mogoče ustvariti ključa varne lupine" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Ustvarjanje ključa varne lupine" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "Use your email address, and any other reminder you need about what this key is for." -msgstr "Uporabite svoj elektronski naslov in druge opomnike za izbrani ključ in njegov namen." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "A Secure Shell (SSH) key lets you connect securely to trusted computers using SSH, without entering a different password for each of them." -msgstr "Uporaba varne lupine (SSH) omogoča varno povezovanje z drugimi računalniki preko SSH sistema, brez vnašanja različnih gesel za posamezen sistem." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "If there is already a computer you want to use this key with, you can set up that computer to recognize your key now. " -msgstr "V kolikor računalnik, s katerim želite uporabiti ta ključ, že obstaja, je mogoče nastaviti računalnik, da ključ prepozna ." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Nov ključ varne lupine" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Ustvari ključ" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Ustvarjanje in nastavitve" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Ustvari ključ" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "Ključ za varno lupino (SSH) omogoča varno povezovanje z drugimi računalniki." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Elektronski naslov ali pa opomnik namena izbranega ključa." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "Opis _ključa:" +msgid "DSA" +msgstr "DSA" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "If there is a computer you want to use this key with, you can set up that computer to recognize your new key." +msgstr "V kolikor računalnik, s katerim naj se uporabi ta ključ, že obstaja, je mogoče nastaviti računalnik, da ključ prepozna." + +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(Neprepoznaven ključ varne lupine)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Osebni ključ SSH" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Kljulč SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Ni mogoče preimenovati ključa." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Ni mogoče spremeniti pooblastila ključa." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Ni mogoče spremeniti gesla za ključ." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritem:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Določilo:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Mesto:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Ime:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Moč:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Uporaba pri povezovanju z drugimi računalniki." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Zaupanje" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Lastnik tega ključa je _pooblaščen za povezavo s tem računalnikom" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "To je v povezavi le z računom '%s'." +msgid "This only applies to the %s account." +msgstr "To je v povezavi le z računom %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "I_zvozi celotni ključ" +msgid "Algorithm:" +msgstr "Algoritem:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Lastnik tega ključa je _pooblaščen za povezavo s tem računalnikom" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Moč:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Mesto:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Uporaba pri povezovanju z drugimi računalniki." +msgid "E_xport Complete Key" +msgstr "I_zvozi celotni ključ" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Ukaz ssh je bil nepričakovano zaključen." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Ukaz ssh je spodletel." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Geslo oddaljenega gostitelja" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Vnesite šifrirno geslo ključa" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Šifrirno geslo za ključ nove varne lupine" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Uvažanje ključa: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Uvažanje ključa. Vnesite šifrirno geslo" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Ključi OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Za ta ključ ni na voljo osebnega ključa." @@ -2378,17 +2508,17 @@ msgstr "Prilagajanje ključev varne lupine ..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "primer: strežnik.primer.si:vrata" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" -msgstr "Priprava računalnika na SSH povezavo" +msgstr "Priprava računalnika na povezavo SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." msgstr "Za uporabo ključa varne lupine pri povezavi z drugim računalnikom, ki uporablja SSH, je treba imeti že ustvarjen račun za prijavo na oddaljenem računalniku." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "primer: strežnik.primer.si:vrata" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Ime _računalnika:" @@ -2401,494 +2531,32 @@ msgid "_Set Up" msgstr "_Nastavitev" -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Secure Shell key" -#~ msgstr "Ključ varne lupine" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "Vnesite šifrirno geslo za nov ključ varne lupine." - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "Ne zaganjaj seahorse ozadnjega programa" - -#~ msgid "couldn't fork process" -#~ msgstr "ni mogoče razvejiti opravila" - -#~ msgid "couldn't create new process group" -#~ msgstr "ni mogoče ustvariti nove opravilne skupine" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "Šifrirni ozadnji program (Seahorse)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "Neveljavna ali neprepoznavna vrsta ključa: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "Vrsta ključa ni podprta: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "Podpora tej zmožnosti ni bila omogočena med izgradnjo" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "Neveljaven ali neprepoznaven ključ: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "Podpis: pretek na %s." - -#~ msgid "Invalid Signature" -#~ msgstr "Neveljaven podpis" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "Podpis: na %s Pretečeno." - -#~ msgid "Expired Signature" -#~ msgstr "Pretečen podpis" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "Podpis: Preklicano na %s." - -#~ msgid "Revoked Signature" -#~ msgstr "Preklican podpis" - -#~ msgid "Signed by on %s." -#~ msgstr "Podpis: na %s." - -#~ msgid "Good Signature" -#~ msgstr "Dober podpis" - -#~ msgid "Signing key not in keyring." -#~ msgstr "Podpisovanje ključa, ki ni v zbirki." - -#~ msgid "Unknown Signature" -#~ msgstr "Neznan podpis" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "" -#~ "Neveljaven ali ponarejen podpis. Podatki podpisa so bili spremenjeni." - -#~ msgid "Bad Signature" -#~ msgstr "Slab podpis" - -#~ msgid "Couldn't verify signature." -#~ msgstr "Ni mogoče overiti podpisa." - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "Neveljaven ali neprepoznaven podpisnik: %s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "Ključ ni veljaven za podpisovanje: %s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "Neveljaven ali neprepoznaven prejemnik: %s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "Ključ ni veljavni prejemnik za šifriranje: %s" - -#~ msgid "No recipients specified" -#~ msgstr "Ni določenih prejemnikov" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "Neveljavna vrsta ključa za odšifriranje: %s" - -#~ msgid "Please set clearuri" -#~ msgstr "Določite naslov čiščenja" - -#~ msgid "Please set crypturi" -#~ msgstr "Določite naslov šifriranja" - -#~ msgid "Error opening clearuri" -#~ msgstr "Napaka med odpiranjem clearuri" - -#~ msgid "No signer specified" -#~ msgstr "Ni določenega podpisnika" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "Neveljavna vrsta ključa za overitev: %s" - -#~ msgid "Invalid key id: %s" -#~ msgstr "Neveljaven ID ključa: %s" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "Lista naslovov strežnikov ključev za oddaljene PGP ključe. V novejših " -#~ "različicah je mogoče določiti tudi ime z dodajanjem presledka in imena za " -#~ "naslovom." - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "Samodejno prenašanje ključev" - -#~ msgid "Auto Sync Keys" -#~ msgstr "Samodejno usklajevanje ključev" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "Upravlja z vidnostjo stolpca preteka v urejevalniku ključev." - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "Upravlja z vidnostjo stolpca zaupanja v urejevalniku ključev." - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "Upravlja z vidnostjo stolpca vrste v urejevalniku ključev." - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "Upravlja z vidnostjo stolpca veljavnosti v urejevalniku ključev." - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "Omogoči DNS-SD souporabo" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "Omogoči DNS-SD (Apple Bonjour) souporabo ključev. Zagnan mora biti " -#~ "seahorse ozadnji program, ki podpira HKP in DNS-SD." - -#~ msgid "ID of the default key" -#~ msgstr "ID privzetega ključa" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "" -#~ "Izbrana možnost omogoči, da bo šifriranje vedno kodirano kot ASCII Armor." - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "" -#~ "Izbrana možnost omogoči, da je privzeti ključ vedno dodan na listo " -#~ "prejemnikov šifriranja." - -#~ msgid "Last key server search pattern" -#~ msgstr "Zadnji iskalni niz strežnika ključev" - -#~ msgid "Last key servers used" -#~ msgstr "Zadnji uporabljeni strežnik ključev" - -#~ msgid "Last key used to sign a message." -#~ msgstr "Zadnji ključ uporabljen za podpisovanje sporočila." - -#~ msgid "PGP Key servers" -#~ msgstr "PGP strežniki ključev" - -#~ msgid "Publish keys to this key server." -#~ msgstr "Objavi ključe na tem strežniku." - -#~ msgid "Show expires column in key manager" -#~ msgstr "Pokaži stolpec preteka v urejevalniku ključev" - -#~ msgid "Show trust column in key manager" -#~ msgstr "Pokaži stolpec zaupanja v urejevalniku ključev" - -#~ msgid "Show type column in key manager" -#~ msgstr "Pokaži stolpec vrste v urejevalniku ključev" - -#~ msgid "Show validity column in key manager" -#~ msgstr "Pokaži stolpec veljavnosti v urejevalniku ključev" - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "Določite stolpec po katerem naj bodo razvrščeni prejemniki. Imeni " -#~ "stolpcev sta: 'ime' in 'ID'. Vnesite '-' pred ime stolpca za padajoče " -#~ "razvrščanje." - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "Določite stolpec po katerem naj bodo razvrščeni ključi v upravljalniku. " -#~ "Imena stolpcev so: 'ime' in 'ID', 'veljavnost', 'pretek', 'zaupanje' in " -#~ "'vrsta'. Vnesite '-' pred ime stolpca za padajoče razvrščanje." - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "" -#~ "ID zadnjega uporabljenega skrivnega ključa za podpisovanje sporočila." - -#~ msgid "The column to sort the recipients by" -#~ msgstr "Stolpec za razvrščanje prejemnikov" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "Stolpec za razvrščanje seahorse ključev" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "" -#~ "Strežnik ključev za objavo PGP ključev. Spraznjena lista onemogoči " -#~ "objavljanje PGP ključev." - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "" -#~ "Zadnje iskanje preko strežnikov ključev je bilo izvedeno na prazni listi " -#~ "strežnikov." - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "Zadnji vzorec iskanja izveden na strežniku ključev." - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "" -#~ "Možnost določa izbiro privzetega ključa za določene naloge, pretežno " -#~ "podpisovanje." - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "" -#~ "Ali naj se spremenjeni ključi samodejno uskladijo s privzetim strežnikom " -#~ "ključev." - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "" -#~ "Ali naj se spremenjeni ključi samodejno uskladijo s privzetim strežnikom " -#~ "ključev." - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "Nastavitev, ali naj šifriranje poteka vedno po privzetem ključu." - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "Naj bo uporabljen ASCII Armor" - -#~ msgid "Web Password" -#~ msgstr "Spletno geslo" - -#~ msgid "Network Password" -#~ msgstr "Omrežno geslo" - -#~ msgid "Couldn't set application access." -#~ msgstr "Ni mogoče določiti dostopa programa." - -#~ msgid "Path:" -#~ msgstr "Pot:" - -#~ msgid "Permissions:" -#~ msgstr "Dovoljenja:" - -#~ msgid "Applications" -#~ msgstr "Programi" - -#~ msgid "_Read" -#~ msgstr "_Preberi" - -#~ msgid "_Write" -#~ msgstr "_Zapiši" -#~ msgctxt "infinitive" - -#~ msgid "_Delete" -#~ msgstr "_Izbriši" - -#~ msgid "Saving item..." -#~ msgstr "Shranjevanje predmeta ..." - -#~ msgid "Listing password keyrings" -#~ msgstr "Seznam zbirk ključev" - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "Ni najdenih šifrirnih ključev, ki bi izvedli zahtevano nalogo. Program " -#~ "Gesla in šifrirni ključi bo zagnan zato, da boste lahko ustvarili " -#~ "ali naložili ustrezen ključ." - -#~ msgid "All Keys" -#~ msgstr "Vsi ključi" - -#~ msgid "Selected Recipients" -#~ msgstr "Izbor prejemnikov" - -#~ msgid "Search Results" -#~ msgstr "Rezultati iskanja" - -#~ msgid "Search _for:" -#~ msgstr "_Poišči:" - -#~ msgid "None (Don't Sign)" -#~ msgstr "Brez (ne podpiši)" - -#~ msgid "Sign this message as %s" -#~ msgstr "Podpiši sporočilo kot %s" - -#~ msgid "_Sign message as:" -#~ msgstr "_Podpiši sporočilo kot:" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Datoteka ni veljavna .desktop datoteka" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Neznana različica datoteke namizja '%s'" - -#~ msgid "Starting %s" -#~ msgstr "Zaganjanje %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Program ne sprejme dokumentov preko ukazne vrstice" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Nepoznana možnost zagona: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Ni mogoče poslati naslova URI dokumenta na vnos 'Vrsta=Povezava' predmeta " -#~ "namizja" - -#~ msgid "Not a launchable item" -#~ msgstr "Predmet ni izvedljiv" - -#~ msgid "Disable connection to session manager" -#~ msgstr "Onemogoči povezavo z upravljalnikom seje" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Določitev datoteke s shranjenimi nastavitvami" - -#~ msgid "FILE" -#~ msgstr "DATOTEKA" - -#~ msgid "Specify session management ID" -#~ msgstr "Določi ID upravljanja seje" - -#~ msgid "Session management options:" -#~ msgstr "Možnosti upravljanja seje:" - -#~ msgid "Show session management options" -#~ msgstr "Pokaži možnosti upravljanja seje" - -#~ msgid "Key Imported" - -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "uvoženih ključev" -#~ msgstr[1] "uvožen ključ" -#~ msgstr[2] "uvožena ključa" -#~ msgstr[3] "uvoženi ključi" - -#~ msgid "Imported %i key" - -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "Uvoženih %i ključev" -#~ msgstr[1] "Uvožen %i ključ" -#~ msgstr[2] "Uvožena %i ključa" -#~ msgstr[3] "Uvoženi %i ključi" - -#~ msgid "Imported a key for" - -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "Uvoženih ključev za" -#~ msgstr[1] "Uvožen ključ za" -#~ msgstr[2] "Uvožena ključa za" -#~ msgstr[3] "Uvoženi ključi za" - -#~ msgid "Notification Messages" -#~ msgstr "Opozorilna sporočila" - -#~ msgid "Symmetric Key" -#~ msgstr "Simetrični ključ" - -#~ msgid "Public Key" -#~ msgstr "Javni ključ" - -#~ msgid "Private Key" -#~ msgstr "Osebni ključ" - -#~ msgid "Credentials" -#~ msgstr "Omrežna poverila" - -#~ msgid "Identity" -#~ msgstr "Istovetnost" - -#~ msgid "Progress Title" -#~ msgstr "Naslov napredovanja" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "Ni mogoče zagnati programa file-roller" - -#~ msgid "Couldn't package files" -#~ msgstr "Ni mogoče pakirati datotek" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "Naloge programa file-roller niso bile uspešno končane" - -#~ msgid "Loading Keys..." -#~ msgstr "Nalaganje ključev ..." - -#~ msgid "Searching for keys..." -#~ msgstr "Iskanje ključev ..." - -#~ msgid "Uploading keys..." -#~ msgstr "Pošiljanje ključev ..." - -#~ msgid "Retrieving keys..." -#~ msgstr "Pridobivanje ključev ..." - -#~ msgid "Searching for keys on: %s" -#~ msgstr "Iskanje ključev na: %s" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "Iskanje ključev, ki vsebujejo '%s' ..." - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "Iskanje ID ključa '%s' ..." - -#~ msgid "Retrieving remote keys..." -#~ msgstr "Prenašanje oddaljenih ključev ..." - -#~ msgid "Sending keys to key server..." -#~ msgstr "Pošiljanje ključev na strežnik ..." - -#~ msgid "Synchronizing keys" -#~ msgstr "Usklajevanje ključev" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Upravljalnik s šifrirnimi ključi" - -#~ msgid "Invalid" -#~ msgstr "Neveljavno" +#~ msgid "Login keyring" +#~ msgstr "Prijavna zbirka ključev" -#~ msgid "Private Secure Shell Key" -#~ msgstr "Osebni ključ varne lupine" +#~ msgid "Access to the key ring was denied" +#~ msgstr "Dostop do zbirke ključev je zavrnjen" -#~ msgid "Public Secure Shell Key" -#~ msgstr "Javni ključ varne lupine" +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "GNOME ozadnji program zbirke ključev ni zagnan" -#~ msgid "Passphrase:" -#~ msgstr "Šifrirno geslo:" +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Zbirka ključev je že odklenjena" -#~ msgid "Couldn't share keys" -#~ msgstr "Ni mogoča souporaba ključev" +#~ msgid "No such key ring exists" +#~ msgstr "Taka zbirka ključev ne obstaja" -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "Ni mogoče objaviti zaznanih podrobnosti na omrežju." +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Ni mogoča povezava z ozadnjim programom zbirke ključev" -#~ msgid "%s's encryption keys" -#~ msgstr "Uporabnik %s: šifrirni ključi" +#~ msgid "The item already exists" +#~ msgstr "Predmet že obstaja" -#~ msgid "Key Sharing" -#~ msgstr "Souporaba ključev" +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Napaka med dostopu do GNOME zbirke ključev" -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "Souporaba ključev omogoča drugim uporabnikom v omrežju uporabljanje " -#~ "ključev, ki ste jih zbrali. To pomeni, da lahko šifrirajo sporočila za " -#~ "tiste, ki jih poznate vi, s tem, da jim ključa ni treba poslati.\n" -#~ "\n" -#~ "Opomba: vaši osebni ključi ostanejo varni." +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "Ali zares želite trajno izbrisati %d ključev seje varne lupine?" -#~ msgid "_Share my keys with others on my network" -#~ msgstr "_Souporaba ključev z drugimi v omrežju" +#~ msgid "Algorithms here" +#~ msgstr "Algoritmi" diff -Nru seahorse-3.2.2/po/sr@latin.po seahorse-3.6.3/po/sr@latin.po --- seahorse-3.2.2/po/sr@latin.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/sr@latin.po 2012-08-21 12:23:19.000000000 +0200 @@ -1,26 +1,25 @@ # Serbian translation of seahorse -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003 - 2009. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003 — 2012. # This file is distributed under the same license as the seahorse package. # Maintainer: Dušan Živojnov # Translated on 2009-05-09 by: Branko Kokanović # Miloš Popović , 2010. -# Miroslav Nikolić , 2011. +# Miroslav Nikolić , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: seahorse\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-18 06:28+0000\n" -"PO-Revision-Date: 2011-09-18 09:52+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahor" +"se&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-07-22 08:33+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%" "10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Virtaal 0.7.0-beta5\n" "X-Project-Style: gnome\n" #: ../gkr/seahorse-add-keyring.xml.h:1 @@ -28,57 +27,163 @@ msgstr "Dodajte privezak za lozinku" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Naziv novog priveska:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "" "Izaberite naziv novog priveska. Biće vam zatražena lozinka za otključavanje." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Naziv novog priveska:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Naziv udaljenog računara ili adresa servera." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Ne mogu da dodam privezak" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Novi privezak za lozinke" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Koristi se za čuvanje lozinki programa i mreže" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nova lozinka..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Sigurno čuva lozinke ili tajne." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Privezak za lozinke" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Sačuvane lozinke" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Ne mogu da postavim osnovni privezak ključeva" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Ne mogu da promenim lozinku priveska ključeva" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Postavi kao osnovno" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Programi uglavnom skladište nove lozinke u osnovnom privesku." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Izmeni _lozinku" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Izmenite lozinku priveska ključeva skladišta lozinki" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Ne mogu da dodam stavku" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Dodajte lozinku" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Opis:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Privezak:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Lozinka:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Prikaži lo_zinku" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Ne mogu da obrišem stavku" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Privezak:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Ne mogu da dodam privezak" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Lozinke" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Sačuvane lične lozinke, uverenja i tajne" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Lozinka TP naloga za " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Lozinka ili tajna" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Lozinka za mrežu" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Sačuvana beleška" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Lozinka priveska" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Lozinka ključa šifrovanja" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Lozinka ključa skladištenja" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Lozinka Gugl Hromijuma" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Lozinka Gnomovih naloga na mreži" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Lozinka Internet pismonoše" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Lozinka trenutnih poruka" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Tajne upravnika mreže" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Da li sigurno želite da izbrišete lozinku „%s“?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -87,261 +192,135 @@ msgstr[2] "Da li sigurno želite da izbrišete %d lozinki?" msgstr[3] "Da li sigurno želite da izbrišete lozinku?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Brišem stavku" -msgstr[1] "Brišem stavke" -msgstr[2] "Brišem stavke" -msgstr[3] "Brišem stavku" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Pristupite sadržaju deljenom na mreži ili resursima" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Pristupite veb stranici" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Otključajte PGP ključ" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Otključajte ključ bezbedne školjke" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Sačuvana lozinka ili prijava" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Punomoćstva mreže" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Lozinka" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Ne mogu da promenim lozinku." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Ažuriram lozinku" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Ne mogu da postavim opis." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Lozinka:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Tehnički detalji:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detalji" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Osobine ključa" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Ključ" +msgid "Use:" +msgstr "Upotreba:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Osobine ključa" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Vrsta:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Prijava:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Prijava:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Prikaži _lozinku" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Vrsta:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Upotreba:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Lozinke: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Lozinke: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Privezak za lozinke" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Koristi se za čuvanje lozinki programa i mreže" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Sačuvane lozinke" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Sigurno čuva lozinke ili tajne." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Ne mogu da otključam privezak ključeva" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Ne mogu da zaključam privezak ključeva" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Ne mogu da postavim osnovni privezak ključeva" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Ne mogu da promenim lozinku priveska ključeva" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Zaključaj" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Zaključajte privezak ključeva skladišta lozinki tako da će biti potrebna " -"glavna lozinka da bi mu pristupili." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Otključaj" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Otključajte privezak ključeva skladišta lozinki glavnom lozinkom tako da se " -"može koristiti." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Postavi kao osnovno" +msgid "Password:" +msgstr "Lozinka:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Programi uglavnom skladište nove lozinke u osnovnom privesku." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Ključ" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Izmeni _lozinku" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Tehnički detalji:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Izmenite lozinku priveska ključeva skladišta lozinki" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Detalji" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Ne mogu da obrišem privezak ključeva" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Privezak koji biva samostalno otključan prilikom prijavljivanja" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Privezak koji se koristi za čuvanje lozinki" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Da li sigurno želite da obrišete „%s“ privezak?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Brišem privezak" -msgstr[1] "Brišem priveske" -msgstr[2] "Brišem priveske" -msgstr[3] "Brišem privezak" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "Created:" -msgstr "Napravljeno:" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "Privezak ključeva" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Shvatam da će sve stavke biti trajno obrisane." -#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../gkr/seahorse-gkr-keyring.xml.h:1 msgid "Keyring Properties" msgstr "Osobine priveska" -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Naziv:" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Naziv:" -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Radnja je otkazana" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "Napravljen:" -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Pristup privesku je odbijen" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Uslužni program Priveska ključeva nije pokrenut" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Privezak je već otključan" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Ne postoji takav privezak" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Ne mogu da se povežem sa uslužnim programom priveska" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Stavka već postoji" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Unutrašnja greška pri pristupanju Gnomovom privesku" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "Privezak ključeva" #: ../libegg/egg-datetime.c:317 msgid "Display flags" @@ -349,7 +328,7 @@ #: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" -msgstr "Prikazane osobine datuma i/ili vremena" +msgstr "Svojstva prikazanog datuma i/ili vremena" #: ../libegg/egg-datetime.c:323 msgid "Lazy mode" @@ -445,7 +424,7 @@ #: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" -msgstr "Deo dana u mesecu donje granice datuma" +msgstr "Dan dela meseca donje granice datuma" #: ../libegg/egg-datetime.c:395 msgid "Upper limit day" @@ -453,7 +432,7 @@ #: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" -msgstr "Deo dana u mesecu gornje granice datuma" +msgstr "Dan dela meseca gornje granice datuma" #: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" @@ -554,12 +533,12 @@ #: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 #: ../libegg/egg-datetime.c:1264 msgid "AM" -msgstr "prepodne" +msgstr "PrP" #: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 #: ../libegg/egg-datetime.c:1268 msgid "PM" -msgstr "popodne" +msgstr "PoP" #. Translators: This is hh:mm:ss AM/PM. #: ../libegg/egg-datetime.c:807 @@ -599,268 +578,330 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "početna privremena stavka" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Dodaj server ključeva" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Domaćin:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Vrsta servera ključeva:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Domaćin:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Port preko koga se može pristupiti serveru." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "početna privremena stavka" +msgid "The port to access the server on." +msgstr "Port preko koga se može pristupiti serveru." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Lozinka" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Izdanje ovog programa" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Lozinka:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "— Podešavanja sistema" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Potvrdi:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Doprinosi:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Neispravna adresa servera ključeva." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Lozinke i ključevi" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Za pomoć se obratite vašem administratoru sistema ili administratoru servera " -"ključeva." +"Danilo Šegan \n" +"Goran Rakić \n" +"Dušan Živojnov \n" +"Branko Kokanović \n" +"\n" +"Prevod.org — prevod na srpski jezik." -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "Adresa" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Stranica projekta Morskog konjića" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Proizvoljno" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Ne mogu da obrišem" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Ništa: nemoj objavljivati ključeve" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Ne mogu da izvezem ključeve" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Automatski preuzmi ključeve sa servera _ključeva" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Ne mogu da izvezem podatke" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Automatski usaglasi _izmenjene ključeve sa serverima ključeva" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Datoteka" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Serveri ključeva" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Izvezi..." -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Podešavanja" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Izvezite u datoteku" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Pronađi ključ preko:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Uređivanje" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Objavi ključeve na:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Umnožite u ostavu" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Preuzimam podatke" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Obriši" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Izvozim podatke" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Obrišite izabrane stavke" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Uvozim podatke" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Prikažite osobine ove stavke" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Prikažite osobine ovog priveska" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Šaljem podatke" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Pos_tavke" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Nedostupno" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Izmenite podešavanja programa" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d.%m.%Y." +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "Pre_gled" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Podaci ključa" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Po_moć" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Višestruki ključevi" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "O ovom programu" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Sve datoteke ključeva" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Sadržaj" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Sve datoteke" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Prikaži pomoć Morskog konjića" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Izvezi" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Unesite PIN ili lozinku za: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Lozinka:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arhive" +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Potvrdi:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Neispravna adresa servera ključeva." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"Datoteka već postoji.\n" -"\n" -"Želite li da je zamenite novom?" +"Za pomoć se obratite vašem administratoru sistema ili administratoru servera " +"ključeva." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "Adresa" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Proizvoljno" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Ništa: nemoj objavljivati ključeve" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Postavke" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Pronađi ključ preko:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Objavi ključeve na:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Automatski preuzmi ključeve sa servera _ključeva" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Automatski usaglasi _izmenjene ključeve sa serverima ključeva" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Serveri ključeva" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Zameni" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d.%m.%Y." #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Nepoznato" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Nikada" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Površno" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Potpuno" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Najveće" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" -msgstr "Onemogućeno" +msgstr "Isključen" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Povučen" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Ne mogu da prikažem pomoć: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Datum isteka:" +msgid "Never E_xpires" +msgstr "Nikada ne _ističe" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Napravite novi podključ" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Ako ključ nikad ne ističe" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Vrsta ključa:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Dužina ključa:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Vrsta ključa:" +msgid "Expiration Date:" +msgstr "Datum isteka:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Dužina ključa" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Nikada ne _ističe" +msgid "Generate a new subkey" +msgstr "Napravite novi podključ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Dodaj IB korisnika" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Napravi novi IB korisnika" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Ime i _prezime:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Ko_mentar ključa:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Mora biti dužine bar 5 znakova" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Neobavezna adresa el. pošte" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Neobavezna primedba za opis ključa" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Neobavezna adresa e-pošte" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Ime i _prezime:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" -msgstr "Adresa _e-pošte:" +msgstr "Adresa _el. pošte:" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Ko_mentar ključa:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Napravi novi IB korisnika" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Izmeni" +msgid "_Never expires" +msgstr "_Nikad ne ističe" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Povuci ključ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Nikad ne ističe" +msgid "C_hange" +msgstr "_Izmeni" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -871,7 +912,7 @@ msgid "Add subkey to %s" msgstr "Dodaj podključ za %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (samo potpis)" @@ -879,7 +920,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (samo šifrovanje)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (samo potpis)" @@ -900,6 +941,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Dešifrovanje nije uspelo. Verovatno nemate ključ za dešifrovanje." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Radnja je otkazana" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Neispravan datum isteka" @@ -917,46 +963,151 @@ msgid "Expiry: %s" msgstr "Ističe: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Višestruki ključevi" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Podaci ključa" + +# bug: plural-forms +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Oklopljeni PGP ključevi" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP ključevi" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP ključ" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" -msgstr "Koristi se za šifrovanje e-pošte i datoteka" +msgstr "Koristi se za šifrovanje el. pošte i datoteka" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Ne mogu da generišem PGP ključ" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Lozinka za novi PGP ključ" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Dvaput unesite lozinku za novi ključ." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Prilikom stvaranja ključa moramo da proizvedemo mnogo\n" +"nasumičnih podataka i potrebna nam je vaša pomoć.\n" +"Poželjno je da obavljate neke druge radnje kao što je\n" +"kucanje na tastaturi, pomeranje miša, korišćenje programa.\n" +"To će sistemu obezebediti potrebne nasumične podatke." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Stvaram ključ" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Da li sigurno želite trajno da uklonite %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Da li ste sigurni da želite trajno da obrišete %d ključ?" +msgstr[1] "Da li ste sigurni da želite trajno da obrišete %d ključa?" +msgstr[2] "Da li ste sigurni da želite trajno da obrišete %d ključeva?" +msgstr[3] "Da li ste sigurni da želite trajno da obrišete jedan ključ?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Pogrešna lozinka" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Ovo je treći put da ste uneli pogrešnu lozinku. Pokušajte ponovo." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Pogrešna lozinka." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Unesite novu lozinku za „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Unesite lozinku za „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Unesite novu lozinku" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Unesite propusnu reč" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Lozinka" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Učitao sam %d ključ" +msgstr[1] "Učitao sam %d ključa" +msgstr[2] "Učitao sam %d ključeva" +msgstr[3] "Učitao sam jedan ključ" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Neispravni podaci ključa (nedostaju JID-ovi). Ovo se može desiti ako je datum " +"na računaru podešen unapred ili ako nedostaje samopotpis." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG ključevi" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: osnovni direktorijum priveska" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -991,27 +1142,31 @@ msgid "All JPEG files" msgstr "Sve JPEG datoteke" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Sve datoteke" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Izaberite sliku za pridodavanje ključu" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Ne mogu da pripremim fotografiju" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Ne mogu da dodam sliku" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Ne mogu da učitam datoteku. Moguće da je u neodgovarajućem formatu" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Da li sigurno želite da uklonite trenutnu sliku iz vašeg ključa?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Ne mogu da izbrišem sliku" @@ -1069,7 +1224,11 @@ msgid "Couldn't add revoker" msgstr "Ne mogu da dodam opozivača" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Shvatam da će ovaj ključ tajne biti trajno obrisan." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1084,11 +1243,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Nema ključeva upotrebljivih za potpisivanje" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1096,511 +1255,573 @@ "Nemate ličnih PGP ključeva koji bi se mogli iskoristiti da ukažu na vaše " "poverenje ovom ključu." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Pogrešna lozinka." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Unesite novu lozinku za „%s“" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Pretraga nije bila dovoljno određena. Server „%s“ je pronašao previše ključeva." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Unesite lozinku za „%s“" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Unesite novu lozinku" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Ne mogu da se povežem sa serverom „%s“: %s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Unesite propusnu reč" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP server ključeva" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Ne mogu da uvezem ključeve" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Uvozim ključeve sa servera ključeva" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Udaljeno" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Zatvorite ovaj prozor" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Pronađi udaljene ključeve..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Potražite ključeve na serveru ključeva" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Uvezi" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Stavlja izabrane ključeve na lokalni privezak" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Udaljeni ključevi" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Učitao sam %d ključ" -msgstr[1] "Učitao sam %d ključa" -msgstr[2] "Učitao sam %d ključeva" -msgstr[3] "Učitao sam ključ" +msgid "Remote Keys Containing '%s'" +msgstr "Udaljeni ključevi koji sadrže „%s“" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Nije uspela pretraga za ključevima." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Pronađite udaljene ključeve" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Neispravni podaci ključa (nedostaju JID-ovi). Ovo se može desiti ako je datum " -"na računaru podešen unapred ili ako nedostaje samopotpis." +"Ova opcija će pronaći ključeve za druge na Internetu. Ove ključeve možete " +"zatim da uvezete u vaš privezak ključeva." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Traži ključeve koji sadrže: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP server ključeva" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Serveri ključeva:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Deljeni ključevi blizu mene:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Gde tražiti:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Potraži" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Ne mogu da objavim ključeve na server" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Pretraga nije bila dovoljno određena. Server „%s“ je pronašao previše ključeva." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Ne mogu da preuzmem ključeve sa servera: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Ne mogu da se povežem sa serverom „%s“: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d ključ je izabran za usaglašavanje" +msgstr[1] "%d ključa su izabrana za usaglašavanje" +msgstr[2] "%d ključeva je izabrano za usaglašavanje" +msgstr[3] "Jedan ključ je izabran za usaglašavanje" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Usaglašavam ključeve..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Usaglasite ključeve" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Ova opcija će objaviti ključeve u vaš privezak, tako da će biti dostupni " +"drugima na korišćenje. Takođe, dobićete izmene koje su napravili drugi od " +"kada ste primili njihove ključeve." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Ova opcija će preuzeti sve izmene koje su drugi napravili od kada ste " +"primili njihove ključeve. Nijedan server ključeva nije izabran za objavljivanje, " +"tako da vaši ključevi neće biti dostupni drugima." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Serveri _ključeva" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Usaglasi" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Ne mogu da se povežem sa „%s“: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Povezujem se na: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Ne mogu da razrešim adresu: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Razrešavam adresu servera: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP server ključeva" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Potpiši ključ..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Potpišite javni ključ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Da li sigurno želite trajno da uklonite %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Da li sigurno želite trajno da izbrišete %d ključeve i identitete?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Da li sigurno želite trajno da izbrišete %d ključeve?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Da li sigurno želite trajno da izbrišete %d identitete?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Usaglasi i objavi ključeve..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Ne mogu da uklonim IB korisnika" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Objavite i/ili usaglasite vaše ključeve sa onima na mreži." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Ne mogu da obrišem lični ključ" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Ne mogu da obrišem javni ključ" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP ključevi" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP ključevi se koriste za šifrovanje el. pošte i datoteka" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Napredne opcije ključa" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Napravi" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "" -"PGP ključ vam omogućava da šifrujete e-poštu ili datoteke koje šaljete drugim " -"ljudima." +msgid "Generate a new key" +msgstr "Napravite novi ključ" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Ovde staviti algoritme" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "" +"PGP ključ vam omogućava da šifrujete el. poštu ili datoteke koje šaljete " +"drugim ljudima." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Napravi" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Napomena:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Datum _isteka:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Nika_da ne ističe" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Vrsta šifrovanja:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Napravite novi ključ" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Jačina ključa (bitova):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Nika_da ne ističe" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Novi PGP ključ" +msgid "E_xpiration Date:" +msgstr "Datum _isteka:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Komentar:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Napredne opcije ključa" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Istekao" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Lični PGP ključ" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP ključ" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Ne mogu da promenim IB osnovnog korisnika" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Sigurno želite trajno da uklonite IB korisnika „%s“?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Ne mogu da uklonim IB korisnika" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Nepoznato]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" -msgstr "Ime/E-pošta" +msgstr "Ime/El. pošta" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "IB potpisa" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Ne mogu da promenim primarnu sliku" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(nepoznato)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Ovaj ključ je istekao: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Naziv" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Da li sigurno želite da trajno uklonite podključ %d od %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Ne mogu da obrišem podključ" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Ne mogu da promenim poverenje" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Ne mogu da izvezem ključ u „%s“" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Izvezi kompletan ključ" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Ne mogu da izvezem ključ." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Ne mogu da izvezem ključ" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nikada" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "IB" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Vrsta" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Napravljen" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Ističe" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" -msgstr "Status" +msgstr "Stanje" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Jačina" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Istekao" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Dobar" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "IB ključa" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Radnje" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Primedba:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datumi" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-pošta:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Otisak" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "IB ključa:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Nikada" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nazivi ključeva i potpisi" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Ovaj ključ je opozvan" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotografija " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Vlasnik ključa je opozvao ključ. Ne može se više koristiti." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Tehnički detalji" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Ovaj ključ je istekao" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Ovaj ključ je opozvan" +msgid "Add a photo to this key" +msgstr "Dodajte fotografiju ovom ključu" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Ovaj ključ je istekao" +msgid "Remove this photo from this key" +msgstr "Ukloni ovu sliku iz ovog ključa" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Vrsta:" +msgid "Make this photo the primary photo" +msgstr "Postavi ovu sliku za glavnu sliku" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Upotreba:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Idite na prethodnu sliku" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Podključevi" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Idite na sledeću sliku" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Dodaj" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotografija " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Dodajte fotografiju ovom ključu" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "IB ključa:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Promeni _lozinku" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Naziv:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Dešifrujte primljene datoteke i e-poštu." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "El. pošta:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Izbriši" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Primedba:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Ističe" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Upotreba:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Ističe:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Vrsta:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Izvezi" +msgid "Decrypt files and email sent to you." +msgstr "Dešifrujte primljene datoteke i el. poštu." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Privatni PGP ključ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Idite na sledeću sliku" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Promeni _lozinku" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Idite na prethodnu sliku" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Vlasnik" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "IB ključa:" +msgid "Key Names and Signatures" +msgstr "Nazivi ključeva i potpisi" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Primarno" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Postavi ovu sliku za glavnu sliku" +msgid "Sign" +msgstr "Potpiši" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Nazivi i potpisi" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Izbriši" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Nikada" +msgid "_Add Name" +msgstr "_Dodaj naziv" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Premosti _poverenje vlasnika:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Vlasnik" +msgid "Revoke" +msgstr "Opozovi" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primarno" +msgid "Names and Signatures" +msgstr "Nazivi i potpisi" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Privatni PGP ključ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "IB ključa:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Ukloni ovu sliku iz ovog ključa" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Opozovi" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Jačina:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Potpiši" +msgid "Technical Details" +msgstr "Tehnički detalji" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Jačina:" +msgid "Fingerprint" +msgstr "Otisak" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Vlasnik ključa je opozvao ključ. Ne može se više koristiti." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Ističe:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Dodaj naziv" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Datumi" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Premosti _poverenje vlasnika:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Izvezi kompletan ključ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Naziv:" +msgid "Actions" +msgstr "Radnje" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datumi:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Dodaj" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Ističe" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Podključevi" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Površno" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Otisak:" +msgid "Fully" +msgstr "Potpuno" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Ukaži na poverenje:" +msgid "Ultimately" +msgstr "Najveće" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Vaše poverenje za ovaj ključ" +msgid "Encrypt files and email to the key's owner" +msgstr "Šifruj datoteku i pošalji vlasniku ključa" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Javni PGP ključ" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Ostali nazivi:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Ljudi koji su potpisali ovaj ključ:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Šifruj datoteku i pošalji vlasniku ključa " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Vaše poverenje za ovaj ključ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Potpuno" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Vaše poverenje je ručno navedeno u jezičku Detalji." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Verujem potpisima sa „%s“ na drugim ključevima" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1608,50 +1829,49 @@ msgstr "" "Ako verujete da je „%s“ osoba koja poseduje ovaj ključ, potpišite ključ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Potpiši ovaj ključ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" "Ako više ne verujete da „%s“ poseduje ovaj ključ, opozovite vaš potpis:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Površno" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Javni PGP ključ" +msgid "_Revoke Signature" +msgstr "_Opozovi potpis" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Ljudi koji su potpisali ovaj ključ:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Prikazuj _samo potpise ljudi kojima verujem" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Poverenje" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Najveće" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "_Verujete vlasniku:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Vaše poverenje je ručno navedeno u jezičku Detalji." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Otisak:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Prikazuj _samo potpise ljudi kojima verujem" +msgid "Dates:" +msgstr "Datumi:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Opozovi potpis" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Ukaži na poverenje:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Potpiši ovaj ključ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Verujete vlasniku:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1659,63 +1879,79 @@ msgstr "Podključ %d od %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Neobavezan opis za povlačenje" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Opozovi" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Razlog za povlačenje ključa" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Razlog:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Neobavezan opis za povlačenje" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Opozovi" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Nemate ličnih PGP ključeva koji se mogu iskoristiti za potpisivanje dokumenta " "ili poruke." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Potpiši poruku _ključem:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Koliko ste pažljivo proverili ovaj ključ?" +msgid "Sign Key" +msgstr "Potpišite ključ" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Kako će drugi videti ovaj potpis:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Potpisivanjem ukazujete vaše poverenje da ovaj ključ pripada:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Potpiši ključ kao:" +msgid "Key Name" +msgstr "Naziv ključa" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Neformalno: znači da ste uradili neformalnu proveru da ključ poseduje " -"osoba koja tvrdi da je njen. Na primer, možete da očitate otisak ključa " -"vlasniku, preko telefona. " +msgid "How carefully have you checked this key?" +msgstr "Koliko ste pažljivo proverili ovaj ključ?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Naziv ključa" +msgid "_Not at all" +msgstr "N_ipošto" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "N_eformalno" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Vrlo pažljivo" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." msgstr "" -"Nikako: znači da verujete da ključ poseduje osoba koja tvrdi da joj " -"pripada, ali ne možete ili niste proverili da je ovo istina" +"Nipošto: znači da verujete da ključ poseduje osoba koja tvrdi da joj " +"pripada, ali ne možete ili niste proverili da je ovo istina." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Neformalno: znači da ste uradili neformalnu proveru da ključ poseduje " +"osoba koja tvrdi da je njen. Na primer, možete da očitate otisak ključa " +"vlasniku, preko telefona." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1723,18 +1959,6 @@ "Vrlo pažljivo: Izaberite ovo jedino ako ste u potpunosti sigurni da je " "ovaj ključ originalan." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Potpisivanjem ukazujete vaše poverenje da ovaj ključ pripada:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Mogu _opozvati ovaj potpis kasnije." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Potpišite ključ" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1742,216 +1966,314 @@ "used email to check that the email address belongs to the owner." msgstr "" "Možete upotrebiti određivanje identiteta fotografijom koja se teško " -"falsifikuje (kao što je pasoš) \n" +"falsifikuje (kao što je pasoš)\n" "da biste lično proverili da li je ime na ključu tačno. Takođe bi trebalo da " -"iskoristite e-poštu da proverite da li adresa e-pošte pripada vlasniku." +"iskoristite el. poštu da proverite da li adresa el. pošte pripada vlasniku." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "N_eformalno" +msgid "How others will see this signature:" +msgstr "Kako će drugi videti ovaj potpis:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "N_ipošto" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Drugi ne bi mogli videti ovaj potpis" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Mogu _opozvati ovaj potpis kasnije." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Potpiši" +msgid "Sign key as:" +msgstr "Potpiši ključ kao:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Potpisnik:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Vrlo pažljivo" +msgid "_Sign" +msgstr "_Potpiši" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Potpiši poruku _ključem:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Izvozim podatke" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Preuzimam podatke" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Uvozim podatke" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Šaljem podatke" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Nedostupno" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Lično uverenje i ključ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Lično uverenje" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Uverenje" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Uverenja (DER šifrovana)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Uverenja" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Iks.509 uverenja i odgovarajući ključevi" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Da li ste sigurni da želite trajno da obrišete %d uverenje?" +msgstr[1] "Da li ste sigurni da želite trajno da obrišete %d uverenja?" +msgstr[2] "Da li ste sigurni da želite trajno da obrišete %d uverenja?" +msgstr[3] "Da li ste sigurni da želite trajno da obrišete jedno uverenje?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Ne mogu da stvorim lični ključ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Napravi" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Privatni ključ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Koristi se za zahtevanje uverenja" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Napravite novi lični ključ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Natpis:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Sačuvan:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Shvatam da će ovaj ključ biti trajno obrisan." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Neimanovan" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Nisam uspeo da izvezem uverenje" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Ne mogu da obrišem" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Da li sigurno želite da obrišete uverenje „%s“?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Da li sigurno želite da uklonite %d uverenje?" -msgstr[1] "Da li sigurno želite da uklonite %d uverenja?" -msgstr[2] "Da li sigurno želite da uklonite %d uverenja?" -msgstr[3] "Da li sigurno želite da uklonite uverenje?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Brišem" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Izvezi" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Izvezite u uverenje" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Obrišite ovo uverenje ili ključ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Zahtevaj _uverenje" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Napravi datoteku zahteva uverenja za ovaj ključ" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Ne mogu da sačuvam zahtev uverenja" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Sačuvaj zahtev uverenja" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Zahtev uverenja" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM šifrovani zahtev" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Ne mogu da napravim zahtev uverenja" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Napravite datoteku zhteva uverenja." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Opšti naziv (CN) postavljen u zahtevu uverenja." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Naziv (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Neimenovani lični ključ" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Promenite lozinku" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Po_tvrdi lozinku:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Nova _lozinka:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Potvrdite novu lozinku" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Nova _lozinka:" +msgid "Con_firm Passphrase:" +msgstr "Po_tvrdi lozinku:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Uredite vaše lozinke i ključeve šifrovanja" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Lozinke i ključevi" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Nastavi" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Izaberite vrstu stavke koju želite da napravite:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Nastavi" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Napravite novi..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Izabran je %d ključ" -msgstr[1] "Izabrana su %d ključa" -msgstr[2] "Izabrano je %d ključeva" -msgstr[3] "Izabran je %d ključ" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Ne mogu da uvezem ključeve" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Uvoz nije uspeo" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Uvezi" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Podaci koji će biti uvezeni:" -# bug: plural-forms -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Uvezeni ključevi" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Uvozim ključeve" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Uvezite ključ" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Neprepoznata vrsta ključa, ili neispravan format podataka" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Uvozim ključeve" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Sve datoteke ključeva" -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Udaljeno" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Ubačeni tekst" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Tekst iz ostave" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Novi" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Zatvorite ovaj program" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." -msgstr "_Novo..." +msgstr "_Novi..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Napravite novi ključ ili stavku" -#: ../src/seahorse-key-manager.c:742 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Dodajte novi ključ ili stavku" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "_Uvezi..." -#: ../src/seahorse-key-manager.c:743 +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "Uvezi iz datoteke" -#: ../src/seahorse-key-manager.c:745 +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "Uvezi iz ostave" -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Pronađi udaljene ključeve..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Potražite ključeve na serveru ključeva" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Usaglasi i objavi ključeve..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Objavite i/ili usaglasite vaše ključeve sa onima na mreži." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Vrste" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Prikažite kolonu vrste" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Isticanja" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Prikažite kolonu isticanja" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "P_overenje" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Prikažite kolonu poverenje vlasnika" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "Ispra_vnost" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Prikažite kolonu ispravnosti" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filter:" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Prema _privesku" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Prikažite spisak privezaka u bočnoj površi" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Prikaži _lični" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Prikažite samo lične ključeve, uverenja i lozinke" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Prikaži _poverljive" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Prikažite samo poverljive ključeve, uverenja i lozinke" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Prikaži _bilo koji" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Prikažite sve ključeve, uverenja i lozinke" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Propusnik" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -1959,277 +2281,47 @@ #: ../src/seahorse-key-manager.xml.h:2 msgid "Generate a new key of your own: " -msgstr "Samostalno napravite novi ključ:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Uvezite postojeće ključeve iz datoteke:" +msgstr "Samostalno napravite novi ključ: " #: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Moji _lični ključevi" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Ostali _ključevi" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Da započnete sa šifrovanjem biće vam potrebni ključevi." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Uvezi" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Lozinke" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Ne mogu da izvezem ključeve" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Ispravnost" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Datum isteka" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Zatvorite ovaj prozor" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Razgranaj sve" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Razgranajte sav ispis" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Sažmi sve" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Sažmite sav ispis" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Udaljeni ključevi" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Udaljeni ključevi koji sadrže „%s“" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Serveri ključeva:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Deljeni ključevi blizu mene:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Pronađite udaljene ključeve" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Ova opcija će pronaći ključeve za druge na Internetu. Ove ključeve možete " -"zatim da uvezete u vaš privezak ključeva." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Gde tražiti:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Potraži" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Traži ključeve koji sadrže:" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Ne mogu da objavim ključeve na server" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Ne mogu da preuzmem ključeve sa servera: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d ključ je izabran za usaglašavanje" -msgstr[1] "%d ključa su izabrana za usaglašavanje" -msgstr[2] "%d ključeva je izabrano za usaglašavanje" -msgstr[3] "%d ključ je izabran za usaglašavanje" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Usaglašavam ključeve..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Usaglasite ključeve" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Ova opcija će objaviti ključeve u vaš privezak, tako da će biti dostupni " -"drugima na korišćenje. Takođe, dobićete izmene koje su napravili drugi od " -"kada ste primili njihove ključeve." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Ova opcija će preuzeti sve izmene koje su drugi napravili od kada ste " -"primili njihove ključeve. Nijedan server ključeva nije izabran za objavljivanje, " -"tako da vaši ključevi neće biti dostupni drugima." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Serveri _ključeva" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Usaglasi" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Izdanje programa" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Doprinosi:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Danilo Šegan \n" -"Goran Rakić \n" -"Dušan Živojnov \n" -"Branko Kokanović \n" -"\n" -"Prevod.org — prevod na srpski jezik." - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Stranica projekta Morskog konjića" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Datoteka" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Uređivanje" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "Pre_gled" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "Po_moć" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Po_dešavanja" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Izmenite podešavanja programa" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "O programu" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Sadržaj" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Prikaži pomoć Morskog konjića" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Izvezite javni ključ" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Izvozim ključeve" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Ne mogu da preuzmem podatke sa servera ključeva" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Umnoženi ključevi" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Preuzimam ključeve" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s je privatni ključ. Da li želite da nastavite?" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Uvozim ključeve sa servera ključeva" +msgid "Import existing keys from a file:" +msgstr "Uvezite postojeće ključeve iz datoteke:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Prikažite osobine" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Da započnete sa šifrovanjem biće vam potrebni ključevi." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Obriši" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Ne mogu da zaključam" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Ne mogu da otključam" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Obrišite izabrane stavke" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Zaključaj" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_Izvezi..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Otključaj" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Izvezite u datoteku" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Svojstva" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Umnožite u ostavu" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Podesi ključ bezbedne _školjke..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Stavlja izabrane ključeve na lokalni privezak" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Pošaljite javni ključ bezbedne školjke na drugu mašinu, i omogućite " +"prijavljivanja korišćenjem tog ključa." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2258,177 +2350,201 @@ msgid "Enter the new passphrase again: %s" msgstr "Ponovo unesite novu lozinku: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Podesi ključeve bezbedne _školjke..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Pošaljite javni ključ bezbedne školjke na drugu mašinu, i omogućite " -"prijavljivanja korišćenjem tog ključa." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Bezbedna školjka" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Ključevi korišćeni za bezbedno povezivanje na druge računare" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Da li sigurno želite trajno da izbrišete ključ bezbedne školjke „%s“?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Da li sigurno želite trajno da izbrišete %d ključeva bezbedne školjke?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Da li sigurno želite trajno da izbrišete %d ključ bezbedne školjke?" +msgstr[1] "Da li sigurno želite trajno da izbrišete %d ključa bezbedne školjke?" +msgstr[2] "Da li sigurno želite trajno da izbrišete %d ključeva bezbedne školjke?" +msgstr[3] "Da li sigurno želite trajno da izbrišete jedan ključ bezbedne školjke?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ključ bezbedne školjke" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Ne mogu da obrišem ključ" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Tajni SSH ključevi" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Javni SSH ključevi" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Nijedan javni ključ nije dostupan za ovaj ključ." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Ključ bezbedne školjke" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Koristi se za pristup drugim računarima (npr: preko terminala)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Ne mogu da napravim ključ bezbedne školjke" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Stvaram ključ bezbedne školjke" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Koristite adresu vaše e-pošte i bilo koji drugi podsetnik koji vam treba " -"da znate čemu služi ovaj ključ." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Ključ bezbedne školjke (SSH) vam omogućava da se bezbedno povežete na " -"poverljive računare koji koriste SSH, bez unošenja različite šifre za svaki od " -"njih." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Ako već postoji računar sa kojim želite da iskoristite ovaj ključ, sada " -"možete da podesite taj računar da prepoznaje vaš ključ." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Novi ključ bezbedne školjke" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Samo napravi ključ" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Napravi i podesi" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Samo napravi ključ" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Ključ bezbedne školjke (SSH) vam omogućava da se bezbedno povežete na druge " +"računare." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Adresa vaše el. pošte ili podsetnik za koji je ovaj ključ." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "Opis _ključa:" +msgid "DSA" +msgstr "DSA" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Ako postoji računar sa kojim želite da koristite ovaj ključ, možete da " +"podesite taj računar da prepoznaje vaš novi ključ." + +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" -msgstr "(Nečitak ključ bezbedne školjke)" +msgstr "(Nečitljiv ključ bezbedne školjke)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Lični SSH ključ" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH ključ" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Ne mogu da preimenujem ključ." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Ne mogu da promenim ovlašćenje za ovaj ključ." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Ne mogu da promenim lozinku za ključ." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritam:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Identifikator:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Lokacija:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Naziv:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Jačina:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Koristi se za povezivanje na druge računare." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Poverenje" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Vlasnik ovog ključa je _ovlašćen da se poveže na ovaj računar" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Ovo jedino važi za „%s“ nalog." +msgid "This only applies to the %s account." +msgstr "Ovo jedino važi za %s nalog." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "I_zvezi kompletan ključ" +msgid "Algorithm:" +msgstr "Algoritam:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Vlasnik ovog ključa je _ovlašćen da se poveže na ovaj računar" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Jačina:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Mesto:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Koristi se za povezivanje na druge računare." +msgid "E_xport Complete Key" +msgstr "I_zvezi kompletan ključ" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH nardba je neočekivano prekinuta." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH naredba nije uspela da se izvrši." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Lozinka udaljenog računara" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Unesite propusnu reč ključa" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Lozinka za novi ključ bezbedne školjke" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Uvozim ključ: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Uvozim ključ. Unesite propusnu reč" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH ključevi" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Nijedan privatni ključ nije dostupan za ovaj ključ." @@ -2441,14 +2557,10 @@ msgstr "Podešavam ključeve bezbedne školjke..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "npr.: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Podesite računar za SSH vezu" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2456,6 +2568,10 @@ "Da biste koristili ključ bezbedne školjke na drugom računaru koji koristi SSH, " "morate već na njemu imati prijavni nalog." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "npr.: fileserver.example.com:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Naziv _računara:" @@ -2467,508 +2583,3 @@ #: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" msgstr "Pode_šavnje" - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "Ne pokreći Morskog konjića kao uslužni program" - -#~ msgid "couldn't fork process" -#~ msgstr "ne mogu da razdelim proces" - -#~ msgid "couldn't create new process group" -#~ msgstr "ne mogu da napravim novu grupu procesa" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "Uslužni program za šifrovanje (Morski konjić)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "Nevažeći ili neprepoznat tip ključa: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "Tip ovog ključa nije podržan: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "Podrška za ovu mogućnost nije uključena tokom izgradnje programa" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "Nevažeći ili neprepoznat ključ: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "Potpisan od strane ističe na %s." - -#~ msgid "Invalid Signature" -#~ msgstr "Nevažeći potpis" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "Potpisan od strane ističe dana %s ." - -#~ msgid "Expired Signature" -#~ msgstr "Istekao potpis" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "Potpisan od strane Opozvan dana %s." - -#~ msgid "Revoked Signature" -#~ msgstr "Opozvan potpis" - -#~ msgid "Signed by on %s." -#~ msgstr "Potpisan od strane dana %s." - -#~ msgid "Good Signature" -#~ msgstr "Dobar potpis" - -#~ msgid "Signing key not in keyring." -#~ msgstr "Ključ koji treba potpisati nije u privesku." - -#~ msgid "Unknown Signature" -#~ msgstr "Nepoznat potpis" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "Loš ili falsifikovan potpis. Potpisani podaci su modifikovani." - -#~ msgid "Bad Signature" -#~ msgstr "Loš potpis" - -#~ msgid "Couldn't verify signature." -#~ msgstr "Ne mogu da potvrdim potpis." - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "Nevažeći ili nepoznat potpisnik: %s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "Ključ nije važeći za potpisivanje: %s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "Nevažeći ili nepoznat primalac: %s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "Ključ nije važeći primalac za šifrovanje: %s" - -#~ msgid "No recipients specified" -#~ msgstr "Nema navedenih primaoca" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "Nevažeći tip ključa za dešifrovanje: %s" - -#~ msgid "Please set clearuri" -#~ msgstr "Postavite clearuri" - -#~ msgid "Please set crypturi" -#~ msgstr "Postavite crypturi" - -#~ msgid "Error opening clearuri" -#~ msgstr "clearuri ne može da se otvori" - -#~ msgid "No signer specified" -#~ msgstr "Potpisnik nije naveden" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "Nevažeći tip ključa za verifikovanje: %s" - -#~ msgid "Invalid key id: %s" -#~ msgstr "Nevažeći IB ključa: %s" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "Lista URI-ja servera ključeva za pretragu udaljenih PGP ključeva. U kasnijim " -#~ "verzijama ime za prikaz se može dodati, pridodajući razmak i zatim ime." - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "Automatski preuzeti ključeve" - -#~ msgid "Auto Sync Keys" -#~ msgstr "Automatski sinhronizovati ključeve" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "Kontroliše vidljivost kolone za rok u upravljaču ključevima." - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "Kontroliše vidljivost kolone za poverenje u upravljaču ključevima." - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "Kontroliše vidljivost kolone za tip u upravljaču ključevima." - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "Kontroliše vidljivost kolone za ispravnost u upravljaču ključevima." - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "Omogućiti DNS-SD deljenje" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "Omogućava DNS-SD (Apple Bonjour) deljenje ključeva. Mora biti pokrenut " -#~ "uslužni program Morskog konjića sa ugrađenom podrškom za HKP i DNS-SD." - -#~ msgid "ID of the default key" -#~ msgstr "IB podrazumevanog ključa" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "" -#~ "Ako je postavljen na tačno, tada će datoteke šifrovane pomoću seahorse-a " -#~ "biti ASCII oklopno šifrovani." - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "" -#~ "Ukoliko je postavljeno, onda će se podrazumevani ključ uvek dodavati u " -#~ "spisak primalaca sa šifrovanjem." - -#~ msgid "Last key server search pattern" -#~ msgstr "Poslednji šablon pretrage servera ključeva" - -#~ msgid "Last key servers used" -#~ msgstr "Poslednji serveri ključeva su iskorišćeni." - -#~ msgid "Last key used to sign a message." -#~ msgstr "Upotrebljen poslednji ključ za potpisivanje poruke." - -#~ msgid "PGP Key servers" -#~ msgstr "PGP serveri ključeva" - -#~ msgid "Publish keys to this key server." -#~ msgstr "Objaviti ključeve na ovom serveru ključeva." - -#~ msgid "Show expires column in key manager" -#~ msgstr "Prikaži kolonu za rok u upravljaču ključevima" - -#~ msgid "Show trust column in key manager" -#~ msgstr "Prikaži kolonu za poverenje u upravljaču ključevima" - -#~ msgid "Show type column in key manager" -#~ msgstr "Prikaži kolonu za tip u upravljaču ključevima" - -#~ msgid "Show validity column in key manager" -#~ msgstr "Prikaži kolonu za ispravnost u upravljaču ključevima" - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "Navesti kolonu po kojoj treba sortirati prozor primalaca. Kolone su: " -#~ "’ime’ i ’IB’. Staviti ’-’ ispred imena kolone za sortiranje po opadajućem " -#~ "redosledu." - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "Kolone po kojima treba sortirati glavni prozor urednika ključeva za " -#~ "Morskog konjića. Moguće kolone su: „name“ (ime), „id“ (IB), " -#~ "„validity“ (ispravnost), „expires“ (vreme isteka), „trust“ (poverenje), i " -#~ "„type“ (vrsta). Staviti ’-’ ispred imena kolone da bi sortirali po " -#~ "opadajućem redosledu." - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "IB poslednjeg tajnog ključa iskorišćenog za potpisivanje poruke." - -#~ msgid "The column to sort the recipients by" -#~ msgstr "Po kojoj koloni ređati primaoce" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "Po kojoj koloni ređati ključeve morskog konja" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "" -#~ "Server ključeva na koji treba objaviti PGP ključeve. Ili isprazniti da bi " -#~ "zaustavili objavljivanje PGP ključeva." - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "" -#~ "Poslednji server ključeva na osnovu kog je izvršena pretraga ili je prazno " -#~ "za upotrebu svih servera ključeva." - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "Poslednja šema pretrage servera ključeva." - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "" -#~ "Ovo određuje podrazumevani ključ koji će se koristiti za određene " -#~ "operacije, prvenstveno za potpisivanje." - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "" -#~ "Bili ili ne ključevi trebaju automatski biti preuzeti sa servera ključeva." - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "" -#~ "Bili ili ne modifikovani ključevi trebaju automatski biti sinhronizovani " -#~ "sa podrazumevanim serverima ključeva." - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "Da li da uvek šifruje prema uobičajenom ključu" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "Da li da koristi ASCII oklop" - -#~ msgid "Web Password" -#~ msgstr "Lozinka za veb" - -#~ msgid "Network Password" -#~ msgstr "Lozinka za mrežu" - -#~ msgid "Couldn't set application access." -#~ msgstr "Ne mogu da postavim pristup aplikaciji." - -#~ msgid "Path:" -#~ msgstr "Putanja:" - -#~ msgid "Permissions:" -#~ msgstr "Dozvole:" - -#~ msgid "Applications" -#~ msgstr "Aplikacije" - -#~ msgid "_Read" -#~ msgstr "_Čitaj" - -#~ msgid "_Write" -#~ msgstr "_Piši" - -#~ msgctxt "infinitive" -#~ msgid "_Delete" -#~ msgstr "_Obriši" - -#~ msgid "Saving item..." -#~ msgstr "Čuvam stavku..." - -#~ msgid "Listing password keyrings" -#~ msgstr "Spisak privezaka za lozinke" - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "Nijedan ključ za šifrovanje nije nađen sa kojim bi se obavila zahtevana " -#~ "operacija. Program Lozinke i ključevi šifrovanja će sada biti " -#~ "pokrenut da biste mogli da ili napravite ključ ili uvezete postojeći." - -#~ msgid "All Keys" -#~ msgstr "Svi ključevi" - -#~ msgid "Selected Recipients" -#~ msgstr "Izabrani primaoci" - -#~ msgid "Search Results" -#~ msgstr "Rezultati pretrage" - -#~ msgid "Search _for:" -#~ msgstr "Pretraga za:" - -#~ msgid "None (Don't Sign)" -#~ msgstr "Nijedan (ne potpisivati)" - -#~ msgid "Sign this message as %s" -#~ msgstr "Potpisati poruku kao %s" - -#~ msgid "_Sign message as:" -#~ msgstr "Potpi_sati poruku kao:" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Ovo nije ispravna .desktop datoteka" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Nije poznato izdanje „%s“ desktop datoteke" - -#~ msgid "Starting %s" -#~ msgstr "Pokrećem %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Program ne prihvata dokumente iz komandne linije" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Nepoznata opcija pri pokretanju: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Ne mogu da prosledim adresu dokumenta u „Type=Link“ unos desktop datoteke" - -#~ msgid "Not a launchable item" -#~ msgstr "Ne možete da pokrenete ovu stavku" - -#~ msgid "Disable connection to session manager" -#~ msgstr "Onemogući vezu sa upravnikom sesije" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Odaberite datoteku koja sadrži sačuvana podešavanja" - -#~ msgid "FILE" -#~ msgstr "DATOTEKA" - -#~ msgid "Specify session management ID" -#~ msgstr "Odaberite IB upravnika sesije" - -#~ msgid "Session management options:" -#~ msgstr "Mogućnosti upravnika sesije:" - -#~ msgid "Show session management options" -#~ msgstr "Prikaži mogućnosti upravnika sesije" - -#~ msgid "Key Imported" -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "Ključ je uvežen" -#~ msgstr[1] "Ključ je uvežen" -#~ msgstr[2] "Ključevi su uveženi" -#~ msgstr[3] "Ključ je uvežen" - -#~ msgid "Imported %i key" -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "Uvezen %i ključ" -#~ msgstr[1] "Uvezen %i ključ" -#~ msgstr[2] "Uvezeno %i ključeva" -#~ msgstr[3] "Uvezen %i ključ" - -#~ msgid "Imported a key for" -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "Uvežen ključ za" -#~ msgstr[1] "Uvežen ključ za" -#~ msgstr[2] "Uveženi ključevi za" -#~ msgstr[3] "Uvežen ključ za" - -#~ msgid "Notification Messages" -#~ msgstr "Obaveštajne poruke" - -#~ msgid "Symmetric Key" -#~ msgstr "Simetrični ključ" - -#~ msgid "Public Key" -#~ msgstr "Javni ključ" - -#~ msgid "Private Key" -#~ msgstr "Privatni ključ" - -#~ msgid "Credentials" -#~ msgstr "Akreditivi" - -#~ msgid "Identity" -#~ msgstr "Identitet" - -#~ msgid "Progress Title" -#~ msgstr "Naslov napredovanja" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "Ne mogu da pokrenem „file-roller“" - -#~ msgid "Couldn't package files" -#~ msgstr "Ne mogu da upakujem datoteke" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "Upravljač arhivom nije ispravno okončan" - -#~ msgid "Loading Keys..." -#~ msgstr "Učitavam ključeve..." - -#~ msgid "Searching for keys..." -#~ msgstr "Tražim ključeve..." - -#~ msgid "Uploading keys..." -#~ msgstr "Slanje ključeva..." - -#~ msgid "Retrieving keys..." -#~ msgstr "Preuzimanje ključeva..." - -#~ msgid "Searching for keys on: %s" -#~ msgstr "Tražim ključeve na: %s" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "Tražim ključeve koji sadrže '%s'..." - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "Tražim IB ključa '%s'..." - -#~ msgid "Retrieving remote keys..." -#~ msgstr "Preuzimam udaljene ključeve..." - -#~ msgid "Sending keys to key server..." -#~ msgstr "Šaljem ključeve na server ključeva" - -#~ msgid "Synchronizing keys" -#~ msgstr "Usaglašavanje ključeva" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Urednik ključeva za šifrovanje" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Invalid" -#~ msgstr "Nevažeće" - -#~ msgid "Private Secure Shell Key" -#~ msgstr "Ključ privatnog osiguranog komandnog okruženja" - -#~ msgid "Public Secure Shell Key" -#~ msgstr "Ključ javnog osiguranog komandnog okruženja" - -#~ msgid "Secure Shell key" -#~ msgstr "Ključ osiguranog komandnog okruženja" - -#~ msgid "Passphrase:" -#~ msgstr "Lozinka:" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "Unesite lozinku za vaš novi ključ osiguranog komandnog okruženja." - -#~ msgid "Couldn't share keys" -#~ msgstr "Nemoguće deliti ključeve" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "Ne mogu objaviti na mreži informacije o pronalascima." - -#~ msgid "%s's encryption keys" -#~ msgstr "%s's ključevi šifriranja" - -#~ msgid "Key Sharing" -#~ msgstr "Deljenje ključeva" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "Deljenje vaših ključeva omogućava drugim ljudima na vašoj mreži da koriste " -#~ "ključeve koje ste sakupili. Ovo znači da oni mogu šifrovati stvari umesto " -#~ "vas ili onih koje vi znate, a da im niste poslali vaš ključ.\n" -#~ "\n" -#~ "Napomena: Vaši lični ključevi neće biti kompromitovani." - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "_Deli moje ključeve sa drugima na mojoj mreži" - -#~ msgid "Seahorse Daemon" -#~ msgstr "Uslužni program Morskog konjića" - -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "X ključeva je izabrano za sinhronizaciju" - -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "" -#~ "Jedan ili više izbrisanih ključeva su privatni. Da li želite da nastavite?" - -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" - -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" diff -Nru seahorse-3.2.2/po/sr.po seahorse-3.6.3/po/sr.po --- seahorse-3.2.2/po/sr.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/sr.po 2012-08-21 12:23:19.000000000 +0200 @@ -1,26 +1,25 @@ # Serbian translation of seahorse -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003 - 2009. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003 — 2012. # This file is distributed under the same license as the seahorse package. # Maintainer: Душан Живојнов # Translated on 2009-05-09 by: Бранко Кокановић # Милош Поповић , 2010. -# Мирослав Николић , 2011. +# Мирослав Николић , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: seahorse\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-18 06:28+0000\n" -"PO-Revision-Date: 2011-09-18 09:52+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahor" +"se&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-07-22 08:33+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%" "10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Virtaal 0.7.0-beta5\n" "X-Project-Style: gnome\n" #: ../gkr/seahorse-add-keyring.xml.h:1 @@ -28,57 +27,163 @@ msgstr "Додајте привезак за лозинку" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Назив новог привеска:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "" "Изаберите назив новог привеска. Биће вам затражена лозинка за откључавање." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Назив новог привеска:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Назив удаљеног рачунара или адреса сервера." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Не могу да додам привезак" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Нови привезак за лозинке" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Користи се за чување лозинки програма и мреже" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Нова лозинка..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Сигурно чува лозинке или тајне." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Привезак за лозинке" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Сачуване лозинке" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Не могу да поставим основни привезак кључева" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Не могу да променим лозинку привеска кључева" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Постави као основно" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Програми углавном складиште нове лозинке у основном привеску." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Измени _лозинку" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Измените лозинку привеска кључева складишта лозинки" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Не могу да додам ставку" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Додајте лозинку" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Опис:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Привезак:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Лозинка:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Прикажи ло_зинку" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Не могу да обришем ставку" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Привезак:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Не могу да додам привезак" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Лозинке" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Сачуване личне лозинке, уверења и тајне" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Лозинка ТП налога за " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Лозинка или тајна" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Лозинка за мрежу" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Сачувана белешка" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Лозинка привеска" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Лозинка кључа шифровања" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Лозинка кључа складиштења" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Лозинка Гугл Хромијума" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Лозинка Гномових налога на мрежи" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Лозинка Интернет писмоноше" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Лозинка тренутних порука" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Тајне управника мреже" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Да ли сигурно желите да избришете лозинку „%s“?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -87,261 +192,135 @@ msgstr[2] "Да ли сигурно желите да избришете %d лозинки?" msgstr[3] "Да ли сигурно желите да избришете лозинку?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Бришем ставку" -msgstr[1] "Бришем ставке" -msgstr[2] "Бришем ставке" -msgstr[3] "Бришем ставку" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Приступите садржају дељеном на мрежи или ресурсима" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Приступите веб страници" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Откључајте ПГП кључ" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Откључајте кључ безбедне шкољке" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Сачувана лозинка или пријава" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Пуномоћства мреже" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Лозинка" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Не могу да променим лозинку." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Ажурирам лозинку" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Не могу да поставим опис." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Лозинка:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Технички детаљи:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Детаљи" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Особине кључа" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Кључ" +msgid "Use:" +msgstr "Употреба:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Особине кључа" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Врста:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Пријава:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Сервер:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Пријава:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Прикажи _лозинку" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Врста:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Употреба:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Лозинкe: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Лозинке: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Привезак за лозинке" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Користи се за чување лозинки програма и мреже" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Сачуване лозинке" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Сигурно чува лозинке или тајне." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Не могу да откључам привезак кључева" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Не могу да закључам привезак кључева" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Не могу да поставим основни привезак кључева" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Не могу да променим лозинку привеска кључева" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Закључај" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Закључајте привезак кључева складишта лозинки тако да ће бити потребна " -"главна лозинка да би му приступили." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Откључај" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Откључајте привезак кључева складишта лозинки главном лозинком тако да се " -"може користити." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Постави као основно" +msgid "Password:" +msgstr "Лозинка:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Програми углавном складиште нове лозинке у основном привеску." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Кључ" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Измени _лозинку" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Технички детаљи:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Измените лозинку привеска кључева складишта лозинки" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Детаљи" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Не могу да обришем привезак кључева" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Привезак који бива самостално откључан приликом пријављивања" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Привезак који се користи за чување лозинки" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Да ли сигурно желите да обришете „%s“ привезак?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Бришем привезак" -msgstr[1] "Бришем привеске" -msgstr[2] "Бришем привеске" -msgstr[3] "Бришем привезак" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "Created:" -msgstr "Направљено:" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "Привезак кључева" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Схватам да ће све ставке бити трајно обрисане." -#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../gkr/seahorse-gkr-keyring.xml.h:1 msgid "Keyring Properties" msgstr "Особине привеска" -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Назив:" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Назив:" -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Радња је отказана" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "Направљен:" -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Приступ привеску је одбијен" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Услужни програм Привеска кључева није покренут" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "Привезак је већ откључан" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Не постоји такав привезак" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Не могу да се повежем са услужним програмом привеска" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Ставка већ постоји" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Унутрашња грешка при приступању Гномовом привеску" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "Привезак кључева" #: ../libegg/egg-datetime.c:317 msgid "Display flags" @@ -349,7 +328,7 @@ #: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" -msgstr "Приказане особине датума и/или времена" +msgstr "Својства приказаног датума и/или времена" #: ../libegg/egg-datetime.c:323 msgid "Lazy mode" @@ -445,7 +424,7 @@ #: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" -msgstr "Део дана у месецу доње границе датума" +msgstr "Дан дела месеца доње границе датума" #: ../libegg/egg-datetime.c:395 msgid "Upper limit day" @@ -453,7 +432,7 @@ #: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" -msgstr "Део дана у месецу горње границе датума" +msgstr "Дан дела месеца горње границе датума" #: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" @@ -554,12 +533,12 @@ #: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 #: ../libegg/egg-datetime.c:1264 msgid "AM" -msgstr "преподне" +msgstr "ПрП" #: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 #: ../libegg/egg-datetime.c:1268 msgid "PM" -msgstr "поподне" +msgstr "ПоП" #. Translators: This is hh:mm:ss AM/PM. #: ../libegg/egg-datetime.c:807 @@ -599,268 +578,330 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "почетна привремена ставка" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Додај сервер кључева" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Домаћин:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Врста сервера кључева:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Домаћин:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Порт преко кога се може приступити серверу." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "почетна привремена ставка" +msgid "The port to access the server on." +msgstr "Порт преко кога се може приступити серверу." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Лозинка" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Издање овог програма" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Лозинка:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "— Подешавања система" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Потврди:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Доприноси:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Неисправна адреса сервера кључева." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Лозинке и кључеви" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"За помоћ се обратите вашем администратору система или администратору сервера " -"кључева." +"Данило Шеган \n" +"Горан Ракић \n" +"Душан Живојнов \n" +"Бранко Кокановић \n" +"\n" +"Превод.орг — превод на српски језик." -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "Адреса" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Страница пројекта Морског коњића" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Произвољно" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Не могу да обришем" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Ништа: немој објављивати кључеве" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Не могу да извезем кључеве" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Аутоматски преузми кључеве са сервера _кључева" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Не могу да извезем податке" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Аутоматски усагласи _измењене кључеве са серверима кључева" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Датотека" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Сервери кључева" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Извези..." -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Подешавања" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Извезите у датотеку" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Пронађи кључ преко:" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Уређивање" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Објави кључеве на:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Умножите у оставу" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Преузимам податке" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Обриши" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Извозим податке" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Обришите изабране ставке" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Увозим податке" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Прикажите особине ове ставке" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Прикажите особине овог привеска" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Шаљем податке" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Пос_тавке" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Недоступно" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Измените подешавања програма" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d.%m.%Y." +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "Пре_глед" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Подаци кључа" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "По_моћ" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Вишеструки кључеви" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "О овом програму" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Све датотеке кључева" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Садржај" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Све датотеке" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Прикажи помоћ Морског коњића" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Извези" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Унесите ПИН или лозинку за: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Лозинка:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Архиве" +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Потврди:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Неисправна адреса сервера кључева." -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"Датотека већ постоји.\n" -"\n" -"Желите ли да је замените новом?" +"За помоћ се обратите вашем администратору система или администратору сервера " +"кључева." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "Адреса" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Произвољно" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Ништа: немој објављивати кључеве" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Поставке" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Пронађи кључ преко:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Објави кључеве на:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Аутоматски преузми кључеве са сервера _кључева" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Аутоматски усагласи _измењене кључеве са серверима кључева" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Сервери кључева" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Замени" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d.%m.%Y." #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Непознато" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Никада" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Површно" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Потпуно" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Највеће" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" -msgstr "Онемогућено" +msgstr "Искључен" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Повучен" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Не могу да прикажем помоћ: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Датум истека:" +msgid "Never E_xpires" +msgstr "Никада не _истиче" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Направите нови подкључ" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Ако кључ никад не истиче" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Врста кључа:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "_Дужина кључа:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Врста кључа:" +msgid "Expiration Date:" +msgstr "Датум истека:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Дужина кључа" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Никада не _истиче" +msgid "Generate a new subkey" +msgstr "Направите нови подкључ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Додај ИБ корисника" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Направи нови ИБ корисника" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Име и _презиме:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Ко_ментар кључа:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Мора бити дужине бар 5 знакова" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Необавезна адреса ел. поште" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Необавезна примедба за опис кључа" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Необавезна адреса е-поште" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Име и _презиме:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" -msgstr "Адреса _е-поште:" +msgstr "Адреса _ел. поште:" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Ко_ментар кључа:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Направи нови ИБ корисника" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Измени" +msgid "_Never expires" +msgstr "_Никад не истиче" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Повуци кључ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Никад не истиче" +msgid "C_hange" +msgstr "_Измени" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -871,7 +912,7 @@ msgid "Add subkey to %s" msgstr "Додај подкључ за %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "ДСА (само потпис)" @@ -879,7 +920,7 @@ msgid "ElGamal (encrypt only)" msgstr "ЕлГамал (само шифровање)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "РСА (само потпис)" @@ -900,6 +941,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "Дешифровање није успело. Вероватно немате кључ за дешифровање." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Радња је отказана" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Неисправан датум истека" @@ -917,46 +963,151 @@ msgid "Expiry: %s" msgstr "Истиче: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Вишеструки кључеви" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Подаци кључа" + +# bug: plural-forms +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Оклопљени ПГП кључеви" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "ПГП кључеви" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "ПГП кључ" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" -msgstr "Користи се за шифровање е-поште и датотека" +msgstr "Користи се за шифровање ел. поште и датотека" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "РСА" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "ДСА Елгамал" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Не могу да генеришем ПГП кључ" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Лозинка за нови ПГП кључ" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Двапут унесите лозинку за нови кључ." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Приликом стварања кључа морамо да произведемо много\n" +"насумичних података и потребна нам је ваша помоћ.\n" +"Пожељно је да обављате неке друге радње као што је\n" +"куцање на тастатури, померање миша, коришћење програма.\n" +"То ће систему обезебедити потребне насумичне податке." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Стварам кључ" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Да ли сигурно желите трајно да уклоните %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Да ли сте сигурни да желите трајно да обришете %d кључ?" +msgstr[1] "Да ли сте сигурни да желите трајно да обришете %d кључа?" +msgstr[2] "Да ли сте сигурни да желите трајно да обришете %d кључева?" +msgstr[3] "Да ли сте сигурни да желите трајно да обришете један кључ?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Погрешна лозинка" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Ово је трећи пут да сте унели погрешну лозинку. Покушајте поново." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Погрешна лозинка." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Унесите нову лозинку за „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Унесите лозинку за „%s“" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Унесите нову лозинку" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Унесите пропусну реч" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Лозинка" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Учитао сам %d кључ" +msgstr[1] "Учитао сам %d кључа" +msgstr[2] "Учитао сам %d кључева" +msgstr[3] "Учитао сам један кључ" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Неисправни подаци кључа (недостају ЈИД-ови). Ово се може десити ако је датум " +"на рачунару подешен унапред или ако недостаје самопотпис." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "ГнуПГ кључеви" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "ГнуПГ: основни директоријум привеска" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -991,27 +1142,31 @@ msgid "All JPEG files" msgstr "Све ЈПЕГ датотеке" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Све датотеке" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Изаберите слику за придодавање кључу" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Не могу да припремим фотографију" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Не могу да додам слику" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Не могу да учитам датотеку. Могуће да је у неодговарајућем формату" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Да ли сигурно желите да уклоните тренутну слику из вашег кључа?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Не могу да избришем слику" @@ -1069,7 +1224,11 @@ msgid "Couldn't add revoker" msgstr "Не могу да додам опозивача" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Схватам да ће овај кључ тајне бити трајно обрисан." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1084,11 +1243,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Нема кључева употребљивих за потписивање" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1096,511 +1255,573 @@ "Немате личних ПГП кључева који би се могли искористити да укажу на ваше " "поверење овом кључу." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Погрешна лозинка." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ЕлГамал" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Унесите нову лозинку за „%s“" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Претрага није била довољно одређена. Сервер „%s“ је пронашао превише кључева." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Унесите лозинку за „%s“" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Унесите нову лозинку" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Не могу да се повежем са сервером „%s“: %s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Унесите пропусну реч" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "ХТТП сервер кључева" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Не могу да увезем кључеве" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Увозим кључеве са сервера кључева" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Удаљено" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Затворите овај прозор" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Пронађи удаљене кључеве..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Потражите кључеве на серверу кључева" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Увези" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Ставља изабране кључеве на локални привезак" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Удаљени кључеви" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Учитао сам %d кључ" -msgstr[1] "Учитао сам %d кључа" -msgstr[2] "Учитао сам %d кључева" -msgstr[3] "Учитао сам кључ" +msgid "Remote Keys Containing '%s'" +msgstr "Удаљени кључеви који садрже „%s“" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Није успела претрага за кључевима." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Пронађите удаљене кључеве" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Неисправни подаци кључа (недостају ЈИД-ови). Ово се може десити ако је датум " -"на рачунару подешен унапред или ако недостаје самопотпис." +"Ова опција ће пронаћи кључеве за друге на Интернету. Ове кључеве можете " +"затим да увезете у ваш привезак кључева." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ЕлГамал" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Тражи кључеве који садрже: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "ХТТП сервер кључева" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Сервери кључева:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Дељени кључеви близу мене:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Где тражити:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Потражи" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Не могу да објавим кључеве на сервер" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Претрага није била довољно одређена. Сервер „%s“ је пронашао превише кључева." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Не могу да преузмем кључеве са сервера: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Не могу да се повежем са сервером „%s“: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d кључ је изабран за усаглашавање" +msgstr[1] "%d кључа су изабрана за усаглашавање" +msgstr[2] "%d кључева је изабрано за усаглашавање" +msgstr[3] "Један кључ је изабран за усаглашавање" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Усаглашавам кључеве..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Усагласите кључеве" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Ова опција ће објавити кључеве у ваш привезак, тако да ће бити доступни " +"другима на коришћење. Такође, добићете измене које су направили други од " +"када сте примили њихове кључеве." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Ова опција ће преузети све измене које су други направили од када сте " +"примили њихове кључеве. Ниједан сервер кључева није изабран за објављивање, " +"тако да ваши кључеви неће бити доступни другима." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Сервери _кључева" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Усагласи" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Не могу да се повежем са „%s“: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "Повезујем се на: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Не могу да разрешим адресу: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Разрешавам адресу сервера: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "ЛДАП сервер кључева" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_Потпиши кључ..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Потпишите јавни кључ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Да ли сигурно желите трајно да уклоните %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Да ли сигурно желите трајно да избришете %d кључеве и идентитете?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Да ли сигурно желите трајно да избришете %d кључеве?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Да ли сигурно желите трајно да избришете %d идентитете?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Усагласи и објави кључеве..." -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Не могу да уклоним ИБ корисника" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Објавите и/или усагласите ваше кључеве са онима на мрежи." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Не могу да обришем лични кључ" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Не могу да обришем јавни кључ" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "ПГП кључеви" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "ПГП кључеви се користе за шифровање ел. поште и датотека" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Напредне опције кључа" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Направи" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "" -"ПГП кључ вам омогућава да шифрујете е-пошту или датотеке које шаљете другим " -"људима." +msgid "Generate a new key" +msgstr "Направите нови кључ" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Овде ставити алгоритме" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "" +"ПГП кључ вам омогућава да шифрујете ел. пошту или датотеке које шаљете " +"другим људима." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Направи" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Напомена:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Датум _истека:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Ника_да не истиче" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Врста шифровања:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Направите нови кључ" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Јачина кључа (битова):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Ника_да не истиче" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Нови ПГП кључ" +msgid "E_xpiration Date:" +msgstr "Датум _истека:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Коментар:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Напредне опције кључа" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Истекао" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Лични ПГП кључ" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "ПГП кључ" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Не могу да променим ИБ основног корисника" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Сигурно желите трајно да уклоните ИБ корисника „%s“?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Не могу да уклоним ИБ корисника" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Непознато]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" -msgstr "Име/Е-пошта" +msgstr "Име/Ел. пошта" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ИБ потписа" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Не могу да променим примарну слику" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(непознато)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Овај кључ је истекао: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Назив" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Да ли сигурно желите да трајно уклоните подкључ %d од %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Не могу да обришем подкључ" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Не могу да променим поверење" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Не могу да извезем кључ у „%s“" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Извези комплетан кључ" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Не могу да извезем кључ." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Не могу да извезем кључ" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Никада" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ИБ" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Врста" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Направљен" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Истиче" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" -msgstr "Статус" +msgstr "Стање" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Јачина" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Истекао" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Добар" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ИБ кључа" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Радње" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Примедба:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Датуми" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Е-пошта:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Отисак" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ИБ кључа:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Никада" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Називи кључева и потписи" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Овај кључ је опозван" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Фотографија " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Власник кључа је опозвао кључ. Не може се више користити." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Технички детаљи" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Овај кључ је истекао" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Овај кључ је опозван" +msgid "Add a photo to this key" +msgstr "Додајте фотографију овом кључу" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Овај кључ је истекао" +msgid "Remove this photo from this key" +msgstr "Уклони ову слику из овог кључа" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Врста:" +msgid "Make this photo the primary photo" +msgstr "Постави ову слику за главну слику" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Употреба:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Идите на претходну слику" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Подкључеви" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Идите на следећу слику" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Додај" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Фотографија " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Додајте фотографију овом кључу" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ИБ кључа:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Промени _лозинку" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Назив:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Дешифрујте примљене датотеке и е-пошту." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Ел. пошта:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Избриши" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Примедба:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Истиче" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Употреба:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Истиче:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Врста:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Извези" +msgid "Decrypt files and email sent to you." +msgstr "Дешифрујте примљене датотеке и ел. пошту." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Приватни ПГП кључ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Идите на следећу слику" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Промени _лозинку" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Идите на претходну слику" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Власник" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ИБ кључа:" +msgid "Key Names and Signatures" +msgstr "Називи кључева и потписи" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Примарно" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Постави ову слику за главну слику" +msgid "Sign" +msgstr "Потпиши" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Називи и потписи" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Избриши" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Никада" +msgid "_Add Name" +msgstr "_Додај назив" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Премости _поверење власника:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Власник" +msgid "Revoke" +msgstr "Опозови" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Примарно" +msgid "Names and Signatures" +msgstr "Називи и потписи" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Приватни ПГП кључ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ИБ кључа:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Уклони ову слику из овог кључа" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Опозови" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Јачина:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Потпиши" +msgid "Technical Details" +msgstr "Технички детаљи" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Јачина:" +msgid "Fingerprint" +msgstr "Отисак" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Власник кључа је опозвао кључ. Не може се више користити." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Истиче:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Додај назив" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Датуми" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Премости _поверење власника:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Извези комплетан кључ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Назив:" +msgid "Actions" +msgstr "Радње" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Датуми:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Додај" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Истиче" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Подкључеви" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Површно" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Отисак:" +msgid "Fully" +msgstr "Потпуно" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Укажи на поверење:" +msgid "Ultimately" +msgstr "Највеће" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Ваше поверење за овај кључ" +msgid "Encrypt files and email to the key's owner" +msgstr "Шифруј датотеку и пошаљи власнику кључа" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Јавни ПГП кључ" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Остали називи:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Људи који су потписали овај кључ:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Шифруј датотеку и пошаљи власнику кључа " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Ваше поверење за овај кључ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Потпуно" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Ваше поверење је ручно наведено у језичку Детаљи." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Верујем потписима са „%s“ на другим кључевима" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1608,50 +1829,49 @@ msgstr "" "Ако верујете да је „%s“ особа која поседује овај кључ, потпишите кључ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Потпиши овај кључ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" "Ако више не верујете да „%s“ поседује овај кључ, опозовите ваш потпис:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Површно" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Јавни ПГП кључ" +msgid "_Revoke Signature" +msgstr "_Опозови потпис" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Људи који су потписали овај кључ:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Приказуј _само потписе људи којима верујем" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Поверење" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Највеће" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "_Верујете власнику:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Ваше поверење је ручно наведено у језичку Детаљи." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Отисак:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Приказуј _само потписе људи којима верујем" +msgid "Dates:" +msgstr "Датуми:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Опозови потпис" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Укажи на поверење:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Потпиши овај кључ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "_Верујете власнику:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1659,63 +1879,79 @@ msgstr "Подкључ %d од %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Необавезан опис за повлачење" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Опозови" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Разлог за повлачење кључа" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Разлог:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Необавезан опис за повлачење" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Опозови" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Немате личних ПГП кључева који се могу искористити за потписивање документа " "или поруке." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Потпиши поруку _кључем:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Колико сте пажљиво проверили овај кључ?" +msgid "Sign Key" +msgstr "Потпишите кључ" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Како ће други видети овај потпис:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Потписивањем указујете ваше поверење да овај кључ припада:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Потпиши кључ као:" +msgid "Key Name" +msgstr "Назив кључа" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Неформално: значи да сте урадили неформалну проверу да кључ поседује " -"особа која тврди да је њен. На пример, можете да очитате отисак кључа " -"власнику, преко телефона. " +msgid "How carefully have you checked this key?" +msgstr "Колико сте пажљиво проверили овај кључ?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Назив кључа" +msgid "_Not at all" +msgstr "Н_ипошто" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "Н_еформално" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Врло пажљиво" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." msgstr "" -"Никако: значи да верујете да кључ поседује особа која тврди да јој " -"припада, али не можете или нисте проверили да је ово истина" +"Нипошто: значи да верујете да кључ поседује особа која тврди да јој " +"припада, али не можете или нисте проверили да је ово истина." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Неформално: значи да сте урадили неформалну проверу да кључ поседује " +"особа која тврди да је њен. На пример, можете да очитате отисак кључа " +"власнику, преко телефона." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1723,18 +1959,6 @@ "Врло пажљиво: Изаберите ово једино ако сте у потпуности сигурни да је " "овај кључ оригиналан." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Потписивањем указујете ваше поверење да овај кључ припада:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Могу _опозвати овај потпис касније." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Потпишите кључ" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1742,216 +1966,314 @@ "used email to check that the email address belongs to the owner." msgstr "" "Можете употребити одређивање идентитета фотографијом која се тешко " -"фалсификује (као што је пасош) \n" +"фалсификује (као што је пасош)\n" "да бисте лично проверили да ли је име на кључу тачно. Такође би требало да " -"искористите е-пошту да проверите да ли адреса е-поште припада власнику." +"искористите ел. пошту да проверите да ли адреса ел. поште припада власнику." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "Н_еформално" +msgid "How others will see this signature:" +msgstr "Како ће други видети овај потпис:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "Н_ипошто" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Други не би могли видети овај потпис" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Могу _опозвати овај потпис касније." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Потпиши" +msgid "Sign key as:" +msgstr "Потпиши кључ као:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Потписник:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Врло пажљиво" +msgid "_Sign" +msgstr "_Потпиши" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Потпиши поруку _кључем:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Извозим податке" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Преузимам податке" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Увозим податке" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Шаљем податке" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Недоступно" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Лично уверење и кључ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Лично уверење" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Уверење" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Уверења (ДЕР шифрована)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Уверења" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Икс.509 уверења и одговарајући кључеви" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Да ли сте сигурни да желите трајно да обришете %d уверење?" +msgstr[1] "Да ли сте сигурни да желите трајно да обришете %d уверења?" +msgstr[2] "Да ли сте сигурни да желите трајно да обришете %d уверења?" +msgstr[3] "Да ли сте сигурни да желите трајно да обришете једно уверење?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Не могу да створим лични кључ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Направи" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Приватни кључ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Користи се за захтевање уверења" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Направите нови лични кључ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Натпис:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Сачуван:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Схватам да ће овај кључ бити трајно обрисан." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Неиманован" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Нисам успео да извезем уверење" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Не могу да обришем" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Да ли сигурно желите да обришете уверење „%s“?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Да ли сигурно желите да уклоните %d уверење?" -msgstr[1] "Да ли сигурно желите да уклоните %d уверења?" -msgstr[2] "Да ли сигурно желите да уклоните %d уверења?" -msgstr[3] "Да ли сигурно желите да уклоните уверење?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Бришем" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Извези" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Извезите у уверење" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Обришите ово уверење или кључ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Захтевај _уверење" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Направи датотеку захтева уверења за овај кључ" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Не могу да сачувам захтев уверења" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Сачувај захтев уверења" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Захтев уверења" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "ПЕМ шифровани захтев" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Не могу да направим захтев уверења" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Направите датотеку зхтева уверења." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Општи назив (ЦН) постављен у захтеву уверења." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Назив (ЦН):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Неименовани лични кључ" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Промените лозинку" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "По_тврди лозинку:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Нова _лозинка:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Потврдите нову лозинку" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Нова _лозинка:" +msgid "Con_firm Passphrase:" +msgstr "По_тврди лозинку:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Уредите ваше лозинке и кључеве шифровања" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Лозинке и кључеви" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Настави" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Изаберите врсту ставке коју желите да направите:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Настави" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Направите нови..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Изабран је %d кључ" -msgstr[1] "Изабрана су %d кључа" -msgstr[2] "Изабрано је %d кључева" -msgstr[3] "Изабран је %d кључ" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Не могу да увезем кључеве" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Увоз није успео" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Увези" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Подаци који ће бити увезени:" -# bug: plural-forms -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Увезени кључеви" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Увозим кључеве" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Увезите кључ" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Непрепозната врста кључа, или неисправан формат података" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Увозим кључеве" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Све датотеке кључева" -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Удаљено" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Убачени текст" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Текст из оставе" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Нови" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Затворите овај програм" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." -msgstr "_Ново..." +msgstr "_Нови..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Направите нови кључ или ставку" -#: ../src/seahorse-key-manager.c:742 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Додајте нови кључ или ставку" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "_Увези..." -#: ../src/seahorse-key-manager.c:743 +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "Увези из датотеке" -#: ../src/seahorse-key-manager.c:745 +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "Увези из оставе" -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Пронађи удаљене кључеве..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Потражите кључеве на серверу кључева" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Усагласи и објави кључеве..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Објавите и/или усагласите ваше кључеве са онима на мрежи." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Врсте" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Прикажите колону врсте" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Истицања" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Прикажите колону истицања" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "П_оверење" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Прикажите колону поверење власника" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "Испра_вност" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Прикажите колону исправности" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Филтер:" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Према _привеску" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Прикажите списак привезака у бочној површи" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Прикажи _лични" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Прикажите само личне кључеве, уверења и лозинке" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Прикажи _поверљиве" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Прикажите само поверљиве кључеве, уверења и лозинке" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Прикажи _било који" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Прикажите све кључеве, уверења и лозинке" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Пропусник" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -1959,277 +2281,47 @@ #: ../src/seahorse-key-manager.xml.h:2 msgid "Generate a new key of your own: " -msgstr "Самостално направите нови кључ:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Увезите постојеће кључеве из датотеке:" +msgstr "Самостално направите нови кључ: " #: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Моји _лични кључеви" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Остали _кључеви" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Да започнете са шифровањем биће вам потребни кључеви." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Увези" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Лозинке" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Не могу да извезем кључеве" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Исправност" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Датум истека" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Затворите овај прозор" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Разгранај све" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Разгранајте сав испис" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Сажми све" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Сажмите сав испис" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Удаљени кључеви" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Удаљени кључеви који садрже „%s“" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Сервери кључева:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Дељени кључеви близу мене:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Пронађите удаљене кључеве" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Ова опција ће пронаћи кључеве за друге на Интернету. Ове кључеве можете " -"затим да увезете у ваш привезак кључева." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Где тражити:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Потражи" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Тражи кључеве који садрже:" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Не могу да објавим кључеве на сервер" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Не могу да преузмем кључеве са сервера: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d кључ је изабран за усаглашавање" -msgstr[1] "%d кључа су изабрана за усаглашавање" -msgstr[2] "%d кључева је изабрано за усаглашавање" -msgstr[3] "%d кључ је изабран за усаглашавање" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Усаглашавам кључеве..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Усагласите кључеве" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Ова опција ће објавити кључеве у ваш привезак, тако да ће бити доступни " -"другима на коришћење. Такође, добићете измене које су направили други од " -"када сте примили њихове кључеве." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Ова опција ће преузети све измене које су други направили од када сте " -"примили њихове кључеве. Ниједан сервер кључева није изабран за објављивање, " -"тако да ваши кључеви неће бити доступни другима." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Сервери _кључева" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Усагласи" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Издање програма" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Доприноси:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Данило Шеган \n" -"Горан Ракић \n" -"Душан Живојнов \n" -"Бранко Кокановић \n" -"\n" -"Превод.орг — превод на српски језик." - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Страница пројекта Морског коњића" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Датотека" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Уређивање" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "Пре_глед" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "По_моћ" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "По_дешавања" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Измените подешавања програма" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "О програму" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Садржај" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Прикажи помоћ Морског коњића" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Извезите јавни кључ" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Извозим кључеве" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Не могу да преузмем податке са сервера кључева" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Умножени кључеви" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Преузимам кључеве" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s је приватни кључ. Да ли желите да наставите?" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Увозим кључеве са сервера кључева" +msgid "Import existing keys from a file:" +msgstr "Увезите постојеће кључеве из датотеке:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Прикажите особине" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Да започнете са шифровањем биће вам потребни кључеви." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Обриши" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Не могу да закључам" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Не могу да откључам" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Обришите изабране ставке" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Закључај" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_Извези..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Откључај" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Извезите у датотеку" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Својства" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Умножите у оставу" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Подеси кључ безбедне _шкољке..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Ставља изабране кључеве на локални привезак" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Пошаљите јавни кључ безбедне шкољке на другу машину, и омогућите " +"пријављивања коришћењем тог кључа." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2258,177 +2350,201 @@ msgid "Enter the new passphrase again: %s" msgstr "Поново унесите нову лозинку: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Подеси кључеве безбедне _шкољке..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Пошаљите јавни кључ безбедне шкољке на другу машину, и омогућите " -"пријављивања коришћењем тог кључа." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Безбедна шкољка" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Кључеви коришћени за безбедно повезивање на друге рачунаре" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "Да ли сигурно желите трајно да избришете кључ безбедне шкољке „%s“?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Да ли сигурно желите трајно да избришете %d кључева безбедне шкољке?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Да ли сигурно желите трајно да избришете %d кључ безбедне шкољке?" +msgstr[1] "Да ли сигурно желите трајно да избришете %d кључа безбедне шкољке?" +msgstr[2] "Да ли сигурно желите трајно да избришете %d кључева безбедне шкољке?" +msgstr[3] "Да ли сигурно желите трајно да избришете један кључ безбедне шкољке?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Кључ безбедне шкољке" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Не могу да обришем кључ" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Тајни ССХ кључеви" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Јавни ССХ кључеви" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Ниједан јавни кључ није доступан за овај кључ." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Кључ безбедне шкољке" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "Користи се за приступ другим рачунарима (нпр: преко терминала)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Не могу да направим кључ безбедне шкољке" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Стварам кључ безбедне шкољке" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Користите адресу ваше е-поште и било који други подсетник који вам треба " -"да знате чему служи овај кључ." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Кључ безбедне шкољке (SSH) вам омогућава да се безбедно повежете на " -"поверљиве рачунаре који користе ССХ, без уношења различите шифре за сваки од " -"њих." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Ако већ постоји рачунар са којим желите да искористите овај кључ, сада " -"можете да подесите тај рачунар да препознаје ваш кључ." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Нови кључ безбедне шкољке" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Само направи кључ" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_Направи и подеси" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Само направи кључ" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Кључ безбедне шкољке (SSH) вам омогућава да се безбедно повежете на друге " +"рачунаре." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Адреса ваше ел. поште или подсетник за који је овај кључ." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "Опис _кључа:" +msgid "DSA" +msgstr "ДСА" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Ако постоји рачунар са којим желите да користите овај кључ, можете да " +"подесите тај рачунар да препознаје ваш нови кључ." + +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" -msgstr "(Нечитак кључ безбедне шкољке)" +msgstr "(Нечитљив кључ безбедне шкољке)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Лични ССХ кључ" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "ССХ кључ" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Не могу да преименујем кључ." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Не могу да променим овлашћење за овај кључ." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Не могу да променим лозинку за кључ." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Алгоритам:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Идентификатор:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Локација:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "Назив:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Јачина:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Користи се за повезивање на друге рачунаре." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Поверење" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Власник овог кључа је _овлашћен да се повеже на овај рачунар" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Ово једино важи за „%s“ налог." +msgid "This only applies to the %s account." +msgstr "Ово једино важи за %s налог." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "И_звези комплетан кључ" +msgid "Algorithm:" +msgstr "Алгоритам:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Власник овог кључа је _овлашћен да се повеже на овај рачунар" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Јачина:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Место:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Користи се за повезивање на друге рачунаре." +msgid "E_xport Complete Key" +msgstr "И_звези комплетан кључ" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "ССХ нардба је неочекивано прекинута." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "ССХ наредба није успела да се изврши." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Лозинка удаљеног рачунара" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Унесите пропусну реч кључа" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Лозинка за нови кључ безбедне шкољке" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Увозим кључ: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Увозим кључ. Унесите пропусну реч" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "ОпенССХ кључеви" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "ОпенССХ: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Ниједан приватни кључ није доступан за овај кључ." @@ -2441,14 +2557,10 @@ msgstr "Подешавам кључеве безбедне шкољке..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "нпр.: fileserver.example.com:порт" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Подесите рачунар за ССХ везу" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2456,6 +2568,10 @@ "Да бисте користили кључ безбедне шкољке на другом рачунару који користи ССХ, " "морате већ на њему имати пријавни налог." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "нпр.: fileserver.example.com:порт" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "Назив _рачунара:" @@ -2467,508 +2583,3 @@ #: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" msgstr "Поде_шавње" - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "Не покрећи Морског коњића као услужни програм" - -#~ msgid "couldn't fork process" -#~ msgstr "не могу да разделим процес" - -#~ msgid "couldn't create new process group" -#~ msgstr "не могу да направим нову групу процеса" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "Услужни програм за шифровање (Морски коњић)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "Неважећи или непрепознат тип кључа: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "Тип овог кључа није подржан: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "Подршка за ову могућност није укључена током изградње програма" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "Неважећи или непрепознат кључ: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "Потписан од стране истиче на %s." - -#~ msgid "Invalid Signature" -#~ msgstr "Неважећи потпис" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "Потписан од стране истиче дана %s ." - -#~ msgid "Expired Signature" -#~ msgstr "Истекао потпис" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "Потписан од стране Опозван дана %s." - -#~ msgid "Revoked Signature" -#~ msgstr "Опозван потпис" - -#~ msgid "Signed by on %s." -#~ msgstr "Потписан од стране дана %s." - -#~ msgid "Good Signature" -#~ msgstr "Добар потпис" - -#~ msgid "Signing key not in keyring." -#~ msgstr "Кључ који треба потписати није у привеску." - -#~ msgid "Unknown Signature" -#~ msgstr "Непознат потпис" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "Лош или фалсификован потпис. Потписани подаци су модификовани." - -#~ msgid "Bad Signature" -#~ msgstr "Лош потпис" - -#~ msgid "Couldn't verify signature." -#~ msgstr "Не могу да потврдим потпис." - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "Неважећи или непознат потписник: %s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "Кључ није важећи за потписивање: %s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "Неважећи или непознат прималац: %s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "Кључ није важећи прималац за шифровање: %s" - -#~ msgid "No recipients specified" -#~ msgstr "Нема наведених примаоца" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "Неважећи тип кључа за дешифровање: %s" - -#~ msgid "Please set clearuri" -#~ msgstr "Поставите clearuri" - -#~ msgid "Please set crypturi" -#~ msgstr "Поставите crypturi" - -#~ msgid "Error opening clearuri" -#~ msgstr "clearuri не може да се отвори" - -#~ msgid "No signer specified" -#~ msgstr "Потписник није наведен" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "Неважећи тип кључа за верификовање: %s" - -#~ msgid "Invalid key id: %s" -#~ msgstr "Неважећи ИБ кључа: %s" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "Листа УРИ-ја сервера кључева за претрагу удаљених ПГП кључева. У каснијим " -#~ "верзијама име за приказ се може додати, придодајући размак и затим име." - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "Аутоматски преузети кључеве" - -#~ msgid "Auto Sync Keys" -#~ msgstr "Аутоматски синхронизовати кључеве" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "Контролише видљивост колоне за рок у управљачу кључевима." - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "Контролише видљивост колоне за поверење у управљачу кључевима." - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "Контролише видљивост колоне за тип у управљачу кључевима." - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "Контролише видљивост колоне за исправност у управљачу кључевима." - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "Омогућити DNS-SD дељење" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "Омогућава DNS-SD (Apple Bonjour) дељење кључева. Мора бити покренут " -#~ "услужни програм Морског коњића са уграђеном подршком за HKP и DNS-SD." - -#~ msgid "ID of the default key" -#~ msgstr "ИБ подразумеваног кључа" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "" -#~ "Ако је постављен на тачно, тада ће датотеке шифроване помоћу seahorse-а " -#~ "бити ASCII оклопно шифровани." - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "" -#~ "Уколико је постављено, онда ће се подразумевани кључ увек додавати у " -#~ "списак прималаца са шифровањем." - -#~ msgid "Last key server search pattern" -#~ msgstr "Последњи шаблон претраге сервера кључева" - -#~ msgid "Last key servers used" -#~ msgstr "Последњи сервери кључева су искоришћени." - -#~ msgid "Last key used to sign a message." -#~ msgstr "Употребљен последњи кључ за потписивање поруке." - -#~ msgid "PGP Key servers" -#~ msgstr "PGP сервери кључева" - -#~ msgid "Publish keys to this key server." -#~ msgstr "Објавити кључеве на овом серверу кључева." - -#~ msgid "Show expires column in key manager" -#~ msgstr "Прикажи колону за рок у управљачу кључевима" - -#~ msgid "Show trust column in key manager" -#~ msgstr "Прикажи колону за поверење у управљачу кључевима" - -#~ msgid "Show type column in key manager" -#~ msgstr "Прикажи колону за тип у управљачу кључевима" - -#~ msgid "Show validity column in key manager" -#~ msgstr "Прикажи колону за исправност у управљачу кључевима" - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "Навести колону по којој треба сортирати прозор прималаца. Колоне су: " -#~ "’име’ и ’ИБ’. Ставити ’-’ испред имена колоне за сортирање по опадајућем " -#~ "редоследу." - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "Колоне по којима треба сортирати главни прозор уредника кључева за " -#~ "Морског коњића. Могуће колоне су: „name“ (име), „id“ (ИБ), " -#~ "„validity“ (исправност), „expires“ (време истека), „trust“ (поверење), и " -#~ "„type“ (врста). Ставити ’-’ испред имена колоне да би сортирали по " -#~ "опадајућем редоследу." - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "ИБ последњег тајног кључа искоришћеног за потписивање поруке." - -#~ msgid "The column to sort the recipients by" -#~ msgstr "По којој колони ређати примаоце" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "По којој колони ређати кључеве морског коња" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "" -#~ "Сервер кључева на који треба објавити PGP кључеве. Или испразнити да би " -#~ "зауставили објављивање ПГП кључева." - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "" -#~ "Последњи сервер кључева на основу ког је извршена претрага или је празно " -#~ "за употребу свих сервера кључева." - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "Последња шема претраге сервера кључева." - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "" -#~ "Ово одређује подразумевани кључ који ће се користити за одређене " -#~ "операције, првенствено за потписивање." - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "" -#~ "Били или не кључеви требају аутоматски бити преузети са сервера кључева." - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "" -#~ "Били или не модификовани кључеви требају аутоматски бити синхронизовани " -#~ "са подразумеваним серверима кључева." - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "Да ли да увек шифрује према уобичајеном кључу" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "Да ли да користи ASCII оклоп" - -#~ msgid "Web Password" -#~ msgstr "Лозинка за веб" - -#~ msgid "Network Password" -#~ msgstr "Лозинка за мрежу" - -#~ msgid "Couldn't set application access." -#~ msgstr "Не могу да поставим приступ апликацији." - -#~ msgid "Path:" -#~ msgstr "Путања:" - -#~ msgid "Permissions:" -#~ msgstr "Дозволе:" - -#~ msgid "Applications" -#~ msgstr "Апликације" - -#~ msgid "_Read" -#~ msgstr "_Читај" - -#~ msgid "_Write" -#~ msgstr "_Пиши" - -#~ msgctxt "infinitive" -#~ msgid "_Delete" -#~ msgstr "_Обриши" - -#~ msgid "Saving item..." -#~ msgstr "Чувам ставку..." - -#~ msgid "Listing password keyrings" -#~ msgstr "Списак привезака за лозинке" - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "Ниједан кључ за шифровање није нађен са којим би се обавила захтевана " -#~ "операција. Програм Лозинке и кључеви шифровања ће сада бити " -#~ "покренут да бисте могли да или направите кључ или увезете постојећи." - -#~ msgid "All Keys" -#~ msgstr "Сви кључеви" - -#~ msgid "Selected Recipients" -#~ msgstr "Изабрани примаоци" - -#~ msgid "Search Results" -#~ msgstr "Резултати претраге" - -#~ msgid "Search _for:" -#~ msgstr "Претрага за:" - -#~ msgid "None (Don't Sign)" -#~ msgstr "Ниједан (не потписивати)" - -#~ msgid "Sign this message as %s" -#~ msgstr "Потписати поруку као %s" - -#~ msgid "_Sign message as:" -#~ msgstr "Потпи_сати поруку као:" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Ово није исправна .desktop датотека" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Није познато издање „%s“ десктоп датотеке" - -#~ msgid "Starting %s" -#~ msgstr "Покрећем %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Програм не прихвата документе из командне линије" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Непозната опција при покретању: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Не могу да проследим адресу документа у „Type=Link“ унос десктоп датотеке" - -#~ msgid "Not a launchable item" -#~ msgstr "Не можете да покренете ову ставку" - -#~ msgid "Disable connection to session manager" -#~ msgstr "Онемогући везу са управником сесије" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Одаберите датотеку која садржи сачувана подешавања" - -#~ msgid "FILE" -#~ msgstr "ДАТОТЕКА" - -#~ msgid "Specify session management ID" -#~ msgstr "Одаберите ИБ управника сесије" - -#~ msgid "Session management options:" -#~ msgstr "Могућности управника сесије:" - -#~ msgid "Show session management options" -#~ msgstr "Прикажи могућности управника сесије" - -#~ msgid "Key Imported" -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "Кључ је увежен" -#~ msgstr[1] "Кључ је увежен" -#~ msgstr[2] "Кључеви су увежени" -#~ msgstr[3] "Кључ је увежен" - -#~ msgid "Imported %i key" -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "Увезен %i кључ" -#~ msgstr[1] "Увезен %i кључ" -#~ msgstr[2] "Увезено %i кључева" -#~ msgstr[3] "Увезен %i кључ" - -#~ msgid "Imported a key for" -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "Увежен кључ за" -#~ msgstr[1] "Увежен кључ за" -#~ msgstr[2] "Увежени кључеви за" -#~ msgstr[3] "Увежен кључ за" - -#~ msgid "Notification Messages" -#~ msgstr "Обавештајне поруке" - -#~ msgid "Symmetric Key" -#~ msgstr "Симетрични кључ" - -#~ msgid "Public Key" -#~ msgstr "Јавни кључ" - -#~ msgid "Private Key" -#~ msgstr "Приватни кључ" - -#~ msgid "Credentials" -#~ msgstr "Акредитиви" - -#~ msgid "Identity" -#~ msgstr "Идентитет" - -#~ msgid "Progress Title" -#~ msgstr "Наслов напредовања" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "Не могу да покренем „file-roller“" - -#~ msgid "Couldn't package files" -#~ msgstr "Не могу да упакујем датотеке" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "Управљач архивом није исправно окончан" - -#~ msgid "Loading Keys..." -#~ msgstr "Учитавам кључеве..." - -#~ msgid "Searching for keys..." -#~ msgstr "Тражим кључеве..." - -#~ msgid "Uploading keys..." -#~ msgstr "Слање кључева..." - -#~ msgid "Retrieving keys..." -#~ msgstr "Преузимање кључева..." - -#~ msgid "Searching for keys on: %s" -#~ msgstr "Тражим кључеве на: %s" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "Тражим кључеве који садрже '%s'..." - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "Тражим ИБ кључа '%s'..." - -#~ msgid "Retrieving remote keys..." -#~ msgstr "Преузимам удаљене кључеве..." - -#~ msgid "Sending keys to key server..." -#~ msgstr "Шаљем кључеве на сервер кључева" - -#~ msgid "Synchronizing keys" -#~ msgstr "Усаглашавање кључева" - -#~ msgid "Encryption Key Manager" -#~ msgstr "Уредник кључева за шифровање" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Invalid" -#~ msgstr "Неважеће" - -#~ msgid "Private Secure Shell Key" -#~ msgstr "Кључ приватног осигураног командног окружења" - -#~ msgid "Public Secure Shell Key" -#~ msgstr "Кључ јавног осигураног командног окружења" - -#~ msgid "Secure Shell key" -#~ msgstr "Кључ осигураног командног окружења" - -#~ msgid "Passphrase:" -#~ msgstr "Лозинка:" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "Унесите лозинку за ваш нови кључ осигураног командног окружења." - -#~ msgid "Couldn't share keys" -#~ msgstr "Немогуће делити кључеве" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "Не могу објавити на мрежи информације о проналасцима." - -#~ msgid "%s's encryption keys" -#~ msgstr "%s's кључеви шифрирања" - -#~ msgid "Key Sharing" -#~ msgstr "Дељење кључева" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "Дељење ваших кључева омогућава другим људима на вашој мрежи да користе " -#~ "кључеве које сте сакупили. Ово значи да они могу шифровати ствари уместо " -#~ "вас или оних које ви знате, а да им нисте послали ваш кључ.\n" -#~ "\n" -#~ "Напомена: Ваши лични кључеви неће бити компромитовани." - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "_Дели моје кључеве са другима на мојој мрежи" - -#~ msgid "Seahorse Daemon" -#~ msgstr "Услужни програм Морског коњића" - -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "X кључева је изабрано за синхронизацију" - -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "" -#~ "Један или више избрисаних кључева су приватни. Да ли желите да наставите?" - -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" - -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" diff -Nru seahorse-3.2.2/po/sv.po seahorse-3.6.3/po/sv.po --- seahorse-3.2.2/po/sv.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/sv.po 2012-08-21 12:23:19.000000000 +0200 @@ -1,14 +1,14 @@ # Swedish messages for seahorse. -# Copyright (C) 2001-2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # Christian Rose , 2001, 2003, 2004. -# Daniel Nylander , 2006, 2007, 2008, 2009, 2010, 2011. +# Daniel Nylander , 2006, 2007, 2008, 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-18 19:35+0200\n" -"PO-Revision-Date: 2011-09-18 19:36+0100\n" +"POT-Creation-Date: 2012-03-01 11:33+0100\n" +"PO-Revision-Date: 2012-03-01 11:49+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -22,21 +22,71 @@ msgstr "Lägg till lösenordsnyckelring" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Nytt nyckelringsnamn:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "Please choose a name for the new keyring. You will be prompted for an unlock password." msgstr "Välj ett namn för den nya nyckelringen. Du kommer att bli tillfrågad efter ett upplåsningslösenord." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Nytt nyckelringsnamn:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Värdnamnet eller adressen för servern." -#: ../gkr/seahorse-gkr-add-item.c:61 -#: ../gkr/seahorse-gkr-add-keyring.c:72 +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Ny lösenordsnyckelring" + +#: ../gkr/seahorse-gkr-actions.c:82 +#: ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Används för att lagra program- och nätverkslösenord" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Nytt lösenord..." + +#: ../gkr/seahorse-gkr-actions.c:84 +#: ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Lagra ett lösenord eller hemlighet på ett säkert sätt." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Lösenordsnyckelring" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Lagrat lösenord" + +#: ../gkr/seahorse-gkr-actions.c:151 +msgid "Couldn't set default keyring" +msgstr "Kunde inte ställa in standardnyckelringen" + +#: ../gkr/seahorse-gkr-actions.c:183 +msgid "Couldn't change keyring password" +msgstr "Kunde inte ändra lösenord för nyckelring" + +#: ../gkr/seahorse-gkr-actions.c:209 +msgid "_Set as default" +msgstr "_Ange som standard" + +#: ../gkr/seahorse-gkr-actions.c:210 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Program lagrar vanligtvis nya lösenord i standardnyckelringen." + +#: ../gkr/seahorse-gkr-actions.c:211 +msgid "Change _Password" +msgstr "Ändra _lösenord" + +#: ../gkr/seahorse-gkr-actions.c:212 +msgid "Change the unlock password of the password storage keyring" +msgstr "Ändra upplåsningslösenordet för nyckelring för lösenordslagring" + +#: ../gkr/seahorse-gkr-add-item.c:60 +#: ../gkr/seahorse-gkr-add-keyring.c:71 msgid "Couldn't add keyring" msgstr "Kunde inte lägga till nyckelring" @@ -45,282 +95,259 @@ msgstr "Lägg till lösenord" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 +#: ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Beskrivning:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "N_yckelring:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Lösenord:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Visa lösen_ord" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Kunde inte ta bort objektet" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "N_yckelring:" + +#: ../gkr/seahorse-gkr-backend.c:99 +msgid "Passwords" +msgstr "Lösenord" + +#: ../gkr/seahorse-gkr-backend.c:102 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Lagrade personliga lösenord, inloggningsuppgifter och hemligheter" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:317 +msgid "IM account password for " +msgstr "Lösenord för snabbmeddelandekonto för " + +#: ../gkr/seahorse-gkr-item.c:383 +msgid "Password or secret" +msgstr "Lösenord eller hemlighet" + +#: ../gkr/seahorse-gkr-item.c:384 +msgid "Network password" +msgstr "Nätverkslösenord" + +#: ../gkr/seahorse-gkr-item.c:385 +msgid "Stored note" +msgstr "Lagrad anteckning" + +#: ../gkr/seahorse-gkr-item.c:386 +msgid "Keyring password" +msgstr "Lösenord för nyckelring" + +#: ../gkr/seahorse-gkr-item.c:387 +msgid "Encryption key password" +msgstr "Lösenord för krypteringsnyckel" + +#: ../gkr/seahorse-gkr-item.c:388 +msgid "Key storage password" +msgstr "Lösenord för nyckellagring" + +#: ../gkr/seahorse-gkr-item.c:389 +msgid "Google Chrome password" +msgstr "Lösenord för Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:390 +msgid "Gnome Online Accounts password" +msgstr "Lösenord för Gnome-nätkonton" + +#: ../gkr/seahorse-gkr-item.c:391 +msgid "Telepathy password" +msgstr "Lösenord för Telepathy" + +#: ../gkr/seahorse-gkr-item.c:392 +msgid "Instant messaging password" +msgstr "Lösenord för snabbmeddelanden" + +#: ../gkr/seahorse-gkr-item.c:393 +msgid "Network Manager secret" +msgstr "Hemlighet för Nätverkshanterare" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Är du säker på att du vill ta bort lösenordet \"%s\"?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:86 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Är du säker på att du vill ta bort %d lösenord?" msgstr[1] "Är du säker på att du vill ta bort %d lösenord?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Tar bort objektet" -msgstr[1] "Tar bort objekten" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a network share or resource" msgstr "Kom åt en nätverksutdelning eller resurs" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Access a website" msgstr "Kom åt en webbplats" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a PGP key" msgstr "Låser upp en PGP-nyckel" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Unlocks a Secure Shell key" msgstr "Låser upp en Secure Shell-nyckel" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:81 msgid "Saved password or login" msgstr "Sparade lösenord eller inloggning" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:105 msgid "Network Credentials" msgstr "Nätverksinloggning" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:110 msgid "Password" msgstr "Lösenord" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:210 msgid "Couldn't change password." msgstr "Kunde inte ändra lösenord." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:255 +#: ../gkr/seahorse-gkr-item-properties.c:376 msgid "Updating password" msgstr "Uppdaterar lösenordet" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:336 msgid "Couldn't set description." msgstr "Kunde inte ställa in beskrivning." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Lösenord:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Tekniska detaljer:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Detaljer" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Nyckelegenskaper" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Nyckel" +msgid "Use:" +msgstr "Användning:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Nyckelegenskaper" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +msgid "Type:" +msgstr "Typ:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Inloggningsnamn:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Server:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Inloggningsnamn:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Visa löse_nord" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Typ:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Användning:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Lösenord: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Lösenord: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "Lösenordsnyckelring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Används för att lagra program- och nätverkslösenord" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Lagrat lösenord" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Lagra ett lösenord eller hemlighet på ett säkert sätt." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Kunde inte låsa upp nyckelringen" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Kunde inte låsa nyckelringen" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Kunde inte ställa in standardnyckelringen" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Kunde inte ändra lösenord för nyckelring" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Lås" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "Lock the password storage keyring so a master password is required to unlock it." -msgstr "Lås nyckelring för lösenordslagring så ett huvudlösenord krävs för att låsa upp den." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "Lås _upp" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "Unlock the password storage keyring with a master password so it is available for use." -msgstr "Lås upp nyckelring för lösenordslagring med ett huvudlösenord så att den är tillgänglig för användning." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Ange som standard" +msgid "Password:" +msgstr "Lösenord:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Program lagrar vanligtvis nya lösenord i standardnyckelringen." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +msgid "Key" +msgstr "Nyckel" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Ändra _lösenord" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Technical Details:" +msgstr "Tekniska detaljer:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Ändra upplåsningslösenordet för nyckelring för lösenordslagring" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "Details" +msgstr "Detaljer" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Kunde inte ta bort nyckelringen" +#: ../gkr/seahorse-gkr-keyring.c:147 +msgid "Login keyring" +msgstr "Inloggningsnyckelring" + +#: ../gkr/seahorse-gkr-keyring.c:676 +msgid "A keyring that is automatically unlocked on login" +msgstr "En nyckelring som automatiskt låses upp vid inloggning" + +#: ../gkr/seahorse-gkr-keyring.c:677 +msgid "A keyring used to store passwords" +msgstr "En nyckelring som används för att lagra lösenord" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "Är du säker på att du vill ta bort lösenordsnyckelringen \"%s\"?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Tar bort nyckelringen" -msgstr[1] "Tar bort nyckelringarna" +#: ../gkr/seahorse-gkr-keyring-deleter.c:83 +msgid "I understand that all items will be permanently deleted." +msgstr "Jag förstår att alla objekt kommer tas bort permanent." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Egenskaper för nyckelring" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Namn:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 msgid "Created:" msgstr "Skapad:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Nyckelring" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Egenskaper för nyckelring" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Namn:" - -#: ../gkr/seahorse-gkr-operation.c:52 +#: ../gkr/seahorse-gkr-operation.c:54 #: ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 -#: ../ssh/seahorse-ssh-operation.c:193 +#: ../pgp/seahorse-hkp-source.c:585 +#: ../ssh/seahorse-ssh-operation.c:194 msgid "The operation was cancelled" msgstr "Åtgärden avbröts" -#: ../gkr/seahorse-gkr-operation.c:57 +#: ../gkr/seahorse-gkr-operation.c:59 msgid "Access to the key ring was denied" msgstr "Åtkomst till nyckelringen nekades" -#: ../gkr/seahorse-gkr-operation.c:60 +#: ../gkr/seahorse-gkr-operation.c:62 msgid "The gnome-keyring daemon is not running" msgstr "Demonen gnome-keyring kör inte" -#: ../gkr/seahorse-gkr-operation.c:63 +#: ../gkr/seahorse-gkr-operation.c:65 msgid "The key ring has already been unlocked" msgstr "Nyckelringen har redan låsts upp" -#: ../gkr/seahorse-gkr-operation.c:66 +#: ../gkr/seahorse-gkr-operation.c:68 msgid "No such key ring exists" msgstr "Ingen sådan nyckelring finns" -#: ../gkr/seahorse-gkr-operation.c:69 +#: ../gkr/seahorse-gkr-operation.c:71 msgid "Couldn't communicate with key ring daemon" msgstr "Kunde inte kommunicera med nyckelringsdemonen" -#: ../gkr/seahorse-gkr-operation.c:72 +#: ../gkr/seahorse-gkr-operation.c:74 msgid "The item already exists" msgstr "Objektet finns redan" -#: ../gkr/seahorse-gkr-operation.c:78 +#: ../gkr/seahorse-gkr-operation.c:80 msgid "Internal error accessing gnome-keyring" msgstr "Internt fel vid åtkomst till gnome-keyring" @@ -583,270 +610,324 @@ msgstr "%u.%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "initialt temporärt objekt" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Lägg till nyckelserver" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Värd:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Typ av nyckelserver:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Värd:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "Porten att komma åt servern på." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "initialt temporärt objekt" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Bidrag:" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Lösenfras" +#: ../libseahorse/seahorse-catalog.c:112 +#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:668 +#: ../src/seahorse-main.c:68 +msgid "Passwords and Keys" +msgstr "Lösenord och nycklar" -#: ../libseahorse/seahorse-passphrase.c:183 -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Lösenord:" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Daniel Nylander \n" +"Christian Rose\n" +"\n" +"Skicka synpunkter på översättningen till\n" +"." -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Bekräfta:" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse-projektets webbplats" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Inte en giltig adress för en nyckelserver." +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Kunde inte ta bort" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "For help contact your system adminstrator or the administrator of the key server." -msgstr "Kontakta din systemadminstratör eller administratören för nyckelservern för hjälp." +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Kunde inte exportera nycklar" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "Url" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Kunde inte exportera data" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Anpassad" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Arkiv" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Ingen: Publicera inga nycklar" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "E_xportera..." -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Hämta nycklar automatiskt från _nyckelservrar" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Exportera till en fil" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Synkronisera automatiskt _ändrade nycklar med nyckelservrar" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "R_edigera" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Nyckelservrar" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Kopiera till urklipp" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Inställningar" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 +#: ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Ta bort" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Hitta nycklar via:" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Ta bort markerade objekt" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Publicera nycklar på:" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Visa egenskaper för detta objekt" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Visa egenskaper för denna nyckelring" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Tar emot data" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Inställni_ngar" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Exporterar data" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Ändra inställningar för detta program" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Importerar data" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Visa" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Skickar data" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Hjälp" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Otillgänglig" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Om detta program" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Innehåll" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Nyckeldata" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Visa hjälp för Seahorse" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Flera nycklar" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +msgid "Export" +msgstr "Exportera" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Alla nyckelfiler" +#: ../libseahorse/seahorse-interaction.c:100 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Ange PIN-kod eller lösenord för: %s" -#: ../libseahorse/seahorse-util.c:745 -#: ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Alla filer" +#: ../libseahorse/seahorse-passphrase.c:182 +#: ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Lösenord:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Arkivfiler" +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:244 +msgid "Confirm:" +msgstr "Bekräfta:" -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"En fil finns redan med detta namn.\n" -"\n" -"Vill du ersätta den med en ny fil?" +#: ../libseahorse/seahorse-prefs.c:66 +msgid "Not a valid Key Server address." +msgstr "Inte en giltig adress för en nyckelserver." + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "For help contact your system adminstrator or the administrator of the key server." +msgstr "Kontakta din systemadminstratör eller administratören för nyckelservern för hjälp." + +#: ../libseahorse/seahorse-prefs.c:180 +msgid "URL" +msgstr "Url" + +#: ../libseahorse/seahorse-prefs.c:350 +msgid "Custom" +msgstr "Anpassad" + +#: ../libseahorse/seahorse-prefs.c:403 +msgid "None: Don't publish keys" +msgstr "Ingen: Publicera inga nycklar" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "Inställningar" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_Hitta nycklar via:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_Publicera nycklar på:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Hämta nycklar automatiskt från _nyckelservrar" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Synkronisera automatiskt _ändrade nycklar med nyckelservrar" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Nyckelservrar" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Ersätt" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 #: ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1248 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Okänd" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1254 msgctxt "Validity" msgid "Never" msgstr "Aldrig" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1261 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Marginell" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Fullständig" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Förbehållslös" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1463 msgid "Disabled" msgstr "Inaktiverat" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1459 msgid "Revoked" msgstr "Spärrad" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:473 #, c-format msgid "Could not display help: %s" msgstr "Kunde inte visa hjälp: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Utgångsdatum:" +msgid "Never E_xpires" +msgstr "Utgår _aldrig" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Generera en ny undernyckel" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Om nyckeln aldrig går ut" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Nyckel_typ:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Nyckel_längd:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Nyckel_typ:" +msgid "Expiration Date:" +msgstr "Utgångsdatum:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Nyckelns längd" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Utgår _aldrig" +msgid "Generate a new subkey" +msgstr "Generera en ny undernyckel" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Lägg till användaridentitet" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Skapa ny användaridentitet" +msgid "Must be at least 5 characters long" +msgstr "Måste vara minst 5 tecken lång" #: ../pgp/seahorse-add-uid.xml.h:3 -#: ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Fullständigt _namn:" +msgid "Optional email address" +msgstr "Valfri e-postadress" #: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Nyckelko_mmentar:" +msgid "Optional comment describing key" +msgstr "Valfri kommentar som beskriver nyckeln" #: ../pgp/seahorse-add-uid.xml.h:5 -msgid "Must be at least 5 characters long" -msgstr "Måste vara minst 5 tecken lång" +#: ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Fullständigt _namn:" #: ../pgp/seahorse-add-uid.xml.h:6 -msgid "Optional comment describing key" -msgstr "Valfri kommentar som beskriver nyckeln" +#: ../pgp/seahorse-pgp-generate.xml.h:6 +msgid "_Email Address:" +msgstr "_E-postadress:" #: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Valfri e-postadress" +msgid "Key Co_mment:" +msgstr "Nyckelko_mmentar:" #: ../pgp/seahorse-add-uid.xml.h:8 -#: ../pgp/seahorse-pgp-generate.xml.h:13 -msgid "_Email Address:" -msgstr "_E-postadress:" +msgid "Create the new user ID" +msgstr "Skapa ny användaridentitet" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Ä_ndra" +msgid "_Never expires" +msgstr "_Går aldrig ut" #: ../pgp/seahorse-expires.xml.h:2 -#: ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Spärra nyckel" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Går aldrig ut" +msgid "C_hange" +msgstr "Ä_ndra" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -858,7 +939,7 @@ msgstr "Lägg till undernyckel till %s" #: ../pgp/seahorse-gpgme-add-subkey.c:197 -#: ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (endast signering)" @@ -867,7 +948,7 @@ msgstr "ElGamal (endast kryptering)" #: ../pgp/seahorse-gpgme-add-subkey.c:211 -#: ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (endast signering)" @@ -905,46 +986,127 @@ msgid "Expiry: %s" msgstr "Utgång: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Flera nycklar" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Nyckeldata" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Textbaserade PGP-nycklar" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP-nycklar" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP-nyckel" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Används för att kryptera e-post och filer" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Kunde inte generera PGP-nyckel" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "Lösenfras för ny PGP-nyckel" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "Ange lösenfrasen för din nya nyckel två gånger." -#: ../pgp/seahorse-gpgme-generate.c:219 +#: ../pgp/seahorse-gpgme-generate.c:223 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Genererar nyckel" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Är du säker på att du vill ta bort %s permanent?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Är du säker på att du permanent vill ta bort %d nyckel?" +msgstr[1] "Är du säker på att du permanent vill ta bort %d nycklar?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Felaktigt lösenord" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Detta var den tredje gången som du angav ett felaktigt lösenord. Försök igen." +#: ../pgp/seahorse-gpgme-keyring.c:90 +#, c-format +msgid "Wrong passphrase." +msgstr "Felaktig lösenfras." + +#: ../pgp/seahorse-gpgme-keyring.c:94 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Ange ny lösenfras för \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:96 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Ange lösenfras för \"%s\"" + +#: ../pgp/seahorse-gpgme-keyring.c:99 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Ange ny lösenfras" + +#: ../pgp/seahorse-gpgme-keyring.c:101 +msgid "Enter passphrase" +msgstr "Ange lösenfras" + +#: ../pgp/seahorse-gpgme-keyring.c:106 +msgid "Passphrase" +msgstr "Lösenfras" + +#: ../pgp/seahorse-gpgme-keyring.c:307 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Läste in %d nyckel" +msgstr[1] "Läste in %d nycklar" + +#: ../pgp/seahorse-gpgme-keyring.c:654 +msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." +msgstr "Ogiltigt nyckeldata (UID:er saknas). Det här kan bero på en dator som har datumet inställt till framtiden eller att en självsignatur saknas." + +#: ../pgp/seahorse-gpgme-keyring.c:814 +msgid "GnuPG keys" +msgstr "GnuPG-nycklar" + +#: ../pgp/seahorse-gpgme-keyring.c:817 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: standardkatalog för nyckelringar" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -975,28 +1137,33 @@ msgid "All JPEG files" msgstr "Alla JPEG-filer" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 +#: ../src/seahorse-key-manager.c:301 +msgid "All files" +msgstr "Alla filer" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Välj foto att lägga till i nyckeln" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Kunde inte förbereda fotot" -#: ../pgp/seahorse-gpgme-photos.c:288 -#: ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 +#: ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Kunde inte lägga till foto" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Filen kunde inte läsas in. Den kan vara i ett ogiltigt format" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Är du säker på att du vill ta bort det aktuellt fotot från din nyckel?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Kunde inte ta bort foto" @@ -1050,7 +1217,12 @@ msgid "Couldn't add revoker" msgstr "Kunde inte lägga till spärr" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 +#: ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Jag förstår att denna hemliga nyckel kommer tas bort permanent." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1065,67 +1237,149 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 -#: ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 +#: ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Inga användbara nycklar för signering" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "You have no personal PGP keys that can be used to indicate your trust of this key." msgstr "Du har inga personliga PGP-nycklar som kan användas för att indikera din tillit till den här nyckeln." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Felaktig lösenfras." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:603 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Ange ny lösenfras för \"%s\"" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "Sökning var inte tillräckligt specifik. Servern \"%s\" hittade för många nycklar." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:606 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Ange lösenfras för \"%s\"" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Kunde inte kommunicera med servern \"%s\": %s" -#: ../pgp/seahorse-gpgme-source.c:95 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Ange ny lösenfras" +#: ../pgp/seahorse-hkp-source.c:1129 +msgid "HTTP Key Server" +msgstr "HTTP-nyckelserver" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Ange lösenfras" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Kunde inte importera nycklar" -#: ../pgp/seahorse-gpgme-source.c:328 -#, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Läste in %d nyckel" -msgstr[1] "Läste in %d nycklar" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Importerar nycklar från nyckelservrar" -#: ../pgp/seahorse-gpgme-source.c:649 -msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." -msgstr "Ogiltigt nyckeldata (UID:er saknas). Det här kan bero på en dator som har datumet inställt till framtiden eller att en självsignatur saknas." +#: ../pgp/seahorse-keyserver-results.c:243 +#: ../src/seahorse-key-manager.c:517 +msgid "_Remote" +msgstr "_Fjärr" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-results.c:245 +msgid "Close this window" +msgstr "Stäng detta fönster" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP-nyckelserver" +#: ../pgp/seahorse-keyserver-results.c:249 +#: ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Sök fjärrnycklar..." + +#: ../pgp/seahorse-keyserver-results.c:250 +#: ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Sök efter nycklar på en nyckelserver" + +#: ../pgp/seahorse-keyserver-results.c:254 +#: ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Importera" + +#: ../pgp/seahorse-keyserver-results.c:255 +msgid "Import selected keys to local key ring" +msgstr "Importera markerade nycklar till lokal nyckelring" + +#: ../pgp/seahorse-keyserver-results.c:285 +msgid "Remote Keys" +msgstr "Fjärrnycklar" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-results.c:287 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "Sökning var inte tillräckligt specifik. Servern \"%s\" hittade för många nycklar." +msgid "Remote Keys Containing '%s'" +msgstr "Fjärrnycklar innehållande \"%s\"" + +#: ../pgp/seahorse-keyserver-results.c:484 +msgid "The search for keys failed." +msgstr "Sökningen efter nycklar misslyckades." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Sök fjärrnycklar" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." +msgstr "Detta kommer att söka nycklar för andra på Internet. Dessa nycklar kan sedan importeras till din lokala nyckelring." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Sök efter nycklar innehållande: " + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Nyckelservrar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Delade nycklar nära mig:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Platser att söka på:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Sök" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Kunde inte publicera nycklar på servern" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Kunde inte kommunicera med servern \"%s\": %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "Kunde inte hämta nycklar från server: %s" + +#: ../pgp/seahorse-keyserver-sync.c:160 +#, c-format +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d nyckel är markerad för synkronisering" +msgstr[1] "%d nycklar är markerade för synkronisering" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Synkroniserar nycklar..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Synkronisera nycklar" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." +msgstr "Detta kommer att publicera nycklarna i din nyckelring så att de blir tillgängliga för andra att använda. Du kan även få de ändringar som andra har gjort sedan du mottog deras nycklar." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." +msgstr "Detta kommer att hämta de ändringar andra har gjort sedan du hämtade deras nycklar. Ingen nyckelserver har valts för publicering, så dina nycklar kommer inte att göras tillgängliga för andra." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Nyckelservrar" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Synkronisera" #: ../pgp/seahorse-ldap-source.c:440 #, c-format @@ -1147,482 +1401,444 @@ msgid "Resolving server address: %s" msgstr "Slår upp serveradress: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1446 msgid "LDAP Key Server" msgstr "LDAP-nyckelserver" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Si_gnera nyckel..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Signera publik nyckel" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Är du säker på att du vill ta bort %s permanent?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Är du säker på att du permanent vill ta bort %d nycklar och identiteter?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Är du säker på att du permanent vill ta bort %d nycklar?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Är du säker på att du permanent vill ta bort %d identiteter?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "Synkronisera och _publicera nycklar..." -#: ../pgp/seahorse-pgp-commands.c:201 -#: ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Kunde inte ta bort användaridentitet" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Publicera och/eller synkronisera dina nycklar med de på nätet." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Kunde inte ta bort privata nyckeln" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Kunde inte ta bort publika nyckeln" +#: ../pgp/seahorse-pgp-backend.c:174 +msgid "PGP Keys" +msgstr "PGP-nycklar" + +#: ../pgp/seahorse-pgp-backend.c:177 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP-nycklar används för att kryptera e-post eller filer" #: ../pgp/seahorse-pgp-generate.xml.h:1 -#: ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Avancerade nyckelalternativ" - -#: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "En PGP-nyckel låter dig kryptera e-post eller filer till andra personer." - -#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "Algorithms here" msgstr "Algoritmer här" -#: ../pgp/seahorse-pgp-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:2 msgid "C_reate" msgstr "Ska_pa" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "U_tgångsdatum:" +#: ../pgp/seahorse-pgp-generate.xml.h:3 +msgid "Generate a new key" +msgstr "Generera en ny nyckel" -#: ../pgp/seahorse-pgp-generate.xml.h:6 -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "Encryption _Type:" -msgstr "Krypterings_typ:" +#: ../pgp/seahorse-pgp-generate.xml.h:4 +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "En PGP-nyckel låter dig kryptera e-post eller filer till andra personer." + +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Kommentar:" #: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Generera en ny nyckel" +msgid "Ne_ver Expires" +msgstr "_Går aldrig ut" #: ../pgp/seahorse-pgp-generate.xml.h:9 -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "Key _Strength (bits):" -msgstr "Nyckel_styrka (bitar):" +#: ../ssh/seahorse-ssh-generate.xml.h:7 +msgid "Encryption _Type:" +msgstr "Krypterings_typ:" #: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Går aldrig ut" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 +msgid "Key _Strength (bits):" +msgstr "Nyckel_styrka (bitar):" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Ny PGP-nyckel" +msgid "E_xpiration Date:" +msgstr "U_tgångsdatum:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Kommentar:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Avancerade nyckelalternativ" -#: ../pgp/seahorse-pgp-key.c:572 -#: ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Utgången" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Personlig PGP-nyckel" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP-nyckel" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Kunde inte ändra primär användaridentitet" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Är du säker på att du vill ta bort \"%s\" permanent?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Kunde inte ta bort användaridentitet" + +#: ../pgp/seahorse-pgp-key-properties.c:428 +#: ../pgp/seahorse-pgp-key-properties.c:1564 msgid "[Unknown]" msgstr "[Okänd]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:535 +#: ../pgp/seahorse-pgp-key-properties.c:1846 msgid "Name/Email" msgstr "Namn/E-post" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:540 msgid "Signature ID" msgstr "Signatur-id" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:673 msgid "Couldn't change primary photo" msgstr "Kunde inte ändra primärt foto" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#: ../pgp/seahorse-pgp-key-properties.c:906 msgid "(unknown)" msgstr "(okänd)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:909 #, c-format msgid "This key expired on: %s" msgstr "Den här nyckeln gick ut den: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:972 msgid "Name" msgstr "Namn" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1085 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Är du säker på att du vill ta bort undernyckel %d av %s permanent?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1094 msgid "Couldn't delete subkey" msgstr "Kunde inte ta bort undernyckel" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1134 +#: ../pgp/seahorse-pgp-key-properties.c:1539 msgid "Unable to change trust" msgstr "Kunde inte ändra tillit" -#: ../pgp/seahorse-pgp-key-properties.c:1142 -#: ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Kan inte exportera nyckel till \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Exportera komplett nyckel" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Kunde inte exportera nyckel." +#: ../pgp/seahorse-pgp-key-properties.c:1147 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Kunde inte exportera nyckeln" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1379 +#: ../pgp/seahorse-pgp-key-properties.c:1468 msgctxt "Expires" msgid "Never" msgstr "Aldrig" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1426 msgid "ID" msgstr "Id" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1429 msgid "Type" msgstr "Typ" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "Created" msgstr "Skapad" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Expires" msgstr "Går ut" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Status" msgstr "Status" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Strength" msgstr "Styrka" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1461 +msgid "Expired" +msgstr "Utgången" + +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Good" msgstr "Bra" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1849 msgid "Key ID" msgstr "Nyckel-id" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Åtgärder" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Kommentar:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Datum" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-post:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Fingeravtryck" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Nyckel-id:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Aldrig" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Nyckelnamn och signaturer" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Den här nyckeln har spärrats" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Foto " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Ägaren av nyckeln har spärrat nyckeln. Den kan inte användas längre." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Tekniska detaljer" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Den här nyckeln har gått ut" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Den här nyckeln har spärrats" +msgid "Add a photo to this key" +msgstr "Lägg till ett foto till denna nyckel" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Den här nyckeln har gått ut" +msgid "Remove this photo from this key" +msgstr "Ta bort det här fotot från nyckeln" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Typ:" +msgid "Make this photo the primary photo" +msgstr "Gör det här fotot till det primära fotot" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Gå till föregående foto" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Användning:" +msgid "Go to next photo" +msgstr "Gå till nästa foto" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Undernycklar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 +msgid "Photo " +msgstr "Foto " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Lägg till" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +msgid "Key ID:" +msgstr "Nyckel-id:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Lägg till ett foto till denna nyckel" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Namn:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Ändra _lösenfras" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 +msgid "Email:" +msgstr "E-post:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Dekryptera filer och din e-post." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgid "Comment:" +msgstr "Kommentar:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Ta bort" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 +#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +msgid "Use:" +msgstr "Användning:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Typ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Utgång" +msgid "Decrypt files and email sent to you." +msgstr "Dekryptera filer och din e-post." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Går ut:" +msgid "Private PGP Key" +msgstr "Privat PGP-nyckel" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Exportera" +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Change _Passphrase" +msgstr "Ändra _lösenfras" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Owner" +msgstr "Ägare" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Gå till nästa foto" +msgid "Key Names and Signatures" +msgstr "Nyckelnamn och signaturer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Gå till föregående foto" +msgid "Primary" +msgstr "Primär" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Nyckel-id:" +msgid "Sign" +msgstr "Signera" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Delete" +msgstr "Ta bort" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Gör det här fotot till det primära fotot" +msgid "_Add Name" +msgstr "_Lägg till namn" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Revoke" +msgstr "Spärra" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 msgid "Names and Signatures" msgstr "Namn och signaturer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Aldrig" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "Key ID:" +msgstr "Nyckel-id:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Åsidosätt ägar_tillit:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Ägare" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 +msgid "Strength:" +msgstr "Styrka:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Primär" +msgid "Technical Details" +msgstr "Tekniska detaljer" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Privat PGP-nyckel" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Ta bort det här fotot från nyckeln" +msgid "Fingerprint" +msgstr "Fingeravtryck" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Spärra" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 +msgid "Expires:" +msgstr "Går ut:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Signera" +msgid "Dates" +msgstr "Datum" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Styrka:" +msgid "Override Owner _Trust:" +msgstr "Åsidosätt ägar_tillit:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Ägaren av nyckeln har spärrat nyckeln. Den kan inte användas längre." +msgid "_Export Complete Key:" +msgstr "_Exportera komplett nyckel:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Actions" +msgstr "Åtgärder" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Add" +msgstr "Lägg till" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Lägg till namn" +msgid "Expire" +msgstr "Utgång" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 -msgid "_Export Complete Key:" -msgstr "_Exportera komplett nyckel:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Namn:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "_Subkeys" +msgstr "_Undernycklar" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Datum:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Marginellt" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Fingeravtryck:" +msgid "Fully" +msgstr "Fullständigt" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Indikera tillit:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Din tillit för den här nyckeln" +msgid "Ultimately" +msgstr "Förbehållslöst" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "_Other Names:" -msgstr "_Andra namn:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +msgid "Encrypt files and email to the key's owner " +msgstr "Kryptera filer och e-post till ägaren av nyckeln " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Personer som har signerat den här nyckeln:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Public PGP Key" +msgstr "Publik PGP-nyckel" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Kryptera filer och e-post till ägaren av nyckeln " +msgid "_Other Names:" +msgstr "_Andra namn:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Fullständigt" +msgid "Your trust of this key" +msgstr "Din tillit för den här nyckeln" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +msgid "Your trust is manually specified on the Details tab." +msgstr "Din tillit anges manuellt under fliken Detaljer." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Jag litar på signaturer från \"%s\" på andra nycklar " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:27 #, no-c-format msgid "If you believe that the person that owns this key is '%s', sign this key:" msgstr "Du kan signera den här nyckeln om du vet att personen som äger denna nyckel är \"%s\":" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +msgid "_Sign this Key" +msgstr "_Signera denna nyckel" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "Du kan spärra din signatur om du inte längre litar på att \"%s\" äger den här nyckeln:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Marginellt" +msgid "_Revoke Signature" +msgstr "_Spärra signatur" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Publik PGP-nyckel" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 +msgid "_People who have signed this key:" +msgstr "_Personer som har signerat den här nyckeln:" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 +msgid "_Only display the signatures of people I trust" +msgstr "_Visa endast signaturer för personer som jag litar på" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 msgid "Trust" msgstr "Tillit" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Förbehållslöst" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Du _litar på ägaren:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Fingerprint:" +msgstr "Fingeravtryck:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Din tillit anges manuellt under fliken Detaljer." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Dates:" +msgstr "Datum:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Visa endast signaturer för personer som jag litar på" +msgid "Indicate Trust:" +msgstr "Indikera tillit:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Spärra signatur" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Signera denna nyckel" +msgid "You _Trust the Owner:" +msgstr "Du _litar på ägaren:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1630,280 +1846,382 @@ msgstr "Undernyckel %d av %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Valfri beskrivning av spärrning" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Spä_rra" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Anledning för spärr av nyckeln" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Orsak:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Valfri beskrivning av spärrning" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "Spä_rra" + +#: ../pgp/seahorse-signer.c:63 msgid "You have no personal PGP keys that can be used to sign a document or message." msgstr "Du har inga personliga PGP-nycklar som kan användas för att signera ett dokument eller meddelande." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Signera meddelande med nyckel:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Hur noggrant har du kontrollerat denna nyckel?" +msgid "Sign Key" +msgstr "Signera nyckel" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Hur andra kommer att se den här signaturen:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Genom att signera visar du din tillit till att den här nyckeln tillhör:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Signera nyckeln som:" +msgid "Key Name" +msgstr "Nyckelnamn" #: ../pgp/seahorse-sign.xml.h:4 -msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. " -msgstr "Flyktigt: betyder att du har gjort en snabb validering att nyckeln ägs av personen som hävdar sig att vara ägare av den. Du kan till exempel läsa upp nyckelns fingeravtryck till ägaren via telefon. " +msgid "How carefully have you checked this key?" +msgstr "Hur noggrant har du kontrollerat denna nyckel?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Nyckelnamn" +msgid "_Not at all" +msgstr "_Inte alls" #: ../pgp/seahorse-sign.xml.h:6 -msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." -msgstr "Inte alls: betyder att du tror att nyckeln ägs av personen som hävdar sig att vara ägaren av den, men du kunde inte eller validerade inte att detta verkligen stämde." +msgid "_Casually" +msgstr "_Flyktigt" #: ../pgp/seahorse-sign.xml.h:7 -msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." -msgstr "Mycket noggrant: Välj endast det här alternativet om du absolut är säker på att den här nyckeln är genuin." +msgid "_Very Carefully" +msgstr "_Mycket noggrant" #: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Genom att signera visar du din tillit till att den här nyckeln tillhör:" +msgid "Not at all: means you believe the key is owned by the person who claims to own it, but you could not or did not verify this to be a fact." +msgstr "Inte alls: betyder att du tror att nyckeln ägs av personen som hävdar sig att vara ägaren av den, men du kunde inte eller validerade inte att detta verkligen stämde." #: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Jag kan _spärra den här signaturen senare." +msgid "Casually: means you have done a casual verification that the key is owned by the person who claims to own it. For example, you could read the key fingerprint to the owner over the phone. " +msgstr "Flyktigt: betyder att du har gjort en snabb validering att nyckeln ägs av personen som hävdar sig att vara ägare av den. Du kan till exempel läsa upp nyckelns fingeravtryck till ägaren via telefon. " #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Signera nyckel" +msgid "Very Carefully: Select this only if you are absolutely sure that this key is genuine." +msgstr "Mycket noggrant: Välj endast det här alternativet om du absolut är säker på att den här nyckeln är genuin." #: ../pgp/seahorse-sign.xml.h:11 msgid "You could use a hard to forge photo identification (such as a passport) to personally check that the name on the key is correct. You should have also used email to check that the email address belongs to the owner." msgstr "Du kan använda en svårförfalskad fotoidentifikation (såsom ett pass) för att personligen kontrollera att namnet på nyckeln är korrekt. Du bör även skicka ett e-postmeddelande för att kontrollera att e-postadress tillhör ägaren. " #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Flyktigt" +msgid "How others will see this signature:" +msgstr "Hur andra kommer att se den här signaturen:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Inte alls" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Andra får inte se den här signaturen" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Jag kan _spärra den här signaturen senare." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Signera" +msgid "Sign key as:" +msgstr "Signera nyckeln som:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Signerare:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Mycket noggrant" +msgid "_Sign" +msgstr "_Signera" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Signera meddelande med nyckel:" +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Exporterar data" + +#: ../pgp/seahorse-transfer.c:237 +#: ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Tar emot data" + +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Importerar data" + +#: ../pgp/seahorse-transfer.c:240 +#: ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Skickar data" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Otillgänglig" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Personligt certifikat och nyckel" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Personligt certifikat" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Certifikat" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "Kunde inte ta bort" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Certifikat (DER-kodade)" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Är du säker på att du vill ta bort certifikatet \"%s\"?" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Certifikat" -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Är du säker på att du vill ta bort %d certifikat?" -msgstr[1] "Är du säker på att du vill ta bort %d certifikat?" +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509-certifikat och relaterade nycklar" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Är du säker på att du permanent vill ta bort %d identitet?" +msgstr[1] "Är du säker på att du permanent vill ta bort %d identiteter?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Kunde inte generera privat nyckel" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Skapa" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Privat nyckel" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Används för att begära ett certifikat" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Skapa en ny personlig nyckel" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etikett:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Lagrad i:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Jag förstår att denna nyckel kommer tas bort permanent." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Namnlös" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Misslyckades med att exportera certifikatet" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 +#: ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Kunde inte ta bort" -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Tar bort" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "E_xportera" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Exportera certifikatet" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Ta bort detta certifikat eller nyckel" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Begär _certifikat" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Skapa en fil för certifikatbegäran för denna nyckel" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Kunde inte spara certifikatbegäran" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Spara certifikatbegäran" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Certifikatbegäran" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM-kodad begäran" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Kunde inte skapa certifikatbegäran" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Skapa en fil för certifikatbegäran." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Common Name (CN) placerad i certifikatbegäran." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Namn (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Namnlös privat nyckel" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Ändra lösenfras" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Bekräfta lösenfras:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Ny _lösenfras:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Bekräfta ny lösenfras" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Ny _lösenfras:" +msgid "Con_firm Passphrase:" +msgstr "_Bekräfta lösenfras:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Hantera dina lösenord och krypteringsnycklar" -#: ../src/seahorse.desktop.in.in.h:2 -#: ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 -#: ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Lösenord och nycklar" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Fortsätt" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Välj vilket sorts objekt som du vill skapa:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "F_ortsätt" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Skapa ny ..." - -#: ../src/seahorse-key-manager.c:251 -#: ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d nyckel markerad" -msgstr[1] "%d nycklar markerade" - -#: ../src/seahorse-key-manager.c:431 -#: ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 -#: ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Kunde inte importera nycklar" - -#: ../src/seahorse-key-manager.c:433 -#: ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Importerade nycklar" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Importerar nycklar" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Importering misslyckades" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Importera" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Data att importeras:" -#: ../src/seahorse-key-manager.c:504 -#: ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:255 +#: ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Importera nyckel" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Okänd nyckeltyp, eller ogiltigt dataformat" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Importerar nycklar" +#: ../src/seahorse-key-manager.c:267 +msgid "All key files" +msgstr "Alla nyckelfiler" -#: ../src/seahorse-key-manager.c:737 -#: ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Fjärr" +#: ../src/seahorse-key-manager.c:368 +msgid "Dropped text" +msgstr "Släppt text" + +#: ../src/seahorse-key-manager.c:391 +msgid "Clipboard text" +msgstr "Urklippstext" + +#: ../src/seahorse-key-manager.c:518 +msgid "_New" +msgstr "_Ny" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:520 msgid "Close this program" msgstr "Stäng detta program" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:521 +#: ../src/seahorse-key-manager.c:523 msgid "_New..." msgstr "_Ny..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:522 msgid "Create a new key or item" msgstr "Skapa en ny nyckel eller objekt" -#: ../src/seahorse-key-manager.c:742 +#: ../src/seahorse-key-manager.c:524 +msgid "Add a new key or item" +msgstr "Lägg till en ny nyckel eller objekt" + +#: ../src/seahorse-key-manager.c:525 msgid "_Import..." msgstr "_Importera..." -#: ../src/seahorse-key-manager.c:743 +#: ../src/seahorse-key-manager.c:526 msgid "Import from a file" msgstr "Importera från en fil" -#: ../src/seahorse-key-manager.c:745 +#: ../src/seahorse-key-manager.c:528 msgid "Import from the clipboard" msgstr "Importera från urklipp" -#: ../src/seahorse-key-manager.c:750 -#: ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_Sök fjärrnycklar..." - -#: ../src/seahorse-key-manager.c:751 -#: ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Sök efter nycklar på en nyckelserver" +#: ../src/seahorse-key-manager.c:532 +msgid "By _keyring" +msgstr "Efter n_yckelring" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show sidebar listing keyrings" +msgstr "Visa listning av nyckelringar i sidopanel" + +#: ../src/seahorse-key-manager.c:537 +msgid "Show _personal" +msgstr "Visa p_ersonliga" + +#: ../src/seahorse-key-manager.c:538 +msgid "Only show personal keys, certificates and passwords" +msgstr "Visa endast personliga nycklar, certifikat och lösenord" + +#: ../src/seahorse-key-manager.c:539 +msgid "Show _trusted" +msgstr "Visa _pålitliga" + +#: ../src/seahorse-key-manager.c:540 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Visa endast pålitliga nycklar, certifikat och lösenord" + +#: ../src/seahorse-key-manager.c:541 +msgid "Show _any" +msgstr "Visa _alla" + +#: ../src/seahorse-key-manager.c:542 +msgid "Show all keys, certificates and passwords" +msgstr "Visa alla nycklar, certifikat och lösenord" -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "Synkronisera och _publicera nycklar..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Publicera och/eller synkronisera dina nycklar med de på nätet." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "T_yper" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Visa typkolumnen" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "Utgångs_datum" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Visa utgångskolumnen" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "_Tillit" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Visa ägartillitskolumnen" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "_Giltighet" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Visa giltighetskolumnen" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Filter:" +#: ../src/seahorse-key-manager.c:750 +msgid "Filter" +msgstr "Filter" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -1913,578 +2231,653 @@ msgid "Generate a new key of your own: " msgstr "Generera en ny nyckel åt dig själv: " -#: ../src/seahorse-key-manager.xml.h:3 +#: ../src/seahorse-key-manager.xml.h:4 msgid "Import existing keys from a file:" msgstr "Importera existerande nycklar från en fil:" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Mina personliga nycklar" - #: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Andra _nycklar" - -#: ../src/seahorse-key-manager.xml.h:6 msgid "To get started with encryption you will need keys." msgstr "För att komma igång med kryptering behöver du nycklar." -#: ../src/seahorse-key-manager.xml.h:7 -#: ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Importera" +#: ../src/seahorse-main.c:54 +msgid "Version of this application" +msgstr "Versionsnummer för detta program" -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Lösenord" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Kunde inte låsa" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Kunde inte låsa upp" -#: ../src/seahorse-key-manager-store.c:610 -#: ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Kunde inte exportera nycklar" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Lås" -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Giltighet" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Utgångsdatum" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "Lås _upp" -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Stäng detta fönster" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Egenskaper" -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Fäll ut alla" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Fäll ut alla listningar" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Fäll ihop alla" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Fäll ihop alla listningar" +#: ../ssh/seahorse-ssh-actions.c:88 +msgid "Configure Key for _Secure Shell..." +msgstr "Konfigurera _nyckel för Secure Shell..." -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Fjärrnycklar" +#: ../ssh/seahorse-ssh-actions.c:89 +msgid "Send public Secure Shell key to another machine, and enable logins using that key." +msgstr "Skicka publik Secure Shell-nyckel till en annan dator, och aktivera inloggningar med den nyckeln." -#: ../src/seahorse-keyserver-results.c:333 +#: ../ssh/seahorse-ssh-askpass.c:60 +#: ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Ange din Secure Shell-lösenfras:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Gammal lösenfras för nyckel" + +#: ../ssh/seahorse-ssh-askpass.c:83 #, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Fjärrnycklar innehållande \"%s\"" +msgid "Enter the old passphrase for: %s" +msgstr "Ange den gamla lösenfrasen för: %s" -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Nyckelservrar:" +#: ../ssh/seahorse-ssh-askpass.c:87 +#: ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Ny lösenfras för nyckel" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Delade nycklar nära mig:" +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "Ange den nya lösenfrasen för: %s" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Sök fjärrnycklar" +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Ange den nya lösenfrasen igen: %s" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." -msgstr "Detta kommer att söka nycklar för andra på Internet. Dessa nycklar kan sedan importeras till din lokala nyckelring." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Nycklar används för att säkert ansluta till andra datorer" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Platser att söka på:" +#: ../ssh/seahorse-ssh-deleter.c:81 +#: ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "Är du säker på att du vill ta bort Secure Shell-nyckeln \"%s\"?" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Sök" +#: ../ssh/seahorse-ssh-deleter.c:91 +#: ../ssh/seahorse-ssh-deleter.c:92 +#, c-format +msgid "Are you sure you want to delete %d secure shell keys?" +msgstr "Är du säker på att du vill ta bort %d Secure Shell-nycklar?" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Sök efter nycklar innehållande: " +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH-nyckel" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Hemliga SSH-nycklar" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Publika SSH-nycklar" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Ingen publik nyckelfil finns tillgänglig för denna nyckel." + +#: ../ssh/seahorse-ssh-generate.c:55 +#: ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 +#: ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "Secure Shell-nyckel" -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Kunde inte publicera nycklar på servern" +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "Används för att komma åt andra datorer (t.ex. via en terminal)" -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Kunde inte hämta nycklar från server: %s" +#: ../ssh/seahorse-ssh-generate.c:110 +#: ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "Kunde inte generera Secure Shell-nyckel" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d nyckel är markerad för synkronisering" -msgstr[1] "%d nycklar är markerade för synkronisering" +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "Skapar Secure Shell-nyckel" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Synkroniserar nycklar..." +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Ny Secure Shell-nyckel" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Synkronisera nycklar" +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Skapa bara nyckel" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." -msgstr "Detta kommer att publicera nycklarna i din nyckelring så att de blir tillgängliga för andra att använda. Du kan även få de ändringar som andra har gjort sedan du mottog deras nycklar." +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_Skapa och konfigurera" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." -msgstr "Detta kommer att hämta de ändringar andra har gjort sedan du hämtade deras nycklar. Ingen nyckelserver har valts för publicering, så dina nycklar kommer inte att göras tillgängliga för andra." +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "En Secure Shell-nyckel (SSH) låter dig ansluta säkert till andra datorer." -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Nyckelservrar" +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Din e-postadress, samt något som påminner dig om vad den här nyckeln är till för." -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Synkronisera" +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Versionsnummer för detta program" +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "If there is a computer you want to use this key with, you can set up that computer to recognize your new key." +msgstr "Om det finns en dator som du vill använda den här nyckeln med så kan du konfigurera den datorn till att känna igen din nya nyckel." -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Bidrag:" +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Oläsbar Secure Shell-nyckel)" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Daniel Nylander \n" -"Christian Rose\n" -"\n" -"Skicka synpunkter på översättningen till\n" -"." +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Personlig SSH-nyckel" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH-nyckel" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse-projektets webbplats" +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "Kunde inte byta namn på nyckel." -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Arkiv" +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "Kunde inte ändra behörighet för nyckel." -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "R_edigera" +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "Kunde inte ändra lösenfras för nyckel." -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Visa" +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "Identifierare:" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Hjälp" +#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +msgid "Name:" +msgstr "Namn:" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "Inställni_ngar" +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgid "Used to connect to other computers." +msgstr "Används för att ansluta till andra datorer." -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Ändra inställningar för detta program" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Trust" +msgstr "Tillit" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Om detta program" +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Ägaren av den här nyckeln är _behörig att ansluta till den här datorn" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Innehåll" +#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#, no-c-format +msgid "This only applies to the '%s' account." +msgstr "Det här gäller endast för kontot \"%s\"." -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Visa hjälp för Seahorse" +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Algorithm:" +msgstr "Algoritm:" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Exportera publik nyckel" +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Strength:" +msgstr "Styrka:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Location:" +msgstr "Plats:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "E_xport Complete Key" +msgstr "E_xportera komplett nyckel" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH-kommandot avslutades oväntat." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Exporterar nycklar" +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH-kommandot misslyckades." -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Kunde inte hämta data från nyckelserver" +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "Lösenord för fjärrvärd" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Kopierade nycklar" +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "Ange lösenfras för nyckel" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Hämtar nycklar" +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "Lösenfras för ny Secure Shell-nyckel" -#: ../src/seahorse-viewer.c:426 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s är en privat nyckel. Är du säker på att du vill fortsätta?" +msgid "Importing key: %s" +msgstr "Importerar nyckel: %s" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Importerar nycklar från nyckelservrar" +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "Importerar nyckel. Ange lösenfras" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Visa egenskaper" +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH-nycklar" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Ta bort" +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Ta bort markerade objekt" +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "Ingen privat nyckelfil finns tillgänglig för denna nyckel." -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "E_xportera..." +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "Kunde inte konfigurera Secure Shell-nycklar på fjärrdator." -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Exportera till en fil" +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "Konfigurerar Secure Shell-nycklar..." -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Kopiera till urklipp" +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "Konfigurera dator för SSH-anslutning" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Importera markerade nycklar till lokal nyckelring" +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." +msgstr "För att använda din Secure Shell-nyckel med en annan dator som använder SSH så måste du redan ha ett inloggningskonto på den datorn." -#: ../ssh/seahorse-ssh-askpass.c:60 -#: ../ssh/seahorse-ssh-askpass.c:68 -msgid "Enter your Secure Shell passphrase:" -msgstr "Ange din Secure Shell-lösenfras:" +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "t.ex: filserver.exempel.se:port" -#: ../ssh/seahorse-ssh-askpass.c:82 -msgid "Old Key Passphrase" -msgstr "Gammal lösenfras för nyckel" +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "_Datornamn:" -#: ../ssh/seahorse-ssh-askpass.c:83 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "Ange den gamla lösenfrasen för: %s" +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "_Inloggningsnamn:" -#: ../ssh/seahorse-ssh-askpass.c:87 -#: ../ssh/seahorse-ssh-askpass.c:92 -msgid "New Key Passphrase" -msgstr "Ny lösenfras för nyckel" +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "_Konfigurera" -#: ../ssh/seahorse-ssh-askpass.c:88 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "Ange den nya lösenfrasen för: %s" +#~ msgid "Couldn't lock keyring" +#~ msgstr "Kunde inte låsa nyckelringen" -#: ../ssh/seahorse-ssh-askpass.c:93 -#, c-format -msgid "Enter the new passphrase again: %s" -msgstr "Ange den nya lösenfrasen igen: %s" +#~ msgid "Couldn't delete keyring" +#~ msgstr "Kunde inte ta bort nyckelringen" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Konfigurera _nyckel för Secure Shell..." +#~ msgid "Deleting keyring" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "Send public Secure Shell key to another machine, and enable logins using that key." -msgstr "Skicka publik Secure Shell-nyckel till en annan dator, och aktivera inloggningar med den nyckeln." +#~ msgid_plural "Deleting keyrings" +#~ msgstr[0] "Tar bort nyckelringen" +#~ msgstr[1] "Tar bort nyckelringarna" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Är du säker på att du vill ta bort Secure Shell-nyckeln \"%s\"?" +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Lås nyckelring för lösenordslagring så ett huvudlösenord krävs för att " +#~ "låsa upp den." -#: ../ssh/seahorse-ssh-commands.c:121 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Är du säker på att du vill ta bort %d Secure Shell-nycklar?" +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Lås upp nyckelring för lösenordslagring med ett huvudlösenord så att den " +#~ "är tillgänglig för användning." -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Kunde inte ta bort nyckel" - -#: ../ssh/seahorse-ssh-generate.c:60 -#: ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 -#: ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "Secure Shell-nyckel" +#~ msgid "Delete the keyring." +#~ msgstr "Ta bort nyckelringen." -#: ../ssh/seahorse-ssh-generate.c:61 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "Används för att komma åt andra datorer (t.ex. via en terminal)" +#~ msgid "Properties of the keyring." +#~ msgstr "Egenskaper för nyckelringen." -#: ../ssh/seahorse-ssh-generate.c:115 -#: ../ssh/seahorse-ssh-generate.c:131 -msgid "Couldn't generate Secure Shell key" -msgstr "Kunde inte generera Secure Shell-nyckel" +#, fuzzy +#~ msgid "Lock the password storage keyring." +#~ msgstr "Ändra upplåsningslösenordet för nyckelring för lösenordslagring" -#: ../ssh/seahorse-ssh-generate.c:197 -msgid "Creating Secure Shell Key" -msgstr "Skapar Secure Shell-nyckel" +#, fuzzy +#~ msgid "Unlock the password storage keyring." +#~ msgstr "Ändra upplåsningslösenordet för nyckelring för lösenordslagring" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "Use your email address, and any other reminder you need about what this key is for." -msgstr "Använd din e-postadress, och något annat som påminner dig om vad den här nyckeln är till för." +#~ msgid "Couldn't delete item" +#~ msgstr "Kunde inte ta bort objektet" -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "A Secure Shell (SSH) key lets you connect securely to trusted computers using SSH, without entering a different password for each of them." -msgstr "En Secure Shell-nyckel (SSH) låter dig ansluta säkert till pålitliga datorer med SSH, utan att ange ett annat lösenord för var och en av dem." +#~ msgid "Deleting item" -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "If there is already a computer you want to use this key with, you can set up that computer to recognize your key now. " -msgstr "Om det redan finns en dator som du vill använda den här nyckeln på, kan du konfigurera den datorn till att känna igen din nyckel nu." +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Tar bort objektet" +#~ msgstr[1] "Tar bort objekten" -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "Ny Secure Shell-nyckel" +#~ msgid "Delete the password." +#~ msgstr "Ta bort lösenordet." -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "_Skapa och konfigurera" +#~ msgid "Archive files" +#~ msgstr "Arkivfiler" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "En fil finns redan med detta namn.\n" +#~ "\n" +#~ "Vill du ersätta den med en ny fil?" + +#~ msgid "_Replace" +#~ msgstr "_Ersätt" + +#, fuzzy +#~ msgid "Show the properties of this place" +#~ msgstr "Visa egenskaper" + +#~ msgid "Export public key" +#~ msgstr "Exportera publik nyckel" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Kan inte exportera nyckel till \"%s\"" + +#~ msgid "Exporting keys" +#~ msgstr "Exporterar nycklar" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Kunde inte hämta data från nyckelserver" + +#~ msgid "Retrieving keys" +#~ msgstr "Hämtar nycklar" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "Är du säker på att du permanent vill ta bort %d nycklar och identiteter?" + +#~ msgid "Couldn't delete private key" +#~ msgstr "Kunde inte ta bort privata nyckeln" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Kunde inte ta bort publika nyckeln" + +#~ msgid "_Sign Key..." +#~ msgstr "Si_gnera nyckel..." + +#~ msgid "Sign public key" +#~ msgstr "Signera publik nyckel" + +#, fuzzy +#~ msgid "Properties of the key." +#~ msgstr "E_genskaper" + +#~ msgid "Delete the key." +#~ msgstr "Ta bort nyckeln." + +#~ msgid "Export Complete Key" +#~ msgstr "Exportera komplett nyckel" + +#~ msgid "Couldn't export key." +#~ msgstr "Kunde inte exportera nyckel." + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Är du säker på att du vill ta bort certifikatet \"%s\"?" + +#~ msgid "Are you sure you want to delete %d certificate?" + +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Är du säker på att du vill ta bort %d certifikat?" +#~ msgstr[1] "Är du säker på att du vill ta bort %d certifikat?" + +#~ msgid "Deleting" +#~ msgstr "Tar bort" + +#~ msgid "Delete the certificate." +#~ msgstr "Ta bort certifikatet." -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Skapa bara nyckel" +#, fuzzy +#~ msgid "Also delete matching private key" +#~ msgstr "Kunde inte ta bort privata nyckeln" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Nyckelbeskrivning:" +#, fuzzy +#~ msgid "Are you sure you want to delete the private key '%s'?" +#~ msgstr "Är du säker på att du vill ta bort certifikatet \"%s\"?" -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(Oläsbar Secure Shell-nyckel)" +#~ msgid "P_laces" +#~ msgstr "P_latser" -#: ../ssh/seahorse-ssh-key-properties.c:79 -msgid "Couldn't rename key." -msgstr "Kunde inte byta namn på nyckel." +#, fuzzy +#~ msgid "Show places sidebar" +#~ msgstr "Visa löse_nord" -#: ../ssh/seahorse-ssh-key-properties.c:132 -msgid "Couldn't change authorization for key." -msgstr "Kunde inte ändra behörighet för nyckel." +#~ msgid "Couldn't delete key" +#~ msgstr "Kunde inte ta bort nyckel" -#: ../ssh/seahorse-ssh-key-properties.c:167 -msgid "Couldn't change passphrase for key." -msgstr "Kunde inte ändra lösenfras för nyckel." +#~ msgid "OpenSSH directory" +#~ msgstr "OpenSSH-katalog" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritm:" +#~ msgid "Passwords: %s" +#~ msgstr "Lösenord: %s" -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "Identifierare:" +#~ msgid "Passwords: %s" +#~ msgstr "Lösenord: %s" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Plats:" +#~ msgid "New PGP Key" +#~ msgstr "Ny PGP-nyckel" -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "Namn:" +#~ msgid "Create New ..." +#~ msgstr "Skapa ny ..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Styrka:" +#~ msgid "Selected %d key" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "Tillit" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "%d nyckel markerad" +#~ msgstr[1] "%d nycklar markerade" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Det här gäller endast för kontot \"%s\"." +#~ msgid "Importing keys" +#~ msgstr "Importerar nycklar" -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "E_xportera komplett nyckel" +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Okänd nyckeltyp, eller ogiltigt dataformat" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Ägaren av den här nyckeln är _behörig att ansluta till den här datorn" +#~ msgid "Importing Keys" +#~ msgstr "Importerar nycklar" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Används för att ansluta till andra datorer." +#~ msgid "T_ypes" +#~ msgstr "T_yper" -#: ../ssh/seahorse-ssh-operation.c:198 -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH-kommandot avslutades oväntat." +#~ msgid "Show type column" +#~ msgstr "Visa typkolumnen" -#: ../ssh/seahorse-ssh-operation.c:208 -msgid "The SSH command failed." -msgstr "SSH-kommandot misslyckades." +#~ msgid "_Expiry" +#~ msgstr "Utgångs_datum" -#: ../ssh/seahorse-ssh-operation.c:518 -msgid "Remote Host Password" -msgstr "Lösenord för fjärrvärd" +#~ msgid "Show expiry column" +#~ msgstr "Visa utgångskolumnen" -#: ../ssh/seahorse-ssh-operation.c:634 -msgid "Enter Key Passphrase" -msgstr "Ange lösenfras för nyckel" +#~ msgid "_Trust" +#~ msgstr "_Tillit" -#: ../ssh/seahorse-ssh-operation.c:724 -msgid "Passphrase for New Secure Shell Key" -msgstr "Lösenfras för ny Secure Shell-nyckel" +#~ msgid "Show owner trust column" +#~ msgstr "Visa ägartillitskolumnen" -#: ../ssh/seahorse-ssh-operation.c:908 -#, c-format -msgid "Importing key: %s" -msgstr "Importerar nyckel: %s" +#~ msgid "_Validity" +#~ msgstr "_Giltighet" -#: ../ssh/seahorse-ssh-operation.c:910 -msgid "Importing key. Enter passphrase" -msgstr "Importerar nyckel. Ange lösenfras" +#~ msgid "Show validity column" +#~ msgstr "Visa giltighetskolumnen" -#: ../ssh/seahorse-ssh-source.c:951 -msgid "No private key file is available for this key." -msgstr "Ingen privat nyckel-fil finns tillgänglig för denna nyckel." +#~ msgid "Other _Keys" +#~ msgstr "Andra _nycklar" -#: ../ssh/seahorse-ssh-upload.c:50 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "Kunde inte konfigurera Secure Shell-nycklar på fjärrdator." +#~ msgid "_Passwords" +#~ msgstr "_Lösenord" -#: ../ssh/seahorse-ssh-upload.c:133 -msgid "Configuring Secure Shell Keys..." -msgstr "Konfigurerar Secure Shell-nycklar..." +#~ msgid "Validity" +#~ msgstr "Giltighet" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "t.ex: filserver.exempel.se:port" +#~ msgid "Expiration Date" +#~ msgstr "Utgångsdatum" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "Konfigurera dator för SSH-anslutning" +#~ msgid "_Expand All" +#~ msgstr "_Fäll ut alla" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "To use your Secure Shell key with another computer that uses SSH, you must already have a login account on that computer." -msgstr "För att använda din Secure Shell-nyckel med en annan dator som använder SSH så måste du redan ha ett inloggningskonto på den datorn." +#~ msgid "Expand all listings" +#~ msgstr "Fäll ut alla listningar" -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "_Datornamn:" +#~ msgid "_Collapse All" +#~ msgstr "_Fäll ihop alla" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "_Inloggningsnamn:" +#~ msgid "Collapse all listings" +#~ msgstr "Fäll ihop alla listningar" -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "_Konfigurera" +#~ msgid "Copied keys" +#~ msgstr "Kopierade nycklar" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s är en privat nyckel. Är du säker på att du vill fortsätta?" + +#~ msgid "_Key Description:" +#~ msgstr "_Nyckelbeskrivning:" #~ msgid "Web Password" #~ msgstr "Webblösenord" -#~ msgid "Network Password" -#~ msgstr "Nätverkslösenord" + #~ msgid "Symmetric Key" #~ msgstr "Symmetrisk nyckel" -#~ msgid "Public Key" -#~ msgstr "Publik nyckel" -#~ msgid "Private Key" -#~ msgstr "Privat nyckel" + #~ msgid "Credentials" #~ msgstr "Inloggningsuppgifter" + #~ msgid "Identity" #~ msgstr "Identitet" -#~ msgid "DSA" -#~ msgstr "DSA" + #~ msgid "Invalid" #~ msgstr "Ogiltig" + #~ msgid "Private Secure Shell Key" #~ msgstr "Privat Secure Shell-nyckel" + #~ msgid "Public Secure Shell Key" #~ msgstr "Publik Secure Shell-nyckel" -#~ msgid "Secure Shell key" -#~ msgstr "Secure Shell-nyckel" + #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "Ange en lösenfras för din nya Secure Shell-nyckel." + #~ msgid "Deleting items" #~ msgstr "Tar bort objekt" -#~ msgid "Deleting keyrings" -#~ msgstr "Tar bort nyckelringar" -#~ msgid "Encryption Key Manager" -#~ msgstr "Hanterare för krypteringsnycklar" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "Kör inte seahorse-daemon som en demon" + #~ msgid "couldn't fork process" #~ msgstr "kunde inte grena process" -#~ msgid "couldn't create new process group" -#~ msgstr "kunde inte skapa ny processgrupp" + #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Krypteringsdemon (Seahorse)" + #~ msgid "Invalid or unrecognized key type: %s" #~ msgstr "Ogiltig eller okänd nyckeltyp: %s" + #~ msgid "This keytype is not supported: %s" #~ msgstr "Denna nyckeltyp stöds inte: %s" + #~ msgid "Support for this feature was not enabled at build time" #~ msgstr "Stöd för denna funktion aktiverades inte vid byggnationen" + #~ msgid "Invalid or unrecognized key: %s" #~ msgstr "Ogiltig eller okänd nyckel: %s" + #~ msgid "Signed by expired on %s." #~ msgstr "Signerad av gick ut den %s." + #~ msgid "Invalid Signature" #~ msgstr "Ogiltig signatur" + #~ msgid "Signed by on %s Expired." #~ msgstr "Signerad av den %s Utgånget." + #~ msgid "Expired Signature" #~ msgstr "Utgången signatur" + #~ msgid "Signed by Revoked on %s." #~ msgstr "Signerad av Spärrad den %s." + #~ msgid "Revoked Signature" #~ msgstr "Spärrad signatur" + #~ msgid "Signed by on %s." #~ msgstr "Signerad av den %s." + #~ msgid "Good Signature" #~ msgstr "Korrekt signatur" + #~ msgid "Signing key not in keyring." #~ msgstr "Signeringsnyckel inte i nyckelring." + #~ msgid "Unknown Signature" #~ msgstr "Okänd signatur" + #~ msgid "Bad or forged signature. The signed data was modified." #~ msgstr "Felaktig eller förfalskad signatur. Signerat data har ändrats." + #~ msgid "Bad Signature" #~ msgstr "Felaktig signatur" -#~ msgid "Couldn't verify signature." -#~ msgstr "Kunde inte validera signatur." + #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Ogiltig eller okänd signerare: %s" + #~ msgid "Key is not valid for signing: %s" #~ msgstr "Nyckeln är inte giltig för signering: %s" + #~ msgid "Invalid or unrecognized recipient: %s" #~ msgstr "Ogiltig eller okänd mottagare: %s" + #~ msgid "Key is not a valid recipient for encryption: %s" #~ msgstr "Nyckeln är inte en giltig mottagare för kryptering: %s" + #~ msgid "No recipients specified" #~ msgstr "Inga mottagare angavs " + #~ msgid "Invalid key type for decryption: %s" #~ msgstr "Ogiltig nyckeltyp för dekryptering: %s" + #~ msgid "Please set clearuri" #~ msgstr "Ställ in clearuri" + #~ msgid "Please set crypturi" #~ msgstr "Ställ in crypturi" + #~ msgid "Error opening clearuri" #~ msgstr "Fel vid öppnandet av clearuri" + #~ msgid "No signer specified" #~ msgstr "Ingen signerare angavs" + #~ msgid "Invalid key type for verifying: %s" #~ msgstr "Ogiltig nyckeltyp för validering: %s" + #~ msgid "Invalid key id: %s" #~ msgstr "Ogiltigt nyckel-id: %s" + #~ msgid "" #~ "A list of key server URIs to search for remote PGP keys. In later " #~ "versions a display name can be included, by appending a space and then " @@ -2493,58 +2886,79 @@ #~ "En lista på nyckelserver-URI:er för att söka efter fjärr-PGP-nycklar. I " #~ "senare versioner kan ett visningsnamn inkluderas, genom att lägga till " #~ "ett blanksteg och sedan ett namn." + #~ msgid "Auto Retrieve Keys" #~ msgstr "Hämta nycklar automatiskt" + #~ msgid "Auto Sync Keys" #~ msgstr "Synkronisera nycklar automatiskt" + #~ msgid "Controls the visibility of the expires column for the key manager." #~ msgstr "Styr synligheten för utgångskolumnen för nyckelhanteraren." + #~ msgid "Controls the visibility of the trust column for the key manager." #~ msgstr "Styr synligheten för tillitskolumnen för nyckelhanteraren." + #~ msgid "Controls the visibility of the type column for the key manager." #~ msgstr "Styr synligheten för typkolumnen för nyckelhanteraren." + #~ msgid "Controls the visibility of the validity column for the key manager." #~ msgstr "Styr synligheten för giltighetskolumnen för nyckelhanteraren." + #~ msgid "Enable DNS-SD sharing" #~ msgstr "Aktivera DNS-SD-delning" + #~ msgid "" #~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " #~ "running and must be built with HKP and DNS-SD support." #~ msgstr "" #~ "Aktiverar DNS-SD-delning (Apple Bonjour) av nycklar. seahorse-daemon " #~ "måste vara igång och måste vara byggd med stöd för HKP och DNS-SD." + #~ msgid "ID of the default key" #~ msgstr "Id för standardnyckeln" + #~ msgid "" #~ "If set to true, then files encrypted with seahorse will be ASCII armor " #~ "encoded." #~ msgstr "" #~ "Om denna är inställd till sant kommer filer som är krypterade med " #~ "seahorse att bli ASCII-skalkodade." + #~ msgid "" #~ "If set to true, then the default key will always be added to an " #~ "encryption recipients list." #~ msgstr "" #~ "Om denna är inställd till sant kommer standardnyckeln att alltid läggas " #~ "till en lista över krypteringsmottagare." + #~ msgid "Last key server search pattern" #~ msgstr "Senaste sökmönster för nyckelserver" + #~ msgid "Last key servers used" #~ msgstr "Senaste använda nyckelservrar" + #~ msgid "Last key used to sign a message." #~ msgstr "Senaste nyckel som användes för att signera ett meddelande." + #~ msgid "PGP Key servers" #~ msgstr "PGP-nyckelservrar" + #~ msgid "Publish keys to this key server." #~ msgstr "Publicera nycklar på denna nyckelserver." + #~ msgid "Show expires column in key manager" #~ msgstr "Visa utgångskolumnen i nyckelhanteraren" + #~ msgid "Show trust column in key manager" #~ msgstr "Visa tillitskolumnen i nyckelhanteraren" + #~ msgid "Show type column in key manager" #~ msgstr "Visa typkolumnen i nyckelhanteraren" + #~ msgid "Show validity column in key manager" #~ msgstr "Visa giltighetskolumnen i nyckelhanteraren" + #~ msgid "" #~ "Specify the column to sort the recipients window by. Columns are: 'name' " #~ "and 'id'. Put a '-' in front of the column name to sort in descending " @@ -2553,6 +2967,7 @@ #~ "Ange kolumnen att sortera mottagarefönstret efter. Kolumner är: \"name\" " #~ "och \"id\". Lägg till ett \"-\" i framkant av kolumnnamnet för att " #~ "sortera i fallande ordning." + #~ msgid "" #~ "Specify the column to sort the seahorse key manager main window by. " #~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " @@ -2562,67 +2977,88 @@ #~ "efter. Kolumner är: \"name\", \"id\", \"validity\", \"expires\", \"trust" #~ "\" och \"type\". Lägg till ett \"-\" i framkant av kolumnnamnet för att " #~ "sortera i omvänd ordning." + #~ msgid "The ID of the last secret key used to sign a message." #~ msgstr "" #~ "Identiteten för den senaste hemliga nyckel som användes för att signera " #~ "ett meddelande." + #~ msgid "The column to sort the recipients by" #~ msgstr "Kolumnen att sortera mottagare efter" + #~ msgid "The column to sort the seahorse keys by" #~ msgstr "Kolumnen att sortera seahorse-nycklarna efter" + #~ msgid "" #~ "The key server to publish PGP keys to. Or empty to suppress publishing of " #~ "PGP keys." #~ msgstr "" #~ "Nyckelservern att publicera PGP-nycklar på. Eller tom för att inte " #~ "publicera PGP-nycklar." + #~ msgid "" #~ "The last key server a search was performed against or empty for all key " #~ "servers." #~ msgstr "" #~ "Den senaste nyckelservern som en sökning genomfördes mot eller blankt för " #~ "alla nyckelservrar." + #~ msgid "The last search pattern searched for against a key server." #~ msgstr "Det senaste sökmönstret som användes mot en nyckelserver." + #~ msgid "" #~ "This specifies the default key to use for certain operations, mainly " #~ "signing." #~ msgstr "" #~ "Detta anger standardnyckeln som ska användas för vissa åtgärder, i " #~ "huvudsak signering." + #~ msgid "" #~ "Whether or not keys should be automatically retrieved from key servers." #~ msgstr "" #~ "Huruvida nycklar ska hämtas automatiskt från nyckelservrar eller inte." + #~ msgid "" #~ "Whether or not modified keys should be automatically synced with the " #~ "default key server." #~ msgstr "" #~ "Huruvida ändrade nycklar ska synkroniseras automatiskt med " #~ "standardnyckelservern eller inte." + #~ msgid "Whether to always encrypt to default key" #~ msgstr "Huruvida kryptering alltid ska ske till standardnyckel" + #~ msgid "Whether to use ASCII Armor" #~ msgstr "Huruvida ASCII-pansar ska användas" + #~ msgid "Couldn't set application access." #~ msgstr "Kunde inte ställa in programåtkomst." + #~ msgid "Path:" #~ msgstr "Sökväg:" + #~ msgid "Permissions:" #~ msgstr "Behörighet:" + #~ msgid "Applications" #~ msgstr "Program" + #~ msgid "_Read" #~ msgstr "_Läsa" + #~ msgid "_Write" #~ msgstr "_Skriva" #~ msgctxt "infinitive" + #~ msgid "_Delete" #~ msgstr "_Ta bort" + #~ msgid "Saving item..." #~ msgstr "Sparar objekt..." + #~ msgid "Listing password keyrings" #~ msgstr "Listar lösenordsnyckelringar" + #~ msgid "" #~ "No encryption keys were found with which to perform the operation you " #~ "requested. The program Passwords and Encryption Keys will now be " @@ -2631,101 +3067,146 @@ #~ "Inga krypteringsnycklar hittades som kan användas för den begärda " #~ "åtgärden. Programmet Lösenord och krypteringsnycklar kommer nu " #~ "att startas så att du antingen kan skapa eller importera en nyckel." + #~ msgid "All Keys" #~ msgstr "Alla nycklar" + #~ msgid "Selected Recipients" #~ msgstr "Markerade mottagare" + #~ msgid "Search Results" #~ msgstr "Sökresultat" + #~ msgid "Search _for:" #~ msgstr "Sök _efter:" + #~ msgid "None (Don't Sign)" #~ msgstr "Ingen (Signera inte)" + #~ msgid "Sign this message as %s" #~ msgstr "Signera detta meddelande som %s" + #~ msgid "_Sign message as:" #~ msgstr "_Signera meddelande som:" + #~ msgid "File is not a valid .desktop file" #~ msgstr "Filen är inte en giltig .desktop-fil" + #~ msgid "Unrecognized desktop file Version '%s'" #~ msgstr "Okänd Version \"%s\" i desktop-fil" + #~ msgid "Starting %s" #~ msgstr "Startar %s" + #~ msgid "Application does not accept documents on command line" #~ msgstr "Programmet tar inte emot dokument på kommandoraden" + #~ msgid "Unrecognized launch option: %d" #~ msgstr "Okänt startalternativ: %d" + #~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" #~ msgstr "" #~ "Kan inte skicka dokument-URI:er till en \"Type=Link\"-skrivbordspost" + #~ msgid "Not a launchable item" #~ msgstr "Inte ett startbart objekt" + #~ msgid "Disable connection to session manager" #~ msgstr "Inaktivera anslutning till sessionshanterare" + #~ msgid "Specify file containing saved configuration" #~ msgstr "Ange fil som innehåller sparad konfiguration" + #~ msgid "FILE" #~ msgstr "FIL" + #~ msgid "Specify session management ID" #~ msgstr "Ange id för sessionshantering" + #~ msgid "Session management options:" #~ msgstr "Flaggor för sessionshantering:" + #~ msgid "Show session management options" #~ msgstr "Visa flaggor för sessionshantering" + #~ msgid "Key Imported" + #~ msgid_plural "Keys Imported" #~ msgstr[0] "Nyckel importerad" #~ msgstr[1] "\"Nycklar importerade" + #~ msgid "Imported %i key" + #~ msgid_plural "Imported %i keys" #~ msgstr[0] "Importerade %d nyckel" #~ msgstr[1] "Importerade %d nycklar" + #~ msgid "Imported a key for" + #~ msgid_plural "Imported keys for" #~ msgstr[0] "Importerade en nyckel för" #~ msgstr[1] "Importerade nycklar för" + #~ msgid "Notification Messages" #~ msgstr "Notifieringsmeddelanden" + #~ msgid "Progress Title" #~ msgstr "Förloppstitel" + #~ msgid "Couldn't run file-roller" #~ msgstr "Kunde inte köra file-roller" + #~ msgid "Couldn't package files" #~ msgstr "Kunde inte paketera filer" + #~ msgid "The file-roller process did not complete successfully" #~ msgstr "File-roller-processen avslutades inte korrekt" + #~ msgid "Couldn't generate key" #~ msgstr "Kunde inte generera nyckel" + #~ msgid "Loading Keys..." #~ msgstr "Läser in nycklar..." -#~ msgid "Searching for keys..." -#~ msgstr "Söker efter nycklar..." + #~ msgid "Uploading keys..." #~ msgstr "Skickar upp nycklar..." + #~ msgid "Retrieving keys..." #~ msgstr "Hämtar nycklar..." + #~ msgid "Searching for keys on: %s" #~ msgstr "Söker efter nycklar på: %s" + #~ msgid "Searching for keys containing '%s'..." #~ msgstr "Söker efter nycklar som innehåller \"%s\"..." + #~ msgid "Searching for key id '%s'..." #~ msgstr "Söker efter nyckel-id \"%s\"..." + #~ msgid "Retrieving remote keys..." #~ msgstr "Hämtar fjärrnycklar..." + #~ msgid "Sending keys to key server..." #~ msgstr "Skickar nycklar till nyckelserver..." + #~ msgid "Synchronizing keys" #~ msgstr "Synkroniserar nycklar" + #~ msgid "Passphrase:" #~ msgstr "Lösenfras:" + #~ msgid "Couldn't share keys" #~ msgstr "Kunde inte dela ut nycklar" + #~ msgid "Can't publish discovery information on the network." #~ msgstr "Kan inte publicera upptäcktsinformation på nätverket." + #~ msgid "%s's encryption keys" #~ msgstr "Krypteringsnycklar för %s" + #~ msgid "Key Sharing" #~ msgstr "Nyckeldelning" + #~ msgid "" #~ "Sharing your keys allows other people on your network to use the keys " #~ "you've collected. This means they can automatically encrypt things for " @@ -2739,24 +3220,32 @@ #~ "skicka dem din nyckel.\n" #~ "\n" #~ "Observera: Dina personliga nycklar kommer inte att komprometteras." + #~ msgid "_Share my keys with others on my network" #~ msgstr "_Dela mina nycklar med andra på mitt nätverk" + #~ msgid "Seahorse Daemon" #~ msgstr "Seahorse-demon" + #~ msgid "X keys are selected for synchronizing" #~ msgstr "X nycklar är markerade för synkronisering" + #~ msgid "" #~ "One or more of the deleted keys are private keys. Are you sure you want " #~ "to proceed?" #~ msgstr "" #~ "En eller flera av de borttagna nycklarna är privata nycklar. Är du säker " #~ "på att du vill fortsätta?" + #~ msgid "/home/nate/.ssh/blah_rsa" #~ msgstr "/home/nate/.ssh/blah_rsa" + #~ msgid "00:00:00:00:00" #~ msgstr "00:00:00:00:00" + #~ msgid "Create a PGP Key" #~ msgstr "Skapa en PGP-nyckel" + #~ msgid "" #~ "Unknown\n" #~ "Never\n" @@ -2769,6 +3258,7 @@ #~ "Marginell\n" #~ "Fullständig\n" #~ "Förbehållslös" + #~ msgid "" #~ "Unknown\n" #~ "Never\n" @@ -2781,283 +3271,375 @@ #~ "Marginellt\n" #~ "Fullständigt\n" #~ "Förbehållslöst" + #~ msgid "Other _Collected Keys" #~ msgstr "Övriga _insamlade nycklar" + #~ msgid "_Trusted Keys" #~ msgstr "_Pålitliga nycklar" + #~ msgid "_About" #~ msgstr "_Om" -#~ msgid "P_roperties" -#~ msgstr "E_genskaper" + #~ msgid "_Copy" #~ msgstr "_Kopiera" -#~ msgid "Passwords" -#~ msgstr "Lösenord" + #~ msgid "Unavailable Key" #~ msgstr "Otillgänglig nyckel" + #~ msgid "Not Part of Certificate" #~ msgstr "Inte en del av certifikatet" + #~ msgid "unknown" #~ msgstr "okänd" -#~ msgid "" -#~ msgstr "" + #~ msgid "Fingerprints" #~ msgstr "Fingeravtryck" + #~ msgid "Issued By" #~ msgstr "Utfärdat av" + #~ msgid "Issued To" #~ msgstr "Utfärdat till" + #~ msgid "This certificate has been verified for the following uses:" #~ msgstr "" #~ "Detta certifikat har verifierats för följande användningsområden:" + #~ msgid "Validity" #~ msgstr "Giltighet" + #~ msgid "Email Recipient Certificate" #~ msgstr "Certifikat för e-postmottagare" + #~ msgid "Email Signer Certificate" #~ msgstr "Certifikat för e-postsignering" + #~ msgid "Expires On" #~ msgstr "Går ut den" + #~ msgid "Issued On" #~ msgstr "Utfärdat den" + #~ msgid "MD5 Fingerprint" #~ msgstr "MD5-fingeravtryck" + #~ msgid "Organization (O)" #~ msgstr "Organisation (O)" + #~ msgid "Organizational Unit (OU)" #~ msgstr "Organisationsenhet (OU)" + #~ msgid "SHA1 Fingerprint" #~ msgstr "SHA1-fingeravtryck" -#~ msgid "SSL Client Certificate" -#~ msgstr "SSL-klientcertifikat" -#~ msgid "SSL Server Certificate" -#~ msgstr "SSL-servercertifikat" + #~ msgid "Serial Number" #~ msgstr "Serienummer" + #~ msgid "Password and Encryption Settings" #~ msgstr "Inställningar för lösenord och kryptering" + #~ msgid "Removing item" #~ msgstr "Tar bort objekt" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "Automatiskt upplåst när användare loggar in." + #~ msgid "Couldn't get default password keyring" #~ msgstr "Kunde inte få standardnyckelring för lösenord" + #~ msgid "Couldn't get list of password keyrings" #~ msgstr "Kunde inte få lista över standardnyckelringar för lösenord" + #~ msgid "Couldn't remove keyring" #~ msgstr "Kunde inte ta bort nyckelring" + #~ msgid "Are you sure you want to permanently delete the '%s' keyring?" #~ msgstr "Är du säker på att du vill ta bort nyckelringen \"%s\" permanent?" + #~ msgid "Default Keyring" #~ msgstr "Standardnyckelring" + #~ msgid "Password Keyrings" #~ msgstr "Lösenordsnyckelringar" + #~ msgid "_Add Keyring" #~ msgstr "_Lägg till nyckelring" + #~ msgid "_Remove Keyring" #~ msgstr "_Ta bort nyckelring" + #~ msgid "Unknown Key: %s" #~ msgstr "Okänd nyckel: %s" + #~ msgid "Unknown Key" #~ msgstr "Okänd nyckel" + #~ msgid "X509 Certificate" #~ msgstr "X509-certifikat" + #~ msgid "Loading..." #~ msgstr "Läser in..." + #~ msgid "Invalid or unrecognized object." #~ msgstr "Ogiltigt eller okänt objekt." + #~ msgid "Exporting is not yet supported." #~ msgstr "Exportering stöds inte än." + #~ msgid "Expiry for Subkey %d of %s" #~ msgstr "Utgångsdatum för undernyckel %d av %s" + #~ msgid "_Quit" #~ msgstr "_Avsluta" -#~ msgid "Create a new personal key" -#~ msgstr "Skapa en ny personlig nyckel" + #~ msgid "Import keys into your key ring from a file" #~ msgstr "Importera nycklar till din nyckelring från en fil" + #~ msgid "_Close" #~ msgstr "_Stäng" + #~ msgid "_Key" #~ msgstr "_Nyckel" -#~ msgid "_Delete Key" -#~ msgstr "_Ta bort nyckel" + #~ msgid "E_xport Public Key..." #~ msgstr "E_xportera publik nyckel..." + #~ msgid "_Copy Public Key" #~ msgstr "_Kopiera publik nyckel" + #~ msgid "Copy public part of selected keys to the clipboard" #~ msgstr "Kopiera den publika delen av markerade nycklar till urklipp" + #~ msgid "Secure Shell Passphrase" #~ msgstr "Lösenfras för Secure Shell" + #~ msgid "Secure Shell Key Passphrase" #~ msgstr "Lösenfras för Secure Shell-nyckel" + #~ msgid "Enter the passphrase for: %s" #~ msgstr "Ange lösenfrasen för: %s" + #~ msgid "Save this passphrase in my keyring" #~ msgstr "Spara den här lösenfrasen i min nyckelring" + #~ msgid "" #~ "%s is a private key. Make sure you have a backup. Do you still want to " #~ "delete it?" #~ msgstr "" #~ "%s är en privat nyckel. Se till att du har en säkerhetskopia. Vill du " #~ "fortfarande ta bort den?" + #~ msgid "User ID" #~ msgstr "Användaridentitet" + #~ msgid "Imported %d key" + #~ msgid_plural "Imported %d keys" #~ msgstr[0] "Importerade %d nyckel" #~ msgstr[1] "Importerade %d nycklar" + #~ msgid "Couldn't read file" #~ msgstr "Kunde inte läsa fil" + #~ msgid "Back up Key Rings to Archive" #~ msgstr "Säkerhetskopiera nyckelringar till arkiv" + #~ msgid "seahorse" #~ msgstr "seahorse" + #~ msgid "_Back up Key Rings..." #~ msgstr "_Säkerhetskopiera nyckelringar..." + #~ msgid "Back up all keys" #~ msgstr "Säkerhetskopiera alla nycklar" + #~ msgid "Set Up Computer for _Secure Shell..." #~ msgstr "Konfigurera dator för _Secure Shell..." + #~ msgid "Couldn't import keys into key ring" #~ msgstr "Kunde inte importera nycklar till nyckelring" + #~ msgid "Couldn't write keys to file: %s" #~ msgstr "Kunde inte skriva nycklar till fil: %s" + #~ msgid "Save Remote Keys" #~ msgstr "Spara fjärrnycklar" + #~ msgid "No matching keys found" #~ msgstr "Inga matchande nycklar hittades" + #~ msgid "Save Key As..." #~ msgstr "Spara nyckel som..." + #~ msgid "Save selected keys as a file" #~ msgstr "Spara markerade nycklar som en fil" + #~ msgid "You have selected multiple files or folders" #~ msgstr "Du har markerat flera filer eller mappar" + #~ msgid "" #~ "Because the files are located remotely, each file will be encrypted " #~ "separately." #~ msgstr "" #~ "På grund av att filerna är fjärrlokaliserade, kommer varje fil att " #~ "krypteras separat." + #~ msgid "Encrypt Multiple Files" #~ msgstr "Kryptera flera filer" + #~ msgid "Encrypt each file separately" #~ msgstr "Kryptera varje fil separat" + #~ msgid "Encrypt packed together in a package" #~ msgstr "Kryptera packade tillsammans i ett paket" + #~ msgid "Package Name:" #~ msgstr "Paketnamn:" + #~ msgid "Packaging:" #~ msgstr "Paketering:" + #~ msgid "encrypted-package" #~ msgstr "krypterat-paket" + #~ msgid "Please enter a passphrase to use." #~ msgstr "Ange en lösenfras att använda." + #~ msgid "Unparseable Key ID" #~ msgstr "Ej tolkningsbart nyckel-id" + #~ msgid "Unknown/Invalid Key" #~ msgstr "Okänd/Ogiltig nyckel" + #~ msgid "PGP Key: %s" #~ msgstr "PGP-nyckel: %s" + #~ msgid "" #~ "Warning: Your system is not configured to cache passphrases in " #~ "secure memory." #~ msgstr "" #~ "Varning: Ditt system är inte konfigurerat att mellanlagra " #~ "lösenfraser i ett säkert minne." + #~ msgid "Cache _Preferences" #~ msgstr "_Inställningar för mellanlagring" + #~ msgid "Cached Encryption Keys" #~ msgstr "Mellanlagrade krypteringsnycklar" + #~ msgid "Change passphrase cache settings." #~ msgstr "Ändra inställningar för mellanlagring av lösenfraser." + #~ msgid "Clear passphrase cache" #~ msgstr "Töm mellanlagrade lösenfraser" + #~ msgid "_Clear Cache" #~ msgstr "_Töm mellanlager" -#~ msgid "_Show Window" -#~ msgstr "_Visa fönster" + #~ msgid "Do not daemonize seahorse-agent" #~ msgstr "Kör inte seahorse-agent som en demon" + #~ msgid "Print variables in for a C type shell" #~ msgstr "Skriv ut variabler för ett C-liknande skal" + #~ msgid "Display environment variables (the default)" #~ msgstr "Visa miljövariabler (standard)" + #~ msgid "Allow GPG agent request from any display" #~ msgstr "Tillåt GPG-agentbegäran från valfri display" + #~ msgid "command..." #~ msgstr "kommando..." + #~ msgid "Encryption Key Agent (Seahorse)" #~ msgstr "Krypteringsnyckelagent (Seahorse)" + #~ msgid "no command specified to execute" #~ msgstr "inget kommandot angivet att köra" + #~ msgid "Authorize Passphrase Access" #~ msgstr "Auktorisera lösenfrasåtkomst" + #~ msgid "The passphrase is cached in memory." #~ msgstr "Lösenfrasen är mellanlagrad i minne." + #~ msgid "Always ask me before using a cached passphrase" #~ msgstr "Fråga mig alltid före användning av en mellanlagrad lösenfras" + #~ msgid "_Authorize" #~ msgstr "_Auktorisera" + #~ msgid "Key Name" #~ msgstr "Nyckelnamn" + #~ msgid "" #~ "After performing an decrypt or verify operation from the applet, display " #~ "the resulting text in a window." #~ msgstr "" #~ "Efter genomförandet av en dekryptering eller validering från " #~ "panelprogrammet, visa den resulterande texten i ett fönster." + #~ msgid "" #~ "After performing an encrypt or signing operation from the applet, display " #~ "the resulting text in a window." #~ msgstr "" #~ "Efter genomförandet av en kryptering eller signering från " #~ "panelprogrammet, visa den resulterande texten i ett fönster." + #~ msgid "Display cache reminder in the notification area" #~ msgstr "Visa cachepåminnare i notifieringsytan" + #~ msgid "Display clipboard after decrypting" #~ msgstr "Visa urklipp efter dekryptering" + #~ msgid "Display clipboard after encrypting" #~ msgstr "Visa urklipp efter kryptering" + #~ msgid "Expire passwords in the cache" #~ msgstr "Låt alla lösenord i mellanlager gå ut" + #~ msgid "" #~ "If set to 'gnome' uses gnome-keyring to cache passwords. When set to " #~ "'internal' uses internal cache." #~ msgstr "" #~ "Om inställt till \"gnome\" används gnome-keyring för att mellanlagra " #~ "lösenord. När inställt till \"internal\" används det interna mellanlagret." + #~ msgid "Prompt before using GPG passwords in cache" #~ msgstr "Fråga före mellanlagrade GPG-lösenord används" + #~ msgid "" #~ "Reflect the contents of the clipboard (whether encrypted, signed, etc...) " #~ "in the panel applet icon." #~ msgstr "" #~ "Visa innehållet i urklipp (om krypterat, signerat, etc...) i " #~ "panelprogrammets ikon." + #~ msgid "" #~ "Set to 'true' to enable display of the cache reminder in the notification " #~ "area of your panel." #~ msgstr "" #~ "Ställ in till \"sant\" för att aktivera visning av cachepåminnaren i " #~ "notifieringsytan i din panel." + #~ msgid "" #~ "Set to 'true' to have seahorse-agent prompt before giving out passwords " #~ "it has cached." #~ msgstr "" #~ "Ställ in till \"sant\" för att få seahorse-agent att fråga innan det ger " #~ "ut lösenord som har mellanlagrats." + #~ msgid "Show clipboard state in panel" #~ msgstr "Visa tillstånd för urklipp i panelen" + #~ msgid "The time (in minutes) to cache GPG passwords" #~ msgstr "Tiden (i minuter) att mellanlagra GPG-lösenord" + #~ msgid "" #~ "This is the amount of time, specified in minutes, to cache GPG passwords " #~ "in seahorse-agent." #~ msgstr "" #~ "Detta är mängden tid, angivet i minuter, som GPG-lösenord i seahorse-" #~ "agent ska mellanlagras." + #~ msgid "" #~ "This option enables the GPG password cache in the seahorse-agent program. " #~ "The 'use-agent' setting in gpg.conf affects this setting." @@ -3065,350 +3647,497 @@ #~ "Detta alternativ aktiverar mellanlagring av GPG-lösenord i programmet " #~ "seahorse-agent. Inställningen \"use-agent\" i gpg.conf påverkar den här " #~ "inställningen." + #~ msgid "" #~ "When set, seahorse-agent expires GPG passwords in its cache after a " #~ "period of time." #~ msgstr "" #~ "När detta alternativ är inställt låter seahorse-agent alla GPG-lösenord i " #~ "dess mellanlager gå ut efter en viss tidsperiod." + #~ msgid "Whether the GPG password cache is enabled" #~ msgstr "Huruvida mellanlagring av GPG-lösenord är aktiverad eller inte" + #~ msgid "None. Prompt for a key." #~ msgstr "Ingen. Fråga efter en nyckel." + #~ msgid "Default Key" #~ msgstr "Standardnyckel" + #~ msgid "Remember PGP Passphrases" #~ msgstr "Kom ihåg PGP-lösenfraser" + #~ msgid "A supported PGP passphrase caching agent is not running." #~ msgstr "" #~ "En stödd mellanlagringsagent för PGP-lösenfraser är inte igång." + #~ msgid "This key is used to sign messages when no other key is chosen" #~ msgstr "" #~ "Den här nyckeln används för att signera meddelanden när ingen annan " #~ "nyckel har valts" + #~ msgid "As_k me before using a cached passphrase" #~ msgstr "F_råga mig innan en mellanlagrad lösenfras används" + #~ msgid "Encryption" #~ msgstr "Kryptering" + #~ msgid "PGP Passphrases" #~ msgstr "PGP-lösenfraser" + #~ msgid "Show _icon in status area when passphrases are in memory" #~ msgstr "Visa _ikon i statusrutan när lösenfraser finns i minnet" + #~ msgid "When _encrypting, always include myself as a recipient" #~ msgstr "När _kryptering sker, inkludera alltid mig själv som en mottagare" + #~ msgid "_Always remember passphrases whenever logged in" #~ msgstr "_Kom alltid ihåg lösenfrasen när inloggad" + #~ msgid "_Default key:" #~ msgstr "_Standardnyckel:" + #~ msgid "_Never remember passphrases" #~ msgstr "_Kom aldrig ihåg några lösenfraser" + #~ msgid "_Remember passphrases for" #~ msgstr "_Kom ihåg lösenfraser i" + #~ msgid "Couldn't set permissions on backup file." #~ msgstr "Kunde inte ställa in rättigheter på säkerhetskopiefilen." -#~ msgid "Clipboard Text Encryption" -#~ msgstr "Textkryptering för urklipp" + #~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." #~ msgstr "" #~ "Kryptera, dekryptera eller signera urklippet (använder PGP-kryptering)." + #~ msgid "Seahorse Applet Factory" #~ msgstr "Panelprogramsfabrik för Seahorse" + #~ msgid "_Preferences" #~ msgstr "Inställni_ngar" + #~ msgid "seahorse-applet" #~ msgstr "seahorse-applet" + #~ msgid "Use PGP/GPG to encrypt/decrypt/sign/verify/import the clipboard." #~ msgstr "" #~ "Använd PGP/GPG för att kryptera/dekryptera/signera/validera/importera " #~ "urklippet." + #~ msgid "Choose Recipient Keys" #~ msgstr "Välj mottagarnycklar" + #~ msgid "Encrypted Text" #~ msgstr "Krypterad text" + #~ msgid "Encryption Failed" #~ msgstr "Kryptering misslyckades" + #~ msgid "The clipboard could not be encrypted." #~ msgstr "Urklippet kunde inte krypteras." + #~ msgid "Choose Key to Sign with" #~ msgstr "Välj nyckel att signera med" + #~ msgid "Signed Text" #~ msgstr "Signerad text" + #~ msgid "Signing Failed" #~ msgstr "Signering misslyckades" + #~ msgid "The clipboard could not be Signed." #~ msgstr "Urklippet kunde inte signeras." -#~ msgid "Import Failed" -#~ msgstr "Importering misslyckades" + #~ msgid "Keys were found but not imported." #~ msgstr "Nycklar hittades men importerades inte." + #~ msgid "Decrypting Failed" #~ msgstr "Dekryptering misslyckades" + #~ msgid "Text may be malformed." #~ msgstr "Texten kan vara felformulerad." + #~ msgid "No PGP key or message was found on clipboard" #~ msgstr "Ingen PGP-nyckel eller meddelande hittades i urklipp" + #~ msgid "No PGP data found." #~ msgstr "Inget PGP-data hittades." + #~ msgid "Decrypted Text" #~ msgstr "Dekrypterad text" + #~ msgid "Could not display the help file" #~ msgstr "Kunde inte visa hjälpfilen" + #~ msgid "_Encrypt Clipboard" #~ msgstr "_Kryptera urklipp" + #~ msgid "_Sign Clipboard" #~ msgstr "_Signera urklipp" + #~ msgid "_Decrypt/Verify Clipboard" #~ msgstr "_Dekryptera/Validera urklipp" + #~ msgid "_Import Keys from Clipboard" #~ msgstr "_Importera nycklar från urklipp" + #~ msgid "Encryption Applet" #~ msgstr "Panelprogram för kryptering" + #~ msgid "Display clipboard contents after:" #~ msgstr "Visa innehållet i urklipp efter:" + #~ msgid "Clipboard Encryption Preferences" #~ msgstr "Krypteringsinställningar för urklipp" + #~ msgid "_Decrypting or verifying the clipboard" #~ msgstr "_Dekryptera eller validera urklipp" + #~ msgid "_Encrypting or signing the clipboard" #~ msgstr "_Kryptera eller signera urklipp" + #~ msgid "_Show clipboard state in panel" #~ msgstr "_Visa tillståndet för urklipp i panelen" + #~ msgid "_Encrypt" #~ msgstr "_Kryptera" + #~ msgid "_Decrypt/Verify" #~ msgstr "_Dekryptera/Validera" + #~ msgid "_Import Key" #~ msgstr "_Importera nyckel" + #~ msgid "Couldn't connect to seahorse-daemon" #~ msgstr "Kunde inte ansluta till seahorse-daemon" + #~ msgid "Encrypted text" #~ msgstr "Krypterad text" + #~ msgid "Couldn't encrypt text" #~ msgstr "Kunde inte kryptera text" + #~ msgid "Keys found but not imported" #~ msgstr "Nycklar hittade men inte importerade" + #~ msgid "Couldn't decrypt text" #~ msgstr "Kunde inte dekryptera text" + #~ msgid "Couldn't verify text" #~ msgstr "Kunde inte validera text" + #~ msgid "No encrypted or signed text is selected." #~ msgstr "Ingen krypterad eller signerad text är markerad." -#~ msgid "Decrypted text" -#~ msgstr "Dekrypterad text" + #~ msgid "Verified text" #~ msgstr "Validerad text" + #~ msgid "Signed text" #~ msgstr "Signerad text" + #~ msgid "Couldn't sign text" #~ msgstr "Kunde inte signera text" + #~ msgid "_Encrypt..." #~ msgstr "Krypte_ra..." + #~ msgid "Encrypt the selected text" #~ msgstr "Kryptera markerad text" + #~ msgid "Decr_ypt/Verify" #~ msgstr "Dekr_yptera/Validera" + #~ msgid "Decrypt and/or Verify text" #~ msgstr "Dekryptera och/eller validera text" + #~ msgid "Sig_n..." #~ msgstr "Sig_nera..." + #~ msgid "Sign the selected text" #~ msgstr "Signera markerad text" + #~ msgid "Enable the seahorse encryption plugin for gedit." #~ msgstr "Aktivera seahorses krypteringsinsticksmodul för gedit." + #~ msgid "Enable the seahorse gedit plugin" #~ msgstr "Aktivera seahorse-insticksmodulen för gedit" + #~ msgid "Text Encryption" #~ msgstr "Textkryptering" + #~ msgid "This plugin performs encryption operations on text." #~ msgstr "Denna insticksmodul genomför krypteringsåtgärder på text." + #~ msgid "Encrypt..." #~ msgstr "Kryptera..." + #~ msgid "Encrypt (and optionally sign) the selected file" + #~ msgid_plural "Encrypt the selected files" #~ msgstr[0] "Kryptera (och valfritt signera) den markerade filen" #~ msgstr[1] "Kryptera de markerade filerna" + #~ msgid "Sign the selected file" + #~ msgid_plural "Sign the selected files" #~ msgstr[0] "Signera markerad fil" #~ msgstr[1] "Signera markerade filer" + #~ msgid "For internal use" #~ msgstr "För intern användning" + #~ msgid "Encryption Preferences" #~ msgstr "Krypteringsinställningar" + #~ msgid "Configure key servers and other encryption settings" #~ msgstr "Konfigurera nyckelservrar och andra krypteringsinställningar" + #~ msgid "Encryption and Keyrings" #~ msgstr "Kryptering och nyckelringar" + #~ msgid "Encrypt file" #~ msgstr "Kryptera fil" + #~ msgid "Sign file with default key" #~ msgstr "Signera fil med standardnyckeln" + #~ msgid "Encrypt and sign file with default key" #~ msgstr "Kryptera och signera fil med standardnyckeln" + #~ msgid "Decrypt encrypted file" #~ msgstr "Dekryptera krypterad fil" + #~ msgid "Verify signature file" #~ msgstr "Validera signaturfil" + #~ msgid "Read list of URIs on standard in" #~ msgstr "Läser in lista på URL:er från standard in" + #~ msgid "file..." #~ msgstr "fil..." + #~ msgid "Choose Recipients" #~ msgstr "Välj mottagare" -#~ msgid "Couldn't load keys" -#~ msgstr "Kunde inte läsa in nycklar" + #~ msgid "Choose Encrypted File Name for '%s'" #~ msgstr "Välj krypterat filnamn för \"%s\"" + #~ msgid "Choose Signer" #~ msgstr "Välj signerare" + #~ msgid "Choose Signature File Name for '%s'" #~ msgstr "Välj signaturfilnamn för \"%s\"" + #~ msgid "Import is complete" #~ msgstr "Importering är färdig" + #~ msgid "Importing keys ..." #~ msgstr "Importerar nycklar ..." + #~ msgid "Choose Decrypted File Name for '%s'" #~ msgstr "Välj dekrypterat filnamn för \"%s\"" + #~ msgid "Choose Original File for '%s'" #~ msgstr "Välj originalfil för \"%s\"" + #~ msgid "No valid signatures found" #~ msgstr "Inga giltiga signaturer hittades" + #~ msgid "File Encryption Tool" #~ msgstr "Filkrypteringsverktyg" + #~ msgid "Encrypting" #~ msgstr "Kryptering" + #~ msgid "Couldn't encrypt file: %s" #~ msgstr "Kunde inte kryptera fil: %s" + #~ msgid "Signing" #~ msgstr "Signering" + #~ msgid "Couldn't sign file: %s" #~ msgstr "Kunde inte signera fil: %s" + #~ msgid "Couldn't import keys from file: %s" #~ msgstr "Kunde inte importera nycklar från fil: %s" + #~ msgid "Decrypting" #~ msgstr "Dekrypterar" + #~ msgid "Couldn't decrypt file: %s" #~ msgstr "Kunde inte dekryptera fil: %s" + #~ msgid "Verifying" #~ msgstr "Validerar" + #~ msgid "Couldn't verify file: %s" #~ msgstr "Kunde inte validera fil: %s" + #~ msgid "Ace (.ace)" #~ msgstr "Ace (.ace)" + #~ msgid "Ar (.ar)" #~ msgstr "Ar (.ar)" + #~ msgid "Arj (.arj)" #~ msgstr "Arj (.arj)" + #~ msgid "Ear (.ear)" #~ msgstr "Ear (.ear)" + #~ msgid "Self-extracting zip (.exe)" #~ msgstr "Självuppackande zip (.exe)" + #~ msgid "Jar (.jar)" #~ msgstr "Jar (.jar)" + #~ msgid "Lha (.lzh)" #~ msgstr "Lha (.lzh)" + #~ msgid "Rar (.rar)" #~ msgstr "Rar (.rar)" + #~ msgid "Tar uncompressed (.tar)" #~ msgstr "Tar okomprimerad (.tar)" + #~ msgid "Tar compressed with bzip (.tar.bz)" #~ msgstr "Tar komprimerad med bzip (.tar.bz)" + #~ msgid "Tar compressed with bzip2 (.tar.bz2)" #~ msgstr "Tar komprimerad med bzip2 (.tar.bz2)" + #~ msgid "Tar compressed with gzip (.tar.gz)" #~ msgstr "Tar komprimerad med gzip (.tar.gz)" + #~ msgid "Tar compressed with lzop (.tar.lzo)" #~ msgstr "Tar komprimerad med lzop (.tar.lzo)" + #~ msgid "Tar compressed with compress (.tar.Z)" #~ msgstr "Tar komprimerad med compress (.tar.Z)" + #~ msgid "War (.war)" #~ msgstr "War (.war)" + #~ msgid "Zip (.zip)" #~ msgstr "Zip (.zip)" + #~ msgid "Zoo (.zoo)" #~ msgstr "Zoo (.zoo)" + #~ msgid "7-Zip (.7z)" #~ msgstr "7-Zip (.7z)" + #~ msgid "You have selected %d file " + #~ msgid_plural "You have selected %d files " #~ msgstr[0] "Du har markerat %d fil " #~ msgstr[1] "Du har markerat %d filer " + #~ msgid "and %d folder" + #~ msgid_plural "and %d folders" #~ msgstr[0] "och %d mapp" #~ msgstr[1] "och %d mappar" + #~ msgid "%s%s" #~ msgstr "%s%s" + #~ msgid "You have selected %d files" #~ msgstr "Du har markerat %d filer" + #~ msgid "You have selected %d folder" + #~ msgid_plural "You have selected %d folders" #~ msgstr[0] "Du har markerat %d mapp" #~ msgstr[1] "Du har markerat %d mappar" + #~ msgid "Couldn't list files" #~ msgstr "Kunde inte lista filer" + #~ msgid "Couldn't retrieve key data" #~ msgstr "Kunde inte hämta nyckeldata" + #~ msgid "Couldn't write key to file" #~ msgstr "Kunde inte skriva nyckel till fil" + #~ msgid "Remote Encryption Keys" #~ msgstr "Fjärrkryperingsnycklar" + #~ msgid "Decrypt File" #~ msgstr "Dekryptera fil" + #~ msgid "I have checked that this key belongs to '%s'" #~ msgstr "Jag har kontrollerat att den här nyckeln tillhör \"%s\"" + #~ msgid "Verify Signature" #~ msgstr "Validera signatur" + #~ msgid "Start the Seahorse pass phrase caching agent" #~ msgstr "Starta Seahorse agent för mellanlagring av lösenfraser" + #~ msgid "couldn't read gpg configuration, will try to create" #~ msgstr "kunde inte läsa gpg-konfiguration, kommer att försöka skapa" + #~ msgid "couldn't modify gpg configuration: %s" #~ msgstr "kunde inte ändra gpg-konfiguration: %s" + #~ msgid "Display variables instead of editing gpg.conf file" #~ msgstr "Visa variabler istället för att redigera filen gpg.conf" + #~ msgid "Couldn't open the Session Properties" #~ msgstr "Kunde inte öppna sessionsegenskaperna" + #~ msgid "Couldn't start the 'seahorse-agent' program" #~ msgstr "Kunde inte starta programmet \"seahorse-agent\"" + #~ msgid "The 'seahorse-agent' program exited unsuccessfully." #~ msgstr "Programmet \"seahorse-agent\" avslutades med fel." + #~ msgid "" #~ "Note: The 'seahorse-agent' program has been started. This program " #~ "is necessary in order to cache passphrases. " #~ msgstr "" #~ "Observera: Programmet \"seahorse-agent\" startades. Detta program " #~ "är nödvändigt för att kunna mellanlagra lösenfraser. " + #~ msgid "" #~ "Warning: The 'seahorse-agent' program is not running. This program " #~ "is necessary in order to cache passphrases. " #~ msgstr "" #~ "Varning: Programmet \"seahorse-agent\" körs inte. Detta program är " #~ "nödvändigt för att kunna mellanlagra lösenfraser. " + #~ msgid "Session _Properties" #~ msgstr "Sessions_egenskaper" + #~ msgid "Start sea_horse-agent" #~ msgstr "Starta sea_horse-agent" + #~ msgid "" #~ "To avoid manually starting the 'seahorse-agent' in the future\n" #~ "add it to the Session Manager. " #~ msgstr "" #~ "För att slippa att manuellt starta \"seahorse-agent\" i framtiden\n" #~ "kan du lägga till den till Sessionshanteraren. " + #~ msgid "Seahorse Preferences" #~ msgstr "Inställningar för Seahorse" + #~ msgid "Default Storage Location" #~ msgstr "Standardplats för lagring" + #~ msgid "Password Storage Locations" #~ msgstr "Platser för lösenordslagring" -#~ msgid "Password Storage" -#~ msgstr "Lösenordslagring" + #~ msgid "_Add Storage" #~ msgstr "_Lägg till lagring" + #~ msgid "_Remove Storage" #~ msgstr "_Ta bort lagring" + #~ msgid "couldn't drop privileges properly" #~ msgstr "kunde inte korrekt släppa privilegier" + #~ msgid "" #~ "When set seahorse-agent will try to automatically load the users SSH keys " #~ "when needed. This is equivalent to using the ssh-add utility." @@ -3416,29 +4145,38 @@ #~ "När inställd kommer seahorse-agent att automatiskt försöka läsa in " #~ "användarnas SSH-nycklar vid behov. Det här är samma som att använda " #~ "verktyget ssh-add." + #~ msgid "Whether to automatically load SSH keys on demand." #~ msgstr "Huruvida automatisk inläsning av SSH-nycklar vid behov ska göras." + #~ msgid "Secure Shell Keys" #~ msgstr "Secure Shell-nycklar" + #~ msgid "" #~ "No SSH caching agent is running. Cannot load Secure Shell keys." #~ msgstr "" #~ "Ingen SSH-agent för mellanlagring kör. Kan inte läsa in Secure Shell-" #~ "nycklar." + #~ msgid "Automatically load _Secure Shell keys" #~ msgstr "Läs automatiskt in _Secure Shell-nycklar" + #~ msgid "" #~ "Changing the master password failed. Make certain that you entered the " #~ "correct original master password." #~ msgstr "" #~ "Ändringen av huvudlösenordet misslyckades. Försäkra dig om att du angav " #~ "det korrekta ursprungliga huvudlösenordet." + #~ msgid "Confirm ne_w master password:" #~ msgstr "Bekräfta n_ytt huvudlösenord:" + #~ msgid "Current _master password:" #~ msgstr "Nuvarande _huvudlösenord:" + #~ msgid "GNOME Keyring" #~ msgstr "GNOME-nyckelring" + #~ msgid "" #~ "GNOME Keyring stores passwords, network keys, passphrases and other " #~ "secrets required for authentication. A master password is used to " @@ -3448,22 +4186,30 @@ #~ "andra hemligheter som krävs för autentisering. Ett huvudlösenord " #~ "används för att skydda dessa hemligheter. Huvudlösenordet kan " #~ "ändras här nedan." + #~ msgid "Passphrase Cache" #~ msgstr "Lösenfraser" + #~ msgid "The master password was successfully changed." #~ msgstr "Huvudlösenordet har ändrats." + #~ msgid "_New master password:" #~ msgstr "_Nytt huvudlösenord:" + #~ msgid "Original Master Password:" #~ msgstr "Ursprungligt huvudlösenord:" + #~ msgid "Progress Message" #~ msgstr "Förloppsmeddelande" + #~ msgid "Progress Status" #~ msgstr "Förloppsstatus" + #~ msgid "Login:" #~ msgstr "Inloggningsnamn:" + #~ msgid "Server:" #~ msgstr "Server:" + #~ msgid "[details]\n" #~ msgstr "[detaljer]\n" - diff -Nru seahorse-3.2.2/po/ta.po seahorse-3.6.3/po/ta.po --- seahorse-3.2.2/po/ta.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/ta.po 2012-09-03 10:44:42.000000000 +0200 @@ -4,17 +4,17 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Dr.T.Vasudevan , 2007, 2008, 2009, 2010, 2011. +# Dr.T.Vasudevan , 2007, 2008, 2009, 2010, 2011, 2012. # I felix , 2007. # I. Felix , 2008, 2009. # Dr.T.vasudevan , 2009. -# Dr,T,Vasudevan , 2010, 2011. +# Dr.T.Vasudevan , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: ta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-18 14:08+0530\n" -"PO-Revision-Date: 2011-09-18 14:09+0530\n" +"POT-Creation-Date: 2012-09-02 14:58+0530\n" +"PO-Revision-Date: 2012-09-02 15:05+0530\n" "Last-Translator: Dr.T.Vasudevan \n" "Language-Team: American English \n" "Language: \n" @@ -50,9 +50,58 @@ msgid "The host name or address of the server." msgstr "அந்த சேவையகத்தின் பெயர் அல்லது முகவரி" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "விசைவளையத்தை சேர்க்க முடியவில்லை" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "புதிய கடவுச்சொல் விசை வளையம் " + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "பயன்பாடு மற்றும் வலைப்பின்னல் கடவுச்சொற்களை சேமிக்க பயன்படுகிறது " + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "புதிய கடவுச்சொல்..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "பாதுகாப்பாக ஒரு கடவுச்சொல் அல்லது ரகசியத்தை சேமி" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "கடவுச்சொல் விசை வளையம் " + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "சேமித்த கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "முன்னிருப்பு விசை வளையத்தை அமைக்க முடியவில்லை" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "விசைவளைய கடவுச்சொல்லை மாற்ற முடியவில்லை" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "(_S) முன்னிருப்பாக அமை" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"வழக்கமாக பயன்பாடுகள் புதிய கடவுச்சொற்களை முன்னிருப்பு விசைவளையத்தில் சேமித்து வைக்கும்" + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "(_P) கடவுச்சொல் ஐ மாற்றுக" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "கடவுச்சொல் சேமிப்பு விசைவளையத்தை திறக்கும் கடவுச்சொல் ஐ மாற்று " + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "உருப்படியை சேர்க்க முடியவில்லை" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" @@ -60,6 +109,7 @@ #: ../gkr/seahorse-gkr-add-item.xml.h:2 #: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "_Description:" msgstr "_D விளக்கம்:" @@ -75,66 +125,117 @@ msgid "_Show Password" msgstr "_S கடவுச்சொல்லை காட்டு" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "உருப்படியை அழிக்க முடியவில்லை" +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "விசைவளையத்தை சேர்க்க முடியவில்லை" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "கடவுச்சொற்கள்" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "சேமித்துவைத்த அந்தரங்க கடவுச்சொற்கள், சான்றுகள் மற்றும் ரகசியங்கள்" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "ஐஎம் கணக்கு கடவுச்சொல் இதற்கு " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "கடவுச்சொல் அல்லது ரகசியம்" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "பிணைய கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "சேமித்த குறிப்பு" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "விசை வளைய கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "மறையாக்க விசை கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "முதன்மை சேமிப்பு கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "கூகுள் குரோம் கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "க்னோம் ஆன் லைன் கணக்குகள் கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "டெலிபதி கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "உடனடி செய்தி கடவுச்சொல்" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "வலைப்பின்னல் மேலாளர் ரகசியம்" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "கடவுச்சொல் '%s' ஐ நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] " %d கடவுச்சொல் ஐ நிச்சயம் நீக்க வேண்டுமா?" msgstr[1] " %d கடவுச்சொற்களை நிச்சயம் நீக்க வேண்டுமா?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "உருப்படியை அழிக்கிறது" -msgstr[1] "உருப்படிகளை அழிக்கிறது" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "ஒரு வளம் அல்லது வலையமைப்பு பகிர்வை அணுகுக" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "ஒரு இணையத்தை அணுகுக" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "ஒரு பிஜிபி விசையை திறக்கிறது" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "ஒரு பத்திரமான ஷெல்விசையை திறக்கிறது" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "சேமித்த கடவுச்சொல் அல்லது உள்நுழைவு" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "பிணைய சான்று பத்திரங்கள்" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "கடவுச்சொல்" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "கடவுச்சொல்லை மாற்ற முடியவில்லை" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "கடவுச்சொற்களை இற்றைப்படுத்துகிறது" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "விவரணத்தை அமைக்க முடியவில்லை" @@ -143,28 +244,28 @@ msgstr "கடவுச்சொல்:" #: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 msgid "Technical Details:" msgstr "தொழிநுட்ப விவரங்கள்:" #: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 msgid "Details" msgstr "விவரங்கள்" #: ../gkr/seahorse-gkr-item-properties.xml.h:4 #: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 msgid "Key" msgstr "விசை" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 msgid "Key Properties" msgstr "விசை பண்புகள்" @@ -181,8 +282,8 @@ msgstr "_கடவுச்சொல்லை காட்டு" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 msgid "Type:" msgstr "வகை:" @@ -191,107 +292,27 @@ msgid "Use:" msgstr "பயன்படுத்து:" -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "கடவுச்சொல்: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "கடவுச்சொல்: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "கடவுச்சொல் விசை வளையம் " - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "பயன்பாடு மற்றும் வலைப்பின்னல் கடவுச்சொற்களை சேமிக்க பயன்படுகிறது " - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "சேமித்த கடவுச்சொல்" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "பாதுகாப்பாக ஒரு கடவுச்சொல் அல்லது ரகசியத்தை சேமி" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "விசைவளையத்தை திறக்க முடியவில்லை" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "விசைவளையத்தை பூட்ட முடியவில்லை" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "முன்னிருப்பு விசை வளையத்தை அமைக்க முடியவில்லை" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "விசைவளைய கடவுச்சொல்லை மாற்ற முடியவில்லை" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "(_L) பூட்டு" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "திறக்க கடவுச்சொல் அவசியமாகும்படி கடவுச்சொல் சேமிப்பு விசைவளையத்தை பூட்டுக. " - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "பூட்டு நீக்கு (_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "கடவுச்சொல் சேமிப்பு விசைவளையத்தை பயன்படுத்த முதன்மை கடவுச்சொல்லால் திறக்கவும்." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "(_S) முன்னிருப்பாக அமை" - -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"வழக்கமாக பயன்பாடுகள் புதிய கடவுச்சொற்களை முன்னிருப்பு விசைவளையத்தில் சேமித்து வைக்கும்" - -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "(_P) கடவுச்சொல் ஐ மாற்றுக" - -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "கடவுச்சொல் சேமிப்பு விசைவளையத்தை திறக்கும் கடவுச்சொல் ஐ மாற்று " - -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "விசை வளையத்தை அழிக்க முடியவில்லை" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "உள்நுழையும்போது தானியங்கியாக திறக்கப்படும் ஒரு விசைவளையம்" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "கடவுச்சொற்களை சேமிக்க ஒரு விசை வளையம்" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "கடவுச்சொல் விசைவளையம் '%s' ஐ நிச்சயம் நீக்க வேண்டுமா?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "விசை வளையத்தை அழிக்கிறது" -msgstr[1] "விசை வளையங்களை அழிக்கிறது" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "எல்லா உருப்படிகளும் நிரந்தரமாக நீக்கப்படும் என நான் அறிவேன்." -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. #. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 msgid "Created:" msgstr "உருவாக்கப்பட்டது:" @@ -304,41 +325,8 @@ msgstr "விசை வளையம் பண்புகள்" #: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "(_N) பெயர்:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "செயல் ரத்து செய்யப்பட்டது." - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "விசை வளையத்துக்கு அணுக்கம் மறுக்கப்பட்டது" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "க்னோம்-விசை வளைய கிங்கரன் இயங்கவில்லை" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "விசைவளையம் ஏற்கெனவே திறக்கப்பட்டது" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "அப்படிப்பட்ட விசை வளையம் ஏதும் இல்லை" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "விசை வளைய கிங்கரன் உடன் தொடர்பு கொள்ள முடியவில்லை" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "இந்த உருப்படி ஏற்கெனவே உள்ளது" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "க்னோம் விசைவளையத்தை அணுகுவதில் உள்சார்ந்த பிழை" +msgid "Name:" +msgstr "பெயர்:" #: ../libegg/egg-datetime.c:317 msgid "Display flags" @@ -619,38 +607,148 @@ msgid "initial temporary item" msgstr "ஆரம்ப தற்காலிக உருப்படி" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "கடவுச்சொற்றொடர்" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "இந்த பயன்பாட்டின் பதிப்பு்பு" + +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- கணினி அமைப்புகள்" + +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "பங்குகள்:" + +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:2 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "கடவுச்சொற்கள் மற்றும் விசைகள்" + +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "மொழிபெயர்ப்பாளர்-நன்றி அறிதல்" + +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "ஸீஹார்ஸ் திட்டம் ஆரம்ப பக்கம்" + +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "நீக்க முடியவில்லை" + +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "விசைகளை ஏற்றுமதி செய்ய முடியவில்லை" + +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "தரவை ஏற்றுமதி செய்ய முடியவில்லை" + +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "(_F) கோப்பு" + +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "(_x) ஏற்றுமதி செய்..." + +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ஒரு கோப்புக்கு ஏற்றுமதி செய்" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_E திருத்து" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "ஒட்டுப்பலகைக்கு படியெடு " + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_D அழி" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "தேர்ந்தெடுக்கப்பட்ட உருப்ப்டிகளை நீக்கு " + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "இந்த உருப்படியின் பண்புகளை காட்டு" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "இந்த விசைவளையத்தின் பண்புகளை காட்டு" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_n விருப்பங்கள்" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "இந்த நிரலுக்கு விருப்பங்களை மாற்றுக" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_V பார்வை" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_H உதவி" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "இந்த நிரல் பற்றி" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_C உள்ளடக்கங்கள்" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "சீஹார்ஸ் உதவியை காட்டுக" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Export" +msgstr "ஏற்றுமதி" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "%s க்கு பின் அல்லது கடவுச்சொற்றொடர் ஐ உள்ளிடு" #: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "கடவுச்சொல்:" #. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" msgstr "உறுதியாக்கம்:" -#: ../libseahorse/seahorse-prefs.c:68 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "செல்லுபடியாகும் சேவையக முகவரி அல்ல" -#: ../libseahorse/seahorse-prefs.c:69 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." msgstr "உதவிக்கு உங்கள் கணினி மேலாளர் அல்லது விசை சேவையக மேலாளர் ஐ அணுகவும்." -#: ../libseahorse/seahorse-prefs.c:183 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "யூஆர்எல்(URL)" -#: ../libseahorse/seahorse-prefs.c:348 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" msgstr "தனிப்பயன்" -#: ../libseahorse/seahorse-prefs.c:406 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" msgstr "ஏதுமில்லை: விசைகளை வெளியிட வேண்டாம்" @@ -678,109 +776,53 @@ msgid "_Publish keys to:" msgstr "_P விசைகளை இதற்கு வெளியிடு:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "தரவை மீட்கிறது" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "தரவை ஏற்றுமதி செய்கிறது" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "தரவை இறக்குமதி செய்கிறது" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "தரவு அனுப்பப்படுகிறது" - -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "இருப்பில் இல்லை" - -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "விசை தரவு" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "பல விசைகள்" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "எல்லா விசை கோப்புகளும்" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "எல்லா கோப்புகளும்" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "கோப்புகளை காப்பகத்தில் சேர்" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"இந்த பெயருடன் ஒரு கோப்பு இருப்பில் உள்ளது.\n" -"\n" -"புதிய கோப்பால் அதை நீக்க வேண்டுமா?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_R இட மாற்று" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "தெரியாத" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "ஒரு போதும் இல்லை" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 msgid "Marginal" msgstr "விளிம்பில்" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 msgid "Full" msgstr "முழு" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "Ultimate" msgstr "கடைசி" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "இயலுமை நீக்கிய" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "ரத்து செய்யப்பட்டது" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "உதவியைக் காட்ட முடியவில்லை: %s" @@ -802,6 +844,7 @@ msgstr "_L விசை நீளம்:" #: ../pgp/seahorse-add-subkey.xml.h:5 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 msgid "Key _Type:" msgstr "விசை _T வகை:" @@ -821,27 +864,28 @@ msgid "Create the new user ID" msgstr "புதிய பயனர் அடையாளத்தை உருவாக்கு" -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:4 ../pgp/seahorse-pgp-generate.xml.h:7 msgid "Full _Name:" msgstr "_N முழுப் பெயர்:" -#: ../pgp/seahorse-add-uid.xml.h:4 +#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Key Co_mment:" msgstr "_m விசை குறிப்பு:" -#: ../pgp/seahorse-add-uid.xml.h:5 +#: ../pgp/seahorse-add-uid.xml.h:6 msgid "Must be at least 5 characters long" msgstr "எண் எழுத்துக்கள் குறியீடுகள் 5 க்கு மேல் இருக்க வேண்டும்." -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:7 msgid "Optional comment describing key" msgstr "விசையை விவரிக்க விருப்ப குறிப்பு" -#: ../pgp/seahorse-add-uid.xml.h:7 +#: ../pgp/seahorse-add-uid.xml.h:8 msgid "Optional email address" msgstr "விருப்ப மின்னஞ்சல் முகவரி" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:9 ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Email Address:" msgstr "_ம மின்னஞ்சல் முகவரி:" @@ -866,7 +910,7 @@ msgid "Add subkey to %s" msgstr "%s க்கு துணை விசையை சேர்க்கவும்" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "டிஎஸ்ஏ(DSA) (கையெழுத்திட மட்டும்)" @@ -874,7 +918,7 @@ msgid "ElGamal (encrypt only)" msgstr "எல் காமல் (மறையாக்கம் மட்டும்)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "ஆர்எஸ்ஏ(RSA) (கையெழுத்திட மட்டும்)" @@ -895,6 +939,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "மறைவிலக்கம் தோல்வியுற்றது. அனேகமாக உங்களிடம் மறை நீக்க விசை இல்லை" +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "செயல் ரத்து செய்யப்பட்டது." + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "செல்லுபடியாகாத காலாவதி தேதி" @@ -912,47 +961,146 @@ msgid "Expiry: %s" msgstr "காலாவதி: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "பல விசைகள்" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "விசை தரவு" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "ஆர்மர்ட் பிஜிபி விசைகள்" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "பிஜிபி விசைகள்" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "பிஜிபி விசை" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "மின்னஞ்சல் மற்றும் கோப்புகளுக்கு மறையாக்கத்தை பயன்படுத்துக" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 msgid "RSA" msgstr "ஆர்எஸ்ஏ(RSA)" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "டிஎஸ்ஏ எல்காமல் (DSA Elgamal)" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "பிஜிபி விசையை உருவாக்க முடியவில்லை" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "புதிய பிஜிபி விசைக்கு கடவுசொற்றொடர்" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "புதிய பிஜிபி விசைக்கு கடவுசொற்றொடரை ஐ இரு முறை உள்ளிடுக" -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"ஒரு விசையை உருவாக்கும்போது நிறையரேண்டம் தகவலை\n" +"உருவாக்க வேண்டும். இதற்கு உங்கள் உதவி தேவை. நல்ல\n" +"உத்தி ஏதேனும் மற்ற வேலைகளை செய்வது - விசைப்பலகையில்\n" +"ஏதேனும் தட்டுவது சொடுக்கியை நகர்த்துவது, நிரல்களை \n" +"இயக்குவது. இவை கணினிக்கு போதுமான தரவை தரும்." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "விசையை உருவாக்குகிறது" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "%s ஐ நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "%d விசைகளை நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" +msgstr[1] "%d விசைகளை நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "தவறான கடவுச்சொல்" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "" "தவறான கடவுச்சொல் ஐ நீங்கள் உள்ளீட்ட து இது மூன்றாம் முறை. தயை செய்து மீண்டும் முயற்சிக்கவும்" +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "தவறான கடவுச்சொற்றொடர்." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' க்கு புதிய கடவுச்சொற்றொடரை உள்ளிடவும்." + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' க்கு கடவுச்சொற்றொடரை உள்ளிடவும்." + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Enter new passphrase" +msgstr "புதிய கடவுச்சொற்றொடரை உள்ளிடவும்." + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "கடவுச்சொற்றொடரை உள்ளிடவும்." + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "கடவுச்சொற்றொடர்" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d விசை ஏற்றப்பட்டது" +msgstr[1] "%d விசைகள் ஏற்றப்பட்டன" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"செல்லுபடியாகாத விசை தரவு (காணாத யுஐடி கள்) இது தேதி எதிர்காலத்தில் அமைத்த கணினி " +"அல்லது காணாத சுய கையெழுத்து ஆல் இருக்கலாம்." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "க்னூபிஜி விசைகள்" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "க்னூபிஜி: முன்னிருப்பு விசைவலைய அடைவு" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -987,27 +1135,31 @@ msgid "All JPEG files" msgstr "எல்லா ஜேபெக் (JPEG) கோப்புகளும்" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "எல்லா கோப்புகளும்" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "விசைக்கு கூட்ட படம் தேர்வு செய்க" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "படத்தை உருவாக்க முடியவில்லை" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "படத்தை சேர்க்க முடியவில்லை" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "கோப்பை ஏற்ற முடியவில்லை. அது செல்லாத முறைமையில் இருக்கலாம்." -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "இப்போதைய படத்தை நிச்சயமாக உங்கள் விசையிலிருந்து நீக்க வேண்டுமா?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "படத்தை நீக்க முடியவில்லை" @@ -1064,7 +1216,11 @@ msgid "Couldn't add revoker" msgstr "இரத்து செய்வியை சேர்க்க முடியவில்லை" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "இந்த ரகசிய விசை நிரந்தரமாக நீக்கப்படும் என நான் அறிவேன்." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1079,137 +1235,207 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "கையெழுத்திட பயனாகும் விசை ஏதும் இல்லை" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "இந்த விசையில் உங்கள் நம்பிக்கையை காட்ட உங்களிடம் பிஜிபி விசை ஏதும் இல்லை." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "தவறான கடவுச்சொற்றொடர்." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "எல் காமல்" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s' க்கு புதிய கடவுச்சொற்றொடரை உள்ளிடவும்." +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "தேடல் குறிப்பாக இல்லை. சேவையகம் '%s' இல் பல விசைகள் உள்ளன." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s' க்கு கடவுச்சொற்றொடரை உள்ளிடவும்." +msgid "Couldn't communicate with server '%s': %s" +msgstr "சேவையகம் '%s' உடன் தொடர்பு கொள்ள முடியவில்லை:%s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "புதிய கடவுச்சொற்றொடரை உள்ளிடவும்." +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP விசை சேவகன்" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "கடவுச்சொற்றொடரை உள்ளிடவும்." +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "விசைகளை ஏற்றுமதி செய்ய முடியவில்லை" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "விசை சேவையகத்துக்கு விசைகளை இறக்குகிறது" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "தொலை (_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "இந்த சாளரத்தை மூடு" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "தொலை விசைகளை தேடுக (_F)..." -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "விசைகளை விசை சேவையகத்தில் தேடுகிறது" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:5 +msgid "_Import" +msgstr "_I இறக்குமதி செய்" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "உள்ளமை விசை ரிங்கிற்கு தேர்ந்தெடுக்கப்பட்ட விசைகளை இறக்கு" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "தொலை விசைகள்" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d விசை ஏற்றப்பட்டது" -msgstr[1] "%d விசைகள் ஏற்றப்பட்டன" +msgid "Remote Keys Containing '%s'" +msgstr "' %s'ஐ தொலை விசைகள் கொண்டுள்ளன" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "விசைகளுக்கு தேடல் தோல்வியடைந்தது." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Key Servers:" +msgstr "விசை சேவையகங்கள்:" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "Shared Keys Near Me:" +msgstr "அருகிலுள்ள பகிர்ந்து கொண்ட விசைகள்:" + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "Find Remote Keys" +msgstr "தொலை விசைகளை தேடுக" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:4 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"செல்லுபடியாகாத விசை தரவு (காணாத யுஐடி கள்) இது தேதி எதிர்காலத்தில் அமைத்த கணினி " -"அல்லது காணாத சுய கையெழுத்து ஆல் இருக்கலாம்." +"இது மற்றவர்களுக்கு இணையத்தில் விசைகளை கண்டு பிடிக்கும். இந்த விசைகளை பின்னர் உங்கள் விசை " +"வளையத்தில் இறக்குமதி செய்யலாம்." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "எல் காமல்" +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Where to search:" +msgstr "எங்கே தேடுவது:" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP விசை சேவகன்" +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "_Search" +msgstr "_S தேடுக" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search for keys containing: " +msgstr "_S இது உள்ள விசைகளை தேடு:" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "சேவையகத்துக்கு விசைகளை வெளியிட முடியவில்லை" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "தேடல் குறிப்பாக இல்லை. சேவையகம் '%s' இல் பல விசைகள் உள்ளன." +msgid "Couldn't retrieve keys from server: %s" +msgstr "%s சேவையகத்திலிருந்து விசைகளை மீட்டெடுக்க முடியவில்லை" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "சேவையகம் '%s' உடன் தொடர்பு கொள்ள முடியவில்லை:%s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "ஒத்திசைவுக்கு %d விசை தேர்ந்தெடுக்கப்படுகிறது" +msgstr[1] "ஒத்திசைவுக்கு %d விசைகள் தேர்ந்தெடுக்கப்படுகிறன" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "விசைகள் ஒத்திசைக்கப்படுகின்றன..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "விசைகள் ஒத்திசைப்பு" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"இது உங்கள் விசை வளையத்தில் உள்ள விசைகளை மற்றவர்களுக்கு கிடைக்கும்படி வெளியிடும். " +"உங்களுக்கு மற்றவர்கள் அவரவர் விசைகளில் நீங்கள் கடைசியாக பெற்ற பின் செய்திருக்கக்கூடிய " +"மாற்றங்களும் கிடைக்கும்." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"இது உங்களுக்கு மற்றவர்கள் அவரவர் விசைகளில் நீங்கள் கடைசியாக பெற்ற பின் செய்திருக்கக்கூடிய " +"மாற்றங்களை எடுக்கிறது. உங்கள் விசைகளை வெளியிட சேவையகத்தை தேர்ந்து எடுக்கவில்லை. அதனால் " +"உங்கள் விசைகள் அவர்களுக்கு கிடைக்காது." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_K விசை சேவையகங்கள்" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_S ஒத்திசைப்பு" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "'%s' உடன் தொடர்பு கொள்ள முடியவில்லை: %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "%s க்கு இணைக்கிறது" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "முகவரியை தீர்க்க முடியவில்லை: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "சேவையக முகவரியை தீர்க்கிறது: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "எல்டிஏபி விசை சேவகன்" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "_S விசை கையொப்பமிடுக..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "பொது விசையை கையொப்பமிடுக" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "%s ஐ நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "%d விசைகள் மற்றும் அடையாளங்களை நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "%d விசைகளைை நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "%d அடையாளங்களை நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" - -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "பயனர் அடையாளத்தை அழிக்க முடியவில்லை" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "ஒருங்கிணை மற்றும் வெளியீடு விசைகள் (_S)..." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "அந்தரங்க விசையை நீக்க முடியவில்லை" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "பொது விசையை அழிக்க முடியவில்லை" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "இந்த ஆன்லைனில் உங்கள் விசைகளை வெளியீடு அல்லது ஒருங்கிணை" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "பிஜிபி விசைகள்" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "பிஜிபி விசைகள் மின்னஞ்சல் மற்றும் கோப்புகளுக்கு மறையாக்கம் செய்ய பயன்படும் " + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "_Advanced key options" msgstr "_A உயர்நிலை விசை தேர்வுகள்" @@ -1220,18 +1446,14 @@ "உதவுகிறது." #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "இங்கு படிமுறைகள்" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 msgid "C_reate" msgstr "_r உருவாக்கு" -#: ../pgp/seahorse-pgp-generate.xml.h:5 +#: ../pgp/seahorse-pgp-generate.xml.h:4 msgid "E_xpiration Date:" msgstr "_x காலாவதி தேதி:" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:5 ../ssh/seahorse-ssh-generate.xml.h:4 msgid "Encryption _Type:" msgstr "_T மறையாக்க வகை:" @@ -1239,7 +1461,9 @@ msgid "Generate a new key" msgstr "ஒரு புதிய விசையை உருவாக்குக" -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:9 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:6 msgid "Key _Strength (bits):" msgstr "விசை _S பலம் (பிட்டுகள்):" @@ -1248,126 +1472,120 @@ msgstr "காலாவதி _v இல்லை" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "புதிய பிஜிபி விசை" - -#: ../pgp/seahorse-pgp-generate.xml.h:12 msgid "_Comment:" msgstr "_C குறிப்புரை:" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "காலாவதியானது" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "அந்தரங்க பிஜிபி விசை" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "பிஜிபி விசை" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "முதன்மை பயனரின் அடையாளத்தை மாற்ற முடியவில்லை" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "பயனர் அடையாளம் '%s' ஐ நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "பயனர் அடையாளத்தை அழிக்க முடியவில்லை" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[தெரியாத]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "பெயர்/மின்னஞ்சல்" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "கையொப்பம் அடையாளம்" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "முதன்மை படத்தை மாற்ற முடியவில்லை" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(தெரியாதது)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "விசை இந்த தேதியில் காலாவதி ஆனது: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "பெயர்" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "நிச்சயமாக துணை விசை %d ( %s இல்) ஐ நிரந்தரமாக நீக்க வேண்டுமா?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "துணை விசையை அழிக்க முடியவில்லை" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "நம்பிக்கையை மாற்ற முடியவில்லை" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "\"%s\" க்கு விசையை ஏற்றுமதி செய்ய முடியவில்லை" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "முழு விசையை ஏற்றுமதி செய்க" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" msgstr "விசையை ஏற்றுமதி செய்ய முடியவில்லை" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "ஒரு போதும் இல்லை" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "அடையாளம்" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "வகை" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "உருவாக்கப்பட்டது" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "காலாவதி ஆவது" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "நிலை" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "பலம்" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "காலாவதியானது" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "நன்று" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "விசை அடையாளம்" @@ -1402,152 +1620,152 @@ msgid "Key Names and Signatures" msgstr "விசை பெயர்கள் மற்றும் கையொப்பம்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +#. A photograph +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 msgid "Photo " msgstr "புகைப்படம்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 msgid "Technical Details" msgstr "தொழில் நுட்ப விவரங்கள்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 msgid "This key has been revoked" msgstr "இந்த விசை இரத்து செய்யப்பட்டது" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 msgid "This key has expired" msgstr "இந்த விசை காலாவதி ஆகிவிட்டது" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 +#: ../ssh/seahorse-ssh-key-properties.xml.h:8 msgid "Type:" msgstr "வகை:" #. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 msgid "Use:" msgstr "பயன்படுத்து:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 msgid "_Subkeys" msgstr "_S துணவிசைகள்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 msgid "Add" msgstr "சேர்க்க" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 msgid "Add a photo to this key" msgstr "இந்த விசைக்கு ஒரு படத்தை சேர்க்கவும்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Change _Passphrase" msgstr "_P கடவுசொற்றொடரை மாற்று" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 msgid "Decrypt files and email sent to you." msgstr "அனுப்பிய கோப்புகள் மற்றும் மின்னஞ்சல்களை மறைவிலக்கு" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 msgid "Delete" msgstr "நீக்கு" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 msgid "Expire" msgstr "காலாவதி" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "Expires:" msgstr "காலாவதியாகிறது:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "ஏற்றுமதி" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 msgid "Go to next photo" msgstr "அடுத்த படத்துக்கு போகவும்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 msgid "Go to previous photo" msgstr "முந்தைய படத்துக்கு போகவும்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 msgid "Key ID:" msgstr "விசை அடையாளம்:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 msgid "Make this photo the primary photo" msgstr "இந்த படத்தை முதன்மை படமாக்குக" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 +#. List of names and signatures on the PGP key. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 msgid "Names and Signatures" msgstr "பெயர்கள் மற்றும் கையெழுத்துக்கள்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 msgid "Never" msgstr "ஒரு போதும் இல்லை" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 msgid "Override Owner _Trust:" msgstr "உரிமையாளர் _T நம்பிக்கை மீறுகை:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 msgid "Owner" msgstr "உரிமையாளர்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 msgid "Primary" msgstr "முதன்மை" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 msgid "Private PGP Key" msgstr "அந்தரங்க பிஜிபி விசை" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 msgid "Remove this photo from this key" msgstr "இந்த விசையிலிருந்து படத்தை நீக்குக" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 msgid "Revoke" msgstr "இரத்து செய்க" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 msgid "Sign" msgstr "கையொப்பம்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 msgid "Strength:" msgstr "பலம்:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 msgid "The owner of the key revoked the key. It can no longer be used." msgstr "இந்த விசையின் உரிமையாளர் விசையை இரத்து செய்துவிட்டார். இதை இனி பயன்படுத்த முடியாது." -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 +#. Add another name to the PGP key. +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 msgid "_Add Name" msgstr "_A பெயரை சேர்க்கவும்" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 msgid "_Export Complete Key:" msgstr "முழு விசையை _E ஏற்றுமதி செய்க:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 msgctxt "name-of-key" msgid "Name:" msgstr "பெயர்:" @@ -1565,78 +1783,77 @@ msgid "Indicate Trust:" msgstr "நம்பிக்கையை காட்டுங்கள்:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 msgid "Your trust of this key" msgstr " இந்த விசையில் உங்கள் நம்பிக்கை" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 msgid "_Other Names:" msgstr "_மற்ற பெயர்கள்:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 msgid "_People who have signed this key:" msgstr "_p இந்த விசையை கையெழுத்திட்ட நபர்கள்:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "மறையாக்குக மற்றும் விசையை உரிமையாளருக்கு மின்னஞ்சல் செய்க." - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 +msgid "Encrypt files and email to the key's owner" +msgstr "கோப்புகளை மறையாக்குக மற்றும் விசை உரிமையாளருக்கு மின்னஞ்சல் செய்க." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 msgid "Fully" msgstr "முழுதும்" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "'%s இடமிருந்து வரும் மற்ற விசைகளையும் நம்புகிறேன்." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "இந்த விசை '%s' உடையது என நம்புகிறீர்கள் எனில் இந்த விசையைகையெழுத்திடுக:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "இந்த விசை '%s' உடையது என இனி நம்பிக்கை இல்லை எனில் விசையை இரத்து செய்க:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 msgid "Marginally" msgstr "விளிம்பில்" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 msgid "Public PGP Key" msgstr "பொது பிஜிபி விசை" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 msgid "Trust" msgstr "நம்பு" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 msgid "Ultimately" msgstr "கடைசியில்" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 msgid "You _Trust the Owner:" msgstr "_T உரிமையாளரை நீங்கள் நம்புகிறீர்கள்:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Your trust is manually specified on the Details tab." msgstr "உங்கள் நம்பிக்கை கைமுறையாக விவரங்கள் கீற்றில் குறிப்பிடப்பட்டது." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 msgid "_Only display the signatures of people I trust" msgstr "_O நான் நம்பும் நபர்களின் விசைகளை மட்டும் இதில் காட்டுக" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 msgid "_Revoke Signature" msgstr "_R கையொப்பத்தை இரத்து செய்க" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 msgid "_Sign this Key" msgstr "_S இந்த விசையை கையெழுத்திடுக" @@ -1661,10 +1878,14 @@ msgid "_Reason:" msgstr "_R காரணம்:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "You have no personal PGP keys that can be used to sign a document or message." msgstr "ஆவணங்களையோ செய்திகளையோ கையெழுதிட உங்களிடம் அந்தரங்க பிஜிபி விசை ஏதும் இல்லை." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_S செய்தியை விசையால் கையொப்பமிடுக." + #: ../pgp/seahorse-sign.xml.h:1 msgid "How carefully have you checked this key?" msgstr "இந்த விசையை கவனமாக சோதித்தீர்களா?" @@ -1681,9 +1902,9 @@ msgid "" "Casually: means you have done a casual verification that the key is " "owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " +"key fingerprint to the owner over the phone." msgstr "" -"i> மேலோட்டமாக எனில் நீங்கள் விசையை தனது என்பவருடையதா என மேலோட்டமாக உறுதி செய்து " +" மேலோட்டமாக எனில் நீங்கள் விசையை தனது என்பவருடையதா என மேலோட்டமாக உறுதி செய்து " "உள்ளீர்கள். உதாரணமாக விசையின் அடையாளத்தை தொலைபேசியில் அவருக்கு படிக்க முடிந்தது." #: ../pgp/seahorse-sign.xml.h:5 @@ -1752,34 +1973,160 @@ msgid "_Very Carefully" msgstr "_V மிக கவனமாக" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_S செய்தியை விசையால் கையொப்பமிடுக." +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "தரவை ஏற்றுமதி செய்கிறது" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "தரவை மீட்கிறது" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "தரவை இறக்குமதி செய்கிறது" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "தரவு அனுப்பப்படுகிறது" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "இருப்பில் இல்லை" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "தனிப்பட்ட சான்றிதழ் மற்றும் விசை " + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "தனிப்பட்ட சான்றிதழ்" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "சான்றிதழ்" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "சான்றிதழ்கள் (டிஈஆர் குறியாக்கம் செய்த)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "சான்றிதழ்கள்" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 சான்றிதழ்கள் மற்றும் தொடர்பான விசைகள் " + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "%d சான்றிதழை நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" +msgstr[1] "%d சான்றிதழ்களை அடையாளங்களை நிச்சயம் நிரந்தரமாக அழிக்க வேண்டுமா?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "அந்தரங்க விசையை உருவாக்க முடியவில்லை" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "உருவாக்கு" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "அந்தரங்க விசை" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "ஒரு சான்றிதழை கேட்க பயனாகிறது" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Create a new private key" +msgstr "ஒரு புதிய அந்தரங்க விசையை உருவாக்குக" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +msgid "Label:" +msgstr "விளக்கச்சீட்டு:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +msgid "Stored at:" +msgstr "சேமித்த இடம்:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "இந்த விசை நிரந்தரமாக நீக்கப்படும் என்று அறிவேன்." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "பெயரில்லா" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "சான்றிதழை ஏற்றுமதி செய்ய முடியவில்லை" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "நீக்க முடியவில்லை" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "சான்றிதழ் '%s' ஐ நிச்சயம் நீக்க விரும்புகிறீர்களா?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "சான்றிதழ் '%d' ஐ நிச்சயம் நீக்க விரும்புகறீர்களா?" -msgstr[1] "சான்றிதழ்கள் '%d' ஐ நிச்சயம் நீக்க விரும்புகறீர்களா?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "அழிக்கிறது" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_E ஏற்றுமதி" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "ஒரு கோப்பை ஏற்றுமதி செய்" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "இந்த சான்றிதழ் அல்லது விசையை நீக்குக" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "_C சான்றிதழ் ஐ வேண்டுக" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "இந்த விசைக்கு ஒரு சான்றிதழை உருவாக்கு" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "சான்றிதழ் வேண்டுதலை சேமிக்க முடியவில்லை." + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "சான்றிதழ் வேண்டுதலை சேமி" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "சான்றிதழ் வேண்டுதல்" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "பிஈஎம் குறியாக்கிய வேண்டுதல்" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "சான்றிதழ் வேண்டுதலை உருவாக்க முடியவில்லை." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "சான்றிதழ் வேண்டுதல் கோப்பை உருவாக்குக" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "Name (CN):" +msgstr "பெயர் (CN):" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "The common name (CN) placed in the certificate request." +msgstr "சான்றிதழ் வேண்டுதலில் வைத்த சாதாரண பெயர் (CN)" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "பெயரிடாத அந்தரங்க விசை" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" @@ -1801,134 +2148,109 @@ msgid "Manage your passwords and encryption keys" msgstr "உங்கள் கடவுச்சொற்கள் மற்றும் மறையாக்க விசைகளை மேலாளுங்கள்" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "கடவுச்சொற்கள் மற்றும் விசைகள்" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "தொடர்க" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "(_S) உருவாக்க வேண்டிய உருப்படியை தேர்ந்தெடுக்கவும்:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_o தொடரவும்" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "புதியது உருவாக்கு..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d விசை தேர்ந்தெடுக்கப்பட்டது" -msgstr[1] "%d விசைகள் தேர்ந்தெடுக்கப்பட்டன" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "விசைகளை ஏற்றுமதி செய்ய முடியவில்லை" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "இறக்குமதி தோல்வி" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "இறக்குமதி" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "இறக்குமதி செய்ய தேதி:" -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "இறக்குமதி செய்யப்பட்ட விசைகள்" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "விசைகளை இறக்குமதி செய்கிறது" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "விசையை இறக்குமதி செய்க" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "அறியப்படாத விசை வகை அல்லது தவறான தரவு வடிவம்" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "விசைகளை இறக்குமதி செய்கிறது" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "எல்லா விசை கோப்புகளும்" -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "தொலை (_R)" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "விடப்பட்ட உரை" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "ஒட்டுப்பலகை உரை" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "புதிய (_N)" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "இந்த நிரல் மூடு" -#: ../src/seahorse-key-manager.c:740 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "புதிய (_N)..." -#: ../src/seahorse-key-manager.c:741 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "ஒரு புதிய விசை அல்லது உருப்படியை உருவாக்குக" -#: ../src/seahorse-key-manager.c:742 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "ஒரு புதிய விசை அல்லது உருப்படியை சேர்" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "இறக்குமதி செய் (_I)..." -#: ../src/seahorse-key-manager.c:743 +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "ஒரு கோப்புக்கு ஏற்றுமதி செய்" -#: ../src/seahorse-key-manager.c:745 +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "ஒட்டுப்பலகைக்கு படியெடு " -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "தொலை விசைகளை தேடுக (_F)..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "விசைகளை விசை சேவையகத்தில் தேடுகிறது" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "ஒருங்கிணை மற்றும் வெளியீடு விசைகள் (_S)..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "இந்த ஆன்லைனில் உங்கள் விசைகளை வெளியீடு அல்லது ஒருங்கிணை" - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "வகை (_y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "வகை பத்தியை காட்டுக." - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "காலாவதி (_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "காலாவதி பத்தியை காட்டுக." - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "நம்பு (_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "மேலாளரில் நம்புக பத்தியை காட்டுக." - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "செல்லுபடி (_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "செல்லுபடி பத்தியை காட்டுக." - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "வடிப்பி:" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "_K விசை வளையத்தால்" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "விசை வளையங்களை பட்டியலிடும் பக்கப்பலகம்" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "_p சொந்தத்தை காட்டு" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "அந்தரங்க விசைகள், சான்றிதழ்கள் மற்றும் கடவுச்சொற்களை மட்டும் காட்டு." + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "_t நம்பகமானதை மட்டும் காட்டு" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "நம்பகமான விசைகள், சான்றிதழ்கள் மற்றும் கடவுச்சொற்களை மட்டும் காட்டு. " + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr " _a எதையும் காட்டுக" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "எல்லா விசைகள், சான்றிதழ்கள் மற்றும் கடவுச்சொற்களையும் காட்டு." + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "வடிப்பி" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -1943,262 +2265,40 @@ msgstr "ஒரு கோப்பிலிருந்து இருப்பில் உள்ள விசைகளை இறக்குமதி செய்க:" #: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_P என் அந்தரங்க விசைகள்" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_K மற்ற விசைகள்" - -#: ../src/seahorse-key-manager.xml.h:6 msgid "To get started with encryption you will need keys." msgstr "மறையாக்கம் செய்ய துவங்க உங்களுக்கு விசைகள் தேவை." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_I இறக்குமதி செய்" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_P கடவுச்சொற்கள்" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "விசைகளை ஏற்றுமதி செய்ய முடியவில்லை" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "செல்லுபடி" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "காலாவதி தேதி" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "இந்த சாளரத்தை மூடு" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "அனைத்தும் விரிவாக்கு (_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "அனைத்து பட்டியலையும் விரிவாக்கு" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "அனைத்தையும் குறுக்கு (_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "அனைத்து பட்டியலிடுதலுகளையும் குறுக்கு" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "தொலை விசைகள்" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "' %s'ஐ தொலை விசைகள் கொண்டுள்ளன" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "விசை சேவையகங்கள்:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "அருகிலுள்ள பகிர்ந்து கொண்ட விசைகள்:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "தொலை விசைகளை தேடுக" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"இது மற்றவர்களுக்கு இணையத்தில் விசைகளை கண்டு பிடிக்கும். இந்த விசைகளை பின்னர் உங்கள் விசை " -"வளையத்தில் இறக்குமதி செய்யலாம்." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "எங்கே தேடுவது:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_S தேடுக" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_S இது உள்ள விசைகளை தேடு:" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "சேவையகத்துக்கு விசைகளை வெளியிட முடியவில்லை" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "%s சேவையகத்திலிருந்து விசைகளை மீட்டெடுக்க முடியவில்லை" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "பூட்ட முடியவில்லை" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "பூட்டு திறக்க முடியவில்லை" -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "ஒத்திசைவுக்கு %d விசை தேர்ந்தெடுக்கப்படுகிறது" -msgstr[1] "ஒத்திசைவுக்கு %d விசைகள் தேர்ந்தெடுக்கப்படுகிறன" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "(_L) பூட்டு" -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "விசைகள் ஒத்திசைக்கப்படுகின்றன..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "பூட்டு நீக்கு (_U)" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "விசைகள் ஒத்திசைப்பு" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "பண்புகள் (_P)" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"இது உங்கள் விசை வளையத்தில் உள்ள விசைகளை மற்றவர்களுக்கு கிடைக்கும்படி வெளியிடும். " -"உங்களுக்கு மற்றவர்கள் அவரவர் விசைகளில் நீங்கள் கடைசியாக பெற்ற பின் செய்திருக்கக்கூடிய " -"மாற்றங்களும் கிடைக்கும்." +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "_S பத்திரமான ஷெல் க்கு விசை வடிவமைக்கிறது..." -#: ../src/seahorse-keyserver-sync.xml.h:3 +#: ../ssh/seahorse-ssh-actions.c:101 msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." +"Send public Secure Shell key to another machine, and enable logins using " +"that key." msgstr "" -"இது உங்களுக்கு மற்றவர்கள் அவரவர் விசைகளில் நீங்கள் கடைசியாக பெற்ற பின் செய்திருக்கக்கூடிய " -"மாற்றங்களை எடுக்கிறது. உங்கள் விசைகளை வெளியிட சேவையகத்தை தேர்ந்து எடுக்கவில்லை. அதனால் " -"உங்கள் விசைகள் அவர்களுக்கு கிடைக்காது." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_K விசை சேவையகங்கள்" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_S ஒத்திசைப்பு" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "இந்த பயன்பாட்டின் பதிப்பு்பு" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "பங்குகள்:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "மொழிபெயர்ப்பாளர்-நன்றி அறிதல்" - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "ஸீஹார்ஸ் திட்டம் ஆரம்ப பக்கம்" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "(_F) கோப்பு" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_E திருத்து" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_V பார்வை" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_H உதவி" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "_n விருப்பங்கள்" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "இந்த நிரலுக்கு விருப்பங்களை மாற்றுக" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "இந்த நிரல் பற்றி" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_C உள்ளடக்கங்கள்" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "சீஹார்ஸ் உதவியை காட்டுக" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "பொது விசையை ஏற்றுமதி செய்க" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "விசைகள் ஏற்றுமதியாகிறன" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "விசை சேவையகத்திலிருந்து தரவை மீட்க முடியவில்லை" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "விசைகள் நகல் எடுக்கப்பட்டன" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "விசைகளை மீட்கிறது" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s ஒரு தனிப்பட்ட விசை. நிச்சயம் தொடர வேண்டுமா?" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "விசை சேவையகத்துக்கு விசைகளை இறக்குகிறது" - -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "பண்புகளை காட்டு" - -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "(_D) அழி" - -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "தேர்ந்தெடுக்கப்பட்ட உருப்ப்டிகளை நீக்கு " - -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "(_x) ஏற்றுமதி செய்..." - -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "ஒரு கோப்புக்கு ஏற்றுமதி செய்" - -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "ஒட்டுப்பலகைக்கு படியெடு " - -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "உள்ளமை விசை ரிங்கிற்கு தேர்ந்தெடுக்கப்பட்ட விசைகளை இறக்கு" +"பத்திரமான ஷெல் விசையை மற்றொரு கணினிக்கு அனுப்பி அந்த விசையை பயன்படுத்தி உள்நுழைய " +"இயலுமை படுத்துக" #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2227,72 +2327,76 @@ msgid "Enter the new passphrase again: %s" msgstr "புதிய கடவுச்சொற்றொடர் ஐ மீண்டும் உள்ளிடு: %s " -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "_S பத்திரமான ஷெல் க்கு விசை வடிவமைக்கிறது..." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "பத்திரமான ஷெல்" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "மற்ற கணினிகளுடன் பாதுகாப்புடன் இணைக்க பயன்படும் விசைகள்" -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"பத்திரமான ஷெல் விசையை மற்றொரு கணினிக்கு அனுப்பி அந்த விசையை பயன்படுத்தி உள்நுழைய " -"இயலுமை படுத்துக" - -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "பத்திரமான ஷெல் விசை '%s' ஐ நிச்சயம் அழிக்க வேண்டுமா?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "%d பத்திரமான ஷெல் விசைகளை ஐ நிச்சயம் அழிக்க வேண்டுமா?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "விசையை அழிக்க முடியவில்லை" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "%d பத்திரமான ஷெல் விசையை நிச்சயம் அழிக்க வேண்டுமா?" +msgstr[1] "%d பத்திரமான ஷெல் விசைகளை நிச்சயம் அழிக்க வேண்டுமா?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "எஸ்எஸ்ஹெச் விசை" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "ரகசிய எஸ்எஸ்ஹெச் விசைகள்" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "பொது எஸ்எஸ்ஹெச் விசைகள்" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "இந்த விசைக்கு பொது விசை கோப்பு இல்லை" -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:16 msgid "Secure Shell Key" msgstr "பத்திரமான ஷெல் விசை" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "மற்ற கணினிகளை அணுக பயன்படும். (எ-டு ஒரு முனையம் வழியாக)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "பத்திரமான ஷெல் விசையை உருவாக்க முடியவில்லை" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "பத்திரமான ஷெல் விசையை உருவாக்குகிறது" #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -" இந்த விசை எதற்கு என்று நினைவுறுத்திக்கொள்ள உங்கள் மின்னஞ்சல் முகவரி அல்லது வேறு எந்த " -"வித நினைவூட்டத்தையும் பயன்படுத்துக." +msgid "Your email address, or a reminder of what this key is for." +msgstr " இந்த விசை எதற்கு என்று நினைவுறுத்திக்கொள்ள உங்கள் மின்னஞ்சல் முகவரி" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -"ஒரு பாதுகாப்பான ஷெல் விசை (SSH) உங்களை SSH ஐ பயன்படுத்தி நம்பகமான கணினிகளுடன் இணைக்க " -"அனுமதிக்கிறது. கடவுச்சொல் ஒவ்வொரு முறையும் உள்ளிடத்தேவை இல்லை." +"ஒரு பாதுகாப்பான ஷெல் விசை (எஸ்எஸ்ஹெச்) உங்களை நம்பகமான கணினிகளுடன் இணைக்க " +"அனுமதிக்கிறது." #: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" "இந்த விசையை பயன்படுத்த ஏற்கெனெவே ஒரு கணினி இருந்தால் உங்கள் விசையை கண்டு கொள்ள அந்த " -"கணினியை இப்போது வடிவமைக்கலாம்." +"கணினியை இப்போது வடிவமைக்கலாம். " #: ../ssh/seahorse-ssh-generate.xml.h:7 msgid "New Secure Shell Key" @@ -2302,27 +2406,31 @@ msgid "_Create and Set Up" msgstr "_C உருவாக்கு மற்றும் அமை" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Jவிசை மட்டும் உருவாக்கு " - #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_K விசை விவரணம்:" +msgid "_Just Create Key" +msgstr "_J விசை மட்டும் உருவாக்கு " -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(படிக்க இயலாத பத்திரமான ஷெல் விசை)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "அந்தரங்க எஸ்எஸ்ஹெச் விசை" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "எஸ்எஸ்ஹெச் விசை" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "விசையை மறு பெயரிட இயலவில்லை." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "விசைக்கு அனுமதியை மாற்ற முடியவில்லை." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "விசைக்கு கடவுச்சொல்லை மாற்ற இயலவில்லை." @@ -2339,64 +2447,75 @@ msgstr "இடம்:" #: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "பெயர்:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 msgid "Strength:" msgstr "பலம்:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 msgid "Trust" msgstr "நம்பிக்கை" #: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr " இது '%s' கணக்குக்கு மட்டுமே செல்லுபடியாகும்." - -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 msgid "E_xport Complete Key" msgstr "_x முழு விசையை ஏற்றுமதி செய்க" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 msgid "The owner of this key is _authorized to connect to this computer" msgstr "_a இந்த விசையின் உரிமையாளர் இந்த கணினியுடன் இணைக்க அனுமதி உடையவர்" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "இது %s கணக்குக்கு மட்டுமே செல்லுபடியாகும்." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 msgid "Used to connect to other computers." msgstr "மற்ற கணினிகளுடன் இணைக்க பயன்படும்." -#: ../ssh/seahorse-ssh-operation.c:198 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "பெயர்:" + +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "எஸ்எஸ்ஹெச்(SSH) கட்டளை எதிர்பாராமல் முடிந்தது." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." -msgstr "எஸ்எஸ்ஹெச்(SSH) தோல்வியுற்றது" +msgstr "எஸ்எஸ்ஹெச் கட்டளை தோல்வியுற்றது" -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "தொலை புரவலன் கடவுச்சொல்" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "விசை கடவுச்சொற்றொடர் ஐ உள்ளிடு" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "புது பத்திரமான ஷெல் விசைக்கு கடவுச்சொற்றொடர்" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "%s விசையை இறக்குமதி செய்கிறது" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "விசையை இறக்குமதி செய்கிறது. கடவுச்சொற்றொடர் ஐ உள்ளிடவும்" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "திறந்த எஸ்எஸ்ஹெச் விசைகள் " + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "திறந்த எஸ்எஸ்ஹெச்: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "இந்த விசைக்கு தனி விசை இல்லை" @@ -2421,8 +2540,8 @@ "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." msgstr "" -"SSH ஐ பயன்படுத்தும் இன்னொரு கணினியுடன் உங்கள் பாதுகாப்பான ஷெல் விசையை பயன்படுத்த அந்த " -"கணினியில் உங்களுக்கு ஒரு உள்நுழைவு கணக்கு இருக்க வேண்டும்." +"எஸ்எஸ்ஹெச் ஐ பயன்படுத்தும் இன்னொரு கணினியுடன் உங்கள் பாதுகாப்பான ஷெல் விசையை பயன்படுத்த " +"அந்த கணினியில் உங்களுக்கு ஒரு உள்நுழைவு கணக்கு இருக்க வேண்டும்." #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" @@ -2436,524 +2555,32 @@ msgid "_Set Up" msgstr "_S அமை" -#~ msgid "DSA" -#~ msgstr "டிஎஸ்ஏ(DSA)" - -#~ msgid "Secure Shell key" -#~ msgstr "பத்திரமான ஷெல் விசை" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "புது பத்திரமான ஷெல் விசைக்கு கடவுச்சொற்றொடர் ஐ உள்ளிடுக" - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "சீஹார்ஸ் கிங்கரனை கிங்கரனாக இயக்காதே" - -#~ msgid "couldn't fork process" -#~ msgstr "செயல்பாடை கிளைக்க முடியவில்லை" - -#~ msgid "couldn't create new process group" -#~ msgstr "புதிய செயல்பாட்டு குழுவை உருவாக்க முடியவில்லை" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "மறையாக்க கிங்கரன் (சீஹார்ஸ்)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "செல்லுபடியாகாத அல்லது அடையாளம் தெரியாத விசை வகை: %s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "இந்த விசை வகைக்கு ஆதரவு இல்லை: %s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "இந்த செயலுக்கு ஆதரவு கட்டுமானம் ஆகும்போது செயலாக்கப்படவில்லை." - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "செல்லுபடியாகாத அல்லது அடையாளம் தெரியாத விசை: %s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "" -#~ "கையெழுத்திட்டவர் காலாவதியாகி விட்டது %s அன்று" - -#~ msgid "Invalid Signature" -#~ msgstr "செல்லுபடியாகாத கையெழுத்து" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "" -#~ "கையெழுத்திட்டவர் %s அன்றுகாலாவதியாகி விட்டது." - -#~ msgid "Expired Signature" -#~ msgstr "காலாவதியான கையெழுத்து" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "கையெழுத்திட்டவர் இரத்து செய்யப்பட்டது %s அன்று" - -#~ msgid "Revoked Signature" -#~ msgstr "இரத்து செய்த கையெழுத்து." - -#~ msgid "Signed by on %s." -#~ msgstr "கையெழுத்திட்டவர் %s அன்று" - -#~ msgid "Good Signature" -#~ msgstr "நல்ல கையெழுத்து" - -#~ msgid "Signing key not in keyring." -#~ msgstr "கையெழுத்திடும் விசை, விசை வளையத்தில் இல்லை." - -#~ msgid "Unknown Signature" -#~ msgstr "தெரியாத கையெழுத்து" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "கெட்ட அல்லது மோசடி கையெழுத்து. கையெழுத்திட்ட தரவு மாறி உள்ளது." - -#~ msgid "Bad Signature" -#~ msgstr "கெட்ட கையெழுத்து." - -#~ msgid "Couldn't verify signature." -#~ msgstr "கையெழுத்தை சரி பார்க்க முடியவில்லை." - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "செல்லுபடியாகாத அல்லது அடையாளம் தெரியாத கையொப்பம் இட்டவர்: %s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "கையொப்பமிட விசை செல்லுபடியாகாது: %s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "செல்லுபடியாகாத அல்லது அடையாளம் தெரியாத பெறுனர்: %s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "விசை மறையாக்கத்துக்கு செல்லுபடியாகாத பெறுனர்: %s" - -#~ msgid "No recipients specified" -#~ msgstr "பெறுனர் குறிப்பிடப்படவில்லை" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "மறைநீக்கத்துக்கு செல்லுபடியாகாத விசை:%s" - -#~ msgid "Please set clearuri" -#~ msgstr "தயவு செய்து க்ளியர்யூஆர்ஐ ஐ அமைக்கவும்" - -#~ msgid "Please set crypturi" -#~ msgstr "தயவு செய்து க்ரிப்ட்யூஆர்ஐ ஐ அமைக்கவும்" - -#~ msgid "Error opening clearuri" -#~ msgstr "க்ளியர்யூஆர்ஐ ஐ திறக்கும் போது பிழை" - -#~ msgid "No signer specified" -#~ msgstr "கையொப்பம் இட்டவர் குறிப்பிடப்படவில்லை" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "உறுதிப்படுத்த செல்லுபடியாகாத விசை:%s" - -#~ msgid "Invalid key id: %s" -#~ msgstr "செல்லுபடியாகாத விசை அடையாளம்:%s" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "தொலை பிஜிபி விசைகளுக்கு தேட ஒரு விசை சேவையக பட்டியல். பின்னைய பதிப்புகளில் ஒரு " -#~ "வெற்று இடத்துக்கு பின் பெயரை சேர்த்து காட்டும் பெயர் ஒன்று சேர்க்கலாம்." - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "தானியங்கியாக விசைகளை மீட்டுவரவும்." - -#~ msgid "Auto Sync Keys" -#~ msgstr "தானியங்கியாக விசைகளை ஒத்திசைக்கவும்." - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "விசை மேலாளர்க்கு காலாவதியாகிறது பத்திக்கான காட்சியை கட்டுப்படுத்துகிறது." - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "விசை மேலாளர்க்கு நம்புங்கள் பத்திக்கான காட்சியை கட்டுப்படுத்துகிறது." - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "விசை மேலாளர்க்கு வகை பத்திக்கான காட்சியை கட்டுப்படுத்துகிறது." - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "விசை மேலாளர்க்கு செல்லுபடி பத்திக்கான காட்சியை கட்டுப்படுத்துகிறது." - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "டிஎன்எஸ்-எஸ்டி பகிர்தலை இயலுமைப்படுத்து." - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "டிஎன்எஸ்-எஸ்டி (ஆப்பிள்-போன்சூர்) விசை பகிர்தலை இயலுமைப்படுத்துகிறது. இத்ற்கு சீஹார்ஸ் " -#~ "கிங்கரன் இயங்க வேண்டும். மேலும் அது ஹெச்கேபி, டிஎன்எஸ்-எஸ்டி ஆதரவுடன் உருவாக்கப்பட்டு " -#~ "இருக்க வேண்டும்." - -#~ msgid "ID of the default key" -#~ msgstr "முன்னிருப்பு விசையின் அடையாளம்." - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "" -#~ "உண்மை என அமைத்தால் சீஹார்ஸ் ஆல் மறையாக்கம் செய்த கோப்புகள் ஆஸ்கி கவச மறையாக்கம் " -#~ "செய்யப்படும்." - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "" -#~ "உண்மை என அமைத்தால் முன்னிருப்பு விசை எப்போதும் மறையாக்க பெறுனர் பட்டியலுக்கு " -#~ "சேர்க்கப்படும்." - -#~ msgid "Last key server search pattern" -#~ msgstr "கடைசி விசை சேவையக தேடல் பாணி" - -#~ msgid "Last key servers used" -#~ msgstr "பயன்படுத்திய கடைசி விசை சேவையகங்கள்" - -#~ msgid "Last key used to sign a message." -#~ msgstr "செய்தியை கையெழுத்திட பயன்படுத்திய கடைசி விசை" - -#~ msgid "PGP Key servers" -#~ msgstr "பிஜிபி விசை சேவையகங்கள்." - -#~ msgid "Publish keys to this key server." -#~ msgstr "இந்த விசை சேவையகத்துக்கு விசைகளை வெளியிடுக." - -#~ msgid "Show expires column in key manager" -#~ msgstr "விசை வளைய மேலாளரில் காலாவதி பத்தியை காட்டுக." - -#~ msgid "Show trust column in key manager" -#~ msgstr "விசை வளைய மேலாளரில் நம்புக பத்தியை காட்டுக." - -#~ msgid "Show type column in key manager" -#~ msgstr "விசை வளைய மேலாளரில் வகை பத்தியை காட்டுக." - -#~ msgid "Show validity column in key manager" -#~ msgstr "விசை வளைய மேலாளரில் செல்லுபடி பத்தியை காட்டுக." - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "பெறுனர் சாளரங்களை அடுக்க பத்தியை குறிப்பிடுக. பத்திகளாவன: 'பெயர்', அடையாளம். " -#~ "தலைகீழ் வரிசையில் அடுக்க பத்தியின் பெயர் முன் '-' ஐ இடவும்." - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "சீஹார்ஸ் விசை மேலாளர் முதன்மை சாளரங்களை அடுக்க பத்தியை குறிப்பிடுக. பத்திகளாவன: " -#~ "'பெயர்', 'அடையாளம்', 'செல்லுபடி', காலாவதி', 'நம்புக', 'வகை'. தலைகீழ் வரிசையில் " -#~ "அடுக்க பத்தியின் பெயர் முன் '-' ஐ இடவும்." - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "செய்திக்கு கையொப்பமிட கடைசியாக பயன்படுத்திய ரகசிய விசையின் அடையாளம்." - -#~ msgid "The column to sort the recipients by" -#~ msgstr "பெறுனர்களை அடுக்க பத்தி" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "சீஹார்ஸ் விசைகளை அடுக்க பத்தி" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "" -#~ "பிஜிபி விசைகளை வெளியிட விசை சேவையகம். அல்லது அவற்றை வெளியிடுவதை தடுக்க வெற்று." - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "கடைசியாக விசையை தேடிய சேவையகம் அல்லது எல்லா விசை சேவையகங்களுக்கு வெற்று." - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "விசை சேவயகத்தில் கடைசியாக தேடலுக்கு பயன்பட்ட தோரணி " - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "" -#~ "சில செயல்பாடுகளுக்கு பிரதானமாக கையொப்பமிட இது முன்னிருப்பு விசிஅயை குறிக்கிறது." - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "விசைகள் விசை சேவையகத்திலிருந்து தானியங்கியாக பெறப்பட வேண்டுமா, இல்லையா." - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "" -#~ "மாற்றப்பட்ட விசைகள் முன்னிருப்பு விசை சேவையகத்திலிருந்து தானியங்கியாக ஒருங்கிசைக்கப் " -#~ "பட வேண்டுமா, இல்லையா." - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "முன்னிருப்பு விசையை எப்போதும் மறையாக்கம் செய்ய வேண்டுமா" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "ஆஸ்கி கவசத்தை பயன்படுத்த வேண்டுமா?" - -#~ msgid "Web Password" -#~ msgstr "வலை கடவுச்சொல்" - -#~ msgid "Network Password" -#~ msgstr "பிணைய கடவுச்சொல்" - -#~ msgid "Couldn't set application access." -#~ msgstr "பயன்பாட்டு அணுகலை அமைக்க முடியவில்லை" - -#~ msgid "Path:" -#~ msgstr "தடம்:" - -#~ msgid "Permissions:" -#~ msgstr "அனுமதிகள்" - -#~ msgid "Applications" -#~ msgstr "பயன்பாடுகள்" - -#~ msgid "_Delete" -#~ msgstr "_D அழி" - -#~ msgid "_Read" -#~ msgstr "படி (_R)" - -#~ msgid "_Write" -#~ msgstr "(_W)எழுது" - -#~ msgid "Saving item..." -#~ msgstr "உருப்படியை சேமித்தல்..." - -#~ msgid "Listing password keyrings" -#~ msgstr "விசை வளையம் கடவுச்சொற்களை பட்டியலிடுதல் " - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "நீங்கள் கேட்ட செயலை செய்ய மறையாக்க விசைகள் இல்லை. கடவுச் சொற்கள் மற்றும் " -#~ "மறையாக்கம் நிரல் இப்போது துவக்கப் பட வேண்டும். இதனால் விசை உருவாக்கப்படும் அல்லது " -#~ "இறக்குமதி ஆகும்." - -#~ msgid "All Keys" -#~ msgstr "எல்லா விசைகளும்" - -#~ msgid "Selected Recipients" -#~ msgstr "தேர்ந்தெடுத்த பெறுனர்கள்" - -#~ msgid "Search Results" -#~ msgstr "தேடல் விடைகள்" - -#~ msgid "Search _for:" -#~ msgstr "_f இதற்குத் தேடு:" - -#~ msgid "None (Don't Sign)" -#~ msgstr "ஏதுமில்லை (கையெழுத்திடாதே)" - -#~ msgid "Sign this message as %s" -#~ msgstr "செய்தியை %s என கையொப்பமிடுக:" - -#~ msgid "_Sign message as:" -#~ msgstr "_S செய்தியை இப்படி கையொப்பமிடுக:" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "கோப்பு செல்லுபடியாகும் .desktop கோப்பு அல்ல" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "அடையாளம் காண இயலா மேல்மேசை கோப்பு பதிப்பு '%s'" - -#~ msgid "Starting %s" -#~ msgstr "%s ஐ துவக்குகிறது" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "பயன்பாடு கட்டளை வரியில் ஆவணங்களை ஒப்புக்கொள்ளாது" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "இனம் காணாத துவக்க தேர்வு: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "'Type=Link' மேல்மேசை உள்ளீடுக்கு ஆவண யூஆர்ஐ ஐ கொடுக்க இயலாது" - -#~ msgid "Not a launchable item" -#~ msgstr "துவக்க முடியாத உருப்படி" - -#~ msgid "Disable connection to session manager" -#~ msgstr "அமர்வு மேலாளருக்கு இணைப்பை செயல் நீக்கு" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "சேமித்த வடிவமைப்பு கூடிய கோப்பை குறிப்பிடுக" - -#~ msgid "FILE" -#~ msgstr "FILE" - -#~ msgid "Specify session management ID" -#~ msgstr "அமர்வு மேலாண்மை அடையாளத்தை குறிப்பிடுக" - -#~ msgid "Session management options:" -#~ msgstr "அமர்வு மேலாண்மை தேர்வுகள்:" - -#~ msgid "Show session management options" -#~ msgstr "அமர்வு மேலாண்மை தேர்வுகளை காட்டு" - -#~ msgid "Key Imported" -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "விசை இறக்குமதி செய்யப்பட்டது" -#~ msgstr[1] "விசைகள் இறக்குமதி செய்யப்பட்டன" - -#~ msgid "Imported %i key" -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "%i விசை இறக்குமதி செய்யப்பட்டது" -#~ msgstr[1] "%i விசைகள் இறக்குமதி செய்யப்பட்டன" - -#~ msgid "Imported a key for" -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "இதற்கு ஒரு விசை இறக்குமதி செய்யப்பட்டது" -#~ msgstr[1] "இதற்கு விசைகள் இறக்குமதி செய்யப்பட்டன" - -#~ msgid "Notification Messages" -#~ msgstr "அறிவிப்பு செய்திகள்" - -#~ msgid "Symmetric Key" -#~ msgstr "சமச்சீர் விசை" - -#~ msgid "Public Key" -#~ msgstr "பொது விசை" - -#~ msgid "Private Key" -#~ msgstr "அந்தரங்க விசை" - -#~ msgid "Credentials" -#~ msgstr "பிணைய சான்று பத்திரங்கள்" - -#~ msgid "Identity" -#~ msgstr "அடையாளம்" - -#~ msgid "Progress Title" -#~ msgstr "முன்னேற்ற தலைப்பு" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "பைல்ரோலர் ஐ இயக்க முடியவில்லை" - -#~ msgid "Couldn't package files" -#~ msgstr "கோப்புகளை பொதியாக்க முடியவில்லை" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "பைல்ரோலர் செயல் வெற்றிகரமாக முடியவில்லை." - -#~ msgid "Loading Keys..." -#~ msgstr "விசைகள் ஏற்றப்படுகிறன" - -#~ msgid "Searching for keys..." -#~ msgstr "விசைகளுக்கு தேடுகிறது..." - -#~ msgid "Uploading keys..." -#~ msgstr "விசைகளை மேலேற்றுகிறது..." - -#~ msgid "Retrieving keys..." -#~ msgstr "விசைகளை மீட்டெடுக்கிறது..." - -#~ msgid "Searching for keys on: %s" -#~ msgstr "விசைகளை இங்கு தேடுகிறது: %s" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "' %s' உள்ள விசைகளை தேடுகிறது..." - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "விசை முகவரி ' %s' ஐ தேடுகிறது..." - -#~ msgid "Retrieving remote keys..." -#~ msgstr "தொலை விசைகளை மீட்டெடுக்கிறது..." - -#~ msgid "Sending keys to key server..." -#~ msgstr "விசை சேவையகத்துக்கு விசைகளை அனுப்புகிறது..." - -#~ msgid "Synchronizing keys" -#~ msgstr "விசைகள் ஒத்திசைக்கப்படுகின்றன" - -#~ msgid "Encryption Key Manager" -#~ msgstr "மறையாக்க விசை மேலாளர்" - -#~ msgid "Invalid" -#~ msgstr "செல்லுபடியாகாது" - -#~ msgid "Private Secure Shell Key" -#~ msgstr "அந்தரங்க பத்திரமான ஷெல் விசை" - -#~ msgid "Public Secure Shell Key" -#~ msgstr "பொது பத்திரமான ஷெல் விசை" - -#~ msgid "Passphrase:" -#~ msgstr "கடவுச்சொல்:" - -#~ msgid "Couldn't share keys" -#~ msgstr "விசைகளை பகிர்ந்து கொள்ள முடியவில்லை" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "கண்டு பிடித்த தகவலை பிணையத்தில் வெளியிட இயலாது." - -#~ msgid "%s's encryption keys" -#~ msgstr "%s இன் மறையாக்க விசைகள்" - -#~ msgid "Key Sharing" -#~ msgstr "விசை பகிர்தல்" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "நீங்கள் சேமித்த விசைகளை பிணையத்தில் மற்றவருடன் பகிந்து கொள்ளுதல். இதனால் உங்களுக்கும் " -#~ "நீங்கள் அறிந்தோருக்கும் தானியங்கியாக உங்கள் விசைகளை அனுப்பாமலேயே மறையாக்கங்களை " -#~ "செய்யலாம்.\n" -#~ "குறிப்பு:.உங்கள் அந்தரங்க விசைகள் பாதிக்கப்படா." - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "பிணையத்தில் மற்றவர்களுடன் என் விசைகளை _பகிர்ந்து கொள்க" +#~ msgid "Login keyring" +#~ msgstr "உள்நுழைவு விசை வளையம்" -#~ msgid "Seahorse Daemon" -#~ msgstr "சீஹார்ஸ் கிங்கரன்" +#~ msgid "Access to the key ring was denied" +#~ msgstr "விசை வளையத்துக்கு அணுக்கம் மறுக்கப்பட்டது" -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "ஒத்திசைக்க X விசைகள் தேர்ந்தெடுக்கப்பட்டன" +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "க்னோம்-விசை வளைய கிங்கரன் இயங்கவில்லை" -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "நீக்கப்பட்டவற்றில் ஒன்று அல்லது அதிகம் தனி விசைகள். நிச்சயம் தொடர வேண்டுமா?" +#~ msgid "The key ring has already been unlocked" +#~ msgstr "விசைவளையம் ஏற்கெனவே திறக்கப்பட்டது" -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" +#~ msgid "No such key ring exists" +#~ msgstr "அப்படிப்பட்ட விசை வளையம் ஏதும் இல்லை" -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "விசை வளைய கிங்கரன் உடன் தொடர்பு கொள்ள முடியவில்லை" -#~ msgid "Create a PGP Key" -#~ msgstr "ஒரு பிஜிபி விசையை உருவாக்குக" +#~ msgid "The item already exists" +#~ msgstr "இந்த உருப்படி ஏற்கெனவே உள்ளது" -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginal\n" -#~ "Full\n" -#~ "Ultimate" -#~ msgstr "" -#~ "தெரியாத\n" -#~ "எப்போதும் இல்லை\n" -#~ "விளிம்பில்\n" -#~ "முழு\n" -#~ "கடைசி" +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "க்னோம் விசைவளையத்தை அணுகுவதில் உள்சார்ந்த பிழை" -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginally\n" -#~ "Fully\n" -#~ "Ultimately" -#~ msgstr "" -#~ "தெரியாத\n" -#~ "எப்போதும் இல்லை\n" -#~ "விளிம்பில்\n" -#~ "முழு\n" -#~ "கடைசி" +#~ msgid "Are you sure you want to delete %d secure shell keys?" +#~ msgstr "%d பத்திரமான ஷெல் விசைகளை ஐ நிச்சயம் அழிக்க வேண்டுமா?" -#~ msgid "_Trusted Keys" -#~ msgstr "_T நம்பிகையான விசைகள்" +#~ msgid "Algorithms here" +#~ msgstr "இங்கு படிமுறைகள்" diff -Nru seahorse-3.2.2/po/te.po seahorse-3.6.3/po/te.po --- seahorse-3.2.2/po/te.po 2011-10-18 09:07:24.000000000 +0200 +++ seahorse-3.6.3/po/te.po 2012-08-21 12:23:19.000000000 +0200 @@ -1,20 +1,21 @@ # translation of seahorse.master.te.po to Telugu # Telugu translation of seahorse. -# Copyright (C) 2007,2011 Swecha Telugu Localisation Team . +# Copyright (C) 2007,2011,2012 Swecha Telugu Localisation Team . # This file is distributed under the same license as the seahorse package. # # Srinivasa Chary , 2007. # Krishna Babu K , 2009. -# Hari Krishna , 2011. # Krishna Babu K , 2011. +# Hari Krishna , 2011, 2012. +# Sasi Bhushan Boddepalli , 2012 msgid "" msgstr "" "Project-Id-Version: seahorse.master.te\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2009-08-28 14:08+0530\n" -"Last-Translator: Hari Krishna \n" +"POT-Creation-Date: 2012-04-16 13:02+0000\n" +"PO-Revision-Date: 2012-04-17 14:13+0530\n" +"Last-Translator: Sasi Bhushan Boddepalli \n" "Language-Team: Telugu \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,23 +31,71 @@ msgstr "దాచబడిన సంకేతపదం లేదా ప్రవేశద్వారం" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "మీట యొక్క పేరు" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "" "కొత్త కీరింగు కొరకు దయచేసి పేరును యెంచుకొనుము. మీరు వొక అన్‌లాక్ సంకేతపదము కొరకు అడుగబడతారు." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "మీట యొక్క పేరు" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "ఆతిథ్య నామం లేదా సేవిక యొక్క చిరునామా." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "కొత్త సంకేతపదం యొక్క కీరింగ్" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "తాత్కాలిక స్థలంలో ఉన్న సంకేతపదాలను ఎక్కడ ఉంచాలి." + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "కొత్త సంకేతపదం" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "సంకేతపదమును లేదా రహస్యమును సురక్షితముగా నిల్వవుంచుము." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "సంకేతపదం" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "నిల్వవుంచిన సంకేతపదము" + +#: ../gkr/seahorse-gkr-actions.c:151 +msgid "Couldn't set default keyring" +msgstr "మీటను తొలగించలేకపోయింది" + +#: ../gkr/seahorse-gkr-actions.c:183 +msgid "Couldn't change keyring password" +msgstr "సంకేతపదంను మార్చలేకపోయింది." + +#: ../gkr/seahorse-gkr-actions.c:209 +msgid "_Set as default" +msgstr "అప్రమేయంగా అమర్చుము (_S)" + +#: ../gkr/seahorse-gkr-actions.c:210 +msgid "Applications usually store new passwords in the default keyring." +msgstr "అనువర్తనములు కొత్త సంకేతపదములను అప్రమేయ కీరింగునందు నిల్వవుంచుతాయి." + +#: ../gkr/seahorse-gkr-actions.c:211 +msgid "Change _Password" +msgstr "సంకేతపదంను మార్చండి (_P)" + +#: ../gkr/seahorse-gkr-actions.c:212 +msgid "Change the unlock password of the password storage keyring" +msgstr "సంకేతపదము నిల్వవుంచే కీరింగు యొక్క అన్‌లాక్ సంకేతపదమును మార్చుము" + +#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:71 msgid "Couldn't add keyring" msgstr "ఉపమీటను చేర్చలేకపోయింది" @@ -55,286 +104,256 @@ msgstr "సంకేతపదమును జతచేయుము" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "వివరణ (_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "కీరింగు (_K):" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "సంకేతపదము (_P):" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "సంకేతపదమును చూపుము (_S)" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "అంశమును తొలగించలేకపోయింది" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "కీరింగు (_K):" + +#: ../gkr/seahorse-gkr-backend.c:99 +msgid "Passwords" +msgstr "సంకేతపదాలు " + +#: ../gkr/seahorse-gkr-backend.c:102 +msgid "Stored personal passwords, credentials and secrets" +msgstr "దాచిన వ్యక్తిగతమైన సంకేతపదము, అధికారపత్రములు మరియు రహస్యములు" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:317 +msgid "IM account password for " +msgstr "దీనికి IM ఖాతా యొక్క రహస్యపదము" + +#: ../gkr/seahorse-gkr-item.c:383 +msgid "Password or secret" +msgstr "సంకేతపదమును లేదా రహస్యమును ." + +#: ../gkr/seahorse-gkr-item.c:384 +msgid "Network password" +msgstr "అల్లిక సంకేతపదం" + +#: ../gkr/seahorse-gkr-item.c:385 +msgid "Stored note" +msgstr "దాచిన నోట్" + +#: ../gkr/seahorse-gkr-item.c:386 +msgid "Keyring password" +msgstr "కీరింగ్ సంకేతపదము" + +#: ../gkr/seahorse-gkr-item.c:387 +msgid "Encryption key password" +msgstr "రహస్యపరచే ముఖ్య రహస్యపదము" + +#: ../gkr/seahorse-gkr-item.c:388 +msgid "Key storage password" +msgstr "నిల్వవుంచిన కీ యొక్క సంకేతపదము" + +#: ../gkr/seahorse-gkr-item.c:389 +msgid "Google Chrome password" +msgstr "గూగుల్ క్రోం యొక్క సంకేతపదం" + +#: ../gkr/seahorse-gkr-item.c:390 +msgid "Gnome Online Accounts password" +msgstr "గ్నోం ఆన్ లైన్ ఖాతాలయొక్క రహస్యపదము" + +#: ../gkr/seahorse-gkr-item.c:391 +msgid "Telepathy password" +msgstr "టెలిపతి యొక్క సంకేతపదం" + +#: ../gkr/seahorse-gkr-item.c:392 +msgid "Instant messaging password" +msgstr "వెంటనే సందేశముయొక్క సంకేతపదం" + +#: ../gkr/seahorse-gkr-item.c:393 +msgid "Network Manager secret" +msgstr "నెట్వర్కు అభికర్త యొక్క రహస్యము" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "'%s' వాడుకరి సంకేతపదంను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:86 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "%d ను శాశ్వతంగా తొలగించాలని మీరు నిశ్చయించుకున్నారా?" msgstr[1] "%d ను శాశ్వతంగా తొలగించాలని మీరు నిశ్చయించుకున్నారా?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "వస్తువును దాచుతోంది" -msgstr[1] "వస్తువును దాచుతోంది" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a network share or resource" msgstr "నెట్వర్కు భాగస్వామ్యము లేదా వనరును యాక్సెస్ చేయుము" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Access a website" msgstr "వెబ్ సైట్ ను సాంగత్యించు" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a PGP key" msgstr "పీజీపీ మీటను తాళం తీస్తుంది" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Unlocks a Secure Shell key" msgstr "సురక్షిత షెల్ మీటను తాళం తీస్తుంది" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:81 msgid "Saved password or login" msgstr "దాచబడిన సంకేతపదం లేదా ప్రవేశద్వారం" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:105 msgid "Network Credentials" msgstr "నెట్వర్క్ పరపతులు" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:110 msgid "Password" msgstr "సంకేతపదం" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:210 msgid "Couldn't change password." msgstr "సంకేతపదంను మార్చలేకపోయింది." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:255 +#: ../gkr/seahorse-gkr-item-properties.c:376 msgid "Updating password" msgstr "సంకేతపదంను తాజాపరుచుట" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:336 msgid "Couldn't set description." msgstr "వర్ణనను ఏర్పాటు చేయలేకపోయింది." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "సంకేతపదం:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "సాంకేతిక వివరములు:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "వివరములు" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "మీట యొక్క లక్షణాలు" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "మీట" +msgid "Use:" +msgstr "ఉపయోగించు:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "మీట యొక్క లక్షణాలు" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "రకము:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "ప్రవేశద్వారం పేరు:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "సేవిక:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "ప్రవేశద్వారం పేరు:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "సంకేతపదంను చూపించు (_w)" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "రకము:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "ఉపయోగించు:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "సంకేతపదం: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "సంకేతపదం: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "సంకేతపదం" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "తాత్కాలిక స్థలంలో ఉన్న సంకేతపదాలను ఎక్కడ ఉంచాలి." - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "నిల్వవుంచిన సంకేతపదము" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "సంకేతపదమును లేదా రహస్యమును సురక్షితముగా నిల్వవుంచుము." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "మీటను సంతకం చేయలేక పోయింది" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "మీటను తొలగించలేకపోయింది" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "మీటను తొలగించలేకపోయింది" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "సంకేతపదంను మార్చలేకపోయింది." - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "లాక్ (_L)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"సంకేతపద నిల్వ కీరింగును లాక్ చేయుము అలా వొక మాస్టర్ సంకేతపదము అవసరమౌతుంది దానిని అన్‌లాక్ చేయుటకు." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "తెరచివేయు(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"సంకేతపదము దాచే కీరింగును మాస్టర్ సంకేతపదముతో అన్‌లాక్ చేయుము అలా అది వుపయోగమునకు అందుబాటులో " -"వుంటుంది." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "అప్రమేయంగా అమర్చుము (_S)" +msgid "Password:" +msgstr "సంకేతపదం:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "అనువర్తనములు కొత్త సంకేతపదములను అప్రమేయ కీరింగునందు నిల్వవుంచుతాయి." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "మీట" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "సంకేతపదంను మార్చండి (_P)" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "సాంకేతిక వివరములు:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "సంకేతపదము నిల్వవుంచే కీరింగు యొక్క అన్‌లాక్ సంకేతపదమును మార్చుము" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "వివరములు" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "కీరింగ్ ను తొలగించలేకపోయింది" +#: ../gkr/seahorse-gkr-keyring.c:147 +msgid "Login keyring" +msgstr "ప్రవేశించుటకు కీరింగ్" + +#: ../gkr/seahorse-gkr-keyring.c:676 +msgid "A keyring that is automatically unlocked on login" +msgstr "ప్రవేసించినపుడు స్వయముగా అన్ లాకఅగు కీరింగు" + +#: ../gkr/seahorse-gkr-keyring.c:677 +msgid "A keyring used to store passwords" +msgstr "సంకేతపదములను దాచుటకు ఉపయోగించు కీరింగ్" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "'%s' వాడుకరి సంకేతపదంను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "కీరింగ్ ను తొలగించుచున్నది" -msgstr[1] "కీరింగ్ లను తొలగించుచున్నది" +#: ../gkr/seahorse-gkr-keyring-deleter.c:83 +msgid "I understand that all items will be permanently deleted." +msgstr "అన్ని ఐటంలు శాశ్వతంగా తొలగించుట అర్ధమైనది." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "మీట యొక్క లక్షణాలు" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "పేరు:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "సృష్టించబడింది:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "గ్నోం కీలకవలయం" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "మీట యొక్క లక్షణాలు" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "పేరు(_N):" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 +#: ../gkr/seahorse-gkr-operation.c:54 ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:585 ../ssh/seahorse-ssh-operation.c:194 msgid "The operation was cancelled" msgstr "కార్యము రద్దుచేయబడినది" -#: ../gkr/seahorse-gkr-operation.c:57 +#: ../gkr/seahorse-gkr-operation.c:59 msgid "Access to the key ring was denied" msgstr "మీట వలయామికి సాంగత్యం తిరస్కరించబడింది" -#: ../gkr/seahorse-gkr-operation.c:60 +#: ../gkr/seahorse-gkr-operation.c:62 msgid "The gnome-keyring daemon is not running" msgstr "గ్నోమ్-కీలకవలయ సూత్రధారి నడవట్లేదు" -#: ../gkr/seahorse-gkr-operation.c:63 +#: ../gkr/seahorse-gkr-operation.c:65 msgid "The key ring has already been unlocked" msgstr "మీట వలయం ఇంతకు ముందే తాళం తీసి ఉంది" -#: ../gkr/seahorse-gkr-operation.c:66 +#: ../gkr/seahorse-gkr-operation.c:68 msgid "No such key ring exists" msgstr "అలాంటి ఏ మీట వలయం లేదు" -#: ../gkr/seahorse-gkr-operation.c:69 +#: ../gkr/seahorse-gkr-operation.c:71 msgid "Couldn't communicate with key ring daemon" msgstr "మీట వలయ సూత్రధారికి తెలియజేయలేకపోయిం" -#: ../gkr/seahorse-gkr-operation.c:72 +#: ../gkr/seahorse-gkr-operation.c:74 msgid "The item already exists" msgstr "ఈ వస్తువు ఇంతకు ముందే ఉంది" -#: ../gkr/seahorse-gkr-operation.c:78 +#: ../gkr/seahorse-gkr-operation.c:80 msgid "Internal error accessing gnome-keyring" msgstr "గ్నోమ్-కీలకవలయాన్ని సాంగత్యించేటప్పుడు అంతర్గత దోషం" @@ -424,7 +443,7 @@ #: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" -msgstr "తక్కువ తేది పరిమితి యొక్క నెల భాగము" +msgstr "తక్కువ తేది పరిమితి యొక్క నెల భాగ1ము" #: ../libegg/egg-datetime.c:383 msgid "Upper limit month" @@ -594,266 +613,314 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "ప్రారంభ తాత్కాలిక అంశము" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "ముఖ్య సేవికను చేర్చు" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "ఆతిథ్యం:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "ముఖ్య సేవిక యొక్క రకము:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "ఆతిథ్యం:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "సేవికను సాంగత్యించేందుకు పోర్టు." -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "ప్రారంభ తాత్కాలిక అంశము" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "సహాయములు:" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "పాస్ పదసముదాయం" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:669 ../src/seahorse-main.c:68 +msgid "Passwords and Keys" +msgstr "సంకేతపదాలు మరియు మీటలు" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "సంకేతపదం:" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "Srinivasa Chary " -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "ధృఢపరచు:" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "సీహార్స్ పథకం నివాస పుట" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "సారమైన మీట సేవిక చిరునామా" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "తొలగించలేకపోయింది" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "సహాయం కోసం మీ వ్యవస్థ నిర్వాహకుడిని లేదా ముఖ్య సేవిక నిర్వాహకుడిని సంప్రదించండి" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "మీటను ఎగుమతి చేయలేకపోయింది" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "యు ఆర్ ఎల్ " +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "సమాచారమును ఎగుమతి చేయలేకపోయింది" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "అలవాటు" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "ఫైలు(_F)" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "ఒకటీ లేదు:మీటలను ప్రచురించకు" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "దిగుమతి... (_E)" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "సేవిక నుంచి మీటలను వెలికితీయలేకపోయింది:%s" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "మీటలోని ప్రజా భాగాన్ని దస్ర్తానికి ఎగుమతి చేయు" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "సవరించిన కీలను కీ సర్వర్లతో స్వయంచాలకంగా ఏకకాలం చేయుము (_m)" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "సరిచేయు (_E)" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "ముఖ్య సేవికలు" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "ఎన్నుకొన్న మీటలను క్లిప్ బోర్డుకు నకలు చేయండి" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "అభీష్టాలు" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "తొలగించు(_D)" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "దీని ద్వారా కీలను కనుగొనుము (_F):" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "ఎన్నుకొన్న మీటలను తొలగించు" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "మీటలను ముఖ్య సేవికకు ప్రచురించు. (_P)" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "ఈ ఐటమ్ యొక్క లక్షణాలను చూపు" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "ఈ మీట యొక్క లక్షణాలను చూపు" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "దత్తాంశమును మరల సంపాదిస్తోంది" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "అభీష్టాలు (_n)" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "దత్తాంశమును ఎగుమతి చేస్తోంది" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "ఈ కార్యక్రమం యొక్క అభీష్టాలను మార్చు" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "దత్తాంశమును దిగుమతి చేస్తోంది" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "దర్శనం (_V)" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "దత్తాంశమును పంపుము" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "సహాయం (_H)" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "అందుబాటులోలేని" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "ఈ కార్యక్రమం గురించి" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "విషయములు (_C)" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "మీట యొక్క దత్తాంశం" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "సీహార్స్ సహాయాన్ని చూపు" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "బహుళ కీలు" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "ఎగుమతి" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "అన్ని ముఖ్యమైన ఫైళ్ళు" +#: ../libseahorse/seahorse-interaction.c:100 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "%s కొరకు PIN లేదా సంకేతపదమును ఇవ్వండి" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "అన్ని ఫైళ్ళు" +#: ../libseahorse/seahorse-passphrase.c:182 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "సంకేతపదం:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:244 +msgid "Confirm:" +msgstr "ధృఢపరచు:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "సంగ్రహమైన ఫైళ్ళు" +#: ../libseahorse/seahorse-prefs.c:66 +msgid "Not a valid Key Server address." +msgstr "సారమైన మీట సేవిక చిరునామా" -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:67 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"ఈ పేరుతో వొక ఫైలు యిప్పటికే వుంది.\n" -"\n" -"మీరు దానిని కొత్త ఫైలుతో పునఃస్థాపించాలని అనుకొనుచున్నారా?" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "సహాయం కోసం మీ వ్యవస్థ నిర్వాహకుడిని లేదా ముఖ్య సేవిక నిర్వాహకుడిని సంప్రదించండి" + +#: ../libseahorse/seahorse-prefs.c:180 +msgid "URL" +msgstr "యు ఆర్ ఎల్ " + +#: ../libseahorse/seahorse-prefs.c:350 +msgid "Custom" +msgstr "అలవాటు" + +#: ../libseahorse/seahorse-prefs.c:403 +msgid "None: Don't publish keys" +msgstr "ఒకటీ లేదు:మీటలను ప్రచురించకు" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "అభీష్టాలు" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "దీని ద్వారా కీలను కనుగొనుము (_F):" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "మీటలను ముఖ్య సేవికకు ప్రచురించు. (_P)" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "సేవిక నుంచి మీటలను వెలికితీయలేకపోయింది:%s" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "సవరించిన కీలను కీ సర్వర్లతో స్వయంచాలకంగా ఏకకాలం చేయుము (_m)" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "ముఖ్య సేవికలు" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "పునఃస్థాపించు (_R)" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1250 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "తెలియనది" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1256 msgctxt "Validity" msgid "Never" msgstr "ఎప్పటికివద్దు" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1263 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "మార్జినల్" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1269 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "పూర్తి" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1275 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "అంతిమ" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Disabled" msgstr "నిరుపయోగంగా చేయబడింది" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1461 msgid "Revoked" msgstr "కొట్టివేయబడింది" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:473 #, c-format msgid "Could not display help: %s" msgstr "%s సహాయాన్ని ప్రదర్శించలేకపోయింది" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "ముగిసే తేది:" +msgid "Never E_xpires" +msgstr "ఎన్నటికి ముగియదు (_x)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "కొత్త ఉపమీటను ఉత్పత్ప్తి చేయు" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "మీట ఎన్నటికి ముగియకపోతే" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "మీటరకం (_T):" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "మీటనిడివి (_L):" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "మీటరకం (_T):" +msgid "Expiration Date:" +msgstr "ముగిసే తేది:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "మీట యొక్క నిడివి" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "ఎన్నటికి ముగియదు (_x)" +msgid "Generate a new subkey" +msgstr "కొత్త ఉపమీటను ఉత్పత్ప్తి చేయు" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "వాడుకరి సంకేతపదంను చేర్చు" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "కొత్త వాడుకరి సంకేతపదంను సృష్టించు" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "పూర్తి పేరు (_N):" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "మీట వ్యాఖ్య (_m):" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "కనీసం 5 అక్షరాలు ఉండాలి" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "ఇచ్ఛాపూర్వక ఇ తపాలా చిరునామా" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "మీటను వివరించేందుకు ఇచ్ఛాపూర్వక వ్యాఖ్య" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "ఇచ్ఛాపూర్వక ఇ తపాలా చిరునామా" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "పూర్తి పేరు (_N):" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr " తపాలా చిరునామా (_E):" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "మీట వ్యాఖ్య (_m):" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "కొత్త వాడుకరి సంకేతపదంను సృష్టించు" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "మార్చు (_h)" +msgid "_Never expires" +msgstr "ఎన్నటికి ముగియదు (_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "కొట్టివేసే మీట" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "ఎన్నటికి ముగియదు (_N)" +msgid "C_hange" +msgstr "మార్చు (_h)" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -864,7 +931,7 @@ msgid "Add subkey to %s" msgstr "%s కు ఉపమీటను చేర్చండి" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "డీ ఎస్ ఏ (సంతకం మాత్రమే)" @@ -872,7 +939,7 @@ msgid "ElGamal (encrypt only)" msgstr "ఎల్ గమల్ (రహస్యపరచడం మాత్రమే)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "ఆర్ ఎస్ ఏ ( సంతకం మాత్రమే)" @@ -910,46 +977,131 @@ msgid "Expiry: %s" msgstr "%s కొరకు ముగియు" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "బహుళ కీలు" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "మీట యొక్క దత్తాంశం" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "రక్షింపబడ్డ PGP మీటలు" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "పీజీపీ మీటలు" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "పీజీపీ మీట" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "ఇ తపాలా మరియు ఫైళ్ళను రహస్యపరచటానికి వాడబడుతుంది" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "డీ ఎస్ ఏ ఎల్గమల్" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "పీజీపీ మీటను ఉత్పత్తి చేయలేక పోయింది" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "కొత్త మీట కోసం పాస్ పదసముదాయం" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "మీ కొత్త మీట కోసం పాస్ పదసముదాయాన్ని వ్రాయండి." -#: ../pgp/seahorse-gpgme-generate.c:219 +#: ../pgp/seahorse-gpgme-generate.c:223 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "మీటను ఉత్పత్తి చేస్తోంది" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "%s ను శాశ్వతంగా తొలగించాలని మీరు నిశ్చయించుకున్నారా?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +msgstr[1] "%d మీటలను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "తప్పు సంకేతపదము" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "ఇది మూడవసారి మీరు తప్పు సంకేతపదంను ప్రవేశించడం.దయచేసి మరల ప్రయత్నించండి" +#: ../pgp/seahorse-gpgme-keyring.c:90 +#, c-format +msgid "Wrong passphrase." +msgstr "తప్పు పాస్ పదసముదాయం." + +#: ../pgp/seahorse-gpgme-keyring.c:94 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' కోసం కొత్త పాస్ పదసముదాయాన్ని ఇవ్వండి" + +#: ../pgp/seahorse-gpgme-keyring.c:96 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' కోసం పాస్ పదసముదాయాన్ని ఇవ్వండి" + +#: ../pgp/seahorse-gpgme-keyring.c:99 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "కొత్త పాస్ పదసముదాయాన్ని ఇవ్వండి" + +#: ../pgp/seahorse-gpgme-keyring.c:101 +msgid "Enter passphrase" +msgstr "పాస్ పదసముదాయాన్ని ఇవ్వండి" + +#: ../pgp/seahorse-gpgme-keyring.c:106 +msgid "Passphrase" +msgstr "పాస్ పదసముదాయం" + +#: ../pgp/seahorse-gpgme-keyring.c:307 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d కీ లోడైంది" +msgstr[1] "%d కీలు లోడైనాయి" + +#: ../pgp/seahorse-gpgme-keyring.c:654 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"నిస్సారమైన దత్తాంశం కీ(తప్పిపోయిన UIDలు).ఇది బహుశా కంప్యూటర్ కి భవిస్యత్తు తేదీ పెట్టినందుకు లేదా " +"తప్పిపోయిన స్వంతమైన సంతకం జరిగిఉండును " + +#: ../pgp/seahorse-gpgme-keyring.c:814 +msgid "GnuPG keys" +msgstr "GnuPG మీట" + +#: ../pgp/seahorse-gpgme-keyring.c:817 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: అప్రమేయ కీరింగు సంచయం" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -973,8 +1125,8 @@ "This is not a image file, or an unrecognized kind of image file. Try to use " "a JPEG image." msgstr "" -"ఇది ప్రతిరూప ఫైలు కాదు లేదా ఒక గుర్తించలేని రకమైన ప్రతిరూప ఫైలు .ఒక JPEG ప్రతిరూపాన్ని " -"వాడటానికి ప్రయత్నించండి" +"ఇది ప్రతిరూప ఫైలు కాదు లేదా ఒక గుర్తించలేని రకమైన ప్రతిరూప ఫైలు .ఒక JPEG ప్రతిరూపాన్ని వాడటానికి " +"ప్రయత్నించండి" #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" @@ -984,27 +1136,31 @@ msgid "All JPEG files" msgstr "అన్ని JPEG ఫైళ్ళు" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:301 +msgid "All files" +msgstr "అన్ని ఫైళ్ళు" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "మీటలోకి చేర్చటానికి ఛాయా చిత్రమును ఎన్నుకోండి" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "ఛాయా చిత్రమును సృష్టించలేకపోయింది" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "ఛాయా చిత్రమును చేర్చలేకపోయింది" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "ఫైలు లోడు కాలేక పోయింది. ఇది చెల్లని ఫార్మాటులో వుండివుండవచ్చు" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "మీ మీటలోంచి ప్రస్తుత ఛాయా చిత్రమును తొలగించాలని మీరు ఖచ్చింతంగా ఉన్నారా ?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "ఛాయా చిత్రమును తొలగించలేకపోయింది" @@ -1062,12 +1218,17 @@ msgid "Couldn't add revoker" msgstr "కొట్టివేసేవారిని చేర్చలేకపోయింది" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "నాకు తెలుసు రహస్యకీ శాశ్వతంగా తొలగింపబడుతుంది." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" "\"%s\"" -msgstr "ఈ మీట ను ముందుగానే సంతకం చేసినవారు \n" +msgstr "" +"ఈ మీట ను ముందుగానే సంతకం చేసినవారు \n" "\"%s\"" #: ../pgp/seahorse-gpgme-sign.c:105 @@ -1076,563 +1237,624 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "సంతకము చేయడానికి ఏ యొక్క మీటలు పనికిరావు" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "ఈ మీట యొక్క నమ్మకాన్ని తెలిపే మీకు స్వకీయమైన పీజీపీ మీటలు లేవు " -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "తప్పు పాస్ పదసముదాయం." - -#: ../pgp/seahorse-gpgme-source.c:90 -#, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s' కోసం కొత్త పాస్ పదసముదాయాన్ని ఇవ్వండి" - -#: ../pgp/seahorse-gpgme-source.c:92 -#, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s' కోసం పాస్ పదసముదాయాన్ని ఇవ్వండి" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "కొత్త పాస్ పదసముదాయాన్ని ఇవ్వండి" - -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "పాస్ పదసముదాయాన్ని ఇవ్వండి" - -#: ../pgp/seahorse-gpgme-source.c:328 -#, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d కీ లోడైంది" -msgstr[1] "%d కీలు లోడైనాయి" - -#: ../pgp/seahorse-gpgme-source.c:649 -msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "నిస్సార" - #: ../pgp/seahorse-gpgme-subkey.c:199 msgid "ElGamal" msgstr "ఎల్గమాల్" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "హెచ్ టిటిపి ముఖ్య సేవిక" - -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-hkp-source.c:603 #, c-format msgid "Search was not specific enough. Server '%s' found too many keys." msgstr "వెతికిన పధ్ధతి అవసరమైనంత వివరంగా లేదు.సేవిక '%s' మరీ ఎక్కువ మీటలను కనుగొంది." -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-hkp-source.c:606 #, c-format msgid "Couldn't communicate with server '%s': %s" msgstr "సేవిక '%s' తో సంప్రదించలేక పోయింది: %s" -#: ../pgp/seahorse-ldap-source.c:440 -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "'%s' తో సంప్రదించలేక పోయింది: %s" +#: ../pgp/seahorse-hkp-source.c:1126 +msgid "HTTP Key Server" +msgstr "హెచ్ టిటిపి ముఖ్య సేవిక" -#: ../pgp/seahorse-ldap-source.c:651 -#, c-format -msgid "Connecting to: %s" -msgstr "%s కు బంధిస్తోంది" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "మీటలను దిగుమతి చేయలేకపోయింది" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "ముఖ్య సేవికల నుంచి మీటలను దిగుమతి చేస్తోంది" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:518 +msgid "_Remote" +msgstr "సుదూర (_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "ఈ గవాక్షాన్ని మూసివేయు" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "సుదూర మీటలను వెతుకు... (_F)" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "ముఖ్య సేవికలో మీటల కోసం వెతుకు" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "దిగుమతి (_I)" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "ఎన్నుకొన్న మీటలను స్థానిక మీట వలయంలోకి దిగుమతి చేయు" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "సుదూర మీటలు" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Couldn't resolve address: %s" -msgstr "చిరునామాను రిజాల్వు చేయలేకపోయింది: %s" +msgid "Remote Keys Containing '%s'" +msgstr "%s కలిగియున్న సుదూర మీటలు" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "మీటలకోసం వెతుకుటలో విఫలం" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "సుదూర మీటలను కనుగొనండి" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "" +"ఇది ఇతరుల కోసం ఇంటర్నెట్లో మీటల కోసం వెతుకుతుంది.ఈ మీటలు తర్వాత స్థానిక మీట వలయంలోకి దిగుమతి " +"చేయబడతాయి." + +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "దీనిని కలగివున్న కీల కొరకు శోధించుము (_S): " + +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "ముఖ్య సేవికలు:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "నా దగ్గరులోనున్న పంచుకొన్న మీటలు : " + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "ఎక్కడ వెతకాలి:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "వెతుకు (_S)" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "సేవికకు మీటలను ప్రచురించలేకపోయింది : %s" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Resolving server address: %s" -msgstr "సేవిక చిరునామాను రిజాల్వుచేస్తోంది: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "సేవిక నుంచి మీటలను వెలికితీయలేకపోయింది:%s" -#: ../pgp/seahorse-ldap-source.c:781 -msgid "LDAP Key Server" -msgstr "ఎల్ డీ ఏ పీ ముఖ్య సేవిక" +#: ../pgp/seahorse-keyserver-sync.c:160 +#, c-format +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d మీట కాలనియమితం చేసేందుకు ఎన్నుకొనబడండి" +msgstr[1] "%d మీటలు కాలనియమితం చేసేందుకు ఎన్నుకొనబడ్డాయి" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "మీటలను కాలనియమితం చేస్తోంది..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "కాలనియమిత మీటలు" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"ఇది కీలను మీ కీరింగు నందు ప్రచురిస్తుంది అలా అవి యితరులకు అందుబాటులో వుంటాయి. మీరు యితరుల కీలను " +"స్వీకరించిన దగ్గరనుండి వారు చేసిన మార్పులను కూడా పొందుతారు." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"మీరు యితరుల కీలను స్వీకరించిన దగ్గరనుండి యిది యితరులు చేసిన మార్పులను వెలికితీస్తుంది. ప్రచురణ కొరకు " +"ఏ కీ సేవిక ఎంచుకొనబడలేదు, అందువలన మీ కీలు యితరులను అందుబాటలో వుండవు." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "ముఖ్య సేవికలు (_K)" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "సంతకం చేయు... (_S)" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "ప్రజా మీటను సంతకం చేయు" +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "కాలనియమితం (_S)" -#: ../pgp/seahorse-pgp-commands.c:174 +#: ../pgp/seahorse-ldap-source.c:440 #, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "%s ను శాశ్వతంగా తొలగించాలని మీరు నిశ్చయించుకున్నారా?" +msgid "Couldn't communicate with '%s': %s" +msgstr "'%s' తో సంప్రదించలేక పోయింది: %s" -#: ../pgp/seahorse-pgp-commands.c:179 +#: ../pgp/seahorse-ldap-source.c:651 #, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +msgid "Connecting to: %s" +msgstr "%s కు బంధిస్తోంది" -#: ../pgp/seahorse-pgp-commands.c:181 +#: ../pgp/seahorse-ldap-source.c:657 #, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +msgid "Couldn't resolve address: %s" +msgstr "చిరునామాను రిజాల్వు చేయలేకపోయింది: %s" -#: ../pgp/seahorse-pgp-commands.c:183 +#: ../pgp/seahorse-ldap-source.c:701 #, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +msgid "Resolving server address: %s" +msgstr "సేవిక చిరునామాను రిజాల్వుచేస్తోంది: %s" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "వాడుకరి సంకేతపదంను తొలగించలేకపోయింది" +#: ../pgp/seahorse-ldap-source.c:1446 +msgid "LDAP Key Server" +msgstr "ఎల్ డీ ఏ పీ ముఖ్య సేవిక" + +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "కాలనియమితం చేసి మీటలను ప్రచురించు... (_S)" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "మీటను తొలగించ లేక పోయింది" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "పబ్లిక్ కీను తొలగించలేకపోయింది" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "ఆన్‌లైను వాటితో మీ కీలను ప్రచురించుము మరియు/లేదా సింక్రొనైజ్ చేయుము." -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "ఉన్నత స్థితి మీట ఇచ్ఛాపూర్వకాలు (_A)" +#: ../pgp/seahorse-pgp-backend.c:174 +msgid "PGP Keys" +msgstr "పీజీపీ మీటలు" + +#: ../pgp/seahorse-pgp-backend.c:177 +msgid "PGP keys are for encrypting email or files" +msgstr "ఇ మెయిల్ మరియు ఫైళ్ళను రహస్యపరచటానికి ఉపయోగించు PGPమీటలు" + +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "సృష్టించు (_r)" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "ఒక పీజీపీ మీట మిమ్మల్ని ఇ-తపాలా లేదా ఫైళ్ళను రహస్యపరచి ఇతరులకు ఇవ్వడానికి అనుమతినిస్తుంది" +msgid "Generate a new key" +msgstr "కొత్త మీటను ఉత్పత్తి చేయు" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "అల్గారిదములు ఇక్కడ" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "ఒక పీజీపీ మీట మిమ్మల్ని ఇ-తపాలా లేదా ఫైళ్ళను రహస్యపరచి ఇతరులకు ఇవ్వడానికి అనుమతినిస్తుంది" -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "సృష్టించు (_r)" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "వ్యాఖ్యానం (_C):" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "ముగిసే తేది (_x):" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "ఎప్పటికీ ముగియదు (_v)" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "రహస్యపరచే రకము (_T):" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "కొత్త మీటను ఉత్పత్తి చేయు" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "మీట యొక్క శక్తి (బిట్స్) (_S)" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "ఎప్పటికీ ముగియదు (_v)" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "కొత్త పీజీపీ మీట" +msgid "E_xpiration Date:" +msgstr "ముగిసే తేది (_x):" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "వ్యాఖ్యానం (_C):" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "ఉన్నత స్థితి మీట ఇచ్ఛాపూర్వకాలు (_A)" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "ముగిసినది" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "స్వకీయమైన మీటలు " + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "పీజీపీ మీట" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "ప్రాథమిక వాడుకరి సంకేతపదంను మార్చలేకపోయింది" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "'%s' వాడుకరి సంకేతపదంను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "వాడుకరి సంకేతపదంను తొలగించలేకపోయింది" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1567 msgid "[Unknown]" msgstr "[గుర్తుతెలియని]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:536 +#: ../pgp/seahorse-pgp-key-properties.c:1850 msgid "Name/Email" msgstr "పేరు/ఇ తపాలా" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:541 msgid "Signature ID" msgstr "సంతక గుచి" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:674 msgid "Couldn't change primary photo" msgstr "ప్రాథమిక చిత్రాన్ని మార్చలేకపోయింది" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:908 msgid "(unknown)" msgstr "(తెలియని)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:911 #, c-format msgid "This key expired on: %s" msgstr "ఈ మీట %s న ముగిసినది." -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:974 msgid "Name" msgstr "పేరు" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1087 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "%d ఉపమీటను (%s లొని) మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1096 msgid "Couldn't delete subkey" msgstr "ఉపమీటను తొలగించలేకపోయింది" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1136 +#: ../pgp/seahorse-pgp-key-properties.c:1541 msgid "Unable to change trust" msgstr "నమ్మకాన్ని మార్చలేకపోయింది" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "\"%s\" కు మీటను ఎగుమతి చేయలేకపోయింది" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "పూర్తి మీటను ఎగుమతిచేయు" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." +#: ../pgp/seahorse-pgp-key-properties.c:1149 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" msgstr "మీటను ఎగుమతి చేయలేకపోయింది" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1381 +#: ../pgp/seahorse-pgp-key-properties.c:1470 msgctxt "Expires" msgid "Never" msgstr "ఎప్పటికివద్దు" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1428 msgid "ID" msgstr "గుచి" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1431 msgid "Type" msgstr "రకం" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1434 msgid "Created" msgstr "సృష్టించినది" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1437 msgid "Expires" msgstr "ముగుస్తుంది" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1440 msgid "Status" msgstr "సుస్థితి" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1443 msgid "Strength" msgstr "శక్తి" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1463 +msgid "Expired" +msgstr "ముగిసినది" + +#: ../pgp/seahorse-pgp-key-properties.c:1467 msgid "Good" msgstr "మంచి" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1853 msgid "Key ID" msgstr "మీట గుచి" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "కార్యములు" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "వ్యాఖ్యానం:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "తేదీలు" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "ఎలక్ర్టానిక్ తపా:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "వేలిముద్ర" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "మీట గుచి" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "ఎప్పటికివద్దు" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "మీట పేర్లు మరియు సంతకములు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "ఈ మీట కొట్టివేయబడింది" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "ఛాయా చిత్రం" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "మీట యొక్క యజమాని ఈ మీటను కొట్టివేశారు. దీనిని ఇకమీద వాడకూడదు." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "సాంకేతిక వివరములు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "ఈ మీట ముగిసినది" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "ఈ మీట కొట్టివేయబడింది" +msgid "Add a photo to this key" +msgstr "ఈ మీటకు ఒక ఛాయా చిత్రమును చేర్చండి" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "ఈ మీట ముగిసినది" +msgid "Remove this photo from this key" +msgstr "ఈ మీట నుంచి ఈ ఛాయా చిత్రాన్ని తీసి వేయండి" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "రకము:" +msgid "Make this photo the primary photo" +msgstr "ఈ ఛాయా చిత్రాన్ని ప్రాథమిక ఛాయా చిత్రాన్ని చేయండి" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "ఉపయోగం:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "పూర్వపు ఛాయా చిత్రానికి వెళ్లు" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "ఉపమీటలు (_S)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "తరువాతి ఛాయా చిత్రానికి వెళ్లు" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "చేర్చు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "ఛాయా చిత్రం" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "ఈ మీటకు ఒక ఛాయా చిత్రమును చేర్చండి" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "మీట గుచి" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "పాస్ పదసముదాయమును మార్చండి (_P)" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "పేరు:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "ఫైలులను డీక్రిప్టు చేయుము మరియు ఈమెయిల్ మీకు పంపబడింది." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "ఎలక్ర్టానిక్ తపా:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "తొలగించు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "వ్యాఖ్యానం:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "ముగియు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "ఉపయోగం:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "ముగుస్తుంది:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "రకము:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "ఎగుమతి" +msgid "Decrypt files and email sent to you." +msgstr "ఫైలులను డీక్రిప్టు చేయుము మరియు ఈమెయిల్ మీకు పంపబడింది." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "స్వంత పీజీపీ మీట" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "తరువాతి ఛాయా చిత్రానికి వెళ్లు" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "పాస్ పదసముదాయమును మార్చండి (_P)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "పూర్వపు ఛాయా చిత్రానికి వెళ్లు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "యజమాని" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "మీట గుచి:" +msgid "Key Names and Signatures" +msgstr "మీట పేర్లు మరియు సంతకములు" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "ప్రాథమిక" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "ఈ ఛాయా చిత్రాన్ని ప్రాథమిక ఛాయా చిత్రాన్ని చేయండి" +msgid "Sign" +msgstr "సంతకం" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "పేర్లు మరియు సంతకములు" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "తొలగించు" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "ఎప్పటికివద్దు" +msgid "_Add Name" +msgstr "పేరును చేర్చు (_A)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "యజమాని నమ్మకాన్ని వోవర్‌రైడ్ చేయుము (_T):" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "యజమాని" +msgid "Revoke" +msgstr "కొట్టివేయు" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "ప్రాథమిక" +msgid "Names and Signatures" +msgstr "పేర్లు మరియు సంతకములు" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "స్వంత పీజీపీ మీట" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "మీట గుచి:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "ఈ మీట నుంచి ఈ ఛాయా చిత్రాన్ని తీసి వేయండి" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "కొట్టివేయు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "శక్తి:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "సంతకం" +msgid "Technical Details" +msgstr "సాంకేతిక వివరములు" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "శక్తి:" +msgid "Fingerprint" +msgstr "వేలిముద్ర" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "మీట యొక్క యజమాని ఈ మీటను కొట్టివేశారు. దీనిని ఇకమీద వాడకూడదు." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "ముగుస్తుంది:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "పేరును చేర్చు (_A)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "తేదీలు" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "యజమాని నమ్మకాన్ని వోవర్‌రైడ్ చేయుము (_T):" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "పూర్తి మీటను ఎగుమతి చేయండి (_E):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "పేరు:" +msgid "Actions" +msgstr "కార్యములు" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "తేదీలు:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "చేర్చు" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "ముగియు" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "ఉపమీటలు (_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "మార్జినల్లీ" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "వేలి ముద్రలు" +msgid "Fully" +msgstr "పూర్తిగా" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "నమ్మకాన్ని తెలుపు:" +msgid "Ultimately" +msgstr "అంతిమంగా" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "ఈ మీట యొక్క మీ నమ్మకం" +msgid "Encrypt files and email to the key's owner" +msgstr "ఫైళ్ళను రహస్యపరచి మీట యజమానికి ఈ మెయిల్ చేయు" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "ప్రజా పీజీపీ మీట" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "ఇతర పేర్లు (_O):" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "ఈ మీటను సంతకము చేసిన ప్రజలు (_P)" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "ఫైళ్ళను రహస్యపరచి మీట యజమానికి ఎలక్ర్టానిక్ తపా చేయు" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "ఈ మీట యొక్క మీ నమ్మకం" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "పూర్తిగా" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "మీ నమ్మకం వివరముల టాబ్ లో వివరించబడింది" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "'%s' నుంచి సంతకాలను వేరే మీటల మీద నమ్ముతున్నాను" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "మీ మీట యొక్క నమ్మకాన్ని ఇతరులకు తెలిపేందుకు ,ఈ మీటను సంతకం చేయు:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "ఈ మీటను సంతకం చేయు (_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "ఒక వేళ మీరు ఈ వ్యక్తి యొక్క గుర్తింపును నమ్మకపోతే , మీ సంతకాన్నికొట్టివేయండి" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "మార్జినల్లీ" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "ప్రజా పీజీపీ మీట" +msgid "_Revoke Signature" +msgstr "సంతకాన్ని కొట్టివేయు (_R)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "ఈ మీటను సంతకము చేసిన ప్రజలు (_P)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "కేవలం నేను నమ్మే ప్రజల సంతకాలను ప్రదర్శించు (_O)" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "నమ్మకం" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "అంతిమంగా" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "మీరునమ్మే యజమాని (_T):" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "మీ నమ్మకం వివరముల టాబ్ లో వివరించబడింది" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "వేలి ముద్రలు" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "కేవలం నేను నమ్మే ప్రజల సంతకాలను ప్రదర్శించు (_O)" +msgid "Dates:" +msgstr "తేదీలు:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "సంతకాన్ని కొట్టివేయు (_R)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "నమ్మకాన్ని తెలుపు:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "ఈ మీటను సంతకం చేయు (_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "మీరునమ్మే యజమాని (_T):" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1640,52 +1862,59 @@ msgstr "%d ఉపమీటను (%s లో ) కొట్టివేయలేకపోయింది" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "ఇష్టానుసారమైన కొట్టివేయుట యొక్క వివరణ" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "కొట్టివేయు (_v)" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "మీటను కొట్టివేయటానికి కారణం" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "కారణం (_R):" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "ఇష్టానుసారమైన కొట్టివేయుట యొక్క వివరణ" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "కొట్టివేయు (_v)" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "పత్రాన్నైనా లేదా సందేశాన్ని సంతకం చేయటానికి మీకు స్వకీయమైన పీజీపీ మీటలు లేవు." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "సందేశాన్ని సంతకం చేయటానికి మీట (_S):" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "ఈ మీటను మీరు ఎంత జాగ్రత్తగా తనిఖీ చేసారు?" +msgid "Sign Key" +msgstr "ఈ మీటను సంతకం చేయు" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "ఇతరులు ఈ సంతకాన్ని ఏ విధంగా చూస్తారు:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "ఈ సంతకం చేసి మీరు ఈ మీట : కి సంబంధించినదని నమ్మకాన్ని తెలుపుతున్నారు" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr ":సంతకంచేయు మీట లాగ:" +msgid "Key Name" +msgstr "మీట పేరు" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"సాదారణంగా: అంటే మీరు సాదారణంగా వొక నిరూపణ జరిపారు ఆ కీ దానిని కలిగివుండాలని క్లేయిము చేసిన వారి " -"వద్దే వుందేమోనని. ఉదాహరణకు, మీరు ఫోను నందు యజమానికి కీ వేలిముద్రను చదువగలరు." +msgid "How carefully have you checked this key?" +msgstr "ఈ మీటను మీరు ఎంత జాగ్రత్తగా తనిఖీ చేసారు?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "మీట పేరు" +msgid "_Not at all" +msgstr "అస్సలు కాదు (_N)" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "అకస్మాత్తుగా (_C)" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "చాలా జాగ్రత్తగా (_V)" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1693,24 +1922,21 @@ "కానేకాదు: అంటే కీ దానిని కావలని క్లెయిము చేసిన వారివద్దనే వున్నదని మీరు నమ్ముతున్నారు, అయితే మీరు " "యిది నిజమనునది నిర్దారించలేక పోయినారు లేదా నిర్ధారించలేదు." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"సాదారణంగా: అంటే మీరు సాదారణంగా వొక నిరూపణ జరిపారు ఆ కీ దానిని కలిగివుండాలని క్లేయిము చేసిన వారి " +"వద్దే వుందేమోనని. ఉదాహరణకు, మీరు ఫోను నందు యజమానికి కీ వేలిముద్రను చదువగలరు." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." msgstr "చాలా జాగ్రత్తగా:మీరు ఈ మీట ఖచ్చితంగా అసలైనదని నమ్మతేనే దీనిని ఎన్నుకోండి" -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "ఈ సంతకం చేసి మీరు ఈ మీట : కి సంబంధించినదని నమ్మకాన్ని తెలుపుతున్నారు" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "నేను ఈ సంతకాన్ని కొంత సమయం తరువాత కొట్టివేయవచ్చు (_r)." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "ఈ మీటను సంతకం చేయు" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1721,474 +1947,359 @@ "పెట్టవచ్చు. ఈమెయిల్ చిరునామా యజమానికి చెందినదేమో పరిశీలించుటకు మీరు ఈమెయిల్‌ను వుపయోగించవచ్చు." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "అకస్మాత్తుగా (_C)" +msgid "How others will see this signature:" +msgstr "ఇతరులు ఈ సంతకాన్ని ఏ విధంగా చూస్తారు:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "అస్సలు కాదు (_N)" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "ఇతరులు ఈ సంతకమును చూడక పోవచ్చు (_O)" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "నేను ఈ సంతకాన్ని కొంత సమయం తరువాత కొట్టివేయవచ్చు (_r)." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "సంతకం (_S)" +msgid "Sign key as:" +msgstr ":సంతకంచేయు మీట లాగ:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "సంతకము చేసేవారు (_S):" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "చాలా జాగ్రత్తగా (_V)" +msgid "_Sign" +msgstr "సంతకం (_S)" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "సందేశాన్ని సంతకం చేయటానికి మీట (_S):" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "దత్తాంశమును ఎగుమతి చేస్తోంది" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "దత్తాంశమును మరల సంపాదిస్తోంది" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "దత్తాంశమును దిగుమతి చేస్తోంది" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "దత్తాంశమును పంపుము" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "అందుబాటులోలేని" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "స్వగత అధికారపత్రములు మరియు మీట" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "స్వగత అధికారపత్రములు" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "యోగ్యతాపత్రిక" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "తొలగించలేకపోయింది" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "అధికారపత్రములు (DER తో నిక్షిప్తమైనవి)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "అధికారపత్రములు" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 అధికారపత్రములు మరియు సంబందిత మీటలు" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +#| msgid "Are you sure you want to permanently delete %d certificate?" +#| msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "%d మీటయొక్క అధికారపత్రమును మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +msgstr[1] "%d మీటయొక్క అధికారపత్రములను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "మీటను సృష్తించలేక పోయింది" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "సృష్టించు " + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "స్వంత పీజీపీ మీట" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "%s ను శాశ్వతంగా తొలగించాలని మీరు నిశ్చయించుకున్నారా?" +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "అధికారపత్రములను అభ్యర్దించుటకు ఉపయోగించబడు " + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "ఒక కొత్త ప్రైవేటు మీటను సృష్టించండి" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "చీటీ:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "నిల్వవుంచిన స్థలము:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "ఈ మీట శాశ్వతముగా తొలగించబడునని నాకు అర్ధమైనది." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "నామములేని" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "అధికారపత్రములు దిగుమతి చేయుతలో విఫలం" -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" -msgstr[1] "%d మీటలను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "తొలగించలేకపోయింది" -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "తొలగిస్తుంది" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "ఎగుమతి(_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "అధికారపత్రానికి ఎగుమతి చేయు" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "ఈ అధికారపత్రము లేదా మీటను తొలగించుము" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "అధికారపత్రమును అర్ధించుము(_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "ఈ కీ కొరకు అభ్యర్దించు అధికారపత్రము ఫైలు సృష్టించుము." + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "అధికారపత్రము అభ్యర్ధన దాచుట కుదురుటలేదు." + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "అధికారపత్రము అభ్యర్ధన దాచుము" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "అధికారపత్రము అభ్యర్ధన " + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM ఎంకోడ్ అభ్యర్ధన" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "అధికారపత్రము సృష్టించలేకపోయింది" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "అధికారపత్రము అభ్యర్ధన ఫైలును సృష్టించుము." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "అధికారపత్రము అభ్యర్ధన లో ఉంచిన సాధారమైన నామము" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "పేరు(CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "నామములేని ప్రైవేటు మీట" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "పాస్ పదసముదాయాన్నిమార్చు" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "పాస్ పదసముదాయాన్ని ధృవీకరించు (_f)" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "కొత్త పాస్ పదసముదాయాన్ని ధృవీకరించు" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "కొత్త పాస్ పదసముదాయం (_P):" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "మీ సంకేతపదాలను మరియు రహస్యపరచే మీటలను నిర్వహించండి" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "సంకేతపదాలు మరియు మీటలు" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "మీరు ఏ రకమైన మీటను సృష్టించాలనుకుంటున్నారో ఆ రకమైన మీటను ఎన్నుకోండి (_S):" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "కొనసాగించు (_o)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "కొత్త మీటను సృష్టించు..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "ఎన్నుకొన్న %d మీట" -msgstr[1] "ఎన్నుకొన్న %d మీటలు" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "మీటలను దిగుమతి చేయలేకపోయింది" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "దిగుమతి చేయబడ్డ మీట" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "మీటలను దిగుమతి చేస్తోంది" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "కీను దిగుమతి చేయి" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "తెలియని మీట రకం, లేదా నిస్సారమైన దత్తాంశ రూపలావణ్యం" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "మీటలను దిగుమతి చేస్తోంది" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "సుదూర (_R)" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "ఈ కార్యక్రమాన్ని మూసివేయు" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "కొత్త(_N)..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "కొత్త మీటను సృష్టించండి" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "దిగుమతి... (_I)" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "మీటలను ఫైలు నుంచి దిగుమతిచేయు" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "క్లిప్ బోర్డు నుంచి మీటలను దిగుమతి చేయు" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "సుదూర మీటలను వెతుకు... (_F)" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "ముఖ్య సేవికలో మీటల కోసం వెతుకు" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "కాలనియమితం చేసి మీటలను ప్రచురించు... (_S)" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "ఆన్‌లైను వాటితో మీ కీలను ప్రచురించుము మరియు/లేదా సింక్రొనైజ్ చేయుము." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "రకాలు (_y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "రకం నిలువును చూపు" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "ముగియు (_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "ముగియు నిలువును చూపు" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "నమ్మకం (_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "యజమాని నమ్మకం నిలువును చూపు" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "దార్ఢ్యము (_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "దార్ఢ్యము నిలువును చూపు" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "వడపోత:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "మొదటి సారి ఇచ్ఛాపూర్వకాలు" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "నీ స్వంత కొత్త మీటను ఉత్పత్తి చేయు:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "ఫైలు నుండి ఉన్న మీటలను దిగుమతి చేయు:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "నా స్వకీయమైన మీటలు (_P)" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "ఇతర కీలు (_K)" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "రహస్యపరచడంతో మొదలుపెట్టడానికి మీకు మీటలు కావాలి." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "దిగుమతి (_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "సంకేతపదాలు (_P)" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "మీటను ఎగుమతి చేయలేకపోయింది" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "దార్ఢ్యము" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "ముగిసే తేది" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "ఈ గవాక్షాన్ని మూసివేయు" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "అన్నింటినీ విస్తరించు (_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "అన్ని జాబితాలను విస్తరించు" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "అన్నింటినీ కూల్చివేయు (_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "అన్ని జాబితాలను కూల్చివేయు" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "సుదూర మీటలు" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "%s కలిగియున్న సుదూర మీటలు" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "ముఖ్య సేవికలు:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "నా దగ్గరులోనున్న పంచుకొన్న మీటలు : " - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "సుదూర మీటలను కనుగొనండి" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"ఇది ఇతరుల కోసం ఇంటర్నెట్లో మీటల కోసం వెతుకుతుంది.ఈ మీటలు తర్వాత స్థానిక మీట వలయంలోకి దిగుమతి " -"చేయబడతాయి." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "ఎక్కడ వెతకాలి:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "వెతుకు (_S)" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "దీనిని కలగివున్న కీల కొరకు శోధించుము (_S): " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "సేవికకు మీటలను ప్రచురించలేకపోయింది : %s" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "సేవిక నుంచి మీటలను వెలికితీయలేకపోయింది:%s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d మీట కాలనియమితం చేసేందుకు ఎన్నుకొనబడండి" -msgstr[1] "%d మీటలు కాలనియమితం చేసేందుకు ఎన్నుకొనబడ్డాయి" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "మీటలను కాలనియమితం చేస్తోంది..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "కాలనియమిత మీటలు" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"ఇది కీలను మీ కీరింగు నందు ప్రచురిస్తుంది అలా అవి యితరులకు అందుబాటులో వుంటాయి. మీరు యితరుల కీలను " -"స్వీకరించిన దగ్గరనుండి వారు చేసిన మార్పులను కూడా పొందుతారు." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"మీరు యితరుల కీలను స్వీకరించిన దగ్గరనుండి యిది యితరులు చేసిన మార్పులను వెలికితీస్తుంది. ప్రచురణ కొరకు " -"ఏ కీ సేవిక ఎంచుకొనబడలేదు, అందువలన మీ కీలు యితరులను అందుబాటలో వుండవు." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "ముఖ్య సేవికలు (_K)" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "కాలనియమితం (_S)" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "కొత్త పాస్ పదసముదాయాన్ని ధృవీకరించు" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "ఈ అనువర్తనము యొక్క వర్షన్" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "పాస్ పదసముదాయాన్ని ధృవీకరించు (_f)" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "సహాయములు:" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "మీ సంకేతపదాలను మరియు రహస్యపరచే మీటలను నిర్వహించండి" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "Srinivasa Chary " +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "కొనసాగించు " -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "సీహార్స్ పథకం నివాస పుట" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "మీరు ఏ రకమైన మీటను సృష్టించాలనుకుంటున్నారో ఆ రకమైన మీటను ఎన్నుకోండి (_S):" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "ఫైలు(_F)" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "దిగుమతిచేయుట విఫలమైంది" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "దిగుమతి " + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "దిగుమతి అగుటకు దత్తాంశము:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "సరిచేయు (_E)" +#: ../src/seahorse-key-manager.c:255 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "కీను దిగుమతి చేయి" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "దర్శనం (_V)" +#: ../src/seahorse-key-manager.c:267 +msgid "All key files" +msgstr "అన్ని ముఖ్యమైన ఫైళ్ళు" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "సహాయం (_H)" +#: ../src/seahorse-key-manager.c:368 +msgid "Dropped text" +msgstr "విడిచిన పాఠము" + +#: ../src/seahorse-key-manager.c:391 +msgid "Clipboard text" +msgstr "క్లిప్ బోర్డుపై పాఠము" + +#: ../src/seahorse-key-manager.c:519 +msgid "_New" +msgstr "కొత్త(_N)" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "అభీష్టాలు (_n)" +#: ../src/seahorse-key-manager.c:521 +msgid "Close this program" +msgstr "ఈ కార్యక్రమాన్ని మూసివేయు" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "ఈ కార్యక్రమం యొక్క అభీష్టాలను మార్చు" +#: ../src/seahorse-key-manager.c:522 ../src/seahorse-key-manager.c:524 +msgid "_New..." +msgstr "కొత్త(_N)..." -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "ఈ కార్యక్రమం గురించి" +#: ../src/seahorse-key-manager.c:523 +msgid "Create a new key or item" +msgstr "కొత్త మీటను సృష్టించండి" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "విషయములు (_C)" +#: ../src/seahorse-key-manager.c:525 +msgid "Add a new key or item" +msgstr "కొత్త మీట లేక ఐటంను జోడించండి" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "సీహార్స్ సహాయాన్ని చూపు" +#: ../src/seahorse-key-manager.c:526 +msgid "_Import..." +msgstr "దిగుమతి... (_I)" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "ప్రజా మీటను ఎగుమతి చేయు" +#: ../src/seahorse-key-manager.c:527 +msgid "Import from a file" +msgstr "మీటలను ఫైలు నుంచి దిగుమతిచేయు" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "మీటలను ఎగుమతి చేస్తోంది" +#: ../src/seahorse-key-manager.c:529 +msgid "Import from the clipboard" +msgstr "క్లిప్ బోర్డు నుంచి మీటలను దిగుమతి చేయు" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "ముఖ్య సేవిక నుంచి దత్తాంశాన్ని మరల సంపాదించలేకపోయింది" +#: ../src/seahorse-key-manager.c:533 +msgid "By _keyring" +msgstr "కీరింగు వల్ల(_K):" + +#: ../src/seahorse-key-manager.c:534 +msgid "Show sidebar listing keyrings" +msgstr "పక్కపట్టీకి జతచేయబడ్డ కీరింగ్ లను చూపుము" + +#: ../src/seahorse-key-manager.c:538 +msgid "Show _personal" +msgstr "వ్యకితగతమైనవి చూపు(_p)" + +#: ../src/seahorse-key-manager.c:539 +msgid "Only show personal keys, certificates and passwords" +msgstr "వ్యక్తిగత మీటలు, అధికారపత్రములు మరియు సంకేతపదములు" + +#: ../src/seahorse-key-manager.c:540 +msgid "Show _trusted" +msgstr "నమ్మకమైనవి చూపు(_t)" + +#: ../src/seahorse-key-manager.c:541 +msgid "Only show trusted keys, certificates and passwords" +msgstr "నమ్మకమైన మీటలు, అధికారపత్రములు మరియు సంకేతపదములు" + +#: ../src/seahorse-key-manager.c:542 +msgid "Show _any" +msgstr "ఏమైనా చూపుము(_a)" + +#: ../src/seahorse-key-manager.c:543 +msgid "Show all keys, certificates and passwords" +msgstr "అన్ని మీటలు, అధికారపత్రములు మరియు సంకేతపదములు" + +#: ../src/seahorse-key-manager.c:751 +msgid "Filter" +msgstr "వడపోత" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "%d మీటను నకలు చేసింది" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "మొదటి సారి ఇచ్ఛాపూర్వకాలు" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "మీటలను మరల సంపాదిస్తోంది" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "నీ స్వంత కొత్త మీటను ఉత్పత్తి చేయు:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s ఒక స్వంతతాళం." +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "ఫైలు నుండి ఉన్న మీటలను దిగుమతి చేయు:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "ముఖ్య సేవికల నుంచి మీటలను దిగుమతి చేస్తోంది" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "రహస్యపరచడంతో మొదలుపెట్టడానికి మీకు మీటలు కావాలి." -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "మీట యొక్క లక్షణాలను చూపు" +#: ../src/seahorse-main.c:54 +msgid "Version of this application" +msgstr "ఈ అనువర్తనము యొక్క వర్షన్" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "తొలగించు(_D)" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "లాక్ చేయలేకపోయింది" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "అన్ లాక్ చేయలేక పోయింది" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "ఎన్నుకొన్న మీటలను తొలగించు" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "లాక్ (_L)" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "దిగుమతి... (_E)" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "తెరచివేయు(_U)" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "మీటలోని ప్రజా భాగాన్ని దస్ర్తానికి ఎగుమతి చేయు" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "అభీష్టా(_P)" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "ఎన్నుకొన్న మీటలను క్లిప్ బోర్డుకు నకలు చేయండి" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "రక్షిత షెల్ మీటలు రూపకరించుచున్నది... (_S)" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "ఎన్నుకొన్న మీటలను స్థానిక మీట వలయంలోకి దిగుమతి చేయు" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "ప్రజా సురక్షిత షెల్ మీటను మరొక యంత్రానికి పంపి, దాని ద్వారా ప్రవేశద్వారానికి ఉపయోగించు. " #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2213,175 +2324,202 @@ msgstr "%s కొరకు కొత్త పాస్ పదసముదాయాన్ని ఇవ్వండి" #: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format msgid "Enter the new passphrase again: %s" msgstr "%s కొరకు కొత్త పాస్ పదసముదాయాన్నిమరల ఇవ్వండి" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "రక్షిత షెల్ మీటలు రూపకరించుచున్నది... (_S)" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "ప్రజా సురక్షిత షెల్ మీటను మరొక యంత్రానికి పంపి, దాని ద్వారా ప్రవేశద్వారానికి ఉపయోగించు. " +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "రక్షిత షెల్ " + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "ఇతర కంప్యూటర్స్ కు సురక్షితమైన బంధంకు వాడబడిన మీటలు." -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "'%s' వాడుకరి సంకేతపదంను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +msgstr[1] "%d మీటలను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "మీటను తొలగించలేకపోయింది" +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "ssh మీట" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "రహస్య షెల్ మీట" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "పబ్లిక్ ssh మీట" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "ఈ కీ కొరకు ఏ పబ్లిక్ కీ అందుబాటులో లేదు." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "రక్షిత షెల్ మీట" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "ఇతర కంప్యూటర్లను సాంగత్యించేందుకు వాడబడతుంది(ఉదాహరణకు:అగ్రం ద్వారా)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "రక్షిత షెల్ మీటను ఉత్పత్తి చేయలేకపోయింది" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "రక్షిత షెల్ మీట సృష్టించుచున్నది." -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "ఈ మీట దేని కొరకో తెలుసుకోవటానికి మీ ఇ తపాలాను లేదా ఇతర జ్ఞాపకంచేసేదానిని వాడండి" - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"ఒక రక్షిత షెల్ (ఎస్ ఎస్ హెచ్) మీట మిమ్మల్ని సురక్షితంగా ఎస్ ఎస్ హెచ్ వాడే నమ్మకమైన కంప్యూటర్లకు వేరువేరు " -"సంకేతపదాలు ఇవ్వకుండా బంధించడానికి ఉపయోగపడుతుంది." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"ఒకవేళ ఈ మీటను వాడడానికి కంప్యూటరుంటే, ఇప్పుడు ఆ కంప్యూటర్నుమీ మీటను గుర్తించే విధంగా దానిని " -"స్థాపించవచ్చు." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "కొత్త రక్షిత షెల్ మీట" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "కేవలం మీట సృష్టించు (_J)" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "సృష్టించు మరియు అమర్చిపెట్టు (_C)" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "కేవలం మీట సృష్టించు (_J)" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"ఒక రక్షిత షెల్ (ఎస్ ఎస్ హెచ్) మీట మిమ్మల్ని సురక్షితంగా వెరే కంప్యూటర్లకు బంధించడానికి ఉపయోగపడుతుంది." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "ఈ మీట దేని కొరకో తెలుసుకోవటానికి మీ ఈ మెయిల్ ను జ్ఞాపకంచేసేదానిని వాడండి" #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "మీట వివరణ (_K):" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"ఒకవేళ ఈ మీటను వాడడానికి కంప్యూటరుంటే, ఇప్పుడు ఆ కంప్యూటర్నుమీ కొత్త మీటను గుర్తించే విధంగా దానిని " +"స్థాపించవచ్చు." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(చదవలేని రక్షిత షెల్ మీట)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "నా స్వకీయమైన ssh మీటలు " + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "ssh మీట" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "మీట పునర్నామకరణము చేయుటకు వీలుకాదు." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "మీట కొరకు అధికారాన్ని మార్చుటకు వీలుకాదు." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "మీట కొరకు పాస్ పదసముదాయాన్ని మార్చుట వీలుకాదు." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "అల్గారిదమ్:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "గుర్తించునది:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "స్థలము:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "పేరు:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "శక్తి:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "ఇతర కంప్యూటర్స్ కు బంధంకు వాడబడినది." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "నమ్మకం" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "ఈ కంప్యూటర్ కు బంధంకు ఈ మీట యొక్క యజమాని కి అధికారమివ్వబడినది. (_a)" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "'%s' కు మాత్రమే ఇది వర్తిస్తుంది ఖాతా." +msgid "This only applies to the %s account." +msgstr "'%s' కు మాత్రమే ఇది వర్తిస్తుంది ఖాతా." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "పూర్తి మీట ఎగుమతి (_x)" +msgid "Algorithm:" +msgstr "అల్గారిదమ్:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "ఈ కంప్యూటర్ కు బంధంకు ఈ మీట యొక్క యజమాని కి అధికారమివ్వబడినది. (_a)" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "శక్తి:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "స్థలము:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "ఇతర కంప్యూటర్స్ కు బంధంకు వాడబడినది." +msgid "E_xport Complete Key" +msgstr "పూర్తి మీట ఎగుమతి (_x)" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "ఎస్ ఎస్ హెచ్ ఆదేశం అనుకోకుండా ముగిసినది." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "ఎస్ ఎస్ హెచ్ ఆదేశం విఫలమైనది." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "అల్లిక సంకేతపదం" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "పాస్ పదసముదాయాన్ని ఇవ్వండి" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "కొత్త రక్షిత షెల్ మీట కొరకు పాస్ పదసముదాయం" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "కీను దిగుమతిచేయుచున్నది: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "కీను దిగుమతిచేయుచున్నది. సంకేతపదమును ప్రవేశపెట్టుము" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH చేసింది" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "ఈ కీ కొరకు ఏ వ్యక్తిగత కీ అందుబాటులో లేదు." @@ -2394,14 +2532,10 @@ msgstr "రక్షిత షెల్ మీటలు రూపకరించుచున్నది..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "ఉదా: fileserver.example.com" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "ఎస్ ఎస్ హెచ్ బంధం కొరకు కంప్యూటర్ అమర్చిపెట్టు" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2410,6 +2544,10 @@ "ఎస్ ఎస్ హెచ్ వాడుతుంది, నీవు ఇదివరకే ఒక ప్రవేశద్వారం ఖాతా కలిగి ఉండవలయును ఆ\n" "కంప్యూటర్ పై." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "ఉదా: fileserver.example.com" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "కంప్యూటర్ పేరు (_C):" @@ -2422,15 +2560,180 @@ msgid "_Set Up" msgstr "అమర్చిపెట్టు (_S)" +#~ msgid "Couldn't delete item" +#~ msgstr "అంశమును తొలగించలేకపోయింది" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "వస్తువును దాచుతోంది" +#~ msgstr[1] "వస్తువును దాచుతోంది" + +#~ msgid "Passwords: %s" +#~ msgstr "సంకేతపదం: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "సంకేతపదం: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "సంకేతపద నిల్వ కీరింగును లాక్ చేయుము అలా వొక మాస్టర్ సంకేతపదము అవసరమౌతుంది దానిని అన్‌లాక్ చేయుటకు." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "సంకేతపదము దాచే కీరింగును మాస్టర్ సంకేతపదముతో అన్‌లాక్ చేయుము అలా అది వుపయోగమునకు అందుబాటులో " +#~ "వుంటుంది." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "కీరింగ్ ను తొలగించలేకపోయింది" + +#~ msgid "Archive files" +#~ msgstr "సంగ్రహమైన ఫైళ్ళు" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "ఈ పేరుతో వొక ఫైలు యిప్పటికే వుంది.\n" +#~ "\n" +#~ "మీరు దానిని కొత్త ఫైలుతో పునఃస్థాపించాలని అనుకొనుచున్నారా?" + +#~ msgid "_Replace" +#~ msgstr "పునఃస్థాపించు (_R)" + +#~ msgid "_Sign Key..." +#~ msgstr "సంతకం చేయు... (_S)" + +#~ msgid "Sign public key" +#~ msgstr "ప్రజా మీటను సంతకం చేయు" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "పబ్లిక్ కీను తొలగించలేకపోయింది" + +#~ msgid "Algorithms here" +#~ msgstr "అల్గారిదములు ఇక్కడ" + +#~ msgid "New PGP Key" +#~ msgstr "కొత్త పీజీపీ మీట" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "\"%s\" కు మీటను ఎగుమతి చేయలేకపోయింది" + +#~ msgid "Export Complete Key" +#~ msgstr "పూర్తి మీటను ఎగుమతిచేయు" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "%s ను శాశ్వతంగా తొలగించాలని మీరు నిశ్చయించుకున్నారా?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "%d మీటను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" +#~ msgstr[1] "%d మీటలను మీరు శాశ్వతంగా తొలగించడానికి నిశ్చయించుకున్నారా?" + +#~ msgid "Deleting" +#~ msgstr "తొలగిస్తుంది" + +#~ msgid "Create New ..." +#~ msgstr "కొత్త మీటను సృష్టించు..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "ఎన్నుకొన్న %d మీట" +#~ msgstr[1] "ఎన్నుకొన్న %d మీటలు" + +#~ msgid "Importing keys" +#~ msgstr "మీటలను దిగుమతి చేస్తోంది" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "తెలియని మీట రకం, లేదా నిస్సారమైన దత్తాంశ రూపలావణ్యం" + +#~ msgid "Importing Keys" +#~ msgstr "మీటలను దిగుమతి చేస్తోంది" + +#~ msgid "T_ypes" +#~ msgstr "రకాలు (_y)" + +#~ msgid "Show type column" +#~ msgstr "రకం నిలువును చూపు" + +#~ msgid "_Expiry" +#~ msgstr "ముగియు (_E)" + +#~ msgid "Show expiry column" +#~ msgstr "ముగియు నిలువును చూపు" + +#~ msgid "_Trust" +#~ msgstr "నమ్మకం (_T)" + +#~ msgid "Show owner trust column" +#~ msgstr "యజమాని నమ్మకం నిలువును చూపు" + +#~ msgid "_Validity" +#~ msgstr "దార్ఢ్యము (_V)" + +#~ msgid "Show validity column" +#~ msgstr "దార్ఢ్యము నిలువును చూపు" + +#~ msgid "Other _Keys" +#~ msgstr "ఇతర కీలు (_K)" + +#~ msgid "Validity" +#~ msgstr "దార్ఢ్యము" + +#~ msgid "Expiration Date" +#~ msgstr "ముగిసే తేది" + +#~ msgid "_Expand All" +#~ msgstr "అన్నింటినీ విస్తరించు (_E)" + +#~ msgid "Expand all listings" +#~ msgstr "అన్ని జాబితాలను విస్తరించు" + +#~ msgid "_Collapse All" +#~ msgstr "అన్నింటినీ కూల్చివేయు (_C)" + +#~ msgid "Collapse all listings" +#~ msgstr "అన్ని జాబితాలను కూల్చివేయు" + +#~ msgid "Export public key" +#~ msgstr "ప్రజా మీటను ఎగుమతి చేయు" + +#~ msgid "Exporting keys" +#~ msgstr "మీటలను ఎగుమతి చేస్తోంది" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "ముఖ్య సేవిక నుంచి దత్తాంశాన్ని మరల సంపాదించలేకపోయింది" + +#~ msgid "Retrieving keys" +#~ msgstr "మీటలను మరల సంపాదిస్తోంది" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s ఒక స్వంతతాళం." + +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "తొలగించు(_D)" + +#~ msgid "Couldn't delete key" +#~ msgstr "మీటను తొలగించలేకపోయింది" + +#~ msgid "_Key Description:" +#~ msgstr "మీట వివరణ (_K):" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "సీహార్స్-డెమోన్‌ను డెమోన్‌లా నడపవద్దు" #~ msgid "couldn't fork process" #~ msgstr "ప్రోసెస్‌ను పోర్కు చేయలేదు" -#~ msgid "couldn't create new process group" -#~ msgstr "కొత్త క్రమణసముదాయాన్ని సృష్టించలేకపోయింది" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "రహస్యపరచు సూత్రధారి(సీహార్స్)" @@ -2479,9 +2782,6 @@ #~ msgid "Bad Signature" #~ msgstr "చెడ్డ సంతకం" -#~ msgid "Couldn't verify signature." -#~ msgstr "సంతకాన్ని పరీక్షించలేకపోయింది." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "నిస్సారమైన లేదా గుర్తించలేని సంతకదారి:%s" @@ -2560,8 +2860,7 @@ #~ msgid "" #~ "If set to true, then files encrypted with seahorse will be ASCII armor " #~ "encoded." -#~ msgstr "" -#~ "సత్యమునకు అమర్చితే, సీహార్సుతో ఎన్క్రిప్టు చేయబడిన ఫైలులు ASCII ఆర్మర్ ఎన్కోడెడ్ అవుతాయి." +#~ msgstr "సత్యమునకు అమర్చితే, సీహార్సుతో ఎన్క్రిప్టు చేయబడిన ఫైలులు ASCII ఆర్మర్ ఎన్కోడెడ్ అవుతాయి." #~ msgid "" #~ "If set to true, then the default key will always be added to an " @@ -2659,9 +2958,6 @@ #~ msgid "Web Password" #~ msgstr "మహాతల సంకేతపదం" -#~ msgid "Network Password" -#~ msgstr "అల్లిక సంకేతపదం" - #~ msgid "Couldn't set application access." #~ msgstr "వర్ణనను ఏర్పాటు చేయలేకపోయింది." @@ -2674,9 +2970,6 @@ #~ msgid "Applications" #~ msgstr "కార్యక్షేత్రాలు" -#~ msgid "_Delete" -#~ msgstr "తొలగించు(_D)" - #~ msgid "_Read" #~ msgstr "చదువుము(_R)" @@ -2779,12 +3072,6 @@ #~ msgid "Symmetric Key" #~ msgstr "కాలనియమిత మీటలు" -#~ msgid "Public Key" -#~ msgstr "Public Key" - -#~ msgid "Private Key" -#~ msgstr "స్వంత పీజీపీ మీట" - #~ msgid "Credentials" #~ msgstr "నెట్వర్క్ పరపతులు" @@ -2825,9 +3112,6 @@ #~ msgid "Loading Keys..." #~ msgstr "కీలు లోడుచేస్తోంది..." -#~ msgid "Searching for keys..." -#~ msgstr "మీటలకోసం వెతుకుతోంది..." - #~ msgid "Uploading keys..." #~ msgstr "కీలను నవీకరించుచున్నది..." @@ -2855,18 +3139,12 @@ #~ msgid "X keys are selected for synchronizing" #~ msgstr "మీటలను కాలనియమితులుగా చేయడానికి ఎన్నుకొనబడ్డాయి" -#~ msgid "Encryption Key Manager" -#~ msgstr "రహస్యపరచే ముఖ్య అభికర్త" - #~ msgid "" #~ "One or more of the deleted keys are private keys. Are you sure you want " #~ "to proceed?" #~ msgstr "" #~ "తొలగించిన కీలలో వొకటి లేదా యెక్కువ కీలు వ్యక్తిగత కీలు. మీరు ఖచ్చితముగా కొనసాగాలని అనుకొనుచున్నారా?" -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "నిస్సారం" @@ -2882,12 +3160,8 @@ #~ msgid "00:00:00:00:00" #~ msgstr "00:00:00:00:00" -#~ msgid "Secure Shell key" -#~ msgstr "రక్షిత షెల్ మీట" - #~ msgid "Passphrase:" #~ msgstr "పాస్ పదసముదాయం" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "కొత్త రక్షిత షెల్ మీట కొరకు పాస్ పదసముదాయం ఇవ్వండి." - diff -Nru seahorse-3.2.2/po/th.po seahorse-3.6.3/po/th.po --- seahorse-3.2.2/po/th.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/th.po 2012-11-12 08:32:13.000000000 +0100 @@ -1,7 +1,7 @@ # Thai translation of seahorse. -# Copyright (C) 2007-2011 Free Software Foundation, Inc. +# Copyright (C) 2007-2012 Free Software Foundation, Inc. # This file is distributed under the same license as the seahorse package. -# Theppitak Karoonboonyanan , 2007-2011. +# Theppitak Karoonboonyanan , 2007-2012. # Sira Nokyoongtong , 2010. # msgid "" @@ -9,8 +9,8 @@ "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-15 08:07+0000\n" -"PO-Revision-Date: 2011-09-18 12:12+0700\n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-09-22 10:54+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" "MIME-Version: 1.0\n" @@ -23,307 +23,297 @@ msgstr "สร้างพวงกุญแจเก็บรหัสผ่าน" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "ตั้งชื่อพวงกุญแจ:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "กรุณาตั้งชื่อพวงกุญแจที่จะสร้าง โปรแกรมจะให้คุณตั้งรหัสผ่านสำหรับปลดล็อคพวงกุญแจในภายหลัง" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "ตั้งชื่อพวงกุญแจ:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "ชื่อโฮสต์หรือที่อยู่ของเซิร์ฟเวอร์" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "ไม่สามารถเพิ่มพวงกุญแจ" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "พวงกุญแจใหม่สำหรับเก็บรหัสผ่าน" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "ใช้เก็บรหัสผ่านของโปรแกรมและเครือข่ายต่างๆ" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "รหัสผ่านใหม่..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "เก็บรหัสผ่านหรือรหัสลับแบบนิรภัย" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "พวงกุญแจเก็บรหัสผ่าน" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "แหล่งเก็บรหัสผ่าน" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "ไม่สามารถกำหนดพวงกุญแจปริยาย" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "ไม่สามารถเปลี่ยนรหัสผ่านพวงกุญแจ" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_กำหนดเป็นพวงกุญแจปริยาย" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "โปรแกรมต่างๆ มักจะเก็บรหัสผ่านไว้ในพวงกุญแจปริยาย" + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "เ_ปลี่ยนรหัสผ่าน" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "เปลี่ยนรหัสผ่านที่จะใช้ปลดล็อคพวงกุญแจเก็บรหัสผ่าน" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "ไม่สามารถเพิ่มรายการ" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "เพิ่มรหัสผ่าน" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_คำอธิบาย:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_พวงกุญแจ:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_รหัสผ่าน:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "แ_สดงรหัสผ่าน" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "ไม่สามารถลบรายการ" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_พวงกุญแจ:" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "ไม่สามารถเพิ่มพวงกุญแจ" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "รหัสผ่าน" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "แหล่งเก็บรหัสผ่าน ข้อมูลลับ และรหัสลับส่วนบุคคล" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "รหัสผ่านบัญชี IM สำหรับ " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "รหัสผ่านหรือรหัสลับ" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "รหัสผ่านเครือข่าย" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "บันทึกข้อความที่เก็บไว้" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "รหัสผ่านพวงกุญแจ" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "รหัสผ่านของกุญแจเข้ารหัสลับ" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "รหัสผ่านของแหล่งเก็บกุญแจ" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "รหัสผ่านของ Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "รหัสผ่านของบัญชีออนไลน์ของ GNOME" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "รหัสผ่านของ Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "รหัสผ่านของข้อความทันใจ" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "รหัสลับของ Network Manager" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "ยืนยันหรือไม่ว่าต้องการลบรหัสผ่าน '%s'?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "ยืนยันหรือไม่ว่าต้องการลบรหัสผ่านทั้ง %d รายการ?" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "กำลังลบรายการ" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "เข้าใช้โฟลเดอร์ใช้ร่วมหรือทรัพยากรในเครือข่าย" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "เข้าใช้เว็บไซต์" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "ไขกุญแจ PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "ไขกุญแจเชลล์นิรภัย" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "รหัสผ่านหรือชื่อเข้าระบบที่บันทึกไว้" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "รหัสลับเครือข่าย" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "รหัสผ่าน" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "ไม่สามารถเปลี่ยนรหัสผ่าน" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "กำลังปรับข้อมูลรหัสผ่าน" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "ไม่สามารถกำหนดคำบรรยาย" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "รหัสผ่าน:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "รายละเอียดทางเทคนิค:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "รายละเอียด" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "คุณสมบัติกุญแจ" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "กุญแจ" +msgid "Use:" +msgstr "การใช้งาน:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "คุณสมบัติกุญแจ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "ชนิด:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "ชื่อเข้าระบบ:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "เซิร์ฟเวอร์:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "ชื่อเข้าระบบ:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "แสดง_รหัสผ่าน" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "ชนิด:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "การใช้งาน:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "รหัสผ่าน: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "รหัสผ่าน: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "พวงกุญแจเก็บรหัสผ่าน" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "ใช้เก็บรหัสผ่านของโปรแกรมและเครือข่ายต่างๆ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "แหล่งเก็บรหัสผ่าน" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "เก็บรหัสผ่านหรือรหัสลับแบบนิรภัย" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "ไม่สามารถปลดล็อคพวงกุญแจ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "ไม่สามารถล็อคพวงกุญแจ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "ไม่สามารถกำหนดพวงกุญแจปริยาย" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "ไม่สามารถเปลี่ยนรหัสผ่านพวงกุญแจ" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_ล็อค" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "ล็อคพวงกุญแจเก็บรหัสผ่าน โดยต้องใช้รหัสผ่านหลักในการปลดล็อค" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "ปล_ดล็อค" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "ปลดล็อคพวงกุญแจเก็บรหัสผ่านโดยใช้รหัสผ่านหลัก เพื่อให้สามารถใช้งานได้" - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_กำหนดเป็นพวงกุญแจปริยาย" +msgid "Password:" +msgstr "รหัสผ่าน:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "โปรแกรมต่างๆ มักจะเก็บรหัสผ่านไว้ในพวงกุญแจปริยาย" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "กุญแจ" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "เ_ปลี่ยนรหัสผ่าน" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "รายละเอียดทางเทคนิค:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "เปลี่ยนรหัสผ่านที่จะใช้ปลดล็อคพวงกุญแจเก็บรหัสผ่าน" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "รายละเอียด" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "ไม่สามารถลบพวงกุญแจ" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "พวงกุญแจซึ่งปลดล็อคโดยอัตโนมัติเมื่อเข้าระบบ" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "พวงกุญแจสำหรับเก็บรหัสผ่าน" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "ยืนยันหรือไม่ว่าต้องการลบพวงกุญแจเก็บรหัสผ่าน '%s'?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "กำลังลบพวงกุญแจ" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "ฉันเข้าใจว่าทุกรายการจะถูกลบทิ้งอย่างถาวร" + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "คุณสมบัติพวงกุญแจ" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "ชื่อ:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "สร้าง:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "พวงกุญแจ" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "คุณสมบัติพวงกุญแจ" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_ชื่อ:" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "การกระทำถูกยกเลิก" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "ไม่ได้รับอนุญาตให้เข้าใช้พวงกุญแจ" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "ดีมอน gnome-keyring ไม่ได้ทำงานอยู่" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "พวงกุญแจถูกปลดล็อคไปแล้ว" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "ไม่มีพวงกุญแจที่ว่านี้อยู่" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "ไม่สามารถติดต่อสื่อสารกับดีมอนพวงกุญแจ" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "มีรายการนี้อยู่ก่อนแล้ว" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "เกิดข้อผิดพลาดภายในขณะเข้าใช้ gnome-keyring" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "แฟล็กการแสดงผล" @@ -580,267 +570,323 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "รายการชั่วคราวเริ่มแรก" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "เพิ่มเซิร์ฟเวอร์กุญแจ" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "โฮสต์:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "ชนิดของเซิร์ฟเวอร์กุญแจ:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "โฮสต์:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "หมายเลขพอร์ตที่จะเข้าใช้เซิร์ฟเวอร์" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "รายการชั่วคราวเริ่มแรก" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "รุ่นของโปรแกรมนี้" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "วลีรหัสผ่าน" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- ตั้งค่าระบบ" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "รหัสผ่าน:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "ผู้ร่วมสมทบ:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "ยืนยัน:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "รหัสผ่านและกุญแจ" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "ที่อยู่เซิร์ฟเวอร์กุญแจไม่ถูกต้อง" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "Theppitak Karoonboonyanan " -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "" -"หากต้องการความช่วยเหลือ กรุณาติดต่อผู้ดูแลระบบของคุณ หรือผู้ดูแลระบบของเครื่องเซิร์ฟเวอร์กุญแจ" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "โฮมเพจโครงการ Seahorse" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "ไม่สามารถลบ" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "กำหนดเอง" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "ไม่สามารถส่งออกกุญแจ" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "ไม่ต้อง: ไม่ต้องประกาศกุญแจ" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "ไม่สามารถส่งออกข้อมูล" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "ดึ_งข้อมูลกุญแจจากเซิร์ฟเวอร์กุญแจโดยอัตโนมัติ" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "แ_ฟ้ม" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "ปรั_บข้อมูลกุญแจที่มีการเปลี่ยนแปลงให้ตรงกับเซิร์ฟเวอร์กุญแจโดยอัตโนมัติ" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_ส่งออก..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "เซิร์ฟเวอร์กุญแจ" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ส่งออกลงในแฟ้ม" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "ปรับแต่ง" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "แ_ก้ไข" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_หากุญแจผ่าน:" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "คัดลอกเข้าคลิปบอร์ด" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_ประกาศกุญแจไปที่:" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_ลบ" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "กำลังดึงข้อมูล" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "ลบรายการที่เลือก" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "กำลังส่งออกข้อมูล" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "แสดงคุณสมบัติของรายการนี้" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "แสดงคุณสมบัติของพวงกุญแจนี้" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "กำลังนำเข้าข้อมูล" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "ปรับแ_ต่ง" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "กำลังส่งข้อมูล" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "ปรับแต่งโปรแกรมนี้" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "ไม่มี" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "มุ_มมอง" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%d/%m/%Ey" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_วิธีใช้" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "ข้อมูลกุญแจ" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "เกี่ยวกับโปรแกรมนี้" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "กุญแจหลายดอก" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "เนื้อ_หา" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "แฟ้มกุญแจทั้งหมด" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "แสดงวิธีใช้ Seahorse" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "แฟ้มทั้งหมด" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "ส่งออก" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "กรุณาป้อน PIN หรือรหัสผ่านสำหรับ: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "รหัสผ่าน:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "ยืนยัน:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "แฟ้มจัดเก็บ" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "ที่อยู่เซิร์ฟเวอร์กุญแจไม่ถูกต้อง" + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "" -"มีแฟ้มชื่อนี้อยู่ก่อนแล้ว\n" -"\n" -"คุณต้องการเขียนทับด้วยแฟ้มใหม่หรือไม่?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "เขียน_ทับ" +"หากต้องการความช่วยเหลือ กรุณาติดต่อผู้ดูแลระบบของคุณ หรือผู้ดูแลระบบของเครื่องเซิร์ฟเวอร์กุญแจ" + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "กำหนดเอง" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "ไม่ต้อง: ไม่ต้องประกาศกุญแจ" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "ปรับแต่ง" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "_หากุญแจผ่าน:" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "_ประกาศกุญแจไปที่:" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "ดึ_งข้อมูลกุญแจจากเซิร์ฟเวอร์กุญแจโดยอัตโนมัติ" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "ปรั_บข้อมูลกุญแจที่มีการเปลี่ยนแปลงให้ตรงกับเซิร์ฟเวอร์กุญแจโดยอัตโนมัติ" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "เซิร์ฟเวอร์กุญแจ" + +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%d/%m/%Ey" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "ไม่ทราบ" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "ไม่เคยเปิดใช้" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "ก้ำกึ่ง" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "เต็มที่" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "เต็มพิกัด" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "ปิดใช้งาน" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "เพิกถอน" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "ไม่สามารถแสดงวิธีใช้: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "วันหมดอายุ:" +msgid "Never E_xpires" +msgstr "ไม่มีวันห_มดอายุ" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "สร้างกุญแจย่อยใหม่" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "กุญแจไม่มีวันหมดอายุใช่หรือไม่" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_ชนิดกุญแจ:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "ความ_ยาวกุญแจ:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_ชนิดกุญแจ:" +msgid "Expiration Date:" +msgstr "วันหมดอายุ:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "ความยาวของกุญแจ" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "ไม่มีวันห_มดอายุ" +msgid "Generate a new subkey" +msgstr "สร้างกุญแจย่อยใหม่" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "เพิ่มหมายเลขผู้ใช้" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "เพิ่มหมายเลขผู้ใช้ใหม่" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "_ชื่อเต็ม:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "ห_มายเหตุกุญแจ:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "ต้องยาวอย่างน้อย 5 ตัวอักษร" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "ที่อยู่อีเมล จะมีหรือไม่ก็ได้" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "หมายเหตุอธิบายกุญแจ จะมีหรือไม่ก็ได้" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "ที่อยู่อีเมล จะมีหรือไม่ก็ได้" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_ชื่อเต็ม:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "ที่อยู่_อีเมล:" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "ห_มายเหตุกุญแจ:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "เพิ่มหมายเลขผู้ใช้ใหม่" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "เ_ปลี่ยน" +msgid "_Never expires" +msgstr "ไ_ม่มีวันหมดอายุ" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "เพิกถอนกุญแจ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "ไ_ม่มีวันหมดอายุ" +msgid "C_hange" +msgstr "เ_ปลี่ยน" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -851,7 +897,7 @@ msgid "Add subkey to %s" msgstr "เพิ่มกุญแจย่อยใน %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (เซ็นเท่านั้น)" @@ -859,7 +905,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (เข้ารหัสลับเท่านั้น)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (เซ็นเท่านั้น)" @@ -880,6 +926,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "ถอดรหัสลับไม่สำเร็จ คุณอาจไม่มีกุญแจสำหรับถอดรหัสลับ" +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "การกระทำถูกยกเลิก" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "วันหมดอายุผิดพลาด" @@ -897,46 +948,144 @@ msgid "Expiry: %s" msgstr "หมดอายุ: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "กุญแจหลายดอก" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "ข้อมูลกุญแจ" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "กุญแจ PGP แบบ ASCII" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "กุญแจ PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "กุญแจ PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "ใช้สำหรับเข้ารหัสลับอีเมลและแฟ้มต่างๆ" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "ไม่สามารถสร้างกุญแจ PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "วลีรหัสผ่านสำหรับกุญแจ PGP ใหม่" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "กรุณาป้อนวลีรหัสผ่านสำหรับกุญแจใหม่ของคุณซ้ำสองครั้ง" -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"ในการสร้างกุญแจ เราต้องสร้างข้อมูลสุ่มจำนวนมาก\n" +"และเราต้องการให้คุณช่วย วิธีที่ดีก็คือทำงานอย่างอื่นบนเครื่อง\n" +"เช่น พิมพ์อะไรก็ได้บนแป้นพิมพ์ ขยับเมาส์ ใช้งานโปรแกรมต่างๆ\n" +"ซึ่งจะทำให้ระบบได้ข้อมูลสุ่มที่ต้องการ" + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "กำลังสร้างกุญแจ" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "ยืนยันหรือไม่ว่าต้องการลบ %s อย่างถาวร?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "ยืนยันหรือไม่ว่าต้องการลบกุญแจทั้ง %d ดอกอย่างถาวร?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "รหัสผ่านไม่ถูกต้อง" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "นี่เป็นครั้งที่สามแล้วที่คุณป้อนรหัสผ่านผิด กรุณาลองอีกครั้ง" +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "วลีรหัสผ่านไม่ถูกต้อง" + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "กรุณาตั้งวลีรหัสผ่านใหม่สำหรับ '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "กรุณาป้อนวลีรหัสผ่านสำหรับ '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "กรุณาตั้งวลีรหัสผ่านใหม่" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "กรุณาป้อนวลีรหัสผ่าน" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "วลีรหัสผ่าน" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "โหลดกุญแจแล้ว %d ดอก" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"ข้อมูลกุญแจไม่ถูกต้อง (ขาด UID) " +"สาเหตุอาจเกิดจากการตั้งเวลาของเครื่องคอมพิวเตอร์ไว้เป็นเวลาอนาคต " +"หรือกุญแจไม่มีลายเซ็นเจ้าของกำกับ" + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "กุญแจ GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: ไดเรกทอรีพวงกุญแจปริยาย" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -969,27 +1118,31 @@ msgid "All JPEG files" msgstr "แฟ้ม JPEG ทั้งหมด" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "แฟ้มทั้งหมด" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "เลือกรูปที่จะเพิ่มในกุญแจ" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "ไม่สามารถเตรียมข้อมูลรูปภาพ" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "ไม่สามารถเพิ่มรูปภาพ" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "ไม่สามารถโหลดแฟ้มได้ อาจเป็นแฟ้มที่ผิดรูปแบบ" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "ยืนยันหรือไม่ ว่าคุณต้องการลบรูปภาพปัจจุบันออกจากกุญแจของคุณ?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "ไม่สามารถลบรูปภาพ" @@ -1047,7 +1200,11 @@ msgid "Couldn't add revoker" msgstr "ไม่สามารถเพิ่มผู้เพิกถอน" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "ฉันเข้าใจว่ากุญแจลับนี้จะถูกลบทิ้งอย่างถาวร" + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1062,566 +1219,624 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "ไม่มีกุญแจที่จะใช้เซ็นกำกับได้" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "คุณไม่มีกุญแจส่วนตัวที่สามารถใช้แสดงความเชื่อมั่นกับกุญแจนี้" -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "วลีรหัสผ่านไม่ถูกต้อง" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "กรุณาตั้งวลีรหัสผ่านใหม่สำหรับ '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "การค้นหายังไม่เจาะจงพอ พบกุญแจในเซิร์ฟเวอร์ '%s' จำนวนมากเกินไป" -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "กรุณาป้อนวลีรหัสผ่านสำหรับ '%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "ไม่สามารถติดต่อสื่อสารกับเซิร์ฟเวอร์ '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "กรุณาตั้งวลีรหัสผ่านใหม่" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "เซิร์ฟเวอร์กุญแจ HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "กรุณาป้อนวลีรหัสผ่าน" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "ไม่สามารถนำเข้ากุญแจ" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "กำลังนำเข้ากุญแจจากเซิร์ฟเวอร์พวงกุญแจ" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "เ_ครือข่าย" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "ปิดหน้าต่างนี้" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_หากุญแจในเครือข่าย..." -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "ค้นหากุญแจในเซิร์ฟเวอร์กุญแจ" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_นำเข้า" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "นำเข้ากุญแจที่เลือกเข้าในพวงกุญแจในเครื่อง" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "กุญแจจากเครือข่าย" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "โหลดกุญแจแล้ว %d ดอก" +msgid "Remote Keys Containing '%s'" +msgstr "กุญแจจากเครือข่ายที่มี '%s'" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "เกิดข้อผิดพลาดขณะค้นหากุญแจ" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "หากุญแจจากเครือข่าย" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"ข้อมูลกุญแจไม่ถูกต้อง (ขาด UID) " -"สาเหตุอาจเกิดจากการตั้งเวลาของเครื่องคอมพิวเตอร์ไว้เป็นเวลาอนาคต " -"หรือกุญแจไม่มีลายเซ็นเจ้าของกำกับ" +"หน้าต่างนี้จะค้นหากุญแจของผู้อื่นในอินเทอร์เน็ต " +"กุญแจเหล่านี้สามารถนำเข้ามาสู่พวงกุญแจในเครื่องของคุณได้" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "ค้น_หากุญแจที่มี:" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "เซิร์ฟเวอร์กุญแจ HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "เซิร์ฟเวอร์กุญแจ:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "กุญแจใช้ร่วมในเครือข่ายใกล้เคียง:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "แหล่งค้นหา:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_ค้นหา" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "ไม่สามารถประกาศกุญแจไปที่เซิร์ฟเวอร์" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "การค้นหายังไม่เจาะจงพอ พบกุญแจในเซิร์ฟเวอร์ '%s' จำนวนมากเกินไป" +msgid "Couldn't retrieve keys from server: %s" +msgstr "ไม่สามารถดึงกุญแจจากเซิร์ฟเวอร์: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "ไม่สามารถติดต่อสื่อสารกับเซิร์ฟเวอร์ '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "มีกุญแจ %d ดอกถูกเลือกสำหรับปรับข้อมูล" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "กำลังปรับข้อมูลกุญแจ..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "ปรับกุญแจ" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"หน้าต่างนี้จะประกาศกุญแจในพวงกุญแจของคุณ เพื่อให้ผู้อื่นใช้งานได้ คุณจะได้รับการเปลี่ยนแปลงต่างๆ " +"ที่คนอื่นๆ ได้ทำนับตั้งแต่คุณรับกุญแจของพวกเขาครั้งสุดท้ายด้วย" + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"หน้าต่างนี้จะดึงการเปลี่ยนแปลงต่างๆ ที่คนอื่นๆ ได้ทำนับตั้งแต่คุณรับกุญแจของพวกเขาครั้งสุดท้าย " +"คุณไม่ได้เลือกเซิร์ฟเวอร์กุญแจสำหรับประกาศ ดังนั้น จะไม่มีการประกาศกุญแจของคุณให้ผู้อื่นใช้" + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "เซิร์ฟเวอร์กุญแ_จ" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_ปรับข้อมูล" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "ไม่สามารถติดต่อสื่อสารกับ '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "กำลังเชื่อมต่อไปยัง: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "ไม่สามารถเปิดหาที่อยู่: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "กำลังเปิดหาที่อยู่เซิร์ฟเวอร์: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "เซิร์ฟเวอร์กุญแจ LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "เ_ซ็นรับรองกุญแจ..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "เซ็นรับรองกุญแจสาธารณะ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "ยืนยันหรือไม่ว่าต้องการลบ %s อย่างถาวร?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "ยืนยันหรือไม่ว่าต้องการลบกุญแจและหมายเลขประจำตัวทั้ง %d รายการอย่างถาวร?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "ยืนยันหรือไม่ว่าต้องการลบกุญแจทั้ง %d ดอกอย่างถาวร?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_ปรับและประกาศกุญแจ..." -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "ยืนยันหรือไม่ว่าต้องการลบเลขประจำตัวทั้ง %d รายการอย่างถาวร?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "ประกาศ และ/หรือ ปรับข้อมูลกุญแจของคุณกับค่าออนไลน์ให้ตรงกัน" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "ไม่สามารถลบหมายเลขผู้ใช้" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "กุญแจ PGP" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "ไม่สามารถลบกุญแจส่วนตัว" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "ไม่สามารถลบกุญแจสาธารณะ" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "กุญแจ PGP ใช้สำหรับเข้ารหัสลับอีเมลและแฟ้มต่างๆ" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "ตัวเลือกโดย_ละเอียดสำหรับกุญแจ" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_สร้าง" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "กุญแจ PGP จะช่วยให้คุณสามารถเข้ารหัสลับอีเมลหรือแฟ้มที่ส่งให้ผู้อื่นได้" +msgid "Generate a new key" +msgstr "สร้างกุญแจใหม่" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "อัลกอริทึม" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "กุญแจ PGP จะช่วยให้คุณสามารถเข้ารหัสลับอีเมลหรือแฟ้มที่ส่งให้ผู้อื่นได้" -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_สร้าง" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_หมายเหตุ:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "วันห_มดอายุ:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "ไ_ม่มีวันหมดอายุ" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_ชนิดการเข้ารหัสลับ:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "สร้างกุญแจใหม่" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "ความแ_ข็งแรงของกุญแจ (จำนวนบิต):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "ไ_ม่มีวันหมดอายุ" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "กุญแจ PGP ใหม่" +msgid "E_xpiration Date:" +msgstr "วันห_มดอายุ:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_หมายเหตุ:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "ตัวเลือกโดย_ละเอียดสำหรับกุญแจ" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "หมดอายุ" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "กุญแจ PGP ส่วนตัว" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "กุญแจ PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "ไม่สามารถเปลี่ยนหมายเลขผู้ใช้หลัก" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "ยืนยันหรือไม่ว่าต้องการลบหมายเลขผู้ใช้ '%s' อย่างถาวร?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "ไม่สามารถลบหมายเลขผู้ใช้" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[ไม่ทราบ]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "ชื่อ/อีเมล" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "หมายเลขลายเซ็น" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "ไม่สามารถเปลี่ยนรูปภาพหลัก" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(ไม่ทราบ)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "กุญแจนี้หมดอายุแล้วเมื่อ: %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "ชื่อ" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "ยืนยันหรือไม่ว่าต้องการลบกุญแจย่อย %d ของ %s อย่างถาวร?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "ไม่สามารถลบกุญแจย่อย" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "ไม่สามารถเปลี่ยนค่าความเชื่อถือ" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "ไม่สามารถส่งออกกุญแจไปยัง \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "ส่งออกกุญแจทั้งหมด" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" msgstr "ไม่สามารถส่งออกกุญแจ" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "ไม่มีวันหมดอายุ" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "ชนิด" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "สร้าง" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "หมดอายุ" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "สถานะ" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "ความแข็งแรง" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "หมดอายุ" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "ดี" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "หมายเลขกุญแจ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "การกระทำ" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "หมายเหตุ:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "วันที่" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "อีเมล:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "ลายนิ้วมือ" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "หมายเลขกุญแจ:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "ไม่เลย" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "ชื่อกุญแจและลายเซ็น" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "กุญแจนี้ถูกเพิกถอนแล้ว" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "รูป" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "เจ้าของกุญแจได้เพิกถอนกุญแจแล้ว จึงไม่สามารถใช้การได้อีก" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "รายละเอียดทางเทคนิค" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "กุญแจนี้หมดอายุแล้ว" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "กุญแจนี้ถูกเพิกถอนแล้ว" +msgid "Add a photo to this key" +msgstr "เพิ่มรูปภาพให้กับกุญแจนี้" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "กุญแจนี้หมดอายุแล้ว" +msgid "Remove this photo from this key" +msgstr "ลบรูปภาพนี้ออกจากกุญแจนี้" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "ชนิด:" +msgid "Make this photo the primary photo" +msgstr "กำหนดให้รูปภาพนี้เป็นรูปภาพหลัก" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "การใช้งาน:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "ไปยังรูปภาพก่อนหน้า" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "กุญแจ_ย่อย" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "ไปยังรูปภาพถัดไป" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "เพิ่ม" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "รูป" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "เพิ่มรูปภาพให้กับกุญแจนี้" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "หมายเลขกุญแจ:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "เปลี่ยน_วลีรหัสผ่าน" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "ชื่อ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "ถอดรหัสลับแฟ้มและอีเมลที่ส่งถึงคุณ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "อีเมล:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "ลบ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "หมายเหตุ:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "หมดอายุ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "การใช้งาน:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "หมดอายุ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "ชนิด:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "ส่งออก" +msgid "Decrypt files and email sent to you." +msgstr "ถอดรหัสลับแฟ้มและอีเมลที่ส่งถึงคุณ" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "กุญแจ PGP ส่วนตัว" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "ไปยังรูปภาพถัดไป" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "เปลี่ยน_วลีรหัสผ่าน" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "ไปยังรูปภาพก่อนหน้า" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "เจ้าของ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "หมายเลขกุญแจ:" +msgid "Key Names and Signatures" +msgstr "ชื่อกุญแจและลายเซ็น" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "กุญแจหลัก" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "กำหนดให้รูปภาพนี้เป็นรูปภาพหลัก" +msgid "Sign" +msgstr "เซ็นกำกับ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "ชื่อและลายเซ็น" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "ลบ" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "ไม่เลย" +msgid "_Add Name" +msgstr "เ_พิ่มชื่อ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "ทับค่าความเ_ชื่อถือของเจ้าของ:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "เจ้าของ" +msgid "Revoke" +msgstr "เพิกถอน" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "กุญแจหลัก" +msgid "Names and Signatures" +msgstr "ชื่อและลายเซ็น" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "กุญแจ PGP ส่วนตัว" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "หมายเลขกุญแจ:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "ลบรูปภาพนี้ออกจากกุญแจนี้" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "เพิกถอน" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "ความแข็งแรง:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "เซ็นกำกับ" +msgid "Technical Details" +msgstr "รายละเอียดทางเทคนิค" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "ความแข็งแรง:" +msgid "Fingerprint" +msgstr "ลายนิ้วมือ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "เจ้าของกุญแจได้เพิกถอนกุญแจแล้ว จึงไม่สามารถใช้การได้อีก" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "หมดอายุ" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "เ_พิ่มชื่อ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "วันที่" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "ทับค่าความเ_ชื่อถือของเจ้าของ:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_ส่งออกกุญแจทั้งดอก:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "ชื่อ:" +msgid "Actions" +msgstr "การกระทำ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "วันที่:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "เพิ่ม" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "หมดอายุ" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "กุญแจ_ย่อย" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "ก้ำกึ่ง" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "ลายนิ้วมือ:" +msgid "Fully" +msgstr "เต็มที่" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "ระบุความเชื่อถือ:" +msgid "Ultimately" +msgstr "เต็มพิกัด" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "ความเชื่อถือของคุณต่อกุญแจนี้" +msgid "Encrypt files and email to the key's owner" +msgstr "เข้ารหัสลับแฟ้มและอีเมลที่ส่งถึงเจ้าของกุญแจ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "กุญแจ PGP สาธารณะ" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "ชื่อ_อื่น:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_ผู้ที่เซ็นรับรองกุญแจนี้:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "เข้ารหัสลับแฟ้มและอีเมลที่ส่งถึงเจ้าของกุญแจ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "ความเชื่อถือของคุณต่อกุญแจนี้" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "เต็มที่" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "ความเชื่อถือของคุณ คุณต้องระบุเองในแท็บ รายละเอียด" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "ฉันเชื่อถือลายเซ็นของ '%s' ในกุญแจอื่น" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "ถ้าคุณเชื่อว่าเจ้าของกุญแจนี้คือ '%s' จริง ก็ให้ เซ็นรับรอง กุญแจนี้:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "เซ็_นรับรองกุญแจนี้" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "" "ถ้าคุณไม่เชื่อถืออีกต่อไป ว่า '%s' เป็นเจ้าของกุญแจนี้ ก็ให้ เพิกถอน ลายเซ็นของคุณ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "ก้ำกึ่ง" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "กุญแจ PGP สาธารณะ" +msgid "_Revoke Signature" +msgstr "เ_พิกถอนลายเซ็น" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "ผู้ที่เซ็น_รับรองกุญแจนี้:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "แสดงลายเซ็นของผู้ที่ฉันเชื่อถือเ_ท่านั้น" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "เชื่อถือ" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "เต็มพิกัด" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "คุณ_เชื่อถือเจ้าของ:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "ความเชื่อถือของคุณ คุณต้องระบุเองในแท็บ รายละเอียด" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "ลายนิ้วมือ:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "แสดงลายเซ็นของผู้ที่ฉันเชื่อถือเ_ท่านั้น" +msgid "Dates:" +msgstr "วันที่:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "เ_พิกถอนลายเซ็น" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "ระบุความเชื่อถือ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "เ_ซ็นรับรองกุญแจนี้" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "คุณเ_ชื่อถือเจ้าของ:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1629,53 +1844,59 @@ msgstr "กุญแจย่อยที่ %d ของ %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "คำอธิบายเสริมสำหรับการเพิกถอน" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "เ_พิกถอน" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "เหตุผลสำหรับการเพิกถอนกุญแจ" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "เ_หตุผล:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "คำอธิบายเสริมสำหรับการเพิกถอน" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "เ_พิกถอน" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "คุณไม่มีกุญแจ PGP ส่วนตัวที่สามารถใช้เซ็นกำกับเอกสารหรือข้อความได้" +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "เ_ซ็นกำกับข้อความด้วยกุญแจ:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "คุณได้ตรวจสอบกุญแจนี้อย่างระมัดระวังแค่ไหน?" +msgid "Sign Key" +msgstr "เซ็นรับรองกุญแจ" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "ผู้อื่นจะมองเห็นลายเซ็นนี้อย่างไร:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "ด้วยการเซ็นรับรองนี้ คุณแสดงความเชื่อมั่นว่ากุญแจนี้เป็นของ:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "เซ็นรับรองกุญแจในนาม:" +msgid "Key Name" +msgstr "ชื่อกุญแจ" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"นิดหน่อย: หมายความว่า คุณได้ตรวจสอบยืนยันบ้างนิดหน่อย " -"ว่ากุญแจนี้เป็นของบุคคลที่อ้างว่าเป็นเจ้าของจริง ตัวอย่างเช่น " -"คุณสามารถอ่านลายนิ้วมือของกุญแจให้เจ้าของฟังทางโทรศัพท์" +msgid "How carefully have you checked this key?" +msgstr "คุณได้ตรวจสอบกุญแจนี้อย่างระมัดระวังแค่ไหน?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "ชื่อกุญแจ" +msgid "_Not at all" +msgstr "ไ_ม่ได้ตรวจเลย" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_นิดหน่อย" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_ระมัดระวังมาก" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1683,24 +1904,22 @@ "ไม่ได้ตรวจเลย: หมายความว่า คุณเชื่อว่ากุญแจเป็นของบุคคลที่อ้างว่าเป็นเจ้าของจริง " "แต่คุณไม่สามารถหรือไม่ได้ตรวจสอบยืนยัน" -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"นิดหน่อย: หมายความว่า คุณได้ตรวจสอบยืนยันบ้างนิดหน่อย " +"ว่ากุญแจนี้เป็นของบุคคลที่อ้างว่าเป็นเจ้าของจริง ตัวอย่างเช่น " +"คุณสามารถอ่านลายนิ้วมือของกุญแจให้เจ้าของฟังทางโทรศัพท์" + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." msgstr "ระมัดระวังมาก: เลือกตัวเลือกนี้ก็ต่อเมื่อคุณมั่นใจเต็มที่ว่ากุญแจนี้เป็นของจริงแท้แน่นอน" -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "ด้วยการเซ็นรับรองนี้ คุณแสดงความเชื่อมั่นว่ากุญแจนี้เป็นของ:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "ฉันสามารถเ_พิกถอนลายเซ็นนี้ได้ในภายหลัง" - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "เซ็นรับรองกุญแจ" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1712,471 +1931,352 @@ "คุณควรใช้อีเมลเพื่อตรวจสอบด้วยว่าที่อยู่อีเมลเป็นของเจ้าของจริง" #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_นิดหน่อย" +msgid "How others will see this signature:" +msgstr "ผู้อื่นจะมองเห็นลายเซ็นนี้อย่างไร:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "ไ_ม่ได้ตรวจเลย" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "ผู้_อื่นไม่สามารถมองเห็นลายเซ็นนี้ได้" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "ฉันสามารถเ_พิกถอนลายเซ็นนี้ได้ในภายหลัง" + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "เ_ซ็นกำกับ" +msgid "Sign key as:" +msgstr "เซ็นรับรองกุญแจในนาม:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_ผู้เซ็น:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_ระมัดระวังมาก" +msgid "_Sign" +msgstr "เ_ซ็นกำกับ" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "เ_ซ็นกำกับข้อความด้วยกุญแจ:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "กำลังส่งออกข้อมูล" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "กำลังดึงข้อมูล" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "กำลังนำเข้าข้อมูล" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "กำลังส่งข้อมูล" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "ไม่มี" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "ใบรับรองและกุญแจส่วนตัว" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "ใบรับรองส่วนตัว" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "ใบรับรอง" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "ไม่สามารถลบ" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "ใบรับรอง (ใช้รหัสแบบ DER)" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "ยืนยันหรือไม่ว่าต้องการลบใบรับรอง '%s'?" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "ใบรับรอง" -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "ยืนยันหรือไม่ว่าต้องการลบใบรับรองทั้ง %d รายการ?" +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "ใบรับรอง X.509 และกุญแจที่เกี่ยวข้อง" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "ยืนยันหรือไม่ว่าต้องการลบใบรับรองทั้ง %d ใบอย่างถาวร?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "ไม่สามารถสร้างกุญแจส่วนตัว" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "สร้าง" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "กุญแจส่วนตัว" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "ใช้ในการยื่นขอใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "สร้างกุญแจส่วนตัวใหม่" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "ป้ายชื่อ:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "เก็บไว้ที่:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "ฉันเข้าใจว่ากุญแจนี้จะถูกลบทิ้งอย่างถาวร" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "ไม่มีชื่อ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "ส่งออกใบรับรองไม่สำเร็จ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "ไม่สามารถลบ" -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "กำลังลบ" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_ส่งออก" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "ส่งออกใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "ลบกุญแจหรือใบรับรองนี้" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "ยื่นขอใ_บรับรอง" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "สร้างแฟ้มใบยื่นขอใบรับรองสำหรับกุญแจนี้" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "ไม่สามารถบันทึกใบยื่นขอใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "บันทึกใบยื่นขอใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "ใบยื่นขอใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "ใบยื่นขอในรูปของรหัส PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "ไม่สามารถสร้างใบยื่นขอใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "สร้างแฟ้มใบยื่นขอใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "ชื่อสามัญ (CN) ที่จะใช้ในใบยื่นขอใบรับรอง" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "ชื่อ (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "กุญแจส่วนตัวไม่มีชื่อ" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "เปลี่ยนวลีรหัสผ่าน" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_ยืนยันวลีรหัสผ่าน:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "วลีรหัสผ่านให_ม่:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "ยืนยันวลีรหัสผ่าน" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "วลีรหัสผ่านให_ม่:" +msgid "Con_firm Passphrase:" +msgstr "_ยืนยันวลีรหัสผ่าน:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "จัดการรหัสผ่านและกุญแจเข้ารหัสลับของคุณ" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "รหัสผ่านและกุญแจ" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "ต่อไป" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "เ_ลือกชนิดของรายการที่ต้องการสร้าง:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_ต่อไป" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "สร้างรายการใหม่ ..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "เลือกกุญแจ %d ดอก" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "ไม่สามารถนำเข้ากุญแจ" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "นำเข้าไม่สำเร็จ" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "นำเข้า" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "ข้อมูลที่จะนำเข้า:" -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "กุญแจนำเข้า" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "กำลังนำเข้ากุญแจ" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "นำเข้ากุญแจ" -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "ไม่รู้จักชนิดกุญแจ หรือรูปแบบข้อมูลไม่ถูกต้อง" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "กำลังนำเข้ากุญแจ" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "เ_ครือข่าย" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "ปิดโปรแกรมนี้" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "ใ_หม่..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "สร้างกุญแจหรือรายการใหม่" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_นำเข้า..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "นำเข้าจากแฟ้ม" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "นำเข้าจากคลิปบอร์ด" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "_หากุญแจในเครือข่าย..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "ค้นหากุญแจในเซิร์ฟเวอร์กุญแจ" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_ปรับและประกาศกุญแจ..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "ประกาศ และ/หรือ ปรับข้อมูลกุญแจของคุณกับค่าออนไลน์ให้ตรงกัน" - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_ชนิด" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "แสดงคอลัมน์ชนิดกุญแจ" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "วันห_มดอายุ" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "แสดงคอลัมน์วันหมดอายุกุญแจ" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "ความเชื่อ_ถือ" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "แสดงคอลัมน์ความเชื่อถือของเจ้าของ" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "สถานะ_มีผลใช้งาน" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "แสดงคอลัมน์สถานะมีผลใช้งาน" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "ตัวกรอง:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "ตัวเลือกสำหรับการใช้งานครั้งแรก:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "สร้างกุญแจใหม่ของคุณเอง:" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "นำเข้ากุญแจจากแฟ้ม:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "กุญแจ_ส่วนตัวของฉัน" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "กุญแจ_อื่นๆ" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "เพื่อจะเริ่มเข้ารหัสลับข้อมูล คุณต้องมีกุญแจเสียก่อน" - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_นำเข้า" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_รหัสผ่าน" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "ไม่สามารถส่งออกกุญแจ" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "มีผลใช้งาน" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "วันหมดอายุ" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "ปิดหน้าต่างนี้" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_ขยายทั้งหมด" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "ขยายรายการทั้งหมด" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "ยุ_บทั้งหมด" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "ยุบรายการทั้งหมด" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "กุญแจจากเครือข่าย" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "กุญแจจากเครือข่ายที่มี '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "เซิร์ฟเวอร์กุญแจ:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "กุญแจใช้ร่วมในเครือข่ายใกล้เคียง:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "หากุญแจจากเครือข่าย" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"หน้าต่างนี้จะค้นหากุญแจของผู้อื่นในอินเทอร์เน็ต " -"กุญแจเหล่านี้สามารถนำเข้ามาสู่พวงกุญแจในเครื่องของคุณได้" - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "แหล่งค้นหา:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_ค้นหา" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "ค้น_หากุญแจที่มี:" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "ไม่สามารถประกาศกุญแจไปที่เซิร์ฟเวอร์" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "ไม่สามารถดึงกุญแจจากเซิร์ฟเวอร์: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "มีกุญแจ %d ดอกถูกเลือกสำหรับปรับข้อมูล" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "กำลังปรับข้อมูลกุญแจ..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "ปรับกุญแจ" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"หน้าต่างนี้จะประกาศกุญแจในพวงกุญแจของคุณ เพื่อให้ผู้อื่นใช้งานได้ คุณจะได้รับการเปลี่ยนแปลงต่างๆ " -"ที่คนอื่นๆ ได้ทำนับตั้งแต่คุณรับกุญแจของพวกเขาครั้งสุดท้ายด้วย" - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"หน้าต่างนี้จะดึงการเปลี่ยนแปลงต่างๆ ที่คนอื่นๆ ได้ทำนับตั้งแต่คุณรับกุญแจของพวกเขาครั้งสุดท้าย " -"คุณไม่ได้เลือกเซิร์ฟเวอร์กุญแจสำหรับประกาศ ดังนั้น จะไม่มีการประกาศกุญแจของคุณให้ผู้อื่นใช้" - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "เซิร์ฟเวอร์กุญแ_จ" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_ปรับข้อมูล" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "รุ่นของโปรแกรมนี้" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "ผู้ร่วมสมทบ:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "เทพพิทักษ์ การุญบุญญานันท์ " - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "โฮมเพจโครงการ Seahorse" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "แ_ฟ้ม" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "แ_ก้ไข" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "มุ_มมอง" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_วิธีใช้" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "แฟ้มกุญแจทั้งหมด" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "ปรับแ_ต่ง" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "ข้อความที่ลากมาวาง" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "ข้อความในคลิปบอร์ด" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "ใ_หม่" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "ปรับแต่งโปรแกรมนี้" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "ปิดโปรแกรมนี้" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "เกี่ยวกับโปรแกรมนี้" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "ใ_หม่..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "เนื้อ_หา" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "สร้างกุญแจหรือรายการใหม่" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "แสดงวิธีใช้ Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "สร้างกุญแจหรือรายการใหม่" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "ส่งออกกุญแจสาธารณะ" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_นำเข้า..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "กำลังส่งออกกุญแจ" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "นำเข้าจากแฟ้ม" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "ไม่สามารถดึงข้อมูลจากเซิร์ฟเวอร์กุญแจ" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "นำเข้าจากคลิปบอร์ด" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "ทำสำเนากุญแจแล้ว" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "ตาม_พวงกุญแจ" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "ใช้แถบด้านข้างแสดงรายชื่อพวงกุญแจ" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "แสดง_ส่วนตัว" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "แสดงเฉพาะกุญแจ ใบรับรอง และรหัสผ่านส่วนตัว" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "แสดงที่เ_ชื่อถือ" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "แสดงเฉพาะกุญแจ ใบรับรอง และรหัสผ่านที่เชื่อถือ" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "แสดง_ทั้งหมด" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "แสดงกุญแจ ใบรับรอง และรหัสผ่านทั้งหมด" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "ตัวกรอง" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "กำลังดึงข้อมูลกุญแจ" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "ตัวเลือกสำหรับการใช้งานครั้งแรก:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s เป็นกุญแจส่วนตัว คุณยังคงต้องการดำเนินการต่อไปหรือไม่?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "สร้างกุญแจใหม่ของคุณเอง:" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "กำลังนำเข้ากุญแจจากเซิร์ฟเวอร์พวงกุญแจ" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "นำเข้ากุญแจจากแฟ้ม:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "แสดงคุณสมบัติ" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "เพื่อจะเริ่มเข้ารหัสลับข้อมูล คุณต้องมีกุญแจเสียก่อน" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_ลบ" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "ไม่สามารถล็อค" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "ไม่สามารถปลดล็อค" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "ลบรายการที่เลือก" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_ล็อค" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_ส่งออก..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "ปล_ดล็อค" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "ส่งออกลงในแฟ้ม" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "คุณ_สมบัติ" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "คัดลอกเข้าคลิปบอร์ด" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "ตั้งค่ากุญแจเชลล์นิรภัย..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "นำเข้ากุญแจที่เลือกเข้าในพวงกุญแจในเครื่อง" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "ส่งกุญแจสาธารณะสำหรับเชลล์นิรภัยไปยังเครื่องอื่น และเปิดใช้การเข้าระบบด้วยกุญแจดังกล่าว" #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2205,171 +2305,194 @@ msgid "Enter the new passphrase again: %s" msgstr "กรุณาป้อนวลีรหัสผ่านที่ตั้งซ้ำอีกครั้ง: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "ตั้งค่ากุญแจเชลล์นิรภัย..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "ส่งกุญแจสาธารณะสำหรับเชลล์นิรภัยไปยังเครื่องอื่น และเปิดใช้การเข้าระบบด้วยกุญแจดังกล่าว" +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "เชลล์นิรภัย" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "กุญแจสำหรับใช้เชื่อมต่อไปยังคอมพิวเตอร์เครื่องอื่นแบบนิรภัย" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "ยืนยันหรือไม่ว่าต้องการลบกุญแจเชลล์นิรภัย '%s'?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "ยืนยันหรือไม่ว่าต้องการลบกุญแจเชลล์นิรภัยทั้ง %d ดอก?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "ไม่สามารถลบกุญแจ" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "ยืนยันหรือไม่ว่าต้องการลบกุญแจเชลล์นิรภัยทั้ง %d ดอก?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "กุญแจ SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "กุญแจลับของ SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "กุญแจสาธารณะของ SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "ไม่มีแฟ้มกุญแจสาธารณะสำหรับกุญแจนี้" -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "กุญแจเชลล์นิรภัย" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "ใช้สำหรับเข้าใช้คอมพิวเตอร์อื่น (เช่น ผ่านเทอร์มินัล)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "ไม่สามารถสร้างกุญแจเชลล์นิรภัย" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "กำลังสร้างกุญแจเชลล์นิรภัย" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "ใช้ที่อยู่อีเมลของคุณ และสิ่งเตือนอย่างอื่นที่จำเป็น สำหรับระบุวัตถุประสงค์ของกุญแจนี้" - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"กุญแจเชลล์นิรภัย (SSH) จะช่วยให้คุณเชื่อมต่อกับคอมพิวเตอร์ต่างๆ ที่คุณเชื่อใจได้อย่างนิรภัยผ่าน SSH " -"โดยไม่ต้องป้อนรหัสผ่านที่ต่างกันสำหรับแต่ละเครื่อง" - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"ถ้ามีคอมพิวเตอร์ที่คุณต้องการใช้กุญแจนี้ด้วยอยู่แล้ว คุณสามารถตั้งค่าเครื่องนั้นให้รู้จักกุญแจของคุณได้เลย" - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "กุญแจเชลล์นิรภัยใหม่" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "สร้างกุญแจเ_ท่านั้น" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "_สร้างและตั้งค่า" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "สร้างกุญแจเ_ท่านั้น" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "กุญแจเชลล์นิรภัย (SSH) จะช่วยให้คุณเชื่อมต่อกับคอมพิวเตอร์ต่างๆ ได้อย่างนิรภัย" + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "ที่อยู่อีเมลของคุณ หรือสิ่งเตือนอย่างอื่นสำหรับระบุวัตถุประสงค์ของกุญแจนี้" #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "คำ_บรรยายกุญแจ:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "ถ้ามีคอมพิวเตอร์ที่คุณต้องการใช้กุญแจนี้ด้วย คุณสามารถตั้งค่าเครื่องนั้นให้รู้จักกุญแจของคุณได้เลย" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(กุญแจเชลล์นิรภัยที่อ่านไม่ได้)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "กุญแจ SSH ส่วนตัว" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "กุญแจ SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "ไม่สามารถเปลี่ยนชื่อกุญแจ" -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "ไม่สามารถเปลี่ยนการอนุญาตสิทธิ์ของกุญแจ" -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "ไม่สามารถเปลี่ยนวลีรหัสผ่านของกุญแจ" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "อัลกอริทึม:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "หมายเลขประจำกุญแจ:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "ตำแหน่ง:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "ชื่อ:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "ความแข็งแรง:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "ใช้เชื่อมต่อไปยังคอมพิวเตอร์เครื่องอื่น" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" -msgstr "ความเชื่อมั่น" +msgstr "ความเชื่อถือ" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "เจ้าของกุญแจนี้ได้รับ_อนุญาตให้เชื่อมต่อกับคอมพิวเตอร์นี้" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "ตัวเลือกนี้ใช้ได้กับบัญชี '%s' เท่านั้น" +msgid "This only applies to the %s account." +msgstr "ตัวเลือกนี้ใช้ได้กับบัญชี %s เท่านั้น" #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_ส่งออกกุญแจทั้งดอก" +msgid "Algorithm:" +msgstr "อัลกอริทึม:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "เจ้าของกุญแจนี้ได้รับ_อนุญาตให้เชื่อมต่อกับคอมพิวเตอร์นี้" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "ความแข็งแรง:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "ตำแหน่ง:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "ใช้เชื่อมต่อไปยังคอมพิวเตอร์เครื่องอื่น" +msgid "E_xport Complete Key" +msgstr "_ส่งออกกุญแจทั้งดอก" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "คำสั่ง SSH จบการทำงานกลางคัน" -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "คำสั่ง SSH ล้มเหลว" -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "รหัสผ่านของเครื่องฝั่งโน้น" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "กรุณาป้อนวลีรหัสผ่านสำหรับกุญแจ" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "วลีรหัสผ่านสำหรับกุญแจเชลล์นิรภัยใหม่" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "กำลังนำเข้ากุญแจ: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "กำลังนำเข้ากุญแจ กรุณาป้อนวลีรหัสผ่าน" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "กุญแจ OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "ไม่มีแฟ้มกุญแจส่วนตัวสำหรับกุญแจนี้" @@ -2382,14 +2505,10 @@ msgstr "กำลังตั้งค่ากุญแจเชลล์นิรภัย..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "เช่น: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "ตั้งค่าคอมพิวเตอร์สำหรับการเชื่อมต่อ SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2397,6 +2516,10 @@ "ในการใช้กุญแจเชลล์นิรภัยกับคอมพิวเตอร์เครื่องอื่นที่ใช้ SSH นั้น " "คุณต้องมีบัญชีสำหรับเข้าระบบในเครื่องนั้นอยู่ก่อนแล้ว" +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "เช่น: fileserver.example.com:port" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "ชื่อ_คอมพิวเตอร์:" @@ -2409,15 +2532,190 @@ msgid "_Set Up" msgstr "_ตั้งค่า" +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "กำลังลบรายการ" + +#~ msgid "Passwords: %s" +#~ msgstr "รหัสผ่าน: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "รหัสผ่าน: %s" + +#~ msgid "Couldn't lock keyring" +#~ msgstr "ไม่สามารถล็อคพวงกุญแจ" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "ล็อคพวงกุญแจเก็บรหัสผ่าน โดยต้องใช้รหัสผ่านหลักในการปลดล็อค" + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "ปลดล็อคพวงกุญแจเก็บรหัสผ่านโดยใช้รหัสผ่านหลัก เพื่อให้สามารถใช้งานได้" + +#~ msgid "Couldn't delete keyring" +#~ msgstr "ไม่สามารถลบพวงกุญแจ" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "ไม่ได้รับอนุญาตให้เข้าใช้พวงกุญแจ" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "ดีมอน gnome-keyring ไม่ได้ทำงานอยู่" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "พวงกุญแจถูกปลดล็อคไปแล้ว" + +#~ msgid "No such key ring exists" +#~ msgstr "ไม่มีพวงกุญแจที่ว่านี้อยู่" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "ไม่สามารถติดต่อสื่อสารกับดีมอนพวงกุญแจ" + +#~ msgid "The item already exists" +#~ msgstr "มีรายการนี้อยู่ก่อนแล้ว" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "เกิดข้อผิดพลาดภายในขณะเข้าใช้ gnome-keyring" + +#~ msgid "Archive files" +#~ msgstr "แฟ้มจัดเก็บ" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "มีแฟ้มชื่อนี้อยู่ก่อนแล้ว\n" +#~ "\n" +#~ "คุณต้องการเขียนทับด้วยแฟ้มใหม่หรือไม่?" + +#~ msgid "_Replace" +#~ msgstr "เขียน_ทับ" + +#~ msgid "_Sign Key..." +#~ msgstr "เ_ซ็นรับรองกุญแจ..." + +#~ msgid "Sign public key" +#~ msgstr "เซ็นรับรองกุญแจสาธารณะ" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "ยืนยันหรือไม่ว่าต้องการลบกุญแจและหมายเลขประจำตัวทั้ง %d รายการอย่างถาวร?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "ไม่สามารถลบกุญแจสาธารณะ" + +#~ msgid "Algorithms here" +#~ msgstr "อัลกอริทึม" + +#~ msgid "New PGP Key" +#~ msgstr "กุญแจ PGP ใหม่" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "ไม่สามารถส่งออกกุญแจไปยัง \"%s\"" + +#~ msgid "Export Complete Key" +#~ msgstr "ส่งออกกุญแจทั้งหมด" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "ยืนยันหรือไม่ว่าต้องการลบใบรับรอง '%s'?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "ยืนยันหรือไม่ว่าต้องการลบใบรับรองทั้ง %d รายการ?" + +#~ msgid "Deleting" +#~ msgstr "กำลังลบ" + +#~ msgid "Create New ..." +#~ msgstr "สร้างรายการใหม่ ..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "เลือกกุญแจ %d ดอก" + +#~ msgid "Importing keys" +#~ msgstr "กำลังนำเข้ากุญแจ" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "ไม่รู้จักชนิดกุญแจ หรือรูปแบบข้อมูลไม่ถูกต้อง" + +#~ msgid "Importing Keys" +#~ msgstr "กำลังนำเข้ากุญแจ" + +#~ msgid "T_ypes" +#~ msgstr "_ชนิด" + +#~ msgid "Show type column" +#~ msgstr "แสดงคอลัมน์ชนิดกุญแจ" + +#~ msgid "_Expiry" +#~ msgstr "วันห_มดอายุ" + +#~ msgid "Show expiry column" +#~ msgstr "แสดงคอลัมน์วันหมดอายุกุญแจ" + +#~ msgid "_Trust" +#~ msgstr "ความเชื่อ_ถือ" + +#~ msgid "Show owner trust column" +#~ msgstr "แสดงคอลัมน์ความเชื่อถือของเจ้าของ" + +#~ msgid "_Validity" +#~ msgstr "สถานะ_มีผลใช้งาน" + +#~ msgid "Show validity column" +#~ msgstr "แสดงคอลัมน์สถานะมีผลใช้งาน" + +#~ msgid "Other _Keys" +#~ msgstr "กุญแจ_อื่นๆ" + +#~ msgid "Validity" +#~ msgstr "มีผลใช้งาน" + +#~ msgid "Expiration Date" +#~ msgstr "วันหมดอายุ" + +#~ msgid "_Expand All" +#~ msgstr "_ขยายทั้งหมด" + +#~ msgid "Expand all listings" +#~ msgstr "ขยายรายการทั้งหมด" + +#~ msgid "_Collapse All" +#~ msgstr "ยุ_บทั้งหมด" + +#~ msgid "Collapse all listings" +#~ msgstr "ยุบรายการทั้งหมด" + +#~ msgid "Export public key" +#~ msgstr "ส่งออกกุญแจสาธารณะ" + +#~ msgid "Exporting keys" +#~ msgstr "กำลังส่งออกกุญแจ" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "ไม่สามารถดึงข้อมูลจากเซิร์ฟเวอร์กุญแจ" + +#~ msgid "Retrieving keys" +#~ msgstr "กำลังดึงข้อมูลกุญแจ" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s เป็นกุญแจส่วนตัว คุณยังคงต้องการดำเนินการต่อไปหรือไม่?" + +#~ msgid "Couldn't delete key" +#~ msgstr "ไม่สามารถลบกุญแจ" + +#~ msgid "_Key Description:" +#~ msgstr "คำ_บรรยายกุญแจ:" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "ไม่ต้องเรียกทำงาน seahorse-daemon แบบดีมอน" #~ msgid "couldn't fork process" #~ msgstr "ไม่สามารถ fork โพรเซสได้" -#~ msgid "couldn't create new process group" -#~ msgstr "ไม่สามารถสร้างกลุ่มโพรเซสใหม่ได้" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "ดีมอนเข้ารหัสลับ (Seahorse)" @@ -2469,9 +2767,6 @@ #~ msgid "Bad Signature" #~ msgstr "ลายเซ็นเสีย" -#~ msgid "Couldn't verify signature." -#~ msgstr "ไม่สามารถตรวจสอบยืนยันลายเซ็น" - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "ผู้เซ็นผิดพลาดหรือไม่รู้จัก: %s" @@ -2490,15 +2785,6 @@ #~ msgid "Invalid key type for decryption: %s" #~ msgstr "ชนิดกุญแจไม่ถูกต้องสำหรับการถอดรหัสลับ: %s" -#~ msgid "Please set clearuri" -#~ msgstr "กรุณากำหนด clearuri" - -#~ msgid "Please set crypturi" -#~ msgstr "กรุณากำหนด crypturi" - -#~ msgid "Error opening clearuri" -#~ msgstr "เกิดข้อผิดพลาดขณะเปิด clearuri" - #~ msgid "No signer specified" #~ msgstr "ไม่ได้ระบุผู้เซ็น" @@ -2649,9 +2935,6 @@ #~ msgid "Web Password" #~ msgstr "รหัสผ่านเว็บ" -#~ msgid "Network Password" -#~ msgstr "รหัสผ่านเครือข่าย" - #~ msgid "Couldn't set application access." #~ msgstr "ไม่สามารถกำหนดการเข้าถึงของโปรแกรมประยุกต์" @@ -2736,9 +3019,6 @@ #~ msgid "Specify file containing saved configuration" #~ msgstr "ระบุแฟ้มที่บันทึกค่าตั้งไว้" -#~ msgid "FILE" -#~ msgstr "FILE" - #~ msgid "Specify session management ID" #~ msgstr "ระบุหมายเลขการจัดการวาระ" @@ -2766,12 +3046,6 @@ #~ msgid "Symmetric Key" #~ msgstr "กุญแจสมมาตร" -#~ msgid "Public Key" -#~ msgstr "กุญแจสาธารณะ" - -#~ msgid "Private Key" -#~ msgstr "กุญแจส่วนตัว" - #~ msgid "Credentials" #~ msgstr "รหัสลับ" @@ -2796,9 +3070,6 @@ #~ msgid "Loading Keys..." #~ msgstr "กำลังโหลดกุญแจ..." -#~ msgid "Searching for keys..." -#~ msgstr "กำลังค้นหากุญแจ..." - #~ msgid "Uploading keys..." #~ msgstr "กำลังอัปโหลดกุญแจ..." @@ -2823,12 +3094,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "กำลังปรับข้อมูลกุญแจ" -#~ msgid "Encryption Key Manager" -#~ msgstr "โปรแกรมจัดการกุญแจเข้ารหัสลับ" - -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "ผิดพลาด" @@ -2838,9 +3103,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "กุญแจสาธารณะสำหรับเชลล์นิรภัย" -#~ msgid "Secure Shell key" -#~ msgstr "กุญแจเชลล์นิรภัย" - #~ msgid "Passphrase:" #~ msgstr "วลีรหัสผ่าน:" @@ -2886,41 +3148,9 @@ #~ "to proceed?" #~ msgstr "กุญแจที่ลบอย่างน้อยหนึ่งดอกเป็นกุญแจส่วนตัว คุณยังคงต้องการดำเนินการต่อไปหรือไม่?" -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" - -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" - #~ msgid "Create a PGP Key" #~ msgstr "สร้างกุญแจ PGP" -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginal\n" -#~ "Full\n" -#~ "Ultimate" -#~ msgstr "" -#~ "ไม่ทราบ\n" -#~ "ไม่เลย\n" -#~ "ก้ำกึ่ง\n" -#~ "เต็มที่\n" -#~ "เต็มพิกัด" - -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginally\n" -#~ "Fully\n" -#~ "Ultimately" -#~ msgstr "" -#~ "ไม่ทราบ\n" -#~ "ไม่เลย\n" -#~ "ก้ำกึ่ง\n" -#~ "เต็มที่\n" -#~ "เต็มพิกัด" - #~ msgid "_Quit" #~ msgstr "_ออก" @@ -2939,18 +3169,12 @@ #~ msgid "_About" #~ msgstr "เ_กี่ยวกับ" -#~ msgid "P_roperties" -#~ msgstr "คุณ_สมบัติ" - #~ msgid "_Copy" #~ msgstr "_คัดลอก" #~ msgid "Removing item" #~ msgstr "กำลังลบรายการ" -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "ปลดล็อคโดยอัตโนมัติเมื่อผู้ใช้เข้าระบบ" - #~ msgid "Couldn't get default password keyring" #~ msgstr "ไม่สามารถอ่านพวงกุญแจปริยายสำหรับเก็บรหัสผ่าน" @@ -3002,9 +3226,6 @@ #~ msgid "Expiry for Subkey %d of %s" #~ msgstr "วันหมดอายุสำหรับกุญแจย่อย %d ของ %s" -#~ msgid "Create a new personal key" -#~ msgstr "สร้างกุญแจส่วนตัวใหม่" - #~ msgid "Import keys into your key ring from a file" #~ msgstr "นำเข้ากุญแจจากแฟ้มเข้าในพวงกุญแจของคุณ" @@ -3057,9 +3278,6 @@ #~ msgid "Back up Key Rings to Archive" #~ msgstr "สำรองพวงกุญแจลงในแฟ้มจัดเก็บ" -#~ msgid "seahorse" -#~ msgstr "seahorse" - #~ msgid "_Back up Key Rings..." #~ msgstr "สำ_รองพวงกุญแจ..." @@ -3110,9 +3328,6 @@ #~ msgid "Packaging:" #~ msgstr "การทำแพกเกจ:" -#~ msgid "encrypted-package" -#~ msgstr "encrypted-package" - #~ msgid "Please enter a passphrase to use." #~ msgstr "กรุณาป้อนวลีรหัสผ่านที่จะใช้" @@ -3310,9 +3525,6 @@ #~ msgid "Couldn't set permissions on backup file." #~ msgstr "ไม่สามารถกำหนดสิทธิ์ให้กับแฟ้มสำรอง" -#~ msgid "Clipboard Text Encryption" -#~ msgstr "การเข้ารหัสลับข้อความในคลิปบอร์ด" - #~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." #~ msgstr "" #~ "เข้ารหัสลับ, ถอดรหัสลับ, หรือเซ็นกำกับข้อความในคลิปบอร์ด (โดยใช้การเข้ารหัสลับแบบ PGP)" @@ -3323,9 +3535,6 @@ #~ msgid "_Preferences" #~ msgstr "_ปรับแต่ง" -#~ msgid "seahorse-applet" -#~ msgstr "seahorse-applet" - #~ msgid "Use PGP/GPG to encrypt/decrypt/sign/verify/import the clipboard." #~ msgstr "" #~ "ใช้ PGP/GPG ในการ เข้ารหัสลับ/ถอดรหัสลับ/เซ็นกำกับ/ตรวจสอบยืนยัน/นำเข้า " @@ -3355,9 +3564,6 @@ #~ msgid "The clipboard could not be Signed." #~ msgstr "ไม่สามารถเซ็นกำกับข้อความในคลิปบอร์ดได้" -#~ msgid "Import Failed" -#~ msgstr "นำเข้าไม่สำเร็จ" - #~ msgid "Keys were found but not imported." #~ msgstr "พบกุญแจแต่นำเข้าไม่สำเร็จ" @@ -3439,9 +3645,6 @@ #~ msgid "No encrypted or signed text is selected." #~ msgstr "ไม่ได้เลือกข้อความที่เข้ารหัสลับหรือเซ็นกำกับไว้" -#~ msgid "Decrypted text" -#~ msgstr "ข้อความถอดรหัสลับแล้ว" - #~ msgid "Verified text" #~ msgstr "ข้อความตรวจสอบยืนยันแล้ว" @@ -3528,9 +3731,6 @@ #~ msgid "Choose Recipients" #~ msgstr "เลือกผู้รับ" -#~ msgid "Couldn't load keys" -#~ msgstr "ไม่สามารถโหลดกุญแจ" - #~ msgid "Choose Encrypted File Name for '%s'" #~ msgstr "ตั้งชื่อแฟ้มเข้ารหัสลับสำหรับ '%s'" @@ -3585,60 +3785,6 @@ #~ msgid "Couldn't verify file: %s" #~ msgstr "ไม่สามารถตรวจสอบยืนยันแฟ้ม: %s" -#~ msgid "Ace (.ace)" -#~ msgstr "Ace (.ace)" - -#~ msgid "Ar (.ar)" -#~ msgstr "Ar (.ar)" - -#~ msgid "Arj (.arj)" -#~ msgstr "Arj (.arj)" - -#~ msgid "Ear (.ear)" -#~ msgstr "Ear (.ear)" - -#~ msgid "Self-extracting zip (.exe)" -#~ msgstr "Zip ที่แตกตัวเอง (.exe)" - -#~ msgid "Jar (.jar)" -#~ msgstr "Jar (.jar)" - -#~ msgid "Lha (.lzh)" -#~ msgstr "Lha (.lzh)" - -#~ msgid "Rar (.rar)" -#~ msgstr "Rar (.rar)" - -#~ msgid "Tar uncompressed (.tar)" -#~ msgstr "Tar ที่ไม่บีบอัด (.tar)" - -#~ msgid "Tar compressed with bzip (.tar.bz)" -#~ msgstr "Tar ที่บีบอัดด้วย bzip (.tar.bz)" - -#~ msgid "Tar compressed with bzip2 (.tar.bz2)" -#~ msgstr "Tar ที่บีบอัดด้วย bzip2 (.tar.bz2)" - -#~ msgid "Tar compressed with gzip (.tar.gz)" -#~ msgstr "Tar ที่บีบอัดด้วย gzip (.tar.gz)" - -#~ msgid "Tar compressed with lzop (.tar.lzo)" -#~ msgstr "Tar ที่บีบอัดด้วย lzop (.tar.lzo)" - -#~ msgid "Tar compressed with compress (.tar.Z)" -#~ msgstr "Tar ที่บีบอัดด้วย compress (.tar.Z)" - -#~ msgid "War (.war)" -#~ msgstr "War (.war)" - -#~ msgid "Zip (.zip)" -#~ msgstr "Zip (.zip)" - -#~ msgid "Zoo (.zoo)" -#~ msgstr "Zoo (.zoo)" - -#~ msgid "7-Zip (.7z)" -#~ msgstr "7-Zip (.7z)" - #~ msgid "You have selected %d file " #~ msgid_plural "You have selected %d files " #~ msgstr[0] "คุณได้เลือกแฟ้ม %d แฟ้ม " @@ -3796,12 +3942,6 @@ #~ msgid "[server]" #~ msgstr "[เซิร์ฟเวอร์]" -#~ msgid "gtk-apply" -#~ msgstr "gtk-apply" - -#~ msgid "gtk-clear" -#~ msgstr "gtk-clear" - #~ msgid "Cursor Position" #~ msgstr "ตำแหน่งเคอร์เซอร์" diff -Nru seahorse-3.2.2/po/tr.po seahorse-3.6.3/po/tr.po --- seahorse-3.2.2/po/tr.po 2011-09-14 17:14:58.000000000 +0200 +++ seahorse-3.6.3/po/tr.po 2012-09-18 13:10:35.000000000 +0200 @@ -2,434 +2,192 @@ # ------------------------------------------------------- # Copyright (C) 2000, 2004, 2007, 2008 Free Software Foundation, Inc. # +# # Fatih Demir , 2000. # Sertaç Ö. Yıldız , 2007. # Baris Cicek , 2004, 2007, 2008, 2009. -# Muhammet Kara , 2011. +# Muhammet Kara , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=seahorse&component=general\n" -"POT-Creation-Date: 2011-01-19 20:34+0000\n" -"PO-Revision-Date: 2011-04-27 00:26+0300\n" -"Last-Translator: Muhammet Kara \n" -"Language-Team: Turkish \n" +"product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-07-31 00:00+0000\n" +"PO-Revision-Date: 2012-08-12 12:12+0300\n" +"Last-Translator: Muhammet Kara \n" +"Language-Team: Türkçe \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 1.2\n" -#: ../daemon/seahorse-daemon.c:64 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "Seahorse-daemon'u servis olarak çalıştır" - -#: ../daemon/seahorse-daemon.c:94 -msgid "couldn't fork process" -msgstr "süreç çatallanamadı" - -#: ../daemon/seahorse-daemon.c:100 -msgid "couldn't create new process group" -msgstr "yeni süreç grubu oluşturulamadı" - -#: ../daemon/seahorse-daemon.c:250 -msgid "Encryption Daemon (Seahorse)" -msgstr "Şifreleme Servisi (Seahorse)" - -#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "Geçersiz veya tanınmayan anahtar türü: %s" - -#: ../daemon/seahorse-service.c:234 -#, c-format -#| msgid "This key expired on: %s" -msgid "This keytype is not supported: %s" -msgstr "Bu anahtar türü desteklenmiyor: %s" - -#: ../daemon/seahorse-service.c:241 -#, c-format -msgid "Support for this feature was not enabled at build time" -msgstr "Bu özellik için destek, inşa zamanında etkinleştirilmemiş" - -#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180 -#: ../daemon/seahorse-service-keyset.c:223 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "Geçersiz veya tanınmayan anahtar: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:204 -#, c-format -msgid "Signed by expired on %s." -msgstr "" -" tarafından imzalanmış, %s tarihinde süresi dolmuş." - -#: ../daemon/seahorse-service-crypto.c:205 -msgid "Invalid Signature" -msgstr "Geçersiz İmza" - -#: ../daemon/seahorse-service-crypto.c:211 -#, c-format -msgid "Signed by on %s Expired." -msgstr "" -" tarafından imzalanmış, %s tarihinde Süresi Dolmuş." - -#: ../daemon/seahorse-service-crypto.c:212 -msgid "Expired Signature" -msgstr "Süresi Dolmuş İmza" - -#: ../daemon/seahorse-service-crypto.c:218 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "" -" tarafından imzalanmış, %s tarihinde Feshedilmiş." - -#: ../daemon/seahorse-service-crypto.c:219 -msgid "Revoked Signature" -msgstr "Feshedilmiş İmza" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:225 -#, c-format -msgid "Signed by on %s." -msgstr " tarafından %s tarihinde imzalanmış." - -#: ../daemon/seahorse-service-crypto.c:226 -msgid "Good Signature" -msgstr "İyi İmza" - -#: ../daemon/seahorse-service-crypto.c:231 -msgid "Signing key not in keyring." -msgstr "İmzalayan anahtar anahtarlıkta değil." - -#: ../daemon/seahorse-service-crypto.c:232 -msgid "Unknown Signature" -msgstr "Bilinmeyen İmza" - -#: ../daemon/seahorse-service-crypto.c:236 -msgid "Bad or forged signature. The signed data was modified." -msgstr "Kötü veya hileli imza. İmzalanan veri değiştirilmiş." - -#: ../daemon/seahorse-service-crypto.c:237 -msgid "Bad Signature" -msgstr "Kötü İmza" - -#: ../daemon/seahorse-service-crypto.c:245 -msgid "Couldn't verify signature." -msgstr "İmza doğrulanamadı." - -#: ../daemon/seahorse-service-crypto.c:317 -#: ../daemon/seahorse-service-crypto.c:646 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "Geçersiz veya tanınmayan imzalayan: %s" - -#: ../daemon/seahorse-service-crypto.c:324 -#: ../daemon/seahorse-service-crypto.c:653 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "Anahtar imzalama için geçersiz: %s" - -#: ../daemon/seahorse-service-crypto.c:335 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "Geçersiz veya tanınmayan alıcı: %s" - -#: ../daemon/seahorse-service-crypto.c:343 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "Anahtar şifreleme için geçerli bir alıcı değil: %s" - -#: ../daemon/seahorse-service-crypto.c:352 -#, c-format -msgid "No recipients specified" -msgstr "Alıcı belirtilmemiş" - -#: ../daemon/seahorse-service-crypto.c:434 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "Şifre çözme için geçersiz anahtar türü: %s" - -#: ../daemon/seahorse-service-crypto.c:548 -#: ../daemon/seahorse-service-crypto.c:746 -#, c-format -msgid "Please set clearuri" -msgstr "Lütfen clearuri'i ayarlayın" - -#: ../daemon/seahorse-service-crypto.c:554 -#: ../daemon/seahorse-service-crypto.c:752 -#, c-format -msgid "Please set crypturi" -msgstr "Lütfen crypturi'i ayarlayın" - -#: ../daemon/seahorse-service-crypto.c:564 -#, c-format -msgid "Error opening clearuri" -msgstr "Clearuri açılırken hata" - -#: ../daemon/seahorse-service-crypto.c:641 -#, c-format -msgid "No signer specified" -msgstr "İmzalayan belirtilmemiş" - -#: ../daemon/seahorse-service-crypto.c:830 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "Doğrulama için geçersiz anahtar türü: %s" - -#: ../daemon/seahorse-service-keyset.c:273 -#, c-format -msgid "Invalid key id: %s" -msgstr "Geçersiz anahtar ID'si: %s" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"Uzaktaki PGP anahtarlarını aramak için anahtar sunucu URI listesi. Sonraki " -"sürümlerde görünen ismi de sonuna boşluktan sonra eklenebilecek." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "Anahtarları Otomatik Al" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "Anahtarları Kendiliğinden Eş Zamanlandır" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "" -"Anahtar yöneticisinde son kullanım sütununun gösterilmesini kontrol eder." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "Anahtar yöneticisinde güven sütununun gösterilmesini kontrol eder." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "Anahtar yöneticisinde tür sütununun gösterilmesini kontrol eder." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "" -"Anahtar yöneticisinde geçerlilik sütununun gösterilmesini kontrol eder." - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "DNS-SD paylaşımını etkinleştir" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"DNS-SD (Apple Bonjour) anahtar paylaşımını etkinleştirir. seahorse-daemon " -"çalışıyor ve HKP ve DNS-SD desteği ile derlenmiş olmalıdır." - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "Öntanımlı Anahtarın ID'si" - -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" -"Eğer seçiliyse, seahorse ile şifrelenen dosyalar ASCII zırhı ile kodlanacak." +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "Parola Anahtarlığı Ekle" -#: ../data/seahorse.schemas.in.h:12 +#: ../gkr/seahorse-add-keyring.xml.h:2 msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." msgstr "" -"Eğer seçiliyse, öntanımlı anahtar her zaman şifreli alıcılar listesine " -"eklenir." - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "Anahtar sunucusunda yapılan son arama" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "Kullanılan son anahtar sunucuları" - -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "İmzalama için kullanılan son anahtar." - -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "PGP Anahtar sunucuları" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "Anahtarları bu anahtar sunucusuna gönder." - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "Anahtar yöneticisinde son kullanım sütununu göster" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "Anahtar yöneticisinde güven sütununu göster" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "Anahtar yöneticisinde tür sütununu göster" +"Lütfen yeni anahtarlık için bir isim seçin. Size bir kilit açma parolası " +"sorulacak." -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "Anahtar yöneticisinde geçerlilik sütununu göster" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Yeni Anahtarlık Adı:" -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"Alıcılar penceresinin sıralama sütununu belirtin. Sütunlar: 'name' (isim) ve " -"'id' olabilir. Ters yönde sıralama için başına '-' koyun." +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "Sunucu makinesinin adı veya adresi." -#: ../data/seahorse.schemas.in.h:23 -msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." -msgstr "" -"Seahorse anahtar yöneticisinin sıralama sütununu belirtin. Sütunlar: " -"'name' (isim), 'id', 'validity' (geçerlilik), 'expires' (son kullanım), " -"'trust' (güven) ve 'type' (tür) olabilir. Ters yönde sıralama için başına " -"'-' koyun." +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Yeni parola anahtarlığı" -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "İmzalama için kullanılan son gizli anahtarın ID'si." +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Uygulama ve ağ parolalarını saklamak için kullanılır" -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "Alıcıları sıralama sütunu" +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Yeni parola..." -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "Seahorse anahtarlarını sıralama sütunu" +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Parolayı ya da gizliyi güvenle kaydet." -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" -"PGP anahtarlarının gönderileceği anahtar sunucusu. Boş ise anahtarlar bir " -"sunucuya gönderilmez." +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "Parola Anahtarlığı" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "" -"Son anahtar sunucu araması burada (boş ise tüm sunucularda) yapılmıştı." +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Saklı Parola" -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "Bir anahtar sunucusunda yapılan son arama." +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Öntanımlı anahtarlık atanamadı" -#: ../data/seahorse.schemas.in.h:30 -msgid "" -"This specifies the default key to use for certain operations, mainly signing." -msgstr "" -"Belirli işlemler (genelde imzalamak) için kullanılacak öntanımlı anahtarı " -"belirler." +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Anahtarlık paroalsı değiştirilemedi" -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "" -"Anahtarların anahtar sunucularından otomatik olarak alınıp alınmayacağı." +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "Ö_ntanımlı ata" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." msgstr "" -"Değişiklik yapılmış anahtarların öntanımlı sunucu ile kendiliğinden " -"güncellenip güncellenmeyeceği." - -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "Herzaman öntanımlı anahtar ile imzalanması" - -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "ASCII zırhını kullanılması" - -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "Parola Anahtarlığı Ekle" - -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Yeni Anahtarlık Adı:" +"Uygulamalar genellikle yeni parolalarını öntanımlı anahtarlıkta saklar." -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"Lütfen yeni anahtarlık için bir isim seçin. Size bir kilit açma parolası " -"sorulacak." +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "_Parola Değiştir" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "Sunucu makinesinin adı veya adresi." +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Parola depolama anahtarlığının kilidini açma parolasını değiştir" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73 -msgid "Couldn't add keyring" -msgstr "Anahtarlık eklenemedi" +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Öge eklenemedi" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Parola Ekle" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:15 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Açıklama:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_Anahtarlık:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Parola:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Parolayı _Göster" -#: ../gkr/seahorse-gkr-item.c:470 -msgid "Web Password" -msgstr "Web Parolası" - -#: ../gkr/seahorse-gkr-item.c:472 -msgid "Network Password" -msgstr "Ağ Parolası" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Anahtarlık:" -#: ../gkr/seahorse-gkr-item.c:474 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "Parola" +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Anahtarlık eklenemedi" -#: ../gkr/seahorse-gkr-item-commands.c:78 +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Parolalar" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Saklanan kişisel parolalar, kimlik bilgileri ve gizli anahtarlar" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Şunun Anlık İleti hesabı parolası: " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Parolayı ya da gizli (soru/anahtar)" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Ağ parolası" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Saklanan not" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Anahtarlık parolası" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Şifreleme anahtarı parolası" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Anahtar deposu parolası" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome parolası" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Gnome Çevrimiçi Hesaplar parolası" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy parolası" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Anlık mesajlaşma parolası" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Ağ Yöneticisi gizli (sorusu/anahtarı)" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "'%s' parolasını silmek istediğinize emin misiniz?" -#: ../gkr/seahorse-gkr-item-commands.c:81 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -459,473 +217,269 @@ msgid "Network Credentials" msgstr "Ağ Kimliği" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "Parola" + +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Parola değiştirilemedi." -#: ../gkr/seahorse-gkr-item-properties.c:350 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 +msgid "Updating password" +msgstr "Parola güncelleniyor" + +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Açıklama değiştirilemedi." -#: ../gkr/seahorse-gkr-item-properties.c:654 -msgid "Couldn't set application access." -msgstr "Uygulama erişimi atanamadı." - #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Parola:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "Yol:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "İzinler:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Anahtar Özellikleri" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Teknik Ayrıntılar:" +msgid "Use:" +msgstr "Kullanım:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "Uygulamalar" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Tür:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Ayrıntılar" +msgid "Server:" +msgstr "Sunucu:" #: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Anahtar" +msgid "Login:" +msgstr "Giriş:" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Anahtar Özellikleri" +msgid "Show pass_word" +msgstr "Parolayı _göster" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "Giriş:" +msgid "Password:" +msgstr "Parola:" #: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "Sunucu:" +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Anahtar" #: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "Parolayı _göster" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Tür:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "Kullanım:" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 -msgid "_Read" -msgstr "_Oku" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Write" -msgstr "_Yaz" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:20 -#| msgid "_Delete" -msgctxt "infinitive" -msgid "_Delete" -msgstr "_Sil" +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Teknik Ayrıntılar:" -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "Parolalar listeleniyor" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Ayrıntılar" -#: ../gkr/seahorse-gkr-keyring.c:354 -#, c-format -msgid "Passwords: %s" -msgstr "Parolalar :%s" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Girişte otomatik olarak kilidi açılan bir anahtarlık" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Parolaları saklamak için kullanılan bir anahtarlık" -#: ../gkr/seahorse-gkr-keyring.c:355 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format -msgid "Passwords: %s" -msgstr "Parolalar: %s" +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "Parola anahtarlığı '%s' silmek istediğinizden emin misiniz?" -#: ../gkr/seahorse-gkr-keyring-commands.c:119 -msgid "Password Keyring" -msgstr "Parola Anahtarlığı" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Tüm öğelerin kalıcı olarak silineceğini anlıyorum." -#: ../gkr/seahorse-gkr-keyring-commands.c:120 -msgid "Used to store application and network passwords" -msgstr "Uygulama ve ağ parolalarını saklamak için kullanılır" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Anahtarlık Özellikleri" -#: ../gkr/seahorse-gkr-keyring-commands.c:121 -msgid "Stored Password" -msgstr "Saklı Parola" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Adı:" -#: ../gkr/seahorse-gkr-keyring-commands.c:122 -msgid "Safely store a password or secret." -msgstr "Parolayı ya da gizliyi güvenle kaydet." - -#: ../gkr/seahorse-gkr-keyring-commands.c:136 -msgid "Couldn't unlock keyring" -msgstr "Anahtarlık kilidi açılamadı" - -#: ../gkr/seahorse-gkr-keyring-commands.c:177 -msgid "Couldn't lock keyring" -msgstr "Anahtarlık kilidi kilitleneme" - -#: ../gkr/seahorse-gkr-keyring-commands.c:218 -msgid "Couldn't set default keyring" -msgstr "Öntanımlı anahtarlık atanamadı" - -#: ../gkr/seahorse-gkr-keyring-commands.c:257 -msgid "Couldn't change keyring password" -msgstr "Anahtarlık paroalsı değiştirilemedi" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "_Lock" -msgstr "_Kilitle" - -#: ../gkr/seahorse-gkr-keyring-commands.c:289 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Parola saklayan anahtarlığı kilitle böylelikle onu açmak için bir parola " -"gereksin." - -#: ../gkr/seahorse-gkr-keyring-commands.c:290 -msgid "_Unlock" -msgstr "_Kilidini Aç" - -#: ../gkr/seahorse-gkr-keyring-commands.c:291 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Parola saklayan anahtarlığın kilidini bir ana parola ile aç böylelikle " -"kullanılabilir olsun." - -#: ../gkr/seahorse-gkr-keyring-commands.c:292 -msgid "_Set as default" -msgstr "Ö_ntanımlı ata" - -#: ../gkr/seahorse-gkr-keyring-commands.c:293 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Uygulamalar genellikle yeni parolalarını öntanımlı anahtarlıkta saklar." - -#: ../gkr/seahorse-gkr-keyring-commands.c:294 -msgid "Change _Password" -msgstr "_Parola Değiştir" - -#: ../gkr/seahorse-gkr-keyring-commands.c:295 -msgid "Change the unlock password of the password storage keyring" -msgstr "Parola depolama anahtarlığının kilidini açma parolasını değiştir" - -#: ../gkr/seahorse-gkr-keyring-commands.c:360 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "Parola anahtarlığı '%s' silmek istediğinizden emin misiniz?" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Oluşturulma:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "Anahtarlık" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Anahtarlık Özellikleri" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Adı:" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "Anahtarlığa erişim reddedildi" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring-daemon çalışmıyor" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "Anahtarlığın kilidi zaten açık" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "Böyle bir anahtarlık bulunmuyor" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "gnome-keyring-daemon ile iletişim kurulamadı" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "Öğe zaten mevcut" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "gnome-keyring'e erişimde dahili hata" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "Öğe kaydediliyor..." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "Öğe siliniyor ..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "Anahtarlık siliniyor..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "Parola anahtarlıkları listeleniyor" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"İstediğinizin işlemi gerçekleştirmek için hiçbir şifreleme anahtarı " -"bulunamadı. Parolalar ve Şifreleme Anahtarları programı şimdi bir " -"anahtar oluşturmanız ya da içe aktarmanız için başlatılacak." - -#: ../libcryptui/cryptui-key-chooser.c:174 -#: ../libcryptui/cryptui-key-chooser.c:179 -msgid "All Keys" -msgstr "Tüm Anahtarlar" - -#: ../libcryptui/cryptui-key-chooser.c:175 -#: ../libcryptui/cryptui-key-chooser.c:180 -msgid "Selected Recipients" -msgstr "Seçilen Alıcılar" - -#: ../libcryptui/cryptui-key-chooser.c:176 -#: ../libcryptui/cryptui-key-chooser.c:181 -msgid "Search Results" -msgstr "Arama Sonuçları" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:192 -msgid "Search _for:" -msgstr "_Ara:" - -#: ../libcryptui/cryptui-key-chooser.c:250 -msgid "None (Don't Sign)" -msgstr "Hiçbiri (İmzalama)" - -#: ../libcryptui/cryptui-key-chooser.c:263 -#, c-format -msgid "Sign this message as %s" -msgstr "Bu mesajı %s olarak imzala" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:285 -msgid "_Sign message as:" -msgstr "Mesajı şu anahtarla im_zala:" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:865 -msgid "Name" -msgstr "İsim" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1745 -#: ../src/seahorse-key-manager-store.c:877 -msgid "Key ID" -msgstr "Anahtar ID" - -#: ../libegg/egg-datetime.c:325 +#: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "İşaretleri göster" -#: ../libegg/egg-datetime.c:326 +#: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" msgstr "Gösterilen tarih ve/veya zaman özellikleri" -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "Tembel kip" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "Tembel kip girilen tarihi ve zaman değerlerini normalleştirmez" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "Yıl" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "Gösterilen yıl" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "Ay" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "Gösterilen ay" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "Gün" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "Gösterilen ayın günü" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "Saat" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "Gösterilen saat" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "Dakika" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "Gösterilen dakika" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "Saniye" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "Gösterilen saniye" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "Alt sınır yılı" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "Alt tarih sınırının yıl bölümü" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "Üst sınır yılı" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "Üst tarih sınırının yıl bölümü" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "Alt sınır ayı" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "Alt tarih sınırının ay bölümü" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "Üst sınır ayı" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "Üst tarih sınırının ay bölümü" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "Alt sınır günü" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "Alt tarih sınırının ayın günü bölümü" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "Üst sınır günü" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "Üst tarih sınırının ayın günü bölümü" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "Alt sınır saati" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "Alt zaman sınırının saat bölümü" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "Üst sınır saati" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "Üst zaman sınırının saat bölümü" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "Alt sınır dakikası" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "Alt zaman sınırının dakika bölümü" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "Üst sınır dakikası" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "Üst zaman sınırının dakika bölümü" -#: ../libegg/egg-datetime.c:433 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "Alt sınır saniyesi" -#: ../libegg/egg-datetime.c:434 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "Alt zaman sınırının ikinci bölümü" -#: ../libegg/egg-datetime.c:439 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "Üst sınır saniyesi" -#: ../libegg/egg-datetime.c:440 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "Üst zaman sınırının ikinci bölümü" @@ -934,248 +488,251 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:482 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:1" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "Tarih" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "Tarihi doğrudan girin" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "Tarihi Seçin" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "Tarihi takvimden seçin" -#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Zaman" -#: ../libegg/egg-datetime.c:529 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "Zamanı doğrudan girin" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "Saati Seçin" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "Listeden saati seçin" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:810 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "yes" -#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274 -#: ../libegg/egg-datetime.c:1278 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "ÖÖ" -#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275 -#: ../libegg/egg-datetime.c:1282 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "ÖS" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:824 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:827 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:831 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:834 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1190 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1255 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Dosya geçerli .desktop dosyası değil" +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "başlangıç geçici öğe" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Tanınmayan masaüstü dosyası Sürüm '%s'" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "Anahtar Sunucusu Ekle" -#: ../libegg/eggdesktopfile.c:968 -#, c-format -msgid "Starting %s" -msgstr "%s Başlatılıyor" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "Anahtar Sunucusu Türü:" -#: ../libegg/eggdesktopfile.c:1110 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Uygulama komut satırından belgeleri kabul etmez" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Makine:" -#: ../libegg/eggdesktopfile.c:1178 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Tanınmayan başlatma seçeneği: %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1383 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "Bir 'Type=Link' masaüstü girişi belge URI'lerine geçilemiyor" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "Sunucuya erişilecek port." -#: ../libegg/eggdesktopfile.c:1404 -#, c-format -msgid "Not a launchable item" -msgstr "Başlatılabilir bir öğe değil" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Bu uygulamanın sürümü" -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "Oturum yöneticisine bağlantıyı devre dışı bırak" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Sistem Ayarları" -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "Kaydedilen yapılandırmayı içeren dosyayı belirtin" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Katkılar:" -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "DOSYA" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Parolalar ve Anahtarlar" -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "Oturum yöneticisi ID'sini belirtin" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"Barış Çiçek \n" +"Sertaç Ö. Yıldız \n" +"Muhammet Kara " -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314 -msgid "ID" -msgstr "ID" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse Web Safyası" -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "Oturum yönetimi seçenekleri:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "Oturum yönetimi seçeneklerini göster" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Silinemiyor" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Anahtarlar aktarılamadı" -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "Anahtar Sunucusu Ekle" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Veri dışa aktarılamadı" -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Makine:" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Dosya" -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "Anahtar Sunucusu Türü:" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Aktar..." -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Sunucuya erişilecek port." +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Bir dosyaya aktar" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "başlangıç geçici öğe" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "Düzenl_e" -#: ../libseahorse/seahorse-notification.c:576 -#: ../libseahorse/seahorse-notification.c:604 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "Anahtar içe aktarıldı" - -#: ../libseahorse/seahorse-notification.c:580 -#: ../libseahorse/seahorse-notification.c:603 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "%d anahtar içe aktarıldı" - -#: ../libseahorse/seahorse-notification.c:582 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "İçe aktarılmış anahtar" - -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "Uyarı Mesajları" - -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "Simetrik Anahtar" - -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "Genel Anahtar" - -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "Özel Anahtar" - -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "Kimlik Bilgileri" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Panoya kopyala" -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "Kimlik" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Sil" -#: ../libseahorse/seahorse-passphrase.c:200 -msgid "Passphrase" -msgstr "Parola Metni" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Seçilen öğeleri sil" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Bu öğenin özelliklerini göster" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Bu anahtarlığın özelliklerini göster" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "_Tercihler" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Program tercihlerini değiştir" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "Gö_rünüm" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Yardım" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Bu program hakkında" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "İçi_ndekiler" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Seahorse yardımını göster" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Aktar" -#: ../libseahorse/seahorse-passphrase.c:203 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "%s için PIN ya da parola girin" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "Parola:" -#: ../libseahorse/seahorse-passphrase.c:269 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" msgstr "Onayla:" -#: ../libseahorse/seahorse-prefs.c:62 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "Anahtar Sunucusu adresi geçersiz." -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." @@ -1183,323 +740,368 @@ "Yardım için sistem yöneticiniz veya anahtar sunucusunun yöneticisi ile " "irtibata geçin." -#: ../libseahorse/seahorse-prefs.c:172 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:352 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" msgstr "Özel" -#: ../libseahorse/seahorse-prefs.c:425 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" msgstr "Hiçbiri: Anahtarları sunucuda yayımlama" #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "_Anahtarları otomatik olarak anahtar sunucularından al" - -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "_Değişmiş anahtarları sunucu ile otomatik olarak eş zamanlandır" - -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Anahtar Sunucuları" - -#: ../libseahorse/seahorse-prefs.xml.h:4 msgid "Preferences" msgstr "Tercihler" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "Anahtar ararken _kullan:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "Anahtarları _yayımlama yeri:" -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "İlerleme Başklığı" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "_Anahtarları otomatik olarak anahtar sunucularından al" -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "Erişilemez" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "_Değişmiş anahtarları sunucu ile otomatik olarak eş zamanlandır" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Anahtar Sunucuları" -#: ../libseahorse/seahorse-util.c:240 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:516 -msgid "Key Data" -msgstr "Anahtar Verisi" - -#: ../libseahorse/seahorse-util.c:518 -msgid "Multiple Keys" -msgstr "Birden Çok Anahtar" - -#: ../libseahorse/seahorse-util.c:774 -msgid "Couldn't run file-roller" -msgstr "Arşiv Yöneticisi başlatılamadı" - -#: ../libseahorse/seahorse-util.c:780 -msgid "Couldn't package files" -msgstr "Dosyalar paketlenemedi" - -#: ../libseahorse/seahorse-util.c:781 -msgid "The file-roller process did not complete successfully" -msgstr "file-roller süreci başarıyla sonlanamadı" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:957 -msgid "All key files" -msgstr "Tüm anahtar dosyaları" - -#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Tüm dosyalar" - -#: ../libseahorse/seahorse-util.c:1009 -msgid "Archive files" -msgstr "Arşiv dosyaları" - -#: ../libseahorse/seahorse-util.c:1079 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Bu isimle bir dosya zaten var.\n" -"\n" -"Yeni dosyayı onun yerine koymak ister misiniz?" - -#: ../libseahorse/seahorse-util.c:1082 -msgid "_Replace" -msgstr "Ye_rine koy" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1133 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Bilinmeyen" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1139 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Asla" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1146 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Değişken" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1152 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Tam" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1158 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Sınırsız" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Kapalı" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1347 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Feshedilmiş" -#: ../libseahorse/seahorse-widget.c:480 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Yardım görüntülenemedi: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Son Kullanım Tarihi:" +msgid "Never E_xpires" +msgstr "Süresi _Dolmaz" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Yeni bir alt anahtar oluştur" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Anahtarın süresi hiç dolmayacaksa" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Anahtar _Türü:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Anahtar _Uzunluğu:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Anahtar _Türü:" +msgid "Expiration Date:" +msgstr "Son Kullanım Tarihi:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Anahtarın Uzunluğu" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Süresi _Dolmaz" +msgid "Generate a new subkey" +msgstr "Yeni bir alt anahtar oluştur" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Kullanıcı ID ekle" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Yeni kullanıcı ID oluştur" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Tam İ_sim:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "Anahtar _Açıklaması:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "En azından 5 karakter uzunluğunda olmalı" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Tercihsel e-posta adresi" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Anahtarı tanımlayacak tercihsel bir açıklama" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Tercihsel e-posta adresi" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Tam İ_sim:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_E-posta Adresi:" -#: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Değişti_r" - -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "Anahtar _Açıklaması:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Yeni kullanıcı ID oluştur" + +#: ../pgp/seahorse-expires.xml.h:1 +msgid "_Never expires" +msgstr "_Asla süresi dolmaz" + +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Anahtarı feshet" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Asla süresi dolmaz" +msgid "C_hange" +msgstr "Değişti_r" -#: ../pgp/seahorse-gpgme-add-subkey.c:147 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "Alt anahtar eklenemedi" -#: ../pgp/seahorse-gpgme-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "%s anahtarına alt anahtar ekle" -#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA ( sadece imzalama)" -#: ../pgp/seahorse-gpgme-add-subkey.c:190 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (sadece şifreleme)" -#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (sadece imzalama)" -#: ../pgp/seahorse-gpgme-add-subkey.c:202 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (sadece şifreleme)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "Kullanıcı ID eklenemedi" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "%s anahtarına kullanıcı ID ekle" -#: ../pgp/seahorse-gpgme.c:72 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "" "Şifre çözme başarısız oldu. Muhtemelen şifre çözme anahtarına sahip " "değilsiniz." -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "İşlem iptal edildi" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Geçersiz son kullanma tarihi" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "Son kullanma tarihi gelecekte olmalıdır" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "Son kullanım tarihi değiştirilemedi" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "Son Kullanım: %s" -#: ../pgp/seahorse-gpgme-generate.c:79 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Birden Çok Anahtar" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Anahtar Verisi" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Zırhlanmış PGP anahtarları" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP anahtarları" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP Anahtarı" -#: ../pgp/seahorse-gpgme-generate.c:80 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "E-postaların ve dosyaların şifresini çözmek için kullanılır" -#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:117 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "PGP Anahtarı oluşturulamadı" -#: ../pgp/seahorse-gpgme-generate.c:195 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Yeni PGP Anahtarı için Parola Metni" -#: ../pgp/seahorse-gpgme-generate.c:196 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Yeni anahtarınız için paro metnini iki kez girin." -#: ../pgp/seahorse-gpgme-generate.c:205 -msgid "Couldn't generate key" -msgstr "Anahtar oluşturulamadı" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Bir anahtar oluştururken çok miktarda rasgele veri\n" +"üretmemiz gerekiyor ve yardımınıza ihtiyacımız var.\n" +"Klavyeyle yazı yazmak, fareyi hareket ettirmek,\n" +"uygulamaları kullanmak gibi diğer bazı eylemleri\n" +"gerçekleştirmeniz iyi bir fikirdir. Bu, sisteme\n" +"ihtiyaç duyduğu rasgele veriyi sağlayacaktır." -#: ../pgp/seahorse-gpgme-generate.c:207 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Anahtar oluşturuluyor" -#: ../pgp/seahorse-gpgme-key-op.c:301 -#| msgid "Show pass_word" +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "%s anahtarını kalıcı olarak silmek istediğinize emin misiniz?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "%d anahtarı kalıcı olarak silmek istediğinizden emin misiniz?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Hatalı parola" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Üçüncü kez yanlış bir parola girdiniz. Lütfen tekrar deneyin." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Yanlış parola metni." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' için yeni parola metni girin" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' için parola metni girin" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Yeni parola metni gir" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Parola metnini girin" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Parola Metni" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d anahtar yüklendi" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Geçersiz anahtar verisi (UID eksik). İlerideki bir tarihe ayarlanmış " +"bilgisayar veya eksik bir öz-imza neden olmuş olabilir." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG anahtarları" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: öntanımlı anahtarlık dizini" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1534,68 +1136,76 @@ msgid "All JPEG files" msgstr "Tüm JPEG dosyaları" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Tüm dosyalar" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Anahtara Eklenecek Fotoğrafı Seçin" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +msgid "Couldn't prepare photo" +msgstr "Fotoğraf hazırlanamadı" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Fotoğraf eklenemedi" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Dosya yüklenemedi. Biçimi geçersiz olabilir" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Bu fotoğrafı anahtarınızdan kaldırmak istediğinize emin misiniz?" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Fotoğraf silinemedi" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "Alt anahtar feshedilemedi" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "İptal edilme: %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "Sebep yok" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "Anahtarı feshetmek için sebep yok" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "Başkalarınca öğrenildi" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "Anahtar başkalarının eline geçti" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "Değiştirildi" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "Anahtar yenisiyle değiştirildi" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "Kullanılmıyor" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "Anahtar artık kullanılmıyor" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " @@ -1604,11 +1214,15 @@ "%s anahtarını %s için feshedici olarak eklemek üzeresiniz. Bu işlem geri " "alınamaz! Devam etmek istediğinize emin misiniz?" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "Feshedici eklenemedi" -#: ../pgp/seahorse-gpgme-sign.c:99 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Bu özel gizli anahtarın kalıcı olarak silineceğini anlıyorum." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1617,17 +1231,17 @@ "Bu anahtar şu kişi tarafından zaten imzalanmış:\n" "\"%s\"" -#: ../pgp/seahorse-gpgme-sign.c:103 +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "Anahtar imzalanamadı" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "İmzalama için kullanılabilir anahtar yok" -#: ../pgp/seahorse-gpgme-sign.c:158 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1635,546 +1249,572 @@ "Bu anahtara güveninizi belirtmek için kullanılacak kişisel bir anahtarınız " "yok." -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "Yanlış parola metni." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s' için yeni parola metni girin" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Arama yeterince özelleştirilmiş değişdi. '%s' sunucusu çok fazla anahtar " +"buldu." -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s' için parola metni girin" +msgid "Couldn't communicate with server '%s': %s" +msgstr "'%s' sunucusu ile iletişim kurulamadı: %s" -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Yeni parola metni gir" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP Anahtar Sunucuları" -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "Parola metnini girin" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Anahtarlar içe aktarılamadı" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Anahtarlar anahtar sunucularından içe aktarılıyor" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Uzaktan" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Bu pencereyi kapat" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "Uzaktan Anahtar _Bul..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Bir anahtar sunucusunda anahtar ara" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "İçe _Aktar" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Seçili anahtarları yerel anahtarlığa aktar" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Uzaktaki Anahtarlar" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "%d anahtar yüklendi" +msgid "Remote Keys Containing '%s'" +msgstr "'%s' İçeren Uzaktarki Anahtarlar" -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "Anahtarlar Yükleniyor..." +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Anahtar arama başarısız oldu." -#: ../pgp/seahorse-gpgme-source.c:820 +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Uzaktaki Anahtarları Bul" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Geçersiz anahtar verisi (UID eksik). İlerideki bir tarihe ayarlanmış " -"bilgisayar veya eksik bir öz-imza neden olmuş olabilir." +"Bu, diğerlerinin anahtarlarını İnternet üzerinden bulacak. Bulunan " +"anahtarları yerel anahtarlığınıza aktarabilirsiniz." -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544 -msgid "Importing Keys" -msgstr "Anahtarlar İçe Aktarılıyor" - -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "Anahtar Aktarılıyor" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "Bunu içeren anahtarı _ara: " -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Anahtar Sunucuları:" -#: ../pgp/seahorse-hkp-source.c:387 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Arama yeterince özelleştirilmiş değişdi. '%s' sunucusu çok fazla anahtar " -"buldu." +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Yakınımdaki Paylaşılan Anahtarlar:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Aranacak yer:" -#: ../pgp/seahorse-hkp-source.c:389 +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Ara" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Anahtarlar sunucuya yayınlanamadı" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "'%s' sunucusu ile iletişim kurulamadı: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "Anahtarlar sunucudan alınamadı: %s" -#: ../pgp/seahorse-hkp-source.c:671 -msgid "Searching for keys..." -msgstr "Anahtarlar aranıyor..." - -#: ../pgp/seahorse-hkp-source.c:759 -msgid "Uploading keys..." -msgstr "Anahtarlar gönderiliyor..." - -#: ../pgp/seahorse-hkp-source.c:857 -msgid "Retrieving keys..." -msgstr "Anahtarlar alınıyor..." - -#: ../pgp/seahorse-hkp-source.c:987 -#, c-format -msgid "Searching for keys on: %s" -msgstr "Anahtarlar burada aranıyor: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154 -#: ../pgp/seahorse-ldap-source.c:668 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Connecting to: %s" -msgstr "Bağlanılıyor: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d anahtar güncelleme için seçildi" -#: ../pgp/seahorse-hkp-source.c:1184 -msgid "HTTP Key Server" -msgstr "HTTP Anahtar Sunucuları" +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Anahtarlar eş zamanlandırılıyor..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Anahtarları Sunucuyla Eş Zamanlandır" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Bu, anahtarlığınızdaki anahtarları, başkalarının ulaşabilmesi için " +"yayımlayacak. Topladığınız anahtarlarda size ulaşmasından sonra yapılan " +"değişiklikleri de almış olacaksınız." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Bu, topladığınız anahtarlarda size ulaşmasından sonra yapılan değişiklikleri " +"alacak. Yayımlama için bir sunucu seçilmemiş, dolayısıyla sizin " +"anahtarlarınız diğerlerine erişilebilir olmayacak." -#: ../pgp/seahorse-ldap-source.c:459 +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Anahtar _Sunucuları" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Güncelle" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "'%s' ile iletişim kurulamadı: %s" -#: ../pgp/seahorse-ldap-source.c:641 +#: ../pgp/seahorse-ldap-source.c:652 +#, c-format +msgid "Connecting to: %s" +msgstr "Bağlanılıyor: %s" + +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Adres çözülemedi: %s" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Sunucu adresi çözülüyor: %s" -#: ../pgp/seahorse-ldap-source.c:955 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "'%s' içeren anahtarlar aranıyor..." - -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "'%s' ID'sine sahip anahtar aranıyor..." - -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "Uzaktaki anahtarlar alınıyor..." - -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "Anahtarlar, anahtar sunucusuna gönderiliyor..." - -#: ../pgp/seahorse-ldap-source.c:1423 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP Anahtar Sunucuları" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "Anahtarı İ_mzala..." - -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "Genel anahtarı imzala" - -#: ../pgp/seahorse-pgp-commands.c:171 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "%s anahtarını kalıcı olarak silmek istediğinize emin misiniz?" - -#: ../pgp/seahorse-pgp-commands.c:176 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "%d anahtarı ve kimliği kalıcı olarak silmek istediğinize emin misiniz?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "Anahtarları Güncelle ve _Yayımla..." -#: ../pgp/seahorse-pgp-commands.c:178 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "%d anahtarı kalıcı olarak silmek istediğinize emin misiniz?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Anahtarlarınızı sunucuda yayımla ve/veya oradakilerle güncelle." -#: ../pgp/seahorse-pgp-commands.c:180 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "%d kimliği kalıcı olarak silmek istediğinize emin misiniz?" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP Anahtarları" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP anahtarları e-posta ya da dosyaların şifrelenmesi içindir" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Gelişmiş anahtar seçenekleri" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "Oluştu_r" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Yeni bir anahtar oluştur" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "PGP anahtarı, e-posta veya dosyaları başkalarına şifrelemenize olanak sağlar." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Algoritmalar" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "Oluştu_r" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Açıklama:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Son Kullanım Tarihi:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Kullanım Süresi Bitmez" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Şifreleme _Türü:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Yeni bir anahtar oluştur" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "Anahtar _Uzunluğu (bit):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Kullanım Süresi Bitmez" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Yeni PGP Anahtarı" +msgid "E_xpiration Date:" +msgstr "_Son Kullanım Tarihi:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Açıklama:" - -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "PGP Gizli Anahtarı" - -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "PGP Genel Anahtarı" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Gelişmiş anahtar seçenekleri" -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349 -msgid "Expired" -msgstr "Süresi Dolmuş" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Kişisel PGP anahtarı" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP anahtarı" -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Birincil kullanıcı ID değiştirilemedi" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "'%s' kullanıcı ID'sini kalıcı olarak silmek istediğinize emin misiniz?" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "Kullanıcı ID silinemedi" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1464 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Bilinmeyen]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1742 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "İsim/E-posta" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "İmza ID'si" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Birincil fotoğraf değiştirilemedi" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(bilinmeyen)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Bu anahtarın kullanım süresi %s tarihinde dolmuş" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "İsim" + +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "" "%2$s anahtarının %1$d alt anahtarını kalıcı olarak silmek istediğinize emin " "misiniz?" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Alt anahtar silinemedi" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1427 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Güven derecesi değiştirilemedi" -#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:290 -#: ../ssh/seahorse-ssh-key-properties.c:168 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Anahtar \"%s\" konumuna aktarılamadı" - -#: ../pgp/seahorse-pgp-key-properties.c:1035 -#: ../ssh/seahorse-ssh-key-properties.c:193 -msgid "Export Complete Key" -msgstr "Anahtarın Tamamını Aktar" - -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:215 -msgid "Couldn't export key." -msgstr "Anahtar aktarılamadı." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Anahtar dışa aktarılamadı" -#: ../pgp/seahorse-pgp-key-properties.c:1267 -#: ../pgp/seahorse-pgp-key-properties.c:1356 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Asla" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1317 -#: ../src/seahorse-key-manager-store.c:896 +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "ID" + +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tür" -#: ../pgp/seahorse-pgp-key-properties.c:1320 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Oluşturulma" -#: ../pgp/seahorse-pgp-key-properties.c:1323 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Son Kullanım" -#: ../pgp/seahorse-pgp-key-properties.c:1326 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Durum" -#: ../pgp/seahorse-pgp-key-properties.c:1329 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Uzunluk" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Süresi Dolmuş" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "İyi" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Eylemler" +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "Anahtar ID" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Açıklama:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Tarihler" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "E-posta:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Parmak izi:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Anahtar ID:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Asla" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Anahtar İsimleri ve İmzaları" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Bu anahtar feshedilmiş" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Fotoğraf " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Sahibi anahtarı feshetti. Artık kullanılamaz." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Teknik Ayrıntılar" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Bu anahtarın süresi dolmuş" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Bu anahtar feshedilmiş" +msgid "Add a photo to this key" +msgstr "Bu anahtara bir fotoğraf ekle" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Bu anahtarın süresi dolmuş" +msgid "Remove this photo from this key" +msgstr "Bu fotoğrafı anahtardan kaldır" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Tür:" +msgid "Make this photo the primary photo" +msgstr "Bu fotoğrafı birincil fotoğraf yap" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Kullanım:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Önceki fotoğrafa git" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Alt Anahtarlar" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Sonraki fotoğrafa git" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Ekle" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Fotoğraf " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Bu anahtara bir fotoğraf ekle" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Anahtar ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "_Parola Metnini Değiştir" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Adı:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Dosyaların ve size gönderilen e-postaların şifresini çözün." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "E-posta:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Sil" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Açıklama:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Son Kullanım" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Kullanım:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Son Kullanım:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Tür:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Aktar" +msgid "Decrypt files and email sent to you." +msgstr "Dosyaların ve size gönderilen e-postaların şifresini çözün." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "PGP Gizli Anahtarı" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Sonraki fotoğrafa git" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "_Parola Metnini Değiştir" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Önceki fotoğrafa git" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Sahibi" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Anahtar ID:" +msgid "Key Names and Signatures" +msgstr "Anahtar İsimleri ve İmzaları" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Birincil" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Bu fotoğrafı birincil fotoğraf yap" +msgid "Sign" +msgstr "İmzala" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "İsimler ve İmzalar" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Sil" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Asla" +msgid "_Add Name" +msgstr "İsim _Ekle" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Sahibine _Güven Derecenizi Değiştirin:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Sahibi" +msgid "Revoke" +msgstr "Feshet" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Birincil" +msgid "Names and Signatures" +msgstr "İsimler ve İmzalar" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Bu fotoğrafı anahtardan kaldır" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Anahtar ID:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Feshet" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Uzunluk:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "İmzala" +msgid "Technical Details" +msgstr "Teknik Ayrıntılar" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Uzunluk:" +msgid "Fingerprint" +msgstr "Parmak izi:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Sahibi anahtarı feshetti. Artık kullanılamaz." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Son Kullanım:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "İsim _Ekle" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Tarihler" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Sahibine _Güven Derecenizi Değiştirin:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Anahtarın Tamamını Aktar:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -#| msgid "Name:" -msgctxt "name-of-key" -msgid "Name:" -msgstr "Adı:" +msgid "Actions" +msgstr "Eylemler" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Tarihler:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Ekle" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Parmak İzi:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Son Kullanım" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Güven Dereceniz:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Alt Anahtarlar" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Değişken" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 +msgid "Fully" +msgstr "Tamamiyle" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 +msgid "Ultimately" +msgstr "Sınırsız" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Bu anahtara güven dereceniz" +msgid "Encrypt files and email to the key's owner" +msgstr "Dosyaları şifrele ve anahtarın sahibine e-postala" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "PGP Genel Anahtarı" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Diğer İsimler:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Bu anahtarı imzalayan diğerleri:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Dosyaları şifrele ve anahtarın sahibine e-posta ile gönder" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Bu anahtara güven dereceniz" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Tamamiyle" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Güven derecenizi Ayrıntılar sekmesinde ayarlayabilirsiniz." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Diğer anahtarlardaki '%s' imzalarına güveniyorum" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -2183,7 +1823,11 @@ "Eğer bu anahtarın sahibi olan kişinin '%s' olduğuna inanıyorsanız, anahtarı " "imzalayın:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "Bu Anahtarı İm_zala" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -2191,39 +1835,38 @@ "Eğer bu anahtara '%s' sahipliğinden artık emin değilseniz, imzanızı " "feshedin:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Değişken" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "İmzayı _Feshet" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Bu anahtarı imzalayan diğerleri:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Sadece güvendiğim kişilerin imzalarını göster" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:890 msgid "Trust" msgstr "Güven" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Sınırsız" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Anahtarın _Sahibine Güven Dereceniz:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Güven derecenizi Ayrıntılar sekmesinde ayarlayabilirsiniz." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Parmak İzi:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Sadece güvendiğim kişilerin imzalarını göster" +msgid "Dates:" +msgstr "Tarihler:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "İmzayı _Feshet" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Güven Dereceniz:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "Bu Anahtarı İm_zala" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Anahtarın _Sahibine Güven Dereceniz:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -2231,53 +1874,61 @@ msgstr "Alt anahtar %d / %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Feshetmek için tercihsel açıklama" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Feshet" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Anahtarı feshetmek için sebep" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Sebep:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Feshetmek için tercihsel açıklama" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Feshet" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "Belge ve mesajları imzalamak için kişisel bir PGP anahtarınız yok." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "Şu anahtar ile im_zala:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Bu anahtarı ne kadar dikkatli kontrol ettiniz?" +msgid "Sign Key" +msgstr "Anahtar İmzala" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Başkaları imzanızı nasıl görecek:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"İmzalayarak, bu anahtarın şu kişiye ait olduğuna inandığınızı " +"gösteriyorsunuz:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Şu anahtarımla imzalayacağım:" +msgid "Key Name" +msgstr "Anahtar Adı" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Özensizce: anahtarın kendine ait olduğunu iddia kişiye ait olduğuna " -"dair geçici bir doğrulama yaptınız demektir. Örneğin, telefon üzerinden " -"sahibine anahtar parmak izinin okunması olabilir." +msgid "How carefully have you checked this key?" +msgstr "Bu anahtarı ne kadar dikkatli kontrol ettiniz?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Anahtar Adı" +msgid "_Not at all" +msgstr "_Tam olarak değil" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "Özensiz_ce" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "Ço_k Dikkatli" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -2286,7 +1937,17 @@ "ait olduğuna inanıyorsunuz ama bunun bir gerçek olduğunu kontrol " "edemiyorsunuz demektir." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Özensizce: anahtarın kendine ait olduğunu iddia kişiye ait olduğuna " +"dair özensiz bir doğrulama yaptınız demektir. Örneğin, telefon üzerinden " +"sahibine anahtar parmak izinin okunması olabilir." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -2294,20 +1955,6 @@ "Çok Dikkatli: Bunu yalnızca bu anahtarın kesinlikle orijinal olduğuna " "eminseniz seçin." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "" -"İmzalayarak, bu anahtarın şu kişiye ait olduğuna inandığınızı " -"gösteriyorsunuz:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Bu imzayı ileride _feshedebilirim." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Anahtar İmzala" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -2319,739 +1966,1294 @@ "olduğunu kontrol etmek için e-posta kullanmalısınız." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "Özensiz_ce" +msgid "How others will see this signature:" +msgstr "Başkaları imzanızı nasıl görecek:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Tam olarak değil" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Başkaları bu imzayı görmesin" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Bu imzayı ileride _feshedebilirim." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "İ_mzala" +msgid "Sign key as:" +msgstr "Şu anahtarımla imzalayacağım:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "İm_zalayan:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "Ço_k Dikkatli" +msgid "_Sign" +msgstr "İ_mzala" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "Şu anahtar ile im_zala:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Veri dışa aktarılıyor" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Veri alınıyor" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Veri içe aktarılıyor" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Veri gönderiliyor" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Erişilemez" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Kişisel sertifika ve anahtar" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Kişisel sertifika" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Sertifika" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Sertifika '%s' silmek istediğinizden emin misiniz?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:111 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "%d sertifika silmek istediğinizden emin misiniz?" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Sertifikalar (DER şifreli)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Sertifikalar" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 sertifikaları ve ilişkili anahtarlar" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "%d sertifikayı kalıcı olarak silmek istediğinizden emin misiniz?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Özel anahtar oluşturulamadı" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Oluştur" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Özel anahtar" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Bir sertifika istemek için kullanılır" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Yeni bir özel anahtar oluştur" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Etiket:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Şuraya saklandı:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Bu anahtarın kalıcı olarak silineceğini anlıyorum." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Adsız" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Sertifikanın dışa aktarılması başarısız oldu" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Silinemedi" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Dışa Aktar" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Sertifikayı dışa aktar" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Bu sertifika ya da anahtarı sil" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "_Sertifika İste" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Bu anahtar için bir sertifika istek dosyası oluştur" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Sertifika isteği kaydedilemedi" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Sertifika isteğini kaydet" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Sertifika isteği" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM kodlu istek" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Sertifika isteği oluşturulamadı" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Bir sertifika istek dosyası oluştur." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Sertifika isteğine yerleştirilen ortak ad (CN)." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Ad (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Adsız özel anahtar" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Parola Metnini Değiştir" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Parola Metnini _Onayla:" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "Yeni _Parola Metni:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Yeni parola metnini onayla" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "Yeni _Parola Metni:" +msgid "Con_firm Passphrase:" +msgstr "Parola Metnini _Onayla:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Parolalarınızı ve şifreleme anahtarlarınızı yönetin" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862 -msgid "Passwords and Encryption Keys" -msgstr "Parolalar ve Şifreleme Anahtarları" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Devam" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Oluşturmak için öğe türünü seçin:" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Devam" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Yeni Oluştur..." - -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d anahtar seçildi" - -#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470 -#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:458 -msgid "Couldn't import keys" -msgstr "Anahtarlar içe aktarılamadı" - -#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:463 -msgid "Imported keys" -msgstr "İçe aktarılmış anahtarlar" - -#: ../src/seahorse-key-manager.c:464 -msgid "Importing keys" -msgstr "Anahtarlar içe aktarılıyor" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "İçe aktarma başarısız oldu" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "İçe Aktar" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "İçe aktarılacak veri:" -#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "İçe Anahtar Aktar" -#: ../src/seahorse-key-manager.c:533 -msgid "Unrecognized key type, or invalid data format" -msgstr "Tanınamayan anahtar türü, veya geçersiz veri biçimi" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Tüm anahtar dosyaları" -#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245 -msgid "_Remote" -msgstr "_Uzaktan" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Bırakılan metin" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Pano metni" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Yeni" -#: ../src/seahorse-key-manager.c:733 +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Bu programı kapat" -#: ../src/seahorse-key-manager.c:734 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_Yeni..." -#: ../src/seahorse-key-manager.c:735 +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Yeni bir anahtar veya öğe oluştur" -#: ../src/seahorse-key-manager.c:736 +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Yeni bir anahtar ya da öğe ekle" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "_İçe Aktar..." -#: ../src/seahorse-key-manager.c:737 +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "Dosyadan içe aktar" -#: ../src/seahorse-key-manager.c:739 +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "Panodan içe aktar" -#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255 -msgid "_Find Remote Keys..." -msgstr "Uzaktan Anahtar _Bul..." +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "_Anahtarlığa göre" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Anahtarlıkları listeleyen yan çubuğu göster" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "_Kişiseli göster" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Sadece kişisel anahtarlar, sertifikalar ve parolaları göster" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "_Güveniliri göster" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Sadece güvenilir anahtarlar, sertifikalar ve parolaları göster" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "_Hepsini göster" -#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256 -msgid "Search for keys on a key server" -msgstr "Bir anahtar sunucusunda anahtar ara" +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Tüm parolaları, sertifikaları ve parolaları göster" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Filtre" + +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "İlk sefer seçenekleri:" + +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Kendinize ait yeni bir anahtar oluşturun: " + +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Varolan anahtarları bir dosyadan aktar:" + +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Şifrelemeye başlamak için anahtarlara ihtiyacınız olacak." + +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Kilitlenemedi" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Kilit açılamadı" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Kilitle" + +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Kilidini Aç" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Özellikler" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "_Güvenli Kabuk İçin Anahtarı Yapılandır..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Genel Güvenli Kabuk anahtarını başka bir bilgisayara gönder, ve o anahtarı " +"kullanarakerişimlere izin ver." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Güvenli Kabuk Parola Metninizi Girin:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Eski Anahtar Parola Metni" + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "%s için önceki parola metnini girin" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Anahtarın Yeni Paro Metni" + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "%s için yeni parola metnini girin" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Yeni parola metnini tekrar girin: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Güvenli Kabuk" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "" +"Diğer bilgisayarlara güvenli bir şekilde bağlanmak için kullanılan anahtarlar" + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "" +"'%s' güvenli kabuk anahtarını kalıcı olarak silmek istediğinize emin misiniz?" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "%d güvenli kabuk anahtarını silmek istediğinizden emin misiniz?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ssh Anahtarı" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Gizli SSH anahtarları" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Genel SSH anahtarları" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Bu anahtar için hiçbir genel anahtar dosyası mevcut değil." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "Güvenli Kabuk Anahtarı" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "Başka bilgisayarlara (örneğin uçbirimden) erişirken kullanılır" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "Güvenli Kabuk anahtarı oluşturulamadı" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "Güvenli Kabuk Anahtarı Oluşturuluyor" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Yeni Güvenli Kabuk Anahtarı" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Sadece Anahtar Oluştur" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "_Oluştur ve Kur" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Güvenli Kabuk (SSH) anahtarı, diğer bilgisayarlara güvenli bir şekilde " +"bağlanmanızı sağlar." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"E-posta adresiniz ya da bu anahtarın ne için olduğuna dair bir " +"hatırlatıcı." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Eğer bu anahtarı kullanmak istediğiniz bir bilgisayar varsa, bilgisayarı " +"yeni anahtarınızı tanıması için ayarlayabilirsiniz." + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Okunamayan Güvenli Kabuk Anahtarı)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Kişisel SSH anahtarı" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH anahtarı" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "Anahtarın adı değiştirilemedi." + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "Anahtar için yetki değiştirilemedi." + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "Anahtar için parola metni değiştirilemedi." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "ID:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "İsim:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Diğer bilgisayarlara bağlamak için kullanılır." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "Güven" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Bu anahtarın _sahibine bu bilgisayara erişim için yetki ver" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "Bu sadece %s kullanıcısı için geçerlidir." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "Algoritma:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Uzunluk:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Konumu:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "Anahtarın _Tamamını Aktar" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH komutu beklenmeyen bir şekilde sonlandı." + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH komutu başarısız oldu." + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "Uzaktaki Makine Parolası" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "Anahtar Parola Metnini Girin" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "Yeni Güvenli Kabuk Anahtarı için parola metni" + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "İçe aktarılan anahtar: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "Anahtar içe aktarılıyor. Parola metni girin" + +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH anahtarları" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "Bu anahtar için hiçbir özel anahtar dosyası mevcut değil." + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "Uzaktaki bilgisayardaki Güvenli Kabuk anahtarları yapılandırılamadı." + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "Güvenli Kabuk Anahtarları ayarlanıyor..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "Bilgisayarı SSH Bağlantısı için Yapılandır" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"SSH kullanan başka bir bilgisayar ile Güvenli Kabuk anahtarınızı kullanmak " +"için, o bilgisayarda bir giriş hesabınızın olması gerekir." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "örneğin: dosyasunucu.example.com:port" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "_Bilgisayar Adı:" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "_Kullanıcı Adı:" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "_Ayarla" + +#~ msgid "Login keyring" +#~ msgstr "Giriş anahtarlığı" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Anahtarlığa erişim reddedildi" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "gnome-keyring-daemon çalışmıyor" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "Anahtarlığın kilidi zaten açık" + +#~ msgid "No such key ring exists" +#~ msgstr "Böyle bir anahtarlık bulunmuyor" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "gnome-keyring-daemon ile iletişim kurulamadı" + +#~ msgid "The item already exists" +#~ msgstr "Öğe zaten mevcut" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "gnome-keyring'e erişimde dahili hata" + +#~ msgid "Algorithms here" +#~ msgstr "Algoritmalar" + +#~ msgid "Show the properties of this place" +#~ msgstr "Bu yerin özelliklerini göster" + +#~ msgid "P_laces" +#~ msgstr "Yer_ler" + +#~ msgid "Show places sidebar" +#~ msgstr "Yerler kenar çubuğunu göster" + +#~ msgid "OpenSSH directory" +#~ msgstr "OpenSSH dizini" + +#~| msgid "Couldn't delete subkey" +#~ msgid "Couldn't delete keyring" +#~ msgstr "Anahtarlık silinemedi" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Parola saklayan anahtarlığı kilitle böylelikle onu açmak için bir parola " +#~ "gereksin." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Parola saklayan anahtarlığın kilidini bir ana parola ile aç böylelikle " +#~ "kullanılabilir olsun." + +#~| msgid "Deleting keyring..." +#~ msgid "Delete the keyring." +#~ msgstr "Anahtarlığı sil." + +#~ msgid "Properties of the keyring." +#~ msgstr "Anahtarlık özellikleri." + +#~| msgid "Change the unlock password of the password storage keyring" +#~ msgid "Lock the password storage keyring." +#~ msgstr "Parola deposu anahtarlığını kilitle." + +#~| msgid "Change the unlock password of the password storage keyring" +#~ msgid "Unlock the password storage keyring." +#~ msgstr "Parola deposu anahtarlığının kilidini aç." + +#~| msgid "Deleting item..." +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Öğeler siliniyor" + +#~ msgid "Properties of the password." +#~ msgstr "Parola özellikleri." + +#~| msgid "Couldn't change password." +#~ msgid "Delete the password." +#~ msgstr "Parolayı sil." + +#~ msgid "Archive files" +#~ msgstr "Arşiv dosyaları" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Bu isimle bir dosya zaten var.\n" +#~ "\n" +#~ "Yeni dosyayı onun yerine koymak ister misiniz?" + +#~ msgid "_Replace" +#~ msgstr "Ye_rine koy" + +#~ msgid "Export public key" +#~ msgstr "Genel anahtarı dışa aktar" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Anahtar \"%s\" konumuna aktarılamadı" + +#~ msgid "Exporting keys" +#~ msgstr "Anahtar aktarılıyor" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Anahtar sunucusundan veri alınamadı" + +#~ msgid "Retrieving keys" +#~ msgstr "Anahtarlar alınıyor" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "" +#~ "%d anahtarı ve kimliği kalıcı olarak silmek istediğinize emin misiniz?" + +#~| msgid "Couldn't generate key" +#~ msgid "Couldn't delete private key" +#~ msgstr "Özel anahtar silinemedi" + +#~| msgid "Couldn't delete subkey" +#~ msgid "Couldn't delete public key" +#~ msgstr "Genel anahtar silinemedi" + +#~ msgid "_Sign Key..." +#~ msgstr "Anahtarı İ_mzala..." + +#~ msgid "Sign public key" +#~ msgstr "Genel anahtarı imzala" + +#~ msgid "Properties of the key." +#~ msgstr "Anahtar özellikleri." + +#~| msgid "Selected %d key" +#~| msgid_plural "Selected %d keys" +#~ msgid "Delete the key." +#~ msgstr "Anahtarı sil." + +#~ msgid "Export Complete Key" +#~ msgstr "Anahtarın Tamamını Aktar" + +#~ msgid "Couldn't export key." +#~ msgstr "Anahtar aktarılamadı." + +#~ msgid "Lock this token" +#~ msgstr "Bu simgeyi kilitle" + +#~ msgid "Unlock this token" +#~ msgstr "Bu simgenin kilidini aç" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Sertifika '%s' silmek istediğinizden emin misiniz?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "%d sertifika silmek istediğinizden emin misiniz?" + +#~| msgid "Deleting..." +#~ msgid "Deleting" +#~ msgstr "Siliniyor" + +#~ msgid "Delete the certificate." +#~ msgstr "Sertifikayı sil." + +#~ msgid "Also delete matching private key" +#~ msgstr "Eşleşen özel anahtarı da sil" + +#~| msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgid "Are you sure you want to delete the private key '%s'?" +#~ msgstr "'%s' özel anahtarını silmek istediğinizden emin misiniz?" + +#~| msgid "Couldn't delete subkey" +#~ msgid "Couldn't delete key" +#~ msgstr "Anahtar silinemedi" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "Seahorse-daemon'u servis olarak çalıştır" + +#~ msgid "couldn't fork process" +#~ msgstr "süreç çatallanamadı" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "Şifreleme Servisi (Seahorse)" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "Geçersiz veya tanınmayan anahtar türü: %s" + +#~| msgid "This key expired on: %s" +#~ msgid "This keytype is not supported: %s" +#~ msgstr "Bu anahtar türü desteklenmiyor: %s" + +#~ msgid "Support for this feature was not enabled at build time" +#~ msgstr "Bu özellik için destek, inşa zamanında etkinleştirilmemiş" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "Geçersiz veya tanınmayan anahtar: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr "" +#~ " tarafından imzalanmış, %s tarihinde süresi dolmuş." + +#~ msgid "Invalid Signature" +#~ msgstr "Geçersiz İmza" + +#~ msgid "Signed by on %s Expired." +#~ msgstr "" +#~ " tarafından imzalanmış, %s tarihinde Süresi " +#~ "Dolmuş." + +#~ msgid "Expired Signature" +#~ msgstr "Süresi Dolmuş İmza" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr "" +#~ " tarafından imzalanmış, %s tarihinde Feshedilmiş." + +#~ msgid "Revoked Signature" +#~ msgstr "Feshedilmiş İmza" + +#~ msgid "Signed by on %s." +#~ msgstr " tarafından %s tarihinde imzalanmış." + +#~ msgid "Good Signature" +#~ msgstr "İyi İmza" + +#~ msgid "Signing key not in keyring." +#~ msgstr "İmzalayan anahtar anahtarlıkta değil." + +#~ msgid "Unknown Signature" +#~ msgstr "Bilinmeyen İmza" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "Kötü veya hileli imza. İmzalanan veri değiştirilmiş." + +#~ msgid "Bad Signature" +#~ msgstr "Kötü İmza" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "Geçersiz veya tanınmayan imzalayan: %s" + +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "Anahtar imzalama için geçersiz: %s" + +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "Geçersiz veya tanınmayan alıcı: %s" + +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "Anahtar şifreleme için geçerli bir alıcı değil: %s" + +#~ msgid "No recipients specified" +#~ msgstr "Alıcı belirtilmemiş" + +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "Şifre çözme için geçersiz anahtar türü: %s" + +#~ msgid "Please set clearuri" +#~ msgstr "Lütfen clearuri'i ayarlayın" -#: ../src/seahorse-key-manager.c:746 -msgid "_Sync and Publish Keys..." -msgstr "Anahtarları Güncelle ve _Yayımla..." +#~ msgid "Please set crypturi" +#~ msgstr "Lütfen crypturi'i ayarlayın" -#: ../src/seahorse-key-manager.c:747 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Anahtarlarınızı sunucuda yayımla ve/veya oradakilerle güncelle." +#~ msgid "Error opening clearuri" +#~ msgstr "Clearuri açılırken hata" -#: ../src/seahorse-key-manager.c:752 -msgid "T_ypes" -msgstr "_Türler" - -#: ../src/seahorse-key-manager.c:752 -msgid "Show type column" -msgstr "Tür sütununu göster" - -#: ../src/seahorse-key-manager.c:754 -msgid "_Expiry" -msgstr "_Son Kullanım" - -#: ../src/seahorse-key-manager.c:754 -msgid "Show expiry column" -msgstr "Son Kullanım sütununu göster" - -#: ../src/seahorse-key-manager.c:756 -msgid "_Trust" -msgstr "_Güven" - -#: ../src/seahorse-key-manager.c:756 -msgid "Show owner trust column" -msgstr "Sahibine güven sütununu göster" - -#: ../src/seahorse-key-manager.c:758 -msgid "_Validity" -msgstr "_Geçerlilik" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show validity column" -msgstr "Geçerlilik sütununu göster" - -#: ../src/seahorse-key-manager.c:931 -msgid "Filter:" -msgstr "Filtre:" +#~ msgid "No signer specified" +#~ msgstr "İmzalayan belirtilmemiş" -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "İlk sefer seçenekleri:" +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "Doğrulama için geçersiz anahtar türü: %s" -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Kendinize ait yeni bir anahtar oluşturun: " +#~ msgid "Invalid key id: %s" +#~ msgstr "Geçersiz anahtar ID'si: %s" -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Varolan anahtarları bir dosyadan aktar:" +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "Uzaktaki PGP anahtarlarını aramak için anahtar sunucu URI listesi. " +#~ "Sonraki sürümlerde görünen ismi de sonuna boşluktan sonra eklenebilecek." -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Kişisel Anahtarlarım" +#~ msgid "Auto Retrieve Keys" +#~ msgstr "Anahtarları Otomatik Al" -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "_Diğer Anahtarlar" +#~ msgid "Auto Sync Keys" +#~ msgstr "Anahtarları Kendiliğinden Eş Zamanlandır" -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Şifrelemeye başlamak için anahtarlara ihtiyacınız olacak." +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "" +#~ "Anahtar yöneticisinde son kullanım sütununun gösterilmesini kontrol eder." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:522 -msgid "_Import" -msgstr "İçe _Aktar" +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "Anahtar yöneticisinde güven sütununun gösterilmesini kontrol eder." -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Parolalar" +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "Anahtar yöneticisinde tür sütununun gösterilmesini kontrol eder." -#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:256 -msgid "Couldn't export keys" -msgstr "Anahtarlar aktarılamadı" +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "" +#~ "Anahtar yöneticisinde geçerlilik sütununun gösterilmesini kontrol eder." -#: ../src/seahorse-key-manager-store.c:883 -msgid "Validity" -msgstr "Geçerlilik" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:902 -msgid "Expiration Date" -msgstr "Son Kullanım Tarihi" +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "DNS-SD paylaşımını etkinleştir" -#: ../src/seahorse-keyserver-results.c:247 -msgid "Close this window" -msgstr "Bu pencereyi kapat" +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "DNS-SD (Apple Bonjour) anahtar paylaşımını etkinleştirir. seahorse-daemon " +#~ "çalışıyor ve HKP ve DNS-SD desteği ile derlenmiş olmalıdır." -#: ../src/seahorse-keyserver-results.c:248 -msgid "_Expand All" -msgstr "_Hepsini Genişlet" - -#: ../src/seahorse-keyserver-results.c:249 -msgid "Expand all listings" -msgstr "Tüm listeleri genişlet" - -#: ../src/seahorse-keyserver-results.c:250 -msgid "_Collapse All" -msgstr "_Hepsini Kapat" - -#: ../src/seahorse-keyserver-results.c:251 -msgid "Collapse all listings" -msgstr "Tüm listeleri kapalı göster" +#~ msgid "ID of the default key" +#~ msgstr "Öntanımlı Anahtarın ID'si" -#: ../src/seahorse-keyserver-results.c:322 -msgid "Remote Keys" -msgstr "Uzaktaki Anahtarlar" +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "Eğer seçiliyse, seahorse ile şifrelenen dosyalar ASCII zırhı ile " +#~ "kodlanacak." -#: ../src/seahorse-keyserver-results.c:324 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "'%s' İçeren Uzaktarki Anahtarlar" +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "Eğer seçiliyse, öntanımlı anahtar her zaman şifreli alıcılar listesine " +#~ "eklenir." -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Anahtar Sunucuları:" +#~ msgid "Last key server search pattern" +#~ msgstr "Anahtar sunucusunda yapılan son arama" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Yakınımdaki Paylaşılan Anahtarlar:" +#~ msgid "Last key servers used" +#~ msgstr "Kullanılan son anahtar sunucuları" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Uzaktaki Anahtarları Bul" +#~ msgid "Last key used to sign a message." +#~ msgstr "İmzalama için kullanılan son anahtar." -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Bu, diğerlerinin anahtarlarını İnternet üzerinden bulacak. Bulunan " -"anahtarları yerel anahtarlığınıza aktarabilirsiniz." +#~ msgid "PGP Key servers" +#~ msgstr "PGP Anahtar sunucuları" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Aranacak yer:" +#~ msgid "Publish keys to this key server." +#~ msgstr "Anahtarları bu anahtar sunucusuna gönder." -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Ara" +#~ msgid "Show expires column in key manager" +#~ msgstr "Anahtar yöneticisinde son kullanım sütununu göster" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "Bunu içeren anahtarı _ara: " +#~ msgid "Show trust column in key manager" +#~ msgstr "Anahtar yöneticisinde güven sütununu göster" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "Anahtarlar sunucuya yayınlanamadı" +#~ msgid "Show type column in key manager" +#~ msgstr "Anahtar yöneticisinde tür sütununu göster" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Anahtarlar sunucudan alınamadı: %s" +#~ msgid "Show validity column in key manager" +#~ msgstr "Anahtar yöneticisinde geçerlilik sütununu göster" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d anahtar güncelleme için seçildi" +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "Alıcılar penceresinin sıralama sütununu belirtin. Sütunlar: 'name' (isim) " +#~ "ve 'id' olabilir. Ters yönde sıralama için başına '-' koyun." -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "Anahtarlar eş zamanlandırılıyor" +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "Seahorse anahtar yöneticisinin sıralama sütununu belirtin. Sütunlar: " +#~ "'name' (isim), 'id', 'validity' (geçerlilik), 'expires' (son kullanım), " +#~ "'trust' (güven) ve 'type' (tür) olabilir. Ters yönde sıralama için " +#~ "başına '-' koyun." -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "Anahtarlar eş zamanlandırılıyor..." +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "İmzalama için kullanılan son gizli anahtarın ID'si." -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Anahtarları Sunucuyla Eş Zamanlandır" +#~ msgid "The column to sort the recipients by" +#~ msgstr "Alıcıları sıralama sütunu" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Bu, anahtarlığınızdaki anahtarları, başkalarının ulaşabilmesi için " -"yayımlayacak. Topladığınız anahtarlarda size ulaşmasından sonra yapılan " -"değişiklikleri de almış olacaksınız." +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "Seahorse anahtarlarını sıralama sütunu" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Bu, topladığınız anahtarlarda size ulaşmasından sonra yapılan değişiklikleri " -"alacak. Yayımlama için bir sunucu seçilmemiş, dolayısıyla sizin " -"anahtarlarınız diğerlerine erişilebilir olmayacak." +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "PGP anahtarlarının gönderileceği anahtar sunucusu. Boş ise anahtarlar bir " +#~ "sunucuya gönderilmez." -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Anahtar _Sunucuları" +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "" +#~ "Son anahtar sunucu araması burada (boş ise tüm sunucularda) yapılmıştı." -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Güncelle" +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "Bir anahtar sunucusunda yapılan son arama." -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "Bu uygulamanın sürümü" +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "Belirli işlemler (genelde imzalamak) için kullanılacak öntanımlı anahtarı " +#~ "belirler." -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144 -msgid "Encryption Key Manager" -msgstr "Şifreleme Anahtar Yöneticisi" +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "" +#~ "Anahtarların anahtar sunucularından otomatik olarak alınıp alınmayacağı." -#: ../src/seahorse-viewer.c:120 -msgid "Contributions:" -msgstr "Katkılar:" +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "" +#~ "Değişiklik yapılmış anahtarların öntanımlı sunucu ile kendiliğinden " +#~ "güncellenip güncellenmeyeceği." -#: ../src/seahorse-viewer.c:146 -msgid "translator-credits" -msgstr "" -"Barış Çiçek \n" -"Sertaç Ö. Yıldız " +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "Herzaman öntanımlı anahtar ile imzalanması" -#: ../src/seahorse-viewer.c:149 -msgid "Seahorse Project Homepage" -msgstr "Seahorse Web Safyası" +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "ASCII zırhını kullanılması" -#. Top menu items -#: ../src/seahorse-viewer.c:168 -msgid "_File" -msgstr "_Dosya" +#~ msgid "Web Password" +#~ msgstr "Web Parolası" -#: ../src/seahorse-viewer.c:169 -msgid "_Edit" -msgstr "Düzenl_e" +#~ msgid "Couldn't set application access." +#~ msgstr "Uygulama erişimi atanamadı." -#: ../src/seahorse-viewer.c:170 -msgid "_View" -msgstr "Gö_rünüm" +#~ msgid "Path:" +#~ msgstr "Yol:" -#: ../src/seahorse-viewer.c:171 -msgid "_Help" -msgstr "_Yardım" +#~ msgid "Permissions:" +#~ msgstr "İzinler:" -#: ../src/seahorse-viewer.c:173 -msgid "Prefere_nces" -msgstr "_Tercihler" +#~ msgid "Applications" +#~ msgstr "Uygulamalar" -#: ../src/seahorse-viewer.c:174 -msgid "Change preferences for this program" -msgstr "Program tercihlerini değiştir" +#~ msgid "_Read" +#~ msgstr "_Oku" -#: ../src/seahorse-viewer.c:177 -msgid "About this program" -msgstr "Bu program hakkında" +#~ msgid "_Write" +#~ msgstr "_Yaz" -#: ../src/seahorse-viewer.c:178 -msgid "_Contents" -msgstr "İçi_ndekiler" +#~ msgid "Passwords: %s" +#~ msgstr "Parolalar :%s" -#: ../src/seahorse-viewer.c:179 -msgid "Show Seahorse help" -msgstr "Seahorse yardımını göster" +#~ msgid "Passwords: %s" +#~ msgstr "Parolalar: %s" -#: ../src/seahorse-viewer.c:276 -msgid "Export public key" -msgstr "Genel anahtarı dışa aktar" +#~ msgid "Saving item..." +#~ msgstr "Öğe kaydediliyor..." -#: ../src/seahorse-viewer.c:296 -msgid "Exporting keys" -msgstr "Anahtar aktarılıyor" +#~ msgid "Listing password keyrings" +#~ msgstr "Parola anahtarlıkları listeleniyor" -#: ../src/seahorse-viewer.c:321 -msgid "Couldn't retrieve data from key server" -msgstr "Anahtar sunucusundan veri alınamadı" +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "İstediğinizin işlemi gerçekleştirmek için hiçbir şifreleme anahtarı " +#~ "bulunamadı. Parolalar ve Şifreleme Anahtarları programı şimdi bir " +#~ "anahtar oluşturmanız ya da içe aktarmanız için başlatılacak." -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:340 -msgid "Copied keys" -msgstr "Kopyalanan anahtarlar" +#~ msgid "All Keys" +#~ msgstr "Tüm Anahtarlar" -#: ../src/seahorse-viewer.c:360 -msgid "Retrieving keys" -msgstr "Anahtarlar alınıyor" +#~ msgid "Selected Recipients" +#~ msgstr "Seçilen Alıcılar" -#: ../src/seahorse-viewer.c:375 -msgid "Couldn't delete." -msgstr "Silinemedi." +#~ msgid "Search Results" +#~ msgstr "Arama Sonuçları" -#: ../src/seahorse-viewer.c:409 -msgid "Deleting..." -msgstr "Siliniyor..." +#~ msgid "Search _for:" +#~ msgstr "_Ara:" -#: ../src/seahorse-viewer.c:435 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s bir özel anahtar. Devam etmek istediğinizden emin misiniz?" +#~ msgid "None (Don't Sign)" +#~ msgstr "Hiçbiri (İmzalama)" -#: ../src/seahorse-viewer.c:483 -msgid "Importing keys from key servers" -msgstr "Anahtarlar anahtar sunucularından içe aktarılıyor" +#~ msgid "Sign this message as %s" +#~ msgstr "Bu mesajı %s olarak imzala" -#: ../src/seahorse-viewer.c:509 -msgid "Show properties" -msgstr "Özellikleri göster" +#~ msgid "_Sign message as:" +#~ msgstr "Mesajı şu anahtarla im_zala:" -#: ../src/seahorse-viewer.c:510 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Sil" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Dosya geçerli .desktop dosyası değil" -#: ../src/seahorse-viewer.c:511 -msgid "Delete selected items" -msgstr "Seçilen öğeleri sil" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Tanınmayan masaüstü dosyası Sürüm '%s'" -#: ../src/seahorse-viewer.c:515 -msgid "E_xport..." -msgstr "_Aktar..." +#~ msgid "Starting %s" +#~ msgstr "%s Başlatılıyor" -#: ../src/seahorse-viewer.c:516 -msgid "Export to a file" -msgstr "Bir dosyaya aktar" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Uygulama komut satırından belgeleri kabul etmez" -#: ../src/seahorse-viewer.c:518 -msgid "Copy to the clipboard" -msgstr "Panoya kopyala" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Tanınmayan başlatma seçeneği: %d" -#: ../src/seahorse-viewer.c:523 -msgid "Import selected keys to local key ring" -msgstr "Seçili anahtarları yerel anahtarlığa aktar" +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "Bir 'Type=Link' masaüstü girişi belge URI'lerine geçilemiyor" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "Güvenli Kabuk Parola Metninizi Girin:" +#~ msgid "Not a launchable item" +#~ msgstr "Başlatılabilir bir öğe değil" -#: ../ssh/seahorse-ssh-commands.c:85 -msgid "Configure Key for _Secure Shell..." -msgstr "_Güvenli Kabuk İçin Anahtarı Yapılandır..." +#~ msgid "Disable connection to session manager" +#~ msgstr "Oturum yöneticisine bağlantıyı devre dışı bırak" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Genel Güvenli Kabuk anahtarını başka bir bilgisayara gönder, ve o anahtarı " -"kullanarakerişimlere izin ver." +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Kaydedilen yapılandırmayı içeren dosyayı belirtin" -#: ../ssh/seahorse-ssh-commands.c:115 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "" -"'%s' güvenli kabuk anahtarını kalıcı olarak silmek istediğinize emin misiniz?" +#~ msgid "FILE" +#~ msgstr "DOSYA" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "" -"%d güvenli kabuk anahtarını kalıcı olarak silmek istediğinize emin misiniz?" +#~ msgid "Specify session management ID" +#~ msgstr "Oturum yöneticisi ID'sini belirtin" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "Güvenli Kabuk Anahtarı" +#~ msgid "Session management options:" +#~ msgstr "Oturum yönetimi seçenekleri:" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "Başka bilgisayarlara (örneğin uçbirimden) erişirken kullanılır" +#~ msgid "Show session management options" +#~ msgstr "Oturum yönetimi seçeneklerini göster" -#: ../ssh/seahorse-ssh-generate.c:90 -msgid "Couldn't generate Secure Shell key" -msgstr "Güvenli Kabuk anahtarı oluşturulamadı" +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "Anahtar içe aktarıldı" -#: ../ssh/seahorse-ssh-generate.c:213 -msgid "Creating Secure Shell Key" -msgstr "Güvenli Kabuk Anahtarı Oluşturuluyor" +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "%d anahtar içe aktarıldı" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Bunun ne için bir anahtar olduğunu hatırlamak için e-posta adresinizi ya " -"da ihtiyaç duyacağınız başka bir anımsatıcı kullanın." +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "İçe aktarılmış anahtar" -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Güvenli Kabuk (SSH) anahtarı SSH kullanarak güvenilen bilgisayarlara, her " -"biri için farklı bir parola girmeden güvenli bir şekilde bağlanmayı sağlar." +#~ msgid "Notification Messages" +#~ msgstr "Uyarı Mesajları" -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +#~ msgid "Symmetric Key" +#~ msgstr "Simetrik Anahtar" -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Eğer zaten bu anahtarı kullanmak istediğiniz bir bilgisayar var ise, şimdi " -"bu bilgisayarı anahtarınızı tanıması için ayarlayabilirsiniz." +#~ msgid "Credentials" +#~ msgstr "Kimlik Bilgileri" -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" -msgstr "Yeni Güvenli Kabuk Anahtarı" +#~ msgid "Identity" +#~ msgstr "Kimlik" -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "_Oluştur ve Kur" +#~ msgid "Progress Title" +#~ msgstr "İlerleme Başklığı" -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "_Sadece Anahtar Oluştur" +#~ msgid "Couldn't run file-roller" +#~ msgstr "Arşiv Yöneticisi başlatılamadı" -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "_Anahtar Açıklaması:" +#~ msgid "Couldn't package files" +#~ msgstr "Dosyalar paketlenemedi" -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(Okunamayan Güvenli Kabuk Anahtarı)" +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "file-roller süreci başarıyla sonlanamadı" -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "Geçersiz" - -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "Gizli Güvenli Kabuk Anahtarı" - -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "Açık Güvenli Kabuk Anahtarı" +#~ msgid "Loading Keys..." +#~ msgstr "Anahtarlar Yükleniyor..." -#: ../ssh/seahorse-ssh-key-properties.c:71 -msgid "Couldn't rename key." -msgstr "Anahtarın adı değiştirilemedi." +#~ msgid "Uploading keys..." +#~ msgstr "Anahtarlar gönderiliyor..." -#: ../ssh/seahorse-ssh-key-properties.c:112 -msgid "Couldn't change authorization for key." -msgstr "Anahtar için yetki değiştirilemedi." +#~ msgid "Retrieving keys..." +#~ msgstr "Anahtarlar alınıyor..." -#: ../ssh/seahorse-ssh-key-properties.c:127 -msgid "Couldn't change passphrase for key." -msgstr "Anahtar için parola metni değiştirilemedi." +#~ msgid "Searching for keys on: %s" +#~ msgstr "Anahtarlar burada aranıyor: %s" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Algoritma:" +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "'%s' içeren anahtarlar aranıyor..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "ID:" +#~ msgid "Searching for key id '%s'..." +#~ msgstr "'%s' ID'sine sahip anahtar aranıyor..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Konumu:" +#~ msgid "Retrieving remote keys..." +#~ msgstr "Uzaktaki anahtarlar alınıyor..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "İsim:" +#~ msgid "Sending keys to key server..." +#~ msgstr "Anahtarlar, anahtar sunucusuna gönderiliyor..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Uzunluk:" +#~ msgid "New PGP Key" +#~ msgstr "Yeni PGP Anahtarı" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "Güven" +#~ msgid "Create New ..." +#~ msgstr "Yeni Oluştur..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Bu sadece '%s' kullanıcısı için geçerlidir." +#~ msgid "Importing keys" +#~ msgstr "Anahtarlar içe aktarılıyor" -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "Anahtarın _Tamamını Aktar" +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Tanınamayan anahtar türü, veya geçersiz veri biçimi" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Bu anahtarın _sahibine bu bilgisayara erişim için yetki ver" +#~ msgid "T_ypes" +#~ msgstr "_Türler" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Diğer bilgisayarlara bağlamak için kullanılır." +#~ msgid "Show type column" +#~ msgstr "Tür sütununu göster" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH komutu beklenmeyen bir şekilde sonlandı." +#~ msgid "_Expiry" +#~ msgstr "_Son Kullanım" -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 -msgid "The SSH command failed." -msgstr "SSH komutu başarısız oldu." +#~ msgid "Show expiry column" +#~ msgstr "Son Kullanım sütununu göster" -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "Güvenli Kabuk anahtarı" - -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "Parola metni:" +#~ msgid "_Trust" +#~ msgstr "_Güven" -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 -msgid "Remote Host Password" -msgstr "Uzaktaki Makine Parolası" +#~ msgid "Show owner trust column" +#~ msgstr "Sahibine güven sütununu göster" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "Eski Anahtar Parola Metni" +#~ msgid "_Validity" +#~ msgstr "_Geçerlilik" -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "%s için önceki parola metnini girin" +#~ msgid "Show validity column" +#~ msgstr "Geçerlilik sütununu göster" -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "Anahtarın Yeni Paro Metni" +#~ msgid "Other _Keys" +#~ msgstr "_Diğer Anahtarlar" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "%s için yeni parola metnini girin" +#~ msgid "Validity" +#~ msgstr "Geçerlilik" -#: ../ssh/seahorse-ssh-operation.c:864 -msgid "Enter Key Passphrase" -msgstr "Anahtar Parola Metnini Girin" +#~ msgid "Expiration Date" +#~ msgstr "Son Kullanım Tarihi" -#: ../ssh/seahorse-ssh-operation.c:931 -msgid "Passphrase for New Secure Shell Key" -msgstr "Yeni Güvenli Kabuk Anahtarı için parola metni" +#~ msgid "_Expand All" +#~ msgstr "_Hepsini Genişlet" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "Yeni Güvenli Kabuk Anahtarınız için bir parola metni girin." +#~ msgid "Expand all listings" +#~ msgstr "Tüm listeleri genişlet" -#: ../ssh/seahorse-ssh-operation.c:1013 -#, c-format -msgid "Importing key: %s" -msgstr "İçe aktarılan anahtar: %s" +#~ msgid "_Collapse All" +#~ msgstr "_Hepsini Kapat" -#: ../ssh/seahorse-ssh-operation.c:1015 -msgid "Importing key. Enter passphrase" -msgstr "Anahtar içe aktarılıyor. Parola metni girin" +#~ msgid "Collapse all listings" +#~ msgstr "Tüm listeleri kapalı göster" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." -msgstr "Bu anahtar için hiçbir özel anahtar dosyası mevcut değil." +#~ msgid "Synchronizing keys" +#~ msgstr "Anahtarlar eş zamanlandırılıyor" -#: ../ssh/seahorse-ssh-upload.c:45 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "Uzaktaki bilgisayardaki Güvenli Kabuk anahtarları yapılandırılamadı." +#~ msgid "Copied keys" +#~ msgstr "Kopyalanan anahtarlar" -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 -msgid "Configuring Secure Shell Keys..." -msgstr "Güvenli Kabuk Anahtarları ayarlanıyor..." +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s bir özel anahtar. Devam etmek istediğinizden emin misiniz?" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "örneğin: dosyasunucu.example.com:port" +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "_Sil" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "Bilgisayarı SSH Bağlantısı için Yapılandır" +#~ msgid "_Key Description:" +#~ msgstr "_Anahtar Açıklaması:" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "" -"SSH kullanan başka bir bilgisayar ile Güvenli Kabuk anahtarınızı kullanmak " -"için, o bilgisayarda bir giriş hesabınızın olması gerekir." +#~ msgid "Invalid" +#~ msgstr "Geçersiz" -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "_Bilgisayar Adı:" +#~ msgid "Private Secure Shell Key" +#~ msgstr "Gizli Güvenli Kabuk Anahtarı" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "_Kullanıcı Adı:" +#~ msgid "Public Secure Shell Key" +#~ msgstr "Açık Güvenli Kabuk Anahtarı" -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "_Ayarla" +#~ msgid "Passphrase:" +#~ msgstr "Parola metni:" + +#~ msgid "Enter a passphrase for your new Secure Shell key." +#~ msgstr "Yeni Güvenli Kabuk Anahtarınız için bir parola metni girin." #~ msgid "Seahorse Daemon" #~ msgstr "Seahorse Servisi" diff -Nru seahorse-3.2.2/po/ug.po seahorse-3.6.3/po/ug.po --- seahorse-3.2.2/po/ug.po 2011-09-14 17:14:58.000000000 +0200 +++ seahorse-3.6.3/po/ug.po 2012-08-21 12:23:19.000000000 +0200 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: seahorse\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&component=general\n" -"POT-Creation-Date: 2011-03-08 17:28+0000\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-02-08 09:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gheyret Kenji\n" "Language-Team: Uyghur Computer Science Association \n" @@ -18,1438 +18,1097 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../daemon/seahorse-daemon.c:64 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "seahorse-daemon نى daemon سۈپىتىدە ئىجرا قىلغىلى بولمىدى" +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "ئىم ئاچقۇچ ھالقىسى قوش" -#: ../daemon/seahorse-daemon.c:94 -msgid "couldn't fork process" -msgstr "" +#: ../gkr/seahorse-add-keyring.xml.h:2 +msgid "" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "يېڭى ئاچقۇچ ھالقىسىنىڭ ئاتىنى كىرگۈزۈڭ. سىزگە قۇلۇپسىزلاش ئۈچۈن ئىم كىرگۈزۈش ئۇچۇرى چىقىدۇ." -#: ../daemon/seahorse-daemon.c:100 -msgid "couldn't create new process group" -msgstr "" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "يېڭى ئاچقۇچ ھالقىسى ئاتى:" -#: ../daemon/seahorse-daemon.c:250 -msgid "Encryption Daemon (Seahorse)" -msgstr "" +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "مۇلازىمېتىرنىڭ ئاتى ياكى ئادرېسى." -#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277 -#, c-format -msgid "Invalid or unrecognized key type: %s" +#: ../gkr/seahorse-gkr-actions.c:81 +#| msgid "Network Password" +msgid "New password keyring" msgstr "" -#: ../daemon/seahorse-service.c:234 -#, c-format -msgid "This keytype is not supported: %s" -msgstr "" +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "پروگرامما ۋە تور ئىملىرىنى ساقلاشقا ئىشلىتىلىدۇ" -#: ../daemon/seahorse-service.c:241 -#, c-format -msgid "Support for this feature was not enabled at build time" +#: ../gkr/seahorse-gkr-actions.c:83 +#| msgid "Network Password" +msgid "New password..." msgstr "" -#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180 -#: ../daemon/seahorse-service-keyset.c:223 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "" +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "ئىم ياكى مەخپىيەتلىكنى بىخەتەر ساقلايدۇ." -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:204 -#, c-format -msgid "Signed by expired on %s." -msgstr "%2$s دىكىۋاقتى ئوتكەن のبىلەن ئىمزا قويۇلغان" +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "ئىم ئاچقۇچ ھالقىسى" -#: ../daemon/seahorse-service-crypto.c:205 -msgid "Invalid Signature" -msgstr "ئىناۋەتسىز ئىمزا" +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "ساقلانغان ئىملار" -#: ../daemon/seahorse-service-crypto.c:211 -#, c-format -msgid "Signed by on %s Expired." -msgstr "%2$s دىكىۋاقتى ئوتكەن のبىلەن ئىمزا قويۇلغان" +#: ../gkr/seahorse-gkr-actions.c:151 +msgid "Couldn't set default keyring" +msgstr "كۆڭۈلدىكى keyring نى تەڭشىيەلمىدى" -#: ../daemon/seahorse-service-crypto.c:212 -msgid "Expired Signature" -msgstr "ۋاقتى ئوتكەن ئىمزا" +#: ../gkr/seahorse-gkr-actions.c:183 +msgid "Couldn't change keyring password" +msgstr "keyring ئىمىنى ئۆزگەرتەلمىدى" -#: ../daemon/seahorse-service-crypto.c:218 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "%2$s دىكىمەغلۇپ بولغان بىلەن ئىمزا قويۇلغان" +#: ../gkr/seahorse-gkr-actions.c:209 +msgid "_Set as default" +msgstr "كۆڭۈلدىكى قىلىپ بەلگىلە(_S)" -#: ../daemon/seahorse-service-crypto.c:219 -msgid "Revoked Signature" -msgstr "" +#: ../gkr/seahorse-gkr-actions.c:210 +msgid "Applications usually store new passwords in the default keyring." +msgstr "پروگراممىلار يېڭى ئىملارنى كۆڭۈلدىكى ئاچقۇچ ھالقىسىدا ساقلايدۇ." -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:225 -#, c-format -msgid "Signed by on %s." -msgstr "%2$s دىكى بىلەن ئىمزا قويۇلغان" +#: ../gkr/seahorse-gkr-actions.c:211 +msgid "Change _Password" +msgstr "ئىم ئۆزگەرت(_P)" -#: ../daemon/seahorse-service-crypto.c:226 -msgid "Good Signature" -msgstr "ئېسىل ئىمزا" +#: ../gkr/seahorse-gkr-actions.c:212 +msgid "Change the unlock password of the password storage keyring" +msgstr "ئىم ساقلاش ئاچقۇچ ھالقىسىنىڭ قۇلۇپسىزلاش ئىمىنى ئۆزگەرتىدۇ" -#: ../daemon/seahorse-service-crypto.c:231 -msgid "Signing key not in keyring." -msgstr "" +#: ../gkr/seahorse-gkr-add-item.c:60 ../gkr/seahorse-gkr-add-keyring.c:71 +msgid "Couldn't add keyring" +msgstr "keyring نى قوشالمىدى" -#: ../daemon/seahorse-service-crypto.c:232 -msgid "Unknown Signature" -msgstr "نامەلۇم ئىمزا" +#: ../gkr/seahorse-gkr-add-item.xml.h:1 +msgid "Add Password" +msgstr "ئىم قوش" -#: ../daemon/seahorse-service-crypto.c:236 -msgid "Bad or forged signature. The signed data was modified." -msgstr "توغرا بولمىغان ياكى ساختا ئىمزا (ئىمزا سانلىق-مەلۇماتى ئۆزگەرتىلىپتۇ)" +#: ../gkr/seahorse-gkr-add-item.xml.h:2 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 +msgid "_Description:" +msgstr "چۈشەندۈرۈش(_D):" -#: ../daemon/seahorse-service-crypto.c:237 -msgid "Bad Signature" -msgstr "توغرا بولمىغان ئىمزا" +#: ../gkr/seahorse-gkr-add-item.xml.h:3 +msgid "_Password:" +msgstr "ئىم(_P):" -#: ../daemon/seahorse-service-crypto.c:245 -msgid "Couldn't verify signature." -msgstr "ئىمزانى دەلىللىگىلى بولمىدى" +#: ../gkr/seahorse-gkr-add-item.xml.h:4 +msgid "_Show Password" +msgstr "ئىمنى كۆرسەت(_S):" -#: ../daemon/seahorse-service-crypto.c:317 -#: ../daemon/seahorse-service-crypto.c:646 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "ئاچقۇچ ھالقىسى(_K):" -#: ../daemon/seahorse-service-crypto.c:324 -#: ../daemon/seahorse-service-crypto.c:653 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "" +#: ../gkr/seahorse-gkr-backend.c:99 +#| msgid "Password" +msgid "Passwords" +msgstr "ئىم" -#: ../daemon/seahorse-service-crypto.c:335 -#, c-format -msgid "Invalid or unrecognized recipient: %s" +#: ../gkr/seahorse-gkr-backend.c:102 +msgid "Stored personal passwords, credentials and secrets" msgstr "" -#: ../daemon/seahorse-service-crypto.c:343 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:317 +msgid "IM account password for " msgstr "" -#: ../daemon/seahorse-service-crypto.c:352 -#, c-format -msgid "No recipients specified" -msgstr "تاپشۇرۇۋالغۇچى كۆرسىتىلمىدى" - -#: ../daemon/seahorse-service-crypto.c:434 -#, c-format -msgid "Invalid key type for decryption: %s" +#: ../gkr/seahorse-gkr-item.c:383 +#| msgid "Password" +msgid "Password or secret" msgstr "" -#: ../daemon/seahorse-service-crypto.c:548 -#: ../daemon/seahorse-service-crypto.c:746 -#, c-format -msgid "Please set clearuri" +#: ../gkr/seahorse-gkr-item.c:384 +#| msgid "Network Password" +msgid "Network password" msgstr "" -#: ../daemon/seahorse-service-crypto.c:554 -#: ../daemon/seahorse-service-crypto.c:752 -#, c-format -msgid "Please set crypturi" +#: ../gkr/seahorse-gkr-item.c:385 +#| msgid "Strength" +msgid "Stored note" msgstr "" -#: ../daemon/seahorse-service-crypto.c:564 -#, c-format -msgid "Error opening clearuri" +#: ../gkr/seahorse-gkr-item.c:386 +#| msgid "Wrong password" +msgid "Keyring password" msgstr "" -#: ../daemon/seahorse-service-crypto.c:641 -#, c-format -msgid "No signer specified" +#: ../gkr/seahorse-gkr-item.c:387 +#| msgid "Encryption Key Manager" +msgid "Encryption key password" msgstr "" -#: ../daemon/seahorse-service-crypto.c:830 -#, c-format -msgid "Invalid key type for verifying: %s" +#: ../gkr/seahorse-gkr-item.c:388 +#| msgid "Network Password" +msgid "Key storage password" msgstr "" -#: ../daemon/seahorse-service-keyset.c:273 -#, c-format -msgid "Invalid key id: %s" -msgstr "ئاچقۇچ id سى ئىناۋەتسىز: %s" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." +#: ../gkr/seahorse-gkr-item.c:389 +#| msgid "Wrong password" +msgid "Google Chrome password" msgstr "" -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" +#: ../gkr/seahorse-gkr-item.c:390 +msgid "Gnome Online Accounts password" msgstr "" -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" +#: ../gkr/seahorse-gkr-item.c:391 +msgid "Telepathy password" msgstr "" -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." +#: ../gkr/seahorse-gkr-item.c:392 +#| msgid "Couldn't change keyring password" +msgid "Instant messaging password" msgstr "" -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." +#: ../gkr/seahorse-gkr-item.c:393 +msgid "Network Manager secret" msgstr "" -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "" +#: ../gkr/seahorse-gkr-item-deleter.c:83 +#, c-format +msgid "Are you sure you want to delete the password '%s'?" +msgstr "ئىم «%s» نى راستلا ئۆچۈرەمسىز؟" -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "" +#: ../gkr/seahorse-gkr-item-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete %d password?" +msgid_plural "Are you sure you want to delete %d passwords?" +msgstr[0] "راستلا «%d» ئىمنى ئۆچۈرەمسىز؟" -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "DNS-SD ھەمبەھىرىنى قوزغات" +#: ../gkr/seahorse-gkr-item-properties.c:69 +msgid "Access a network share or resource" +msgstr "تور ھەمبەھىرى ياكى بايلىقىنى زىيارەت قىلىش" -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.c:72 +msgid "Access a website" +msgstr "تورتۇرانى زىيارەت قىلىش" -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "كۆڭۈلدىكى كۇنۇپكىنىڭ ID سى" +#: ../gkr/seahorse-gkr-item-properties.c:75 +msgid "Unlocks a PGP key" +msgstr "PGP ئاچقۇچلىرىنى قۇلۇپسىزلايدۇ" -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.c:78 +msgid "Unlocks a Secure Shell key" +msgstr "بىخەتەر Shell ئاچقۇچلىرىنى قۇلۇپسىزلايدۇ" -#: ../data/seahorse.schemas.in.h:12 -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.c:81 +msgid "Saved password or login" +msgstr "ساقلانغان ئىم ياكى كىرىش" -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.c:105 +msgid "Network Credentials" +msgstr "تور ئىسپاتنامىسى" -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.c:110 +msgid "Password" +msgstr "ئىم" -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "ئۇچۇرغا ئىمزا قويغاندا ئىشلەتكەن ئەڭ ئاخىرقى ئاچقۇچ." +#: ../gkr/seahorse-gkr-item-properties.c:210 +msgid "Couldn't change password." +msgstr "ئىمنى ئۆزگەرتەلمىدى." -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "PGP ئاچقۇچ مۇلازىمېتىرى" +#: ../gkr/seahorse-gkr-item-properties.c:255 +#: ../gkr/seahorse-gkr-item-properties.c:376 +#| msgid "Wrong password" +msgid "Updating password" +msgstr "ئىملارنى يېڭىلاۋاتىدۇ" -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.c:336 +msgid "Couldn't set description." +msgstr "چۈشەندۈرۈشلەرنى بەلگىلىيەلمىدى." -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:1 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "ئاچقۇچ خاسلىقى" -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 +msgid "Use:" +msgstr "ئىشلىتىلىشى:" -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:5 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +msgid "Type:" +msgstr "تىپى:" -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:6 +msgid "Server:" +msgstr "مۇلازىمېتىر:" -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "تىزىمغا كىر:" -#: ../data/seahorse.schemas.in.h:23 -msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +msgid "Show pass_word" +msgstr "ئىم كۆرسەت(_W)" -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "ئۇچۇرغا ئىمزا قويغاندا ئىشلەتكەن ئەڭ ئاخىرقى مەخپىي ئاچقۇچنىڭ ID سى." +#: ../gkr/seahorse-gkr-item-properties.xml.h:9 +msgid "Password:" +msgstr "ئىم:" -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +msgid "Key" +msgstr "ئاچقۇچ" -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Technical Details:" +msgstr "تېخنىكىلىق تەپسىلاتلار:" -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "Details" +msgstr "تەپسىلاتى" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." +#: ../gkr/seahorse-gkr-keyring.c:147 +#| msgid "Deleting keyring..." +msgid "Login keyring" msgstr "" -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." +#: ../gkr/seahorse-gkr-keyring.c:676 +msgid "A keyring that is automatically unlocked on login" msgstr "" -#: ../data/seahorse.schemas.in.h:30 -msgid "" -"This specifies the default key to use for certain operations, mainly signing." +#: ../gkr/seahorse-gkr-keyring.c:677 +msgid "A keyring used to store passwords" msgstr "" -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "" +#: ../gkr/seahorse-gkr-keyring-deleter.c:80 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "راستلا ئىم ئاچقۇچ ھالقىسى «%s» نى ئۆچۈرەمسىز؟" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." +#: ../gkr/seahorse-gkr-keyring-deleter.c:83 +msgid "I understand that all items will be permanently deleted." msgstr "" -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "ئاچقۇچ ھالقىسى خاسلىقى" -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "ASCII" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +#| msgid "_Name:" +msgid "Name:" +msgstr "ئاتى:" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Created:" +msgstr "قۇرۇلغان:" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "" +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "ئاچقۇچ ھالقىسى" -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" +#: ../gkr/seahorse-gkr-operation.c:54 ../pgp/seahorse-gpgme.c:73 +#: ../pgp/seahorse-hkp-source.c:585 ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "مەشغۇلاتتىن ۋاز كەچتى" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "" +#: ../gkr/seahorse-gkr-operation.c:59 +msgid "Access to the key ring was denied" +msgstr "ئاچقۇچ ھالقىسىنى زىيارەت قىلىش رەت قىلىندى" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73 -msgid "Couldn't add keyring" -msgstr "keyring نى قوشالمىدى" +#: ../gkr/seahorse-gkr-operation.c:62 +msgid "The gnome-keyring daemon is not running" +msgstr "ئاچقۇچ ھالقىسى daemon نى ئىجرا قىلىنمىغان" -#: ../gkr/seahorse-gkr-add-item.xml.h:1 -msgid "Add Password" -msgstr "ئىم قوش" +#: ../gkr/seahorse-gkr-operation.c:65 +msgid "The key ring has already been unlocked" +msgstr "ئاچقۇچ ھالقىسى ئاللىقاچان قۇلۇپسىزلانغان" -#: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:15 ../pgp/seahorse-revoke.xml.h:5 -msgid "_Description:" -msgstr "چۈشەندۈرۈش(_D):" +#: ../gkr/seahorse-gkr-operation.c:68 +msgid "No such key ring exists" +msgstr "بۇنداق ئاچقۇچ ھالقىسى يوق" -#: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "" +#: ../gkr/seahorse-gkr-operation.c:71 +msgid "Couldn't communicate with key ring daemon" +msgstr "key ring daemon بىلەن ئالاقىلىشەلمىدى" -#: ../gkr/seahorse-gkr-add-item.xml.h:4 -msgid "_Password:" -msgstr "ئىم(_P):" +#: ../gkr/seahorse-gkr-operation.c:74 +msgid "The item already exists" +msgstr "بۇ تۈر مەۋجۇت" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 -msgid "_Show Password" -msgstr "" +#: ../gkr/seahorse-gkr-operation.c:80 +msgid "Internal error accessing gnome-keyring" +msgstr "ئاچقۇچ ھالقىسىنى زىيارەت قىلىشتا ئىچكى خاتالىق كۆرۈلدى" -#: ../gkr/seahorse-gkr-item.c:473 -msgid "Web Password" -msgstr "" +#: ../libegg/egg-datetime.c:317 +msgid "Display flags" +msgstr "بايراقلارنى كۆرسەت" -#: ../gkr/seahorse-gkr-item.c:475 -msgid "Network Password" -msgstr "تور ئىمى" +#: ../libegg/egg-datetime.c:318 +msgid "Displayed date and/or time properties" +msgstr "كۆرسىتىلگەن چېسلا ۋە ياكى ۋاقىت خاسلىقلىرى" -#: ../gkr/seahorse-gkr-item.c:477 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "ئىم" +#: ../libegg/egg-datetime.c:323 +msgid "Lazy mode" +msgstr "ھۇرۇن ھالەت" -#: ../gkr/seahorse-gkr-item-commands.c:78 -#, c-format -msgid "Are you sure you want to delete the password '%s'?" -msgstr "ئىم «%s» نى راستلا ئۆچۈرەمسىز؟" +#: ../libegg/egg-datetime.c:324 +msgid "Lazy mode doesn't normalize entered date and time values" +msgstr "ھۇرۇن ھالەتتە كىرگۈزۈلگەن چېسلا ۋە ۋاقىت قىممەتلىرى نورماللاشتۇرۇلمايدۇ" -#: ../gkr/seahorse-gkr-item-commands.c:81 -#, c-format -msgid "Are you sure you want to delete %d password?" -msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "" +#: ../libegg/egg-datetime.c:329 +msgid "Year" +msgstr "يىل" -#: ../gkr/seahorse-gkr-item-properties.c:66 -msgid "Access a network share or resource" -msgstr "تور ھەمبەھىرى ياكى بايلىقىنى زىيارەت قىلىش" +#: ../libegg/egg-datetime.c:330 +msgid "Displayed year" +msgstr "كۆرسىتىلگەن يىل" -#: ../gkr/seahorse-gkr-item-properties.c:69 -msgid "Access a website" -msgstr "تورتۇرانى زىيارەت قىلىش" +#: ../libegg/egg-datetime.c:335 +msgid "Month" +msgstr "ئاي" -#: ../gkr/seahorse-gkr-item-properties.c:72 -msgid "Unlocks a PGP key" -msgstr "" +#: ../libegg/egg-datetime.c:336 +msgid "Displayed month" +msgstr "كۆرسىتىلگەن ئاي" -#: ../gkr/seahorse-gkr-item-properties.c:75 -msgid "Unlocks a Secure Shell key" -msgstr "" +#: ../libegg/egg-datetime.c:341 +msgid "Day" +msgstr "كۈن" -#: ../gkr/seahorse-gkr-item-properties.c:78 -msgid "Saved password or login" -msgstr "" +#: ../libegg/egg-datetime.c:342 +msgid "Displayed day of month" +msgstr "كۆرسىتىلگەن كۈن" -#: ../gkr/seahorse-gkr-item-properties.c:102 -msgid "Network Credentials" -msgstr "" - -#: ../gkr/seahorse-gkr-item-properties.c:245 -msgid "Couldn't change password." -msgstr "ئىمنى ئۆزگەرتەلمىدى." - -#: ../gkr/seahorse-gkr-item-properties.c:350 -msgid "Couldn't set description." -msgstr "" - -#: ../gkr/seahorse-gkr-item-properties.c:656 -msgid "Couldn't set application access." -msgstr "" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "ئىم:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "يول:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "ھوقۇقلار:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "تېخنىكىلىق تەپسىلاتلار:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "پروگراممىلار" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "تەپسىلاتى" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "ئاچقۇچ" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "تىزىمغا كىر:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "مۇلازىمېتىر:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "تىپى:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 -msgid "_Read" -msgstr "ئوقۇ(_R)" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Write" -msgstr "ياز(_W)" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:20 -#| msgid "_Delete" -msgctxt "infinitive" -msgid "_Delete" -msgstr "ئۆچۈر(_D)" - -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring.c:354 -#, c-format -msgid "Passwords: %s" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring.c:355 -#, c-format -msgid "Passwords: %s" -msgstr "ئىملار:%s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:119 -msgid "Password Keyring" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:120 -msgid "Used to store application and network passwords" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:121 -msgid "Stored Password" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:122 -msgid "Safely store a password or secret." -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:136 -msgid "Couldn't unlock keyring" -msgstr "keyring نىڭ قۇلۇپىنى ئاچالمىدى" - -#: ../gkr/seahorse-gkr-keyring-commands.c:177 -msgid "Couldn't lock keyring" -msgstr "keyring نى قۇلۇپلىيالمىدى" - -#: ../gkr/seahorse-gkr-keyring-commands.c:218 -msgid "Couldn't set default keyring" -msgstr "كۆڭۈلدىكى keyring نى تەڭشىيەلمىدى" - -#: ../gkr/seahorse-gkr-keyring-commands.c:257 -msgid "Couldn't change keyring password" -msgstr "keyring ئىمىنى ئۆزگەرتەلمىدى" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "_Lock" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:289 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:290 -msgid "_Unlock" -msgstr "قۇلۇپ ئاچ(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:291 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:292 -msgid "_Set as default" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:293 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:294 -msgid "Change _Password" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:295 -msgid "Change the unlock password of the password storage keyring" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring-commands.c:360 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "Created:" -msgstr "قۇرۇلغان:" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "ئاتى(_N):" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "key ring daemon بىلەن ئالاقىلىشەلمىدى" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "" - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "تۈرلەرنى ئۆچۈرۈۋاتىدۇ..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "keyring ئۆچۈرۈۋاتىدۇ..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" - -#: ../libcryptui/cryptui-key-chooser.c:174 -#: ../libcryptui/cryptui-key-chooser.c:179 -msgid "All Keys" -msgstr "" - -#: ../libcryptui/cryptui-key-chooser.c:175 -#: ../libcryptui/cryptui-key-chooser.c:180 -msgid "Selected Recipients" -msgstr "" - -#: ../libcryptui/cryptui-key-chooser.c:176 -#: ../libcryptui/cryptui-key-chooser.c:181 -msgid "Search Results" -msgstr "ئىزدەش نەتىجىسى" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:192 -msgid "Search _for:" -msgstr "" - -#: ../libcryptui/cryptui-key-chooser.c:250 -msgid "None (Don't Sign)" -msgstr "" - -#: ../libcryptui/cryptui-key-chooser.c:263 -#, c-format -msgid "Sign this message as %s" -msgstr "" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:285 -msgid "_Sign message as:" -msgstr "" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:865 -msgid "Name" -msgstr "ئاتى" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1745 -#: ../src/seahorse-key-manager-store.c:877 -msgid "Key ID" -msgstr "شىفىرلىق ئاچقۇچ ID" - -#: ../libegg/egg-datetime.c:325 -msgid "Display flags" -msgstr "بايراقلارنى كۆرسەت" - -#: ../libegg/egg-datetime.c:326 -msgid "Displayed date and/or time properties" -msgstr "كۆرسىتىلگەن چېسلا ۋە ياكى ۋاقىت خاسلىقلىرى" - -#: ../libegg/egg-datetime.c:331 -msgid "Lazy mode" -msgstr "" - -#: ../libegg/egg-datetime.c:332 -msgid "Lazy mode doesn't normalize entered date and time values" -msgstr "" - -#: ../libegg/egg-datetime.c:337 -msgid "Year" -msgstr "يىل" - -#: ../libegg/egg-datetime.c:338 -msgid "Displayed year" -msgstr "" - -#: ../libegg/egg-datetime.c:343 -msgid "Month" -msgstr "ئاي" - -#: ../libegg/egg-datetime.c:344 -msgid "Displayed month" -msgstr "" - -#: ../libegg/egg-datetime.c:349 -msgid "Day" -msgstr "كۈن" - -#: ../libegg/egg-datetime.c:350 -msgid "Displayed day of month" -msgstr "" - -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "سائەت" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" -msgstr "" +msgstr "كۆرسىتىلگەن سائەت" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "مىنۇت" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" -msgstr "" +msgstr "كۆرسىتىلگەن ۋاقىت" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:359 msgid "Second" -msgstr "" +msgstr "سېكۇنت" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" -msgstr "" +msgstr "كۆرسىتىلگەن سېكۇنت" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" -msgstr "" +msgstr "توۋەن يىل چېكى" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" -msgstr "" +msgstr "چېسلانىڭ توۋەن چېكىنىڭ يىل بۆلىكى" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" -msgstr "" +msgstr "يۇقىرى يىل چېكى" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" -msgstr "" +msgstr "چېسلانىڭ يۇقىرى چېكىنىڭ يىل بۆلىكى" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" -msgstr "" +msgstr "توۋەن ئاي چېكى" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" -msgstr "" +msgstr "چېسلانىڭ توۋەن چېكىنىڭ ئاي بۆلىكى" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" -msgstr "" +msgstr "يۇقىرى ئاي چېكى" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" -msgstr "" +msgstr "چېسلانىڭ يۇقىرى چېكىنىڭ ئاي بۆلىكى" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" -msgstr "" +msgstr "توۋەن كۈن چېكى" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" -msgstr "" +msgstr "چېسلانىڭ توۋەن چېكىنىڭ كۈن بۆلىكى" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" -msgstr "" +msgstr "يۇقىرى كۈن چېكى" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" -msgstr "" +msgstr "چېسلانىڭ يۇقىرى چېكىنىڭ كۈن بۆلىكى" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" -msgstr "" +msgstr "توۋەن سائەت چېكى" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" -msgstr "" +msgstr "ۋاقىتنىڭ توۋەن چېكىنىڭ سائەت بۆلىكى" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" -msgstr "" +msgstr "يۇقىرى سائەت چېكى" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" -msgstr "" +msgstr "ۋاقىتنىڭ يۇقىرى چېكىنىڭ سائەت بۆلىكى" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" -msgstr "" +msgstr "توۋەن مىنۇت چېكى" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" -msgstr "" +msgstr "ۋاقىتنىڭ توۋەن چېكىنىڭ مىنۇت بۆلىكى" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" -msgstr "" +msgstr "يۇقىرى مىنۇت چېكى" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" -msgstr "" +msgstr "ۋاقىتنىڭ يۇقىرى چېكىنىڭ مىنۇت بۆلىكى" -#: ../libegg/egg-datetime.c:433 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" -msgstr "" +msgstr "توۋەن سېكۇنت چېكى" -#: ../libegg/egg-datetime.c:434 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" -msgstr "" +msgstr "ۋاقىتنىڭ توۋەن چېكىنىڭ سېكۇنت بۆلىكى" -#: ../libegg/egg-datetime.c:439 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" -msgstr "" +msgstr "يۇقىرى سېكۇنت چېكى" -#: ../libegg/egg-datetime.c:440 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" -msgstr "" +msgstr "ۋاقىتنىڭ يۇقىرى چېكىنىڭ سېكۇنت بۆلىكى" #. Translate to calendar:week_start:1 if you want Monday to be the #. * first day of the week; otherwise translate to calendar:week_start:0. #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:482 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:0" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "چېسلا" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "چېسلانى بىۋاسىتە كىرگۈزۈڭ" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "چېسلا تاللا" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "يىلنامىدىن چېسلا تاللا" -#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "ۋاقىت" -#: ../libegg/egg-datetime.c:529 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "ۋاقىتنى بىۋاسىتە كىرگۈزۈڭ" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "ۋاقىت تاللا" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "تىزىملىكتىن ۋاقىت تاللا" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:810 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" -msgstr "" +msgstr "24 سائەت: ياق" -#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274 -#: ../libegg/egg-datetime.c:1278 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "چ ب" -#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275 -#: ../libegg/egg-datetime.c:1282 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "چ ك" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:824 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:827 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:831 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:834 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1190 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1255 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ھۆججەت ئىناۋەتلىك .desktop ھۆججىتى ئەمەس." +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "دەسلەپكى ۋاقىتلىق تۈر" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "تونۇيالمىغان ئۈستەلئۈستى ھۆججەت نەشرى '%s'" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "ئاچقۇچ مۇلازىمېتىرى قوش" -#: ../libegg/eggdesktopfile.c:968 -#, c-format -msgid "Starting %s" -msgstr "%s قوزغىلىۋاتىدۇ" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "ئاچقۇچ مۇلازىمېتىرى تىپى:" -#: ../libegg/eggdesktopfile.c:1110 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "پروگرامما بۇيرۇق قۇرىدا پۈتۈكنى قوبۇل قىلالمايدۇ" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "كومپيۇتېر:" -#: ../libegg/eggdesktopfile.c:1178 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "تونۇمايدىغان ئىجرا تاللانمىسى: %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1383 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "URI پۈتۈكنى 'Type=Link' ئۈستەلئۈستى تۈرىگە يوللىيالمىدى." +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "مۇلازىمېتىردىكى زىيارەت ئېغىزى." -#: ../libegg/eggdesktopfile.c:1404 -#, c-format -msgid "Not a launchable item" -msgstr "ئىجراچان تۈر ئەمەس" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "تۆھپىكارلار:" -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "ئەڭگىمە باشقۇرغۇچقا باغلىنىشنى چەكلە" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:668 ../src/seahorse-main.c:68 +#| msgid "Password" +msgid "Passwords and Keys" +msgstr "ئىملار ۋە ئاچقۇچلار" -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "سەپلىمە ساقلانغان ھۆججەتنى بەلگىلە" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "Gheyret Kenji \n" +"Sahran" -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "FILE" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse قۇرۇلۇشى تورتۇراسى" -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "ئەڭگىمە باشقۇرغۇ ID سېنى بەلگىلە" +#: ../libseahorse/seahorse-catalog.c:191 +#| msgid "Couldn't delete." +msgid "Cannot delete" +msgstr "" -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314 -msgid "ID" -msgstr "ID" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "ئاچقۇچنى ئېكسپورت قىلالمىدى" -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "ئەڭگىمە باشقۇرغۇ تاللانمىلىرى:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "ئەڭگىمە باشقۇرغۇ تاللانمىلىرى كۆرسەت" +#: ../libseahorse/seahorse-catalog.c:268 +#| msgid "Couldn't export key." +msgid "Couldn't export data" +msgstr "" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "ھۆججەت(_F)" -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "ئېكسپورت قىل(_X)..." -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "كومپيۇتېر:" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "ھۆججەتكە چىقار" -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "تەھرىر(_E)" -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "چاپلاش تاختىسىغا كۆچۈرىدۇ" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +#| msgctxt "infinitive" +#| msgid "_Delete" +msgid "_Delete" +msgstr "ئۆچۈر(_D)" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "تاللانغان تۈرلەرنى ئۆچۈر" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" msgstr "" -#: ../libseahorse/seahorse-notification.c:576 -#: ../libseahorse/seahorse-notification.c:604 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "ئاچقۇچ(لار) ئىمپورت قىلىندى" +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "" -#: ../libseahorse/seahorse-notification.c:580 -#: ../libseahorse/seahorse-notification.c:603 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "%i دانە ئاچقۇچ ئىمپورت قىلىندى" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "مايىللىق(_N)" -#: ../libseahorse/seahorse-notification.c:582 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "تۆۋەندىكى ئاچقۇچ(لار) ئىمپورت قىلىندى:" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "پروگراممىنىڭ مايىللىقىنى ئۆزگەرتىدۇ" -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "ئۇقتۇرۇش ئۇچۇرلىرى" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "كۆرۈنۈش(_V)" -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "ياردەم(_H)" -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "ئاممىۋى شىفىرلىق ئاچقۇچ" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "بۇ پروگرامما ھەققىدە" -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "مەخپىي ئاچقۇچ" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "مەزمۇنلار(_C)" -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Seahorse ياردىمىنى كۆرسىتىدۇ" -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "سالاھىيەت" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +msgid "Export" +msgstr "چىقار" -#: ../libseahorse/seahorse-passphrase.c:200 -msgid "Passphrase" -msgstr "ئىم جۈملىسى" +#: ../libseahorse/seahorse-interaction.c:100 +#, c-format +#| msgid "Enter passphrase for '%s'" +msgid "Enter PIN or password for: %s" +msgstr "" -#: ../libseahorse/seahorse-passphrase.c:203 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-passphrase.c:182 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" msgstr "ئىم:" -#: ../libseahorse/seahorse-passphrase.c:269 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:244 msgid "Confirm:" -msgstr "" +msgstr "جەزملە:" -#: ../libseahorse/seahorse-prefs.c:62 +#: ../libseahorse/seahorse-prefs.c:66 msgid "Not a valid Key Server address." -msgstr "" +msgstr "ئىناۋەتلىك ئاچقۇچ مۇلازىمېتىرى ئادرېسى ئەمەس." -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:67 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." -msgstr "" +msgstr "ياردەم ئۈچۈن سىستېما باشقۇرغۇچىسى ياكى ئاچقۇچ مۇلازىمېتىرىنىڭ باشقۇرغۇچىسى بىلەن ئالاقە قىلىڭ." -#: ../libseahorse/seahorse-prefs.c:172 +#: ../libseahorse/seahorse-prefs.c:180 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:352 +#: ../libseahorse/seahorse-prefs.c:350 msgid "Custom" msgstr "ئىختىيارى" -#: ../libseahorse/seahorse-prefs.c:425 +#: ../libseahorse/seahorse-prefs.c:403 msgid "None: Don't publish keys" -msgstr "" +msgstr "يوق: ئاچقۇچلارنى ئېلان قىلمايدۇ" #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "" +msgid "Preferences" +msgstr "مايىللىق" #: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "" +msgid "_Find keys via:" +msgstr "ئاچقۇچلارنى تۆۋەندىكى ئارقىلىق ئىزدە(_F):" #: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "" +msgid "_Publish keys to:" +msgstr "ئاچقۇچلارنى تۆۋەندىكىلەرگە ئېلان قىل(_P):" #: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "مايىللىق" +msgid "Automatically retrieve keys from _key servers" +msgstr "ئاچقۇچلارنى ئاچقۇچ مۇلازىمېتىرلىرىدىن ئاپتوماتىك ئال(_K)" #: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "" +msgid "Automatically synchronize _modified keys with key servers" +msgstr "ئۆزگەرتىلگەن ئاچقۇچلارنى ئاچقۇچ مۇلازىمېتىرلىرى بىلەن قەدەمداشلا(_M)" #: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "" - -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "" - -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "ئىشلەتكىلى بولمايدۇ" +msgid "Key Servers" +msgstr "ئاچقۇچ مۇلازىمېتىرلىرى" -#: ../libseahorse/seahorse-util.c:240 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:516 -msgid "Key Data" -msgstr "ئاچقۇچ سانلىق-مەلۇماتى" - -#: ../libseahorse/seahorse-util.c:518 -msgid "Multiple Keys" -msgstr "بىرنەچچە كۇنۇپكىلار" - -#: ../libseahorse/seahorse-util.c:774 -msgid "Couldn't run file-roller" -msgstr "'file-roller' نى ئىجرا قىلغىلى بولمىدى" - -#: ../libseahorse/seahorse-util.c:780 -msgid "Couldn't package files" -msgstr "ھۆججەتلەرنى بوغچىلىغىلى بولمىدى" - -#: ../libseahorse/seahorse-util.c:781 -msgid "The file-roller process did not complete successfully" -msgstr "'file-roller' مۇۋەپپەقىيەتلىك قوزغىلالمىدى" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:957 -msgid "All key files" -msgstr "بارلىق ئاچقۇچ ھۆججەتلىرى" - -#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "ھەممە ھۆججەتلەر" - -#: ../libseahorse/seahorse-util.c:1009 -msgid "Archive files" -msgstr "ئارخىپ ھۆججەتلەر" - -#: ../libseahorse/seahorse-util.c:1079 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "ئوخشاش ئاتتىكى ھۆججەت مەۋجۇت.\n" -"\n" -"ئۇنى يېڭى ھۆججەتتە قاپلىۋېتەمسىز؟" - -#: ../libseahorse/seahorse-util.c:1082 -msgid "_Replace" -msgstr "ئالماشتۇر(_R)" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1133 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1248 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "نامەلۇم" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1139 +#: ../pgp/seahorse-pgp-key-properties.c:1254 msgctxt "Validity" msgid "Never" msgstr "ھەرگىز" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1146 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1261 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" -msgstr "" +msgstr "قىسمەن" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1152 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "تامامەن" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1158 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" -msgstr "" +msgstr "مۇتلەق" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1463 msgid "Disabled" msgstr "چەكلەنگەن" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1347 +#: ../pgp/seahorse-pgp-key-properties.c:1459 msgid "Revoked" -msgstr "" +msgstr "بىكار قىلىنغان" -#: ../libseahorse/seahorse-widget.c:480 +#: ../libseahorse/seahorse-widget.c:473 #, c-format msgid "Could not display help: %s" msgstr "ياردەمنى كۆرسىتەلمەيدۇ: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "" +msgid "Never E_xpires" +msgstr "زادىلا ۋاقتى ئۆتمەيدۇ(_X)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "" +msgid "If key never expires" +msgstr "ئاچقۇچنىڭ ۋاقتى زادىلا ئۆتۈپ كەتمىسە" #: ../pgp/seahorse-add-subkey.xml.h:3 -msgid "If key never expires" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "ئاچقۇچ تىپى(_T):" #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" -msgstr "" +msgstr "ئاچقۇچ ئۇزۇنلۇقى" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "" +msgid "Expiration Date:" +msgstr "ئىناۋەتلىك چېسلاسى:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" -msgstr "" +msgstr "ئاچقۇچ ئۇزۇنلۇقى" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "" +msgid "Generate a new subkey" +msgstr "يېڭى تارماق ئاچقۇچ قۇرىدۇ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "ئىشلەتكۈچى ID قوشۇش" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "يېڭى ئىشلەتكۈچى ID سىنى قۇرىدۇ" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "تولۇق ئاتى(_N):" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "ئەڭ ئاز دېگەندە 5 ھەرپ بولۇشى كېرەك" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "ئېلخەت ئادرېسى(ئىختىيارىي)" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" -msgstr "" +msgstr "ئاچقۇچنىڭ ئىزاھاتى(ئىختىيار)" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "" +#: ../pgp/seahorse-add-uid.xml.h:5 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "تولۇق ئاتى(_N):" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "ئېلخەت ئادرېسى(_E):" +#: ../pgp/seahorse-add-uid.xml.h:7 +msgid "Key Co_mment:" +msgstr "ئاچقۇچ ئىزاھاتى(_M):" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Create the new user ID" +msgstr "يېڭى ئىشلەتكۈچى ID سىنى قۇرىدۇ" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "ئۆزگەرت(_H)" +msgid "_Never expires" +msgstr "زادىلا ۋاقتى ئۆتمەيدۇ(_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" -msgstr "" +msgstr "ئاچقۇچنى بىكار قىل" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "" +msgid "C_hange" +msgstr "ئۆزگەرت(_H)" -#: ../pgp/seahorse-gpgme-add-subkey.c:147 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "subkey نى قوشالمىدى" -#: ../pgp/seahorse-gpgme-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" -msgstr "" +msgstr "تارماق ئاچقۇچنى %s غا قوشۇش" -#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" -msgstr "" +msgstr "DSA (ئىمزالا)" -#: ../pgp/seahorse-gpgme-add-subkey.c:190 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" -msgstr "" +msgstr "ElGamal (شىفىرلاشلا)" -#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" -msgstr "" +msgstr "RSA (ئىمزالا)" -#: ../pgp/seahorse-gpgme-add-subkey.c:202 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA(شىفىرلاشلا)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "ئىشلەتكۈچى id سىنى قوشالمىدى" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "ئىشلەتكۈچى ID نى %s غا قوشىدۇ" -#: ../pgp/seahorse-gpgme.c:72 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "شىفىرنى يېشىش مەغلۇپ بولدى (قارىغاندا يېشىش ئاچقۇچى يوقمۇ قانداق)" -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" -msgstr "" +msgstr "ئىناۋەتسىز بولۇش چېسلاسى" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" -msgstr "" +msgstr "ئىناۋەتسىز بولۇش چېسلاسى چوقۇم ھازىردىن كېيىن بولۇشى كېرەك" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" -msgstr "" +msgstr "ئىناۋەتسىز بولۇش چېسلاسىنى ئۆزگەرتكىلى بولمىدى" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" +msgstr "ئىناۋەتسىز بولۇش چېسلاسى: %s" + +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "بىرنەچچە كۇنۇپكىلار" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "ئاچقۇچ سانلىق-مەلۇماتى" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +#| msgid "Imported keys" +msgid "Armored PGP keys" msgstr "" -#: ../pgp/seahorse-gpgme-generate.c:79 +#: ../pgp/seahorse-gpgme-exporter.c:118 +#| msgid "New PGP Key" +msgid "PGP keys" +msgstr "PGP ئاچقۇچلىرى" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" -msgstr "" +msgstr "PGP ئاچقۇچ" -#: ../pgp/seahorse-gpgme-generate.c:80 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" -msgstr "" +msgstr "ئېلخەت ۋە ھۆججەتلەرنى شىفىرلاش ئۈچۈن ئىشلىتىلىدۇ" -#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:117 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" -msgstr "" +msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "PGP ئاچقۇچىنى ھاسىل قىلالمىدى" -#: ../pgp/seahorse-gpgme-generate.c:195 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" -msgstr "" +msgstr "يېڭى PGP ئاچقۇچىنىڭ ئىمى" -#: ../pgp/seahorse-gpgme-generate.c:196 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." -msgstr "" - -#: ../pgp/seahorse-gpgme-generate.c:205 -msgid "Couldn't generate key" -msgstr "ئاچقۇچىنى ھاسىل قىلالمىدى" +msgstr "يېڭى ئاچقۇچنىڭ ئىمىنى ئىككى قېتىم كىرگۈزۈڭ." -#: ../pgp/seahorse-gpgme-generate.c:207 +#: ../pgp/seahorse-gpgme-generate.c:223 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" -msgstr "" +msgstr "ئاچقۇچىنى ھاسىل قىلىۋاتىدۇ" + +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "%s نى راستلا مەڭگۈلۈككە ئۆچۈرەمسىز؟" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +#| msgid "Are you sure you want to permanently delete %d keys?" +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "راستلا %d ئاچقۇچنى مەڭگۈلۈككە ئۆچۈرەمسىز؟" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "ئىم خاتا" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." +msgstr "بۇ سىزنىڭ ئىمنى ئۈچىنچى قېتىم خاتا كىرگۈزۈشىڭىز. قايتا كىرگۈزۈڭ." + +#: ../pgp/seahorse-gpgme-keyring.c:90 +#, c-format +msgid "Wrong passphrase." +msgstr "خاتا passphrase." + +#: ../pgp/seahorse-gpgme-keyring.c:94 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "'%s' نىڭ يېڭى passphrase نى كىرگۈزۈڭ" + +#: ../pgp/seahorse-gpgme-keyring.c:96 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "'%s' نىڭ passphrase نى كىرگۈزۈڭ" + +#: ../pgp/seahorse-gpgme-keyring.c:99 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "يېڭى passphrase كىرگۈزۈڭ" + +#: ../pgp/seahorse-gpgme-keyring.c:101 +msgid "Enter passphrase" +msgstr "ئىم جۈملىسىنى كىرگۈزۈڭ" + +#: ../pgp/seahorse-gpgme-keyring.c:106 +msgid "Passphrase" +msgstr "ئىم جۈملىسى" + +#: ../pgp/seahorse-gpgme-keyring.c:307 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "%d ئاچقۇچ ئوقۇلدى" + +#: ../pgp/seahorse-gpgme-keyring.c:654 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "ئاچقۇچ سانلىق-مەلۇماتلىرى ئىناۋەتسىز(كىملىك يوق). بۇ كومپيۇتېرنىڭ چېسلاسى خاتا(كەلگۈسىگە) تەڭشەلگەن ياكى ئوز ئىمزاسىنىڭ يوق بولۇشى سەۋەبىدىن بولىدۇ." + +#: ../pgp/seahorse-gpgme-keyring.c:814 +msgid "GnuPG keys" +msgstr "" + +#: ../pgp/seahorse-gpgme-keyring.c:817 +msgid "GnuPG: default keyring directory" msgstr "" #: ../pgp/seahorse-gpgme-photos.c:73 @@ -1457,11 +1116,12 @@ msgid "" "The photo is too large\n" "The recommended size for a photo on your key is %d x %d pixels." -msgstr "" +msgstr "سۈرەت بەك چوڭ\n" +"سىزنىڭ ئاچقۇچىڭىزغا ماس كېلىدىغان سۈرەتنىڭ چوڭلۇقى %d x %d پىكسېل." #: ../pgp/seahorse-gpgme-photos.c:78 msgid "_Don't Resize" -msgstr "" +msgstr "چوڭلۇقىنى ئۆزگەرتمە(_D)" #: ../pgp/seahorse-gpgme-photos.c:79 msgid "_Resize" @@ -1472,7 +1132,7 @@ msgid "" "This is not a image file, or an unrecognized kind of image file. Try to use " "a JPEG image." -msgstr "" +msgstr "بۇ سۈرەت ھۆججىتى ئەمەس، ياكى چۈشىنىكسىز سۈرەت ھۆججىتى ئىكەن. JPEG سۈرەت ھۆججىتىنى ئىشلىتىڭ." #: ../pgp/seahorse-gpgme-photos.c:224 msgid "All image files" @@ -1482,1471 +1142,1637 @@ msgid "All JPEG files" msgstr "بارلىق JPEG ھۆججەتلىرى" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:301 +msgid "All files" +msgstr "ھەممە ھۆججەتلەر" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" -msgstr "" +msgstr "ئاچقۇچقا قوشىدىغان سۈرەتنى تاللاش" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +#| msgid "Couldn't add photo" +msgid "Couldn't prepare photo" +msgstr "سۈرەتنى تەييار قىلغىلى بولمىدى" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "سۈرەتنى قوشالمىدى" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" -msgstr "" +msgstr "ھۆججەتنى ئوقۇغىلى بولمىدى. ئۇنىڭ پىچىمى ئىناۋەتسىزدەك قىلىدۇ" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" -msgstr "" +msgstr "ئاچقۇچتىن نۆۋەتتىكى سۈرەتنى راستلا چىقىرىۋېتەمسىز؟" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "سۈرەتنى ئۆچۈرەلمىدى" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" -msgstr "" +msgstr "تارماق ئاچقۇچنى بىكار قىلالمىدى" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" -msgstr "" +msgstr "بىكار قىلىش: %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "سەۋەبسىز" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" -msgstr "" +msgstr "ئاچقۇچنى بىكار قىلىشنىڭ سەۋەبى يوق." -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" -msgstr "" +msgstr "مۇرەسسە قىلىنغان" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" -msgstr "" +msgstr "ئاچقۇچ مۇرەسسە قىلىنغان" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "بىكار قىلىندى" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" -msgstr "" +msgstr "ئاچقۇچ بىكار قىلىنغان" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "ئىشلىتىلمىگەن" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" -msgstr "" +msgstr "ئاچقۇچ ئەمدى ئىشلىتىلمەيدۇ" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " "undone! Are you sure you want to continue?" -msgstr "" +msgstr "سىز %s نى %s نىڭ revoker ئى سۈپىتىدە قوشماقچى بولۇۋاتىسىز. بۇ مەشغۇلاتتىن يېنىۋالغىلى بولمايدۇ. راستلا داۋاملاشتۇرامسىز؟" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "revoker نى قوشالمىدى" -#: ../pgp/seahorse-gpgme-sign.c:99 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "" + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" "\"%s\"" -msgstr "" +msgstr "بۇ ئاچقۇچقا «%s»\n" +"ئىمزا قويۇپ بولغان" -#: ../pgp/seahorse-gpgme-sign.c:103 +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" -msgstr "" +msgstr "ئاچقۇچقا ئىمزا قويغىلى بولمىدى" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" -msgstr "" +msgstr "ئىم قويىدىغان ئاچقۇچلار يوق" -#: ../pgp/seahorse-gpgme-sign.c:158 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." -msgstr "" +msgstr "سىزنىڭ بۇ ئاچقۇچقا بولغان ئىشەنچىڭىزنى كۆرسىتىپ بېرىدىغان خۇسۇسىي PGP ئاچقۇچلىرى يوق." -#: ../pgp/seahorse-gpgme-source.c:99 -#, c-format -msgid "Wrong passphrase." -msgstr "خاتا passphrase." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:103 +#: ../pgp/seahorse-hkp-source.c:603 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "'%s' نىڭ يېڭى passphrase نى كىرگۈزۈڭ" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "مۇلازىمېتىر ‹%s› نىڭدا نۇرغۇن ئاچ بار بولغاچقا، ماس كېلىدىغان ئاچقۇچنى ئېنىق بەلگىلىيەلمىدى." -#: ../pgp/seahorse-gpgme-source.c:105 +#: ../pgp/seahorse-hkp-source.c:606 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "'%s' نىڭ passphrase نى كىرگۈزۈڭ" +msgid "Couldn't communicate with server '%s': %s" +msgstr "مۇلازىمېتىر «%s» بىلەن ئالاقىلىشەلمىدى: %s" -#: ../pgp/seahorse-gpgme-source.c:108 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "يېڭى passphrase كىرگۈزۈڭ" +#: ../pgp/seahorse-hkp-source.c:1129 +msgid "HTTP Key Server" +msgstr "HTTP ئاچقۇچ مۇلازىمېتىرى" -#: ../pgp/seahorse-gpgme-source.c:110 -msgid "Enter passphrase" -msgstr "ئىم جۈملىسىنى كىرگۈزۈڭ" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "ئاچقۇچلارنى ئىمپورت قىلغىلى بولمىدى" -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:722 -#, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "" +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "ئاچقۇچ مۇلازىمېتىرىدىن ئاچقۇچلارنى ئىمپورت قىلىۋاتىدۇ" -#: ../pgp/seahorse-gpgme-source.c:777 -msgid "Loading Keys..." -msgstr "" +#: ../pgp/seahorse-keyserver-results.c:243 ../src/seahorse-key-manager.c:517 +msgid "_Remote" +msgstr "يىراق(_R)" -#: ../pgp/seahorse-gpgme-source.c:820 -msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "" +#: ../pgp/seahorse-keyserver-results.c:245 +msgid "Close this window" +msgstr "بۇ كۆزنەكنى ياپ" -#: ../pgp/seahorse-gpgme-source.c:910 ../src/seahorse-key-manager.c:544 -msgid "Importing Keys" -msgstr "ئاچقۇچلارنى ئىمپورت قىلىۋاتىدۇ" +#: ../pgp/seahorse-keyserver-results.c:249 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "يىراقتىكى ئاچقۇچلارنى ئىزدە(_F)…" -#: ../pgp/seahorse-gpgme-source.c:946 -msgid "Exporting Keys" -msgstr "" +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "ئاچقۇچ مۇلازىمېتىرىدىن ئاچقۇچلارنى ئىزدەيدۇ" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "" +#: ../pgp/seahorse-keyserver-results.c:254 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "ئىمپورت قىل(_I)" -#: ../pgp/seahorse-hkp-source.c:387 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" +#: ../pgp/seahorse-keyserver-results.c:255 +msgid "Import selected keys to local key ring" +msgstr "تاللانغان ئاچقۇچلارنى يەرلىك ئاچقۇچ ھالقىسىغا ئىمپورت قىلىدۇ" + +#: ../pgp/seahorse-keyserver-results.c:285 +msgid "Remote Keys" +msgstr "يىراقتىكى ئاچقۇچلار" -#: ../pgp/seahorse-hkp-source.c:389 +#: ../pgp/seahorse-keyserver-results.c:287 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "مۇلازىمېتىر «%s» بىلەن ئالاقىلىشەلمىدى: %s" +msgid "Remote Keys Containing '%s'" +msgstr "يىراقتىكى ئاچقۇچلار ‹%s› نى ئوز ئىچىگە ئالغان" -#: ../pgp/seahorse-hkp-source.c:671 -msgid "Searching for keys..." +#: ../pgp/seahorse-keyserver-results.c:484 +msgid "The search for keys failed." msgstr "" -#: ../pgp/seahorse-hkp-source.c:759 -msgid "Uploading keys..." -msgstr "" +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "يىراقتىكى ئاچقۇچنى ئىزدە" -#: ../pgp/seahorse-hkp-source.c:857 -msgid "Retrieving keys..." -msgstr "" +#: ../pgp/seahorse-keyserver-search.xml.h:2 +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "ئىنتېرنېتتىكى باشقا ئاچقۇچلارنى ئىزدەپ تاپقىلى ۋە ئۇنى يەرلىك كومپيۇتېردىكى ئاچقۇچ ھالقىسىغا ئۆتكۈزۈۋالغىلى بولىدۇ." -#: ../pgp/seahorse-hkp-source.c:987 -#, c-format -msgid "Searching for keys on: %s" -msgstr "" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "تۆۋەندىكىلەرنى ئوز ئىچىگە ئالغان ئاچقۇچلارنى ئىزدە(_S): " -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154 -#: ../pgp/seahorse-ldap-source.c:668 -#, c-format -msgid "Connecting to: %s" -msgstr "" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "ئاچقۇچ مۇلازىمېتىرلىرى:" -#: ../pgp/seahorse-hkp-source.c:1184 -msgid "HTTP Key Server" -msgstr "HTTP ئاچقۇچ مۇلازىمېتىرى" +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "ئەتراپىمدىكى ھەمبەھىرلەنگەن ئاچقۇچلار:" -#: ../pgp/seahorse-ldap-source.c:459 -#, c-format -msgid "Couldn't communicate with '%s': %s" -msgstr "«%s» بىلەن ئالاقىلىشەلمىدى: %s" +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "ئىزدەيدىغان ئورۇن:" -#: ../pgp/seahorse-ldap-source.c:641 -#, c-format -msgid "Couldn't resolve address: %s" -msgstr "" +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "ئىزدە(_S)" -#: ../pgp/seahorse-ldap-source.c:719 -#, c-format -msgid "Resolving server address: %s" -msgstr "" +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "ئاچقۇچىنى مۇلازىمېتىرغا تارقىتالمىدى" -#: ../pgp/seahorse-ldap-source.c:955 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Searching for keys containing '%s'..." -msgstr "" +msgid "Couldn't retrieve keys from server: %s" +msgstr "مۇلازىمېتىردىن ئاچقۇچلارنى ئالغىلى بولمىدى: %s" -#: ../pgp/seahorse-ldap-source.c:983 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Searching for key id '%s'..." -msgstr "" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "قەدەمداشلاش ئۈچۈن %d ئاچقۇچ تاللاندى" -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "" +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "ئاچقۇچلارنى قەدەمداشلاۋاتىدۇ…" -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "" +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "ئاچقۇچلارنى قەدەمداشلاش" -#: ../pgp/seahorse-ldap-source.c:1423 -msgid "LDAP Key Server" -msgstr "LDAP ئاچقۇچ مۇلازىمېتىرى" +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "ئاچقۇچ ھالقىسىدىكى ئاچقۇچلارنى تارقىتىپ باشقىلار ئىشلىتەلەيدىغان قىلىدۇ.شۇنداقلا، باشقىلار تارقاتقان ئاچقۇچتا ئۆزگىرىش بولسا، ئۇنىمۇ يەنە ئالغىلى بولىدۇ." -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "" +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "ئاچقۇچتىكى ئۆزگىرىشلەرنى ئالىدۇ. ئاچقۇچنى تارقىتىدىغان مۇلازىمېتىر تاللانمىغان بولغاچقا، باشقىلار ئاچقۇچلارنى ئىشلىتەلمەيدۇ." -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "" +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "ئاچقۇچ مۇلازىمېتىرلىرى(_K)" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "قەدەمداشلا(_S)" -#: ../pgp/seahorse-pgp-commands.c:171 +#: ../pgp/seahorse-ldap-source.c:440 #, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "%s نى راستلا مەڭگۈلۈككە ئۆچۈرەمسىز؟" +msgid "Couldn't communicate with '%s': %s" +msgstr "«%s» بىلەن ئالاقىلىشەلمىدى: %s" -#: ../pgp/seahorse-pgp-commands.c:176 +#: ../pgp/seahorse-ldap-source.c:651 #, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "" +msgid "Connecting to: %s" +msgstr "باغلانغان ئورۇن: %s" -#: ../pgp/seahorse-pgp-commands.c:178 +#: ../pgp/seahorse-ldap-source.c:657 #, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "%d ئاچقۇچنى راستلا مەڭگۈلۈككە ئۆچۈرەمسىز؟" +msgid "Couldn't resolve address: %s" +msgstr "ئادرېسلارنى ھەل قىلالمىدى: %s" -#: ../pgp/seahorse-pgp-commands.c:180 +#: ../pgp/seahorse-ldap-source.c:701 #, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "" +msgid "Resolving server address: %s" +msgstr "مۇلازىمېتىرنىڭ ئادرېسىنى ھەل قىلىۋاتىدۇ: %s" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" +#: ../pgp/seahorse-ldap-source.c:1446 +msgid "LDAP Key Server" +msgstr "LDAP ئاچقۇچ مۇلازىمېتىرى" + +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "ئاچقۇچلارنى قەدەمداشلاش ۋە ئېلان قىلىش(_S)…" + +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "بۇ ئاچقۇچلارنى ئېلان قىلىپ توردىكى ئاچقۇچلار بىلەن قەدەمداشلايدۇ." + +#: ../pgp/seahorse-pgp-backend.c:174 +#| msgid "New PGP Key" +msgid "PGP Keys" msgstr "" -#: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." +#: ../pgp/seahorse-pgp-backend.c:177 +msgid "PGP keys are for encrypting email or files" msgstr "" -#: ../pgp/seahorse-pgp-generate.xml.h:3 +#: ../pgp/seahorse-pgp-generate.xml.h:1 msgid "Algorithms here" msgstr "ئالگورىزىملار بۇ يەردە" -#: ../pgp/seahorse-pgp-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:2 msgid "C_reate" msgstr "قۇر(_R)" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "" +#: ../pgp/seahorse-pgp-generate.xml.h:3 +msgid "Generate a new key" +msgstr "يېڭى ئاچقۇچلارنى ھاسىل قىلىدۇ" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "Encryption _Type:" -msgstr "شىفىرلاش تىپى(_T):" +#: ../pgp/seahorse-pgp-generate.xml.h:4 +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "PGP ئاچقۇچى ئىشلىتىلسە باشقىلارغا ئەۋەتىدىغان ھۆججەت ياكى ئېلخەتلەرنى شىفىرلاشقا بولىدۇ" + +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "چۈشەندۈرۈش(_C):" #: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "" +msgid "Ne_ver Expires" +msgstr "زادىلا ئىناۋەتسىز بولمايدۇ(_V)" #: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "Key _Strength (bits):" -msgstr "" +msgid "Encryption _Type:" +msgstr "شىفىرلاش تىپى(_T):" #: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 +msgid "Key _Strength (bits):" +msgstr "ئاچقۇچنىڭ كۈچلۈكلۈكى(بىت سانى)(_S):" #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "يېڭى PGP ئاچقۇچى" +msgid "E_xpiration Date:" +msgstr "ئىناۋەتلىك چېسلاسى(_X):" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "b>ئالىي ئاچقۇچ تاللانمىلىرى(_A)" -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" msgstr "" -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" +#: ../pgp/seahorse-pgp-key.c:355 +#| msgid "New PGP Key" +msgid "PGP key" msgstr "" -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349 -msgid "Expired" -msgstr "ۋاقتى ئۆتكەن" - -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" -msgstr "" +msgstr "ئاساسىي ئىشلەتكۈچى كىملىكىنى ئۆزگەرتكىلى بولمىدى" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "'%s' دېگەن ئىشلەتكۈچى ID نى راستلا مەڭگۈلۈككە ئۆچۈرەمسىز؟" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "ئىشلەتكۈچى ID سىنى ئۆچۈرەلمىدى" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1464 +#: ../pgp/seahorse-pgp-key-properties.c:428 +#: ../pgp/seahorse-pgp-key-properties.c:1564 msgid "[Unknown]" -msgstr "" +msgstr "[نامەلۇم]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1742 +#: ../pgp/seahorse-pgp-key-properties.c:535 +#: ../pgp/seahorse-pgp-key-properties.c:1846 msgid "Name/Email" msgstr "ئات/ئېلخەت" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:540 msgid "Signature ID" -msgstr "" +msgstr "ئىمزا كىملىكى" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:673 msgid "Couldn't change primary photo" -msgstr "" +msgstr "ئاساسىي سۈرەتنى ئۆزگەرتكىلى بولمىدى" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#: ../pgp/seahorse-pgp-key-properties.c:906 msgid "(unknown)" msgstr "(ناتونۇش)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:909 #, c-format msgid "This key expired on: %s" -msgstr "" +msgstr "ئاچقۇچنىڭ ئىناۋەتسىز بولۇش ۋاقتى: %s" + +#: ../pgp/seahorse-pgp-key-properties.c:972 +msgid "Name" +msgstr "ئاتى" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:1085 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" -msgstr "" +msgstr "راستلا تارماق ئاچقۇچ %d (%s) مەڭگۈلۈككە ئۆچۈرەمسىز؟" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1094 msgid "Couldn't delete subkey" msgstr "subkey نى ئۆچۈرەلمىدى" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1427 +#: ../pgp/seahorse-pgp-key-properties.c:1134 +#: ../pgp/seahorse-pgp-key-properties.c:1539 msgid "Unable to change trust" -msgstr "" - -#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:291 -#: ../ssh/seahorse-ssh-key-properties.c:168 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "ئاچقۇچنى «%s» غا ئېكسپورت قىلالمىدى" +msgstr "ئىشەنچنى ئۆزگەرتكىلى بولمىدى" -#: ../pgp/seahorse-pgp-key-properties.c:1035 -#: ../ssh/seahorse-ssh-key-properties.c:193 -msgid "Export Complete Key" +#: ../pgp/seahorse-pgp-key-properties.c:1147 +#: ../ssh/seahorse-ssh-key-properties.c:202 +#| msgid "Couldn't export key." +msgid "Couldn't export key" msgstr "" -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:215 -msgid "Couldn't export key." -msgstr "ئاچقۇچنى ئېكسپورت قىلالمىدى" - -#: ../pgp/seahorse-pgp-key-properties.c:1267 -#: ../pgp/seahorse-pgp-key-properties.c:1356 +#: ../pgp/seahorse-pgp-key-properties.c:1379 +#: ../pgp/seahorse-pgp-key-properties.c:1468 msgctxt "Expires" msgid "Never" msgstr "ھەرگىز" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1317 -#: ../src/seahorse-key-manager-store.c:896 +#: ../pgp/seahorse-pgp-key-properties.c:1426 +msgid "ID" +msgstr "ID" + +#: ../pgp/seahorse-pgp-key-properties.c:1429 msgid "Type" msgstr "تىپى" -#: ../pgp/seahorse-pgp-key-properties.c:1320 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "Created" msgstr "قۇرغان" -#: ../pgp/seahorse-pgp-key-properties.c:1323 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Expires" msgstr "ۋاقتى ئۆتتى" -#: ../pgp/seahorse-pgp-key-properties.c:1326 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Status" -msgstr "ھالەت" +msgstr "ھالىتى" -#: ../pgp/seahorse-pgp-key-properties.c:1329 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Strength" msgstr "كۈچلۈكلۈك" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1461 +msgid "Expired" +msgstr "ۋاقتى ئۆتكەن" + +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Good" msgstr "ياخشى" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "مەشغۇلات" +#: ../pgp/seahorse-pgp-key-properties.c:1849 +msgid "Key ID" +msgstr "شىفىرلىق ئاچقۇچ ID" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "ئىزاھات:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "چېسلا" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "ئېلخەت:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "ھەرگىز" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "بۇ ئاچقۇچ بىكار قىلىنغان" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "سۈرەت" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "ئاچقۇچنىڭ ئىگىسى ئاچقۇچنى بىكار قىلىۋەتتى. ئۇنى ئەمدى ئىشلەتكىلى بولمايدۇ." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "تېخنىكىلىق تەپسىلاتلار" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "بۇ ئاچقۇچنىڭ ۋاقتى ئوتكەن" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "" +msgid "Add a photo to this key" +msgstr "بۇ ئاچقۇچقا سۈرەت قوشىدۇ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "بۇ ئاچقۇچنىڭ ۋاقتى ئوتكەن" +msgid "Remove this photo from this key" +msgstr "بۇ ئاچقۇچتىن بۇ سۈرەتنى چىقىرىۋەت" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "تۈرى:" +msgid "Make this photo the primary photo" +msgstr "بۇ سۈرەتنى ئاساسىي سۈرەت قىلىپ ئىشلىتىدۇ" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "ئالدىنقى سۈرەتكە يۆتكىلىدۇ" -#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "" +msgid "Go to next photo" +msgstr "كېيىنكى سۈرەتكە يۆتكىلىدۇ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 +msgid "Photo " +msgstr "سۈرەت" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "قوش" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 +msgid "Key ID:" +msgstr "ئاچقۇچ كىملىكى(ID):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgctxt "name-of-key" +msgid "Name:" +msgstr "ئاتى:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Passphrase نى ئۆزگەرت(_P)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 +msgid "Email:" +msgstr "ئېلخەت:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "شىفىرسىزلاپ سىزگە يوللايدۇ." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgid "Comment:" +msgstr "ئىزاھات:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "ئۆچۈر" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:12 +#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +msgid "Use:" +msgstr "ئىشلىتىلىشى:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "تۈرى:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "" +msgid "Decrypt files and email sent to you." +msgstr "شىفىرسىزلاپ سىزگە يوللايدۇ." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "قەرەلى:" +msgid "Private PGP Key" +msgstr "خۇسۇسىي PGP ئاچقۇچى" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "چىقار" +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Change _Passphrase" +msgstr "Passphrase نى ئۆزگەرت(_P)" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Owner" +msgstr "ئىگىدار" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "" +msgid "Key Names and Signatures" +msgstr "ئاچقۇچ ئاتلىرى ۋە ئىمزالار" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "" +msgid "Primary" +msgstr "ئاساسىي" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "" +msgid "Sign" +msgstr "ئىمزا" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Delete" +msgstr "ئۆچۈر" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "" +msgid "_Add Name" +msgstr "ئات قوش(_A)" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Revoke" +msgstr "بىكار قىلىش" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 msgid "Names and Signatures" msgstr "ئات ۋە ئىمزالار" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "ھەرگىز" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "Key ID:" +msgstr "ئاچقۇچ كىملىكى(ID):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "ئىگىدار" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 +msgid "Strength:" +msgstr "كۈچلۈكلۈكى:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "ئاساسىي" +msgid "Technical Details" +msgstr "تېخنىكىلىق تەپسىلاتلار" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +msgid "Fingerprint" +msgstr "بارماق ئىزى" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 +msgid "Expires:" +msgstr "قەرەلى:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "ئىمزا" +msgid "Dates" +msgstr "چېسلا" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "" +msgid "Override Owner _Trust:" +msgstr "ئىگىسىنىڭ ئىشەنچىنى قاپلاش(_T):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "" +msgid "_Export Complete Key:" +msgstr "ئاچقۇچنى ئېكسپورت قىل(_E):" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Actions" +msgstr "مەشغۇلات" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Add" +msgstr "قوش" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "" +msgid "Expire" +msgstr "ئىناۋەتلىك ۋاقتى" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 -msgid "_Export Complete Key:" -msgstr "" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -#| msgid "Name:" -msgctxt "name-of-key" -msgid "Name:" -msgstr "ئاتى:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "_Subkeys" +msgstr "تارماق ئاچقۇچلار(_S)" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "چېسلا:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "بىرئاز" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "" +msgid "Fully" +msgstr "تولۇق" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "" +msgid "Ultimately" +msgstr "تەلتۆكۈس" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "_Other Names:" -msgstr "باشقا ئاتلار(_O):" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +msgid "Encrypt files and email to the key's owner " +msgstr "ھۆججەتنى شىفىرلاپ ئۇنى ئاچقۇچ ئىگىسىگە يوللايدۇ " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Public PGP Key" +msgstr "ئاممىۋى PGP ئاچقۇچى" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "ھۆججەتنى شىفىرلاپ ئۇنى ئاچقۇچ ئىگىسىگە يوللايدۇ " +msgid "_Other Names:" +msgstr "باشقا ئاتلار(_O):" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "" +msgid "Your trust of this key" +msgstr "بۇ ئاچقۇچنىڭ ئىشەنچلىكلىكى" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +msgid "Your trust is manually specified on the Details tab." +msgstr "‹تەپسىلات› بەتكۈچىدە ئىشەنچنى تەپسىلىي كۆرسەتكىلى بولىدۇ." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 #, no-c-format msgid "I trust signatures from '%s' on other keys" -msgstr "" +msgstr "باشقا ئاچقۇچتىكى ‹%s› ئىمزاغا ئىشىنىمەن" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:27 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" -msgstr "" +msgstr "ئاچقۇچ ‹%s› نىڭ ئىگىسىگە ئىشەنسىڭىز، بۇ ئاچقۇچقا ئىمزا قويۇڭ:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +msgid "_Sign this Key" +msgstr "ئىمزا قويۇش(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" -msgstr "" +msgstr "ئاچقۇچ ‹%s› نىڭ ئىگىسىگە ئەمدى ئىشەنمىسىڭىز، ئىمزايىڭىزنى ئەمەلدىن قالدۇرۇڭ:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "" +msgid "_Revoke Signature" +msgstr "ئىمزانى بىكار قىلىش(_R)" -#. Trust column -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:890 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 +msgid "_People who have signed this key:" +msgstr "بۇ ئاچقۇچقا ئىمزا قويغان كىشىلەر(_P):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 +msgid "_Only display the signatures of people I trust" +msgstr "مەن ئىشەنگەن كىشىلەرنىڭ ئىمزاسىنىلا كۆرسەت(_O)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 msgid "Trust" -msgstr "" +msgstr "ئىشەنچ" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "" +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Fingerprint:" +msgstr "بارماق ئىزى:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Dates:" +msgstr "چېسلا:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "" +msgid "Indicate Trust:" +msgstr "ئىشەنچىنى كۆرسىتىش:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "" +msgid "You _Trust the Owner:" +msgstr "ئىگىسىنىڭ ئىشەنچلىكلىكى(_T):" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format msgid "Subkey %d of %s" -msgstr "" +msgstr "تارماق ئاچقۇچ %d / %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "" +msgid "Reason for revoking the key" +msgstr "بۇ ئاچقۇچنى بىكار قىلىشنىڭ سەۋەبى" #: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "" +msgid "_Reason:" +msgstr "سەۋەب(_S):" -#: ../pgp/seahorse-revoke.xml.h:3 -msgid "Reason for revoking the key" -msgstr "" +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "بىكار قىلىشنىڭ چۈشەندۈرۈلۈشى(ئىختىيارى)" #: ../pgp/seahorse-revoke.xml.h:6 -msgid "_Reason:" -msgstr "" +msgid "Re_voke" +msgstr "بىكار قىل(_V)" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." -msgstr "" +msgstr "پۈتۈك ياكى ئۇچۇرغا ئىمزا قويۇش ئۈچۈن ئىشلىتىدىغان خۇسۇسىي PGP ئاچقۇچلىرىنىڭ يوق" + +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "تۆۋەندىكى ئاچقۇچنى ئىشلىتىپ ئۇچۇرغا ئىمزا قوي(_S):" #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "" +msgid "Sign Key" +msgstr "ئىمزا" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "ئىمزا قويسىڭىز، تۆۋەندىكى ئاچقۇچقا ئىشەنگەن بولىسىز:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "" +msgid "Key Name" +msgstr "ئاچقۇچ ئاتى" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" +msgid "How carefully have you checked this key?" +msgstr "بۇ ئاچقۇچنى قانچىلىك ئېھتىيات بىلەن تەكشۈردىڭىز؟" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "" +msgid "_Not at all" +msgstr "زادىلا تەكشۈرمىگەن(_N)" #: ../pgp/seahorse-sign.xml.h:6 -msgid "" -"Not at all: means you believe the key is owned by the person who " -"claims to own it, but you could not or did not verify this to be a fact." -msgstr "" +msgid "_Casually" +msgstr "مۇنداقلا تەكشۈرگەن(_C)" #: ../pgp/seahorse-sign.xml.h:7 -msgid "" -"Very Carefully: Select this only if you are absolutely sure that this " -"key is genuine." -msgstr "" +msgid "_Very Carefully" +msgstr "تەپسىلىي تەكشۈرگەن(_V)" #: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "" +msgid "" +"Not at all: means you believe the key is owned by the person who " +"claims to own it, but you could not or did not verify this to be a fact." +msgstr "يوق:سىز بۇ شىفىرلىق ئاچقۇچنىڭ ئۇنىڭ ئىگىسىنىڭ ئىكەنلىكىگە ئىشىنىدىغانلىقىڭىزنى بىلدۈرىدۇ، ئەمما سىز ئۇنىڭ راستىلىقىنى دەلىللىيەلمەيسىز ياكى دەلىللىمىدىڭىز." #: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "" +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone. " +msgstr "ۋاقىتلىق:مەنىسى بىر تۈرلۈك ۋاقىتلىق دەلىللەشنى تاماملىغانلىقىنى بىلدۈرىدۇ، بۇ شىفىرلىق ئاچقۇچنىڭ ئۇنىڭغا ئېنىقلىما بەرگەن كىشىگە تەۋە ئىگەنلىكىنى ئىسپاتلايدۇ. مەسىلەن، سىز تېلېفون ئارقىلىق شىفىرلىق ئاچقۇچ بارماق ئىزىنى ئىگىسىگە ئوقۇپ جەزملىيەلەيسىز. " #: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "" +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "ناھايىتى تەپسىلىي:بۇ تاللانما تاللانشا مەزكۇر شىفىرلىق ئاچقۇچنىڭ ھەقىقىيلىقىغا مۇتلەق ئىشىنىدىغانلىقىڭىزنى بىلدۈرىدۇ." #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " "personally check that the name on the key is correct. You should have also " "used email to check that the email address belongs to the owner." -msgstr "" +msgstr "ئاچقۇچ ئاتىنىڭ توغرا خاتالىقىنى ئۆزىڭىز تەكشۈرمەكچى بولسىڭىز، يەنى پاسپورتقا چاپلانغان رەسىمنى ئىشلىتىپ، كىملىك تەكشۈرۈپ، ساختىلىقتىن ساقلانغاندەك قىلىشقا بولىدۇ. يەنە ئېلخەت ئادرېسىنى ئىشلىتىپ ئۇنىڭ ئىگىسىگە تەۋەمۇ ئەمەسمۇ تەكشۈرۈشكە بولىدۇ." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "" +msgid "How others will see this signature:" +msgstr "ئىمزانى باشقىلارغا قانچىلىك ئاشكارا ئېلان قىلىسىز:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "" +msgid "_Others may not see this signature" +msgstr "بۇ ئىمزانى باشقىلارغا ئېلان قىلما(_O)" #: ../pgp/seahorse-sign.xml.h:14 -msgid "_Others may not see this signature" -msgstr "" +msgid "I can _revoke this signature at a later date." +msgstr "مەن بۇ ئىمزانى كېيىنرەك بىكار قىلىمەن(_R)." #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "ئىمزا(_S)" +msgid "Sign key as:" +msgstr "ئاچقۇچنىڭ ئىمزاچىسى:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" -msgstr "" +msgstr "ئىمزاچى(_S):" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "گۇۋاھنامە" - -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "" +msgid "_Sign" +msgstr "ئىمزا(_S)" -#: ../pkcs11/seahorse-pkcs11-commands.c:111 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +#| msgid "Expiration Date" +msgid "Exporting data" +msgstr "سانلىق-مەلۇماتلارنى ئېكسپورت قىلىۋاتىدۇ" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "سانلىق-مەلۇماتلارنى ئېلىۋاتىدۇ" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +#| msgid "Importing Keys" +msgid "Importing data" +msgstr "سانلىق-مەلۇماتلارنى ئىمپورت قىلىۋاتىدۇ" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "ئۇچۇر يوللاۋاتىدۇ" -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "ئىشلەتكىلى بولمايدۇ" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" msgstr "" -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" +#: ../pkcs11/seahorse-certificate.c:438 +#| msgid "Certificate" +msgid "Personal certificate" msgstr "" -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "گۇۋاھنامە" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" msgstr "" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862 -msgid "Passwords and Encryption Keys" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +#| msgid "Certificate" +msgid "Certificates" +msgstr "گۇۋاھنامە" -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" msgstr "" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "داۋاملاشتۇر(_O)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "يېڭىدىن قۇرۇش..." - -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 #, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" +#| msgid "Are you sure you want to permanently delete %d keys?" +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" msgstr[0] "" -#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470 -#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:459 -msgid "Couldn't import keys" -msgstr "ئاچقۇچلارنى ئىمپورت قىلغىلى بولمىدى" - -#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:464 -msgid "Imported keys" -msgstr "ئىمپورت قىلىنغان ئاچقۇچلار" - -#: ../src/seahorse-key-manager.c:464 -msgid "Importing keys" -msgstr "ئاچقۇچلارنى ئىمپورت قىلىۋاتىدۇ" - -#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017 -msgid "Import Key" -msgstr "ئاچقۇچ ئىمپورت قىلىش" - -#: ../src/seahorse-key-manager.c:533 -msgid "Unrecognized key type, or invalid data format" -msgstr "" - -#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245 -msgid "_Remote" -msgstr "" - -#: ../src/seahorse-key-manager.c:733 -msgid "Close this program" -msgstr "" - -#: ../src/seahorse-key-manager.c:734 -msgid "_New..." -msgstr "يېڭى(_N)..." - -#: ../src/seahorse-key-manager.c:735 -msgid "Create a new key or item" -msgstr "يېڭى ئاچقۇچ ياكى تۈر قۇرىدۇ" - -#: ../src/seahorse-key-manager.c:736 -msgid "_Import..." +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +#| msgid "Couldn't generate key" +msgid "Couldn't generate private key" msgstr "" -#: ../src/seahorse-key-manager.c:737 -msgid "Import from a file" -msgstr "ھۆججەتتىن ئەكىر" - -#: ../src/seahorse-key-manager.c:739 -msgid "Import from the clipboard" -msgstr "چاپلاش تاختىسىدىن ئىمپورت قىل" - -#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255 -msgid "_Find Remote Keys..." -msgstr "" +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +#| msgid "C_reate" +msgid "Create" +msgstr "ياسا" -#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256 -msgid "Search for keys on a key server" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +#| msgid "Private Key" +msgid "Private key" +msgstr "خاس ئاچقۇچ" -#: ../src/seahorse-key-manager.c:746 -msgid "_Sync and Publish Keys..." +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" msgstr "" -#: ../src/seahorse-key-manager.c:747 -msgid "Publish and/or synchronize your keys with those online." +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +#| msgid "Create a new key or item" +msgid "Create a new private key" msgstr "" -#: ../src/seahorse-key-manager.c:752 -msgid "T_ypes" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "ئەن:" -#: ../src/seahorse-key-manager.c:752 -msgid "Show type column" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" msgstr "" -#: ../src/seahorse-key-manager.c:754 -msgid "_Expiry" +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." msgstr "" -#: ../src/seahorse-key-manager.c:754 -msgid "Show expiry column" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "ئاتسىز" -#: ../src/seahorse-key-manager.c:756 -msgid "_Trust" +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" msgstr "" -#: ../src/seahorse-key-manager.c:756 -msgid "Show owner trust column" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +#| msgid "Couldn't delete." +msgid "Couldn't delete" +msgstr "ئۆچۈرگىلى بولمىدى." -#: ../src/seahorse-key-manager.c:758 -msgid "_Validity" -msgstr "" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +#| msgid "Export" +msgid "_Export" +msgstr "چىقار(_E)" -#: ../src/seahorse-key-manager.c:758 -msgid "Show validity column" +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +#| msgid "Export to a file" +msgid "Export the certificate" msgstr "" -#: ../src/seahorse-key-manager.c:931 -msgid "Filter:" -msgstr "سۈزگۈچ:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" msgstr "" -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#| msgid "Certificate" +msgid "Request _Certificate" msgstr "" -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "ھۆججەتتىن بار بولغان ئاچقۇچنى ئىمپورت قىلىش:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" msgstr "" -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" +#: ../pkcs11/seahorse-pkcs11-request.c:104 +#| msgid "Couldn't verify signature." +msgid "Couldn't save certificate request" msgstr "" -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" msgstr "" -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:523 -msgid "_Import" -msgstr "ئىمپورت قىل(_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" +#: ../pkcs11/seahorse-pkcs11-request.c:138 +#| msgid "Certificate" +msgid "Certificate request" msgstr "" -#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:257 -msgid "Couldn't export keys" -msgstr "ئاچقۇچنى ئېكسپورت قىلالمىدى" - -#: ../src/seahorse-key-manager-store.c:883 -msgid "Validity" -msgstr "ئۈنۈملۈكلۈكى" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:902 -msgid "Expiration Date" -msgstr "ئاخىرلىشىدىغان چېسلا" - -#: ../src/seahorse-keyserver-results.c:247 -msgid "Close this window" -msgstr "بۇ كۆزنەكنى ياپىدۇ" - -#: ../src/seahorse-keyserver-results.c:248 -msgid "_Expand All" -msgstr "ھەممىنى ياي(_E)" - -#: ../src/seahorse-keyserver-results.c:249 -msgid "Expand all listings" -msgstr "ھەممىنى ياي" - -#: ../src/seahorse-keyserver-results.c:250 -msgid "_Collapse All" -msgstr "ھەممىنى قاتلا(_C)" - -#: ../src/seahorse-keyserver-results.c:251 -msgid "Collapse all listings" +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" msgstr "" -#: ../src/seahorse-keyserver-results.c:322 -msgid "Remote Keys" +#: ../pkcs11/seahorse-pkcs11-request.c:194 +#| msgid "Couldn't generate key" +msgid "Couldn't create certificate request" msgstr "" -#: ../src/seahorse-keyserver-results.c:324 -#, c-format -msgid "Remote Keys Containing '%s'" +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." msgstr "" -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." msgstr "" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +#| msgid "_Name:" +msgid "Name (CN):" msgstr "" -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "يىراقتىكى ئاچقۇچنى ئىزدە" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." +#: ../pkcs11/seahorse-private-key.c:132 +#| msgid "Private Key" +msgid "Unnamed private key" msgstr "" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "ئىمنى ئۆچۈرۈش" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "ئىزدە(_S)" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "يېڭى ئىم(_P):" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "يېڭى ئىمنى جەزملەيدۇ" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "ئاچقۇچىنى مۇلازىمېتىرغا تارقىتالمىدى" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "ئىمنى جەزملەش(_F):" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "ئىم ۋە شىفىرلاش ئاچقۇچلىرىنى باشقۇرىدۇ" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "" +#: ../src/seahorse-generate-select.c:229 +#| msgid "C_ontinue" +msgid "Continue" +msgstr "داۋاملاشتۇر" -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "قۇرىدىغان تۇرنىڭ تىپىنى تاللاڭ(_S):" -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "" +#: ../src/seahorse-import-dialog.c:98 +#| msgid "Import from a file" +msgid "Import failed" +msgstr "ئىمپورت قىلىش مەغلۇپ بولدى" -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "" +#: ../src/seahorse-import-dialog.c:116 +#| msgid "_Import" +msgid "Import" +msgstr "ئەكىر" -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." +#: ../src/seahorse-import-dialog.c:129 +#| msgid "Dates:" +msgid "Data to be imported:" msgstr "" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" +#: ../src/seahorse-key-manager.c:255 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "ئاچقۇچ ئىمپورت قىلىش" -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "" +#: ../src/seahorse-key-manager.c:267 +msgid "All key files" +msgstr "بارلىق ئاچقۇچ ھۆججەتلىرى" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" +#: ../src/seahorse-key-manager.c:368 +msgid "Dropped text" msgstr "" -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "بۇ پروگراممىنىڭ نەشرى" - -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144 -msgid "Encryption Key Manager" -msgstr "شىفىرلاش ئاچقۇچىنى باشقۇرغۇ" - -#: ../src/seahorse-viewer.c:120 -msgid "Contributions:" +#: ../src/seahorse-key-manager.c:391 +msgid "Clipboard text" msgstr "" -#: ../src/seahorse-viewer.c:146 -msgid "translator-credits" -msgstr "Gheyret Kenji \n" -"Sahran\n" -"Muhemmed Erdem " - -#: ../src/seahorse-viewer.c:149 -msgid "Seahorse Project Homepage" -msgstr "Seahorse قۇرۇلۇشى تورتۇراسى" - -#. Top menu items -#: ../src/seahorse-viewer.c:169 -msgid "_File" -msgstr "ھۆججەت(_F)" - -#: ../src/seahorse-viewer.c:170 -msgid "_Edit" -msgstr "تەھرىر(_E)" - -#: ../src/seahorse-viewer.c:171 -msgid "_View" -msgstr "كۆرۈنۈش(_V)" +#: ../src/seahorse-key-manager.c:518 +#| msgid "_New..." +msgid "_New" +msgstr "يېڭى(_N)" -#: ../src/seahorse-viewer.c:172 -msgid "_Help" -msgstr "ياردەم(_H)" +#: ../src/seahorse-key-manager.c:520 +msgid "Close this program" +msgstr "بۇ پروگراممىنى ياپىدۇ" -#: ../src/seahorse-viewer.c:174 -msgid "Prefere_nces" -msgstr "مايىللىق(_N)" +#: ../src/seahorse-key-manager.c:521 ../src/seahorse-key-manager.c:523 +msgid "_New..." +msgstr "يېڭى(_N)..." -#: ../src/seahorse-viewer.c:175 -msgid "Change preferences for this program" +#: ../src/seahorse-key-manager.c:522 +msgid "Create a new key or item" +msgstr "يېڭى ئاچقۇچ ياكى تۈر قۇرىدۇ" + +#: ../src/seahorse-key-manager.c:524 +#| msgid "Create a new key or item" +msgid "Add a new key or item" msgstr "" -#: ../src/seahorse-viewer.c:178 -msgid "About this program" -msgstr "بۇ پروگرامما ھەققىدە" +#: ../src/seahorse-key-manager.c:525 +msgid "_Import..." +msgstr "ئىمپورت قىل(_I)…" -#: ../src/seahorse-viewer.c:179 -msgid "_Contents" -msgstr "مەزمۇنلار(_C)" +#: ../src/seahorse-key-manager.c:526 +msgid "Import from a file" +msgstr "ھۆججەتتىن ئەكىر" -#: ../src/seahorse-viewer.c:180 -msgid "Show Seahorse help" -msgstr "" +#: ../src/seahorse-key-manager.c:528 +msgid "Import from the clipboard" +msgstr "چاپلاش تاختىسىدىن ئىمپورت قىل" -#: ../src/seahorse-viewer.c:277 -msgid "Export public key" -msgstr "ئاممىۋى ئاچقۇچنى ئېكسپورت قىل" +#: ../src/seahorse-key-manager.c:532 +msgid "By _keyring" +msgstr "" -#: ../src/seahorse-viewer.c:297 -msgid "Exporting keys" +#: ../src/seahorse-key-manager.c:533 +msgid "Show sidebar listing keyrings" msgstr "" -#: ../src/seahorse-viewer.c:322 -msgid "Couldn't retrieve data from key server" +#: ../src/seahorse-key-manager.c:537 +msgid "Show _personal" msgstr "" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:341 -msgid "Copied keys" +#: ../src/seahorse-key-manager.c:538 +msgid "Only show personal keys, certificates and passwords" msgstr "" -#: ../src/seahorse-viewer.c:361 -msgid "Retrieving keys" +#: ../src/seahorse-key-manager.c:539 +msgid "Show _trusted" msgstr "" -#: ../src/seahorse-viewer.c:376 -msgid "Couldn't delete." -msgstr "ئۆچۈرەلمىدى." +#: ../src/seahorse-key-manager.c:540 +msgid "Only show trusted keys, certificates and passwords" +msgstr "" -#: ../src/seahorse-viewer.c:410 -msgid "Deleting..." -msgstr "ئۆچۈرۈۋاتىدۇ…" +#: ../src/seahorse-key-manager.c:541 +msgid "Show _any" +msgstr "" -#: ../src/seahorse-viewer.c:436 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s خۇسۇسىي ئاچقۇچ. راستلا بىر تەرەپ قىلىۋېرەمسىز؟" +#: ../src/seahorse-key-manager.c:542 +msgid "Show all keys, certificates and passwords" +msgstr "" -#: ../src/seahorse-viewer.c:484 -msgid "Importing keys from key servers" -msgstr "ئاچقۇچ مۇلازىمېتىرىدىن ئاچقۇچلارنى ئىمپورت قىلىۋاتىدۇ" +#: ../src/seahorse-key-manager.c:750 +#| msgid "Filter:" +msgid "Filter" +msgstr "سۈزگۈچ" -#: ../src/seahorse-viewer.c:510 -msgid "Show properties" -msgstr "" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "تۇنجى قېتىمقى تاللانمىلار:" -#: ../src/seahorse-viewer.c:511 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "ئۆچۈر(_D)" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "ئۆزى يېڭى ئاچقۇچ قۇرىدۇ: " -#: ../src/seahorse-viewer.c:512 -msgid "Delete selected items" -msgstr "تاللانغان تۈرلەرنى ئۆچۈر" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "ھۆججەتتىن بار بولغان ئاچقۇچنى ئىمپورت قىلىش:" -#: ../src/seahorse-viewer.c:516 -msgid "E_xport..." -msgstr "ئېكسپورت قىل(_X)..." +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "شىفىرلاشنى باشلاش ئۈچۈن ئاچقۇچلار زۆرۈر بولىدۇ." -#: ../src/seahorse-viewer.c:517 -msgid "Export to a file" -msgstr "ھۆججەتكە چىقار" +#: ../src/seahorse-main.c:54 +msgid "Version of this application" +msgstr "بۇ پروگراممىنىڭ نەشرى" -#: ../src/seahorse-viewer.c:519 -msgid "Copy to the clipboard" +#: ../src/seahorse-sidebar.c:799 +#| msgid "Couldn't lock keyring" +msgid "Couldn't lock" msgstr "" -#: ../src/seahorse-viewer.c:524 -msgid "Import selected keys to local key ring" +#: ../src/seahorse-sidebar.c:836 +#| msgid "Couldn't unlock keyring" +msgid "Couldn't unlock" msgstr "" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "قۇلۇپلا(_L)" -#: ../ssh/seahorse-ssh-commands.c:85 +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "قۇلۇپ ئاچ(_U)" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "خاسلىق(_P)" + +#: ../ssh/seahorse-ssh-actions.c:88 msgid "Configure Key for _Secure Shell..." -msgstr "" +msgstr "بىخەتەر Shell نىڭ ئاچقۇچىنى سەپلەڭ…" -#: ../ssh/seahorse-ssh-commands.c:86 +#: ../ssh/seahorse-ssh-actions.c:89 msgid "" "Send public Secure Shell key to another machine, and enable logins using " "that key." +msgstr "بىخەتەر Shell نىڭ ئاممىۋى ئاچقۇچىنى باشقا ماشىنىغا ئەۋەتىدۇ، شۇ ئارقىلىق بۇ ئاچقۇچنى ئىشلىتىپ كىرىشكە ئىمكانىيەت يارىتىدۇ." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "بىخەتەر Shell نىڭ ئىمىنى كىرگۈزۈڭ:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "كونا ئاچقۇچ ئىمى" + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "%s نىڭ كونا ئىمىنى كىرگۈزۈڭ:" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "يېڭى ئاچقۇچ ئىمى" + +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "%s نىڭ يېڭى ئىمىنى كىرگۈزۈڭ:" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +#| msgid "Enter new passphrase for '%s'" +msgid "Enter the new passphrase again: %s" +msgstr "يېڭى ئىمنى قايتا كىرگۈزۈڭ: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +#| msgid "Creating Secure Shell Key" +msgid "Secure Shell" +msgstr "بىخەتەر Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" msgstr "" -#: ../ssh/seahorse-ssh-commands.c:115 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "مەخپىي shell ئاچقۇچى «%s» نى راستلا ئۆچۈرەمسىز؟" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:91 ../ssh/seahorse-ssh-deleter.c:92 #, c-format msgid "Are you sure you want to delete %d secure shell keys?" msgstr "%d مەخپىي shell ئاچقۇچلىرىنى راستلا ئۆچۈرەمسىز؟" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" +#: ../ssh/seahorse-ssh-exporter.c:92 +#| msgid "Key" +msgid "Ssh Key" msgstr "" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "" + +#: ../ssh/seahorse-ssh-exporter.c:126 +#| msgid "Public Key" +msgid "Public SSH keys" +msgstr "" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." msgstr "" -#: ../ssh/seahorse-ssh-generate.c:90 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "بىخەتەر shell ئاچقۇچى" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "باشقا كومپيۇتېرلارنى زىيارەت قىلىش ئۈچۈن ئىشلىتىلىدۇ(مەسىلەن: تېرمىنالنى ئىشلىتىپ)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Secure Shell ئاچقۇچىنى ھاسىل قىلالمىدى" -#: ../ssh/seahorse-ssh-generate.c:213 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Secure Shell ئاچقۇچىنى قۇرۇۋاتىدۇ" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "يېڭى بىخەتەر Shell ئاچقۇچى" + #: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" +msgid "_Just Create Key" +msgstr "ئاچقۇچلا قۇر(_J)" #: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" +msgid "_Create and Set Up" +msgstr "قۇر ۋە تەڭشە(_C)" #: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" - -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." msgstr "" -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." msgstr "" #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "" - -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "" +msgid "DSA" +msgstr "DSA" #: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." msgstr "" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(ئوقۇغىلى بولمايدىغان Secure Shell ئاچقۇچى)" -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "ئىناۋەتسىز" - -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" msgstr "" -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" msgstr "" -#: ../ssh/seahorse-ssh-key-properties.c:71 +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "ئاچقۇچ ئاتىنى ئۆزگەرتەلمىدى." -#: ../ssh/seahorse-ssh-key-properties.c:112 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." -msgstr "" +msgstr "ئاچقۇچنىڭ سالاھىيەت دەلىللىشىنى ئۆزگەرتكىلى بولمىدى." -#: ../ssh/seahorse-ssh-key-properties.c:127 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." -msgstr "" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "ئالگورىزىم:" +msgstr "ئاچقۇچنىڭ ئىمىنى ئۆزگەرتكىلى بولمىدى." -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" -msgstr "" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "" +msgstr "كىملىكى:" #: ../ssh/seahorse-ssh-key-properties.xml.h:5 msgid "Name:" msgstr "ئاتى:" #: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "" +msgid "Used to connect to other computers." +msgstr "باشقا كومپيۇتېرلار بىلەن ئالاقە قىلىشقا ئىشلىتىلىدۇ." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 msgid "Trust" -msgstr "" +msgstr "ئىشەنچلىك" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "بۇ ئاچقۇچنىڭ ئىگىسىنىڭ بۇ كومپيۇتېرغا باغلىنىش سالاھىيىتى بار(_A)" #: ../ssh/seahorse-ssh-key-properties.xml.h:13 #, no-c-format msgid "This only applies to the '%s' account." -msgstr "" +msgstr "بۇ پەقەت '%s' ھېساباتى ئۈچۈن ئىشلىتىلىدۇ." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Algorithm:" +msgstr "ئالگورىزىم:" #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "" +msgid "Strength:" +msgstr "كۈچلۈكلۈكى:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Location:" +msgstr "ئورنى:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "" +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "E_xport Complete Key" +msgstr "تولۇق ئاچقۇچنى ئېكسپورت قىل(_X)" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." -msgstr "" +msgstr "SSH بۇيرۇقى ئويمىغان يەردىن توختاپ قالدى." -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." -msgstr "" - -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "" +msgstr "SSH بۇيرۇقى مەغلۇپ بولدى." -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "ئىم جۈملىسى:" - -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" -msgstr "" - -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "" - -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "" - -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "" +msgstr "يىراقتىكى ماشىنا ئىمى" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "" - -#: ../ssh/seahorse-ssh-operation.c:864 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" -msgstr "" +msgstr "ئاچقۇچنىڭ ئىمىنى كىرگۈزۈڭ" -#: ../ssh/seahorse-ssh-operation.c:931 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" -msgstr "" - -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "" +msgstr "يېڭى بىخەتەر Shell ئاچقۇچىنىڭ ئىمى" -#: ../ssh/seahorse-ssh-operation.c:1013 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "ئاچقۇچ ئىمپورت قىلىۋاتىدۇ: %s" -#: ../ssh/seahorse-ssh-operation.c:1015 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "ئاچقۇچلارنى ئىمپورت قىلىۋاتىدۇ. passphrase كىرگۈزۈڭ" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" msgstr "" -#: ../ssh/seahorse-ssh-upload.c:45 +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "مەزكۇر ئاچقۇچقا ماس كېلىدىغان خۇسۇسىي ئاچقۇچ يوق." + +#: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." msgstr "يىراقتىكى كومپيۇتېردىكى Secure Shell ئاچقۇچىنى سەپلىيەلمىدى." -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 +#: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." -msgstr "" +msgstr "بىخەتەر Shell ئاچقۇچلىرىنى سەپلەۋاتىدۇ…" #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "eg: fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" -msgstr "" +msgstr "كومپيۇتېرنى SSH بىلەن باغلىنىدىغان قىلىپ تەڭشە" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." -msgstr "" +msgstr "SSH ئىشلەتكەن باشقا بىر كومپيۇتېر بىلەن بىخەتەر(Secure Shell) Shell نى ئىشلىتىش ئۈچۈن، ئۇ كومپيۇتېردا ھېساباتىڭىز بولۇشى كېرەك." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "eg: fileserver.example.com:port" #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" -msgstr "" +msgstr "كومپيۇتېر ئاتى(_C):" #: ../ssh/seahorse-ssh-upload.xml.h:6 msgid "_Login Name:" -msgstr "" +msgstr "كىرىش ئاتى(_L):" #: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" -msgstr "" +msgstr "تەڭشە(_S)" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "seahorse-daemon نى daemon سۈپىتىدە ئىجرا قىلغىلى بولمىدى" + +#~ msgid "Signed by expired on %s." +#~ msgstr "" +#~ "%2$s دىكىۋاقتى ئوتكەن のبىلەن ئىمزا قويۇلغان" + +#~ msgid "Invalid Signature" +#~ msgstr "ئىناۋەتسىز ئىمزا" + +#~ msgid "Signed by on %s Expired." +#~ msgstr "" +#~ "%2$s دىكىۋاقتى ئوتكەن のبىلەن ئىمزا قويۇلغان" + +#~ msgid "Expired Signature" +#~ msgstr "ۋاقتى ئوتكەن ئىمزا" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr "" +#~ "%2$s دىكىمەغلۇپ بولغان بىلەن ئىمزا قويۇلغان" + +#~ msgid "Signed by on %s." +#~ msgstr "%2$s دىكى بىلەن ئىمزا قويۇلغان" + +#~ msgid "Good Signature" +#~ msgstr "ئېسىل ئىمزا" + +#~ msgid "Unknown Signature" +#~ msgstr "نامەلۇم ئىمزا" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "" +#~ "توغرا بولمىغان ياكى ساختا ئىمزا (ئىمزا سانلىق-مەلۇماتى ئۆزگەرتىلىپتۇ)" + +#~ msgid "Bad Signature" +#~ msgstr "توغرا بولمىغان ئىمزا" + +#~ msgid "No recipients specified" +#~ msgstr "تاپشۇرۇۋالغۇچى كۆرسىتىلمىدى" + +#~ msgid "Invalid key id: %s" +#~ msgstr "ئاچقۇچ id سى ئىناۋەتسىز: %s" + +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "DNS-SD ھەمبەھىرىنى قوزغات" + +#~ msgid "ID of the default key" +#~ msgstr "كۆڭۈلدىكى كۇنۇپكىنىڭ ID سى" + +#~ msgid "Last key used to sign a message." +#~ msgstr "ئۇچۇرغا ئىمزا قويغاندا ئىشلەتكەن ئەڭ ئاخىرقى ئاچقۇچ." + +#~ msgid "PGP Key servers" +#~ msgstr "PGP ئاچقۇچ مۇلازىمېتىرى" + +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "" +#~ "ئۇچۇرغا ئىمزا قويغاندا ئىشلەتكەن ئەڭ ئاخىرقى مەخپىي ئاچقۇچنىڭ ID سى." + +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "ASCII" + +#~ msgid "Path:" +#~ msgstr "يول:" + +#~ msgid "Permissions:" +#~ msgstr "ھوقۇقلار:" + +#~ msgid "Applications" +#~ msgstr "پروگراممىلار" + +#~ msgid "_Read" +#~ msgstr "ئوقۇ(_R)" + +#~ msgid "_Write" +#~ msgstr "ياز(_W)" + +#~ msgid "Passwords: %s" +#~ msgstr "ئىملار:%s" + +#~ msgid "Deleting item..." +#~ msgstr "تۈرلەرنى ئۆچۈرۈۋاتىدۇ..." + +#~ msgid "Search Results" +#~ msgstr "ئىزدەش نەتىجىسى" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ھۆججەت ئىناۋەتلىك .desktop ھۆججىتى ئەمەس." + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "تونۇيالمىغان ئۈستەلئۈستى ھۆججەت نەشرى '%s'" + +#~ msgid "Starting %s" +#~ msgstr "%s قوزغىلىۋاتىدۇ" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "پروگرامما بۇيرۇق قۇرىدا پۈتۈكنى قوبۇل قىلالمايدۇ" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "تونۇمايدىغان ئىجرا تاللانمىسى: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "URI پۈتۈكنى 'Type=Link' ئۈستەلئۈستى تۈرىگە يوللىيالمىدى." + +#~ msgid "Not a launchable item" +#~ msgstr "ئىجراچان تۈر ئەمەس" + +#~ msgid "Disable connection to session manager" +#~ msgstr "ئەڭگىمە باشقۇرغۇچقا باغلىنىشنى چەكلە" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "سەپلىمە ساقلانغان ھۆججەتنى بەلگىلە" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "ئەڭگىمە باشقۇرغۇ ID سېنى بەلگىلە" + +#~ msgid "Session management options:" +#~ msgstr "ئەڭگىمە باشقۇرغۇ تاللانمىلىرى:" + +#~ msgid "Show session management options" +#~ msgstr "ئەڭگىمە باشقۇرغۇ تاللانمىلىرى كۆرسەت" + +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "ئاچقۇچ(لار) ئىمپورت قىلىندى" + +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "%i دانە ئاچقۇچ ئىمپورت قىلىندى" + +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "تۆۋەندىكى ئاچقۇچ(لار) ئىمپورت قىلىندى:" + +#~ msgid "Notification Messages" +#~ msgstr "ئۇقتۇرۇش ئۇچۇرلىرى" + +#~ msgid "Identity" +#~ msgstr "سالاھىيەت" + +#~ msgid "Couldn't run file-roller" +#~ msgstr "'file-roller' نى ئىجرا قىلغىلى بولمىدى" + +#~ msgid "Couldn't package files" +#~ msgstr "ھۆججەتلەرنى بوغچىلىغىلى بولمىدى" + +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "'file-roller' مۇۋەپپەقىيەتلىك قوزغىلالمىدى" + +#~ msgid "Archive files" +#~ msgstr "ئارخىپ ھۆججەتلەر" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "ئوخشاش ئاتتىكى ھۆججەت مەۋجۇت.\n" +#~ "\n" +#~ "ئۇنى يېڭى ھۆججەتتە قاپلىۋېتەمسىز؟" + +#~ msgid "_Replace" +#~ msgstr "ئالماشتۇر(_R)" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "ئاچقۇچنى «%s» غا ئېكسپورت قىلالمىدى" + +#~ msgid "Create New ..." +#~ msgstr "يېڭىدىن قۇرۇش..." + +#~ msgid "Importing keys" +#~ msgstr "ئاچقۇچلارنى ئىمپورت قىلىۋاتىدۇ" + +#~ msgid "Validity" +#~ msgstr "ئۈنۈملۈكلۈكى" + +#~ msgid "_Expand All" +#~ msgstr "ھەممىنى ياي(_E)" + +#~ msgid "Expand all listings" +#~ msgstr "ھەممىنى ياي" + +#~ msgid "_Collapse All" +#~ msgstr "ھەممىنى قاتلا(_C)" + +#~ msgid "Export public key" +#~ msgstr "ئاممىۋى ئاچقۇچنى ئېكسپورت قىل" + +#~ msgid "Deleting..." +#~ msgstr "ئۆچۈرۈۋاتىدۇ…" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s خۇسۇسىي ئاچقۇچ. راستلا بىر تەرەپ قىلىۋېرەمسىز؟" + +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "ئۆچۈر(_D)" + +#~ msgid "Invalid" +#~ msgstr "ئىناۋەتسىز" + +#~ msgid "Passphrase:" +#~ msgstr "ئىم جۈملىسى:" diff -Nru seahorse-3.2.2/po/uk.po seahorse-3.6.3/po/uk.po --- seahorse-3.2.2/po/uk.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/uk.po 2012-09-25 14:50:51.000000000 +0200 @@ -2,32 +2,29 @@ # Yuri Syrota , 2000. # Maxim Dziumanenko , 2004-2010 # wanderlust , 2009. -# Korostil Daniel , 2011. +# Korostil Daniel , 2011, 2012. +# Re. , 2012. msgid "" msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-28 03:20+0300\n" -"PO-Revision-Date: 2011-09-28 03:28+0300\n" -"Last-Translator: Korostil Daniel \n" -"Language-Team: translation@linux.org.ua\n" +"POT-Creation-Date: 2012-09-20 23:13+0300\n" +"PO-Revision-Date: 2012-09-20 23:12+0300\n" +"Last-Translator: Re. \n" +"Language-Team: linux.org.ua\n" "Language: uk\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" -"X-Generator: Virtaal 0.6.1\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Virtaal 0.7.1\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "Додати сховище ключів паролю" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Назва нової в'язки ключів:" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." @@ -35,308 +32,294 @@ "Виберіть назву нової в'язки ключів. Вас буде запитано пароль для її " "розблокування." +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Назва нової в'язки ключів:" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "Назва вузла чи адреса сервера." -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Не вдається додати в'язку ключів" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "Створити пароль сховища ключів" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Використовується для зберігання паролів програм та мережних вузлів" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Створити пароль…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Безпечно зберегти пароль або секрет." + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "В'язка ключів" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Збережений пароль" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Не вдається встановити типову в'язку ключів" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Не вдається змінити пароль в'язки ключів" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "_Встановити типовим" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Програми зберігають свої паролі у типовій в'язці." + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Змінити _пароль" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Змінити головний пароль, що розблоковує типову в'язку ключів" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "Неможливо додати об'єкт" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "Додати пароль" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Опис:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "_В'язка ключів" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "_Пароль:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "П_оказати пароль" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "Неможливо вилучити об'єкт" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_В'язка ключів" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Не вдається додати в'язку ключів" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "Паролі" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Збережені особисті паролі, реєстраційні дані та таємниці" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Пароль облікового запису обміну повідомленнями для" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Пароль або таємниця" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Мережний пароль" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Збережена примітка" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Пароль від сховища ключів" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Пароль від шифрованого ключа" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Пароль від складу ключів" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Пароль від Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Пароль від мережевого облікового запису Gnome" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Пароль від Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Пароль від обміну повідомленнями" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Таємниця керування мережею" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" -msgstr "Дійсно бажаєте остаточно видалити пароль «%s»?" +msgstr "Остаточно вилучити пароль «%s»?" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" -msgstr[0] "Дійсно бажаєте остаточно видалити %d пароль?" -msgstr[1] "Дійсно бажаєте остаточно видалити %d паролі?" -msgstr[2] "Дійсно бажаєте остаточно видалити %d паролів?" - -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "Вилучення об'єкта" -msgstr[1] "Вилучення об'єктів" -msgstr[2] "Вилучення об'єктів" +msgstr[0] "Остаточно вилучити %d пароль?" +msgstr[1] "Остаточно вилучити %d паролі?" +msgstr[2] "Остаточно вилучити %d паролів?" -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "Надає доступ до мережного сховища чи ресурсу" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "Надає доступ до веб-сайту" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "Розблокувати ключ PGP" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "Розблокувати ключ віддаленого командного рядка" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "Збережений пароль чи обліковий запис" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "Мережні рекомендації" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "Пароль" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Не вдається змінити пароль." -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "Оновлення паролю" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Не вдається відновити опис." #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Пароль:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Подробиці:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Подробиці" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Властивості ключа" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Ключ" +msgid "Use:" +msgstr "Використовувати:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Властивості ключа" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Тип:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "Обліковий запис:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "Сервер:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "Обліковий запис:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "Показати _пароль" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Тип:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "Використовувати:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "Паролі: %s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "Паролі: %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "В'язка ключів" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "Використовується для зберігання паролів програм та мережних вузлів" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "Збережений пароль" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "Безпечно зберегти пароль або секрет." - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "Не вдається розблокувати в'язку ключів" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "Не вдається заблокувати в'язку ключів" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "Не вдається встановити типову в'язку ключів" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "Не вдається змінити пароль в'язки ключів" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "_Блокувати" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Блокувати в'язку для зберігання паролів. Для розблокування в'язки треба буде " -"ввести головний пароль." - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "_Розблокувати" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Розблокувати в'язку ключів для збереження паролів з використанням головного " -"паролю." - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "_Встановити типовим" +msgid "Password:" +msgstr "Пароль:" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Програми зберігають свої паролі у типовій в'язці." +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Ключ" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "Змінити _пароль" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Подробиці:" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "Змінити головний пароль, що розблоковує типову в'язку ключів" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Подробиці" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "Неможливо вилучити сховище ключів" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Сховище ключів, які автоматично розблоковуються на вході" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Сховище ключів для зберігання ключів" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "Дійсно бажаєте видалити в'язку ключів «%s»?" +msgstr "Вилучити сховище ключів «%s»?" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "Вилучення сховища ключів" -msgstr[1] "Вилучення сховищ ключів" -msgstr[2] "Вилучення сховищ ключів" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Я розумію, що всі об'єкти буде остаточно вилучено." + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Властивості в'язки" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "Назва:" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "Створено:" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "В'язка ключів" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Властивості в'язки" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "_Назва" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "Операцію скасовано" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "Доступ до в'язки заборонений" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "Служба в'язок GNOME не запущена" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "В'язок вже розблокувати" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "Немає такого в'язки" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "Не вдається зв'язатися з службою в'язок" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "Елемент вже існує" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "Внутрішня помилка при доступі до в'язок GNOME" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "Ознаки показу" @@ -593,268 +576,326 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "початковий тимчасовий пункт" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "Додати сервер ключів" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Вузол:" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "Тип сервера ключів:" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Вузол:" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Порт для доступу до сервера." +msgid ":" +msgstr ":" #: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "початковий тимчасовий пункт" +msgid "The port to access the server on." +msgstr "Порт для доступу до сервера." -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "Пароль" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Версія програми" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "Пароль:" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "— Системні параметри" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "Підтвердження:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Підтримка:" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "Некоректна адреса сервера ключів." +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Паролі й ключі" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" msgstr "" -"Для отримання довідки зв'яжіться з Вашим адміністратором та адміністратором " -"сервера ключів." +"Юрій Сирота \n" +"Максим Дзюманенко " -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Домашня сторінка проекту Seahorse" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "Інший" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Неможливо вилучити" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "Немає: не публікувати ключі" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Не вдається експортувати ключі" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Автоматично отримувати _ключі з серверів" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Неможливо експортувати дані" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Автоматично синхронізувати з_мінені ключі з серверами ключів" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Файл" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Сервери ключів" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Експорт..." -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Експортувати у файл" + +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Правка" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Копіювати у буфер обміну" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Вилучити" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Вилучити вибрані об'єкти" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Показати властивості цього об'єкта" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Показати властивості цих сховищ ключів" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "П_араметри" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Налаштувати програму" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Вигляд" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "_Довідка" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Про цю програму" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "_Зміст" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Показати довідку з Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Експортувати" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Ввести PIN або пароль для: %s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "Пароль:" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "Підтвердження:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "Некоректна адреса сервера ключів." + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "" +"Для отримання довідки зв'яжіться з Вашим адміністратором та адміністратором " +"сервера ключів." + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "Інший" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "Немає: не публікувати ключі" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "Параметри" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "Зн_айти ключі за допомогою:" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "_Публікувати ключі у:" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "Одержання даних" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "Експортування даних" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "Імпортування даних" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "Автоматично отримувати _ключі з серверів" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "Надсилання даних" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Автоматично синхронізувати з_мінені ключі з серверами ключів" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "Недоступно" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "Сервери ключів" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d-%M-%Y" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "Дані ключа" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "Декілька ключів" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "Усі файли ключів" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Усі файли" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "Архівні файли" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Файл з такою назвою існує.\n" -"\n" -"Замінити його новим файлом?" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "_Замінити" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Невідомо" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Не довіряю" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Слабо" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Повністю" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Безумовно" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Вимкнений" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Відкликаний" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Не вдалось показати довідку: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Дата закінчення дії:" +msgid "Never E_xpires" +msgstr "Ніколи _не закінчується термін дії" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Створити новий підключ" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Якщо дія ключа ніколи не закінчується" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "Т_ип ключа:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "Дов_жина ключа:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "Т_ип ключа:" +msgid "Expiration Date:" +msgstr "Дата закінчення дії:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Довжина ключа" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "Ніколи _не закінчується термін дії" +msgid "Generate a new subkey" +msgstr "Створити новий підключ" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Додати ідентифікатор користувача" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Створити новий ідентифікатор користувача" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Повне _ім'я:" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Коментар до ключа:" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Довжина повинна бути не менша ніж 5 символів" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Необов'язкова адреса ел.пошти" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Необов'язковий коментар з описом ключа" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Необов'язкова адреса ел.пошти" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "Повне _ім'я:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "_Адреса ел.пошти" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Коментар до ключа:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Створити новий ідентифікатор користувача" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "_Змінити" +msgid "_Never expires" +msgstr "_Ніколи не закінчується" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Відкликати ключ" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "_Ніколи не закінчується" +msgid "C_hange" +msgstr "_Змінити" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -865,7 +906,7 @@ msgid "Add subkey to %s" msgstr "Додати підключ до %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (лише підпис)" @@ -873,7 +914,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (лише шифрування)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (лише підпис)" @@ -896,6 +937,11 @@ "Не вдається розшифрувати. Можливо, відсутній потрібний ключ для " "розшифровування." +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Операцію скасовано" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Некоректний термін дії" @@ -913,46 +959,149 @@ msgid "Expiry: %s" msgstr "Дійсний до: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Декілька ключів" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Дані ключа" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Захищені ключі через PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Ключ PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Ключ PGP" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Використовується для шифрування пошти та файлів" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Не вдається створити ключ PGP" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Пароль для нового PGP ключа" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Введіть пароль для нового ключа двічі." -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"Коли створюєте ключ, потрібно породити багато\n" +"випадкових даних і потрібна ваша поміч. Було б добре\n" +"виконати певні всілякі дії, як-от, клацання по\n" +"клавіатурі, рухання мишкою, користування програмами.\n" +"Це дає системі випадкові дані, які їй потрібно." + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Створення ключа" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Остаточно вилучити %s?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Остаточно вилучити %d ключ?" +msgstr[1] "Остаточно вилучити %d ключі?" +msgstr[2] "Остаточно вилучити %d ключів?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Неправильний пароль" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Ви тричі ввели неправильний пароль. Спробуйте ще раз." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Неправильний пароль." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Введіть новий пароль для '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Введіть пароль для '%s'" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Введіть новий пароль" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Введіть пароль" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Пароль" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Завантажено %d ключ" +msgstr[1] "Завантажено %d ключі" +msgstr[2] "Завантажено %d ключів" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Некоректні дані ключа (відсутні ідентифікатори користувача). Причиною можуть " +"бути некоректний час у комп'ютері, наприклад, час у майбутньому або " +"відсутній підпис." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Ключі GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: типовий каталог сховища ключів" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -987,29 +1136,33 @@ msgid "All JPEG files" msgstr "Всі файли формату JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Усі файли" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Виберіть фотографію для додавання до ключа" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "Неможливо підготувати фотографію" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Не вдається додати фотографію" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Не вдається завантажити файл. Може бути, він має некоректний формат" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" -msgstr "Ви дійсно хочете видалити поточну фотографію з ключа?" +msgstr "Вилучити поточну фотографію з ключа?" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" -msgstr "Не вдається видалити зображення" +msgstr "Неможливо вилучити фотографію" #: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" @@ -1065,7 +1218,11 @@ msgid "Couldn't add revoker" msgstr "Не вдається додати позначку про відкликання" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Я розумію, що ця таємний ключ остаточно буде вилучено." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1080,11 +1237,11 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Немає придатних ключів для підпису" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1092,510 +1249,571 @@ "У вас немає особистого ключа PGP, необхідного для того, щоб висловити довіру " "цьому ключу." -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "Неправильний пароль." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Введіть новий пароль для '%s'" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Параметри пошуку були недостатньо визначеними. Сервер '%s' видав надто " +"багато ключів." -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Введіть пароль для '%s'" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Не вдається зв'язатись з сервером '%s': %s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Введіть новий пароль" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Сервер ключів HTTP" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "Введіть пароль" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Не вдається імпортувати ключі" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Імпортувати ключі з сервера ключів" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "_Мережа" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Закрити це вікно" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "З_найти віддалені ключі..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Шукати ключі на сервері ключів" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Імпорт" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Імпортувати вибрані ключі у локальну в'язку" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Ключі з мережі" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Завантажено %d ключ" -msgstr[1] "Завантажено %d ключі" -msgstr[2] "Завантажено %d ключів" +msgid "Remote Keys Containing '%s'" +msgstr "Ключі з мережі, що містять '%s'" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Не вдалось знайти ключі." + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Знайти ключі у мережі" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Некоректні дані ключа (відсутні ідентифікатори користувача). Причиною можуть " -"бути некоректний час у комп'ютері, наприклад, час у майбутньому або " -"відсутній підпис." +"Так можна знайти інші ключі у мережі. Ці ключі будуть внесені у локальну " +"в'язу." -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "П_ошук ключів, що містять: " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "Сервер ключів HTTP" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Сервери ключів:" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Ключі, що публікуються у локальній мережі:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Де шукати:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Пошук" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Не вдається опублікувати ключі на сервері" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Параметри пошуку були недостатньо визначеними. Сервер '%s' видав надто " -"багато ключів." +msgid "Couldn't retrieve keys from server: %s" +msgstr "Не вдається завантажити ключі з сервера: %s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Не вдається зв'язатись з сервером '%s': %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d ключ вибрано для синхронізації" +msgstr[1] "%d ключі вибрано для синхронізації" +msgstr[2] "%d ключі вибрано для синхронізації" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Синхронізація ключів..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Синхронізувати ключі" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Зараз ключі з вашої в'язки будуть опубліковані на сервері та стануть " +"доступними для інших. Також ви отримаєте інформацію, що оновлюється з " +"останнього підключення до сервера ключів." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Зараз усі зміни, зроблені з останнього з'єднання до сервера будуть " +"перенесені на комп'ютер. Серверів для публікації ключів обрано не було, тому " +"ваші ключі не будуть доступні іншим." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "_Сервера ключів" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "_Синхронізувати" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Не вдається зв'язатись з '%s': %s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "З'єднання: %s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Не вдається визначити адресу: %s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Визначення адреси сервера: %s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Сервер ключів LDAP" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "Підписати _ключ..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "Підписати публічний ключ" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Ви впевнені, що бажаєте остаточно видалити %s?" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Дійсно бажаєте остаточно видалити %d ключів та ідентифікаторів?" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Дійсно бажаєте остаточно видалити %d ключ?" - -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Ви дійсно хочете остаточно видалити %d ідентифікаторів?" - -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "Не вдається видалити ідентифікатор користувача" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "_Синхронізувати та опублікувати ключі..." -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "Неможливо вилучити закритий ключ" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Опублікувати ключі та синхронізувати з серверами у мережі." -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "Неможливо вилучити відкритий ключ" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Ключі PGP" + +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Ключі PGP для шифрування пошти або файлів" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "_Додаткові параметри ключа" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "_Створити" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "Ключ PGP дозволяє шифрувати пошту та файли для інших людей." +msgid "Generate a new key" +msgstr "Створити новий ключ" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Алгоритми" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "Ключ PGP дозволяє шифрувати пошту та файли для інших людей." -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "_Створити" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Коментар:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "_Термін закінчення:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "Н_іколи не закінчується" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Тип шифрування:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Створити новий ключ" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Міцність ключа (біти):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "Н_іколи не закінчується" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Новий ключ PGP" +msgid "E_xpiration Date:" +msgstr "_Термін закінчення:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Коментар:" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "_Додаткові параметри ключа" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "Термін вийшов" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Особистий ключ PGP" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Ключ PGP" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Ну вдається змінити головний ідентифікатор користувача" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Ви дійсно бажаєте видалити ідентифікатор користувача '%s'?" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "Неможливо вилучити ідентифікатор користувача" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Невідомо]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Ім'я/ел. пошта" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "Ідентифікатор підпису" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Не вдається змінити головну фотографію" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(невідомо)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Цей ключ закінчився %s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "Ім'я" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" -msgstr "Ви впевнені, що бажаєте остаточно видалити підключ %d з ключа %s?" +msgstr "Остаточно вилучити підключ %d з ключа %s?" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" -msgstr "Не вдається видалити підключ" +msgstr "Неможливо вилучити підключ" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Не вдається змінити рівень довіри" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Не вдається експортувати ключі у \"%s\"" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "Експортувати ключ повністю" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "Не вдається експортувати ключ." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Неможливо експортувати ключ" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Ніколи" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "Ідентифікатор" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Тип" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Створено" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Закінчується дія" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Стан" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Міцність" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Термін вийшов" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Добра" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "Ідентифікатор ключа" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Дії" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Коментарі:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Дати" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Ел. пошта:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Відбиток" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "Ідентифікатор ключа:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Не довіряю" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Імена ключів та підписи" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Цей ключ був відкликаний" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Фотографія" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Власник відкликав ключ. Його не можна використовувати." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Подробиці" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Термін дії цього ключа закінчився" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Цей ключ був відкликаний" +msgid "Add a photo to this key" +msgstr "Додати фотографію" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Термін дії цього ключа закінчився" +msgid "Remove this photo from this key" +msgstr "Видалити фотографію з цього ключа" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Тип:" +msgid "Make this photo the primary photo" +msgstr "Зробити цю фотографію головною" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Призначення:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Перейти до наступної фотографії" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "_Підключі" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Перейти до наступної фотографії" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Додати" - +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Фотографія" + #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Додати фотографію" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "Ідентифікатор ключа:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Змінити _пароль" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Назва:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Дозволяє розшифрувати фали та поштові повідомлення." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Ел. пошта:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Видалити" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Коментарі:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Закінчується дія" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Призначення:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Закінчується дія:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Тип:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Експортувати" +msgid "Decrypt files and email sent to you." +msgstr "Дозволяє розшифрувати фали та поштові повідомлення." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Закритий ключ PGP" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Перейти до наступної фотографії" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Змінити _пароль" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Перейти до наступної фотографії" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Власника" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "Ідентифікатор ключа:" +msgid "Key Names and Signatures" +msgstr "Імена ключів та підписи" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Первинний" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Зробити цю фотографію головною" +msgid "Sign" +msgstr "Підписати" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Імена та підписи" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Видалити" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "Не довіряю" +msgid "_Add Name" +msgstr "_Додати назву" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Ігнорувати _довіру власника:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Власника" +msgid "Revoke" +msgstr "Відкликати" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Первинний" +msgid "Names and Signatures" +msgstr "Імена та підписи" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Закритий ключ PGP" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "Ідентифікатор ключа:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Видалити фотографію з цього ключа" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Відкликати" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Міцність:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Підписати" +msgid "Technical Details" +msgstr "Подробиці" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Міцність:" +msgid "Fingerprint" +msgstr "Відбиток" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Власник відкликав ключ. Його не можна використовувати." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Закінчується дія:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "_Додати назву" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Дати" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Ігнорувати _довіру власника:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "Експортувати _повний ключ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "Назва:" +msgid "Actions" +msgstr "Дії" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Дати:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Додати" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Закінчується дія" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "_Підключі" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Слабо" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Відбиток:" +msgid "Fully" +msgstr "Повністю" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Рівень довіри:" +msgid "Ultimately" +msgstr "Безумовно" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Ваша довіра цьому ключу" +msgid "Encrypt files and email to the key's owner" +msgstr "Шифрувати файли і пошту для власника ключа" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Відкритий ключ PGP" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "_Інші імена:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Люди, які підписали цей ключ:" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Дозволяє шифрувати файли та пошту для власника ключа " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Ваша довіра цьому ключу" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "Повністю" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Рівень довіри задається у закладці подробиці." -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Я довіряю підписам, поставленим «%s» ставить на інших ключах" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -1603,7 +1821,11 @@ msgstr "" "Якщо ви впевнені, що власником ключа є «%s», підпишіть цей ключ:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_Підписати ключ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -1611,43 +1833,38 @@ "Якщо ви більше не впевнені, що власником ключа є «%s», відкличте свій " "підпис:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "Слабо" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Відкритий ключ PGP" +msgid "_Revoke Signature" +msgstr "_Відкликати підпис" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Люди, які підписали цей ключ:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "Показувати лише підписи людей, яким я _довіряю" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "Довіряти" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "Безумовно" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Ви д_овіряєте власнику:" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Рівень довіри задається у закладці подробиці." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Відбиток:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "Показувати лише підписи людей, яким я _довіряю" +msgid "Dates:" +msgstr "Дати:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Відкликати підпис" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Рівень довіри:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_Підписати ключ" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Ви д_овіряєте власнику:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1655,55 +1872,62 @@ msgstr "Підключ %d ключа %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Необов'язковий опис відкликання" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "_Відкликати" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "Причина відкликання ключа" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "_Причина:" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Необов'язковий опис відкликання" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "_Відкликати" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Немає особистого ключа PGP, придатного для підпису документу або " "повідомлення." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Підписати повідомлення ключем:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Наскільки докладно ви перевірили цей ключ?" +msgid "Sign Key" +msgstr "Підписати ключ" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Інші побачать цей підпис як:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "" +"Підписуючи ключ, ви заявляєте про свою довіру тому, кому належить цей ключ:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Підписати ключ як:" +msgid "Key Name" +msgstr "Назва ключа" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Поверхнево: означає, що ви провели поверхневу перевірку того,\n" -"що цей ключ належить тому, хто записаний власником. Наприклад, ви\n" -"з власником звірили відбитки ключа, переданні по телефону від власника. " +msgid "How carefully have you checked this key?" +msgstr "Наскільки докладно ви перевірили цей ключ?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Назва ключа" +msgid "_Not at all" +msgstr "_Не зовсім" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Поверхнево" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "Дуже _обережно" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1711,7 +1935,17 @@ "Ніякі: означає, що ви вірите, ще цей ключ належить тому, хто " "записаний власником, але ви не перевірили це." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Поверхнево: означає, що ви провели поверхневе перевіряння того,\n" +"що цей ключ належить тому, хто записаний власником. Наприклад, ви\n" +"з власником звірили відбитки ключа, переданні через телефон від власника." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -1719,19 +1953,6 @@ "Дуже ретельно: Вибирайте цей варіант лише коли ви впевнені, що цей " "ключ автентичний." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "" -"Підписуючи ключ, ви заявляєте про свою довіру тому, кому належить цей ключ:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Я можу _відкликати цей підпис пізніше." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "Підписати ключ" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1744,481 +1965,356 @@ "надсилаючи йому поштове повідомлення." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Поверхнево" +msgid "How others will see this signature:" +msgstr "Інші побачать цей підпис як:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "_Не зовсім" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Інші можуть не бачити цей підпис" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Я можу _відкликати цей підпис пізніше." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Підписати" +msgid "Sign key as:" +msgstr "Підписати ключ як:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "_Автор підпису:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "Дуже _обережно" +msgid "_Sign" +msgstr "_Підписати" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Підписати повідомлення ключем:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Експортування даних" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Одержання даних" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Імпортування даних" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Надсилання даних" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Недоступно" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Особистий сертифікат і ключ" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Особистий сертифікат" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Сертифікат" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Сертифікати (закодовано через DER)" + +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Сертифікати" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Сертифікати X.509 і пов'язані ключі" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Остаточно вилучити %d сертифікат?" +msgstr[1] "Остаточно вилучити %d сертифікати?" +msgstr[2] "Остаточно вилучити %d сертифікатів?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Неможливо породити закритий ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Створити" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Закритий ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Потрібно для одержання сертифікатів" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Створити новий закритий ключ" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Мітка:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Збережено в:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Я розумію, що цей ключ буде остаточно вилучено." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Неназвано" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Не вдалось експортувати сертифікат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 msgid "Couldn't delete" msgstr "Неможливо вилучити" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Дійсно бажаєте остаточно видалити «%s»?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Дійсно бажаєте остаточно видалити %d сертифікат?" -msgstr[1] "Дійсно бажаєте остаточно видалити %d сертифікати?" -msgstr[2] "Дійсно бажаєте остаточно видалити %d сертифікатів?" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "Вилучення" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Експортувати" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Експортувати сертифікат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Вилучити цей сертифікат або ключ" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Одержати _сертифікат" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Створити файл запиту на сертифікат для цього ключа" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Неможливо зберегти запит на сертифікат" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Зберегти запит на сертифікат" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Запит на сертифікат" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Запит на кодування PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "Неможливо створити запит на сертифікат" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Створити файл запиту на сертифіката." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "Загальна назва (CN) у запиті на сертифікат." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Назва (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Неназваний закрити ключ" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Змінити пароль" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "Підт_вердження паролю:" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "Підтвердьте новий пароль" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "_Новий пароль:" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "Керування паролями та ключами шифрування" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "Паролі й ключі" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "_Виберіть тип елементу, який треба створити:" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "Пр_одовжити" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Створити..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "Виділено %d ключ" -msgstr[1] "Виділено %d ключі" -msgstr[2] "Виділено %d ключів" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "Не вдається імпортувати ключі" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "Ключі імпортовані" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "Імпорт ключів" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "Імпортувати ключ" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "Невідомий тип ключа чи некоректний формат даних" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "Імпорт ключів" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "_Мережа" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "Закрити програму" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "_створити..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "Створити новий ключ чи елементи" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "_Імпорт..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "Імпортувати з файлу" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "Імпортувати з буферу обміну" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "З_найти віддалені ключі..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "Шукати ключі на сервері ключів" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "_Синхронізувати та опублікувати ключі..." - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Опублікувати ключі та синхронізувати з серверами у мережі." - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "_Тип" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "Показати колонку типу ключа" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "_Закінчується" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "Показати колонку терміну дії" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "До_віра" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "Показати колонку довіри власника" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "Д_ійсність" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "Показати колонку правильності" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "Фільтр:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "Параметри для першого запуску:" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "Створити новий ключ для себе: " - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "Імпортувати новий ключ для себе:" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "_Особисті ключі" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "Інші _ключі" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "Для початку роботи с шифруванням треба створити ключі." - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "_Імпорт" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Паролі" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "Не вдається експортувати ключі" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "Дійсність" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "Закінчується дія" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "Закрити це вікно" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "_Розгорнути все" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "Розгорнути всі списки" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "_Згорнути все" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "Згорнути всі списки" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "Ключі з мережі" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "Ключі з мережі, що містять '%s'" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Сервери ключів:" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Ключі, що публікуються у локальній мережі:" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Знайти ключі у мережі" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Так можна знайти інші ключі у мережі. Ці ключі будуть внесені у локальну " -"в'язу." - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Де шукати:" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Пошук" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "П_ошук ключів, що містять: " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "Не вдається опублікувати ключі на сервері" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Не вдається завантажити ключі з сервера: %s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d ключ вибрано для синхронізації" -msgstr[1] "%d ключі вибрано для синхронізації" -msgstr[2] "%d ключі вибрано для синхронізації" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "Синхронізація ключів..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Синхронізувати ключі" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Зараз ключі з вашої в'язки будуть опубліковані на сервері та стануть " -"доступними для інших. Також ви отримаєте інформацію, що оновлюється з " -"останнього підключення до сервера ключів." - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Зараз усі зміни, зроблені з останнього з'єднання до сервера будуть " -"перенесені на комп'ютер. Серверів для публікації ключів обрано не було, тому " -"ваші ключі не будуть доступні іншим." - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "_Сервера ключів" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "_Синхронізувати" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "Підтвердьте новий пароль" -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "Версія програми" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "Підт_вердження паролю:" -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "Підтримка:" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "Керування паролями та ключами шифрування" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"Юрій Сирота \n" -"Максим Дзюманенко " +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Продовжити" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Домашня сторінка проекту Seahorse" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "_Виберіть тип елементу, який треба створити:" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "_Файл" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Не вдалось імпортувати" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Імпортувати" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Дата імпортування:" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "_Правка" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "Імпортувати ключ" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "_Вигляд" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Усі файли ключів" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "_Довідка" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "Кинутий текст" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "Текст з буфера" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "П_араметри" +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Створити" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "Налаштувати програму" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "Закрити програму" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "Про цю програму" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "_створити..." -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "_Зміст" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "Створити новий ключ чи елементи" -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "Показати довідку з Seahorse" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Додати новий ключ або об'єкт" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "Експортувати публічний ключ" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "_Імпорт..." -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "Експорт ключів" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "Імпортувати з файлу" -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "Не вдається отримати дані з сервера ключів" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "Імпортувати з буферу обміну" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "Скопійовані ключ" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Через _сховище ключів" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Показати панель зі сховищами ключів" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Показати _особисті" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "Показувати тільки особисті ключі, сертифікати і паролі" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Показати _довірені" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "Показувати тільки довірені ключі, сертифікати і паролі" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Показати _обидва" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "Показати всі ключі, сертифікати і паролі" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Фільтр" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "Отримання ключів" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "Параметри для першого запуску:" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s є приватним ключем. Продовжити попри все?" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "Створити новий ключ для себе: " -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "Імпортувати ключі з сервера ключів" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "Імпортувати новий ключ для себе:" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "Показати властивості" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "Для початку роботи с шифруванням треба створити ключі." -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "В_идаляти" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Неможливо заблокувати" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Неможливо розблокувати" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "Видалити виділені елементи" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Блокувати" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "_Експорт..." +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Розблокувати" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "Експортувати у файл" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "_Властивості" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "Копіювати у буфер обміну" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Налаштовувати ключ для _SSH..." -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "Імпортувати виділені ключі у локальну в'язку" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Надіслати відкритий ключ віддаленого командного рядка на іншу машину та " +"налаштувати вхід з використанням цього ключа." #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2247,198 +2343,217 @@ msgid "Enter the new passphrase again: %s" msgstr "Введіть новий пароль знову: %s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "Налаштовувати ключ для _SSH..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Надіслати відкритий ключ віддаленого командного рядка на іншу машину та " -"налаштувати вхід з використанням цього ключа." +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Secure Shell" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Ключі для безпечного з'єднання до інших комп'ютерів" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Ви дійсно бажаєте остаточно видалити ключ SSH «%s»?" +msgstr "Остаточно вилучити ключ SSH «%s»?" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Ви дійсно бажаєте остаточно видалити %d ключів SSH?" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "Неможливо вилучити ключ" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Остаточно вилучити %d безпечний ключ?" +msgstr[1] "Остаточно вилучити %d безпечних ключі?" +msgstr[2] "Остаточно вилучити %d безпечних ключів?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Ключ ssh" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Ключі таємного SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Відкриті ключі SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Для цього ключа немає файлів відкритого ключа." -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Ключ SSH" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "" "Використовується для доступу до інших комп'ютерів, наприклад, через термінал." -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "Не вдається створити ключ для віддаленого командного рядка" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "Створення ключа віддаленого командного рядка" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Використовуйте вашу адресу електронної пошти або іншу інформацію, які " -"допоможуть пригадати призначення ключа." - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Ключі SSH дозволяють безпечно та використовувати віддалені комп'ютери через " -"протокол SSH, без потреби вводити пароль для кожного з них." - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Якщо вже є комп'ютер, з яким ви хочете використовувати цей ключ його, можна " -"зараз налаштувати цей комп'ютер для використання вашого ключа." - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "Новий ключ віддаленого командного рядка" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Просто створити ключ" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "Створити та _встановити" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "_Просто створити ключ" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" +"Ключ Secure Shell (SSH) допомагає безпечно з'єднатись з іншими комп'ютерами." + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "Ваша поштова адреса, або нагадування для чого цей ключ." #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "_Опис ключа:" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Якщо є комп'ютер, з яким бажаєте використовувати цей ключ його, можна " +"налаштувати цей комп'ютер для розпізнавання нового ключа." -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(ключ оболонки віддаленого командного рядка, що не показується)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Особистий ключ SSH" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Ключ SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "Не вдається перейменувати ключ." -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Не вдається змінити параметри авторизації для цього ключа." -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "Не вдається змінити пароль для цього ключа." -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Алгоритм:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "Ідентифікатор:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Розташування:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" msgid "Name:" -msgstr "Ім'я:" +msgstr "Назва:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Міцність:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Використовується для з'єднання з іншим комп'ютерами." -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "Довіра" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Власник цього ключа _авторизований для з'єднання з цим комп'ютером" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Це застосовується лише до облікового запису '%s'." +msgid "This only applies to the %s account." +msgstr "Це застосовується лише до облікового запису %s." #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_Експортувати повний ключ" +msgid "Algorithm:" +msgstr "Алгоритм:" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Власник цього ключа _авторизований для з'єднання з цим комп'ютером" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Міцність:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Розташування:" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Використовується для з'єднання з іншим комп'ютерами." +msgid "E_xport Complete Key" +msgstr "_Експортувати повний ключ" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "Команда SSH несподівано завершилась." -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "Команда SSH закінчилась невдало." -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "Пароль віддаленого доступу" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "Введіть пароль ключа" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "Пароль для нового ключа віддаленого командного рядка" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "Імпорт ключа: %s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "Імпорт ключа. Введіть пароль" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Ключі OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "Не вдається знайти приватний ключ для цього публічного ключа." #: ../ssh/seahorse-ssh-upload.c:50 msgid "Couldn't configure Secure Shell keys on remote computer." msgstr "" -"Не видаляється налаштувати ключі віддаленого командного рядка на сервері." +"Неможливо налаштувати безпечні ключі віддаленого командного рядка на сервері." #: ../ssh/seahorse-ssh-upload.c:133 msgid "Configuring Secure Shell Keys..." msgstr "Налаштовування ключів віддаленого командного рядка..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "наприклад: fileserver.example.com:порт" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "Налаштувати комп'ютер для роботи з SSH" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2446,6 +2561,10 @@ "Щоб використовувати ключ SSH з іншим комп'ютером, що використовує SSH, у вас " "вже має бути обліковий запис на тому комп'ютері.на цьому комп'ютері." +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "наприклад: fileserver.example.com:порт" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "_Комп'ютер:" @@ -2458,15 +2577,200 @@ msgid "_Set Up" msgstr "_Встановити" +#~ msgid "Login keyring" +#~ msgstr "Вхід у сховище ключів" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Доступ до в'язки заборонений" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Служба в'язок GNOME не запущена" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "В'язок вже розблокувати" + +#~ msgid "No such key ring exists" +#~ msgstr "Немає такого в'язки" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Не вдається зв'язатися з службою в'язок" + +#~ msgid "The item already exists" +#~ msgstr "Елемент вже існує" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Внутрішня помилка при доступі до в'язок GNOME" + +#~ msgid "Algorithms here" +#~ msgstr "Алгоритми" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "Вилучення об'єкта" +#~ msgstr[1] "Вилучення об'єктів" +#~ msgstr[2] "Вилучення об'єктів" + +#~ msgid "Passwords: %s" +#~ msgstr "Паролі: %s" + +#~ msgid "Passwords: %s" +#~ msgstr "Паролі: %s" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Блокувати в'язку для зберігання паролів. Для розблокування в'язки треба " +#~ "буде ввести головний пароль." + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Розблокувати в'язку ключів для збереження паролів з використанням " +#~ "головного паролю." + +#~ msgid "Couldn't delete keyring" +#~ msgstr "Неможливо вилучити сховище ключів" + +#~ msgid "Archive files" +#~ msgstr "Архівні файли" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Файл з такою назвою існує.\n" +#~ "\n" +#~ "Замінити його новим файлом?" + +#~ msgid "_Replace" +#~ msgstr "_Замінити" + +#~ msgid "_Sign Key..." +#~ msgstr "Підписати _ключ..." + +#~ msgid "Sign public key" +#~ msgstr "Підписати публічний ключ" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "Дійсно бажаєте остаточно видалити %d ключів та ідентифікаторів?" + +#~ msgid "Couldn't delete public key" +#~ msgstr "Неможливо вилучити відкритий ключ" + +#~ msgid "New PGP Key" +#~ msgstr "Новий ключ PGP" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Не вдається експортувати ключі у \"%s\"" + +#~ msgid "Export Complete Key" +#~ msgstr "Експортувати ключ повністю" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Дійсно бажаєте остаточно видалити «%s»?" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Дійсно бажаєте остаточно видалити %d сертифікат?" +#~ msgstr[1] "Дійсно бажаєте остаточно видалити %d сертифікати?" +#~ msgstr[2] "Дійсно бажаєте остаточно видалити %d сертифікатів?" + +#~ msgid "Deleting" +#~ msgstr "Вилучення" + +#~ msgid "Create New ..." +#~ msgstr "Створити..." + +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "Виділено %d ключ" +#~ msgstr[1] "Виділено %d ключі" +#~ msgstr[2] "Виділено %d ключів" + +#~ msgid "Importing keys" +#~ msgstr "Імпорт ключів" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Невідомий тип ключа чи некоректний формат даних" + +#~ msgid "Importing Keys" +#~ msgstr "Імпорт ключів" + +#~ msgid "T_ypes" +#~ msgstr "_Тип" + +#~ msgid "Show type column" +#~ msgstr "Показати колонку типу ключа" + +#~ msgid "_Expiry" +#~ msgstr "_Закінчується" + +#~ msgid "Show expiry column" +#~ msgstr "Показати колонку терміну дії" + +#~ msgid "_Trust" +#~ msgstr "До_віра" + +#~ msgid "Show owner trust column" +#~ msgstr "Показати колонку довіри власника" + +#~ msgid "_Validity" +#~ msgstr "Д_ійсність" + +#~ msgid "Show validity column" +#~ msgstr "Показати колонку правильності" + +#~ msgid "Other _Keys" +#~ msgstr "Інші _ключі" + +#~ msgid "Validity" +#~ msgstr "Дійсність" + +#~ msgid "Expiration Date" +#~ msgstr "Закінчується дія" + +#~ msgid "_Expand All" +#~ msgstr "_Розгорнути все" + +#~ msgid "Expand all listings" +#~ msgstr "Розгорнути всі списки" + +#~ msgid "_Collapse All" +#~ msgstr "_Згорнути все" + +#~ msgid "Collapse all listings" +#~ msgstr "Згорнути всі списки" + +#~ msgid "Export public key" +#~ msgstr "Експортувати публічний ключ" + +#~ msgid "Exporting keys" +#~ msgstr "Експорт ключів" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Не вдається отримати дані з сервера ключів" + +#~ msgid "Retrieving keys" +#~ msgstr "Отримання ключів" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s є приватним ключем. Продовжити попри все?" + +#~ msgid "Couldn't delete key" +#~ msgstr "Неможливо вилучити ключ" + +#~ msgid "_Key Description:" +#~ msgstr "_Опис ключа:" + #~ msgid "Do not run seahorse-daemon as a daemon" #~ msgstr "Не залишати менеджер seahorse у пам'яті" #~ msgid "couldn't fork process" #~ msgstr "не вдається створити процес" -#~ msgid "couldn't create new process group" -#~ msgstr "не вдається створити нову групу процесів" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "Менеджер шифрування (Seahorse)" @@ -2518,9 +2822,6 @@ #~ msgid "Bad Signature" #~ msgstr "Неправильний підпис" -#~ msgid "Couldn't verify signature." -#~ msgstr "Не вдається перевірити підпис." - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "Некоректний чи нерозпізнаний автор підпису: %s" @@ -2708,9 +3009,6 @@ #~ msgid "Web Password" #~ msgstr "Пароль веб" -#~ msgid "Network Password" -#~ msgstr "Мережний пароль" - #~ msgid "Couldn't set application access." #~ msgstr "Не вдається встановити доступ до програми." @@ -2832,12 +3130,6 @@ #~ msgid "Symmetric Key" #~ msgstr "Симетричний ключ" -#~ msgid "Public Key" -#~ msgstr "Відкритий ключ" - -#~ msgid "Private Key" -#~ msgstr "Приватний ключ" - #~ msgid "Credentials" #~ msgstr "Відомості" @@ -2859,9 +3151,6 @@ #~ msgid "Loading Keys..." #~ msgstr "Завантаження ключів..." -#~ msgid "Searching for keys..." -#~ msgstr "Пошук ключів..." - #~ msgid "Uploading keys..." #~ msgstr "Завантаження ключів..." @@ -2886,12 +3175,6 @@ #~ msgid "Synchronizing keys" #~ msgstr "Синхронізуватися ключів" -#~ msgid "Encryption Key Manager" -#~ msgstr "Менеджер ключів шифрування" - -#~ msgid "DSA" -#~ msgstr "DSA" - #~ msgid "Invalid" #~ msgstr "Некоректний" @@ -2901,9 +3184,6 @@ #~ msgid "Public Secure Shell Key" #~ msgstr "Відкритий ключ SSH" -#~ msgid "Secure Shell key" -#~ msgstr "Ключ віддаленого командного рядка" - #~ msgid "Passphrase:" #~ msgstr "Пароль:" diff -Nru seahorse-3.2.2/po/vi.po seahorse-3.6.3/po/vi.po --- seahorse-3.2.2/po/vi.po 2011-09-14 17:14:58.000000000 +0200 +++ seahorse-3.6.3/po/vi.po 2012-09-03 10:44:42.000000000 +0200 @@ -1,6 +1,6 @@ # Vietnamese translation for Seahorse. # Copyright © 2009 Free Software Foundation, Inc. -# Nguyễn Thái Ngọc Duy , 2007,2011. +# Nguyễn Thái Ngọc Duy , 2007,2011-2012. # Clytie Siddall , 2006-2009. # msgid "" @@ -8,9 +8,9 @@ "Project-Id-Version: seahorse 2.25.90\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-29 11:47+0000\n" -"PO-Revision-Date: 2011-05-22 12:53+0700\n" -"Last-Translator: Clytie Siddall \n" +"POT-Creation-Date: 2012-07-02 16:47+0000\n" +"PO-Revision-Date: 2012-09-01 22:47+0700\n" +"Last-Translator: Nguyễn Thái Ngọc Duy \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,414 +18,168 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.8\n" -#: ../daemon/seahorse-daemon.c:64 -msgid "Do not run seahorse-daemon as a daemon" -msgstr "Đừng chạy seahorse-daemon ở chế độ nền" - -#: ../daemon/seahorse-daemon.c:94 -msgid "couldn't fork process" -msgstr "không thể tạo tiến trình con" - -#: ../daemon/seahorse-daemon.c:100 -msgid "couldn't create new process group" -msgstr "không thể tạo nhóm tiến trình mới" - -#: ../daemon/seahorse-daemon.c:250 -msgid "Encryption Daemon (Seahorse)" -msgstr "Trình nền mã hoá (Seahorse)" - -#: ../daemon/seahorse-service.c:164 ../daemon/seahorse-service.c:277 -#, c-format -msgid "Invalid or unrecognized key type: %s" -msgstr "Kiểu khoá không hợp lệ hay không được nhận ra: %s" - -#: ../daemon/seahorse-service.c:234 -#, c-format -#| msgid "This key expired on: %s" -msgid "This keytype is not supported: %s" -msgstr "Kiểu khoá này không được hỗ trợ: %s" - -#: ../daemon/seahorse-service.c:241 -#, c-format -msgid "Support for this feature was not enabled at build time" -msgstr "Tính năng này không được chọn hỗ trợ lúc biên dịch" - -#: ../daemon/seahorse-service.c:341 ../daemon/seahorse-service-keyset.c:180 -#: ../daemon/seahorse-service-keyset.c:223 -#, c-format -msgid "Invalid or unrecognized key: %s" -msgstr "Khoá không hợp lệ hay không được nhận ra: %s" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:204 -#, c-format -msgid "Signed by expired on %s." -msgstr "Ký bởi hết hạn vào %s." - -#: ../daemon/seahorse-service-crypto.c:205 -msgid "Invalid Signature" -msgstr "Chữ ký không hợp lệ" - -#: ../daemon/seahorse-service-crypto.c:211 -#, c-format -msgid "Signed by on %s Expired." -msgstr "Ký bởi vào %s đã hết hạn." - -#: ../daemon/seahorse-service-crypto.c:212 -msgid "Expired Signature" -msgstr "Chữ ký đã hết hạn" - -#: ../daemon/seahorse-service-crypto.c:218 -#, c-format -msgid "Signed by Revoked on %s." -msgstr "Ký bởi đã hủy bỏ vào %s." - -#: ../daemon/seahorse-service-crypto.c:219 -msgid "Revoked Signature" -msgstr "Chữ ký bị hủy bỏ" - -#. TRANSLATORS: is a custom markup tag, do not translate. -#: ../daemon/seahorse-service-crypto.c:225 -#, c-format -msgid "Signed by on %s." -msgstr "Ký bởi vào %s." - -#: ../daemon/seahorse-service-crypto.c:226 -msgid "Good Signature" -msgstr "Chữ ký tốt" - -#: ../daemon/seahorse-service-crypto.c:231 -msgid "Signing key not in keyring." -msgstr "Khóa ký không nằm trong xâu khoá." - -#: ../daemon/seahorse-service-crypto.c:232 -msgid "Unknown Signature" -msgstr "Chữ ký lạ" - -#: ../daemon/seahorse-service-crypto.c:236 -msgid "Bad or forged signature. The signed data was modified." -msgstr "Chữ ký sai hay giả. Dữ liệu được ký bị sửa đổi." - -#: ../daemon/seahorse-service-crypto.c:237 -msgid "Bad Signature" -msgstr "Chữ ký sai" - -#: ../daemon/seahorse-service-crypto.c:245 -msgid "Couldn't verify signature." -msgstr "Không thể thẩm tra chữ ký." - -#: ../daemon/seahorse-service-crypto.c:317 -#: ../daemon/seahorse-service-crypto.c:646 -#, c-format -msgid "Invalid or unrecognized signer: %s" -msgstr "Người ký không hợp lệ hay không được nhận ra: %s" - -#: ../daemon/seahorse-service-crypto.c:324 -#: ../daemon/seahorse-service-crypto.c:653 -#, c-format -msgid "Key is not valid for signing: %s" -msgstr "Khoá không hợp lệ để ký: %s" - -#: ../daemon/seahorse-service-crypto.c:335 -#, c-format -msgid "Invalid or unrecognized recipient: %s" -msgstr "Người nhận không hợp lệ hay không được nhận ra: %s" - -#: ../daemon/seahorse-service-crypto.c:343 -#, c-format -msgid "Key is not a valid recipient for encryption: %s" -msgstr "Khoá không phải là người nhận hợp lệ để mã hoá: %s" - -#: ../daemon/seahorse-service-crypto.c:352 -#, c-format -msgid "No recipients specified" -msgstr "Chưa ghi rõ người nhận nào" - -#: ../daemon/seahorse-service-crypto.c:434 -#, c-format -msgid "Invalid key type for decryption: %s" -msgstr "Kiểu khoá không hợp lệ để giải mã: %s" - -#: ../daemon/seahorse-service-crypto.c:548 -#: ../daemon/seahorse-service-crypto.c:746 -#, c-format -msgid "Please set clearuri" -msgstr "Vui lòng đặt clearuri" - -#: ../daemon/seahorse-service-crypto.c:554 -#: ../daemon/seahorse-service-crypto.c:752 -#, c-format -msgid "Please set crypturi" -msgstr "Vui lòng đặt crypturi" - -#: ../daemon/seahorse-service-crypto.c:564 -#, c-format -msgid "Error opening clearuri" -msgstr "Lỗi mở clearuri" - -#: ../daemon/seahorse-service-crypto.c:641 -#, c-format -msgid "No signer specified" -msgstr "Chưa ghi rõ người ký nào" - -#: ../daemon/seahorse-service-crypto.c:830 -#, c-format -msgid "Invalid key type for verifying: %s" -msgstr "Kiểu khoá không hợp lệ để thẩm tra: %s" - -#: ../daemon/seahorse-service-keyset.c:273 -#, c-format -msgid "Invalid key id: %s" -msgstr "Mã nhận diện khoá không hợp lệ: %s" - -#: ../data/seahorse.schemas.in.h:1 -msgid "" -"A list of key server URIs to search for remote PGP keys. In later versions a " -"display name can be included, by appending a space and then the name." -msgstr "" -"Danh sách các địa chỉ Mạng của máy phục vụ khoá nơi cần tìm kiếm khoá PGP từ " -"xa. Trong phiên bản mới hơn, cũng có thể gồm tên hiển thị, bằng cách phụ " -"thêm một dấu cách, rồi tên đó." - -#: ../data/seahorse.schemas.in.h:2 -msgid "Auto Retrieve Keys" -msgstr "Tự động lấy các khoá" - -#: ../data/seahorse.schemas.in.h:3 -msgid "Auto Sync Keys" -msgstr "Tự động đồng bộ hóa khoá" - -#: ../data/seahorse.schemas.in.h:4 -msgid "Controls the visibility of the expires column for the key manager." -msgstr "Hiện/ẩn cột « hết hạn » cho bộ quản lý khoá." - -#: ../data/seahorse.schemas.in.h:5 -msgid "Controls the visibility of the trust column for the key manager." -msgstr "Hiện/ẩn cột tin cậy cho bộ quản lý khoá." - -#: ../data/seahorse.schemas.in.h:6 -msgid "Controls the visibility of the type column for the key manager." -msgstr "Hiện/ẩn cột « kiểu » cho bộ quản lý khoá." - -#: ../data/seahorse.schemas.in.h:7 -msgid "Controls the visibility of the validity column for the key manager." -msgstr "Hiện/ẩn cột « độ hợp lệ » cho bộ quản lý khoá." - -#: ../data/seahorse.schemas.in.h:8 -msgid "Enable DNS-SD sharing" -msgstr "Bật chia sẻ DNS-SD" - -#: ../data/seahorse.schemas.in.h:9 -msgid "" -"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -"running and must be built with HKP and DNS-SD support." -msgstr "" -"Hiệu lực cách chia sẻ khoá kiểu DNS-SD (Apple Bonjour). Trình nền seahorse-" -"daemon phải đang chạy và cũng phải được xây dựng với khả năng hỗ trợ HKP và " -"DNS-SD." - -#: ../data/seahorse.schemas.in.h:10 -msgid "ID of the default key" -msgstr "ID của khoá mặc định" - -#: ../data/seahorse.schemas.in.h:11 -msgid "" -"If set to true, then files encrypted with seahorse will be ASCII armor " -"encoded." -msgstr "" -"Đặt là true (đúng) thì các tập tin được mã hoá bằng Seahorse sẽ được mã hoá " -"bọc sắt ASCII." - -#: ../data/seahorse.schemas.in.h:12 -msgid "" -"If set to true, then the default key will always be added to an encryption " -"recipients list." -msgstr "" -"Nếu đặt là « true » (đúng) thì khoá mặc định luôn luôn sẽ được thêm vào danh " -"sách người nhận mã hoá." - -#: ../data/seahorse.schemas.in.h:13 -msgid "Last key server search pattern" -msgstr "Mẫu tìm kiếm máy chủ khoá cuối cùng" - -#: ../data/seahorse.schemas.in.h:14 -msgid "Last key servers used" -msgstr "Máy phục vụ khoá dùng cuối cùng" - -#: ../data/seahorse.schemas.in.h:15 -msgid "Last key used to sign a message." -msgstr "Khoá được dùng cuối cùng để ký thư." - -#: ../data/seahorse.schemas.in.h:16 -msgid "PGP Key servers" -msgstr "Máy phục vụ khoá PGP" - -#: ../data/seahorse.schemas.in.h:17 -msgid "Publish keys to this key server." -msgstr "Xuất khoá tới máy phục vụ khoá này." - -#: ../data/seahorse.schemas.in.h:18 -msgid "Show expires column in key manager" -msgstr "Hiện cột « hết hạn » trong bộ quản lý khoá" - -#: ../data/seahorse.schemas.in.h:19 -msgid "Show trust column in key manager" -msgstr "Hiện cột « tin cậy » trong bộ quản lý khoá" - -#: ../data/seahorse.schemas.in.h:20 -msgid "Show type column in key manager" -msgstr "Hiện cột « kiểu » trong bộ quản lý khoá" - -#: ../data/seahorse.schemas.in.h:21 -msgid "Show validity column in key manager" -msgstr "Hiện cột « độ hợp lệ » trong bộ quản lý khoá" - -#: ../data/seahorse.schemas.in.h:22 -msgid "" -"Specify the column to sort the recipients window by. Columns are: 'name' and " -"'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "" -"Ghi rõ cột theo đó cần sắp xếp cửa sổ người nhận. Các cột là 'name' (tên) và " -"'id' (mã nhận diện). Để dấu trừ '-' nằm trước tên cột để sắp xếp theo thứ tự " -"giảm dần." +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "Add Password Keyring" +msgstr "Thêm xâu khoá mật khẩu" -#: ../data/seahorse.schemas.in.h:23 +#: ../gkr/seahorse-add-keyring.xml.h:2 msgid "" -"Specify the column to sort the seahorse key manager main window by. Columns " -"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " -"front of the column name to sort in descending order." -msgstr "" -"Ghi rõ cột theo đó cần sắp xếp cửa sổ chính của bộ quản lý khoá Seahorse. " -"Cột là : 'name' (tên), 'id', 'validity' (hợp lệ), 'expires' (hết hạn), " -"'trust' (tin cậy) và 'type' (kiểu). Có thể sắp xếp giảm dần nếu bạn chèn một " -"dấu gạch nối trước tên cột đó." - -#: ../data/seahorse.schemas.in.h:24 -msgid "The ID of the last secret key used to sign a message." -msgstr "Mã nhận diện (ID) của khoá bí mật cuối cùng được dùng để ký thư." +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "Hãy chọn tên cho xâu khoá mới. Bạn sẽ được nhắc nhập mật khẩu gỡ khoá." -#: ../data/seahorse.schemas.in.h:25 -msgid "The column to sort the recipients by" -msgstr "Cột theo nó cần sắp xếp các người nhận" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "Tên xâu khoá mới:" -#: ../data/seahorse.schemas.in.h:26 -msgid "The column to sort the seahorse keys by" -msgstr "Cột theo nó cần sắp xếp các khoá Seahorse" +#: ../gkr/seahorse-add-keyring.xml.h:4 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "Tên máy hay địa chỉ của máy phục vụ." -#: ../data/seahorse.schemas.in.h:27 -msgid "" -"The key server to publish PGP keys to. Or empty to suppress publishing of " -"PGP keys." -msgstr "Máy phục vụ khoá nơi cần xuất khoá PGP. Để rỗng để ngăn xuất khoá PGP." +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "xâu khoá mật khẩu mới" -#: ../data/seahorse.schemas.in.h:28 -msgid "" -"The last key server a search was performed against or empty for all key " -"servers." -msgstr "" -"Máy phục vụ khoá cuối cùng được tìm kiếm, hoặc rỗng để đại diện mọi máy phục " -"vụ khoá" +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "Dùng để lưu trữ các mật khẩu kiểu ứng dụng và mạng" -#: ../data/seahorse.schemas.in.h:29 -msgid "The last search pattern searched for against a key server." -msgstr "" -"Mẫu tìm kiếm cuối cùng được dùng để tìm kiếm trên một máy phục vụ khoá." +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "Mật khẩu mới..." -#: ../data/seahorse.schemas.in.h:30 -msgid "" -"This specifies the default key to use for certain operations, mainly signing." -msgstr "" -"Đây xác định khoá mặc định cần dùng trong một số thao tác riêng, phần lớn là " -"việc ký tên." +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "Lưu an toàn mật khẩu oặc bí mật." -#: ../data/seahorse.schemas.in.h:31 -msgid "Whether or not keys should be automatically retrieved from key servers." -msgstr "Có nên tự động lấy các khoá từ các máy phục vụ khoá hay không." +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "xâu khoá Mật khẩu" -#: ../data/seahorse.schemas.in.h:32 -msgid "" -"Whether or not modified keys should be automatically synced with the default " -"key server." -msgstr "" -"Có nên tự động đồng bộ hoá các khoá đã sửa đổi với máy phục vụ khoá mặc định " -"hay không." +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "Mật khẩu đã lưu" -#: ../data/seahorse.schemas.in.h:33 -msgid "Whether to always encrypt to default key" -msgstr "Có nên luôn luôn mã hoá bằng khoá mặc định hay không" +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "Không thể đặt xâu khoá mặc định" -#: ../data/seahorse.schemas.in.h:34 -msgid "Whether to use ASCII Armor" -msgstr "Có nên dùng bọc kim ASCII hay không" +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "Không thể thay đổi mật khẩu của xâu khoá" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "Thêm xâu khoá mật khẩu" +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "Đặt là _mặc định" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "Tên xâu khoá mới:" +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "Ứng dụng thường lưu mật khẩu mới vào xâu khoá mặc định." -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "" -"Hãy chọn tên cho xâu khoá mới. Bạn sẽ được nhắc nhập mật khẩu gỡ khoá." +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "Đổi _mật khẩu" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "Tên máy hay địa chỉ của máy phục vụ." +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "Thay đổi mật khẩu sẽ mở khoá xâu khoá lưu trữ mật khẩu" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:73 -msgid "Couldn't add keyring" -msgstr "Không thể thêm xâu khoá" +#: ../gkr/seahorse-gkr-add-item.c:58 +#| msgid "Couldn't add photo" +msgid "Couldn't add item" +msgstr "Không thể thêm mục" #: ../gkr/seahorse-gkr-add-item.xml.h:1 -#| msgid "Password" msgid "Add Password" msgstr "Thêm mật khẩu" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:15 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "_Mô tả:" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -#| msgid "Keyring" -msgid "_Keyring:" -msgstr "_Xâu khoá:" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 -#| msgid "Password:" msgid "_Password:" msgstr "_Mật khẩu:" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 -#| msgid "Show pass_word" +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "Hiện _mật khẩu" -#: ../gkr/seahorse-gkr-item.c:473 -msgid "Web Password" -msgstr "Mật khẩu Web" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "_Xâu khoá:" -#: ../gkr/seahorse-gkr-item.c:475 -msgid "Network Password" -msgstr "Mật khẩu mạng" +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "Không thể thêm xâu khoá" -#: ../gkr/seahorse-gkr-item.c:477 ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" msgstr "Mật khẩu" -#: ../gkr/seahorse-gkr-item-commands.c:78 +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Mật khẩu cá nhân, chứng nhận và các bí mật khác được lưu" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "Mật khẩu tài khoản IM cho " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "Mật khẩu hoặc mật mã" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "Mật khẩu mạng" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "Ghi chú được lưu" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "Mật khẩu xâu khoá" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "Mật khẩu khoá mật mã hoá" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "Mật khẩu kho chứa khoá" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Mật khẩu Google Chrome" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "Mật khẩu Tài khoản Gnome trực tuyến" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Mật khẩu Telepathy" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "Mật khẩu tán gẫu" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "Mật mã Trình quản lý mạng" + +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Bạn có chắc muốn xoá mật khẩu « %s » không?" -#: ../gkr/seahorse-gkr-item-commands.c:81 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" @@ -455,474 +209,269 @@ msgid "Network Credentials" msgstr "Thông tin xác thực mạng" -#: ../gkr/seahorse-gkr-item-properties.c:245 +#: ../gkr/seahorse-gkr-item-properties.c:107 +msgid "Password" +msgstr "Mật khẩu" + +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "Không thể thay đổi mật khẩu." -#: ../gkr/seahorse-gkr-item-properties.c:350 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 +msgid "Updating password" +msgstr "Đang cập nhật mật khẩu" + +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "Không thể đặt mô tả." -#: ../gkr/seahorse-gkr-item-properties.c:656 -msgid "Couldn't set application access." -msgstr "Không thể đặt cách truy cập đến ứng dụng." - #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "Mật khẩu :" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -msgid "Path:" -msgstr "Đường dẫn:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -msgid "Permissions:" -msgstr "Quyền hạn:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Thuộc tính khoá" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "Chi tiết kỹ thuật:" +msgid "Use:" +msgstr "Dùng:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -msgid "Applications" -msgstr "Ứng dụng" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "Kiểu:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "Chi tiết" +msgid "Server:" +msgstr "Máy phục vụ:" #: ../gkr/seahorse-gkr-item-properties.xml.h:7 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "Khoá" +msgid "Login:" +msgstr "Đăng nhập:" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "Thuộc tính khoá" +msgid "Show pass_word" +msgstr "Hiện _mật khẩu" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -msgid "Login:" -msgstr "Đăng nhập:" +msgid "Password:" +msgstr "Mật khẩu :" #: ../gkr/seahorse-gkr-item-properties.xml.h:10 -msgid "Server:" -msgstr "Máy phục vụ :" +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "Khoá" #: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Show pass_word" -msgstr "Hiện _mật khẩu" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "Kiểu :" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:14 -msgid "Use:" -msgstr "Dùng:" +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "Chi tiết kỹ thuật:" -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:17 -msgid "_Read" -msgstr "Đọ_c" - -#. To translators: This is the infinitive not the imperative. -#: ../gkr/seahorse-gkr-item-properties.xml.h:19 -msgid "_Write" -msgstr "_Ghi" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:20 -#| msgid "_Delete" -msgctxt "infinitive" -msgid "_Delete" -msgstr "_Xoá" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "Chi tiết" -#: ../gkr/seahorse-gkr-keyring.c:193 -msgid "Listing passwords" -msgstr "Đang liệt kê các mật khẩu" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "Tự động mở xâu khoá khi đăng nhập" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "Xâu khoá dùng để lưu mật khẩu" -#: ../gkr/seahorse-gkr-keyring.c:354 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format -#| msgid "Password:" -msgid "Passwords: %s" -msgstr "Mật khẩu: %s" +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "Bạn có chắc muốn xoá xâu khoá mật khẩu « %s » không?" -#: ../gkr/seahorse-gkr-keyring.c:355 -#, c-format -#| msgid "Password:" -msgid "Passwords: %s" -msgstr "Mật khẩu: %s" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "Tôi hiểu mọi mục sẽ bị xoá vĩnh viễn." -#: ../gkr/seahorse-gkr-keyring-commands.c:119 -msgid "Password Keyring" -msgstr "xâu khoá Mật khẩu" +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "Thuộc tính xâu khoá" -#: ../gkr/seahorse-gkr-keyring-commands.c:120 -msgid "Used to store application and network passwords" -msgstr "Dùng để lưu trữ các mật khẩu kiểu ứng dụng và mạng" +#: ../gkr/seahorse-gkr-keyring.xml.h:2 +msgid "Name:" +msgstr "Tên:" -#: ../gkr/seahorse-gkr-keyring-commands.c:121 -#| msgid "Network Password" -msgid "Stored Password" -msgstr "Mật khẩu đã lưu" +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 +msgid "Created:" +msgstr "Tạo:" -#: ../gkr/seahorse-gkr-keyring-commands.c:122 -msgid "Safely store a password or secret." -msgstr "Lưu an toàn mật khẩu oặc bí mật." +#: ../gkr/seahorse-gkr-keyring.xml.h:5 +msgid "Keyring" +msgstr "xâu khoá" -#: ../gkr/seahorse-gkr-keyring-commands.c:136 -msgid "Couldn't unlock keyring" -msgstr "Không thể mở khoá xâu khoá" - -#: ../gkr/seahorse-gkr-keyring-commands.c:177 -msgid "Couldn't lock keyring" -msgstr "Không thể khoá xâu khoá" +#: ../libegg/egg-datetime.c:317 +msgid "Display flags" +msgstr "Hiển thị cờ" -#: ../gkr/seahorse-gkr-keyring-commands.c:218 -msgid "Couldn't set default keyring" -msgstr "Không thể đặt xâu khoá mặc định" - -#: ../gkr/seahorse-gkr-keyring-commands.c:257 -msgid "Couldn't change keyring password" -msgstr "Không thể thay đổi mật khẩu của xâu khoá" - -#: ../gkr/seahorse-gkr-keyring-commands.c:288 -msgid "_Lock" -msgstr "_Khoá" - -#: ../gkr/seahorse-gkr-keyring-commands.c:289 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "" -"Khoá xâu khoá lưu trữ mật khẩu để yêu cầu một mật khẩu chủ để mở khoá nó." - -#: ../gkr/seahorse-gkr-keyring-commands.c:290 -msgid "_Unlock" -msgstr "_Mở khoá" - -#: ../gkr/seahorse-gkr-keyring-commands.c:291 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "" -"Mở khoá xâu khoá lưu trữ mật khẩu dùng một mật khẩu chủ để nó sẵn sàng sử " -"dụng." - -#: ../gkr/seahorse-gkr-keyring-commands.c:292 -msgid "_Set as default" -msgstr "Đặt là _mặc định" - -#: ../gkr/seahorse-gkr-keyring-commands.c:293 -msgid "Applications usually store new passwords in the default keyring." -msgstr "Ứng dụng thường lưu mật khẩu mới vào xâu khoá mặc định." - -#: ../gkr/seahorse-gkr-keyring-commands.c:294 -msgid "Change _Password" -msgstr "Đổi _mật khẩu" - -#: ../gkr/seahorse-gkr-keyring-commands.c:295 -msgid "Change the unlock password of the password storage keyring" -msgstr "Thay đổi mật khẩu sẽ mở khoá xâu khoá lưu trữ mật khẩu" - -#: ../gkr/seahorse-gkr-keyring-commands.c:360 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "Bạn có chắc muốn xoá xâu khoá mật khẩu « %s » không?" - -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 -msgid "Created:" -msgstr "Tạo :" - -#: ../gkr/seahorse-gkr-keyring.xml.h:3 -msgid "Keyring" -msgstr "xâu khoá" - -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "Thuộc tính xâu khoá" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "Tê_n:" - -#: ../gkr/seahorse-gkr-operation.c:168 -msgid "Access to the key ring was denied" -msgstr "Truy cập xâu khoá bị từ chối" - -#: ../gkr/seahorse-gkr-operation.c:171 -msgid "The gnome-keyring daemon is not running" -msgstr "Trình nền xâu khoá gnome-keyring hiện thời không chạy" - -#: ../gkr/seahorse-gkr-operation.c:174 -msgid "The key ring has already been unlocked" -msgstr "xâu khoá đã được mở" - -#: ../gkr/seahorse-gkr-operation.c:177 -msgid "No such key ring exists" -msgstr "Không có xâu khoá như vậy" - -#: ../gkr/seahorse-gkr-operation.c:180 -msgid "Couldn't communicate with key ring daemon" -msgstr "Không thể liên lạc với trình nền xâu khoá" - -#: ../gkr/seahorse-gkr-operation.c:183 -msgid "The item already exists" -msgstr "Mục đã có" - -#: ../gkr/seahorse-gkr-operation.c:189 -msgid "Internal error accessing gnome-keyring" -msgstr "Gặp lỗi nội bộ khi truy cập gnome-keyring" - -#: ../gkr/seahorse-gkr-operation.c:238 ../gkr/seahorse-gkr-operation.c:264 -msgid "Saving item..." -msgstr "Đang lưu mục..." - -#: ../gkr/seahorse-gkr-operation.c:300 -msgid "Deleting item..." -msgstr "Đang xoá mục..." - -#: ../gkr/seahorse-gkr-operation.c:325 -msgid "Deleting keyring..." -msgstr "Đang xoá xâu khoá..." - -#: ../gkr/seahorse-gkr-source.c:234 -msgid "Listing password keyrings" -msgstr "Đang liệt kê các xâu khoá mật khẩu" - -#: ../libcryptui/cryptui.c:272 -msgid "" -"No encryption keys were found with which to perform the operation you " -"requested. The program Passwords and Encryption Keys will now be " -"started so that you may either create a key or import one." -msgstr "" -"Không tìm thấy khoá mật mã cần dùng để thực hiện thao tác yêu cầu. Chương " -"trình Mật khẩu và Khoá Mật mã sắp được khởi chạy để cho phép bạn hoặc " -"tạo một khoá mới hoặc nhập một khoá đã có." - -#: ../libcryptui/cryptui-key-chooser.c:174 -#: ../libcryptui/cryptui-key-chooser.c:179 -msgid "All Keys" -msgstr "Mọi khoá" - -#: ../libcryptui/cryptui-key-chooser.c:175 -#: ../libcryptui/cryptui-key-chooser.c:180 -msgid "Selected Recipients" -msgstr "Người nhận đã chọn" - -#: ../libcryptui/cryptui-key-chooser.c:176 -#: ../libcryptui/cryptui-key-chooser.c:181 -msgid "Search Results" -msgstr "Kết quả tìm" - -#. Filter Label -#: ../libcryptui/cryptui-key-chooser.c:192 -msgid "Search _for:" -msgstr "Tì_m:" - -#: ../libcryptui/cryptui-key-chooser.c:250 -msgid "None (Don't Sign)" -msgstr "Không (đừng ký)" - -#: ../libcryptui/cryptui-key-chooser.c:263 -#, c-format -msgid "Sign this message as %s" -msgstr "Ký thư này dưới %s" - -#. Sign Label -#: ../libcryptui/cryptui-key-chooser.c:285 -msgid "_Sign message as:" -msgstr "_Ký thư với tên:" - -#. TODO: Icons -#. The name column -#: ../libcryptui/cryptui-key-list.c:140 -#: ../pgp/seahorse-pgp-key-properties.c:839 -#: ../src/seahorse-key-manager-store.c:865 -msgid "Name" -msgstr "Tên" - -#. The keyid column -#: ../libcryptui/cryptui-key-list.c:145 -#: ../pgp/seahorse-pgp-key-properties.c:1745 -#: ../src/seahorse-key-manager-store.c:877 -msgid "Key ID" -msgstr "ID khoá" - -#: ../libegg/egg-datetime.c:325 -msgid "Display flags" -msgstr "Hiển thị cờ" - -#: ../libegg/egg-datetime.c:326 +#: ../libegg/egg-datetime.c:318 msgid "Displayed date and/or time properties" msgstr "Thuộc tính ngày/giờ đã hiển thị" -#: ../libegg/egg-datetime.c:331 +#: ../libegg/egg-datetime.c:323 msgid "Lazy mode" msgstr "Chế độ lười" -#: ../libegg/egg-datetime.c:332 +#: ../libegg/egg-datetime.c:324 msgid "Lazy mode doesn't normalize entered date and time values" msgstr "Chế độ lười thì không chuẩn hoá các giá trị ngày tháng và thời gian" -#: ../libegg/egg-datetime.c:337 +#: ../libegg/egg-datetime.c:329 msgid "Year" msgstr "Năm" -#: ../libegg/egg-datetime.c:338 +#: ../libegg/egg-datetime.c:330 msgid "Displayed year" msgstr "Năm đã hiển thị" -#: ../libegg/egg-datetime.c:343 +#: ../libegg/egg-datetime.c:335 msgid "Month" msgstr "Tháng" -#: ../libegg/egg-datetime.c:344 +#: ../libegg/egg-datetime.c:336 msgid "Displayed month" msgstr "Tháng đã hiển thị" -#: ../libegg/egg-datetime.c:349 +#: ../libegg/egg-datetime.c:341 msgid "Day" msgstr "Ngày" -#: ../libegg/egg-datetime.c:350 +#: ../libegg/egg-datetime.c:342 msgid "Displayed day of month" msgstr "Ngày của tháng đã hiển thị" -#: ../libegg/egg-datetime.c:355 +#: ../libegg/egg-datetime.c:347 msgid "Hour" msgstr "Giờ" -#: ../libegg/egg-datetime.c:356 +#: ../libegg/egg-datetime.c:348 msgid "Displayed hour" msgstr "Giờ đã hiển thị" -#: ../libegg/egg-datetime.c:361 +#: ../libegg/egg-datetime.c:353 msgid "Minute" msgstr "Phút" -#: ../libegg/egg-datetime.c:362 +#: ../libegg/egg-datetime.c:354 msgid "Displayed minute" msgstr "Phút đã hiển thị" -#: ../libegg/egg-datetime.c:367 +#: ../libegg/egg-datetime.c:359 msgid "Second" msgstr "Giây" -#: ../libegg/egg-datetime.c:368 +#: ../libegg/egg-datetime.c:360 msgid "Displayed second" msgstr "Giây đã hiển thị" -#: ../libegg/egg-datetime.c:373 +#: ../libegg/egg-datetime.c:365 msgid "Lower limit year" msgstr "Năm giới hạn dưới" -#: ../libegg/egg-datetime.c:374 +#: ../libegg/egg-datetime.c:366 msgid "Year part of the lower date limit" msgstr "Phần năm của giới hạn ngày dưới" -#: ../libegg/egg-datetime.c:379 +#: ../libegg/egg-datetime.c:371 msgid "Upper limit year" msgstr "Năm giới hạn trên" -#: ../libegg/egg-datetime.c:380 +#: ../libegg/egg-datetime.c:372 msgid "Year part of the upper date limit" msgstr "Phần năm của giới hạn ngày trên" -#: ../libegg/egg-datetime.c:385 +#: ../libegg/egg-datetime.c:377 msgid "Lower limit month" msgstr "Tháng giới hạn dưới" -#: ../libegg/egg-datetime.c:386 +#: ../libegg/egg-datetime.c:378 msgid "Month part of the lower date limit" msgstr "Phần tháng của giới hạn ngày dưới" -#: ../libegg/egg-datetime.c:391 +#: ../libegg/egg-datetime.c:383 msgid "Upper limit month" msgstr "Tháng giới hạn trên" -#: ../libegg/egg-datetime.c:392 +#: ../libegg/egg-datetime.c:384 msgid "Month part of the upper date limit" msgstr "Phần tháng của giới hạn ngày trên" -#: ../libegg/egg-datetime.c:397 +#: ../libegg/egg-datetime.c:389 msgid "Lower limit day" msgstr "Ngày giới hạn dưới" -#: ../libegg/egg-datetime.c:398 +#: ../libegg/egg-datetime.c:390 msgid "Day of month part of the lower date limit" msgstr "Phần ngày của tháng của giới hạn ngày dưới" -#: ../libegg/egg-datetime.c:403 +#: ../libegg/egg-datetime.c:395 msgid "Upper limit day" msgstr "Ngày giới hạn trên" -#: ../libegg/egg-datetime.c:404 +#: ../libegg/egg-datetime.c:396 msgid "Day of month part of the upper date limit" msgstr "Phần ngày của tháng của giới hạn ngày trên" -#: ../libegg/egg-datetime.c:409 +#: ../libegg/egg-datetime.c:401 msgid "Lower limit hour" msgstr "Giờ giới hạn dưới" -#: ../libegg/egg-datetime.c:410 +#: ../libegg/egg-datetime.c:402 msgid "Hour part of the lower time limit" msgstr "Phần giờ của giới hạn ngày dưới" -#: ../libegg/egg-datetime.c:415 +#: ../libegg/egg-datetime.c:407 msgid "Upper limit hour" msgstr "Giờ giới hạn trên" -#: ../libegg/egg-datetime.c:416 +#: ../libegg/egg-datetime.c:408 msgid "Hour part of the upper time limit" msgstr "Phần giờ của giới hạn ngày trên" -#: ../libegg/egg-datetime.c:421 +#: ../libegg/egg-datetime.c:413 msgid "Lower limit minute" msgstr "Phút giới hạn dưới" -#: ../libegg/egg-datetime.c:422 +#: ../libegg/egg-datetime.c:414 msgid "Minute part of the lower time limit" msgstr "Phần phút của giới hạn ngày dưới" -#: ../libegg/egg-datetime.c:427 +#: ../libegg/egg-datetime.c:419 msgid "Upper limit minute" msgstr "Phút giới hạn trên" -#: ../libegg/egg-datetime.c:428 +#: ../libegg/egg-datetime.c:420 msgid "Minute part of the upper time limit" msgstr "Phần phút của giới hạn ngày trên" -#: ../libegg/egg-datetime.c:433 +#: ../libegg/egg-datetime.c:425 msgid "Lower limit second" msgstr "Giây giới hạn dưới" -#: ../libegg/egg-datetime.c:434 +#: ../libegg/egg-datetime.c:426 msgid "Second part of the lower time limit" msgstr "Phần giây của giới hạn ngày dưới" -#: ../libegg/egg-datetime.c:439 +#: ../libegg/egg-datetime.c:431 msgid "Upper limit second" msgstr "Giây giới hạn trên" -#: ../libegg/egg-datetime.c:440 +#: ../libegg/egg-datetime.c:432 msgid "Second part of the upper time limit" msgstr "Phần giây của giới hạn ngày trên" @@ -931,250 +480,248 @@ #. * Do *not* translate it to anything else, if it isn't calendar:week_start:1 #. * or calendar:week_start:0 it will not work. #. -#: ../libegg/egg-datetime.c:482 +#: ../libegg/egg-datetime.c:474 msgid "calendar:week_start:0" msgstr "calendar:week_start:0" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Date" msgstr "Ngày" -#: ../libegg/egg-datetime.c:504 +#: ../libegg/egg-datetime.c:496 msgid "Enter the date directly" msgstr "Nhập trực tiếp ngày tháng" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select Date" msgstr "Chọn ngày" -#: ../libegg/egg-datetime.c:511 +#: ../libegg/egg-datetime.c:503 msgid "Select the date from a calendar" msgstr "Chọn ngày tháng trong một lịch" -#: ../libegg/egg-datetime.c:529 ../libegg/egg-datetime.c:2213 +#: ../libegg/egg-datetime.c:521 ../libegg/egg-datetime.c:2199 msgid "Time" msgstr "Giờ" -#: ../libegg/egg-datetime.c:529 +#: ../libegg/egg-datetime.c:521 msgid "Enter the time directly" msgstr "Nhập trực tiếp thời gian" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select Time" msgstr "Chọn giờ" -#: ../libegg/egg-datetime.c:536 +#: ../libegg/egg-datetime.c:528 msgid "Select the time from a list" msgstr "Chọn thời gian trong một lịch" #. Translators: set this to anything else if you want to use a #. * 24 hour clock. #. -#: ../libegg/egg-datetime.c:810 +#: ../libegg/egg-datetime.c:793 msgid "24hr: no" msgstr "24hr: no" -#: ../libegg/egg-datetime.c:814 ../libegg/egg-datetime.c:1274 -#: ../libegg/egg-datetime.c:1278 +#: ../libegg/egg-datetime.c:797 ../libegg/egg-datetime.c:1260 +#: ../libegg/egg-datetime.c:1264 msgid "AM" msgstr "sáng" -#: ../libegg/egg-datetime.c:816 ../libegg/egg-datetime.c:1275 -#: ../libegg/egg-datetime.c:1282 +#: ../libegg/egg-datetime.c:799 ../libegg/egg-datetime.c:1261 +#: ../libegg/egg-datetime.c:1268 msgid "PM" msgstr "chiều" #. Translators: This is hh:mm:ss AM/PM. -#: ../libegg/egg-datetime.c:824 +#: ../libegg/egg-datetime.c:807 #, c-format msgid "%02d:%02d:%02d %s" msgstr "%02d:%02d:%02d %s" #. Translators: This is hh:mm AM/PM. -#: ../libegg/egg-datetime.c:827 +#: ../libegg/egg-datetime.c:810 #, c-format msgid "%02d:%02d %s" msgstr "%02d:%02d %s" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:831 +#: ../libegg/egg-datetime.c:814 #, c-format msgid "%02d:%02d:%02d" msgstr "%02d:%02d:%02d" #. Translators: This is hh:mm. -#: ../libegg/egg-datetime.c:834 +#: ../libegg/egg-datetime.c:817 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" #. TODO: should handle other display modes as well... #. Translators: This is YYYY-MM-DD -#: ../libegg/egg-datetime.c:1190 +#: ../libegg/egg-datetime.c:1176 #, c-format msgid "%04d-%02d-%02d" msgstr "%04d-%02d-%02d" #. Translators: This is hh:mm:ss. -#: ../libegg/egg-datetime.c:1255 +#: ../libegg/egg-datetime.c:1241 #, c-format msgid "%u:%u:%u" msgstr "%u:%u:%u" -#: ../libegg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Tập tin không phải là một tập tin .desktop hợp lệ" +#: ../libseahorse/seahorse-add-keyserver.xml.h:1 +msgid "initial temporary item" +msgstr "mục tạm ban đầu" -#: ../libegg/eggdesktopfile.c:188 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Không nhận ra tập tin desktop Phiên bản « %s »" +#: ../libseahorse/seahorse-add-keyserver.xml.h:2 +msgid "Add Key Server" +msgstr "Thêm máy phục vụ khoá" -#: ../libegg/eggdesktopfile.c:968 -#, c-format -msgid "Starting %s" -msgstr "Đang khởi chạy %s" +#: ../libseahorse/seahorse-add-keyserver.xml.h:3 +msgid "Key Server Type:" +msgstr "Kiểu máy phục vụ khoá:" -#: ../libegg/eggdesktopfile.c:1110 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Ứng dụng không chấp nhận tài liệu trên dòng lệnh" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "Máy:" -#: ../libegg/eggdesktopfile.c:1178 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Không nhận ra tuỳ chọn khởi chạy: %d" +#: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" -#: ../libegg/eggdesktopfile.c:1383 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Không thể gửi địa chỉ URI của tài liệu cho một mục nhập môi trường « " -"Type=Link » (Kiểu=Liên kết)" +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 +msgid "The port to access the server on." +msgstr "Cổng nơi cần truy cập máy phục vụ." -#: ../libegg/eggdesktopfile.c:1404 -#, c-format -msgid "Not a launchable item" -msgstr "Không phải một mục có thể khởi chạy được" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "Phiên bản của ứng dụng này" -#: ../libegg/eggsmclient.c:225 -msgid "Disable connection to session manager" -msgstr "Tắt kết nối đến trình quản lý buổi hợp" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- Thiết lập hệ thống" -#: ../libegg/eggsmclient.c:228 -msgid "Specify file containing saved configuration" -msgstr "Xác định tập tin chứa cấu hình đã lưu" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "Đóng góp:" -#: ../libegg/eggsmclient.c:228 -msgid "FILE" -msgstr "TẬP TIN" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "Mật khẩu và khoá" -#: ../libegg/eggsmclient.c:231 -msgid "Specify session management ID" -msgstr "Xác định mã số quản lý buổi hợp" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "Nhóm Việt hóa Gnome " -#: ../libegg/eggsmclient.c:231 ../pgp/seahorse-pgp-key-properties.c:1314 -msgid "ID" -msgstr "ID" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Trang chủ Dự án Seahorse" -#: ../libegg/eggsmclient.c:252 -msgid "Session management options:" -msgstr "Các tuỳ chọn quản lý buổi hợp:" - -#: ../libegg/eggsmclient.c:253 -msgid "Show session management options" -msgstr "Hiển thị các tuỳ chọn quản lý buổi hợp" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "Không thể xoá" -#: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Không thể xuất khoá" -#: ../libseahorse/seahorse-add-keyserver.xml.h:2 -msgid "Add Key Server" -msgstr "Thêm máy phục vụ khoá" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "Không thể xuất khẩu dữ liệu" -#: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "Máy:" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "_Tập tin" -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 -msgid "Key Server Type:" -msgstr "Kiểu máy phục vụ khoá :" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "_Xuất..." -#: ../libseahorse/seahorse-add-keyserver.xml.h:6 -msgid "The port to access the server on." -msgstr "Cổng nơi cần truy cập máy phục vụ." +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "Xuất vào tập tin" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "mục tạm ban đầu" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "_Sửa" -#: ../libseahorse/seahorse-notification.c:576 -#: ../libseahorse/seahorse-notification.c:604 -msgid "Key Imported" -msgid_plural "Keys Imported" -msgstr[0] "Khoá đã nhập" - -#: ../libseahorse/seahorse-notification.c:580 -#: ../libseahorse/seahorse-notification.c:603 -#, c-format -msgid "Imported %i key" -msgid_plural "Imported %i keys" -msgstr[0] "Đã nhập %i khoá" - -#: ../libseahorse/seahorse-notification.c:582 -#, c-format -msgid "Imported a key for" -msgid_plural "Imported keys for" -msgstr[0] "Khoá đã được nhập cho" - -#: ../libseahorse/seahorse-notify.xml.h:1 -msgid "Notification Messages" -msgstr "Thông điệp thông báo" - -#: ../libseahorse/seahorse-object.c:317 -msgid "Symmetric Key" -msgstr "Khoá đối sứng" - -#: ../libseahorse/seahorse-object.c:320 -msgid "Public Key" -msgstr "Khoá công" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "Chép sang bảng nháp" -#: ../libseahorse/seahorse-object.c:323 -msgid "Private Key" -msgstr "Khoá riêng" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "_Xoá" -#: ../libseahorse/seahorse-object.c:326 -msgid "Credentials" -msgstr "Thông tin xác thực" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "Xoá các mục đã chọn" -#. -#. * Translators: "This object is a means of storing items such as -#. * name, email address, etc. that make up one's digital identity. -#. -#: ../libseahorse/seahorse-object.c:333 -msgid "Identity" -msgstr "Cá tính" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "Hiện thuộc tính mục này" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "Hiện thuộc tính xâu khoá này" -#: ../libseahorse/seahorse-passphrase.c:200 -msgid "Passphrase" -msgstr "Cụm từ mật khẩu" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "Tù_y thích" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "Thay đổi tùy thích cho chương trình này" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "_Xem" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "Trợ g_iúp" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "Giới thiệu về chương trình này" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "Mục lụ_c" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "Hiện trợ giúp Seahorse" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "Xuất" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "Nhập PIN hoặc mật khẩu cho: %s" -#: ../libseahorse/seahorse-passphrase.c:203 -#: ../ssh/seahorse-ssh-operation.c:480 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 msgid "Password:" -msgstr "Mật khẩu :" +msgstr "Mật khẩu:" -#: ../libseahorse/seahorse-passphrase.c:269 +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 msgid "Confirm:" msgstr "Xác nhận:" -#: ../libseahorse/seahorse-prefs.c:62 +#: ../libseahorse/seahorse-prefs.c:67 msgid "Not a valid Key Server address." msgstr "Không phải địa chỉ máy phục vụ khoá hợp lệ." -#: ../libseahorse/seahorse-prefs.c:63 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." @@ -1182,322 +729,361 @@ "Để được trợ giúp, hãy liên lạc với quản trị hệ thống, hoặc với quản trị của " "máy phục vụ khoá." -#: ../libseahorse/seahorse-prefs.c:172 +#: ../libseahorse/seahorse-prefs.c:181 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:352 +#: ../libseahorse/seahorse-prefs.c:351 msgid "Custom" msgstr "Tự chọn" -#: ../libseahorse/seahorse-prefs.c:425 +#: ../libseahorse/seahorse-prefs.c:404 msgid "None: Don't publish keys" msgstr "Không: đừng xuất bản khoá" #: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "Tự động lấy các khoá từ các máy phục vụ _khoá" +msgid "Preferences" +msgstr "Tuỳ thích" #: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "Tự động đồng bộ hoá các khoá đã sửa đổi với các _máy phục vụ khoá" +msgid "_Find keys via:" +msgstr "_Tìm khoá bằng:" #: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "Máy phục vụ khoá" +msgid "_Publish keys to:" +msgstr "_Xuất bản khoá tới:" #: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "Tuỳ thích" +msgid "Automatically retrieve keys from _key servers" +msgstr "Tự động lấy các khoá từ các máy phục vụ _khoá" #: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "_Tìm khoá bằng:" +msgid "Automatically synchronize _modified keys with key servers" +msgstr "Tự động đồng bộ hoá các khoá đã sửa đổi với các _máy phục vụ khoá" #: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "_Xuất bản khoá tới :" - -#: ../libseahorse/seahorse-progress.xml.h:1 -msgid "Progress Title" -msgstr "Tựa tiến hành" - -#: ../libseahorse/seahorse-unknown.c:67 -msgid "Unavailable" -msgstr "Không sẵn sàng" +msgid "Key Servers" +msgstr "Máy phục vụ khoá" -#: ../libseahorse/seahorse-util.c:240 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%d-%m-%Y" -#: ../libseahorse/seahorse-util.c:516 -msgid "Key Data" -msgstr "Dữ liệu khoá" - -#: ../libseahorse/seahorse-util.c:518 -msgid "Multiple Keys" -msgstr "Đa khoá" - -#: ../libseahorse/seahorse-util.c:774 -msgid "Couldn't run file-roller" -msgstr "Không thể chạy chương trình file-roller" - -#: ../libseahorse/seahorse-util.c:780 -msgid "Couldn't package files" -msgstr "Không thể đóng gói các tập tin" - -#: ../libseahorse/seahorse-util.c:781 -msgid "The file-roller process did not complete successfully" -msgstr "Tiến trình file-roller đã không chạy xong thành công" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:957 -msgid "All key files" -msgstr "Mọi tập tin khoá" - -#: ../libseahorse/seahorse-util.c:968 ../libseahorse/seahorse-util.c:1016 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "Mọi tập tin" - -#: ../libseahorse/seahorse-util.c:1009 -msgid "Archive files" -msgstr "Tập tin kho lưu" - -#: ../libseahorse/seahorse-util.c:1079 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"Tập tin tên đó đã có.\n" -"\n" -"Bạn có muốn thay thế nó bằng một tập tin mới không?" - -#: ../libseahorse/seahorse-util.c:1082 -msgid "_Replace" -msgstr "Tha_y thế" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1133 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "Không rõ" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1139 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "Không bao giờ" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1146 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "Sát giới hạn" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1152 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "Đầy" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1158 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "Cuối cùng" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1351 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Bị tắt" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1347 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Bị hủy bỏ" -#: ../libseahorse/seahorse-widget.c:480 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "Không thể hiển thị trợ giúp: %s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "Ngày hết hạn:" +msgid "Never E_xpires" +msgstr "_Vô hạn" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "Tạo ra khoá phụ mới" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "Nếu khoá vô hạn" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "_Kiểu khoá:" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" -msgstr "_Dài khoá :" +msgstr "_Dài khoá:" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "_Kiểu khoá :" +msgid "Expiration Date:" +msgstr "Ngày hết hạn:" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "Độ dài của khoá" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "_Vô hạn" +msgid "Generate a new subkey" +msgstr "Tạo ra khoá phụ mới" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "Thêm ID người dùng" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "Tạo ID người dùng mới" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "Tê_n đầy đủ :" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "_Ghi chú khoá :" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "Độ dài ít nhất 5 ký tự" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "Địa chỉ thư điện tử tùy chọn" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "Chú thích tùy chọn mà diễn tả khoá" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "Địa chỉ thư điện tử tùy chọn" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "_Họ và tên:" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" -msgstr "Đị_a chỉ thư :" +msgstr "Đị_a chỉ thư:" + +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "_Ghi chú khoá:" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "Tạo ID người dùng mới" #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "Đổ_i" +msgid "_Never expires" +msgstr "Vô hạ_n" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "Hủy bỏ khoá" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "Vô hạ_n" +msgid "C_hange" +msgstr "Đổ_i" -#: ../pgp/seahorse-gpgme-add-subkey.c:147 +#: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" msgstr "Không thể thêm khoá phụ" -#: ../pgp/seahorse-gpgme-add-subkey.c:166 +#: ../pgp/seahorse-gpgme-add-subkey.c:181 #, c-format msgid "Add subkey to %s" msgstr "Thêm khoá phụ vào %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:182 ../pgp/seahorse-gpgme-generate.c:118 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (chỉ ký)" -#: ../pgp/seahorse-gpgme-add-subkey.c:190 +#: ../pgp/seahorse-gpgme-add-subkey.c:205 msgid "ElGamal (encrypt only)" msgstr "ElGamal (chỉ mã hoá)" -#: ../pgp/seahorse-gpgme-add-subkey.c:196 ../pgp/seahorse-gpgme-generate.c:119 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (chỉ ký)" -#: ../pgp/seahorse-gpgme-add-subkey.c:202 +#: ../pgp/seahorse-gpgme-add-subkey.c:217 msgid "RSA (encrypt only)" msgstr "RSA (chỉ mã hoá)" -#: ../pgp/seahorse-gpgme-add-uid.c:85 +#: ../pgp/seahorse-gpgme-add-uid.c:100 msgid "Couldn't add user id" msgstr "Không thể thêm ID người dùng" -#: ../pgp/seahorse-gpgme-add-uid.c:107 +#: ../pgp/seahorse-gpgme-add-uid.c:122 #, c-format msgid "Add user ID to %s" msgstr "Thêm ID người dùng vào %s" -#: ../pgp/seahorse-gpgme.c:72 +#: ../pgp/seahorse-gpgme.c:69 msgid "Decryption failed. You probably do not have the decryption key." msgstr "Lỗi giải mã. Rất có thể là bạn không có khoá giải mã." -#: ../pgp/seahorse-gpgme-expires.c:58 +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "Thao tác bị huỷ" + +#: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "Ngày hết hạn không hợp lệ" -#: ../pgp/seahorse-gpgme-expires.c:59 +#: ../pgp/seahorse-gpgme-expires.c:66 msgid "The expiry date must be in the future" msgstr "Ngày hết hạn phải nằm trong tương lai" -#: ../pgp/seahorse-gpgme-expires.c:72 +#: ../pgp/seahorse-gpgme-expires.c:79 msgid "Couldn't change expiry date" msgstr "Không thể thay đổi ngày hết hạn" -#: ../pgp/seahorse-gpgme-expires.c:131 +#: ../pgp/seahorse-gpgme-expires.c:140 #, c-format msgid "Expiry: %s" msgstr "Hết hạn: %s" -#: ../pgp/seahorse-gpgme-generate.c:79 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "Đa khoá" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "Dữ liệu khoá" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "Khoá Armored PGP" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "Khoá PGP" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "Khoá PGP" -#: ../pgp/seahorse-gpgme-generate.c:80 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "Dùng để mã hoá thư điện tử và tập tin" -#: ../pgp/seahorse-gpgme-generate.c:116 ../ssh/seahorse-ssh-generate.xml.h:9 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" # Name: don't translate/Tên: đừng dịch -#: ../pgp/seahorse-gpgme-generate.c:117 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "Không thể tạo ra khoá PGP" -#: ../pgp/seahorse-gpgme-generate.c:195 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "Cụm từ mật khẩu cho khoá PGP mới" -#: ../pgp/seahorse-gpgme-generate.c:196 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "Gõ hai lần cụm từ mật khẩu cho khoá mới ." -#: ../pgp/seahorse-gpgme-generate.c:205 -msgid "Couldn't generate key" -msgstr "Không thể tạo ra khoá" +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" -#: ../pgp/seahorse-gpgme-generate.c:207 +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "Đang tạo ra khoá" -#: ../pgp/seahorse-gpgme-key-op.c:301 -#| msgid "Show pass_word" +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "Bạn có chắc muốn xoá hoàn toàn %s không?" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "Bạn có chắc muốn xoá hẳn %d khoá không?" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "Mật khẩu sai" -#: ../pgp/seahorse-gpgme-key-op.c:301 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "Đây là lần thứ ba bạn nhập sai mật khẩu. Hãy thử lại lần nữa." +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "Cụm từ mật khẩu không đúng." + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "Gõ cụm từ mật khẩu mới cho « %s »" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "Gõ cụm từ mật khẩu cho « %s »" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "Gõ cụm từ mật khẩu mới" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "Gõ cụm từ mật khẩu" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "Cụm từ mật khẩu" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "Đã nạp %d khoá" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"Gặp dữ liệu khoá không hợp lệ (thiếu UID). Có thể do máy tính có ngày tháng " +"được đặt trong tương lai, hay chữ tự ký bị thiếu." + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "Khoá GnuPG" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG: thư mục xâu khoá mặc định" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -1532,68 +1118,76 @@ msgid "All JPEG files" msgstr "Mọi tập tin JPEG" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "Mọi tập tin" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "Chọn ảnh chụp cần thêm vào khoá" -#: ../pgp/seahorse-gpgme-photos.c:290 ../pgp/seahorse-gpgme-photos.c:294 +#: ../pgp/seahorse-gpgme-photos.c:285 +msgid "Couldn't prepare photo" +msgstr "Không thể chuẩn bị ảnh chụp" + +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "Không thể thêm ảnh chụp" -#: ../pgp/seahorse-gpgme-photos.c:291 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "Tập tin không nạp được; có lẽ nó có định dạng không hợp lệ" -#: ../pgp/seahorse-gpgme-photos.c:320 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "Bạn có chắc muốn gỡ bỏ ảnh chụp hiện thời khỏi khoá của bạn không?" -#: ../pgp/seahorse-gpgme-photos.c:333 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "Không thể xoá ảnh chụp" -#: ../pgp/seahorse-gpgme-revoke.c:70 +#: ../pgp/seahorse-gpgme-revoke.c:75 msgid "Couldn't revoke subkey" msgstr "Không thể hủy bỏ khoá phụ" -#: ../pgp/seahorse-gpgme-revoke.c:91 +#: ../pgp/seahorse-gpgme-revoke.c:96 #, c-format msgid "Revoke: %s" msgstr "Hủy bỏ : %s" -#: ../pgp/seahorse-gpgme-revoke.c:102 +#: ../pgp/seahorse-gpgme-revoke.c:107 msgid "No reason" msgstr "Không có lý do" -#: ../pgp/seahorse-gpgme-revoke.c:103 +#: ../pgp/seahorse-gpgme-revoke.c:108 msgid "No reason for revoking key" msgstr "Không có lý do hủy bỏ khoá" -#: ../pgp/seahorse-gpgme-revoke.c:109 +#: ../pgp/seahorse-gpgme-revoke.c:114 msgid "Compromised" msgstr "Bị xâm nhập" -#: ../pgp/seahorse-gpgme-revoke.c:110 +#: ../pgp/seahorse-gpgme-revoke.c:115 msgid "Key has been compromised" msgstr "Khoá đã bị xâm nhập" -#: ../pgp/seahorse-gpgme-revoke.c:116 +#: ../pgp/seahorse-gpgme-revoke.c:121 msgid "Superseded" msgstr "Bị thay thế" -#: ../pgp/seahorse-gpgme-revoke.c:117 +#: ../pgp/seahorse-gpgme-revoke.c:122 msgid "Key has been superseded" msgstr "Khoá bị thay thế vì quá cũ" -#: ../pgp/seahorse-gpgme-revoke.c:123 +#: ../pgp/seahorse-gpgme-revoke.c:128 msgid "Not Used" msgstr "Không dùng" -#: ../pgp/seahorse-gpgme-revoke.c:124 +#: ../pgp/seahorse-gpgme-revoke.c:129 msgid "Key is no longer used" msgstr "Khoá không còn được dùng lại" -#: ../pgp/seahorse-gpgme-revoke.c:161 +#: ../pgp/seahorse-gpgme-revoke.c:166 #, c-format msgid "" "You are about to add %s as a revoker for %s. This operation cannot be " @@ -1602,11 +1196,15 @@ "Bạn sắp thêm %s là bộ hủy bỏ cho %s. Thao tác này không thể được hồi lại. " "Bạn vẫn muốn tiếp tục không?" -#: ../pgp/seahorse-gpgme-revoke.c:173 +#: ../pgp/seahorse-gpgme-revoke.c:178 msgid "Couldn't add revoker" msgstr "Không thể thêm bộ hủy bỏ" -#: ../pgp/seahorse-gpgme-sign.c:99 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "Tôi hiểu bí mật này sẽ bị xoá vĩnh viễn." + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1615,17 +1213,17 @@ "Khoá này được ký bởi\n" "\"%s\"" -#: ../pgp/seahorse-gpgme-sign.c:103 +#: ../pgp/seahorse-gpgme-sign.c:105 msgid "Couldn't sign key" msgstr "Không thể ký khoá" #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:157 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "Không có khoá nào ký được" -#: ../pgp/seahorse-gpgme-sign.c:158 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." @@ -1633,547 +1231,571 @@ "Bạn không có khoá PGP riêng nào có thể được dùng để ghi độ tin cậy của bạn " "trên khoá này." -#: ../pgp/seahorse-gpgme-source.c:102 -#, c-format -msgid "Wrong passphrase." -msgstr "Cụm từ mật khẩu không đúng." +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:106 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "Gõ cụm từ mật khẩu mới cho « %s »" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "" +"Chuỗi tìm kiếm không đủ dứt khoát nên máy phục vụ « %s » tìm thấy quá nhiều " +"khoá." -#: ../pgp/seahorse-gpgme-source.c:108 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "Gõ cụm từ mật khẩu cho « %s »" +msgid "Couldn't communicate with server '%s': %s" +msgstr "Không thể liên lạc với máy phục vụ « %s »: %s" -#: ../pgp/seahorse-gpgme-source.c:111 -#: ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "Gõ cụm từ mật khẩu mới" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "Máy phục vụ khoá HTTP" -#: ../pgp/seahorse-gpgme-source.c:113 -msgid "Enter passphrase" -msgstr "Gõ cụm từ mật khẩu" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "Không thể nhập khoá" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "Nhập khoá cho máy phục vụ khoá" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "Ở _xa" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "Đóng cửa sổ" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "_Tìm khoá từ xa..." -#. TODO: We can use the GPGME progress to make this more accurate -#: ../pgp/seahorse-gpgme-source.c:725 +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "Tìm khoá trên máy phục vụ khoá" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "_Nhập" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "Nhập khoá được chọn vào xâu khoá cục bộ" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "Khoá ở xa" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "Đã nạp %d khoá" +msgid "Remote Keys Containing '%s'" +msgstr "Khoá ở xa chứa '%s'" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "Tìm kiếm khoá thất bại." -#: ../pgp/seahorse-gpgme-source.c:780 -msgid "Loading Keys..." -msgstr "Đang nạp các khoá..." +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "Tìm khoá từ xa" -#: ../pgp/seahorse-gpgme-source.c:823 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"Gặp dữ liệu khoá không hợp lệ (thiếu UID). Có thể do máy tính có ngày tháng " -"được đặt trong tương lai, hay chữ tự ký bị thiếu." +"Việc này sẽ tìm khoá của người khác trên Mạng. Tìm được thì có thể nhập khoá " +"vào xâu khoá của bạn." -#: ../pgp/seahorse-gpgme-source.c:913 ../src/seahorse-key-manager.c:544 -msgid "Importing Keys" -msgstr "Đang nhập khoá" - -#: ../pgp/seahorse-gpgme-source.c:949 -msgid "Exporting Keys" -msgstr "Đang xuất khoá" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "_Tìm khoá chứa: " -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "Máy phục vụ khoá:" -#: ../pgp/seahorse-hkp-source.c:387 -#, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "" -"Chuỗi tìm kiếm không đủ dứt khoát nên máy phục vụ « %s » tìm thấy quá nhiều " -"khoá." +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "Khoá dùng chung gần tôi:" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "Nơi cần tìm:" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "_Tìm" -#: ../pgp/seahorse-hkp-source.c:389 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "Không thể xuất khoá tới máy phục vụ" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "Không thể liên lạc với máy phục vụ « %s »: %s" +msgid "Couldn't retrieve keys from server: %s" +msgstr "Không thể lấy khoá từ máy phục vụ : %s" -#: ../pgp/seahorse-hkp-source.c:671 -msgid "Searching for keys..." -msgstr "Đang tìm kiếm khoá..." - -#: ../pgp/seahorse-hkp-source.c:759 -msgid "Uploading keys..." -msgstr "Đang tải lên khoá ..." - -#: ../pgp/seahorse-hkp-source.c:857 -msgid "Retrieving keys..." -msgstr "Đang lấy khoá..." - -#: ../pgp/seahorse-hkp-source.c:987 -#, c-format -msgid "Searching for keys on: %s" -msgstr "Đang tìm kiếm khoá trên: %s" - -#. The ldap_cb and chain_cb were set in seahorse_ldap_operation_start -#: ../pgp/seahorse-hkp-source.c:1072 ../pgp/seahorse-hkp-source.c:1154 -#: ../pgp/seahorse-ldap-source.c:668 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Connecting to: %s" -msgstr "Đang kết nối đến: %s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "%d khoá được chọn để đồng bộ hoá" -#: ../pgp/seahorse-hkp-source.c:1184 -msgid "HTTP Key Server" -msgstr "Máy phục vụ khoá HTTP" +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "Đang đồng bộ hoá khoá..." -#: ../pgp/seahorse-ldap-source.c:459 +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "Đồng bộ hóa khoá" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"Việc này sẽ xuất các khoá trong xâu khoá của bạn, để người khác sử dụng. Bạn " +"sẽ cũng nhận thay đổi nào của người khác kể từ lần bạn nhận khoá họ cuối " +"cùng." + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"Việc này sẽ lấy thay đổi nào của người khác kể từ lần bạn nhận khoá họ cuối " +"cùng. Chưa chọn máy phục vụ khoá nơi cần xuất nên người khác sẽ không thể sử " +"dụng khoá của bạn." + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "Máy phục vụ _khoá" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "Đồng _bộ" + +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Không thể liên lạc với « %s »: %s" -#: ../pgp/seahorse-ldap-source.c:641 +#: ../pgp/seahorse-ldap-source.c:652 +#, c-format +msgid "Connecting to: %s" +msgstr "Đang kết nối đến: %s" + +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "Không thể quyết định địa chỉ: %s" -#: ../pgp/seahorse-ldap-source.c:719 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "Đang quyết định địa chỉ của máy phục vụ : %s" -#: ../pgp/seahorse-ldap-source.c:955 -#, c-format -msgid "Searching for keys containing '%s'..." -msgstr "Đang tìm kiếm khoá chứa « %s »..." - -#: ../pgp/seahorse-ldap-source.c:983 -#, c-format -msgid "Searching for key id '%s'..." -msgstr "Đang tìm kiếm ID khoá « %s »..." - -#: ../pgp/seahorse-ldap-source.c:1089 -msgid "Retrieving remote keys..." -msgstr "Đang lấy khoá từ xa..." - -#: ../pgp/seahorse-ldap-source.c:1221 -msgid "Sending keys to key server..." -msgstr "Đang gửi khoá cho máy phục..." - -#: ../pgp/seahorse-ldap-source.c:1423 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "Máy phục vụ khoá LDAP" -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "_Sign Key..." -msgstr "_Ký khoá..." - -#: ../pgp/seahorse-pgp-commands.c:103 -msgid "Sign public key" -msgstr "Ký khoá công" - -#: ../pgp/seahorse-pgp-commands.c:171 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "Bạn có chắc muốn xoá hoàn toàn %s không?" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "Đồn_g bộ và công bố khoá..." -#: ../pgp/seahorse-pgp-commands.c:176 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "Bạn có chắc muốn xoá hẳn %d khoá và cá tính không?" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "Công bố và/hoặc đồng bộ khoá với trên mạng." -#: ../pgp/seahorse-pgp-commands.c:178 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "Bạn có chắc muốn xoá hẳn %d khoá không?" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "Khoá PGP" -#: ../pgp/seahorse-pgp-commands.c:180 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "Bạn có chắc muốn xoá hẳn %d cá tính không?" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "Khoá PGP dùng để mã hoá thư điện tử và tập tin" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "Tùy chọn khoá cấp c_ao" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "Tạ_o" #: ../pgp/seahorse-pgp-generate.xml.h:2 +msgid "Generate a new key" +msgstr "Tạo ra một khoá mới" + +#: ../pgp/seahorse-pgp-generate.xml.h:3 msgid "A PGP key allows you to encrypt email or files to other people." msgstr "" "Khoá PGP cho bạn có khả năng mã hoá thư điện tử hay tập tin cho người khác." -#: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "Thuật toán ở đây" - -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "Tạ_o" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "_Chú thích:" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "Ngà_y hết hạn:" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "_Vô hạn" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:5 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "_Kiểu mã hoá:" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "Tạo ra một khoá mới" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "_Mạnh khoá (bit):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "_Vô hạn" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "Khoá PGP mới" +msgid "E_xpiration Date:" +msgstr "Ngà_y hết hạn:" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "_Chú thích:" - -#: ../pgp/seahorse-pgp-key.c:201 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "Khoá PGP riêng" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "Tùy chọn khoá cấp c_ao" -#: ../pgp/seahorse-pgp-key.c:204 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "Khoá PGP công" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "Khoá GPG cá nhân" -#: ../pgp/seahorse-pgp-key.c:583 ../pgp/seahorse-pgp-key-properties.c:1349 -msgid "Expired" -msgstr "Đã hết hạn" +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "Khoá PGP" -#: ../pgp/seahorse-pgp-key-properties.c:224 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "Không thể thay đổi ID người dùng chính" -#: ../pgp/seahorse-pgp-key-properties.c:241 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "Bạn có chắc muốn xoá hoàn toàn ID người dùng « %s » không?" -#: ../pgp/seahorse-pgp-key-properties.c:251 +#: ../pgp/seahorse-pgp-key-properties.c:354 msgid "Couldn't delete user ID" msgstr "Không thể xoá ID người dùng" -#: ../pgp/seahorse-pgp-key-properties.c:333 -#: ../pgp/seahorse-pgp-key-properties.c:1464 +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Không rõ]" -#: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1742 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Tên/Địa chỉ thư" -#: ../pgp/seahorse-pgp-key-properties.c:431 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "ID chữ ký" -#: ../pgp/seahorse-pgp-key-properties.c:552 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "Không thể thay đổi ảnh chụp chính" -#: ../pgp/seahorse-pgp-key-properties.c:775 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(không rõ)" -#: ../pgp/seahorse-pgp-key-properties.c:778 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "Khoá này đã hết hạn vào : %s" -#: ../pgp/seahorse-pgp-key-properties.c:946 +#: ../pgp/seahorse-pgp-key-properties.c:978 +msgid "Name" +msgstr "Tên" + +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Bạn có chắc muốn xoá hoàn toàn khoá phụ %d của %s không?" -#: ../pgp/seahorse-pgp-key-properties.c:955 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "Không thể xoá khoá phụ" -#: ../pgp/seahorse-pgp-key-properties.c:991 -#: ../pgp/seahorse-pgp-key-properties.c:1427 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Không thể thay đổi tình trạng đáng tin" -#: ../pgp/seahorse-pgp-key-properties.c:1006 ../src/seahorse-viewer.c:291 -#: ../ssh/seahorse-ssh-key-properties.c:168 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "Không thể xuất khẩu khoá tới « %s »" - -#: ../pgp/seahorse-pgp-key-properties.c:1035 -#: ../ssh/seahorse-ssh-key-properties.c:193 -msgid "Export Complete Key" -msgstr "Xuất toàn bộ khoá" - -#: ../pgp/seahorse-pgp-key-properties.c:1060 -#: ../ssh/seahorse-ssh-key-properties.c:215 -msgid "Couldn't export key." -msgstr "Không thể xuất khẩu khoá." +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "Không thể xuất khẩu khoá" -#: ../pgp/seahorse-pgp-key-properties.c:1267 -#: ../pgp/seahorse-pgp-key-properties.c:1356 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Không bao giờ" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1317 -#: ../src/seahorse-key-manager-store.c:896 +#: ../pgp/seahorse-pgp-key-properties.c:1432 +msgid "ID" +msgstr "ID" + +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Kiểu" -#: ../pgp/seahorse-pgp-key-properties.c:1320 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Tạo" -#: ../pgp/seahorse-pgp-key-properties.c:1323 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Hết hạn" -#: ../pgp/seahorse-pgp-key-properties.c:1326 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Trạng thái" -#: ../pgp/seahorse-pgp-key-properties.c:1329 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Mạnh" -#: ../pgp/seahorse-pgp-key-properties.c:1353 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "Đã hết hạn" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Tốt" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "Hành vi" +#: ../pgp/seahorse-pgp-key-properties.c:1857 +msgid "Key ID" +msgstr "ID khoá" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "Chú thích:" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "Ngày" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "Địa chỉ thư :" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "Vân tay" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "ID khoá:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "Không bao giờ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "Tên khoá và chữ ký" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "Khoá này đã bị hủy bỏ" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "Ảnh chụp " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "Người sở hữu khoá đã hủy bỏ khoá đó nên nó vô ích." #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "Chi tiết kỹ thuật" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "Khoá này đã hết hạn dùng" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "Khoá này đã bị hủy bỏ" +msgid "Add a photo to this key" +msgstr "Thêm ảnh chụp vào khoá này" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "Khoá này đã hết hạn dùng" +msgid "Remove this photo from this key" +msgstr "Gỡ bỏ ảnh chụp này khỏi khoá này" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "Kiểu :" +msgid "Make this photo the primary photo" +msgstr "Làm cho ảnh chụp này là ảnh chụp chính" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "Dùng:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "Về ảnh chụp trước" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "Khoá _phụ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "Tới ảnh chụp kế" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "Thêm" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "Ảnh chụp " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "Thêm ảnh chụp vào khoá này" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "ID khoá:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "Đổi _cụm từ mật khẩu" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "Tên:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "Giải mã tập tin và thư điện tử được gửi cho bạn." +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "Địa chỉ thư :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "Xoá" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "Chú thích:" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "Hết hạn" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "Dùng:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "Hết hạn:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "Kiểu :" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "Xuất" +msgid "Decrypt files and email sent to you." +msgstr "Giải mã tập tin và thư điện tử được gửi cho bạn." + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "Khoá PGP riêng" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "Tới ảnh chụp kế" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "Đổi _cụm từ mật khẩu" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "Về ảnh chụp trước" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "Sở hữu" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "ID khoá:" +msgid "Key Names and Signatures" +msgstr "Tên khoá và chữ ký" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "Chính" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "Làm cho ảnh chụp này là ảnh chụp chính" +msgid "Sign" +msgstr "Ký" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "Tên và Chữ ký" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "Xoá" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -#| msgctxt "Validity" -#| msgid "Never" -msgid "Never" -msgstr "Không bao giờ" +msgid "_Add Name" +msgstr "Thê_m tên" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "Ghi đè lên _tình trạng tin cậy của người sở hữu :" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "Sở hữu" +msgid "Revoke" +msgstr "Hủy bỏ" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "Chính" +msgid "Names and Signatures" +msgstr "Tên và Chữ ký" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "Gỡ bỏ ảnh chụp này khỏi khoá này" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "ID khoá:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "Hủy bỏ" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "Độ mạnh:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "Ký" +msgid "Technical Details" +msgstr "Chi tiết kỹ thuật" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "Độ mạnh:" +msgid "Fingerprint" +msgstr "Vân tay" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "Người sở hữu khoá đã hủy bỏ khoá đó nên nó vô ích." +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "Hết hạn:" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "Thê_m tên" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "Ngày" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "Ghi đè lên _tình trạng tin cậy của người sở hữu:" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "_Xuất toàn bộ khoá:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -#| msgid "Name:" -msgctxt "name-of-key" -msgid "Name:" -msgstr "Tên:" +msgid "Actions" +msgstr "Hành vi" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "Ngày:" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "Thêm" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "Hết hạn" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "Khoá _phụ" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "Biên" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "Vân tay:" +msgid "Fully" +msgstr "Đầy" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "Ghi tin cậy" +msgid "Ultimately" +msgstr "Cuối cùng" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "Độ tin cậy của bạn với khoá này" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 -msgid "_Other Names:" -msgstr "_Tên khác:" +#| msgid "Encrypt files and email to the key's owner " +msgid "Encrypt files and email to the key's owner" +msgstr "Mã hoá tập tin và thư cho người sử hữu khoá này" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "_Người đã ký khoá này:" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "Khoá PGP công" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "Mã hoá tập tin và thư cho người sử hữu khoá này " +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 +msgid "_Other Names:" +msgstr "_Tên khác:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -#| msgid "Full" -msgid "Fully" -msgstr "Đầy" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "Độ tin cậy của bạn với khoá này" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "Độ tin cậy của bạn được ghi rõ bằng tay trên thanh Chi tiết." + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "Tin cậy các chữ ký từ « %s » trên các khoá khác " -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " @@ -2181,7 +1803,11 @@ msgstr "" "Để ghi rằng bạn tin cậy người sở hữu khoá này là « %s », ký khoá này:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "_ Ký khoá này" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" @@ -2189,41 +1815,38 @@ "Nếu bạn không còn tin cậy lại « %s » sở hữu khoá này, hủy bỏ chữ ký " "của bạn:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -#| msgid "Marginal" -msgid "Marginally" -msgstr "Biên" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 +msgid "_Revoke Signature" +msgstr "_Hủy bỏ chữ ký" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "_Người đã ký khoá này:" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "_Chỉ hiển thị chữ ký của những người tôi tin cậy" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:890 msgid "Trust" msgstr "Tin cậy" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -#| msgid "Ultimate" -msgid "Ultimately" -msgstr "Cuối cùng" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "Bạn _tin cậy người sở hữu :" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "Độ tin cậy của bạn được ghi rõ bằng tay trên thanh Chi tiết." +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "Vân tay:" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "_Chỉ hiển thị chữ ký của những người tôi tin cậy" +msgid "Dates:" +msgstr "Ngày:" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "_Hủy bỏ chữ ký" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "Ghi tin cậy" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "_ Ký khoá này" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "Bạn _tin cậy người sở hữu:" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -2231,54 +1854,60 @@ msgstr "Khoá phụ %d của %s" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "Mô tả tùy chọn của sự hủy bỏ" +msgid "Reason for revoking the key" +msgstr "Lý do hủy bỏ khoá này" #: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "Hủ_y bỏ" +msgid "_Reason:" +msgstr "_Lý do:" -#: ../pgp/seahorse-revoke.xml.h:3 -msgid "Reason for revoking the key" -msgstr "Lý do hủy bỏ khoá này" +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "Mô tả tùy chọn của sự hủy bỏ" #: ../pgp/seahorse-revoke.xml.h:6 -msgid "_Reason:" -msgstr "_Lý do :" +msgid "Re_voke" +msgstr "Hủ_y bỏ" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "" "Bạn không có khoá PGP riêng nào có thể được dùng để ký tài liệu hay thư." +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "_Ký thư bằng khoá:" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "Bao đã kiểm tra khoá này một cách cẩn thận bao nhiêu?" +msgid "Sign Key" +msgstr " Ký khoá" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "Hình thức của chữ ký này cho người khác:" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "Bằng cách ký, bạn ghi rằng bạn tin cậy khoá này thuộc về:" #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "Ký chữ ký như là:" +msgid "Key Name" +msgstr "Tên khoá" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"Cẩu thả: có nghĩa là bạn đã thẩm tra cẩu thả khoá đó thuộc về người " -"tuyên bố sở hữu nó. Ví dụ, bạn có thể đọc vân tay khoá qua điện thoại khi " -"nói với người sở hữu." +msgid "How carefully have you checked this key?" +msgstr "Bao đã kiểm tra khoá này một cách cẩn thận bao nhiêu?" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "Tên khoá" +msgid "_Not at all" +msgstr "Khô_ng bằng cách nào cả" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "_Cẩu thả" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "_Rất cẩn thận" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -2286,7 +1915,21 @@ "Không bằng cách nào cả: có nghĩa là bạn cho rằng khoá này thuộc về " "người tuyên bố sở hữu nó, nhưng bạn chưa hay không thể thẩm tra đây là thật." -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +#| msgid "" +#| "Casually: means you have done a casual verification that the key " +#| "is owned by the person who claims to own it. For example, you could read " +#| "the key fingerprint to the owner over the phone. " +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"Cẩu thả: có nghĩa là bạn đã thẩm tra cẩu thả khoá đó thuộc về người " +"tuyên bố sở hữu nó. Ví dụ, bạn có thể đọc vân tay khoá qua điện thoại khi " +"nói với người sở hữu." + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." @@ -2294,18 +1937,6 @@ "Rất cẩn thận: chọn mục này chỉ nếu bạn có chắc chắn hoàn toàn rằng " "khoá này là thật và đúng." -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "Bằng cách ký, bạn ghi rằng bạn tin cậy khoá này thuộc về:" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "Tôi có thể _hủy bỏ chữ ký này vào ngày sau." - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr " Ký khoá" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -2317,216 +1948,306 @@ "kiểm tra địa chỉ thư điện tử của khoá có phải thuộc về người sở hữu đó." #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "_Cẩu thả" +msgid "How others will see this signature:" +msgstr "Hình thức của chữ ký này cho người khác:" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "Khô_ng bằng cách nào cả" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "_Không cho phép người khác xem chữ ký này" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "Tôi có thể _hủy bỏ chữ ký này vào ngày sau." + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "_Ký" +msgid "Sign key as:" +msgstr "Ký chữ ký như là:" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "Người _ký:" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "_Rất cẩn thận" +msgid "_Sign" +msgstr "_Ký" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "_Ký thư bằng khoá:" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "Xuất khoá" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "Lấy các khoá" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "Nhập khoá" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "Gửi khoá" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "Không sẵn sàng" + +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "Chứng nhận và khoá cá nhân" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "Chứng nhận cá nhân" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "Chứng nhận" -#: ../pkcs11/seahorse-pkcs11-commands.c:108 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "Bạn có chắc muốn xoá chứng nhận « %s » không?" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "Chứng nhận (mã hoá DER)" -#: ../pkcs11/seahorse-pkcs11-commands.c:111 -#, c-format -#| msgid "Are you sure you want to delete %d certificates?" -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "Bạn có chắc muốn xoá %d chứng nhận không?" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "Chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "Chứng nhận X.509 và khoá liên quan" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "Bạn có chắc muốn xoá hẳn %d chứng nhận không?" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "Không thể tạo ra khoá riêng" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "Tạo" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "Khoá riêng" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "Dùng để yêu cầu chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "Tạo khoá riêng mới" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "Nhãn:" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "Lưu tại:" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "Tôi hiểu khoá này sẽ bị xoá vĩnh viễn." + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "Không tên" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "Lỗi xuất chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "Không thể xoá" + +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "_Xuất" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "Xuất chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "Xoá khoá hoặc chứng nhận này" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "Yêu cầu _chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "Tạo tập tin yêu cầu chứng nhận cho khoá này" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "Không thể lưu yêu cầu chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "Lưu yêu cầu chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "Yêu cầu chứng nhận" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "Yêu cầu mã hoá dạng PEM" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "không thể tạo yêu cầu chứng nhận mới" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "Tạo tập tin yêu cầu chứng nhận." + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "Tên (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "Khoá riêng không tên" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "Đổi cụm từ mật khẩu" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "_Xác nhận cụm từ mật khẩu :" - #: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "_Cụm từ mật khẩu mới:" + +#: ../src/seahorse-change-passphrase.xml.h:4 msgid "Confirm new passphrase" msgstr "Xác nhận cụm từ mật khẩu mới" #: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "_Cụm từ mật khẩu mới :" +msgid "Con_firm Passphrase:" +msgstr "_Xác nhận cụm từ mật khẩu:" -#: ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse.desktop.in.in.h:2 msgid "Manage your passwords and encryption keys" msgstr "Quản lý các mật khẩu và khoá mã hoá của bạn" -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:862 -msgid "Passwords and Encryption Keys" -msgstr "Mật khẩu và khoá mã hoá" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "Tiếp tục" #: ../src/seahorse-generate-select.xml.h:1 msgid "_Select the type of item to create:" msgstr "_Chọn kiểu khoá cần tạo :" -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "_Tiếp tục" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "Tạo mục mới..." - -#: ../src/seahorse-key-manager.c:233 ../src/seahorse-keyserver-results.c:108 -#, c-format -#| msgid "Loaded %d key" -#| msgid_plural "Loaded %d keys" -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "%d khoá được chọn" - -#: ../src/seahorse-key-manager.c:410 ../src/seahorse-key-manager.c:470 -#: ../src/seahorse-key-manager.c:533 ../src/seahorse-viewer.c:459 -#| msgid "Couldn't export keys" -msgid "Couldn't import keys" -msgstr "Không thể nhập khoá" - -#: ../src/seahorse-key-manager.c:415 ../src/seahorse-viewer.c:464 -#| msgid "Imported %i key" -#| msgid_plural "Imported %i keys" -msgid "Imported keys" -msgstr "Khoá đã nhậ" - -#: ../src/seahorse-key-manager.c:464 -#| msgid "Importing Keys" -msgid "Importing keys" -msgstr "Nhập khoá" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "Nhập thất bại" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "Nhập" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "Ngày nhập:" -#: ../src/seahorse-key-manager.c:487 ../ssh/seahorse-ssh-operation.c:1017 +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 msgid "Import Key" msgstr "Nhập khoá" -#: ../src/seahorse-key-manager.c:533 -msgid "Unrecognized key type, or invalid data format" -msgstr "Không nhận ra loại khoá, hoặc định dạng ngày không hợp lệ" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "Mọi tập tin khoá" -#: ../src/seahorse-key-manager.c:731 ../src/seahorse-keyserver-results.c:245 -#| msgid "Revoke" -msgid "_Remote" -msgstr "Ở _xa" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "" -#: ../src/seahorse-key-manager.c:733 -#| msgid "About this program" +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "_Mới" + +#: ../src/seahorse-key-manager.c:511 msgid "Close this program" msgstr "Đóng chương trình" -#: ../src/seahorse-key-manager.c:734 +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 msgid "_New..." msgstr "_Mới..." -#: ../src/seahorse-key-manager.c:735 -#| msgid "Generate a new key" +#: ../src/seahorse-key-manager.c:513 msgid "Create a new key or item" msgstr "Tạo mục hoặc khoá mới" -#: ../src/seahorse-key-manager.c:736 -#| msgid "_Import" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "Tạo mục hoặc khoá mới" + +#: ../src/seahorse-key-manager.c:516 msgid "_Import..." msgstr "_Nhập..." -#: ../src/seahorse-key-manager.c:737 -#| msgid "Export to a file" +#: ../src/seahorse-key-manager.c:517 msgid "Import from a file" msgstr "Nhập từ tập tin" -#: ../src/seahorse-key-manager.c:739 -#| msgid "Copy to the clipboard" +#: ../src/seahorse-key-manager.c:519 msgid "Import from the clipboard" msgstr "Nhập từ bảng nháp" -#: ../src/seahorse-key-manager.c:744 ../src/seahorse-keyserver-results.c:255 -#| msgid "Find Remote Keys" -msgid "_Find Remote Keys..." -msgstr "_Tìm khoá từ xa..." +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "Theo _xâu khoá" -#: ../src/seahorse-key-manager.c:745 ../src/seahorse-keyserver-results.c:256 -#| msgid "Searching for keys on: %s" -msgid "Search for keys on a key server" -msgstr "Tìm khoá trên máy phục vụ khoá" +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "Hiện danh mục xâu khoá ở bên" -#: ../src/seahorse-key-manager.c:746 -msgid "_Sync and Publish Keys..." -msgstr "Đồn_g bộ và công bố khoá..." +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "Hiện _cá nhân" -#: ../src/seahorse-key-manager.c:747 -msgid "Publish and/or synchronize your keys with those online." -msgstr "Công bố và/hoặc đồng bộ khoá với trên mạng." +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "" -#: ../src/seahorse-key-manager.c:752 -#| msgid "Type" -msgid "T_ypes" -msgstr "_Kiểu" - -#: ../src/seahorse-key-manager.c:752 -#| msgid "Show type column in key manager" -msgid "Show type column" -msgstr "Hiện cột kiểu" - -#: ../src/seahorse-key-manager.c:754 -#| msgid "Expire" -msgid "_Expiry" -msgstr "_Hết hạn" - -#: ../src/seahorse-key-manager.c:754 -#| msgid "Show expires column in key manager" -msgid "Show expiry column" -msgstr "Hiện cột hết hạn" - -#: ../src/seahorse-key-manager.c:756 -#| msgid "Trust" -msgid "_Trust" -msgstr "_Tin cậy" - -#: ../src/seahorse-key-manager.c:756 -#| msgid "Show trust column in key manager" -msgid "Show owner trust column" -msgstr "Hiện cột tin cậy sở hữu" +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "Hiện _tin cậy" -# Name: don't translate / Tên: đừng dịch -#: ../src/seahorse-key-manager.c:758 -#| msgid "Validity" -msgid "_Validity" -msgstr "_Hợp lệ" - -#: ../src/seahorse-key-manager.c:758 -#| msgid "Show validity column in key manager" -msgid "Show validity column" -msgstr "Hiện cột hợp lệ" - -#: ../src/seahorse-key-manager.c:937 -#| msgid "_File" -msgid "Filter:" -msgstr "Bộ lọc:" +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "Hiện _bất kỳ" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "Bộ lọc" #: ../src/seahorse-key-manager.xml.h:1 msgid "First time options:" @@ -2536,547 +2257,916 @@ msgid "Generate a new key of your own: " msgstr "Tạo ra một khoá mới của mình: " -#: ../src/seahorse-key-manager.xml.h:3 +#: ../src/seahorse-key-manager.xml.h:4 msgid "Import existing keys from a file:" msgstr "Nhập khoá đã có từ tập tin:" -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "Khoá _cá nhân của tôi" - #: ../src/seahorse-key-manager.xml.h:5 -#| msgid "Other _Collected Keys" -msgid "Other _Keys" -msgstr "_Khoá khác" - -#: ../src/seahorse-key-manager.xml.h:6 msgid "To get started with encryption you will need keys." msgstr "Để mã hoá, cần thiết có khoá." -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:523 -msgid "_Import" -msgstr "_Nhập" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "Không thể khoá" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "Không thể mở khoá" + +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "_Khoá" + +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "_Mở khoá" + +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "Th_uộc tính" + +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "Cấu hình khoá cho trình bao bảo mật (_SSH)..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "" +"Gửi khoá SSH công cho máy tính khác, và hiệu lực khả năng đăng nhập bằng " +"khoá đó." + +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "Nhập vào cụm từ mật khẩu SSH:" + +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "Cụm từ mật khẩu khoá cũ" + +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "Gõ cụm từ mật khẩu cũ cho : %s" + +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "Cụm từ mật khẩu khoá mới" -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "_Mật khẩu" +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "Gõ cụm từ mật khẩu mới cho : %s" + +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "Gõ cụm từ mật khẩu mới lần nữa: %s" + +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "Dòng lệnh an ninh" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "Khoá dùng để kết nối an toàn tới máy tính khác" + +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "Bạn có chắc muốn xoá khoá trình bao bảo mật (SSH) « %s » không?" + +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +#| msgid "Are you sure you want to delete %d secure shell keys?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "Bạn có chắc muốn xoá %d khoá trình bao bảo mật (SSH) không?" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "Khoá SSH" + +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "Khoá mật SSH" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "Khoá công SSH" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "Không có khoá công nào sẵn sàng cho khoá này." + +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "Khoá SSH" + +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "Dùng để truy cập máy tính khác (v.d. thông qua thiết bị cuối)" + +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "Không thể tạo ra khoá SSH" + +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "Đang tạo khoá SSH" + +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "Khoá SSH mới" + +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "_Chỉ tạo khoá" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "Tạ_o và Thiết lập" + +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "" + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "" +"Địa chỉ thư điện tử của bạn, hoặc bất cứ lời nhắc nhở nào khác cần thiết " +"để nhớ mục đích của khoá này." + +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"Có một máy tính với đó bạn muốn sử dụng khoá này thì bạn có thể thiết lập " +"máy đó để nhận diện khoá của bạn." + +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "(Khoá SSH không đọc được)" + +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "Khoá SSH cá nhân" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "Khoá SSH" + +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "Không thể thay đổi tên của khoá." + +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "Không thể thay đổi thông tin xác thực cho khoá đó." + +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "Không thể thay đổi cụm từ mật khẩu cho khoá đó." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "Bộ nhận diện:" + +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +#| msgid "Name:" +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "Tên:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "Dùng để kết nối tới máy tính khác." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "Tin cậy" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "Người sở hữu khoá này có _quyền kết nối đến máy tính này" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +#| msgid "This only applies to the '%s' account." +msgid "This only applies to the %s account." +msgstr "Chỉ áp dụng cho tài khoản %s." + +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "Thuật toán:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "Độ mạnh:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "Vị trí:" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "_Xuất toàn bộ khoá" + +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "Lệnh SSH bị chấm dứt bất thường." + +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "Lệnh SSH bị lỗi." + +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "Mật khẩu máy ở xa" + +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "Gõ cụm từ mật khẩu khoá" + +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "Cụm từ mật khẩu cho khoá SSH mới" + +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "Đang nhập khẩu khoá: %s" + +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "Đang nhập khẩu khoá — gõ cụm từ mật khẩu" + +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "Khoá OpenSSH" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH: %s" + +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "Không có tập tin khoá riêng nào sẵn sàng cho khoá này." + +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "Không thể cấu hình khoá SSH trên máy tính từ xa." + +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "Đang cấu hình khoá SSH..." + +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "Thiết lập máy tính để kết nối bằng SSH" + +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "" +"Để sử dụng khoá SSH của bạn với một máy tính khác có chạy SSH, trước tiên " +"bạn cần phải thiết lập một tài khoản đăng nhập trên máy tính đó." + +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "v.d.: máy_phục_vụ_tập_tin.thí_dụ.com:cổng" + +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "Tên _máy tính:" + +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "Tê_n đăng nhập:" + +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "Thiết _lập" + +#~| msgid "Deleting keyring..." +#~ msgid "Login keyring" +#~ msgstr "Xâu khoá đăng nhập" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "Truy cập xâu khoá bị từ chối" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "Trình nền xâu khoá gnome-keyring hiện thời không chạy" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "xâu khoá đã được mở" + +#~ msgid "No such key ring exists" +#~ msgstr "Không có xâu khoá như vậy" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "Không thể liên lạc với trình nền xâu khoá" + +#~ msgid "The item already exists" +#~ msgstr "Mục đã có" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "Gặp lỗi nội bộ khi truy cập gnome-keyring" + +#~ msgid "Algorithms here" +#~ msgstr "Thuật toán ở đây" + +#~ msgid "Do not run seahorse-daemon as a daemon" +#~ msgstr "Đừng chạy seahorse-daemon ở chế độ nền" + +#~ msgid "couldn't fork process" +#~ msgstr "không thể tạo tiến trình con" + +#~ msgid "Encryption Daemon (Seahorse)" +#~ msgstr "Trình nền mã hoá (Seahorse)" + +#~ msgid "Invalid or unrecognized key type: %s" +#~ msgstr "Kiểu khoá không hợp lệ hay không được nhận ra: %s" + +#~| msgid "This key expired on: %s" +#~ msgid "This keytype is not supported: %s" +#~ msgstr "Kiểu khoá này không được hỗ trợ: %s" + +#~ msgid "Support for this feature was not enabled at build time" +#~ msgstr "Tính năng này không được chọn hỗ trợ lúc biên dịch" + +#~ msgid "Invalid or unrecognized key: %s" +#~ msgstr "Khoá không hợp lệ hay không được nhận ra: %s" + +#~ msgid "Signed by expired on %s." +#~ msgstr "Ký bởi hết hạn vào %s." + +#~ msgid "Invalid Signature" +#~ msgstr "Chữ ký không hợp lệ" + +#~ msgid "Signed by on %s Expired." +#~ msgstr "Ký bởi vào %s đã hết hạn." + +#~ msgid "Expired Signature" +#~ msgstr "Chữ ký đã hết hạn" + +#~ msgid "Signed by Revoked on %s." +#~ msgstr "Ký bởi đã hủy bỏ vào %s." + +#~ msgid "Revoked Signature" +#~ msgstr "Chữ ký bị hủy bỏ" + +#~ msgid "Signed by on %s." +#~ msgstr "Ký bởi vào %s." + +#~ msgid "Good Signature" +#~ msgstr "Chữ ký tốt" + +#~ msgid "Signing key not in keyring." +#~ msgstr "Khóa ký không nằm trong xâu khoá." + +#~ msgid "Unknown Signature" +#~ msgstr "Chữ ký lạ" + +#~ msgid "Bad or forged signature. The signed data was modified." +#~ msgstr "Chữ ký sai hay giả. Dữ liệu được ký bị sửa đổi." + +#~ msgid "Bad Signature" +#~ msgstr "Chữ ký sai" + +#~ msgid "Invalid or unrecognized signer: %s" +#~ msgstr "Người ký không hợp lệ hay không được nhận ra: %s" + +#~ msgid "Key is not valid for signing: %s" +#~ msgstr "Khoá không hợp lệ để ký: %s" + +#~ msgid "Invalid or unrecognized recipient: %s" +#~ msgstr "Người nhận không hợp lệ hay không được nhận ra: %s" + +#~ msgid "Key is not a valid recipient for encryption: %s" +#~ msgstr "Khoá không phải là người nhận hợp lệ để mã hoá: %s" + +#~ msgid "No recipients specified" +#~ msgstr "Chưa ghi rõ người nhận nào" + +#~ msgid "Invalid key type for decryption: %s" +#~ msgstr "Kiểu khoá không hợp lệ để giải mã: %s" + +#~ msgid "Please set clearuri" +#~ msgstr "Vui lòng đặt clearuri" + +#~ msgid "Please set crypturi" +#~ msgstr "Vui lòng đặt crypturi" + +#~ msgid "Error opening clearuri" +#~ msgstr "Lỗi mở clearuri" + +#~ msgid "No signer specified" +#~ msgstr "Chưa ghi rõ người ký nào" + +#~ msgid "Invalid key type for verifying: %s" +#~ msgstr "Kiểu khoá không hợp lệ để thẩm tra: %s" + +#~ msgid "Invalid key id: %s" +#~ msgstr "Mã nhận diện khoá không hợp lệ: %s" + +#~ msgid "" +#~ "A list of key server URIs to search for remote PGP keys. In later " +#~ "versions a display name can be included, by appending a space and then " +#~ "the name." +#~ msgstr "" +#~ "Danh sách các địa chỉ Mạng của máy phục vụ khoá nơi cần tìm kiếm khoá PGP " +#~ "từ xa. Trong phiên bản mới hơn, cũng có thể gồm tên hiển thị, bằng cách " +#~ "phụ thêm một dấu cách, rồi tên đó." + +#~ msgid "Auto Retrieve Keys" +#~ msgstr "Tự động lấy các khoá" + +#~ msgid "Auto Sync Keys" +#~ msgstr "Tự động đồng bộ hóa khoá" + +#~ msgid "Controls the visibility of the expires column for the key manager." +#~ msgstr "Hiện/ẩn cột « hết hạn » cho bộ quản lý khoá." + +#~ msgid "Controls the visibility of the trust column for the key manager." +#~ msgstr "Hiện/ẩn cột tin cậy cho bộ quản lý khoá." + +#~ msgid "Controls the visibility of the type column for the key manager." +#~ msgstr "Hiện/ẩn cột « kiểu » cho bộ quản lý khoá." + +#~ msgid "Controls the visibility of the validity column for the key manager." +#~ msgstr "Hiện/ẩn cột « độ hợp lệ » cho bộ quản lý khoá." + +#~ msgid "Enable DNS-SD sharing" +#~ msgstr "Bật chia sẻ DNS-SD" + +#~ msgid "" +#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +#~ "running and must be built with HKP and DNS-SD support." +#~ msgstr "" +#~ "Hiệu lực cách chia sẻ khoá kiểu DNS-SD (Apple Bonjour). Trình nền " +#~ "seahorse-daemon phải đang chạy và cũng phải được xây dựng với khả năng hỗ " +#~ "trợ HKP và DNS-SD." + +#~ msgid "ID of the default key" +#~ msgstr "ID của khoá mặc định" + +#~ msgid "" +#~ "If set to true, then files encrypted with seahorse will be ASCII armor " +#~ "encoded." +#~ msgstr "" +#~ "Đặt là true (đúng) thì các tập tin được mã hoá bằng Seahorse sẽ được mã " +#~ "hoá bọc sắt ASCII." + +#~ msgid "" +#~ "If set to true, then the default key will always be added to an " +#~ "encryption recipients list." +#~ msgstr "" +#~ "Nếu đặt là « true » (đúng) thì khoá mặc định luôn luôn sẽ được thêm vào " +#~ "danh sách người nhận mã hoá." + +#~ msgid "Last key server search pattern" +#~ msgstr "Mẫu tìm kiếm máy chủ khoá cuối cùng" + +#~ msgid "Last key servers used" +#~ msgstr "Máy phục vụ khoá dùng cuối cùng" + +#~ msgid "Last key used to sign a message." +#~ msgstr "Khoá được dùng cuối cùng để ký thư." + +#~ msgid "PGP Key servers" +#~ msgstr "Máy phục vụ khoá PGP" + +#~ msgid "Publish keys to this key server." +#~ msgstr "Xuất khoá tới máy phục vụ khoá này." + +#~ msgid "Show expires column in key manager" +#~ msgstr "Hiện cột « hết hạn » trong bộ quản lý khoá" + +#~ msgid "Show trust column in key manager" +#~ msgstr "Hiện cột « tin cậy » trong bộ quản lý khoá" + +#~ msgid "Show type column in key manager" +#~ msgstr "Hiện cột « kiểu » trong bộ quản lý khoá" + +#~ msgid "Show validity column in key manager" +#~ msgstr "Hiện cột « độ hợp lệ » trong bộ quản lý khoá" + +#~ msgid "" +#~ "Specify the column to sort the recipients window by. Columns are: 'name' " +#~ "and 'id'. Put a '-' in front of the column name to sort in descending " +#~ "order." +#~ msgstr "" +#~ "Ghi rõ cột theo đó cần sắp xếp cửa sổ người nhận. Các cột là 'name' (tên) " +#~ "và 'id' (mã nhận diện). Để dấu trừ '-' nằm trước tên cột để sắp xếp theo " +#~ "thứ tự giảm dần." + +#~ msgid "" +#~ "Specify the column to sort the seahorse key manager main window by. " +#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " +#~ "Put a '-' in front of the column name to sort in descending order." +#~ msgstr "" +#~ "Ghi rõ cột theo đó cần sắp xếp cửa sổ chính của bộ quản lý khoá Seahorse. " +#~ "Cột là : 'name' (tên), 'id', 'validity' (hợp lệ), 'expires' (hết hạn), " +#~ "'trust' (tin cậy) và 'type' (kiểu). Có thể sắp xếp giảm dần nếu bạn chèn " +#~ "một dấu gạch nối trước tên cột đó." + +#~ msgid "The ID of the last secret key used to sign a message." +#~ msgstr "Mã nhận diện (ID) của khoá bí mật cuối cùng được dùng để ký thư." + +#~ msgid "The column to sort the recipients by" +#~ msgstr "Cột theo nó cần sắp xếp các người nhận" + +#~ msgid "The column to sort the seahorse keys by" +#~ msgstr "Cột theo nó cần sắp xếp các khoá Seahorse" + +#~ msgid "" +#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " +#~ "PGP keys." +#~ msgstr "" +#~ "Máy phục vụ khoá nơi cần xuất khoá PGP. Để rỗng để ngăn xuất khoá PGP." + +#~ msgid "" +#~ "The last key server a search was performed against or empty for all key " +#~ "servers." +#~ msgstr "" +#~ "Máy phục vụ khoá cuối cùng được tìm kiếm, hoặc rỗng để đại diện mọi máy " +#~ "phục vụ khoá" -#: ../src/seahorse-key-manager-store.c:685 ../src/seahorse-viewer.c:257 -msgid "Couldn't export keys" -msgstr "Không thể xuất khoá" +#~ msgid "The last search pattern searched for against a key server." +#~ msgstr "" +#~ "Mẫu tìm kiếm cuối cùng được dùng để tìm kiếm trên một máy phục vụ khoá." -# Name: don't translate / Tên: đừng dịch -#: ../src/seahorse-key-manager-store.c:883 -msgid "Validity" -msgstr "Hợp lệ" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:902 -msgid "Expiration Date" -msgstr "Ngày hết hạn" +#~ msgid "" +#~ "This specifies the default key to use for certain operations, mainly " +#~ "signing." +#~ msgstr "" +#~ "Đây xác định khoá mặc định cần dùng trong một số thao tác riêng, phần lớn " +#~ "là việc ký tên." -#: ../src/seahorse-keyserver-results.c:247 -msgid "Close this window" -msgstr "Đóng cửa sổ" +#~ msgid "" +#~ "Whether or not keys should be automatically retrieved from key servers." +#~ msgstr "Có nên tự động lấy các khoá từ các máy phục vụ khoá hay không." -#: ../src/seahorse-keyserver-results.c:248 -msgid "_Expand All" -msgstr "_Bung hết" - -#: ../src/seahorse-keyserver-results.c:249 -msgid "Expand all listings" -msgstr "Bung mọi danh mục" - -#: ../src/seahorse-keyserver-results.c:250 -msgid "_Collapse All" -msgstr "_Co hết" - -#: ../src/seahorse-keyserver-results.c:251 -msgid "Collapse all listings" -msgstr "Co mọi danh mục" +#~ msgid "" +#~ "Whether or not modified keys should be automatically synced with the " +#~ "default key server." +#~ msgstr "" +#~ "Có nên tự động đồng bộ hoá các khoá đã sửa đổi với máy phục vụ khoá mặc " +#~ "định hay không." -#: ../src/seahorse-keyserver-results.c:322 -#| msgid "Find Remote Keys" -msgid "Remote Keys" -msgstr "Khoá ở xa" +#~ msgid "Whether to always encrypt to default key" +#~ msgstr "Có nên luôn luôn mã hoá bằng khoá mặc định hay không" -#: ../src/seahorse-keyserver-results.c:324 -#, c-format -#| msgid "Searching for keys containing '%s'..." -msgid "Remote Keys Containing '%s'" -msgstr "Khoá ở xa chứa '%s'" +#~ msgid "Whether to use ASCII Armor" +#~ msgstr "Có nên dùng bọc kim ASCII hay không" -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "Máy phục vụ khoá:" +#~ msgid "Web Password" +#~ msgstr "Mật khẩu Web" -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "Khoá dùng chung gần tôi:" +#~ msgid "Couldn't set application access." +#~ msgstr "Không thể đặt cách truy cập đến ứng dụng." -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "Tìm khoá từ xa" +#~ msgid "Path:" +#~ msgstr "Đường dẫn:" -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"Việc này sẽ tìm khoá của người khác trên Mạng. Tìm được thì có thể nhập khoá " -"vào xâu khoá của bạn." +#~ msgid "Permissions:" +#~ msgstr "Quyền hạn:" -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "Nơi cần tìm:" +#~ msgid "Applications" +#~ msgstr "Ứng dụng" -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "_Tìm" +#~ msgid "_Read" +#~ msgstr "Đọ_c" -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "_Tìm khoá chứa: " +#~ msgid "_Write" +#~ msgstr "_Ghi" -#: ../src/seahorse-keyserver-sync.c:45 -msgid "Couldn't publish keys to server" -msgstr "Không thể xuất khoá tới máy phục vụ" +#~| msgid "Password:" +#~ msgid "Passwords: %s" +#~ msgstr "Mật khẩu: %s" -#: ../src/seahorse-keyserver-sync.c:61 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "Không thể lấy khoá từ máy phục vụ : %s" +#~| msgid "Password:" +#~ msgid "Passwords: %s" +#~ msgstr "Mật khẩu: %s" -#: ../src/seahorse-keyserver-sync.c:155 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "%d khoá được chọn để đồng bộ hoá" +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "" +#~ "Khoá xâu khoá lưu trữ mật khẩu để yêu cầu một mật khẩu chủ để mở khoá nó." -#: ../src/seahorse-keyserver-sync.c:216 -msgid "Synchronizing keys" -msgstr "Đang đồng bộ hoá khoá" +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "" +#~ "Mở khoá xâu khoá lưu trữ mật khẩu dùng một mật khẩu chủ để nó sẵn sàng sử " +#~ "dụng." -#. Show the progress window if necessary -#: ../src/seahorse-keyserver-sync.c:248 -msgid "Synchronizing keys..." -msgstr "Đang đồng bộ hoá khoá..." +#~ msgid "Saving item..." +#~ msgstr "Đang lưu mục..." -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "Đồng bộ hóa khoá" +#~ msgid "Deleting item..." +#~ msgstr "Đang xoá mục..." -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"Việc này sẽ xuất các khoá trong xâu khoá của bạn, để người khác sử dụng. " -"Bạn sẽ cũng nhận thay đổi nào của người khác kể từ lần bạn nhận khoá họ cuối " -"cùng." +#~ msgid "Listing password keyrings" +#~ msgstr "Đang liệt kê các xâu khoá mật khẩu" -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"Việc này sẽ lấy thay đổi nào của người khác kể từ lần bạn nhận khoá họ cuối " -"cùng. Chưa chọn máy phục vụ khoá nơi cần xuất nên người khác sẽ không thể sử " -"dụng khoá của bạn." +#~ msgid "" +#~ "No encryption keys were found with which to perform the operation you " +#~ "requested. The program Passwords and Encryption Keys will now be " +#~ "started so that you may either create a key or import one." +#~ msgstr "" +#~ "Không tìm thấy khoá mật mã cần dùng để thực hiện thao tác yêu cầu. Chương " +#~ "trình Mật khẩu và Khoá Mật mã sắp được khởi chạy để cho phép bạn " +#~ "hoặc tạo một khoá mới hoặc nhập một khoá đã có." -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "Máy phục vụ _khoá" +#~ msgid "All Keys" +#~ msgstr "Mọi khoá" -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "Đồng _bộ" +#~ msgid "Selected Recipients" +#~ msgstr "Người nhận đã chọn" -#: ../src/seahorse-main.c:62 -msgid "Version of this application" -msgstr "Phiên bản của ứng dụng này" +#~ msgid "Search Results" +#~ msgstr "Kết quả tìm" -#: ../src/seahorse-main.c:78 ../src/seahorse-viewer.c:144 -msgid "Encryption Key Manager" -msgstr "Bộ quản lý khoá mã hoá" +#~ msgid "Search _for:" +#~ msgstr "Tì_m:" -#: ../src/seahorse-viewer.c:120 -msgid "Contributions:" -msgstr "Đóng góp:" +#~ msgid "None (Don't Sign)" +#~ msgstr "Không (đừng ký)" -#: ../src/seahorse-viewer.c:146 -msgid "translator-credits" -msgstr "Nhóm Việt hóa Gnome " +#~ msgid "Sign this message as %s" +#~ msgstr "Ký thư này dưới %s" -#: ../src/seahorse-viewer.c:149 -msgid "Seahorse Project Homepage" -msgstr "Trang chủ Dự án Seahorse" +#~ msgid "_Sign message as:" +#~ msgstr "_Ký thư với tên:" -#. Top menu items -#: ../src/seahorse-viewer.c:169 -msgid "_File" -msgstr "_Tập tin" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Tập tin không phải là một tập tin .desktop hợp lệ" -#: ../src/seahorse-viewer.c:170 -msgid "_Edit" -msgstr "_Sửa" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Không nhận ra tập tin desktop Phiên bản « %s »" -#: ../src/seahorse-viewer.c:171 -msgid "_View" -msgstr "_Xem" +#~ msgid "Starting %s" +#~ msgstr "Đang khởi chạy %s" -#: ../src/seahorse-viewer.c:172 -msgid "_Help" -msgstr "Trợ g_iúp" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Ứng dụng không chấp nhận tài liệu trên dòng lệnh" -#: ../src/seahorse-viewer.c:174 -msgid "Prefere_nces" -msgstr "Tù_y thích" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Không nhận ra tuỳ chọn khởi chạy: %d" -#: ../src/seahorse-viewer.c:175 -msgid "Change preferences for this program" -msgstr "Thay đổi tùy thích cho chương trình này" +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Không thể gửi địa chỉ URI của tài liệu cho một mục nhập môi trường « " +#~ "Type=Link » (Kiểu=Liên kết)" -#: ../src/seahorse-viewer.c:178 -msgid "About this program" -msgstr "Giới thiệu về chương trình này" +#~ msgid "Not a launchable item" +#~ msgstr "Không phải một mục có thể khởi chạy được" -#: ../src/seahorse-viewer.c:179 -msgid "_Contents" -msgstr "Mục lụ_c" +#~ msgid "Disable connection to session manager" +#~ msgstr "Tắt kết nối đến trình quản lý buổi hợp" -#: ../src/seahorse-viewer.c:180 -msgid "Show Seahorse help" -msgstr "Hiện trợ giúp Seahorse" +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Xác định tập tin chứa cấu hình đã lưu" -#: ../src/seahorse-viewer.c:277 -msgid "Export public key" -msgstr "Xuất khẩu khoá công" - -#: ../src/seahorse-viewer.c:297 -msgid "Exporting keys" -msgstr "Đang xuất khẩu khoá" - -#: ../src/seahorse-viewer.c:322 -msgid "Couldn't retrieve data from key server" -msgstr "Không thể lấy dữ liệu từ máy phục vụ khoá" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:341 -msgid "Copied keys" -msgstr "Khoá đã sao chép" - -#: ../src/seahorse-viewer.c:361 -msgid "Retrieving keys" -msgstr "Đang lấy các khoá" - -#: ../src/seahorse-viewer.c:376 -msgid "Couldn't delete." -msgstr "Không thể xoá." - -#: ../src/seahorse-viewer.c:410 -msgid "Deleting..." -msgstr "Đang xoá..." +#~ msgid "FILE" +#~ msgstr "TẬP TIN" -#: ../src/seahorse-viewer.c:436 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s là một khoá riêng. Bạn có chắc muốn tiếp tục không?" +#~ msgid "Specify session management ID" +#~ msgstr "Xác định mã số quản lý buổi hợp" -#: ../src/seahorse-viewer.c:484 -#| msgid "Sending keys to key server..." -msgid "Importing keys from key servers" -msgstr "Nhập khoá cho máy phục vụ khoá" +#~ msgid "Session management options:" +#~ msgstr "Các tuỳ chọn quản lý buổi hợp:" -#: ../src/seahorse-viewer.c:510 -msgid "Show properties" -msgstr "Hiện thuộc tính" - -#: ../src/seahorse-viewer.c:511 -#| msgid "_Delete" -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "_Xoá" +#~ msgid "Show session management options" +#~ msgstr "Hiển thị các tuỳ chọn quản lý buổi hợp" -#: ../src/seahorse-viewer.c:512 -msgid "Delete selected items" -msgstr "Xoá các mục đã chọn" +#~ msgid "Key Imported" +#~ msgid_plural "Keys Imported" +#~ msgstr[0] "Khoá đã nhập" -#: ../src/seahorse-viewer.c:516 -msgid "E_xport..." -msgstr "_Xuất..." +#~ msgid "Imported %i key" +#~ msgid_plural "Imported %i keys" +#~ msgstr[0] "Đã nhập %i khoá" -#: ../src/seahorse-viewer.c:517 -msgid "Export to a file" -msgstr "Xuất vào tập tin" +#~ msgid "Imported a key for" +#~ msgid_plural "Imported keys for" +#~ msgstr[0] "Khoá đã được nhập cho" -#: ../src/seahorse-viewer.c:519 -msgid "Copy to the clipboard" -msgstr "Chép sang bảng nháp" +#~ msgid "Notification Messages" +#~ msgstr "Thông điệp thông báo" -#: ../src/seahorse-viewer.c:524 -msgid "Import selected keys to local key ring" -msgstr "Nhập khoá được chọn vào xâu khoá cục bộ" +#~ msgid "Symmetric Key" +#~ msgstr "Khoá đối sứng" -#: ../ssh/seahorse-ssh-askpass.c:99 -msgid "Enter your Secure Shell passphrase:" -msgstr "Nhập vào cụm từ mật khẩu SSH:" +#~ msgid "Credentials" +#~ msgstr "Thông tin xác thực" -#: ../ssh/seahorse-ssh-commands.c:85 -msgid "Configure Key for _Secure Shell..." -msgstr "Cấu hình khoá cho trình bao bảo mật (_SSH)..." +#~ msgid "Identity" +#~ msgstr "Cá tính" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "" -"Gửi khoá SSH công cho máy tính khác, và hiệu lực khả năng đăng nhập bằng " -"khoá đó." +#~ msgid "Progress Title" +#~ msgstr "Tựa tiến hành" -#: ../ssh/seahorse-ssh-commands.c:115 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "Bạn có chắc muốn xoá khoá trình bao bảo mật (SSH) « %s » không?" +#~ msgid "Couldn't run file-roller" +#~ msgstr "Không thể chạy chương trình file-roller" -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "Bạn có chắc muốn xoá %d khoá trình bao bảo mật (SSH) không?" +#~ msgid "Couldn't package files" +#~ msgstr "Không thể đóng gói các tập tin" -#: ../ssh/seahorse-ssh-generate.c:59 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "Khoá SSH" +#~ msgid "The file-roller process did not complete successfully" +#~ msgstr "Tiến trình file-roller đã không chạy xong thành công" -#: ../ssh/seahorse-ssh-generate.c:60 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "Dùng để truy cập máy tính khác (v.d. thông qua thiết bị cuối)" +#~ msgid "Archive files" +#~ msgstr "Tập tin kho lưu" -#: ../ssh/seahorse-ssh-generate.c:90 -msgid "Couldn't generate Secure Shell key" -msgstr "Không thể tạo ra khoá SSH" +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "Tập tin tên đó đã có.\n" +#~ "\n" +#~ "Bạn có muốn thay thế nó bằng một tập tin mới không?" -#: ../ssh/seahorse-ssh-generate.c:213 -msgid "Creating Secure Shell Key" -msgstr "Đang tạo khoá SSH" +#~ msgid "_Replace" +#~ msgstr "Tha_y thế" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"Sử dụng địa chỉ thư điện tử của bạn, và bất cứ lời nhắc nhở nào khác cần " -"thiết để nhớ mục đích của khoá này." +#~ msgid "Loading Keys..." +#~ msgstr "Đang nạp các khoá..." -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"Một khoá Trình bao Bảo mật (SSH) thì cho phép bạn kết nối an toàn bằng SSH " -"tới máy tính đáng tin, mà không cần nhập một mật khẩu riêng cho mỗi máy." +#~ msgid "Uploading keys..." +#~ msgstr "Đang tải lên khoá ..." -#: ../ssh/seahorse-ssh-generate.xml.h:4 -msgid "DSA" -msgstr "DSA" +#~ msgid "Retrieving keys..." +#~ msgstr "Đang lấy khoá..." -#: ../ssh/seahorse-ssh-generate.xml.h:6 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"Có một máy tính với đó bạn muốn sử dụng khoá này thì bạn có thể thiết lập " -"máy đó để nhận diện khoá của bạn ngay bây giờ." +#~ msgid "Searching for keys on: %s" +#~ msgstr "Đang tìm kiếm khoá trên: %s" -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "New Secure Shell Key" -msgstr "Khoá SSH mới" +#~ msgid "Searching for keys containing '%s'..." +#~ msgstr "Đang tìm kiếm khoá chứa « %s »..." -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Create and Set Up" -msgstr "Tạ_o và Thiết lập" +#~ msgid "Searching for key id '%s'..." +#~ msgstr "Đang tìm kiếm ID khoá « %s »..." -#: ../ssh/seahorse-ssh-generate.xml.h:11 -msgid "_Just Create Key" -msgstr "_Chỉ tạo khoá" +#~ msgid "Retrieving remote keys..." +#~ msgstr "Đang lấy khoá từ xa..." -#: ../ssh/seahorse-ssh-generate.xml.h:12 -msgid "_Key Description:" -msgstr "_Mô tả khoá:" +#~ msgid "Sending keys to key server..." +#~ msgstr "Đang gửi khoá cho máy phục..." -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "(Khoá SSH không đọc được)" +#~ msgid "_Sign Key..." +#~ msgstr "_Ký khoá..." -#: ../ssh/seahorse-ssh-key.c:105 -msgid "Invalid" -msgstr "Không hợp lệ" - -#: ../ssh/seahorse-ssh-key.c:116 -msgid "Private Secure Shell Key" -msgstr "Khoá SSH riêng" - -#: ../ssh/seahorse-ssh-key.c:119 -msgid "Public Secure Shell Key" -msgstr "Khoá SSH công" +#~ msgid "Sign public key" +#~ msgstr "Ký khoá công" -#: ../ssh/seahorse-ssh-key-properties.c:71 -msgid "Couldn't rename key." -msgstr "Không thể thay đổi tên của khoá." +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "Bạn có chắc muốn xoá hẳn %d khoá và cá tính không?" -#: ../ssh/seahorse-ssh-key-properties.c:112 -msgid "Couldn't change authorization for key." -msgstr "Không thể thay đổi thông tin xác thực cho khoá đó." +#~ msgid "New PGP Key" +#~ msgstr "Khoá PGP mới" -#: ../ssh/seahorse-ssh-key-properties.c:127 -msgid "Couldn't change passphrase for key." -msgstr "Không thể thay đổi cụm từ mật khẩu cho khoá đó." +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "Không thể xuất khẩu khoá tới « %s »" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "Thuật toán:" +#~ msgid "Export Complete Key" +#~ msgstr "Xuất toàn bộ khoá" -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "Bộ nhận diện:" +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "Bạn có chắc muốn xoá chứng nhận « %s » không?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "Vị trí:" +#~| msgid "Are you sure you want to delete %d certificates?" +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "Bạn có chắc muốn xoá %d chứng nhận không?" -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "Tên:" +#~ msgid "Create New ..." +#~ msgstr "Tạo mục mới..." -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "Độ mạnh:" +#~| msgid "Loaded %d key" +#~| msgid_plural "Loaded %d keys" +#~ msgid "Selected %d key" +#~ msgid_plural "Selected %d keys" +#~ msgstr[0] "%d khoá được chọn" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "Tin cậy" +#~| msgid "Importing Keys" +#~ msgid "Importing keys" +#~ msgstr "Nhập khoá" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "Chỉ áp dụng cho tài khoản « %s »." +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "Không nhận ra loại khoá, hoặc định dạng ngày không hợp lệ" -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "_Xuất toàn bộ khoá" +#~| msgid "Type" +#~ msgid "T_ypes" +#~ msgstr "_Kiểu" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "Người sở hữu khoá này có _quyền kết nối đến máy tính này" +#~| msgid "Show type column in key manager" +#~ msgid "Show type column" +#~ msgstr "Hiện cột kiểu" -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "Dùng để kết nối tới máy tính khác." +#~| msgid "Expire" +#~ msgid "_Expiry" +#~ msgstr "_Hết hạn" -#: ../ssh/seahorse-ssh-operation.c:143 ../ssh/seahorse-ssh-operation.c:732 -#, c-format -msgid "The SSH command was terminated unexpectedly." -msgstr "Lệnh SSH bị chấm dứt bất thường." +#~| msgid "Show expires column in key manager" +#~ msgid "Show expiry column" +#~ msgstr "Hiện cột hết hạn" -#: ../ssh/seahorse-ssh-operation.c:151 ../ssh/seahorse-ssh-operation.c:739 -msgid "The SSH command failed." -msgstr "Lệnh SSH bị lỗi." +#~| msgid "Trust" +#~ msgid "_Trust" +#~ msgstr "_Tin cậy" -#: ../ssh/seahorse-ssh-operation.c:445 ../ssh/seahorse-ssh-operation.c:477 -msgid "Secure Shell key" -msgstr "Khoá SSH" +#~| msgid "Show trust column in key manager" +#~ msgid "Show owner trust column" +#~ msgstr "Hiện cột tin cậy sở hữu" -#: ../ssh/seahorse-ssh-operation.c:448 -msgid "Passphrase:" -msgstr "Cụm từ mật khẩu:" +# Name: don't translate / Tên: đừng dịch +#~| msgid "Validity" +#~ msgid "_Validity" +#~ msgstr "_Hợp lệ" + +#~| msgid "Show validity column in key manager" +#~ msgid "Show validity column" +#~ msgstr "Hiện cột hợp lệ" + +#~| msgid "Other _Collected Keys" +#~ msgid "Other _Keys" +#~ msgstr "_Khoá khác" -#. Just prompt over and over again -#: ../ssh/seahorse-ssh-operation.c:762 -msgid "Remote Host Password" -msgstr "Mật khẩu máy ở xa" +# Name: don't translate / Tên: đừng dịch +#~ msgid "Validity" +#~ msgstr "Hợp lệ" -#: ../ssh/seahorse-ssh-operation.c:850 -msgid "Old Key Passphrase" -msgstr "Cụm từ mật khẩu khoá cũ" +#~ msgid "Expiration Date" +#~ msgstr "Ngày hết hạn" -#: ../ssh/seahorse-ssh-operation.c:851 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "Gõ cụm từ mật khẩu cũ cho : %s" +#~ msgid "_Expand All" +#~ msgstr "_Bung hết" -#: ../ssh/seahorse-ssh-operation.c:855 -msgid "New Key Passphrase" -msgstr "Cụm từ mật khẩu khoá mới" +#~ msgid "Expand all listings" +#~ msgstr "Bung mọi danh mục" -#: ../ssh/seahorse-ssh-operation.c:856 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "Gõ cụm từ mật khẩu mới cho : %s" +#~ msgid "_Collapse All" +#~ msgstr "_Co hết" -#: ../ssh/seahorse-ssh-operation.c:864 -msgid "Enter Key Passphrase" -msgstr "Gõ cụm từ mật khẩu khoá" +#~ msgid "Collapse all listings" +#~ msgstr "Co mọi danh mục" -#: ../ssh/seahorse-ssh-operation.c:931 -msgid "Passphrase for New Secure Shell Key" -msgstr "Cụm từ mật khẩu cho khoá SSH mới" +#~ msgid "Synchronizing keys" +#~ msgstr "Đang đồng bộ hoá khoá" -#: ../ssh/seahorse-ssh-operation.c:932 -msgid "Enter a passphrase for your new Secure Shell key." -msgstr "Gõ cụm từ mật khẩu cho khoá SSH mới của bạn." +#~ msgid "Export public key" +#~ msgstr "Xuất khẩu khoá công" -#: ../ssh/seahorse-ssh-operation.c:1013 -#, c-format -msgid "Importing key: %s" -msgstr "Đang nhập khẩu khoá: %s" +#~ msgid "Exporting keys" +#~ msgstr "Đang xuất khẩu khoá" -#: ../ssh/seahorse-ssh-operation.c:1015 -msgid "Importing key. Enter passphrase" -msgstr "Đang nhập khẩu khoá — gõ cụm từ mật khẩu" +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "Không thể lấy dữ liệu từ máy phục vụ khoá" -#: ../ssh/seahorse-ssh-source.c:825 -msgid "No private key file is available for this key." -msgstr "Không có tập tin khoá riêng nào sẵn sàng cho khoá này." +#~ msgid "Deleting..." +#~ msgstr "Đang xoá..." -#: ../ssh/seahorse-ssh-upload.c:45 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "Không thể cấu hình khoá SSH trên máy tính từ xa." +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s là một khoá riêng. Bạn có chắc muốn tiếp tục không?" -#. Show the progress window if necessary -#: ../ssh/seahorse-ssh-upload.c:181 -msgid "Configuring Secure Shell Keys..." -msgstr "Đang cấu hình khoá SSH..." +#~| msgid "_Delete" +#~ msgctxt "" +#~ "This text refers to deleting an item from its type's backing store." +#~ msgid "_Delete" +#~ msgstr "_Xoá" -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "v.d.: máy_phục_vụ_tập_tin.thí_dụ.com:cổng" +#~ msgid "_Key Description:" +#~ msgstr "_Mô tả khoá:" -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "Thiết lập máy tính để kết nối bằng SSH" +#~ msgid "Invalid" +#~ msgstr "Không hợp lệ" -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "" -"Để sử dụng khoá SSH của bạn với một máy tính khác có chạy SSH, trước tiên " -"bạn cần phải thiết lập một tài khoản đăng nhập trên máy tính đó." +#~ msgid "Private Secure Shell Key" +#~ msgstr "Khoá SSH riêng" -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "Tên _máy tính:" +#~ msgid "Public Secure Shell Key" +#~ msgstr "Khoá SSH công" -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "Tê_n đăng nhập:" +#~ msgid "Passphrase:" +#~ msgstr "Cụm từ mật khẩu:" -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "Thiết _lập" +#~ msgid "Enter a passphrase for your new Secure Shell key." +#~ msgstr "Gõ cụm từ mật khẩu cho khoá SSH mới của bạn." #~| msgid "seahorse" #~ msgid "Seahorse Daemon" @@ -3156,9 +3246,6 @@ #~ "Một hay nhiều khoá bị xoá cũng là khoá riêng. Bạn có chắc muốn tiếp tục " #~ "không?" -#~ msgid "P_roperties" -#~ msgstr "Th_uộc tính" - #~| msgid "_Copy Key" #~ msgid "_Copy" #~ msgstr "_Chép" diff -Nru seahorse-3.2.2/po/zh_CN.po seahorse-3.6.3/po/zh_CN.po --- seahorse-3.2.2/po/zh_CN.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/zh_CN.po 2012-09-25 14:50:51.000000000 +0200 @@ -6,329 +6,322 @@ # Deng Xiyue 2007, 2008, 2009. # Aron Xu , 2009, 2010, 2011. # Yinghua Wang , 2010, 2011. +# YunQiang Su , 2012. # msgid "" msgstr "" "Project-Id-Version: seahorse master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-16 12:44+0000\n" -"PO-Revision-Date: 2011-09-16 21:00+0800\n" -"Last-Translator: Wylmer Wang \n" +"POT-Creation-Date: 2012-08-17 10:17+0000\n" +"PO-Revision-Date: 2012-09-23 03:00+0800\n" +"Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Launchpad-Export-Date: 2010-10-03 18:56+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Generator: Gtranslator 2.91.5\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "添加密码密钥环" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "新密钥环名称：" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "请为新密钥环选择名称。您将会被提示输入解锁密码。" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "新密钥环名称：" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "服务器的主机名称或地址" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "无法添加密钥环" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "新建密码密钥环" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "用来保存应用程序和网络密码" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "新密码..." + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "安全地储存密码或密语。" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "密码密钥环" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "已储存的密码" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "无法设置默认密钥环" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "无法修改密钥环密码" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "设为默认(_S)" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "应用程序通常将新密码存储在默认密钥环中。" + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "更改密码(_P)" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "修改密码存储密钥环的解锁密码" + +#: ../gkr/seahorse-gkr-add-item.c:58 +#| msgid "Couldn't delete item" +msgid "Couldn't add item" +msgstr "无法添加项目" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "添加密码" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "描述(_D)：" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "密钥环(_K)：" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "密码(_P)：" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "显示密码(_S)" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "无法删除项目" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "密钥环(_K)：" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "无法添加密钥环" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "密码" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "存储个人密码、证书和私钥" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "即时通信帐号密码" + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "密码或私钥" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "网络密码" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "已存储的便笺" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "密钥环密码" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "加密密钥口令" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "密钥存储口令" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome 密码" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "GNOME 在线帐户密码" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy 密码" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "即时通讯密码" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "网络管理器私钥" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "确认要删除密码“%s”吗？" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "您确定要删除 %d 个密码吗？" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "正在删除条目" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "访问网络共享或资源" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "访问站点" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "解锁 PGP 密钥" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "解锁 SSH 密钥" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "已存储的密码或登录" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "网络证书" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "密码" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "无法修改密码。" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "正在更新密码" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "无法设定说明。" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "密码：" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "技术细节：" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "细节" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "密钥首选项" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "密钥" +msgid "Use:" +msgstr "使用：" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "密钥首选项" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "类型：" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "登录：" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "服务器：" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "登录：" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "显示密码(_W)" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "类型：" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "使用：" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "密码：%s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "密码： %s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "密码密钥环" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "用来保存应用程序和网络密码" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "已储存的密码" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "安全地储存密码或密语。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "无法解锁密钥环" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "无法锁定密钥环" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "无法设置默认密钥环" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "无法修改密钥环密码" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "锁定(_L)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "锁定密码存储密钥环进而需要主密码才能将其解锁。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "解锁(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "使用主密码解锁密码存储密钥环使其可以使用。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "设为默认(_S)" +msgid "Password:" +msgstr "密码：" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "应用程序通常将新密码存储在默认密钥环中。" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "密钥" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "更改密码(_P)" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "技术细节：" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "修改密码存储密钥环的解锁密码" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "细节" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "无法删除密钥环" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "登录系统时自动解锁的密钥环" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "用于存储密码的密钥环" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "确认要删除密码密钥环“%s”吗？" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "正在删除密钥环" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "我明白，所有的条目都将永久删除。" + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "密钥环属性" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "名称：" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "创建：" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "密钥环" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "密钥环属性" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "名称(_N)：" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "操作被取消" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "访问密钥环被拒绝" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring 守护进程没有运行" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "密钥环已经解锁" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "不存在该密钥环" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "无法与密钥环守护进程通讯" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "条目已经存在" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "访问 gnome-keyring 时发生内部错误" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "显示标志" @@ -585,266 +578,327 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr "：" +msgid "initial temporary item" +msgstr "初始化临时条目" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "添加密钥服务器" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "主机：" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "密钥服务器类型：" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "主机：" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr "：" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "连接服务器的端口。" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "初始化临时条目" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "本程序的版本" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "密码" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- 系统设置" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "密码：" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "贡献人：" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "确认：" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "密码和密钥" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "不是有效的密钥服务器地址。" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"wei Li Zipeco , 2002\n" +"Funda Wang , 2004\n" +"Deng Xiyue 2007, 2008, 2009\n" +"Aron Xu , 2009, 2010, 2011\n" +"Yinghua Wang , 2010, 2011" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "请向您的系统管理员或密钥服务器管理员寻求帮助。" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse 项目首页" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "无法删除" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "制定" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "无法导出密钥" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "无：不要发行密钥" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "无法导出数据" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "自动从密钥服务器获取密钥(_K)" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "文件(_F)" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "自动从密钥服务器同步修改的密钥(_M)" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "导出(_X)..." -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "密钥服务器" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "导出到文件" -#: ../libseahorse/seahorse-prefs.xml.h:4 +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "编辑(_E)" + +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "复制到剪贴板" + +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "删除(_D)" + +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "删除已选择的项目" + +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "显示此项目的属性" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "显示此密钥环的属性" + +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "首选项(_N)" + +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "修改此程序的首选项" + +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "视图(_V)" + +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "帮助(_H)" + +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "关于此程序" + +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "内容(_C)" + +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "显示 Seahorse 帮助" + +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "导出" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "输入密码或 PIN：%s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "密码：" + +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "确认：" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "不是有效的密钥服务器地址。" + +#: ../libseahorse/seahorse-prefs.c:68 +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "请向您的系统管理员或密钥服务器管理员寻求帮助。" + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "制定" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "无：不要发行密钥" + +#: ../libseahorse/seahorse-prefs.xml.h:1 msgid "Preferences" msgstr "首选项" -#: ../libseahorse/seahorse-prefs.xml.h:5 +#: ../libseahorse/seahorse-prefs.xml.h:2 msgid "_Find keys via:" msgstr "在此寻找密钥(_F)：" -#: ../libseahorse/seahorse-prefs.xml.h:6 +#: ../libseahorse/seahorse-prefs.xml.h:3 msgid "_Publish keys to:" msgstr "将密钥发布到(_P)：" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "正在取回数据" - -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "正在导出数据" - -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "正在导入数据" +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "自动从密钥服务器获取密钥(_K)" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "正在发送数据" +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "自动从密钥服务器同步修改的密钥(_M)" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "不可用" +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "密钥服务器" -#: ../libseahorse/seahorse-util.c:259 +#: ../libseahorse/seahorse-util.c:209 msgid "%Y-%m-%d" msgstr "%Y-%m-%d" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "密钥数据" - -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "多个密钥" - -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "所有密钥文件" - -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "所有文件" - -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "档案文件" - -#: ../libseahorse/seahorse-util.c:856 -msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"使用该文件名的文件已存在。\n" -"\n" -"您想用新的文件替换它吗？" - -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "替换(_R)" - #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "未知" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "从不" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "部分" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "完全" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "彻底" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "禁止" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "撤回" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "无法显示帮助：%s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "有效期：" +msgid "Never E_xpires" +msgstr "永不过期(_X)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "生成一个新的子密钥" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "如果密钥永不过期" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "密钥类型(_T)：" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "密钥长度(_L)：" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "密钥类型(_T)：" +msgid "Expiration Date:" +msgstr "有效期：" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "密钥长度" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "永不过期(_X)" +msgid "Generate a new subkey" +msgstr "生成一个新的子密钥" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "添加用户 ID" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "创建新用户 ID" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "全名(_N)：" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "密钥注释(_M)：" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "必须至少5个字符长度" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "可选电子邮件地址" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "可选的描述密钥的注释" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "可选电子邮件地址" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "全名(_N)：" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "电子邮件地址(_E)：" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "密钥注释(_M)：" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "创建新用户 ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "更改(_H)" +msgid "_Never expires" +msgstr "永不过期(_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "撤回密钥" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "永不过期(_N)" +msgid "C_hange" +msgstr "更改(_H)" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -855,7 +909,7 @@ msgid "Add subkey to %s" msgstr "向 %s 添加子密钥" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (仅签署)" @@ -863,7 +917,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (仅加密)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (仅签署)" @@ -884,6 +938,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "解密失败。您可能没有解密密钥。" +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "操作被取消" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "无效的有效期" @@ -901,46 +960,142 @@ msgid "Expiry: %s" msgstr "过期状态：%s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "多个密钥" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "密钥数据" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "字符形式的密钥" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP 密钥" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP 密钥" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "用来加密邮件和文件" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "无法生成 PGP 密钥" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "新 PGP 密钥的密码" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "输入您的新密钥的密码两次" -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"创建密钥时需要生成大量随机数据并需要您协助。\n" +"执行在键盘上打字、移动鼠标、使用应用程序等都有所帮助。\n" +"这将给予系统其所需用的随机数据。" + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "正在生成密钥" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "您确定要永久删除 %s 吗？" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "您确定您要永久地删除 %d 个密钥吗？" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "密码错误" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "这是您第三次输错密码了。请重试。" +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "错误的密码。" + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "请输入“%s”的新密码" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "请输入“%s”的密码" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "输入新密码" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "输入密码" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "密码" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "已载入 %d 个密钥" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"无效的密钥数据(缺少 UID)。这可能是由于电脑时间设置成未来时间或者缺少自我签" +"名。" + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG 密钥" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG：默认密钥换目录" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -974,27 +1129,31 @@ msgid "All JPEG files" msgstr "所有 JPEG 文件" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "所有文件" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "选择要添加到密钥的照片" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "无法准备照片" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "无法添加照片" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "文件无法加载。可能是无效格式" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "您确定要从您的密钥中移除当前照片吗？" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "无法删除照片" @@ -1050,7 +1209,11 @@ msgid "Couldn't add revoker" msgstr "无法添加撤回者" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "我明白，此私钥将永久删除。" + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1065,564 +1228,622 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "没有可用于签署的密钥" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "您没有个人 PGP 密钥可用于表明您是否信任此密钥。" -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "错误的密码。" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "请输入“%s”的新密码" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "搜索范围过宽。服务器“%s”中找到太多密钥。" -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "请输入“%s”的密码" +msgid "Couldn't communicate with server '%s': %s" +msgstr "无法与服务器“%s”通讯：%s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "输入新密码" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP 密钥服务器" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "输入密码" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "无法导入密钥" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "从密钥服务器导入密钥" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "远程(_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "关闭此窗口" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "寻找远程密钥(_F)..." + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "在密钥服务器搜索密钥" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "导入(_I)" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "将已选择的密钥导入到本地密钥环" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "远程密钥" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "已载入 %d 个密钥" +msgid "Remote Keys Containing '%s'" +msgstr "远程密钥包含“%s”" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "寻找密钥失败。" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "寻找远程密钥" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "" -"无效的密钥数据(缺少 UID)。这可能是由于电脑时间设置成未来时间或者缺少自我签" -"名。" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "这将在互联网上寻找其他人的密钥。这些密钥可以导入您的本地密钥环。" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "搜索包含这些内容的密钥(_S)： " -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP 密钥服务器" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "密钥服务器：" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "我附近的共享密钥：" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "从哪里搜索：" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "搜索(_S)" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "无法向服务器发行密钥" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "搜索范围过宽。服务器“%s”中找到太多密钥。" +msgid "Couldn't retrieve keys from server: %s" +msgstr "无法从服务器取回密钥：%s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "无法与服务器“%s”通讯：%s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "已选择同步 %d 个密钥" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "正在同步密钥..." + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "同步密钥" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"这将发行您密钥环里的密钥，这样它们可供其他人来使用。您也可以获得自上次获得别" +"人密钥以来别人进行的修改" + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"这将取回自上次您获得他们的密钥以来别人所作的所有改变。没有指定用来发行的密钥" +"服务器，所以您的密钥无法被其他人使用。" + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "密钥服务器(_K)" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "同步(_S)" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "无法与“%s”通讯：%s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "正在连接到：%s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "无法解析地址：%s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "正在解析服务器地址：%s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP 密钥服务器" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "签署密钥(_S)..." - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "签署公钥" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "您确定要永久删除 %s 吗？" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "您确定您要永久地删除 %d 个密钥和身份吗？" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "您确定您要永久地删除 %d 个密钥吗？" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "同步并发布密钥(_S)" -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "您确定要永久删除 %d 个身份吗？" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "与那些在线的密钥发行并/或同步您的密钥" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "无法删除用户 ID" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP 密钥" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "无法删除私钥" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "无法删除公钥" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "PGP 密钥用来加密邮件和文件" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "高级密钥选项" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "创建(_R)" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "PGP 密钥允许您加密给别人的电子邮件或文件。" +msgid "Generate a new key" +msgstr "生成新密钥" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "算法" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "PGP 密钥允许您加密给别人的电子邮件或文件。" -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "创建(_R)" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "备注(_C)：" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "有效期至(_X)：" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "永不过期(_V)" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "加密类型(_T)：" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "生成新密钥" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "密钥保密强度(位)(_S)" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "永不过期(_V)" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "新 PGP 密钥" +msgid "E_xpiration Date:" +msgstr "有效期至(_X)：" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "备注(_C)：" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "高级密钥选项" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "已过期" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "个人 PGP 密钥" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP 密钥" + +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "无法修改主用户 ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "您确定要永久删除“%s”用户 ID 吗？" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "无法删除用户 ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[未知]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "名称/电子邮件" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "签名 ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "无法修改主照片" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "(未知)" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "此密钥已于 %s 过期。" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "名称" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "您确定要永久删除 %2$s 的子密钥 %1$d 吗？" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "无法删除子密钥" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "无法修改信任栏" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "无法向“%s”导出密钥" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "导出完整密钥" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "无法导出密钥。" +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "无法导出密钥" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "从不" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "类型" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "已创建" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "过期" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "状态" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "强度" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "已过期" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "好" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "密钥 ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "动作" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "备注：" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "日期" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "电子邮件：" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "指纹" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "密钥 ID：" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "从不" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "密钥名称和签名" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "此密钥已被撤回" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "照片 " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "此密钥的所有者已撤回此密钥。它将不能再使用。" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "技术细节" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "此密钥已过期" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "此密钥已被撤回" +msgid "Add a photo to this key" +msgstr "向此密钥添加照片" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "此密钥已过期" +msgid "Remove this photo from this key" +msgstr "从此密钥中移除此照片" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "类型：" +msgid "Make this photo the primary photo" +msgstr "使用此照片作为主照片" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "使用：" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "到上个照片" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "子密钥(_S)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "到下个照片" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "添加" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "照片 " #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "向此密钥添加照片" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "更改密码(_P)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "密钥 ID：" + +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "名称：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "解密发给您的文件和电子邮件" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "电子邮件：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "删除" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "备注：" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "过期" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "使用：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "过期：" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "类型：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "导出" +msgid "Decrypt files and email sent to you." +msgstr "解密发给您的文件和电子邮件" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "PGP 私钥" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "到下个照片" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "更改密码(_P)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "到上个照片" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "所有者" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "密钥 ID：" +msgid "Key Names and Signatures" +msgstr "密钥名称和签名" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "主要" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "使用此照片作为主照片" +msgid "Sign" +msgstr "签署" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "名称和签名" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "删除" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "从不" +msgid "_Add Name" +msgstr "添加名称(_A)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "覆盖所有者信任状态(_T)：" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "所有者" +msgid "Revoke" +msgstr "撤回" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "主要" +msgid "Names and Signatures" +msgstr "名称和签名" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "PGP 私钥" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "密钥 ID：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "从此密钥中移除此照片" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "撤回" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "保密强度：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "签署" +msgid "Technical Details" +msgstr "技术细节" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "保密强度：" +msgid "Fingerprint" +msgstr "指纹" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "此密钥的所有者已撤回此密钥。它将不能再使用。" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "过期：" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "添加名称(_A)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "日期" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "覆盖所有者信任状态(_T)：" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "导出完整密钥(_E)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "名称：" +msgid "Actions" +msgstr "动作" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "日期：" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "添加" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "过期" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "子密钥(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "部分" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "指纹：" +msgid "Fully" +msgstr "完全" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "是否信任：" +msgid "Ultimately" +msgstr "彻底" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "您是否信任此密钥" +#| msgid "Encrypt files and email to the key's owner " +msgid "Encrypt files and email to the key's owner" +msgstr "加密文件并通过电子邮件发给密钥所有者" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "PGP 公钥" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "其他名称(_O)：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "其他签署此密钥的人(_P)" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "加密文件并通过电子邮件发给密钥所有者 " +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "您是否信任此密钥" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "完全" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "您的信任度在细节栏手动指定。" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "我信任来自其它密钥上的“%s”的签名" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "如果您相信拥有此密钥的人是“%s”，请签署此密钥：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "签署此密钥(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "如果您不再相信“%s”拥有此密钥，请撤回您的签名：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "部分" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "PGP 公钥" +msgid "_Revoke Signature" +msgstr "撤回签名(_R)：" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "其他签署此密钥的人(_P)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "仅显示我信任的人的签名(_O)" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "信任" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "彻底" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "对此密钥的信任度(_T)：" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "您的信任度在细节栏手动指定。" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "指纹：" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "仅显示我信任的人的签名(_O)" +msgid "Dates:" +msgstr "日期：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "撤回签名(_R)：" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "是否信任：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "签署此密钥(_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "对此密钥的信任度(_T)：" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1630,52 +1851,59 @@ msgstr "%2$s 的子密钥 %1$d" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "可选的撤回描述" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "撤回(_V)" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "撤回密钥的原因" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "原因(_R)：" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "可选的撤回描述" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "撤回(_V)" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "您没有个人 PGP 密钥可用于签署文档或消息" +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "用此密钥签署消息(_S)：" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "您检查此密钥的严格程度如何？" +msgid "Sign Key" +msgstr "签署密钥" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "其他人如何看到这个签名：" - +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "通过签署您表明您信任此密钥属于：" + #: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "以此身份签署密钥：" +msgid "Key Name" +msgstr "密钥名称" #: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"非正式：意思是您完成了一项非正式地验证，证明该密钥是由声称拥有它的人所" -"有。比如，您可以通过电话将密钥指纹读给所有者以确认。 " +msgid "How carefully have you checked this key?" +msgstr "您检查此密钥的严格程度如何？" #: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "密钥名称" +msgid "_Not at all" +msgstr "无(_N)" #: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "非正式地(_C)" + +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "非常仔细地(_V)" + +#: ../pgp/seahorse-sign.xml.h:8 msgid "" "Not at all: means you believe the key is owned by the person who " "claims to own it, but you could not or did not verify this to be a fact." @@ -1683,24 +1911,25 @@ "无：意味着您相信此密钥是声称拥有它的人所拥有的，但您不能或没有校验其真" "实性。" -#: ../pgp/seahorse-sign.xml.h:7 +#: ../pgp/seahorse-sign.xml.h:9 +#| msgid "" +#| "Casually: means you have done a casual verification that the key " +#| "is owned by the person who claims to own it. For example, you could read " +#| "the key fingerprint to the owner over the phone. " +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"非正式：意思是您完成了一项非正式地验证，证明该密钥是由声称拥有它的人所" +"有。比如，您可以通过电话将密钥指纹读给所有者以确认。" + +#: ../pgp/seahorse-sign.xml.h:10 msgid "" "Very Carefully: Select this only if you are absolutely sure that this " "key is genuine." msgstr "非常仔细：选择此选项仅当您绝对确信此密钥是真实的。" -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "通过签署您表明您信任此密钥属于：" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "我可以在之后撤回此签名(_R)。" - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "签署密钥" - #: ../pgp/seahorse-sign.xml.h:11 msgid "" "You could use a hard to forge photo identification (such as a passport) to " @@ -1711,474 +1940,352 @@ "要使用电子邮件来检查此电子邮件地址属于所有者。" #: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "非正式地(_C)" +msgid "How others will see this signature:" +msgstr "其他人如何看到这个签名：" #: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "无(_N)" - -#: ../pgp/seahorse-sign.xml.h:14 msgid "_Others may not see this signature" msgstr "其他人不能看到此签名(_O)" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "我可以在之后撤回此签名(_R)。" + #: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "签署(_S)" +msgid "Sign key as:" +msgstr "以此身份签署密钥：" #: ../pgp/seahorse-sign.xml.h:16 msgid "_Signer:" msgstr "签署者(_S)：" #: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "非常仔细地(_V)" +msgid "_Sign" +msgstr "签署(_S)" -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "用此密钥签署消息(_S)：" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "正在导出数据" + +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "正在取回数据" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "正在导入数据" + +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "正在发送数据" + +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "不可用" -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "个人证书和密钥" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "个人证书" + +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 msgid "Certificate" msgstr "证书" -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "无法删除" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "密钥(DER 编码)" -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "您确定要删除证书“%s”吗？" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "证书" -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "您确定要删除 %d 个证书吗？" +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 证书和相关的密钥" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "您确定要永久删除 %d 个证书吗？" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "无法生成私钥" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "创建" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "私钥" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "用于请求证书" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "创建新密钥" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "标签：" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "已储存于：" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "我明白，此密钥将永久删除。" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "未命名" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "导出证书失败" + +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "无法删除" -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "正在删除" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "导出(_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "导出证书" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "删除此证书或密钥" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "请求证书(_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "为此密钥创建一个证书请求文件" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "无法保存证书请求" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "保存证书请求" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "证书请求" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM 编码的请求" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "无法创建证书请求" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "创建一个证书请求文件。" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "在证书请求中的通用名(CN)。" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "名称(CN)：" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "未命名的私钥" #: ../src/seahorse-change-passphrase.xml.h:1 msgid "Change Passphrase" msgstr "更改密码" -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "确认密码(_F)：" - #: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "确认新密码" - -#: ../src/seahorse-change-passphrase.xml.h:5 msgid "New _Passphrase:" msgstr "新密码(_P)：" -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "管理您的密码和加密密钥" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "密码和密钥" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "选择您希望创建的条目的类型(_S)：" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "继续(_C)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "新建..." - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "已选择 %d 个密钥" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "无法导入密钥" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "已导入的密钥" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "正在导入密钥" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "导入密钥" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "无法识别的密钥类型，或无效的数据格式" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "正在导入密钥" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "远程(_R)" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "关闭此程序" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "新建(_N)..." - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "创建新密钥或条目" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "导入(_I)..." - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "从文件导入" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "从剪贴板导入" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "寻找远程密钥(_F)..." - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "在密钥服务器搜索密钥" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "同步并发布密钥(_S)" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "与那些在线的密钥发行并/或同步您的密钥" - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "类型(_Y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "显示类型列" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "过期(_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "显示过期列" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "信任(_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "显示所有者信任列" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "有效性(_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "显示有效性列" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "过滤器：" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "初次选项：" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "生成您自己的新密钥：" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "从文件导入已存在的密钥：" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "我的个人密钥(_P)" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "其他密钥(_K)" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "您需要密钥以开始加密。" - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "导入(_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "密码(_P)" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "无法导出密钥" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "有效性" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "有效期" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "关闭此窗口" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "全部展开(_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "展开全部列表" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "全部折叠(_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "折叠全部列表" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "远程密钥" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "远程密钥包含“%s”" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "密钥服务器：" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "我附近的共享密钥：" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "寻找远程密钥" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "这将在互联网上寻找其他人的密钥。这些密钥可以导入您的本地密钥环。" - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "从哪里搜索：" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "搜索(_S)" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "搜索包含这些内容的密钥(_S)： " - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "无法向服务器发行密钥" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "无法从服务器取回密钥：%s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "已选择同步 %d 个密钥" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "正在同步密钥..." - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "同步密钥" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"这将发行您密钥环里的密钥，这样它们可供其他人来使用。您也可以获得自上次获得别" -"人密钥以来别人进行的修改" - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"这将取回自上次您获得他们的密钥以来别人所作的所有改变。没有指定用来发行的密钥" -"服务器，所以您的密钥无法被其他人使用。" - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "密钥服务器(_K)" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "同步(_S)" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "本程序的版本" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "贡献人：" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "确认新密码" -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"wei Li Zipeco , 2002\n" -"Funda Wang , 2004\n" -"Deng Xiyue 2007, 2008, 2009\n" -"Aron Xu , 2009, 2010, 2011\n" -"Yinghua Wang , 2010, 2011" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "确认密码(_F)：" -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse 项目首页" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "管理您的密码和加密密钥" -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "文件(_F)" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "继续" -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "编辑(_E)" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "选择您希望创建的条目的类型(_S)：" -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "视图(_V)" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "导入失败" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "导入" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "要导入的数据：" -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "帮助(_H)" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "导入密钥" -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "首选项(_N)" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "所有密钥文件" -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "修改此程序的首选项" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "丢失的文本" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "剪贴板文本" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "新建(_N)" -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "关于此程序" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "关闭此程序" -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "内容(_C)" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "新建(_N)..." -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "显示 Seahorse 帮助" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "创建新密钥或条目" -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "导出公钥" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "添加新密钥或条目" -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "正在导出密钥" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "导入(_I)..." -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "无法从密钥服务器取回数据" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "从文件导入" -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "已复制密钥" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "从剪贴板导入" -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "正在取回密钥" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "根据密钥环(_K)：" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "显示密钥环列表侧边栏" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "显示个人(_P)" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "只显示个人密钥、证书和密码" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "仅显示信任的(_T)" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "只显示信任的密钥、证书和密码" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "显示全部(_A)" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "显示全部密钥、证书和密码" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "过滤器" -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s 是私钥。您确定要进行吗？" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "初次选项：" -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "从密钥服务器导入密钥" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "生成您自己的新密钥：" -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "显示属性" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "从文件导入已存在的密钥：" -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "删除(_D)" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "您需要密钥以开始加密。" -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "删除已选择的项目" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "无法锁定" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "无法解锁" -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "导出(_X)..." +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "锁定(_L)" -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "导出到文件" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "解锁(_U)" -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "复制到剪贴板" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "属性(_P)" -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "将已选择的密钥导入到本地密钥环" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "为 _SSH 配置密钥..." + +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "发送 SSH 公钥到另一个机器，并允许使用该密钥登录。" #: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 msgid "Enter your Secure Shell passphrase:" @@ -2207,173 +2314,199 @@ msgid "Enter the new passphrase again: %s" msgstr "再次输入新密码：%s" -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "为 _SSH 配置密钥..." - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "发送 SSH 公钥到另一个机器，并允许使用该密钥登录。" +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "SSH" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "用来连接到其他计算机的密钥。" -#: ../ssh/seahorse-ssh-commands.c:118 +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 #, c-format msgid "Are you sure you want to delete the secure shell key '%s'?" msgstr "您确认要删除 SSH 密钥“%s”吗？" -#: ../ssh/seahorse-ssh-commands.c:121 +#: ../ssh/seahorse-ssh-deleter.c:91 #, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "您确认要删除 %d 个 SSH 密钥吗？" +#| msgid "Are you sure you want to delete %d secure shell keys?" +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "您确认要删除 %d 个 SSH 密钥吗？" + +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH 密钥" -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "无法删除密钥" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "SSH 私钥" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "SSH 公钥" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "此密钥的公钥文件不可用。" -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "SSH 密钥" -#: ../ssh/seahorse-ssh-generate.c:61 +#: ../ssh/seahorse-ssh-generate.c:56 msgid "Used to access other computers (eg: via a terminal)" msgstr "用来访问其他计算机(例如：通过终端)" -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 msgid "Couldn't generate Secure Shell key" msgstr "无法创建 SSH 密钥" -#: ../ssh/seahorse-ssh-generate.c:197 +#: ../ssh/seahorse-ssh-generate.c:192 msgid "Creating Secure Shell Key" msgstr "创建 SSH 密钥" -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "" -"使用您的电子邮件地址，和其他您所需要的提醒信息来提醒此密钥的用途" - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"SSH 密钥允许您通过 SSH 安全的连接到信任的计算机，而不用为它们依次输入不同的密" -"码。" - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "" -"如果您已经打算在一台计算机上使用此密钥，您现在可以设定那台计算机来识别您的密" -"钥 " - -#: ../ssh/seahorse-ssh-generate.xml.h:7 +#: ../ssh/seahorse-ssh-generate.xml.h:1 msgid "New Secure Shell Key" msgstr "新 SSH 密钥" -#: ../ssh/seahorse-ssh-generate.xml.h:8 +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "仅创建密钥(_J)" + +#: ../ssh/seahorse-ssh-generate.xml.h:3 msgid "_Create and Set Up" msgstr "创建并设定(_C)" -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "仅创建密钥(_J)" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "安全 Shell (SSH) 密钥允许您通过安全的连接到其它计算机。" + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "使用您的电子邮件地址，或标示此密钥的用途" #: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "密钥描述(_K)" +msgid "DSA" +msgstr "DSA" + +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "" +"如果您打算在一台计算机上使用此密钥，您现在可以将那台计算机设定为识别您的密" +"钥。" -#: ../ssh/seahorse-ssh-key.c:87 +#: ../ssh/seahorse-ssh-key.c:110 msgid "(Unreadable Secure Shell Key)" msgstr "(无法读取的 SSH 密钥)" -#: ../ssh/seahorse-ssh-key-properties.c:79 +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "个人 SSH 密钥" + +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH 密钥" + +#: ../ssh/seahorse-ssh-key-properties.c:82 msgid "Couldn't rename key." msgstr "无法重命名密钥。" -#: ../ssh/seahorse-ssh-key-properties.c:132 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "无法更改此密钥的授权。" -#: ../ssh/seahorse-ssh-key-properties.c:167 +#: ../ssh/seahorse-ssh-key-properties.c:170 msgid "Couldn't change passphrase for key." msgstr "无法更改此密钥的密码。" -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "算法：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 msgid "Identifier:" msgstr "标识符：" -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "位置：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +#| msgid "Name:" +msgctxt "name-of-ssh-key" msgid "Name:" msgstr "名称：" -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "保密强度：" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "用来连接到其他计算机。" -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 msgid "Trust" msgstr "信任" -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "此密钥的拥有者已被授权连接到此计算机(_A)" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 #, no-c-format -msgid "This only applies to the '%s' account." -msgstr "仅用于“%s”帐户。" +#| msgid "This only applies to the '%s' account." +msgid "This only applies to the %s account." +msgstr "仅用于%s帐户。" #: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "导出完整密钥(_X)" +msgid "Algorithm:" +msgstr "算法：" -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "此密钥的拥有者已被授权连接到此计算机(_A)" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "保密强度：" + +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "位置：" #: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "用来连接到其他计算机。" +msgid "E_xport Complete Key" +msgstr "导出完整密钥(_X)" -#: ../ssh/seahorse-ssh-operation.c:198 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The SSH command was terminated unexpectedly." msgstr "SSH 命令意外终止。" -#: ../ssh/seahorse-ssh-operation.c:208 +#: ../ssh/seahorse-ssh-operation.c:209 msgid "The SSH command failed." msgstr "SSH 命令失败。" -#: ../ssh/seahorse-ssh-operation.c:518 +#: ../ssh/seahorse-ssh-operation.c:502 msgid "Remote Host Password" msgstr "远程主机密码" -#: ../ssh/seahorse-ssh-operation.c:634 +#: ../ssh/seahorse-ssh-operation.c:588 msgid "Enter Key Passphrase" msgstr "输入密钥密码" -#: ../ssh/seahorse-ssh-operation.c:724 +#: ../ssh/seahorse-ssh-operation.c:678 msgid "Passphrase for New Secure Shell Key" msgstr "新的 SSH 密钥的密码" -#: ../ssh/seahorse-ssh-operation.c:908 +#: ../ssh/seahorse-ssh-operation.c:862 #, c-format msgid "Importing key: %s" msgstr "正在导入密钥：%s" -#: ../ssh/seahorse-ssh-operation.c:910 +#: ../ssh/seahorse-ssh-operation.c:864 msgid "Importing key. Enter passphrase" msgstr "正在导入密钥。输入密码" -#: ../ssh/seahorse-ssh-source.c:951 +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH keys" + +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH：%s" + +#: ../ssh/seahorse-ssh-source.c:940 msgid "No private key file is available for this key." msgstr "此密钥的私钥文件不可用。" @@ -2386,14 +2519,10 @@ msgstr "正在配置 SSH 密钥..." #: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "例如： fireserver.example.com:端口" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "Set Up Computer for SSH Connection" msgstr "为 SSH 连接设定计算机" -#: ../ssh/seahorse-ssh-upload.xml.h:4 +#: ../ssh/seahorse-ssh-upload.xml.h:2 msgid "" "To use your Secure Shell key with another computer that uses SSH, you must " "already have a login account on that computer." @@ -2401,6 +2530,10 @@ "要在另一台使用 SSH 的计算机上使用您的 SSH 密钥，您必须在那台计算机上有已存在" "的登录帐户。" +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "例如： fireserver.example.com:端口" + #: ../ssh/seahorse-ssh-upload.xml.h:5 msgid "_Computer Name:" msgstr "计算机名(_C)：" @@ -2413,11 +2546,247 @@ msgid "_Set Up" msgstr "设定(_S)" -#~ msgid "DSA" -#~ msgstr "DSA" +#~ msgid "Login keyring" +#~ msgstr "登录密钥环" + +#~ msgid "Access to the key ring was denied" +#~ msgstr "访问密钥环被拒绝" + +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "gnome-keyring 守护进程没有运行" + +#~ msgid "The key ring has already been unlocked" +#~ msgstr "密钥环已经解锁" + +#~ msgid "No such key ring exists" +#~ msgstr "不存在该密钥环" + +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "无法与密钥环守护进程通讯" + +#~ msgid "The item already exists" +#~ msgstr "条目已经存在" + +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "访问 gnome-keyring 时发生内部错误" + +#~ msgid "Algorithms here" +#~ msgstr "算法" + +#~ msgid "Couldn't delete keyring" +#~ msgstr "无法删除密钥环" + +#~ msgid "Deleting keyring" +#~ msgid_plural "Deleting keyrings" +#~ msgstr[0] "正在删除密钥环" + +#~ msgid "" +#~ "Lock the password storage keyring so a master password is required to " +#~ "unlock it." +#~ msgstr "锁定密码存储密钥环进而需要主密码才能将其解锁。" + +#~ msgid "" +#~ "Unlock the password storage keyring with a master password so it is " +#~ "available for use." +#~ msgstr "使用主密码解锁密码存储密钥环使其可以使用。" + +#~ msgid "Delete the keyring." +#~ msgstr "删除密钥环" + +#~ msgid "Properties of the keyring." +#~ msgstr "密钥环的属性。" + +#~ msgid "Lock the password storage keyring." +#~ msgstr "锁定存储密码的密钥环。" + +#~ msgid "Unlock the password storage keyring." +#~ msgstr "解锁存储密码的密钥环。" + +#~ msgid "Deleting item" +#~ msgid_plural "Deleting items" +#~ msgstr[0] "正在删除条目" + +#~ msgid "Properties of the password." +#~ msgstr "密码的属性。" + +#~ msgid "Delete the password." +#~ msgstr "删除密码。" -#~ msgid "Secure Shell key" -#~ msgstr "SSH 密钥" +#~ msgid "Archive files" +#~ msgstr "档案文件" + +#~ msgid "" +#~ "A file already exists with this name.\n" +#~ "\n" +#~ "Do you want to replace it with a new file?" +#~ msgstr "" +#~ "使用该文件名的文件已存在。\n" +#~ "\n" +#~ "您想用新的文件替换它吗？" + +#~ msgid "_Replace" +#~ msgstr "替换(_R)" + +#~ msgid "Show the properties of this place" +#~ msgstr "显示此位置的属性" + +#~ msgid "Export public key" +#~ msgstr "导出公钥" + +#~ msgid "Couldn't export key to \"%s\"" +#~ msgstr "无法向“%s”导出密钥" + +#~ msgid "Exporting keys" +#~ msgstr "正在导出密钥" + +#~ msgid "Couldn't retrieve data from key server" +#~ msgstr "无法从密钥服务器取回数据" + +#~ msgid "Retrieving keys" +#~ msgstr "正在取回密钥" + +#~ msgid "Are you sure you want to permanently delete %d keys and identities?" +#~ msgstr "您确定您要永久地删除 %d 个密钥和身份吗？" + +#~ msgid "Couldn't delete private key" +#~ msgstr "无法删除私钥" + +#~ msgid "Couldn't delete public key" +#~ msgstr "无法删除公钥" + +#~ msgid "_Sign Key..." +#~ msgstr "签署密钥(_S)..." + +#~ msgid "Sign public key" +#~ msgstr "签署公钥" + +#~ msgid "Properties of the key." +#~ msgstr "密钥的属性。" + +#~ msgid "Delete the key." +#~ msgstr "删除密钥。" + +#~ msgid "Export Complete Key" +#~ msgstr "导出完整密钥" + +#~ msgid "Couldn't export key." +#~ msgstr "无法导出密钥。" + +#~ msgid "Lock this token" +#~ msgstr "锁定此令牌" + +#~ msgid "Unlock this token" +#~ msgstr "解锁此令牌" + +#~ msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgstr "您确定要删除证书“%s”吗？" + +#~ msgid "Are you sure you want to delete %d certificate?" +#~ msgid_plural "Are you sure you want to delete %d certificates?" +#~ msgstr[0] "您确定要删除 %d 个证书吗？" + +#~ msgid "Deleting" +#~ msgstr "正在删除" + +#~ msgid "Delete the certificate." +#~ msgstr "删除此证书。" + +#~ msgid "Also delete matching private key" +#~ msgstr "同时删除匹配的私钥" + +#, fuzzy +#~| msgid "Are you sure you want to delete the certificate '%s'?" +#~ msgid "Are you sure you want to delete the private key '%s'?" +#~ msgstr "您确定要删除证书“%s”吗？" + +#~ msgid "P_laces" +#~ msgstr "位置(_L)" + +#, fuzzy +#~| msgid "Show pass_word" +#~ msgid "Show places sidebar" +#~ msgstr "显示密码(_W)" + +#~ msgid "Couldn't delete key" +#~ msgstr "无法删除密钥" + +#~ msgid "OpenSSH directory" +#~ msgstr "OpenSSH 目录" + +#~ msgid "Passwords: %s" +#~ msgstr "密码：%s" + +#~ msgid "Passwords: %s" +#~ msgstr "密码： %s" + +#~ msgid "New PGP Key" +#~ msgstr "新 PGP 密钥" + +#~ msgid "Create New ..." +#~ msgstr "新建..." + +#~ msgid "Importing keys" +#~ msgstr "正在导入密钥" + +#~ msgid "Unrecognized key type, or invalid data format" +#~ msgstr "无法识别的密钥类型，或无效的数据格式" + +#~ msgid "Importing Keys" +#~ msgstr "正在导入密钥" + +#~ msgid "T_ypes" +#~ msgstr "类型(_Y)" + +#~ msgid "Show type column" +#~ msgstr "显示类型列" + +#~ msgid "_Expiry" +#~ msgstr "过期(_E)" + +#~ msgid "Show expiry column" +#~ msgstr "显示过期列" + +#~ msgid "_Trust" +#~ msgstr "信任(_T)" + +#~ msgid "Show owner trust column" +#~ msgstr "显示所有者信任列" + +#~ msgid "_Validity" +#~ msgstr "有效性(_V)" + +#~ msgid "Show validity column" +#~ msgstr "显示有效性列" + +#~ msgid "Other _Keys" +#~ msgstr "其他密钥(_K)" + +#~ msgid "Validity" +#~ msgstr "有效性" + +#~ msgid "Expiration Date" +#~ msgstr "有效期" + +#~ msgid "_Expand All" +#~ msgstr "全部展开(_E)" + +#~ msgid "Expand all listings" +#~ msgstr "展开全部列表" + +#~ msgid "_Collapse All" +#~ msgstr "全部折叠(_C)" + +#~ msgid "Collapse all listings" +#~ msgstr "折叠全部列表" + +#~ msgid "Copied keys" +#~ msgstr "已复制密钥" + +#~ msgid "%s is a private key. Are you sure you want to proceed?" +#~ msgstr "%s 是私钥。您确定要进行吗？" + +#~ msgid "_Key Description:" +#~ msgstr "密钥描述(_K)" #~ msgid "Enter a passphrase for your new Secure Shell key." #~ msgstr "为您的输入新 SSH 密钥输入密码" @@ -2425,33 +2794,18 @@ #~ msgid "Web Password" #~ msgstr "Web 密码" -#~ msgid "Network Password" -#~ msgstr "网络密码" - #~ msgid "Deleting items" #~ msgstr "正在删除项目" -#~ msgid "Deleting keyrings" -#~ msgstr "正在删除密钥环" - #~ msgid "Symmetric Key" #~ msgstr "对称密钥" -#~ msgid "Public Key" -#~ msgstr "公钥" - -#~ msgid "Private Key" -#~ msgstr "私钥" - #~ msgid "Credentials" #~ msgstr "证书" #~ msgid "Identity" #~ msgstr "身份" -#~ msgid "Encryption Key Manager" -#~ msgstr "密钥管理器" - #~ msgid "Invalid" #~ msgstr "无效" @@ -2467,9 +2821,6 @@ #~ msgid "couldn't fork process" #~ msgstr "无法创建子进程" -#~ msgid "couldn't create new process group" -#~ msgstr "无法创建新的进程组" - #~ msgid "Encryption Daemon (Seahorse)" #~ msgstr "加密守护进程 (Seahorse)" @@ -2521,9 +2872,6 @@ #~ msgid "Bad Signature" #~ msgstr "签名错误" -#~ msgid "Couldn't verify signature." -#~ msgstr "无法验证签名。" - #~ msgid "Invalid or unrecognized signer: %s" #~ msgstr "无效或者无法识别的签署者：%s" @@ -2819,9 +3167,6 @@ #~ msgid "Loading Keys..." #~ msgstr "正在载入密钥... " -#~ msgid "Searching for keys..." -#~ msgstr "正在寻找密钥..." - #~ msgid "Uploading keys..." #~ msgstr "正在上传密钥..." diff -Nru seahorse-3.2.2/po/zh_HK.po seahorse-3.6.3/po/zh_HK.po --- seahorse-3.2.2/po/zh_HK.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/zh_HK.po 2012-08-21 12:23:19.000000000 +0200 @@ -6,327 +6,314 @@ # msgid "" msgstr "" -"Project-Id-Version: seahorse 3.1.91\n" +"Project-Id-Version: seahorse 3.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-26 23:00+0800\n" -"PO-Revision-Date: 2011-09-26 23:00+0800\n" +"POT-Creation-Date: 2012-07-17 15:28+0800\n" +"PO-Revision-Date: 2012-07-17 15:28+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" "Language: \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=1; plural=0;\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "加入密碼密碼匙圈" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "新密碼匙圈名稱：" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "請為新的密碼匙圈選擇一個名稱。系統會提示你提供解鎖密碼。" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "新密碼匙圈名稱：" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "伺服器的主機名稱或位址。" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "無法加入密碼匙圈" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "新增密碼密碼匙圈" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "用來儲存應用程式和網絡的密碼" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "新密碼…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "安全的存放密語或機密。" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "密碼密碼匙圈" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "已儲存的密碼" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "無法設定預設的密碼匙圈" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "無法更改密碼匙圈密碼" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "設為預設值(_S)" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "應用程式通常會把新密碼儲存在預設密碼匙圈裏。" + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "更改密碼(_P)" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "改變密碼儲存密碼匙圈的解鎖密碼" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "無法加入項目" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "加入密碼" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "描述(_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "密碼匙圈(_K):" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "密碼(_P):" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "顯示密碼(_S)" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "無法刪除項目" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "密碼匙圈(_K):" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "無法加入密碼匙圈" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "密碼" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "已儲存的個人密碼、證書和機密" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "IM 帳號的密碼 " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "密語或機密" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "網絡密碼" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "儲存的備註" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "密碼匙圈密碼" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "加密密碼匙密碼" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "密碼匙儲存密碼" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome 密碼" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "GNOME 網上帳號密碼" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy 密碼" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "即時訊息密碼" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "網絡管理程式機密" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "確定要刪除密碼「%s」？" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "確定要刪除 %d 個密碼？" -msgstr[1] "確定要刪除 %d 個密碼？" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "刪除項目" -msgstr[1] "刪除項目" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "存取網絡共享或資源" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "存取網站" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "解除 PGP 密碼匙鎖定" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "解除 SSH 密碼匙鎖定" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "已儲密碼或登入" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "網絡認證" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "密碼" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "無法更改密碼。" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "更新密碼" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "無法設定描述。" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "密碼：" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "技術資料：" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "詳細資料" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "密碼匙屬性" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "密碼匙" +msgid "Use:" +msgstr "使用:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "密碼匙屬性" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "類型:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "登入:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "伺服器:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "登入:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "顯示密碼(_W)" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "類型:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "使用:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "密碼：%s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "密碼：%s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "密碼密碼匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "用來儲存應用程式和網絡的密碼" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "已儲存的密碼" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "安全的存放密語或機密。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "無法解鎖密碼匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "無法鎖定密碼匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "無法設定預設的密碼匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "無法更改密碼匙圈密碼" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "鎖定(_L)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "鎖定密碼儲存密碼匙圈，如此要將它解鎖就要有主控密碼才行。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "解鎖(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "使用主控密碼將密碼儲存密碼匙圈解鎖，如此就成為可以使用的狀態。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "設為預設值(_S)" +msgid "Password:" +msgstr "密碼：" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "應用程式通常會把新密碼儲存在預設密碼匙圈裏。" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "密碼匙" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "更改密碼(_P)" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "技術資料：" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "改變密碼儲存密碼匙圈的解鎖密碼" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "詳細資料" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "無法刪除密碼匙圈" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "登入時自動解鎖的密碼匙圈" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "用來儲存密碼的密碼匙圈" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "你確定要刪除這個密碼密碼匙圈「%s」？" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "刪除密碼匙圈" -msgstr[1] "刪除密碼匙圈" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "我知道所有的項目會永遠的被刪除。" + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "密碼匙圈屬性" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "名稱：" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "建立日期：" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "密碼匙圈" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "密碼匙圈屬性" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "名稱(_N):" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "該操作已取消" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "存取密碼匙圈被禁止" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring 服務程式沒有執行" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "密碼匙圈已經解鎖" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "沒有該密碼匙圈存在" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "無法與密碼匙圈服務程式聯絡" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "項目已經存在" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "存取 gnome-keyring 發生內部錯誤" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "顯示旗標" @@ -583,266 +570,327 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "起動臨時項目" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "加入密碼匙伺服器" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "主機：" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "密碼匙伺服器類型：" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "主機：" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "連接伺服器的連接埠。" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "起動臨時項目" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "這個應用程式的版本" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "密語" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- 系統設定值" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "密碼:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "貢獻者:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "確認:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "密碼及加密密碼匙" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "不是有效的密碼匙伺服器位址。" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"如對翻譯有任何意見，請送一封電子郵件給\n" +"以下地址，GNOME 翻譯隊伍會盡快回覆你：\n" +"zh-l10n@lists.linux.org.tw\n" +"\n" +"Woodman Tuen , 2005-07" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "向系統管理員或密碼匙伺服器管理員取得協助。" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse 專案網頁" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "不能刪除" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "自選" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "無法匯出金錀" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "沒有：不要發行密碼匙" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "無法匯出資料" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "自動從密碼匙伺服器取得密碼匙(_K)" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "檔案(_F)" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "與密碼匙伺服器自動將已修改的密碼匙同步(_M)" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "匯出(_X)…" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "密碼匙伺服器" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "匯出為檔案" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "偏好設定" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "編輯(_E)" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "尋找密碼匙以(_F):" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "複製到剪貼簿" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "發行密碼匙至(_P):" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "刪除(_D)" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "取回資料" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "刪除選取的項目" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "匯出資料" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "顯示這個項目的屬性" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "顯示這個密碼匙圈的屬性" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "輸入資料" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "偏好設定(_N)" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "傳送資料" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "更改本程式的偏好設定" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "不存在" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "檢視(_V)" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "求助(_H)" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "密碼匙資料" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "關於本程式" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "多個密碼匙" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "內容(_C)" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "所有密碼匙檔" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "顯示 Seahorse 的說明文件" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "所有檔案" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "匯出" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "輸入 PIN 或密碼：%s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "密碼:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "壓縮檔" +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "確認:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "不是有效的密碼匙伺服器位址。" -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"以這名稱命名的檔案已經存在。\n" -"\n" -"你是否希望以新的檔案來取代它？" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "向系統管理員或密碼匙伺服器管理員取得協助。" + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "自選" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "沒有：不要發行密碼匙" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "偏好設定" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "尋找密碼匙以(_F):" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "發行密碼匙至(_P):" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "自動從密碼匙伺服器取得密碼匙(_K)" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "與密碼匙伺服器自動將已修改的密碼匙同步(_M)" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "密碼匙伺服器" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "取代(_R)" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "不明" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "永不" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "勉強" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "完全" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "徹底" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "已停用" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "已撤銷" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "無法顯示說明文件：%s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "有效日期：" +msgid "Never E_xpires" +msgstr "永不過期(_X)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "產生新的子鑰" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "如果密碼匙永不過期" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "密碼匙類型(_T):" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "密碼匙長度(_L)" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "密碼匙類型(_T):" +msgid "Expiration Date:" +msgstr "有效日期：" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "密碼匙長度" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "永不過期(_X)" +msgid "Generate a new subkey" +msgstr "產生新的子鑰" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "加入使用者 ID" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "建立新的使用者 ID" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "全名(_N):" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "密碼匙附註(_M):" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "長度最少要有 5 個字符" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "電郵地址（非必要）" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "描述密碼匙的註釋（非必要）" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "電郵地址（非必要）" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "全名(_N):" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "電郵地址(_C):" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "密碼匙附註(_M):" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "建立新的使用者 ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "更改(_H)" +msgid "_Never expires" +msgstr "永不過期(_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "撤銷密碼匙" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "永不過期(_N)" +msgid "C_hange" +msgstr "改變(_H)" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -853,7 +901,7 @@ msgid "Add subkey to %s" msgstr "加入子鑰至 %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (只能簽署)" @@ -861,7 +909,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (只能加密)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (只能簽署)" @@ -882,6 +930,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "解密失敗。你可能沒有解密的密碼匙。" +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "該操作已取消" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "無效的到期日" @@ -899,46 +952,142 @@ msgid "Expiry: %s" msgstr "到期日: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "多個密碼匙" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "密碼匙資料" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "防護的 PGP 密碼匙" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP 密碼匙" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP 密碼匙" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "用作加密郵件及檔案" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "無法產生 PGP 密碼匙" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "PGP 密碼匙的密語" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "輸入新密碼匙的密語兩次。" -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"當建立密碼匙時我們需要產生大量\n" +"的亂數資料，而且需要你的協助。\n" +"要產生這些資料，你不妨在鍵盤\n" +"打字、移動滑鼠、使用應用程式等。\n" +"這樣就會讓系統取得所需亂數資料。" + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "正在產生密碼匙" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "確定要永久地刪除 %s？" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "你確定要永久刪除 %d 個密碼匙？" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "錯誤的密碼" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "這是你第三次輸入錯誤的密碼。請再試一次。" +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "密語錯誤。" + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "輸入‘%s’的新密語" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "輸入‘%s’的密語" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "輸入新的密語" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "輸入密語" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "密語" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "已載入 %d 個密碼匙" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "無效的密碼匙資料（遺漏了 UID）。這可能是電腦的時間不準確，設為未來的時間；或是遺漏了自身的簽署。" + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG 密碼匙" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG：預設的密碼匙圈目錄" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -971,27 +1120,31 @@ msgid "All JPEG files" msgstr "所有 JPEG 檔案" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "所有檔案" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "選擇加入至密碼匙的照片" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "無法準備相片" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "無法加入相片" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "檔案無法載入。可能無效的格式" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "確定要將目前的門口照片永遠地刪除‘%s’的使用者 ID？" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "無法刪除相片" @@ -1047,7 +1200,11 @@ msgid "Couldn't add revoker" msgstr "無法加入撤銷者" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "我知道這個私人密碼匙會被永久刪除。" + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1062,563 +1219,617 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "沒有密碼匙能用作簽署" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "你沒有個人 PGP 密碼匙可以代表你信任此密碼匙。" -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "密語錯誤。" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "輸入‘%s’的新密語" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "搜尋範圍過寬。伺服器“%s”中找到太多密碼匙。" -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "輸入‘%s’的密語" +msgid "Couldn't communicate with server '%s': %s" +msgstr "無法與伺服器‘%s’聯絡：%s" -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "輸入新的密語" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP 密碼匙伺服器" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "輸入密語" +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "無法匯入密碼匙" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "從密碼匙伺服器匯入密碼匙" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "遠端(_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "關閉本視窗" + +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "尋找遠端密碼匙(_F)…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "在密碼匙伺服器尋找密碼匙" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "匯入(_I)" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "匯入已選的密碼匙到本機密碼匙圈" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "遠端密碼匙" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "已載入 %d 個密碼匙" -msgstr[1] "已載入 %d 個密碼匙" +msgid "Remote Keys Containing '%s'" +msgstr "遠端密碼匙包含‘%s’" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "搜尋密碼匙失敗。" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "尋找遠端密碼匙" + +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." -msgstr "無效的密碼匙資料（遺漏了 UID）。這可能是電腦的時間不準確，設為未來的時間；或是遺漏了自身的簽署。" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "這樣會在互聯網上尋找給別人的密碼匙。然後這些密碼匙能匯入到你的本地密碼匙圈中。" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "搜尋密碼匙包含(_S):" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP 密碼匙伺服器" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "密碼匙伺服器：" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "附近的共享密碼匙：" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "搜尋的地方：" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "搜尋(_S)" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "無法發行密碼匙到伺服器" + +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "搜尋範圍過寬。伺服器“%s”中找到太多密碼匙。" +msgid "Couldn't retrieve keys from server: %s" +msgstr "無法從伺服器中取得密碼匙：%s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "無法與伺服器‘%s’聯絡：%s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "選擇了 %d 個密碼匙來進行同步" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "密碼匙正在同步…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "密碼匙同步" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "這會發行你的密碼匙到密碼匙伺服器，給其他人能使用。同樣你他們給你的密碼匙若有任何改變時，你也可以取得。" + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "這樣他們給你的密碼匙若有任何改變時，你也可以取得。沒有選取密碼匙伺服器作發行，所以其它人不會有你的密碼匙。" + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "密碼匙伺服器(_K)" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "同步(_S)" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "無法與‘%s’溝通：%s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "連接到：%s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "無法解析位置：%s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "正在解析伺服器位址：%s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP 密碼匙伺服器" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "簽署密碼匙(_S)…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "簽署公開密碼匙" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "確定要永久地刪除 %s？" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "確定要將 %d 個密碼匙與身分識別永久地刪除嗎？" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "你確定要永久刪除 %d 個密碼匙？" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "同步及發行密碼匙(_S)…" -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "你確定要永久刪除 %d 個身分識別？" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "在線時發行及/或將密碼匙同步" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "無法刪除使用者 ID" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP 密碼匙" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "無法刪除私密密碼匙" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "無法刪除公開密碼匙" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "用來加密郵件或檔案的 PGP 密碼匙" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "進階密碼匙選項(_A)" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "建立(_R)" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "PGP 密碼匙允許你將給別人的電郵及檔案加密。" +msgid "Generate a new key" +msgstr "產生新的密碼匙" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "演算法這裏" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "PGP 密碼匙允許你將給別人的電郵及檔案加密。" -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "建立(_R)" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "附註(_C):" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "有效日期(_X):" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "永不過期(_V)" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "加密類型(_T):" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "產生新的密碼匙" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "密碼匙強度[位元](_S):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "永不過期(_V)" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "新增 PGP 密碼匙" +msgid "E_xpiration Date:" +msgstr "有效日期(_X):" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "附註(_C):" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "進階密碼匙選項(_A)" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "已過期" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "個人 PGP 密碼匙" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP 密碼匙" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "無法更改主要的使用者 ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "確定要永久地刪除‘%s’的使用者 ID？" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "無法刪除使用者 ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[不詳]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "名稱/電郵" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "簽署 ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "無法更改主要的相片" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "（不明）" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "此密碼匙的過期於：%s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "名稱" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "確定要永久地刪除 %2$s 的子鑰 %1$d？" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "無法刪除子鑰" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "無法更改信任度" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "無法匯出密碼匙至“%s”" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "匯出整個密碼匙" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "無法匯出密碼匙。" +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "無法匯出密碼匙" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "永不" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "類型" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "建立日期" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "有效日期" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "狀態" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "強度" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "已過期" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "良好" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "密碼匙 ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "動作" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "附註：" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "日期" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "電郵：" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "指紋" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "密碼匙 ID：" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "永不" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "密碼匙名稱及簽署" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "此密碼匙已被撤銷" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "相片" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "密碼匙的擁有者已將密碼匙撤銷。它不能繼續使用。" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "技術資料" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "此密碼匙的已經過期" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "此密碼匙已被撤銷" +msgid "Add a photo to this key" +msgstr "加入照片至本密碼匙" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "此密碼匙的已經過期" +msgid "Remove this photo from this key" +msgstr "將此相片從本密碼匙中移除" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "類型:" +msgid "Make this photo the primary photo" +msgstr "使本相片成為主要的相片" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "用作：" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "回上一幅相片" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "子鑰(_S)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "往下一幅相片" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "加入" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "相片" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "加入照片至本密碼匙" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "密碼匙 ID：" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "更改密語(_P)" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "名稱：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "將傳給你的檔案及電郵解密。" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "電郵：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "刪除" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "附註：" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "有效日期" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "用作：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "有效日期：" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "類型:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "匯出" +msgid "Decrypt files and email sent to you." +msgstr "將傳給你的檔案及電郵解密。" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "私人 PGP 密碼匙" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "往下一幅相片" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "更改密語(_P)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "回上一幅相片" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "擁有者" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "密碼匙 ID：" +msgid "Key Names and Signatures" +msgstr "密碼匙名稱及簽署" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "主要" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "使本相片成為主要的相片" +msgid "Sign" +msgstr "簽署" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "名稱及簽署" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "刪除" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "永不" +msgid "_Add Name" +msgstr "加入名稱(_A)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "取締擁有者的信任度(_T):" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "擁有者" +msgid "Revoke" +msgstr "撤銷" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "主要" +msgid "Names and Signatures" +msgstr "名稱及簽署" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "私人 PGP 密碼匙" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "密碼匙 ID：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "將此相片從本密碼匙中移除" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "撤銷" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "強度：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "簽署" +msgid "Technical Details" +msgstr "技術資料" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "強度：" +msgid "Fingerprint" +msgstr "指紋" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "密碼匙的擁有者已將密碼匙撤銷。它不能繼續使用。" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "有效日期：" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "加入名稱(_A)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "日期" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "取締擁有者的信任度(_T):" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "匯出整個密碼匙(_E):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "名稱：" +msgid "Actions" +msgstr "動作" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "日期：" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "加入" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "有效日期" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "子鑰(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "勉強的" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "指紋：" +msgid "Fully" +msgstr "完全的" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "信任度：" +msgid "Ultimately" +msgstr "徹底的" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "你信任此密碼匙" +msgid "Encrypt files and email to the key's owner" +msgstr "加密給密碼匙擁有者的檔案及電郵" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "公共 PGP 密碼匙" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "其它名稱：(_O)" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "誰簽署此密碼匙(_P):" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "加密給密碼匙擁有者的檔案及電郵" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "你信任此密碼匙" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "完全的" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "你的信任度是在詳細資料中自行設定。" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "我信任來自「%s」其它密碼匙的簽署。" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "如果你信任擁有這個密碼匙的人是「%s」，簽署此密碼匙：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "簽署此密碼匙(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "如果你不再信任此「%s」擁有這個密碼匙，撤銷你的簽署：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "勉強的" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "公共 PGP 密碼匙" +msgid "_Revoke Signature" +msgstr "撤銷簽署(_R):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "誰簽署此密碼匙(_P):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "只顯示我信任的人的簽署(_O)" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "信任" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "徹底的" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "你信任擁有者(_T)" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "你的信任度是在詳細資料中自行設定。" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "指紋：" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "只顯示我信任的人的簽署(_O)" +msgid "Dates:" +msgstr "日期：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "撤銷簽署(_R):" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "信任度：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "簽署此密碼匙(_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "你信任擁有者(_T)" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1626,2187 +1837,707 @@ msgstr "%2$s 的子鑰 %1$d" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "撤銷的描述（非必要）" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "撤銷(_V)" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "撤銷密碼匙的原因" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "原因(_R):" -#: ../pgp/seahorse-signer.c:62 -msgid "" -"You have no personal PGP keys that can be used to sign a document or message." -msgstr "你沒有 PGP 密碼匙可用作簽署文件或訊息。" - -#: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "你要多小心地驗證本密碼匙？" - -#: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "其他人如何看到此簽署：" +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "撤銷的描述（非必要）" -#: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "用作簽署的密碼匙：" +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "撤銷(_V)" -#: ../pgp/seahorse-sign.xml.h:4 +#: ../pgp/seahorse-signer.c:63 msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "隨意：代表你隨意地檢驗過密碼匙是由聲稱擁有它的人擁有。例如，你可以透過電話要求該人讀出密碼匙的數碼指紋。" - -#: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "密碼匙名稱" - -#: ../pgp/seahorse-sign.xml.h:6 -msgid "" -"Not at all: means you believe the key is owned by the person who " -"claims to own it, but you could not or did not verify this to be a fact." -msgstr "沒關係：代表你信任密碼匙是由聲稱擁有它的人所擁有，但實際上你不能或是沒有檢查它。" - -#: ../pgp/seahorse-sign.xml.h:7 -msgid "" -"Very Carefully: Select this only if you are absolutely sure that this " -"key is genuine." -msgstr "非常小心：只有你在完全信任此密碼匙為真時才選取此項。" - -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "簽署代表你信任本密碼匙是屬於：" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "我可以在稍後時間撤銷此簽署(_R)" - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "簽署密碼匙" - -#: ../pgp/seahorse-sign.xml.h:11 -msgid "" -"You could use a hard to forge photo identification (such as a passport) to " -"personally check that the name on the key is correct. You should have also " -"used email to check that the email address belongs to the owner." -msgstr "你可以使用難以偽造的相片（像護照一樣）來辨認密碼匙的名稱是否正確。你同時應以電郵來檢查該電郵是否屬於該人擁有。" - -#: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "隨意(_C)" - -#: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "沒關係(_N)" - -#: ../pgp/seahorse-sign.xml.h:14 -msgid "_Others may not see this signature" -msgstr "其他人可能無法看到此簽署(_O)" - -#: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "簽署(_S)" - -#: ../pgp/seahorse-sign.xml.h:16 -msgid "_Signer:" -msgstr "簽署者(_S)" - -#: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "非常小心(_V)" +"You have no personal PGP keys that can be used to sign a document or message." +msgstr "你沒有 PGP 密碼匙可用作簽署文件或訊息。" #: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "簽署信息的密碼匙(_S):" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "證書" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "無法刪除" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "確定要刪除這個證書「%s」？" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "確定要刪除 %d 個證書？" -msgstr[1] "確定要刪除 %d 個證書？" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "刪除" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "更改密語" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "確認密語(_F):" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "確認新的密語" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "新的密語(_P):" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "管理密碼及密碼匙" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "密碼及加密密碼匙" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "選取想要建立的項目類型(_S):" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "繼續(_O)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "建立新的…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "已選取 %d 個密碼匙" -msgstr[1] "已選取 %d 個密碼匙" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "無法匯入密碼匙" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "匯入的密碼匙" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "正在匯入密碼匙" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "匯入密碼匙" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "無法辨別的密碼匙類型，或是無效的資料格式" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "匯入密碼匙" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "遠端(_R)" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "關閉本程式" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "新增(_N)…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "建立新的密碼匙或項目" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "匯入(_I)…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "由檔案匯入" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "從剪貼簿匯入" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "尋找遠端密碼匙(_F)…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "在密碼匙伺服器尋找密碼匙" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "同步及發行密碼匙(_S)…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "在線時發行及/或將密碼匙同步" - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "類型(_Y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "顯示類型欄位" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "有效日期(_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "顯示有效日期欄位" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "信任(_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "顯示信任欄位" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "有效性(_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "顯示有效性欄位" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "過濾條件:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "第一次執行選項：" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "產生你的密碼匙：" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "從檔案中匯入已存的密碼匙" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "我的個人密碼匙(_P)" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "其他密碼匙(_K)" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "開始加密前你需要擁有密碼匙。" - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "匯入(_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "密碼(_P)" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "無法匯出金錀" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "有效性" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "有效日期" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "關閉本視窗" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "全部展開(_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "展開整個清單" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "全部收起(_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "收起整個清單" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "遠端密碼匙" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "遠端密碼匙包含‘%s’" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "密碼匙伺服器：" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "附近的共享密碼匙：" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "尋找遠端密碼匙" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "這樣會在互聯網上尋找給別人的密碼匙。然後這些密碼匙能匯入到你的本地密碼匙圈中。" - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "搜尋的地方：" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "搜尋(_S)" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "搜尋密碼匙包含(_S):" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "無法發行密碼匙到伺服器" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "無法從伺服器中取得密碼匙：%s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "選擇了 %d 個密碼匙來進行同步" -msgstr[1] "選擇了 %d 個密碼匙來進行同步" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "密碼匙正在同步…" - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "密碼匙同步" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "這會發行你的密碼匙到密碼匙伺服器，給其他人能使用。同樣你他們給你的密碼匙若有任何改變時，你也可以取得。" - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "這樣他們給你的密碼匙若有任何改變時，你也可以取得。沒有選取密碼匙伺服器作發行，所以其它人不會有你的密碼匙。" - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "密碼匙伺服器(_K)" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "同步(_S)" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "這個應用程式的版本" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "貢獻者:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"如對翻譯有任何意見，請送一封電子郵件給\n" -"以下地址，GNOME 翻譯隊伍會盡快回覆你：\n" -"zh-l10n@lists.linux.org.tw\n" -"\n" -"Woodman Tuen , 2005-07" - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse 專案網頁" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "檔案(_F)" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "編輯(_E)" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "檢視(_V)" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "求助(_H)" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "偏好設定(_N)" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "更改本程式的偏好設定" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "關於本程式" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "內容(_C)" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "顯示 Seahorse 的說明文件" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "匯出公開密碼匙" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "正在匯出密碼匙" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "無法從密碼匙伺服器中取得資料" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "複製的密碼匙" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "正在取得密碼匙" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s 是一個私密密碼匙。你確定要繼續？" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "從密碼匙伺服器匯入密碼匙" - -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "顯示屬性" - -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "刪除(_D)" - -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "刪除選取的項目" - -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "匯出(_X)…" - -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "匯出為檔案" - -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "複製到剪貼簿" - -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "匯入已選的密碼匙到本機密碼匙圈" - -#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 -msgid "Enter your Secure Shell passphrase:" -msgstr "輸入你的 SSH 密語:" - -#: ../ssh/seahorse-ssh-askpass.c:82 -msgid "Old Key Passphrase" -msgstr "舊密碼匙密語" - -#: ../ssh/seahorse-ssh-askpass.c:83 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "輸入 %s 的舊密語" - -#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 -msgid "New Key Passphrase" -msgstr "新的密碼匙密語" - -#: ../ssh/seahorse-ssh-askpass.c:88 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "輸入 %s 的新密語" - -#: ../ssh/seahorse-ssh-askpass.c:93 -#, c-format -msgid "Enter the new passphrase again: %s" -msgstr "請再次輸入新密語：%s" - -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "正在設定 _SSH 密碼匙…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "將公共 SSH 密碼匙傳送給其它電腦，及能使用該密碼匙登入。" - -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "確定要刪除 SSH 金錀「%s」？" - -#: ../ssh/seahorse-ssh-commands.c:121 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "確定要刪除 %d 個 SSH 密碼匙？" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "無法刪除密碼匙" - -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "SSH 密碼匙" - -#: ../ssh/seahorse-ssh-generate.c:61 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "用作存取其它電腦（如終端機）" - -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 -msgid "Couldn't generate Secure Shell key" -msgstr "無法產生 SSH 密碼匙" - -#: ../ssh/seahorse-ssh-generate.c:197 -msgid "Creating Secure Shell Key" -msgstr "正在產生 SSH 密碼匙" - -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "以你的電郵，及其他提示這密碼匙要來作甚麼。" - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "SSH (Secure Shell) 密碼匙能安全地連接使用 SSH 的電腦，而無需逐一輸入不同的密碼。" - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "如果已有一臺電腦你想使用本密碼匙。現在可以設定電腦認識你的密碼匙。" - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "新增 SSH 密碼匙" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "建立及設定(_C)" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "只是建立密碼匙(_J)" - -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "密碼匙描述(_K):" - -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "（不能讀取的 SSH 密碼匙）" - -#: ../ssh/seahorse-ssh-key-properties.c:79 -msgid "Couldn't rename key." -msgstr "密碼匙無法重新命名。" - -#: ../ssh/seahorse-ssh-key-properties.c:132 -msgid "Couldn't change authorization for key." -msgstr "無法更改密碼匙的認證。" - -#: ../ssh/seahorse-ssh-key-properties.c:167 -msgid "Couldn't change passphrase for key." -msgstr "無法更改密碼匙的密語。" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "演算法：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "識別碼：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "位置:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "名稱:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "強度：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "信任" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "只會套用在‘%s’帳戶。" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "匯出整個密碼匙(_X)" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "此密碼匙的擁有者被授權連接本電腦(_A)" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "用作連接其它電腦。" - -#: ../ssh/seahorse-ssh-operation.c:198 -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH 指令在無法預期下中止。" - -#: ../ssh/seahorse-ssh-operation.c:208 -msgid "The SSH command failed." -msgstr "SSH 指令失敗。" - -#: ../ssh/seahorse-ssh-operation.c:518 -msgid "Remote Host Password" -msgstr "遠端主機密碼 " - -#: ../ssh/seahorse-ssh-operation.c:634 -msgid "Enter Key Passphrase" -msgstr "輸入密碼匙密語" - -#: ../ssh/seahorse-ssh-operation.c:724 -msgid "Passphrase for New Secure Shell Key" -msgstr "新的 SSH 密碼匙的密語" - -#: ../ssh/seahorse-ssh-operation.c:908 -#, c-format -msgid "Importing key: %s" -msgstr "匯入密碼匙：%s" - -#: ../ssh/seahorse-ssh-operation.c:910 -msgid "Importing key. Enter passphrase" -msgstr "正在匯入密碼匙，請輸入密語" - -#: ../ssh/seahorse-ssh-source.c:951 -msgid "No private key file is available for this key." -msgstr "這個密碼匙沒有可用的私密密碼匙。" - -#: ../ssh/seahorse-ssh-upload.c:50 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "在遠端電腦無法設定 SSH 密碼匙" - -#: ../ssh/seahorse-ssh-upload.c:133 -msgid "Configuring Secure Shell Keys..." -msgstr "正在設定 SSH 密碼匙" - -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "例如：fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "設定電腦的 SSH 連線" - -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "要在其他的電腦使用你的 SSH 密碼匙，你需要有該電腦的登入帳號。" - -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "電腦名稱(_C):" - -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "登入名稱(_L):" - -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "設定(_S)" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Secure Shell key" -#~ msgstr "SSH 金鑰" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "輸入新的 SSH 金鑰的密語。" - -#~ msgid "Web Password" -#~ msgstr "網頁密碼" - -#~ msgid "Network Password" -#~ msgstr "網路密碼" - -#~ msgid "Deleting items" -#~ msgstr "刪除項目" - -#~ msgid "Deleting keyrings" -#~ msgstr "刪除鑰匙圈" - -#~ msgid "Symmetric Key" -#~ msgstr "對稱式金鑰" - -#~ msgid "Public Key" -#~ msgstr "公開金鑰" - -#~ msgid "Private Key" -#~ msgstr "私密金鑰" - -#~ msgid "Credentials" -#~ msgstr "憑證" - -#~ msgid "Identity" -#~ msgstr "身分" - -#~ msgid "Encryption Key Manager" -#~ msgstr "金鑰管理員" - -#~ msgid "Invalid" -#~ msgstr "無效" - -#~ msgid "Private Secure Shell Key" -#~ msgstr "私人 SSH 金鑰" - -#~ msgid "Public Secure Shell Key" -#~ msgstr "公共 SSH 金鑰" - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "不以伺服程式形式執行 seahorse-daemon" - -#~ msgid "couldn't fork process" -#~ msgstr "無法建立子程序" - -#~ msgid "couldn't create new process group" -#~ msgstr "無法建立新的程序群組" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "加密伺服程式 (Seahorse)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "無效或無法確認的金鑰類型：%s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "這個金鑰類型是不支援的：%s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "編譯時沒有啟用對這個功能的支援" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "無效或無法碓認的金鑰：%s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "由 簽署，於 %s 過期。" - -#~ msgid "Invalid Signature" -#~ msgstr "無效的簽章" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "由 於 %s 簽署，已過期。" - -#~ msgid "Expired Signature" -#~ msgstr "已過期的簽章" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "由 簽署，於 %s 撤銷。" - -#~ msgid "Revoked Signature" -#~ msgstr "簽章已撤銷" - -#~ msgid "Signed by on %s." -#~ msgstr "由 於 %s 簽署。" - -#~ msgid "Good Signature" -#~ msgstr "完好的簽章" - -#~ msgid "Signing key not in keyring." -#~ msgstr "簽署金鑰並非在鑰匙圈內。" - -#~ msgid "Unknown Signature" -#~ msgstr "不明的簽章" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "損壞或是偽造的簽章。簽章資料已被修改。" - -#~ msgid "Bad Signature" -#~ msgstr "損壞的簽章" - -#~ msgid "Couldn't verify signature." -#~ msgstr "無法驗證簽章。" - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "無效或無法辨認的簽章者：%s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "金鑰不能有效地作為簽署使用：%s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "無效或無法辨認的收件人：%s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "金鑰不是一個有效的收件人作加密：%s" - -#~ msgid "No recipients specified" -#~ msgstr "沒有指定收件人" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "解密的金鑰類型無效：%s" - -#~ msgid "Please set clearuri" -#~ msgstr "請設定 clearui" - -#~ msgid "Please set crypturi" -#~ msgstr "請設定 cryptui" - -#~ msgid "Error opening clearuri" -#~ msgstr "開啟 clearui 時發生錯誤" - -#~ msgid "No signer specified" -#~ msgstr "沒有指定簽章者" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "驗證 %s 的金鑰類型無效" - -#~ msgid "Invalid key id: %s" -#~ msgstr "無效的金鑰 id：%s" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "尋找遠端 PGP 金鑰的金鑰伺服器的 URL 清單。在晚一點的版本可包括顯示名稱，以" -#~ "加入空格及名稱。" - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "自動取得金鑰" - -#~ msgid "Auto Sync Keys" -#~ msgstr "金鑰自動同步" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "控制金鑰管理員的有效日期欄位的可示性。" - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "控制金鑰管理員的信任欄位的可示性。" - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "控制金鑰管理員的類型欄位的可示性。" - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "控制金鑰管理員的有效性欄位的可示性。" - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "啟用 DNS-SD 共享" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "啟用 DNS-SD (Apple Bonjour) 金鑰共享，必須運行 seahorse-daemon 及加入 " -#~ "HKP 及 DNS-SD 支援。" - -#~ msgid "ID of the default key" -#~ msgstr "預設金鑰的 ID" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "如設定為‘true’，使用 seahorse 加密的檔案會是以 ASCII 封裝編碼。" - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "如設定為‘true’，預設金鑰總是會加入加密收件人清單。" - -#~ msgid "Last key server search pattern" -#~ msgstr "上次在金鑰伺服器的搜尋式樣" - -#~ msgid "Last key servers used" -#~ msgstr "上次使用的金鑰伺服器" - -#~ msgid "Last key used to sign a message." -#~ msgstr "上次用作簽署的金鑰" - -#~ msgid "PGP Key servers" -#~ msgstr "PGP 金鑰伺服器" - -#~ msgid "Publish keys to this key server." -#~ msgstr "發行金鑰到此金鑰伺服器。" - -#~ msgid "Show expires column in key manager" -#~ msgstr "在金鑰管理員中顯示有效日期的欄位" - -#~ msgid "Show trust column in key manager" -#~ msgstr "在金鑰管理員中顯示信任的欄位" - -#~ msgid "Show type column in key manager" -#~ msgstr "在金鑰管理員中顯示類型的欄位" - -#~ msgid "Show validity column in key manager" -#~ msgstr "在金鑰管理員中顯示有效性的欄位" - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "指定收件人視窗的欄位的排序方式：‘name’及‘id’。在欄位名稱前加上‘-’以反向排" -#~ "序。" - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "指定 seahorse 金鑰管理程式主視窗欄位的排序方" -#~ "式：‘name’，‘id’，‘validity’，‘expires’，‘trust’及‘type’。在欄位名稱前加" -#~ "上‘-’以反向排序。" - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "上次用作簽署信息的私鑰 ID。" - -#~ msgid "The column to sort the recipients by" -#~ msgstr "seahorse 收件人欄位的排序形式" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "seahorse 金鑰欄位的排序形式" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "PGP 金鑰發行到的金鑰伺服器。或使留空白來禁止發行 PGP 金鑰" - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "上次搜尋的金鑰伺服器。或其留空給所有伺服器。" - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "上次在金鑰伺服器的搜尋樣式。" - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "這指定在某些動作中使用的預設金鑰，主要為簽署時使用。" - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "是否自動從金鑰伺服器取得金鑰。" - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "已修改的金鑰應否自動與預設的金鑰伺服器同步。" - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "是否總是以預設金鑰來加密" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "是否使用 ASCII 封裝" - -#~ msgid "Couldn't set application access." -#~ msgstr "無法設定應用程式的存取。" - -#~ msgid "Path:" -#~ msgstr "路徑:" - -#~ msgid "Permissions:" -#~ msgstr "權限:" - -#~ msgid "Applications" -#~ msgstr "應用程式" - -#~ msgid "_Read" -#~ msgstr "讀取(_R)" - -#~ msgid "_Write" -#~ msgstr "寫入(_W)" - -#~ msgctxt "infinitive" -#~ msgid "_Delete" -#~ msgstr "刪除(_D)" - -#~ msgid "Saving item..." -#~ msgstr "正在儲存項目…" - -#~ msgid "Listing password keyrings" -#~ msgstr "正在列出密碼鑰匙圈 " - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "在進行您所要求的操作時找不到加密金鑰。現在會啟動 密碼與加密金鑰 程" -#~ "式讓您建立或匯入一個金鑰。" - -#~ msgid "All Keys" -#~ msgstr "所有金鑰" - -#~ msgid "Selected Recipients" -#~ msgstr "已選取收件人" - -#~ msgid "Search Results" -#~ msgstr "搜尋結果" - -#~ msgid "Search _for:" -#~ msgstr "搜尋(_F):" - -#~ msgid "None (Don't Sign)" -#~ msgstr "沒有（不要簽署）" - -#~ msgid "Sign this message as %s" -#~ msgstr "以 %s 簽署這個郵件" - -#~ msgid "_Sign message as:" -#~ msgstr "簽署訊息的金鑰(_S):" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "檔案不是有效的 .desktop 檔案" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "無法辨識的桌面檔案版本「%s」" - -#~ msgid "Starting %s" -#~ msgstr "準備啟動 %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "應用程式不接受以命令列開啟文件" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "無法辨識的啟動選項：%d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "不能傳送文件 URI 至「Type=Link」桌面項目" - -#~ msgid "Not a launchable item" -#~ msgstr "不是可以啟動的項目" - -#~ msgid "Disable connection to session manager" -#~ msgstr "停用到作業階段管理程式的連線" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "指定含有已儲存組態的檔案" - -#~ msgid "FILE" -#~ msgstr "檔案" - -#~ msgid "Specify session management ID" -#~ msgstr "指定作業階段管理 ID" - -#~ msgid "Session management options:" -#~ msgstr "作業階段管理選項:" - -#~ msgid "Show session management options" -#~ msgstr "顯示作業階段管理選項" - -#~ msgid "Key Imported" -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "金鑰已匯入" -#~ msgstr[1] "金鑰已匯入" - -#~ msgid "Imported %i key" -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "已匯入 %i 個金鑰" -#~ msgstr[1] "已匯入 %i 個金鑰" - -#~ msgid "Imported a key for" -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "匯入此金鑰" -#~ msgstr[1] "匯入此金鑰" - -#~ msgid "Notification Messages" -#~ msgstr "通知訊息" - -#~ msgid "Progress Title" -#~ msgstr "進度標題" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "無法執行 fille-roller" - -#~ msgid "Couldn't package files" -#~ msgstr "檔案無法封裝" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "file-roller 程序無法完成" - -#~ msgid "Loading Keys..." -#~ msgstr "正在載入金鑰…" - -#~ msgid "Searching for keys..." -#~ msgstr "正在搜尋金鑰…" - -#~ msgid "Uploading keys..." -#~ msgstr "正在上傳金鑰…" - -#~ msgid "Retrieving keys..." -#~ msgstr "正在取得金鑰…" - -#~ msgid "Searching for keys on: %s" -#~ msgstr "搜尋在 %s 的金鑰" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "正在搜尋含有‘%s’的金鑰…" - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "正在搜尋 id 為‘%s’的金鑰…" - -#~ msgid "Retrieving remote keys..." -#~ msgstr "正在取得遠端金鑰…" - -#~ msgid "Sending keys to key server..." -#~ msgstr "正在傳送金鑰到金鑰伺服器" - -#~ msgid "Synchronizing keys" -#~ msgstr "金鑰正在同步…" - -#~ msgid "Passphrase:" -#~ msgstr "密語：" - -#~ msgid "Couldn't share keys" -#~ msgstr "無法共享金鑰" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "無法在網路上發行尋找資訊。" - -#~ msgid "%s's encryption keys" -#~ msgstr "%s 的密鑰" - -#~ msgid "Key Sharing" -#~ msgstr "金鑰共享" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "共享金鑰允許其他人使用您搜集的金鑰。這代表他們加密東西給您，或是您認識的，" -#~ "而無需您的將金鑰傳給他們。\n" -#~ "\n" -#~ "注意：您的金鑰不會受損害。" - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "在我的網路中共享我的金鑰(_S)" - -#~ msgid "Seahorse Daemon" -#~ msgstr "Seahorse 伺服程式" - -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "選擇了 X 個金鑰來進行同步" - -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "一或多個刪除的金鑰為私密金鑰。您確定要繼續執行？" - -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" - -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" - -#~ msgid "Create a PGP Key" -#~ msgstr "建立 PGP 金鑰" - -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginal\n" -#~ "Full\n" -#~ "Ultimate" -#~ msgstr "" -#~ "不詳\n" -#~ "永不\n" -#~ "勉強\n" -#~ "完全\n" -#~ "徹底" - -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginally\n" -#~ "Fully\n" -#~ "Ultimately" -#~ msgstr "" -#~ "不詳\n" -#~ "永不\n" -#~ "勉強地\n" -#~ "完全地\n" -#~ "徹底地" - -#~ msgid "Other _Collected Keys" -#~ msgstr "其它搜集的金鑰" - -#~ msgid "_Trusted Keys" -#~ msgstr "信任的金鑰(_T)" - -#~ msgid "_About" -#~ msgstr "關於(_A)" - -#~ msgid "P_roperties" -#~ msgstr "屬性(_R)" - -#~ msgid "_Copy" -#~ msgstr "複製(_C)" - -#~ msgid "Removing item" -#~ msgstr "正在移除項目" - -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "當使用者登入時自動解鎖。" - -#~ msgid "Couldn't get default password keyring" -#~ msgstr "無法取得預設的密碼鑰匙圈" - -#~ msgid "Couldn't get list of password keyrings" -#~ msgstr "無法取得密碼鑰匙圈的清單" - -#~ msgid "Couldn't remove keyring" -#~ msgstr "無法移除金鑰" - -#~ msgid "Are you sure you want to permanently delete the '%s' keyring?" -#~ msgstr "確定要永久地刪除‘%s’鑰匙圈？" - -#~ msgid "Default Keyring" -#~ msgstr "預設鑰匙圈" - -#~ msgid "Password Keyrings" -#~ msgstr "密碼鑰匙圈" - -#~ msgid "Password and Encryption Settings" -#~ msgstr "密碼及加密設定值" - -#~ msgid "_Add Keyring" -#~ msgstr "加入鑰匙圈(_A)" - -#~ msgid "_Remove Keyring" -#~ msgstr "移除鑰圈(_R)" - -#~ msgid "Unknown Key: %s" -#~ msgstr "不明的金鑰：%s" - -#~ msgid "Unknown Key" -#~ msgstr "不明的金鑰" - -#~ msgid "Unavailable Key" -#~ msgstr "不存在的金鑰" - -#~ msgid "X509 Certificate" -#~ msgstr "X509 憑證" - -#~ msgid "Loading..." -#~ msgstr "載入中…" - -#~ msgid "Invalid or unrecognized object." -#~ msgstr "無效或無法碓認的物件。" - -#~ msgid "Exporting is not yet supported." -#~ msgstr "匯出功能尚未支援。" - -#~ msgid "Expiry for Subkey %d of %s" -#~ msgstr "%2$s %1$d 個子金鑰的有效日期" - -#~ msgid "_Quit" -#~ msgstr "結束(_Q)" - -#~ msgid "Create a new personal key" -#~ msgstr "建立新的個人金鑰" - -#~ msgid "Import keys into your key ring from a file" -#~ msgstr "從檔案將金鑰匯入鑰匙圈" - -#~ msgid "_Close" -#~ msgstr "關閉(_C)" - -#~ msgid "Secure Shell Passphrase" -#~ msgstr "SSH 密語" - -#~ msgid "Secure Shell Key Passphrase" -#~ msgstr "SSH 金鑰密語" - -#~ msgid "Enter the passphrase for: %s" -#~ msgstr "輸入 %s 的密語" - -#~ msgid "Save this passphrase in my keyring" -#~ msgstr "在鑰匙圈中儲存此密語" - -#~ msgid "_Key" -#~ msgstr "金鑰(_K)" - -#~ msgid "E_xport Public Key..." -#~ msgstr "匯出公鑰(_X)…" - -#~ msgid "_Copy Public Key" -#~ msgstr "複製公鑰(_C)" - -#~ msgid "Copy public part of selected keys to the clipboard" -#~ msgstr "將已選金鑰的公共部份複製到剪貼薄" - -#~ msgid "_Delete Key" -#~ msgstr "刪除金鑰(_D)" - -#~ msgid "Please enter a passphrase to use." -#~ msgstr "請輸入密語來使用。" - -#~ msgid "Unparseable Key ID" -#~ msgstr "無法分析的金鑰 ID" - -#~ msgid "Unknown/Invalid Key" -#~ msgstr "不明/無效的金鑰" - -#~ msgid "PGP Key: %s" -#~ msgstr "PGP 金鑰：%s" - -#~ msgid "" -#~ "Warning: Your system is not configured to cache passphrases in " -#~ "secure memory." -#~ msgstr "警告：您的系統沒有設定在安全的記憶體下使用密語快取。" - -#~ msgid "Cache _Preferences" -#~ msgstr "快取偏好設定(_P)" - -#~ msgid "Cached Encryption Keys" -#~ msgstr "已使用快取的加密金鑰" - -#~ msgid "Change passphrase cache settings." -#~ msgstr "更改密語快取設定。" - -#~ msgid "Clear passphrase cache" -#~ msgstr "清除密語快取" - -#~ msgid "_Clear Cache" -#~ msgstr "清除快取(_C)" - -#~ msgid "_Show Window" -#~ msgstr "顯示視窗(_S)" - -#~ msgid "Do not daemonize seahorse-agent" -#~ msgstr "不以服務程式形式執行 seahorse-agent" - -#~ msgid "Print variables in for a C type shell" -#~ msgstr "以 C shell 形式列印變數" - -#~ msgid "Display environment variables (the default)" -#~ msgstr "顯示環境變數 (預設值)" - -#~ msgid "Allow GPG agent request from any display" -#~ msgstr "允許來自任何畫面的 GPG 代理的要求" - -#~ msgid "command..." -#~ msgstr "指令…" - -#~ msgid "Encryption Key Agent (Seahorse)" -#~ msgstr "金鑰代理程式 (Seahorse)" - -#~ msgid "no command specified to execute" -#~ msgstr "沒有指定執行的指令" - -#~ msgid "Authorize Passphrase Access" -#~ msgstr "授權密語存取" - -#~ msgid "The passphrase is cached in memory." -#~ msgstr "密語在記憶體進行快取。" - -#~ msgid "Always ask me before using a cached passphrase" -#~ msgstr "在使用密語快取前先總是詢問" - -#~ msgid "_Authorize" -#~ msgstr "認證(_A)" - -#~ msgid "Key Name" -#~ msgstr "金鑰名稱" - -#~ msgid "" -#~ "After performing an decrypt or verify operation from the applet, display " -#~ "the resulting text in a window." -#~ msgstr "在面板程式進行解密或檢驗後，在視窗中顯示結果。" - -#~ msgid "" -#~ "After performing an encrypt or signing operation from the applet, display " -#~ "the resulting text in a window." -#~ msgstr "在面板程式進行加密或簽署後，在視窗中顯示結果。" - -#~ msgid "Display cache reminder in the notification area" -#~ msgstr "在面板通知區中顯示快取提示" - -#~ msgid "Display clipboard after decrypting" -#~ msgstr "解密後顯示剪貼簿" - -#~ msgid "Display clipboard after encrypting" -#~ msgstr "加密後顯示剪貼簿" - -#~ msgid "Expire passwords in the cache" -#~ msgstr "密碼在快取中過期" - -#~ msgid "" -#~ "If set to 'gnome' uses gnome-keyring to cache passwords. When set to " -#~ "'internal' uses internal cache." -#~ msgstr "" -#~ "如設定為‘gnome’，使用 gnome-keyring 進行密碼快取。設定為‘internal’，則使用" -#~ "內部快取。" - -#~ msgid "Prompt before using GPG passwords in cache" -#~ msgstr "在快取中使用 GPG 密碼前詢問" - -#~ msgid "" -#~ "Reflect the contents of the clipboard (whether encrypted, signed, etc...) " -#~ "in the panel applet icon." -#~ msgstr "在面版程式的圖示中反映剪貼簿的內容（是加密，簽署等…）" - -#~ msgid "" -#~ "Set to 'true' to enable display of the cache reminder in the notification " -#~ "area of your panel." -#~ msgstr "設定為‘true’則會在面板通知區上顯示快取提示。" - -#~ msgid "" -#~ "Set to 'true' to have seahorse-agent prompt before giving out passwords " -#~ "it has cached." -#~ msgstr "設定為‘true’時 seahorse-agent 在將密碼傳給快取前會提示。" - -#~ msgid "Show clipboard state in panel" -#~ msgstr "在面板中顯示剪貼簿狀態" - -#~ msgid "The time (in minutes) to cache GPG passwords" -#~ msgstr "快取 GPG 密碼的時間（以分鐘計算）" - -#~ msgid "" -#~ "This is the amount of time, specified in minutes, to cache GPG passwords " -#~ "in seahorse-agent." -#~ msgstr "這是時間的總數，以分鐘計算，用作在 seahorse-agent 的GPG 密碼快取。" - -#~ msgid "" -#~ "This option enables the GPG password cache in the seahorse-agent program. " -#~ "The 'use-agent' setting in gpg.conf affects this setting." -#~ msgstr "" -#~ "本選項會允許在 seahorse-agent 進行GPG 密碼快取。在 gpg-conf 中的‘use-" -#~ "agent’設定會影響本設定" - -#~ msgid "" -#~ "When set, seahorse-agent expires GPG passwords in its cache after a " -#~ "period of time." -#~ msgstr "設定後， seahorse 在快取中的 GPG 密碼會在一段間後過期。" - -#~ msgid "Whether the GPG password cache is enabled" -#~ msgstr "是否啟用 GPG 密碼快取" - -#~ msgid "None. Prompt for a key." -#~ msgstr "沒有。詢問使用那個金鑰。" - -#~ msgid "Default Key" -#~ msgstr "預設金鑰" - -#~ msgid "Remember PGP Passphrases" -#~ msgstr "記錄 PGP 密語" - -#~ msgid "A supported PGP passphrase caching agent is not running." -#~ msgstr "支援的 PGP 快取代理程式並未執行。" - -#~ msgid "This key is used to sign messages when no other key is chosen" -#~ msgstr "如沒有選取其它金鑰，則會使用此金鑰來簽署訊息" - -#~ msgid "As_k me before using a cached passphrase" -#~ msgstr "在使用密語快取前先詢問(_K)" - -#~ msgid "Encryption" -#~ msgstr "加密" - -#~ msgid "PGP Passphrases" -#~ msgstr "PGP 密語" - -#~ msgid "Show _icon in status area when passphrases are in memory" -#~ msgstr "當密語存在記憶體時於狀態區顯示圖示(_I)" - -#~ msgid "When _encrypting, always include myself as a recipient" -#~ msgstr "加密時，總是將自己加入為收件人之一(_E)" - -#~ msgid "_Always remember passphrases whenever logged in" -#~ msgstr "每次登入後總是記錄密碼(_A)" - -#~ msgid "_Default key:" -#~ msgstr "預設金鑰(_D):" - -#~ msgid "_Never remember passphrases" -#~ msgstr "永不記錄密語" - -#~ msgid "_Remember passphrases for" -#~ msgstr "密語記錄在(_R)" - -#~ msgid "Couldn't set permissions on backup file." -#~ msgstr "無法設定備份檔的權限。" - -#~ msgid "Clipboard Text Encryption" -#~ msgstr "剪貼簿文字加密" - -#~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." -#~ msgstr "加密，解密或簽署剪貼簿（使用 PGP 形式加密）" - -#~ msgid "Seahorse Applet Factory" -#~ msgstr "Seahorse 面板程式工廠" - -#~ msgid "_Preferences" -#~ msgstr "偏好設定(_P)" - -#~ msgid "seahorse-applet" -#~ msgstr "seahorse-applet" - -#~ msgid "Use PGP/GPG to encrypt/decrypt/sign/verify/import the clipboard." -#~ msgstr "使用 PGP/GPG來加密/解密/簽署/驗證/匯入剪貼簿" - -#~ msgid "Choose Recipient Keys" -#~ msgstr "選擇收件人金鑰" - -#~ msgid "Encrypted Text" -#~ msgstr "已加密文字" - -#~ msgid "Encryption Failed" -#~ msgstr "加密失敗" - -#~ msgid "The clipboard could not be encrypted." -#~ msgstr "剪貼簿無法加密。" - -#~ msgid "Choose Key to Sign with" -#~ msgstr "選取用作簽署的金鑰" - -#~ msgid "Signed Text" -#~ msgstr "已簽署文字" - -#~ msgid "Signing Failed" -#~ msgstr "簽署失敗" - -#~ msgid "The clipboard could not be Signed." -#~ msgstr "剪貼簿無法簽署。" - -#~ msgid "Import Failed" -#~ msgstr "匯入失敗" - -#~ msgid "Keys were found but not imported." -#~ msgstr "找到金鑰但沒有匯入。" - -#~ msgid "Decrypting Failed" -#~ msgstr "解密失敗" - -#~ msgid "Text may be malformed." -#~ msgstr "文字可能已變形。" - -#~ msgid "No PGP key or message was found on clipboard" -#~ msgstr "剪貼簿中沒有 PGP 金鑰或訊息" - -#~ msgid "No PGP data found." -#~ msgstr "找不到 PGP 資料。" - -#~ msgid "Decrypted Text" -#~ msgstr "已解密文字" - -#~ msgid "Could not display the help file" -#~ msgstr "無法顯示說明文件" - -#~ msgid "_Encrypt Clipboard" -#~ msgstr "加密剪貼薄(_E)" - -#~ msgid "_Sign Clipboard" -#~ msgstr "簽署剪貼薄(_S)" - -#~ msgid "_Decrypt/Verify Clipboard" -#~ msgstr "解密/驗證剪貼薄後(_D)" - -#~ msgid "_Import Keys from Clipboard" -#~ msgstr "從剪貼薄匯入金鑰(_I)" - -#~ msgid "Encryption Applet" -#~ msgstr "加密面板程式" - -#~ msgid "Display clipboard contents after:" -#~ msgstr "顯示剪貼簿內容於：" - -#~ msgid "Clipboard Encryption Preferences" -#~ msgstr "剪貼簿加密偏好設定" - -#~ msgid "_Decrypting or verifying the clipboard" -#~ msgstr "解密或驗證剪貼簿(_D)" - -#~ msgid "_Encrypting or signing the clipboard" -#~ msgstr "加密或簽署剪貼簿後(_E)" - -#~ msgid "_Show clipboard state in panel" -#~ msgstr "在面板中顯示剪貼薄狀態(_S)" - -#~ msgid "_Encrypt" -#~ msgstr "加密(_E)" - -#~ msgid "_Decrypt/Verify" -#~ msgstr "解密/驗證(_D)" - -#~ msgid "_Import Key" -#~ msgstr "匯入金鑰(_I)" - -#~ msgid "Couldn't connect to seahorse-daemon" -#~ msgstr "無法連接 seahorse-daemon" - -#~ msgid "Encrypted text" -#~ msgstr "已加密的文字" - -#~ msgid "Couldn't encrypt text" -#~ msgstr "無法將文字加密" - -#~ msgid "Keys found but not imported" -#~ msgstr "找到金鑰但沒有匯入" - -#~ msgid "Couldn't decrypt text" -#~ msgstr "無法將文字解密" - -#~ msgid "Couldn't verify text" -#~ msgstr "無法驗證文字" - -#~ msgid "No encrypted or signed text is selected." -#~ msgstr "沒有選取任何已加密或簽署的文字。" - -#~ msgid "Decrypted text" -#~ msgstr "已解密文字" - -#~ msgid "Verified text" -#~ msgstr "已驗證文字" - -#~ msgid "Imported %d key" -#~ msgid_plural "Imported %d keys" -#~ msgstr[0] "已匯入 %d 個金鑰" -#~ msgstr[1] "已匯入 %d 個金鑰" - -#~ msgid "Signed text" -#~ msgstr "已簽署文字" - -#~ msgid "Couldn't sign text" -#~ msgstr "無法簽署文字" - -#~ msgid "_Encrypt..." -#~ msgstr "加密(_E)…" - -#~ msgid "Encrypt the selected text" -#~ msgstr "將已選的文字加密" - -#~ msgid "Decr_ypt/Verify" -#~ msgstr "解密/驗證(_Y)" - -#~ msgid "Decrypt and/or Verify text" -#~ msgstr "解密及/或驗證文字" - -#~ msgid "Sig_n..." -#~ msgstr "簽署(_N)…" - -#~ msgid "Sign the selected text" -#~ msgstr "簽署已選的文字" - -#~ msgid "Enable the seahorse encryption plugin for gedit." -#~ msgstr "啟用給 gedit 的 seahorse 加密外掛程式。" - -#~ msgid "Enable the seahorse gedit plugin" -#~ msgstr "啟用 seahorse gedit 外掛程式" - -#~ msgid "Text Encryption" -#~ msgstr "文字加密" - -#~ msgid "This plugin performs encryption operations on text." -#~ msgstr "這外掛程式進行文字的加密動作。" - -#~ msgid "Encrypt..." -#~ msgstr "加密…" - -#~ msgid "Encrypt (and optionally sign) the selected file" -#~ msgid_plural "Encrypt the selected files" -#~ msgstr[0] "將已選的檔案加密（及選擇性地簽署）" -#~ msgstr[1] "將已選的壓縮檔加密" - -#~ msgid "Sign the selected file" -#~ msgid_plural "Sign the selected files" -#~ msgstr[0] "簽署已選檔案" -#~ msgstr[1] "簽署已選檔案" - -#~ msgid "For internal use" -#~ msgstr "內部使用" - -#~ msgid "Encryption Preferences" -#~ msgstr "加密偏好設定" - -#~ msgid "Configure key servers and other encryption settings" -#~ msgstr "配置金鑰伺服器及加密設定" - -#~ msgid "Encryption and Keyrings" -#~ msgstr "加密與鑰匙圈" - -#~ msgid "Encrypt file" -#~ msgstr "加密檔案" - -#~ msgid "Sign file with default key" -#~ msgstr "以預設的金鑰簽署" - -#~ msgid "Encrypt and sign file with default key" -#~ msgstr "以預設金鑰加密及簽署檔案" +msgid "_Sign message with key:" +msgstr "簽署信息的密碼匙(_S):" -#~ msgid "Decrypt encrypted file" -#~ msgstr "解密已加密的檔案" +#: ../pgp/seahorse-sign.xml.h:1 +msgid "Sign Key" +msgstr "簽署密碼匙" -#~ msgid "Verify signature file" -#~ msgstr "驗證簽章檔" +#: ../pgp/seahorse-sign.xml.h:2 +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "簽署代表你信任本密碼匙是屬於：" -#~ msgid "Read list of URIs on standard in" -#~ msgstr "在標準輸入中讀取 URI 清單" +#: ../pgp/seahorse-sign.xml.h:3 +msgid "Key Name" +msgstr "密碼匙名稱" -#~ msgid "file..." -#~ msgstr "檔案…" +#: ../pgp/seahorse-sign.xml.h:4 +msgid "How carefully have you checked this key?" +msgstr "你要多小心地驗證本密碼匙？" -#~ msgid "Choose Recipients" -#~ msgstr "選擇收件人" +#: ../pgp/seahorse-sign.xml.h:5 +msgid "_Not at all" +msgstr "沒關係(_N)" -#~ msgid "Couldn't load keys" -#~ msgstr "無法載入金鑰" +#: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "隨意(_C)" -#~ msgid "Choose Encrypted File Name for '%s'" -#~ msgstr "選取‘%s’加密後的檔案名稱" +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "非常小心(_V)" -#~ msgid "Choose Signer" -#~ msgstr "選擇簽章者" +#: ../pgp/seahorse-sign.xml.h:8 +msgid "" +"Not at all: means you believe the key is owned by the person who " +"claims to own it, but you could not or did not verify this to be a fact." +msgstr "沒關係：代表你信任密碼匙是由聲稱擁有它的人所擁有，但實際上你不能或是沒有檢查它。" -#~ msgid "Choose Signature File Name for '%s'" -#~ msgstr "選取‘%s’的簽章檔案名稱" +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "隨意：代表你隨意地檢驗過密碼匙是由聲稱擁有它的人擁有。例如，你可以透過電話要求該人讀出密碼匙的數碼指紋。" -#~ msgid "Import is complete" -#~ msgstr "匯出已完成" +#: ../pgp/seahorse-sign.xml.h:10 +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "非常小心：只有你在完全信任此密碼匙為真時才選取此項。" -#~ msgid "Importing keys ..." -#~ msgstr "正在匯入金鑰…" +#: ../pgp/seahorse-sign.xml.h:11 +msgid "" +"You could use a hard to forge photo identification (such as a passport) to " +"personally check that the name on the key is correct. You should have also " +"used email to check that the email address belongs to the owner." +msgstr "你可以使用難以偽造的相片（像護照一樣）來辨認密碼匙的名稱是否正確。你同時應以電郵來檢查該電郵是否屬於該人擁有。" -#~ msgid "Choose Decrypted File Name for '%s'" -#~ msgstr "選取‘%s’解密後的檔案名稱" +#: ../pgp/seahorse-sign.xml.h:12 +msgid "How others will see this signature:" +msgstr "其他人如何看到此簽署：" -#~ msgid "Choose Original File for '%s'" -#~ msgstr "選取‘%s’原始檔案名稱" +#: ../pgp/seahorse-sign.xml.h:13 +msgid "_Others may not see this signature" +msgstr "其他人可能無法看到此簽署(_O)" -#~ msgid "No valid signatures found" -#~ msgstr "找不到有效的簽章" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "我可以在稍後時間撤銷此簽署(_R)" -#~ msgid "File Encryption Tool" -#~ msgstr "檔案加密工具" +#: ../pgp/seahorse-sign.xml.h:15 +msgid "Sign key as:" +msgstr "用作簽署的密碼匙：" -#~ msgid "Encrypting" -#~ msgstr "加密中" +#: ../pgp/seahorse-sign.xml.h:16 +msgid "_Signer:" +msgstr "簽署者(_S)" -#~ msgid "Couldn't encrypt file: %s" -#~ msgstr "無法將檔案加密：%s" +#: ../pgp/seahorse-sign.xml.h:17 +msgid "_Sign" +msgstr "簽署(_S)" -#~ msgid "Signing" -#~ msgstr "簽署中" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "匯出資料" -#~ msgid "Couldn't sign file: %s" -#~ msgstr "無法簽署檔案：%s" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "取回資料" -#~ msgid "Couldn't import keys from file: %s" -#~ msgstr "無法從檔案匯入金鑰：%s" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "輸入資料" -#~ msgid "Decrypting" -#~ msgstr "解密中" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "傳送資料" -#~ msgid "Couldn't decrypt file: %s" -#~ msgstr "無法將檔案解密：%s" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "不存在" -#~ msgid "Verifying" -#~ msgstr "驗證中" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "個人證書與密碼匙" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "個人證書.." -#~ msgid "Couldn't verify file: %s" -#~ msgstr "無法驗證檔案：%s" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "證書" -#~ msgid "Ace (.ace)" -#~ msgstr "Ace 格式 (.ace)" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "證書 (DER 編碼)" -#~ msgid "Ar (.ar)" -#~ msgstr "Ar 格式 (.ar)" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "證書" -#~ msgid "Arj (.arj)" -#~ msgstr "Arj 格式 (.arj)" +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 證書和相關密碼匙" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "你確定要永久刪除 %d 個證書？" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "無法產生私密密碼匙" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "建立" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "私密密碼匙" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "用來申請證書" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "建立新的私密密碼匙" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "標籤：" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "儲存在：" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "我知道這個密碼匙會被永久刪除。" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "未命名的" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "無法匯出證書" -#~ msgid "Ear (.ear)" -#~ msgstr "Ear 格式 (.ear)" +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "無法刪除" -#~ msgid "Self-extracting zip (.exe)" -#~ msgstr "自動解壓縮 zip 檔 (.exe)" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "匯出(_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "匯出證書" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "刪除這個證書或密碼匙" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "申請證書(_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "為這個密碼匙建立證書申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "無法儲存證書申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "儲存證書申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "證書申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM 編碼的申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "無法建立證書申請" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "建立證書申請檔案。" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "放在證書申請中的一般名稱 (CN)。" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "一般名稱 (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "未命名的私密密碼匙" -#~ msgid "Jar (.jar)" -#~ msgstr "Jar 格式 (.jar)" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "更改密語" -#~ msgid "Lha (.lzh)" -#~ msgstr "Lha 格式 (.lzh)" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "新的密語(_P):" -#~ msgid "Rar (.rar)" -#~ msgstr "Rar 格式 (.rar)" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "確認新的密語" -#~ msgid "Tar uncompressed (.tar)" -#~ msgstr "未壓縮的 Tar 格式 (.tar)" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "確認密語(_F):" -#~ msgid "Tar compressed with bzip (.tar.bz)" -#~ msgstr "使用 bzip 壓縮的 Tar 檔案 (.tar.bz)" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "管理密碼及密碼匙" -#~ msgid "Tar compressed with bzip2 (.tar.bz2)" -#~ msgstr "使用 bzip2 壓縮的 Tar 檔案 (.tar.bz2)" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "繼續" -#~ msgid "Tar compressed with gzip (.tar.gz)" -#~ msgstr "使用 gzip 壓縮的 Tar 檔案 (.tar.gz)" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "選取想要建立的項目類型(_S):" -#~ msgid "Tar compressed with lzop (.tar.lzo)" -#~ msgstr "使用 lzop 壓縮的 Tar 檔案 (.tar.lzo)" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "匯入失敗" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "匯入" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "要匯入的資料：" -#~ msgid "Tar compressed with compress (.tar.Z)" -#~ msgstr "使用 compress 壓縮的 Tar 檔案 (.tar.Z)" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "匯入密碼匙" -#~ msgid "War (.war)" -#~ msgstr "War 格式 (.war)" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "所有密碼匙檔" -#~ msgid "Zip (.zip)" -#~ msgstr "Zip 格式 (.zip)" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "拖放的文字" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "剪貼簿文字" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "新增(_N)" -#~ msgid "Zoo (.zoo)" -#~ msgstr "Zoo 格式 (.zoo)" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "關閉本程式" -#~ msgid "7-Zip (.7z)" -#~ msgstr "7-Zip 格式 (.7z)" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "新增(_N)…" -#~ msgid "You have selected %d file " -#~ msgid_plural "You have selected %d files " -#~ msgstr[0] "您選取了 %d 個檔案" -#~ msgstr[1] "您選取了 %d 個檔案" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "建立新的密碼匙或項目" -#~ msgid "and %d folder" -#~ msgid_plural "and %d folders" -#~ msgstr[0] "及 %d 個資料夾" -#~ msgstr[1] "及 %d 個資料夾" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "加入新的密碼匙或項目" -#~ msgid "%s%s" -#~ msgstr "%s%s" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "匯入(_I)…" -#~ msgid "You have selected %d files" -#~ msgstr "您選取了 %d 個檔案" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "由檔案匯入" -#~ msgid "You have selected %d folder" -#~ msgid_plural "You have selected %d folders" -#~ msgstr[0] "您選取了 %d 個資料夾" -#~ msgstr[1] "您選取了 %d 個資料夾" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "從剪貼簿匯入" -#~ msgid "Couldn't list files" -#~ msgstr "無法列出檔案" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "根據密碼匙圈(_K)" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "顯示側邊欄列出密碼匙圈" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "顯示個人(_P)" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "只顯示個人密碼匙、證書和密碼" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "顯示信任的(_T)" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "只顯示信任的密碼匙、證書和密碼" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "顯示任何(_A)" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "顯示所有的密碼匙、證書和密碼" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "過濾條件" -#~ msgid "Couldn't read file" -#~ msgstr "無法讀取檔案" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "第一次執行選項：" -#~ msgid "Back up Key Rings to Archive" -#~ msgstr "將金鑰備份至壓縮檔" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "產生你的密碼匙：" -#~ msgid "seahorse" -#~ msgstr "Seahorse" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "從檔案中匯入已存的密碼匙" -#~ msgid "_Back up Key Rings..." -#~ msgstr "備份鑰匙圈(_B)…" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "開始加密前你需要擁有密碼匙。" -#~ msgid "Back up all keys" -#~ msgstr "備份所有金鑰" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "無法鎖定" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "無法解鎖" -#~ msgid "Set Up Computer for _Secure Shell..." -#~ msgstr "設定電腦的 _SSH…" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "鎖定(_L)" -#~ msgid "User ID" -#~ msgstr "使用者 ID" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "解鎖(_U)" -#~ msgid "Couldn't retrieve key data" -#~ msgstr "無法取得金鑰資料" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "屬性(_P)" -#~ msgid "Couldn't write key to file" -#~ msgstr "金鑰無法儲存至檔案" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "正在設定 _SSH 密碼匙…" -#~ msgid "Couldn't import keys into key ring" -#~ msgstr "無法將金鑰匯入至鑰匙圈中" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "將公共 SSH 密碼匙傳送給其它電腦，及能使用該密碼匙登入。" -#~ msgid "Couldn't write keys to file: %s" -#~ msgstr "無法將金鑰寫入至檔案：%s" +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "輸入你的 SSH 密語:" -#~ msgid "Save Remote Keys" -#~ msgstr "儲存遠端金鑰" +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "舊密碼匙密語" -#~ msgid "No matching keys found" -#~ msgstr "找不到相符的金鑰" +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "輸入 %s 的舊密語" -#~ msgid "Save Key As..." -#~ msgstr "另存金鑰為…" +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "新的密碼匙密語" -#~ msgid "Save selected keys as a file" -#~ msgstr "儲存金鑰為檔案" +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "輸入 %s 的新密語" -#~ msgid "Remote Encryption Keys" -#~ msgstr "遠端加密金鑰" +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "請再次輸入新密語：%s" -#~ msgid "You have selected multiple files or folders" -#~ msgstr "您選取了多個檔案或資料夾" +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "安全系統殼(Secure Shell)" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "用來安全的連接其他電腦的密碼匙" -#~ msgid "" -#~ "Because the files are located remotely, each file will be encrypted " -#~ "separately." -#~ msgstr "由於檔案位於在遠端，因此會分開每個檔案加密。" +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "確定要刪除 SSH 金錀「%s」？" -#~ msgid "Encrypt Multiple Files" -#~ msgstr "加密多個檔案" +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "確定要刪除 %d 個 SSH 密碼匙？" -#~ msgid "Encrypt each file separately" -#~ msgstr "每個檔案分開加密" +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH 密碼匙" -#~ msgid "Encrypt packed together in a package" -#~ msgstr "加密及封裝在同一個套件中" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "秘密 SSH 密碼匙" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "公開 SSH 密碼匙" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "這個密碼匙沒有可用的公開密碼匙。" -#~ msgid "Package Name:" -#~ msgstr "套件名稱：" +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "SSH 密碼匙" -#~ msgid "Packaging:" -#~ msgstr "封裝形式：" +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "用作存取其它電腦（如終端機）" -#~ msgid "encrypted-package" -#~ msgstr "encrypted-package" +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "無法產生 SSH 密碼匙" -#~ msgid "Decrypt File" -#~ msgstr "解密檔案" +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "正在產生 SSH 密碼匙" -#~ msgid "I have checked that this key belongs to '%s'" -#~ msgstr "已檢查該金鑰屬於‘%s’" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "新增 SSH 密碼匙" -#~ msgid "Verify Signature" -#~ msgstr "驗證簽章" +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "只是建立密碼匙(_J)" -#~ msgid "couldn't read gpg configuration, will try to create" -#~ msgstr "無法讀取 gpg 設定，會嘗設建立" +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "建立及設定(_C)" -#~ msgid "couldn't modify gpg configuration: %s" -#~ msgstr "無法修改 gpg 設定：%s" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "SSH (Secure Shell) 密碼匙能讓你安全的連接其他的電腦。" + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "你的電子郵件位址，及其他提示這密碼匙要來作甚麼。" -#~ msgid "" -#~ "Display variables instead of editing conf files (gpg.conf, SSH agent " -#~ "socket)" -#~ msgstr "以顯示變數取代編輯 conf 檔案 (gpg.conf, SSH agent socket)" +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" -#~ msgid "couldn't drop privileges properly" -#~ msgstr "無法正確地消除權限" +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "如果有你想使用本密碼匙的電腦，現在可以設定電腦認識你的密碼匙。" -#~ msgid "" -#~ "When set seahorse-agent will try to automatically load the users SSH keys " -#~ "when needed. This is equivalent to using the ssh-add utility." -#~ msgstr "" -#~ "設定後 seahorse-agent 在需要時會嘗試自動載入使用者的 SSH 金鑰。這跟使用" -#~ "ssh-add 工具的效果一樣。" +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "（不能讀取的 SSH 密碼匙）" -#~ msgid "Whether to automatically load SSH keys on demand." -#~ msgstr "需要時是否自動載入 SSH 金鑰。" +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "個人的 SSH 密碼匙" -#~ msgid "Couldn't open the Session Properties" -#~ msgstr "無法開啟階段屬性" +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH 密碼匙" -#~ msgid "Couldn't start the 'seahorse-agent' program" -#~ msgstr "無法執行‘seahorse-agent’程式" +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "密碼匙無法重新命名。" -#~ msgid "The 'seahorse-agent' program exited unsuccessfully." -#~ msgstr "‘seahorse-agent’程式未能成功離開。" +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "無法更改密碼匙的認證。" -#~ msgid "" -#~ "Note: The 'seahorse-agent' program has been started. This program " -#~ "is necessary in order to cache passphrases. " -#~ msgstr "" -#~ "注意：‘seahorse-agent’程式已經執行。使用密語快取時需要這程式。" +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "無法更改密碼匙的密語。" -#~ msgid "Secure Shell Keys" -#~ msgstr "SSH 金鑰" +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "識別碼：" -#~ msgid "" -#~ "Warning: The 'seahorse-agent' program is not running. This program " -#~ "is necessary in order to cache passphrases. " -#~ msgstr "" -#~ "警告：‘seahorse-agent’程式並沒有執行。使用密語快取時所需要這程式。" +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "名稱：" -#~ msgid "" -#~ "No SSH caching agent is running. Cannot load Secure Shell keys." -#~ msgstr "沒有 SSH 代理程式正在運行，無法載入 SSH 金鑰。" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "用作連接其它電腦。" -#~ msgid "Automatically load _Secure Shell keys" -#~ msgstr "自動載入 _SSH 金鑰" +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "信任" -#~ msgid "Passphrase Cache" -#~ msgstr "密語快取" +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "此密碼匙的擁有者被授權連接本電腦(_A)" -#~ msgid "Session Properties" -#~ msgstr "階段屬性" +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "只會套用在 %s帳號。" -#~ msgid "" -#~ "To avoid manually starting the 'seahorse-agent' in the future\n" -#~ "add it to the Session Manager. " -#~ msgstr "" -#~ "為了以後無需每次都要自行執行‘seahorse-agent’，\n" -#~ "將其加入到作業階段管理員。" +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "演算法：" -#~ msgid "Progress Message" -#~ msgstr "進度信息" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "強度：" -#~ msgid "Progress Status" -#~ msgstr "進度狀態" +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "位置:" -#~ msgid "Cursor Position" -#~ msgstr "游標位置" +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "匯出整個密碼匙(_X)" -#~ msgid "The current position of the insertion cursor in chars" -#~ msgstr "游標目前的位置，以字元計。" +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH 指令在無法預期下中止。" -#~ msgid "Selection Bound" -#~ msgstr "選取邊界" +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH 指令失敗。" -#~ msgid "" -#~ "The position of the opposite end of the selection from the cursor in chars" -#~ msgstr "所選取的部份中，游標到另一端位置的距離（字元為單位）" +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "遠端主機密碼 " -#~ msgid "Maximum length" -#~ msgstr "最大長度" +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "輸入密碼匙密語" -#~ msgid "Maximum number of characters for this entry. Zero if no maximum" -#~ msgstr "輸入欄中字元數目的上限。0 為沒有上限" +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "新的 SSH 密碼匙的密語" -#~ msgid "Has Frame" -#~ msgstr "有框架" +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "匯入密碼匙：%s" -#~ msgid "FALSE removes outside bevel from entry" -#~ msgstr "FALSE 可將外部裝飾" +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "正在匯入密碼匙，請輸入密語" -#~ msgid "Invisible character" -#~ msgstr "隱形字元" +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH 密碼匙" -#~ msgid "" -#~ "The character to use when masking entry contents (in \"password mode\")" -#~ msgstr "用來遮蓋輸入內容的字元（在「密碼模式」裡）" +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH：%s" -#~ msgid "" -#~ "Whether to activate the default widget (such as the default button in a " -#~ "dialog) when Enter is pressed" -#~ msgstr "當按下 Enter 鍵時，是否啟動預設視窗元件（例如對話盒的按鈕）" +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "這個密碼匙沒有可用的私密密碼匙。" -#~ msgid "Width in chars" -#~ msgstr "寬度（以字元計算）" +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "在遠端電腦無法設定 SSH 密碼匙" -#~ msgid "Number of characters to leave space for in the entry" -#~ msgstr "輸入元件中預留的空白長度（單位為字元）" +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "正在設定 SSH 密碼匙" -#~ msgid "Scroll offset" -#~ msgstr "捲動偏移" +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "設定電腦的 SSH 連線" -#~ msgid "Number of pixels of the entry scrolled off the screen to the left" -#~ msgstr "輸入元件相對於螢幕向左捲動偏移的程度（單位為像素）" +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "要在其他的電腦使用你的 SSH 密碼匙，你需要有該電腦的登入帳號。" -#~ msgid "Text" -#~ msgstr "文字" +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "例如：fileserver.example.com:port" -#~ msgid "The contents of the entry" -#~ msgstr "輸入的內容" +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "電腦名稱(_C):" -#~ msgid "Visibility" -#~ msgstr "可見狀態" +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "登入名稱(_L):" -#~ msgid "Whether contents are drawn using invisible character" -#~ msgstr "內容是否以透明的字元顯示" +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "設定(_S)" -#~ msgid "Key type / algorithm" -#~ msgstr "金鑰類型 / 演算法" +#~ msgid "Login keyring" +#~ msgstr "登入鑰匙圈" -#~ msgid "Login:" -#~ msgstr "登入：" +#~ msgid "Access to the key ring was denied" +#~ msgstr "存取鑰匙圈被禁止" -#~ msgid "Server:" -#~ msgstr "伺服器：" +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "gnome-keyring 服務程式沒有執行" -#~ msgid "[Type here]" -#~ msgstr "[在這裡輸入]" +#~ msgid "The key ring has already been unlocked" +#~ msgstr "鑰匙圈已經解鎖" -#~ msgid "[Use here]" -#~ msgstr "[使用這裡]" +#~ msgid "No such key ring exists" +#~ msgstr "沒有該鑰匙圈存在" -#~ msgid "[details]\n" -#~ msgstr "[詳細資料]\n" +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "無法與鑰匙圈服務程式聯絡" -#~ msgid "[login]" -#~ msgstr "[登入]" +#~ msgid "The item already exists" +#~ msgstr "項目已經存在" -#~ msgid "[server]" -#~ msgstr "[伺服器]" +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "存取 gnome-keyring 發生內部錯誤" -#~ msgid "This key expired on: (placeholder)" -#~ msgstr "此金鑰過期於：(placeholder)" +#~ msgid "Algorithms here" +#~ msgstr "演算法這裡" diff -Nru seahorse-3.2.2/po/zh_TW.po seahorse-3.6.3/po/zh_TW.po --- seahorse-3.2.2/po/zh_TW.po 2011-10-17 18:51:26.000000000 +0200 +++ seahorse-3.6.3/po/zh_TW.po 2012-08-21 12:23:19.000000000 +0200 @@ -6,327 +6,314 @@ # msgid "" msgstr "" -"Project-Id-Version: seahorse 3.1.91\n" +"Project-Id-Version: seahorse 3.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-26 23:00+0800\n" -"PO-Revision-Date: 2011-09-26 10:40+0800\n" +"POT-Creation-Date: 2012-07-17 15:28+0800\n" +"PO-Revision-Date: 2012-07-16 09:41+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" "Language: \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=1; plural=0;\n" #: ../gkr/seahorse-add-keyring.xml.h:1 msgid "Add Password Keyring" msgstr "加入密碼鑰匙圈" #: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "New Keyring Name:" -msgstr "新鑰匙圈名稱：" - -#: ../gkr/seahorse-add-keyring.xml.h:3 msgid "" "Please choose a name for the new keyring. You will be prompted for an unlock " "password." msgstr "請為新的鑰匙圈選擇一個名稱。系統會提示您提供解鎖密碼。" +#: ../gkr/seahorse-add-keyring.xml.h:3 +msgid "New Keyring Name:" +msgstr "新鑰匙圈名稱：" + #: ../gkr/seahorse-add-keyring.xml.h:4 #: ../libseahorse/seahorse-add-keyserver.xml.h:5 #: ../ssh/seahorse-ssh-upload.xml.h:3 msgid "The host name or address of the server." msgstr "伺服器的主機名稱或位址。" -#: ../gkr/seahorse-gkr-add-item.c:61 ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "無法加入鑰匙圈" +#: ../gkr/seahorse-gkr-actions.c:81 +msgid "New password keyring" +msgstr "新增密碼鑰匙圈" + +#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +msgid "Used to store application and network passwords" +msgstr "用來儲存應用程式和網路的密碼" + +#: ../gkr/seahorse-gkr-actions.c:83 +msgid "New password..." +msgstr "新密碼…" + +#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +msgid "Safely store a password or secret." +msgstr "安全的存放密語或機密。" + +#: ../gkr/seahorse-gkr-actions.c:88 +msgid "Password Keyring" +msgstr "密碼鑰匙圈" + +#: ../gkr/seahorse-gkr-actions.c:90 +msgid "Stored Password" +msgstr "已儲存的密碼" + +#: ../gkr/seahorse-gkr-actions.c:174 +msgid "Couldn't set default keyring" +msgstr "無法設定預設的鑰匙圈" + +#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 +msgid "Couldn't change keyring password" +msgstr "無法更改鑰匙圈密碼" + +#: ../gkr/seahorse-gkr-actions.c:281 +msgid "_Set as default" +msgstr "設為預設值(_S)" + +#: ../gkr/seahorse-gkr-actions.c:282 +msgid "Applications usually store new passwords in the default keyring." +msgstr "應用程式通常會把新密碼儲存在預設鑰匙圈裡。" + +#: ../gkr/seahorse-gkr-actions.c:283 +msgid "Change _Password" +msgstr "變更密碼(_P)" + +#: ../gkr/seahorse-gkr-actions.c:284 +msgid "Change the unlock password of the password storage keyring" +msgstr "改變密碼儲存鑰匙圈的解鎖密碼" + +#: ../gkr/seahorse-gkr-add-item.c:58 +msgid "Couldn't add item" +msgstr "無法加入項目" #: ../gkr/seahorse-gkr-add-item.xml.h:1 msgid "Add Password" msgstr "加入密碼" #: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 ../pgp/seahorse-revoke.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 msgid "_Description:" msgstr "描述(_D):" #: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Keyring:" -msgstr "鑰匙圈(_K):" - -#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Password:" msgstr "密碼(_P):" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 +#: ../gkr/seahorse-gkr-add-item.xml.h:4 msgid "_Show Password" msgstr "顯示密碼(_S)" -#: ../gkr/seahorse-gkr-item-commands.c:78 -msgid "Couldn't delete item" -msgstr "無法刪除項目" +#: ../gkr/seahorse-gkr-add-item.xml.h:5 +msgid "_Keyring:" +msgstr "鑰匙圈(_K):" + +#: ../gkr/seahorse-gkr-add-keyring.c:72 +msgid "Couldn't add keyring" +msgstr "無法加入鑰匙圈" + +#: ../gkr/seahorse-gkr-backend.c:205 +msgid "Passwords" +msgstr "密碼" + +#: ../gkr/seahorse-gkr-backend.c:208 +msgid "Stored personal passwords, credentials and secrets" +msgstr "已儲存的個人密碼、憑證和機密" + +#. Translators: This should be the same as the string in empathy +#: ../gkr/seahorse-gkr-item.c:293 +msgid "IM account password for " +msgstr "IM 帳號的密碼 " + +#: ../gkr/seahorse-gkr-item.c:353 +msgid "Password or secret" +msgstr "密語或機密" + +#: ../gkr/seahorse-gkr-item.c:354 +msgid "Network password" +msgstr "網路密碼" + +#: ../gkr/seahorse-gkr-item.c:355 +msgid "Stored note" +msgstr "儲存的備註" + +#: ../gkr/seahorse-gkr-item.c:356 +msgid "Keyring password" +msgstr "鑰匙圈密碼" + +#: ../gkr/seahorse-gkr-item.c:357 +msgid "Encryption key password" +msgstr "加密金鑰密碼" + +#: ../gkr/seahorse-gkr-item.c:358 +msgid "Key storage password" +msgstr "金鑰儲存密碼" + +#: ../gkr/seahorse-gkr-item.c:359 +msgid "Google Chrome password" +msgstr "Google Chrome 密碼" + +#: ../gkr/seahorse-gkr-item.c:360 +msgid "Gnome Online Accounts password" +msgstr "GNOME 線上帳號密碼" + +#: ../gkr/seahorse-gkr-item.c:361 +msgid "Telepathy password" +msgstr "Telepathy 密碼" + +#: ../gkr/seahorse-gkr-item.c:362 +msgid "Instant messaging password" +msgstr "即時訊息密碼" + +#: ../gkr/seahorse-gkr-item.c:363 +msgid "Network Manager secret" +msgstr "網路管理程式機密" -#: ../gkr/seahorse-gkr-item-commands.c:100 +#: ../gkr/seahorse-gkr-item-deleter.c:80 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "確定要刪除密碼「%s」？" -#: ../gkr/seahorse-gkr-item-commands.c:103 +#: ../gkr/seahorse-gkr-item-deleter.c:83 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "確定要刪除 %d 個密碼？" -msgstr[1] "確定要刪除 %d 個密碼？" -#: ../gkr/seahorse-gkr-item-commands.c:114 -msgid "Deleting item" -msgid_plural "Deleting items" -msgstr[0] "刪除項目" -msgstr[1] "刪除項目" - -#: ../gkr/seahorse-gkr-item-properties.c:70 +#: ../gkr/seahorse-gkr-item-properties.c:66 msgid "Access a network share or resource" msgstr "存取網路共享或資源" -#: ../gkr/seahorse-gkr-item-properties.c:73 +#: ../gkr/seahorse-gkr-item-properties.c:69 msgid "Access a website" msgstr "存取網站" -#: ../gkr/seahorse-gkr-item-properties.c:76 +#: ../gkr/seahorse-gkr-item-properties.c:72 msgid "Unlocks a PGP key" msgstr "解除 PGP 金鑰鎖定" -#: ../gkr/seahorse-gkr-item-properties.c:79 +#: ../gkr/seahorse-gkr-item-properties.c:75 msgid "Unlocks a Secure Shell key" msgstr "解除 SSH 金鑰鎖定" -#: ../gkr/seahorse-gkr-item-properties.c:82 +#: ../gkr/seahorse-gkr-item-properties.c:78 msgid "Saved password or login" msgstr "已儲密碼或登入" -#: ../gkr/seahorse-gkr-item-properties.c:106 +#: ../gkr/seahorse-gkr-item-properties.c:102 msgid "Network Credentials" msgstr "網路認證" -#: ../gkr/seahorse-gkr-item-properties.c:111 +#: ../gkr/seahorse-gkr-item-properties.c:107 msgid "Password" msgstr "密碼" -#: ../gkr/seahorse-gkr-item-properties.c:211 +#: ../gkr/seahorse-gkr-item-properties.c:215 msgid "Couldn't change password." msgstr "無法更改密碼。" -#: ../gkr/seahorse-gkr-item-properties.c:256 -#: ../gkr/seahorse-gkr-item-properties.c:377 +#: ../gkr/seahorse-gkr-item-properties.c:262 +#: ../gkr/seahorse-gkr-item-properties.c:383 msgid "Updating password" msgstr "更新密碼" -#: ../gkr/seahorse-gkr-item-properties.c:337 +#: ../gkr/seahorse-gkr-item-properties.c:344 msgid "Couldn't set description." msgstr "無法設定描述。" #: ../gkr/seahorse-gkr-item-properties.xml.h:1 -msgid "Password:" -msgstr "密碼：" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 -#: ../ssh/seahorse-ssh-key-properties.xml.h:7 -msgid "Technical Details:" -msgstr "技術資料：" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:3 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:22 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 -#: ../ssh/seahorse-ssh-key-properties.xml.h:15 -msgid "Details" -msgstr "詳細資料" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "金鑰屬性" +#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-item-properties.xml.h:4 -#: ../pgp/seahorse-pgp-subkey.c:366 -#: ../ssh/seahorse-ssh-key-properties.xml.h:17 -msgid "Key" -msgstr "金鑰" +msgid "Use:" +msgstr "使用:" #: ../gkr/seahorse-gkr-item-properties.xml.h:5 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 -#: ../ssh/seahorse-ssh-key-properties.xml.h:18 -msgid "Key Properties" -msgstr "金鑰屬性" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 +msgid "Type:" +msgstr "類型:" #: ../gkr/seahorse-gkr-item-properties.xml.h:6 -msgid "Login:" -msgstr "登入:" - -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Server:" msgstr "伺服器:" +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +msgid "Login:" +msgstr "登入:" + #: ../gkr/seahorse-gkr-item-properties.xml.h:8 msgid "Show pass_word" msgstr "顯示密碼(_W)" #: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 -msgid "Type:" -msgstr "類型:" - -#. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 -msgid "Use:" -msgstr "使用:" - -#: ../gkr/seahorse-gkr-keyring.c:120 -#, c-format -msgid "Passwords: %s" -msgstr "密碼：%s" - -#: ../gkr/seahorse-gkr-keyring.c:121 -#, c-format -msgid "Passwords: %s" -msgstr "密碼：%s" - -#: ../gkr/seahorse-gkr-keyring-commands.c:113 -msgid "Password Keyring" -msgstr "密碼鑰匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:114 -msgid "Used to store application and network passwords" -msgstr "用來儲存應用程式和網路的密碼" - -#: ../gkr/seahorse-gkr-keyring-commands.c:115 -msgid "Stored Password" -msgstr "已儲存的密碼" - -#: ../gkr/seahorse-gkr-keyring-commands.c:116 -msgid "Safely store a password or secret." -msgstr "安全的存放密語或機密。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:128 -msgid "Couldn't unlock keyring" -msgstr "無法解鎖鑰匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:165 -msgid "Couldn't lock keyring" -msgstr "無法鎖定鑰匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:202 -msgid "Couldn't set default keyring" -msgstr "無法設定預設的鑰匙圈" - -#: ../gkr/seahorse-gkr-keyring-commands.c:239 -msgid "Couldn't change keyring password" -msgstr "無法更改鑰匙圈密碼" - -#: ../gkr/seahorse-gkr-keyring-commands.c:268 -msgid "_Lock" -msgstr "鎖定(_L)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:269 -msgid "" -"Lock the password storage keyring so a master password is required to unlock " -"it." -msgstr "鎖定密碼儲存鑰匙圈，如此要將它解鎖就要有主控密碼才行。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:270 -msgid "_Unlock" -msgstr "解鎖(_U)" - -#: ../gkr/seahorse-gkr-keyring-commands.c:271 -msgid "" -"Unlock the password storage keyring with a master password so it is " -"available for use." -msgstr "使用主控密碼將密碼儲存鑰匙圈解鎖，如此就成為可以使用的狀態。" - -#: ../gkr/seahorse-gkr-keyring-commands.c:272 -msgid "_Set as default" -msgstr "設為預設值(_S)" +msgid "Password:" +msgstr "密碼：" -#: ../gkr/seahorse-gkr-keyring-commands.c:273 -msgid "Applications usually store new passwords in the default keyring." -msgstr "應用程式通常會把新密碼儲存在預設鑰匙圈裡。" +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../pgp/seahorse-pgp-subkey.c:366 +#: ../ssh/seahorse-ssh-key-properties.xml.h:15 +msgid "Key" +msgstr "金鑰" -#: ../gkr/seahorse-gkr-keyring-commands.c:274 -msgid "Change _Password" -msgstr "變更密碼(_P)" +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 +#: ../ssh/seahorse-ssh-key-properties.xml.h:20 +msgid "Technical Details:" +msgstr "技術資料：" -#: ../gkr/seahorse-gkr-keyring-commands.c:275 -msgid "Change the unlock password of the password storage keyring" -msgstr "改變密碼儲存鑰匙圈的解鎖密碼" +#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49 +#: ../ssh/seahorse-ssh-key-properties.xml.h:22 +msgid "Details" +msgstr "詳細資料" -#: ../gkr/seahorse-gkr-keyring-commands.c:340 -msgid "Couldn't delete keyring" -msgstr "無法刪除鑰匙圈" +#: ../gkr/seahorse-gkr-keyring.c:466 +msgid "A keyring that is automatically unlocked on login" +msgstr "登入時自動解鎖的鑰匙圈" + +#: ../gkr/seahorse-gkr-keyring.c:467 +msgid "A keyring used to store passwords" +msgstr "用來儲存密碼的鑰匙圈" -#: ../gkr/seahorse-gkr-keyring-commands.c:358 +#: ../gkr/seahorse-gkr-keyring-deleter.c:76 #, c-format msgid "Are you sure you want to delete the password keyring '%s'?" msgstr "您確定要刪除這個密碼鑰匙圈「%s」？" -#: ../gkr/seahorse-gkr-keyring-commands.c:368 -msgid "Deleting keyring" -msgid_plural "Deleting keyrings" -msgstr[0] "刪除鑰匙圈" -msgstr[1] "刪除鑰匙圈" +#: ../gkr/seahorse-gkr-keyring-deleter.c:79 +msgid "I understand that all items will be permanently deleted." +msgstr "我知道所有的項目會永遠的被刪除。" + +#: ../gkr/seahorse-gkr-keyring.xml.h:1 +msgid "Keyring Properties" +msgstr "鑰匙圈屬性" -#. ----------------------------------------------------------------------------- -#. * PUBLIC -#. -#. To translators: This is the noun not the verb. #: ../gkr/seahorse-gkr-keyring.xml.h:2 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Name:" +msgstr "名稱：" + +#. To translators: This is the noun not the verb. +#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 msgid "Created:" msgstr "建立日期：" -#: ../gkr/seahorse-gkr-keyring.xml.h:3 +#: ../gkr/seahorse-gkr-keyring.xml.h:5 msgid "Keyring" msgstr "鑰匙圈" -#: ../gkr/seahorse-gkr-keyring.xml.h:4 -msgid "Keyring Properties" -msgstr "鑰匙圈屬性" - -#: ../gkr/seahorse-gkr-keyring.xml.h:5 -msgid "_Name:" -msgstr "名稱(_N):" - -#: ../gkr/seahorse-gkr-operation.c:52 ../pgp/seahorse-gpgme.c:73 -#: ../pgp/seahorse-hkp-source.c:662 ../ssh/seahorse-ssh-operation.c:193 -msgid "The operation was cancelled" -msgstr "該操作已取消" - -#: ../gkr/seahorse-gkr-operation.c:57 -msgid "Access to the key ring was denied" -msgstr "存取鑰匙圈被禁止" - -#: ../gkr/seahorse-gkr-operation.c:60 -msgid "The gnome-keyring daemon is not running" -msgstr "gnome-keyring 服務程式沒有執行" - -#: ../gkr/seahorse-gkr-operation.c:63 -msgid "The key ring has already been unlocked" -msgstr "鑰匙圈已經解鎖" - -#: ../gkr/seahorse-gkr-operation.c:66 -msgid "No such key ring exists" -msgstr "沒有該鑰匙圈存在" - -#: ../gkr/seahorse-gkr-operation.c:69 -msgid "Couldn't communicate with key ring daemon" -msgstr "無法與鑰匙圈服務程式聯絡" - -#: ../gkr/seahorse-gkr-operation.c:72 -msgid "The item already exists" -msgstr "項目已經存在" - -#: ../gkr/seahorse-gkr-operation.c:78 -msgid "Internal error accessing gnome-keyring" -msgstr "存取 gnome-keyring 發生內部錯誤" - #: ../libegg/egg-datetime.c:317 msgid "Display flags" msgstr "顯示旗標" @@ -583,266 +570,327 @@ msgstr "%u:%u:%u" #: ../libseahorse/seahorse-add-keyserver.xml.h:1 -msgid ":" -msgstr ":" +msgid "initial temporary item" +msgstr "起動臨時項目" #: ../libseahorse/seahorse-add-keyserver.xml.h:2 msgid "Add Key Server" msgstr "加入金鑰伺服器" #: ../libseahorse/seahorse-add-keyserver.xml.h:3 -msgid "Host:" -msgstr "主機：" - -#: ../libseahorse/seahorse-add-keyserver.xml.h:4 msgid "Key Server Type:" msgstr "金鑰伺服器類型：" +#: ../libseahorse/seahorse-add-keyserver.xml.h:4 +msgid "Host:" +msgstr "主機：" + #: ../libseahorse/seahorse-add-keyserver.xml.h:6 +msgid ":" +msgstr ":" + +#: ../libseahorse/seahorse-add-keyserver.xml.h:7 msgid "The port to access the server on." msgstr "連接伺服器的連接埠。" -#: ../libseahorse/seahorse-add-keyserver.xml.h:7 -msgid "initial temporary item" -msgstr "起動臨時項目" +#: ../libseahorse/seahorse-application.c:118 +msgid "Version of this application" +msgstr "這個應用程式的版本" -#: ../libseahorse/seahorse-passphrase.c:180 -msgid "Passphrase" -msgstr "密語" +#: ../libseahorse/seahorse-application.c:124 +msgid "- System Settings" +msgstr "- 系統設定值" -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 -msgid "Password:" -msgstr "密碼:" +#: ../libseahorse/seahorse-catalog.c:88 +msgid "Contributions:" +msgstr "貢獻者:" -#. The second and main entry -#: ../libseahorse/seahorse-passphrase.c:246 -msgid "Confirm:" -msgstr "確認:" +#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:659 +msgid "Passwords and Keys" +msgstr "密碼及加密金鑰" -#: ../libseahorse/seahorse-prefs.c:68 -msgid "Not a valid Key Server address." -msgstr "不是有效的金鑰伺服器位址。" +#: ../libseahorse/seahorse-catalog.c:114 +msgid "translator-credits" +msgstr "" +"如對翻譯有任何意見，請送一封電子郵件給\n" +"以下地址，GNOME 翻譯團隊會盡快回覆您：\n" +"zh-l10n@lists.linux.org.tw\n" +"\n" +"Woodman Tuen , 2005-07" -#: ../libseahorse/seahorse-prefs.c:69 -msgid "" -"For help contact your system adminstrator or the administrator of the key " -"server." -msgstr "向系統管理員或金鑰伺服器管理員取得協助。" +#: ../libseahorse/seahorse-catalog.c:117 +msgid "Seahorse Project Homepage" +msgstr "Seahorse 專案網頁" -#: ../libseahorse/seahorse-prefs.c:183 -msgid "URL" -msgstr "URL" +#: ../libseahorse/seahorse-catalog.c:191 +msgid "Cannot delete" +msgstr "不能刪除" -#: ../libseahorse/seahorse-prefs.c:348 -msgid "Custom" -msgstr "自訂" +#: ../libseahorse/seahorse-catalog.c:239 +#: ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "無法匯出金錀" -#: ../libseahorse/seahorse-prefs.c:406 -msgid "None: Don't publish keys" -msgstr "沒有：不要發行金鑰" +#: ../libseahorse/seahorse-catalog.c:268 +msgid "Couldn't export data" +msgstr "無法匯出資料" -#: ../libseahorse/seahorse-prefs.xml.h:1 -msgid "Automatically retrieve keys from _key servers" -msgstr "自動從金鑰伺服器取得金鑰(_K)" +#. Top menu items +#: ../libseahorse/seahorse-catalog.c:277 +msgid "_File" +msgstr "檔案(_F)" -#: ../libseahorse/seahorse-prefs.xml.h:2 -msgid "Automatically synchronize _modified keys with key servers" -msgstr "與金鑰伺服器自動將已修改的金鑰同步(_M)" +#: ../libseahorse/seahorse-catalog.c:278 +msgid "E_xport..." +msgstr "匯出(_X)…" -#: ../libseahorse/seahorse-prefs.xml.h:3 -msgid "Key Servers" -msgstr "金鑰伺服器" +#: ../libseahorse/seahorse-catalog.c:279 +msgid "Export to a file" +msgstr "匯出為檔案" -#: ../libseahorse/seahorse-prefs.xml.h:4 -msgid "Preferences" -msgstr "偏好設定" +#: ../libseahorse/seahorse-catalog.c:280 +msgid "_Edit" +msgstr "編輯(_E)" -#: ../libseahorse/seahorse-prefs.xml.h:5 -msgid "_Find keys via:" -msgstr "尋找金鑰以(_F):" +#: ../libseahorse/seahorse-catalog.c:283 +msgid "Copy to the clipboard" +msgstr "複製到剪貼簿" -#: ../libseahorse/seahorse-prefs.xml.h:6 -msgid "_Publish keys to:" -msgstr "發行金鑰至(_P):" +#: ../libseahorse/seahorse-catalog.c:284 +#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:957 +msgid "_Delete" +msgstr "刪除(_D)" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Retrieving data" -msgstr "取回資料" +#: ../libseahorse/seahorse-catalog.c:285 +msgid "Delete selected items" +msgstr "刪除選取的項目" -#: ../libseahorse/seahorse-transfer.c:178 -msgid "Exporting data" -msgstr "匯出資料" +#: ../libseahorse/seahorse-catalog.c:287 +msgid "Show the properties of this item" +msgstr "顯示這個項目的屬性" + +#: ../libseahorse/seahorse-catalog.c:289 +msgid "Show the properties of this keyring" +msgstr "顯示這個鑰匙圈的屬性" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Importing data" -msgstr "輸入資料" +#: ../libseahorse/seahorse-catalog.c:290 +msgid "Prefere_nces" +msgstr "偏好設定(_N)" -#: ../libseahorse/seahorse-transfer.c:182 -msgid "Sending data" -msgstr "傳送資料" +#: ../libseahorse/seahorse-catalog.c:291 +msgid "Change preferences for this program" +msgstr "更改本程式的偏好設定" -#: ../libseahorse/seahorse-unknown.c:59 -msgid "Unavailable" -msgstr "不存在" +#: ../libseahorse/seahorse-catalog.c:292 +msgid "_View" +msgstr "檢視(_V)" -#: ../libseahorse/seahorse-util.c:259 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" +#: ../libseahorse/seahorse-catalog.c:293 +msgid "_Help" +msgstr "求助(_H)" -#: ../libseahorse/seahorse-util.c:444 -msgid "Key Data" -msgstr "金鑰資料" +#: ../libseahorse/seahorse-catalog.c:295 +msgid "About this program" +msgstr "關於本程式" -#: ../libseahorse/seahorse-util.c:446 -msgid "Multiple Keys" -msgstr "多個金鑰" +#: ../libseahorse/seahorse-catalog.c:296 +msgid "_Contents" +msgstr "內容(_C)" -#. Filter for PGP keys. We also include *.asc, as in many -#. cases that extension is associated with text/plain -#: ../libseahorse/seahorse-util.c:734 -msgid "All key files" -msgstr "所有金鑰檔" +#: ../libseahorse/seahorse-catalog.c:297 +msgid "Show Seahorse help" +msgstr "顯示 Seahorse 的說明文件" -#: ../libseahorse/seahorse-util.c:745 ../libseahorse/seahorse-util.c:793 -#: ../pgp/seahorse-gpgme-photos.c:242 -msgid "All files" -msgstr "所有檔案" +#: ../libseahorse/seahorse-exportable.c:407 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +msgid "Export" +msgstr "匯出" + +#: ../libseahorse/seahorse-interaction.c:99 +#, c-format +msgid "Enter PIN or password for: %s" +msgstr "輸入 PIN 或密碼：%s" + +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +msgid "Password:" +msgstr "密碼:" -#: ../libseahorse/seahorse-util.c:786 -msgid "Archive files" -msgstr "壓縮檔" +#. The second and main entry +#: ../libseahorse/seahorse-passphrase.c:245 +msgid "Confirm:" +msgstr "確認:" + +#: ../libseahorse/seahorse-prefs.c:67 +msgid "Not a valid Key Server address." +msgstr "不是有效的金鑰伺服器位址。" -#: ../libseahorse/seahorse-util.c:856 +#: ../libseahorse/seahorse-prefs.c:68 msgid "" -"A file already exists with this name.\n" -"\n" -"Do you want to replace it with a new file?" -msgstr "" -"以這名稱命名的檔案已經存在。\n" -"\n" -"您是否希望以新的檔案來取代它？" +"For help contact your system adminstrator or the administrator of the key " +"server." +msgstr "向系統管理員或金鑰伺服器管理員取得協助。" + +#: ../libseahorse/seahorse-prefs.c:181 +msgid "URL" +msgstr "URL" + +#: ../libseahorse/seahorse-prefs.c:351 +msgid "Custom" +msgstr "自訂" + +#: ../libseahorse/seahorse-prefs.c:404 +msgid "None: Don't publish keys" +msgstr "沒有：不要發行金鑰" + +#: ../libseahorse/seahorse-prefs.xml.h:1 +msgid "Preferences" +msgstr "偏好設定" + +#: ../libseahorse/seahorse-prefs.xml.h:2 +msgid "_Find keys via:" +msgstr "尋找金鑰以(_F):" + +#: ../libseahorse/seahorse-prefs.xml.h:3 +msgid "_Publish keys to:" +msgstr "發行金鑰至(_P):" + +#: ../libseahorse/seahorse-prefs.xml.h:4 +msgid "Automatically retrieve keys from _key servers" +msgstr "自動從金鑰伺服器取得金鑰(_K)" + +#: ../libseahorse/seahorse-prefs.xml.h:5 +msgid "Automatically synchronize _modified keys with key servers" +msgstr "與金鑰伺服器自動將已修改的金鑰同步(_M)" + +#: ../libseahorse/seahorse-prefs.xml.h:6 +msgid "Key Servers" +msgstr "金鑰伺服器" -#: ../libseahorse/seahorse-util.c:859 -msgid "_Replace" -msgstr "取代(_R)" +#: ../libseahorse/seahorse-util.c:209 +msgid "%Y-%m-%d" +msgstr "%Y-%m-%d" #: ../libseahorse/seahorse-validity.c:40 ../pgp/seahorse-gpgme-subkey.c:197 -#: ../pgp/seahorse-pgp-key-properties.c:1273 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 +#: ../pkcs11/seahorse-token.c:576 msgid "Unknown" msgstr "不明" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1260 msgctxt "Validity" msgid "Never" msgstr "永不" #: ../libseahorse/seahorse-validity.c:44 -#: ../pgp/seahorse-pgp-key-properties.c:1286 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 msgid "Marginal" msgstr "勉強" #: ../libseahorse/seahorse-validity.c:46 -#: ../pgp/seahorse-pgp-key-properties.c:1292 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 msgid "Full" msgstr "完全" #: ../libseahorse/seahorse-validity.c:48 -#: ../pgp/seahorse-pgp-key-properties.c:1298 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 msgid "Ultimate" msgstr "徹底" #: ../libseahorse/seahorse-validity.c:50 -#: ../pgp/seahorse-pgp-key-properties.c:1491 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "已停用" #: ../libseahorse/seahorse-validity.c:52 -#: ../pgp/seahorse-pgp-key-properties.c:1487 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "已撤銷" -#: ../libseahorse/seahorse-widget.c:461 +#: ../libseahorse/seahorse-widget.c:460 #, c-format msgid "Could not display help: %s" msgstr "無法顯示說明文件：%s" #: ../pgp/seahorse-add-subkey.xml.h:1 -msgid "Expiration Date:" -msgstr "有效日期：" +msgid "Never E_xpires" +msgstr "永不過期(_X)" #: ../pgp/seahorse-add-subkey.xml.h:2 -msgid "Generate a new subkey" -msgstr "產生新的子鑰" - -#: ../pgp/seahorse-add-subkey.xml.h:3 msgid "If key never expires" msgstr "如果金鑰永不過期" +#: ../pgp/seahorse-add-subkey.xml.h:3 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:4 +msgid "Key _Type:" +msgstr "金鑰類型(_T):" + #: ../pgp/seahorse-add-subkey.xml.h:4 msgid "Key _Length:" msgstr "金鑰長度(_L)" #: ../pgp/seahorse-add-subkey.xml.h:5 -msgid "Key _Type:" -msgstr "金鑰類型(_T):" +msgid "Expiration Date:" +msgstr "有效日期：" #: ../pgp/seahorse-add-subkey.xml.h:6 msgid "Length of Key" msgstr "金鑰長度" #: ../pgp/seahorse-add-subkey.xml.h:7 -msgid "Never E_xpires" -msgstr "永不過期(_X)" +msgid "Generate a new subkey" +msgstr "產生新的子鑰" #: ../pgp/seahorse-add-uid.xml.h:1 msgid "Add User ID" msgstr "加入使用者 ID" #: ../pgp/seahorse-add-uid.xml.h:2 -msgid "Create the new user ID" -msgstr "建立新的使用者 ID" - -#: ../pgp/seahorse-add-uid.xml.h:3 ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "Full _Name:" -msgstr "全名(_N):" - -#: ../pgp/seahorse-add-uid.xml.h:4 -msgid "Key Co_mment:" -msgstr "金鑰附註(_M):" - -#: ../pgp/seahorse-add-uid.xml.h:5 msgid "Must be at least 5 characters long" msgstr "長度最少要有 5 個字元" -#: ../pgp/seahorse-add-uid.xml.h:6 +#: ../pgp/seahorse-add-uid.xml.h:3 +msgid "Optional email address" +msgstr "電郵地址（非必要）" + +#: ../pgp/seahorse-add-uid.xml.h:4 msgid "Optional comment describing key" msgstr "描述金鑰的註釋（非必要）" -#: ../pgp/seahorse-add-uid.xml.h:7 -msgid "Optional email address" -msgstr "電郵地址（非必要）" +#. Full name of the key, usually the name of the user. +#: ../pgp/seahorse-add-uid.xml.h:6 ../pgp/seahorse-pgp-generate.xml.h:5 +msgid "Full _Name:" +msgstr "全名(_N):" -#: ../pgp/seahorse-add-uid.xml.h:8 ../pgp/seahorse-pgp-generate.xml.h:13 +#: ../pgp/seahorse-add-uid.xml.h:7 ../pgp/seahorse-pgp-generate.xml.h:6 msgid "_Email Address:" msgstr "電郵地址(_C):" +#: ../pgp/seahorse-add-uid.xml.h:8 +msgid "Key Co_mment:" +msgstr "金鑰附註(_M):" + +#: ../pgp/seahorse-add-uid.xml.h:9 +msgid "Create the new user ID" +msgstr "建立新的使用者 ID" + #: ../pgp/seahorse-expires.xml.h:1 -msgid "C_hange" -msgstr "變更(_H)" +msgid "_Never expires" +msgstr "永不過期(_N)" -#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:4 +#: ../pgp/seahorse-expires.xml.h:2 ../pgp/seahorse-revoke.xml.h:5 msgid "Revoke key" msgstr "撤銷金鑰" #: ../pgp/seahorse-expires.xml.h:3 -msgid "_Never expires" -msgstr "永不過期(_N)" +msgid "C_hange" +msgstr "改變(_H)" #: ../pgp/seahorse-gpgme-add-subkey.c:162 msgid "Couldn't add subkey" @@ -853,7 +901,7 @@ msgid "Add subkey to %s" msgstr "加入子鑰至 %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:130 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 msgid "DSA (sign only)" msgstr "DSA (只能簽署)" @@ -861,7 +909,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (只能加密)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:131 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 msgid "RSA (sign only)" msgstr "RSA (只能簽署)" @@ -882,6 +930,11 @@ msgid "Decryption failed. You probably do not have the decryption key." msgstr "解密失敗。您可能沒有解密的金鑰。" +#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 +#: ../ssh/seahorse-ssh-operation.c:194 +msgid "The operation was cancelled" +msgstr "該操作已取消" + #: ../pgp/seahorse-gpgme-expires.c:65 msgid "Invalid expiry date" msgstr "無效的到期日" @@ -899,46 +952,144 @@ msgid "Expiry: %s" msgstr "到期日: %s" -#: ../pgp/seahorse-gpgme-generate.c:91 +#: ../pgp/seahorse-gpgme-exporter.c:84 +msgid "Multiple Keys" +msgstr "多個金鑰" + +#: ../pgp/seahorse-gpgme-exporter.c:88 +msgid "Key Data" +msgstr "金鑰資料" + +#: ../pgp/seahorse-gpgme-exporter.c:114 +msgid "Armored PGP keys" +msgstr "防護的 PGP 金鑰" + +#: ../pgp/seahorse-gpgme-exporter.c:118 +msgid "PGP keys" +msgstr "PGP 金鑰" + +#: ../pgp/seahorse-gpgme-generate.c:95 msgid "PGP Key" msgstr "PGP 金鑰" -#: ../pgp/seahorse-gpgme-generate.c:92 +#: ../pgp/seahorse-gpgme-generate.c:96 msgid "Used to encrypt email and files" msgstr "用作加密郵件及檔案" -#: ../pgp/seahorse-gpgme-generate.c:128 +#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pkcs11/seahorse-pkcs11-generate.c:92 +#: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:129 +#: ../pgp/seahorse-gpgme-generate.c:133 msgid "DSA Elgamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:178 +#: ../pgp/seahorse-gpgme-generate.c:182 msgid "Couldn't generate PGP key" msgstr "無法產生 PGP 金鑰" -#: ../pgp/seahorse-gpgme-generate.c:209 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Passphrase for New PGP Key" msgstr "PGP 金鑰的密語" -#: ../pgp/seahorse-gpgme-generate.c:210 +#: ../pgp/seahorse-gpgme-generate.c:215 msgid "Enter the passphrase for your new key twice." msgstr "輸入新金鑰的密語兩次。" -#: ../pgp/seahorse-gpgme-generate.c:219 +#. Has line breaks because GtkLabel is completely broken WRT wrapping +#: ../pgp/seahorse-gpgme-generate.c:226 +msgid "" +"When creating a key we need to generate a lot of\n" +"random data and we need you to help. It's a good\n" +"idea to perform some other action like typing on\n" +"the keyboard, moving the mouse, using applications.\n" +"This gives the system the random data that it needs." +msgstr "" +"當建立金鑰時我們需要產生大量\n" +"的亂數資料，而且需要您的協助。\n" +"要產生這些資料，您不妨在鍵盤\n" +"打字、移動滑鼠、使用應用程式等。\n" +"這樣就會讓系統取得所需亂數資料。" + +#: ../pgp/seahorse-gpgme-generate.c:231 +#: ../pkcs11/seahorse-pkcs11-generate.c:460 msgid "Generating key" msgstr "正在產生金鑰" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-deleter.c:78 +#: ../pgp/seahorse-gpgme-secret-deleter.c:77 +#: ../pkcs11/seahorse-pkcs11-deleter.c:66 +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %s?" +msgstr "確定要永久地刪除 %s？" + +#: ../pgp/seahorse-gpgme-key-deleter.c:81 +#, c-format +msgid "Are you sure you want to permanently delete %d keys?" +msgid_plural "Are you sure you want to permanently delete %d keys?" +msgstr[0] "您確定要永久刪除 %d 個金鑰？" + +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "Wrong password" msgstr "錯誤的密碼" -#: ../pgp/seahorse-gpgme-key-op.c:370 +#: ../pgp/seahorse-gpgme-key-op.c:381 msgid "This was the third time you entered a wrong password. Please try again." msgstr "這是您第三次輸入錯誤的密碼。請再試一次。" +#: ../pgp/seahorse-gpgme-keyring.c:91 +#, c-format +msgid "Wrong passphrase." +msgstr "密語錯誤。" + +#: ../pgp/seahorse-gpgme-keyring.c:95 +#, c-format +msgid "Enter new passphrase for '%s'" +msgstr "輸入‘%s’的新密語" + +#: ../pgp/seahorse-gpgme-keyring.c:97 +#, c-format +msgid "Enter passphrase for '%s'" +msgstr "輸入‘%s’的密語" + +#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../src/seahorse-change-passphrase.xml.h:2 +msgid "Enter new passphrase" +msgstr "輸入新的密語" + +#: ../pgp/seahorse-gpgme-keyring.c:102 +msgid "Enter passphrase" +msgstr "輸入密語" + +#: ../pgp/seahorse-gpgme-keyring.c:107 +msgid "Passphrase" +msgstr "密語" + +#: ../pgp/seahorse-gpgme-keyring.c:308 +#, c-format +msgid "Loaded %d key" +msgid_plural "Loaded %d keys" +msgstr[0] "已載入 %d 個金鑰" + +#: ../pgp/seahorse-gpgme-keyring.c:655 +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"無效的金鑰資料（遺漏了 UID）。這可能是電腦的時間不準確，設為未來的時間；或是" +"遺漏了自身的簽章。" + +#: ../pgp/seahorse-gpgme-keyring.c:815 +msgid "GnuPG keys" +msgstr "GnuPG 金鑰" + +#: ../pgp/seahorse-gpgme-keyring.c:818 +msgid "GnuPG: default keyring directory" +msgstr "GnuPG：預設的鑰匙圈目錄" + #: ../pgp/seahorse-gpgme-photos.c:73 #, c-format msgid "" @@ -971,27 +1122,31 @@ msgid "All JPEG files" msgstr "所有 JPEG 檔案" -#: ../pgp/seahorse-gpgme-photos.c:261 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308 +msgid "All files" +msgstr "所有檔案" + +#: ../pgp/seahorse-gpgme-photos.c:263 msgid "Choose Photo to Add to Key" msgstr "選擇加入至金鑰的照片" -#: ../pgp/seahorse-gpgme-photos.c:278 +#: ../pgp/seahorse-gpgme-photos.c:285 msgid "Couldn't prepare photo" msgstr "無法準備相片" -#: ../pgp/seahorse-gpgme-photos.c:288 ../pgp/seahorse-gpgme-photos.c:292 +#: ../pgp/seahorse-gpgme-photos.c:295 ../pgp/seahorse-gpgme-photos.c:298 msgid "Couldn't add photo" msgstr "無法加入相片" -#: ../pgp/seahorse-gpgme-photos.c:289 +#: ../pgp/seahorse-gpgme-photos.c:296 msgid "The file could not be loaded. It may be in an invalid format" msgstr "檔案無法載入。可能無效的格式" -#: ../pgp/seahorse-gpgme-photos.c:318 +#: ../pgp/seahorse-gpgme-photos.c:322 msgid "Are you sure you want to remove the current photo from your key?" msgstr "確定要將目前的門口照片永遠地刪除‘%s’的使用者 ID？" -#: ../pgp/seahorse-gpgme-photos.c:331 +#: ../pgp/seahorse-gpgme-photos.c:335 msgid "Couldn't delete photo" msgstr "無法刪除相片" @@ -1047,7 +1202,11 @@ msgid "Couldn't add revoker" msgstr "無法加入撤銷者" -#: ../pgp/seahorse-gpgme-sign.c:101 +#: ../pgp/seahorse-gpgme-secret-deleter.c:82 ../ssh/seahorse-ssh-deleter.c:83 +msgid "I understand that this secret key will be permanently deleted." +msgstr "我知道這個私鑰會被永久刪除。" + +#: ../pgp/seahorse-gpgme-sign.c:100 #, c-format msgid "" "This key was already signed by\n" @@ -1062,565 +1221,622 @@ #. TODO: We should be giving an error message that allows them to #. generate or import a key -#: ../pgp/seahorse-gpgme-sign.c:161 ../pgp/seahorse-signer.c:61 +#: ../pgp/seahorse-gpgme-sign.c:164 ../pgp/seahorse-signer.c:62 msgid "No keys usable for signing" msgstr "沒有金鑰能用作簽署" -#: ../pgp/seahorse-gpgme-sign.c:162 +#: ../pgp/seahorse-gpgme-sign.c:165 msgid "" "You have no personal PGP keys that can be used to indicate your trust of " "this key." msgstr "您沒有個人 PGP 金鑰可以代表您信任此金鑰。" -#: ../pgp/seahorse-gpgme-source.c:86 -#, c-format -msgid "Wrong passphrase." -msgstr "密語錯誤。" +#: ../pgp/seahorse-gpgme-subkey.c:199 +msgid "ElGamal" +msgstr "ElGamal" -#: ../pgp/seahorse-gpgme-source.c:90 +#: ../pgp/seahorse-hkp-source.c:604 #, c-format -msgid "Enter new passphrase for '%s'" -msgstr "輸入‘%s’的新密語" +msgid "Search was not specific enough. Server '%s' found too many keys." +msgstr "搜尋範圍過寬。伺服器“%s”中找到太多金鑰。" -#: ../pgp/seahorse-gpgme-source.c:92 +#: ../pgp/seahorse-hkp-source.c:607 #, c-format -msgid "Enter passphrase for '%s'" -msgstr "輸入‘%s’的密語" - -#: ../pgp/seahorse-gpgme-source.c:95 ../src/seahorse-change-passphrase.xml.h:4 -msgid "Enter new passphrase" -msgstr "輸入新的密語" +msgid "Couldn't communicate with server '%s': %s" +msgstr "無法與伺服器‘%s’聯絡：%s" -#: ../pgp/seahorse-gpgme-source.c:97 -msgid "Enter passphrase" -msgstr "輸入密語" +#: ../pgp/seahorse-hkp-source.c:1127 +msgid "HTTP Key Server" +msgstr "HTTP 金鑰伺服器" + +#: ../pgp/seahorse-keyserver-results.c:175 +msgid "Couldn't import keys" +msgstr "無法匯入金鑰" + +#: ../pgp/seahorse-keyserver-results.c:218 +msgid "Importing keys from key servers" +msgstr "從金鑰伺服器匯入金鑰" + +#. TRANSLATORS: The "Remote" menu contains key operations on remote systems. +#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508 +msgid "_Remote" +msgstr "遠端(_R)" + +#: ../pgp/seahorse-keyserver-results.c:246 +msgid "Close this window" +msgstr "關閉本視窗" -#: ../pgp/seahorse-gpgme-source.c:328 +#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113 +msgid "_Find Remote Keys..." +msgstr "尋找遠端金鑰(_F)…" + +#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114 +msgid "Search for keys on a key server" +msgstr "在金鑰伺服器尋找金鑰" + +#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +msgid "_Import" +msgstr "匯入(_I)" + +#: ../pgp/seahorse-keyserver-results.c:256 +msgid "Import selected keys to local key ring" +msgstr "匯入已選的金鑰到本機鑰匙圈" + +#: ../pgp/seahorse-keyserver-results.c:286 +msgid "Remote Keys" +msgstr "遠端金鑰" + +#: ../pgp/seahorse-keyserver-results.c:288 #, c-format -msgid "Loaded %d key" -msgid_plural "Loaded %d keys" -msgstr[0] "已載入 %d 個金鑰" -msgstr[1] "已載入 %d 個金鑰" +msgid "Remote Keys Containing '%s'" +msgstr "遠端金鑰包含‘%s’" + +#: ../pgp/seahorse-keyserver-results.c:485 +msgid "The search for keys failed." +msgstr "搜尋金鑰失敗。" + +#: ../pgp/seahorse-keyserver-search.xml.h:1 +msgid "Find Remote Keys" +msgstr "尋找遠端金鑰" -#: ../pgp/seahorse-gpgme-source.c:649 +#: ../pgp/seahorse-keyserver-search.xml.h:2 msgid "" -"Invalid key data (missing UIDs). This may be due to a computer with a date " -"set in the future or a missing self-signature." +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." msgstr "" -"無效的金鑰資料（遺漏了 UID）。這可能是電腦的時間不準確，設為未來的時間；或是" -"遺漏了自身的簽章。" +"這樣會在網際網路上尋找給別人的金鑰。然後這些金鑰能匯入到您的本地鑰匙圈中。" -#: ../pgp/seahorse-gpgme-subkey.c:199 -msgid "ElGamal" -msgstr "ElGamal" +#: ../pgp/seahorse-keyserver-search.xml.h:3 +msgid "_Search for keys containing: " +msgstr "搜尋金鑰包含(_S):" -#: ../pgp/seahorse-hkp-source.c:645 -msgid "HTTP Key Server" -msgstr "HTTP 金鑰伺服器" +#: ../pgp/seahorse-keyserver-search.xml.h:4 +msgid "Key Servers:" +msgstr "金鑰伺服器：" + +#: ../pgp/seahorse-keyserver-search.xml.h:5 +msgid "Shared Keys Near Me:" +msgstr "附近的共享金鑰：" + +#: ../pgp/seahorse-keyserver-search.xml.h:6 +msgid "Where to search:" +msgstr "搜尋的地方：" + +#: ../pgp/seahorse-keyserver-search.xml.h:7 +msgid "_Search" +msgstr "搜尋(_S)" + +#: ../pgp/seahorse-keyserver-sync.c:57 +msgid "Couldn't publish keys to server" +msgstr "無法發行金鑰到伺服器" -#: ../pgp/seahorse-hkp-source.c:680 +#: ../pgp/seahorse-keyserver-sync.c:76 #, c-format -msgid "Search was not specific enough. Server '%s' found too many keys." -msgstr "搜尋範圍過寬。伺服器“%s”中找到太多金鑰。" +msgid "Couldn't retrieve keys from server: %s" +msgstr "無法從伺服器中取得金鑰：%s" -#: ../pgp/seahorse-hkp-source.c:683 +#: ../pgp/seahorse-keyserver-sync.c:160 #, c-format -msgid "Couldn't communicate with server '%s': %s" -msgstr "無法與伺服器‘%s’聯絡：%s" +msgid "%d key is selected for synchronizing" +msgid_plural "%d keys are selected for synchronizing" +msgstr[0] "選擇了 %d 個金鑰來進行同步" + +#: ../pgp/seahorse-keyserver-sync.c:240 +msgid "Synchronizing keys..." +msgstr "金鑰正在同步…" + +#: ../pgp/seahorse-keyserver-sync.xml.h:1 +msgid "Sync Keys" +msgstr "金鑰同步" + +#: ../pgp/seahorse-keyserver-sync.xml.h:2 +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"這會發行您的金鑰到金鑰伺服器，給其他人能使用。同樣您他們給您的金鑰若有任何改" +"變時，您也可以取得。" + +#: ../pgp/seahorse-keyserver-sync.xml.h:3 +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"這樣他們給您的金鑰若有任何改變時，您也可以取得。沒有選取金鑰伺服器作發行，所" +"以其它人不會有您的金鑰。" + +#: ../pgp/seahorse-keyserver-sync.xml.h:4 +msgid "_Key Servers" +msgstr "金鑰伺服器(_K)" + +#: ../pgp/seahorse-keyserver-sync.xml.h:5 +msgid "_Sync" +msgstr "同步(_S)" -#: ../pgp/seahorse-ldap-source.c:440 +#: ../pgp/seahorse-ldap-source.c:441 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "無法與‘%s’溝通：%s" -#: ../pgp/seahorse-ldap-source.c:651 +#: ../pgp/seahorse-ldap-source.c:652 #, c-format msgid "Connecting to: %s" msgstr "連接到：%s" -#: ../pgp/seahorse-ldap-source.c:657 +#: ../pgp/seahorse-ldap-source.c:658 #, c-format msgid "Couldn't resolve address: %s" msgstr "無法解析位置：%s" -#: ../pgp/seahorse-ldap-source.c:701 +#: ../pgp/seahorse-ldap-source.c:702 #, c-format msgid "Resolving server address: %s" msgstr "正在解析伺服器位址：%s" -#: ../pgp/seahorse-ldap-source.c:781 +#: ../pgp/seahorse-ldap-source.c:1447 msgid "LDAP Key Server" msgstr "LDAP 金鑰伺服器" -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "_Sign Key..." -msgstr "簽署金鑰(_S)…" - -#: ../pgp/seahorse-pgp-commands.c:104 -msgid "Sign public key" -msgstr "簽署公鑰" - -#: ../pgp/seahorse-pgp-commands.c:174 -#, c-format -msgid "Are you sure you want to permanently delete %s?" -msgstr "確定要永久地刪除 %s？" - -#: ../pgp/seahorse-pgp-commands.c:179 -#, c-format -msgid "Are you sure you want to permanently delete %d keys and identities?" -msgstr "確定要將 %d 個金鑰與身分識別永久地刪除嗎？" - -#: ../pgp/seahorse-pgp-commands.c:181 -#, c-format -msgid "Are you sure you want to permanently delete %d keys?" -msgstr "您確定要永久刪除 %d 個金鑰？" +#: ../pgp/seahorse-pgp-actions.c:118 +msgid "_Sync and Publish Keys..." +msgstr "同步及發行金鑰(_S)…" -#: ../pgp/seahorse-pgp-commands.c:183 -#, c-format -msgid "Are you sure you want to permanently delete %d identities?" -msgstr "您確定要永久刪除 %d 個身分識別？" +#: ../pgp/seahorse-pgp-actions.c:119 +msgid "Publish and/or synchronize your keys with those online." +msgstr "在線時發行及/或將金鑰同步" -#: ../pgp/seahorse-pgp-commands.c:201 ../pgp/seahorse-pgp-key-properties.c:348 -msgid "Couldn't delete user ID" -msgstr "無法刪除使用者 ID" +#: ../pgp/seahorse-pgp-backend.c:172 +msgid "PGP Keys" +msgstr "PGP 金鑰" -#: ../pgp/seahorse-pgp-commands.c:205 -msgid "Couldn't delete private key" -msgstr "無法刪除私密金鑰" - -#: ../pgp/seahorse-pgp-commands.c:208 -msgid "Couldn't delete public key" -msgstr "無法刪除公開金鑰" +#: ../pgp/seahorse-pgp-backend.c:175 +msgid "PGP keys are for encrypting email or files" +msgstr "用來加密郵件或檔案的 PGP 金鑰" -#: ../pgp/seahorse-pgp-generate.xml.h:1 ../ssh/seahorse-ssh-generate.xml.h:1 -msgid "_Advanced key options" -msgstr "進階金鑰選項(_A)" +#: ../pgp/seahorse-pgp-generate.xml.h:1 +msgid "C_reate" +msgstr "建立(_R)" #: ../pgp/seahorse-pgp-generate.xml.h:2 -msgid "A PGP key allows you to encrypt email or files to other people." -msgstr "PGP 金鑰允許您將給別人的電郵及檔案加密。" +msgid "Generate a new key" +msgstr "產生新的金鑰" #: ../pgp/seahorse-pgp-generate.xml.h:3 -msgid "Algorithms here" -msgstr "演算法這裡" +msgid "A PGP key allows you to encrypt email or files to other people." +msgstr "PGP 金鑰允許您將給別人的電郵及檔案加密。" -#: ../pgp/seahorse-pgp-generate.xml.h:4 -msgid "C_reate" -msgstr "建立(_R)" +#: ../pgp/seahorse-pgp-generate.xml.h:7 +msgid "_Comment:" +msgstr "附註(_C):" -#: ../pgp/seahorse-pgp-generate.xml.h:5 -msgid "E_xpiration Date:" -msgstr "有效日期(_X):" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "Ne_ver Expires" +msgstr "永不過期(_V)" -#: ../pgp/seahorse-pgp-generate.xml.h:6 ../ssh/seahorse-ssh-generate.xml.h:4 +#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "加密類型(_T):" -#: ../pgp/seahorse-pgp-generate.xml.h:8 -msgid "Generate a new key" -msgstr "產生新的金鑰" - -#: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:6 +#: ../pgp/seahorse-pgp-generate.xml.h:10 +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:5 +#: ../ssh/seahorse-ssh-generate.xml.h:8 msgid "Key _Strength (bits):" msgstr "金鑰強度[位元](_S):" -#: ../pgp/seahorse-pgp-generate.xml.h:10 -msgid "Ne_ver Expires" -msgstr "永不過期(_V)" - #: ../pgp/seahorse-pgp-generate.xml.h:11 -msgid "New PGP Key" -msgstr "新增 PGP 金鑰" +msgid "E_xpiration Date:" +msgstr "有效日期(_X):" #: ../pgp/seahorse-pgp-generate.xml.h:12 -msgid "_Comment:" -msgstr "附註(_C):" +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:6 +#: ../ssh/seahorse-ssh-generate.xml.h:11 +msgid "_Advanced key options" +msgstr "進階金鑰選項(_A)" -#: ../pgp/seahorse-pgp-key.c:572 ../pgp/seahorse-pgp-key-properties.c:1489 -msgid "Expired" -msgstr "已過期" +#: ../pgp/seahorse-pgp-key.c:353 +msgid "Personal PGP key" +msgstr "個人 PGP 金鑰" + +#: ../pgp/seahorse-pgp-key.c:355 +msgid "PGP key" +msgstr "PGP 金鑰" -#: ../pgp/seahorse-pgp-key-properties.c:319 +#: ../pgp/seahorse-pgp-key-properties.c:325 msgid "Couldn't change primary user ID" msgstr "無法變更主要的使用者 ID" -#: ../pgp/seahorse-pgp-key-properties.c:338 +#: ../pgp/seahorse-pgp-key-properties.c:344 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "確定要永久地刪除‘%s’的使用者 ID？" -#: ../pgp/seahorse-pgp-key-properties.c:433 -#: ../pgp/seahorse-pgp-key-properties.c:1604 +#: ../pgp/seahorse-pgp-key-properties.c:354 +msgid "Couldn't delete user ID" +msgstr "無法刪除使用者 ID" + +#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[不詳]" -#: ../pgp/seahorse-pgp-key-properties.c:533 -#: ../pgp/seahorse-pgp-key-properties.c:1885 +#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "名稱/電郵" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:545 msgid "Signature ID" msgstr "簽章 ID" -#: ../pgp/seahorse-pgp-key-properties.c:671 +#: ../pgp/seahorse-pgp-key-properties.c:678 msgid "Couldn't change primary photo" msgstr "無法變更主要的相片" -#: ../pgp/seahorse-pgp-key-properties.c:903 +#. TRANSLATORS: (unknown) expiry date +#: ../pgp/seahorse-pgp-key-properties.c:912 msgid "(unknown)" msgstr "（不明）" -#: ../pgp/seahorse-pgp-key-properties.c:906 +#: ../pgp/seahorse-pgp-key-properties.c:915 #, c-format msgid "This key expired on: %s" msgstr "此金鑰的過期於：%s" -#: ../pgp/seahorse-pgp-key-properties.c:967 -#: ../src/seahorse-key-manager-store.c:802 +#: ../pgp/seahorse-pgp-key-properties.c:978 msgid "Name" msgstr "名稱" -#: ../pgp/seahorse-pgp-key-properties.c:1078 +#: ../pgp/seahorse-pgp-key-properties.c:1091 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "確定要永久地刪除 %2$s 的子鑰 %1$d？" -#: ../pgp/seahorse-pgp-key-properties.c:1087 +#: ../pgp/seahorse-pgp-key-properties.c:1100 msgid "Couldn't delete subkey" msgstr "無法刪除子鑰" -#: ../pgp/seahorse-pgp-key-properties.c:1127 -#: ../pgp/seahorse-pgp-key-properties.c:1567 +#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "無法更改信任度" -#: ../pgp/seahorse-pgp-key-properties.c:1142 ../src/seahorse-viewer.c:298 -#: ../ssh/seahorse-ssh-key-properties.c:201 -#, c-format -msgid "Couldn't export key to \"%s\"" -msgstr "無法匯出金鑰至“%s”" - -#: ../pgp/seahorse-pgp-key-properties.c:1172 -#: ../ssh/seahorse-ssh-key-properties.c:225 -msgid "Export Complete Key" -msgstr "匯出整個金鑰" - -#: ../pgp/seahorse-pgp-key-properties.c:1197 -#: ../ssh/seahorse-ssh-key-properties.c:247 -msgid "Couldn't export key." -msgstr "無法匯出金鑰。" +#: ../pgp/seahorse-pgp-key-properties.c:1153 +#: ../ssh/seahorse-ssh-key-properties.c:202 +msgid "Couldn't export key" +msgstr "無法匯出金鑰" -#: ../pgp/seahorse-pgp-key-properties.c:1407 -#: ../pgp/seahorse-pgp-key-properties.c:1496 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "永不" -#: ../pgp/seahorse-pgp-key-properties.c:1454 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#. The key type column -#: ../pgp/seahorse-pgp-key-properties.c:1457 -#: ../src/seahorse-key-manager-store.c:833 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "類型" -#: ../pgp/seahorse-pgp-key-properties.c:1460 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "建立日期" -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "有效日期" -#: ../pgp/seahorse-pgp-key-properties.c:1466 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "狀態" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "強度" -#: ../pgp/seahorse-pgp-key-properties.c:1493 +#: ../pgp/seahorse-pgp-key-properties.c:1467 +msgid "Expired" +msgstr "已過期" + +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "良好" -#: ../pgp/seahorse-pgp-key-properties.c:1888 -#: ../src/seahorse-key-manager-store.c:814 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "金鑰 ID" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 -msgid "Actions" -msgstr "動作" - #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 -msgid "Comment:" -msgstr "附註：" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3 -msgid "Dates" -msgstr "日期" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 -msgid "Email:" -msgstr "電郵：" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5 -msgid "Fingerprint" -msgstr "指紋" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -msgid "Key ID:" -msgstr "金鑰 ID：" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 +msgid "Never" +msgstr "永不" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 -msgid "Key Names and Signatures" -msgstr "金鑰名稱及簽章" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 +msgid "This key has been revoked" +msgstr "此金鑰已被撤銷" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:8 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 -msgid "Photo " -msgstr "相片" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:8 +msgid "The owner of the key revoked the key. It can no longer be used." +msgstr "金鑰的擁有者已將金鑰撤銷。它不能繼續使用。" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:9 -msgid "Technical Details" -msgstr "技術資料" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 +msgid "This key has expired" +msgstr "此金鑰的已經過期" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:10 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:9 -msgid "This key has been revoked" -msgstr "此金鑰已被撤銷" +msgid "Add a photo to this key" +msgstr "加入照片至本金鑰" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:11 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:10 -msgid "This key has expired" -msgstr "此金鑰的已經過期" +msgid "Remove this photo from this key" +msgstr "將此相片從本金鑰中移除" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:12 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 -#: ../ssh/seahorse-ssh-key-properties.xml.h:9 -msgid "Type:" -msgstr "類型:" +msgid "Make this photo the primary photo" +msgstr "使本相片成為主要的相片" -#. To translators: This is the noun not the verb. -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 -#: ../ssh/seahorse-ssh-key-properties.xml.h:11 -msgid "Use:" -msgstr "用作：" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:13 +msgid "Go to previous photo" +msgstr "回上一幅相片" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:15 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 -msgid "_Subkeys" -msgstr "子鑰(_S)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:14 +msgid "Go to next photo" +msgstr "往下一幅相片" +#. A photograph #: ../pgp/seahorse-pgp-private-key-properties.xml.h:16 -msgid "Add" -msgstr "加入" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:11 +msgid "Photo " +msgstr "相片" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:17 -msgid "Add a photo to this key" -msgstr "加入照片至本金鑰" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +msgid "Key ID:" +msgstr "金鑰 ID：" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:18 -#: ../ssh/seahorse-ssh-key-properties.xml.h:14 -msgid "Change _Passphrase" -msgstr "更改密語(_P)" +#. Name of key, usually a persons name +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:19 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:17 +msgctxt "name-of-key" +msgid "Name:" +msgstr "名稱：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:20 -msgid "Decrypt files and email sent to you." -msgstr "將傳給您的檔案及電郵解密。" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:18 +msgid "Email:" +msgstr "電郵：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:21 -msgid "Delete" -msgstr "刪除" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:19 +msgid "Comment:" +msgstr "附註：" +#. To translators: This is the noun not the verb. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 -msgid "Expire" -msgstr "有效日期" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 +#: ../ssh/seahorse-ssh-key-properties.xml.h:9 +msgid "Use:" +msgstr "用作：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 -msgid "Expires:" -msgstr "有效日期：" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 +#: ../ssh/seahorse-ssh-key-properties.xml.h:3 +msgid "Type:" +msgstr "類型:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:25 -msgid "Export" -msgstr "匯出" +msgid "Decrypt files and email sent to you." +msgstr "將傳給您的檔案及電郵解密。" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:26 +msgid "Private PGP Key" +msgstr "私人 PGP 金鑰" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:27 -msgid "Go to next photo" -msgstr "往下一幅相片" +#: ../ssh/seahorse-ssh-key-properties.xml.h:10 +msgid "Change _Passphrase" +msgstr "更改密語(_P)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:28 -msgid "Go to previous photo" -msgstr "回上一幅相片" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +msgid "Owner" +msgstr "擁有者" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:29 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:29 -msgid "Key ID:" -msgstr "金鑰 ID：" +msgid "Key Names and Signatures" +msgstr "金鑰名稱及簽章" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:30 +msgid "Primary" +msgstr "主要" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:31 -msgid "Make this photo the primary photo" -msgstr "使本相片成為主要的相片" +msgid "Sign" +msgstr "簽署" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:33 -msgid "Names and Signatures" -msgstr "名稱及簽章" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:32 +msgid "Delete" +msgstr "刪除" +#. Add another name to the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:34 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:32 -msgid "Never" -msgstr "永不" +msgid "_Add Name" +msgstr "加入名稱(_A)" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:35 -msgid "Override Owner _Trust:" -msgstr "取締擁有者的信任度(_T):" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:36 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 -msgid "Owner" -msgstr "擁有者" +msgid "Revoke" +msgstr "撤銷" +#. List of names and signatures on the PGP key. #: ../pgp/seahorse-pgp-private-key-properties.xml.h:37 -msgid "Primary" -msgstr "主要" +msgid "Names and Signatures" +msgstr "名稱及簽章" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:38 -msgid "Private PGP Key" -msgstr "私人 PGP 金鑰" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 +msgid "Key ID:" +msgstr "金鑰 ID：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:39 -msgid "Remove this photo from this key" -msgstr "將此相片從本金鑰中移除" - -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40 -msgid "Revoke" -msgstr "撤銷" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40 +msgid "Strength:" +msgstr "強度：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 -msgid "Sign" -msgstr "簽署" +msgid "Technical Details" +msgstr "技術資料" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:42 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 -msgid "Strength:" -msgstr "強度：" +msgid "Fingerprint" +msgstr "指紋" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 -msgid "The owner of the key revoked the key. It can no longer be used." -msgstr "金鑰的擁有者已將金鑰撤銷。它不能繼續使用。" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 +msgid "Expires:" +msgstr "有效日期：" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 -msgid "_Add Name" -msgstr "加入名稱(_A)" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 +msgid "Dates" +msgstr "日期" -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Override Owner _Trust:" +msgstr "取締擁有者的信任度(_T):" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "_Export Complete Key:" msgstr "匯出整個金鑰(_E):" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:49 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 -msgctxt "name-of-key" -msgid "Name:" -msgstr "名稱：" +msgid "Actions" +msgstr "動作" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 -msgid "Dates:" -msgstr "日期：" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50 +msgid "Add" +msgstr "加入" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 +msgid "Expire" +msgstr "有效日期" + +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:52 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:48 +msgid "_Subkeys" +msgstr "子鑰(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:3 +msgid "Marginally" +msgstr "勉強的" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:4 -#: ../ssh/seahorse-ssh-key-properties.xml.h:2 -msgid "Fingerprint:" -msgstr "指紋：" +msgid "Fully" +msgstr "完全的" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:5 -msgid "Indicate Trust:" -msgstr "信任度：" +msgid "Ultimately" +msgstr "徹底的" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:14 -msgid "Your trust of this key" -msgstr "您信任此金鑰" +msgid "Encrypt files and email to the key's owner" +msgstr "加密給金鑰擁有者的檔案及電郵" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:21 +msgid "Public PGP Key" +msgstr "公共 PGP 金鑰" + +#. Names set on the PGP key. +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:23 msgid "_Other Names:" msgstr "其它名稱：(_O)" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:16 -msgid "_People who have signed this key:" -msgstr "誰簽署此金鑰(_P):" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 -msgid "Encrypt files and email to the key's owner " -msgstr "加密給金鑰擁有者的檔案及電郵" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:25 +msgid "Your trust of this key" +msgstr "您信任此金鑰" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:22 -msgid "Fully" -msgstr "完全的" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +msgid "Your trust is manually specified on the Details tab." +msgstr "您的信任度是在詳細資料中自行設定。" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:24 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 #, no-c-format msgid "I trust signatures from '%s' on other keys" msgstr "我信任來自「%s」其它金鑰的簽章。" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:26 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:30 #, no-c-format msgid "" "If you believe that the person that owns this key is '%s', sign this " "key:" msgstr "如果您信任擁有這個金鑰的人是「%s」，簽署此金鑰：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:28 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 +msgid "_Sign this Key" +msgstr "簽署此金鑰(_S)" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:33 #, no-c-format msgid "" "If you no longer trust that '%s' owns this key, revoke your signature:" msgstr "如果您不再信任此「%s」擁有這個金鑰，撤銷您的簽章：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:31 -msgid "Marginally" -msgstr "勉強的" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:34 -msgid "Public PGP Key" -msgstr "公共 PGP 金鑰" +msgid "_Revoke Signature" +msgstr "撤銷簽章(_R):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:35 +msgid "_People who have signed this key:" +msgstr "誰簽署此金鑰(_P):" + +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:36 +msgid "_Only display the signatures of people I trust" +msgstr "只顯示我信任的人的簽章(_O)" -#. Trust column #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37 -#: ../src/seahorse-key-manager-store.c:827 msgid "Trust" msgstr "信任" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39 -msgid "Ultimately" -msgstr "徹底的" - -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41 -msgid "You _Trust the Owner:" -msgstr "您信任擁有者(_T)" - #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 -msgid "Your trust is manually specified on the Details tab." -msgstr "您的信任度是在詳細資料中自行設定。" +#: ../ssh/seahorse-ssh-key-properties.xml.h:19 +msgid "Fingerprint:" +msgstr "指紋：" #: ../pgp/seahorse-pgp-public-key-properties.xml.h:43 -msgid "_Only display the signatures of people I trust" -msgstr "只顯示我信任的人的簽章(_O)" +msgid "Dates:" +msgstr "日期：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44 -msgid "_Revoke Signature" -msgstr "撤銷簽章(_R):" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:46 +msgid "Indicate Trust:" +msgstr "信任度：" -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45 -msgid "_Sign this Key" -msgstr "簽署此金鑰(_S)" +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 +msgid "You _Trust the Owner:" +msgstr "您信任擁有者(_T)" #: ../pgp/seahorse-pgp-subkey.c:371 #, c-format @@ -1628,2200 +1844,713 @@ msgstr "%2$s 的子鑰 %1$d" #: ../pgp/seahorse-revoke.xml.h:1 -msgid "Optional description of revocation" -msgstr "撤銷的描述（非必要）" - -#: ../pgp/seahorse-revoke.xml.h:2 -msgid "Re_voke" -msgstr "撤銷(_V)" - -#: ../pgp/seahorse-revoke.xml.h:3 msgid "Reason for revoking the key" msgstr "撤銷金鑰的原因" -#: ../pgp/seahorse-revoke.xml.h:6 +#: ../pgp/seahorse-revoke.xml.h:2 msgid "_Reason:" msgstr "原因(_R):" -#: ../pgp/seahorse-signer.c:62 +#: ../pgp/seahorse-revoke.xml.h:4 +msgid "Optional description of revocation" +msgstr "撤銷的描述（非必要）" + +#: ../pgp/seahorse-revoke.xml.h:6 +msgid "Re_voke" +msgstr "撤銷(_V)" + +#: ../pgp/seahorse-signer.c:63 msgid "" "You have no personal PGP keys that can be used to sign a document or message." msgstr "您沒有 PGP 金鑰可用作簽署文件或訊息。" +#: ../pgp/seahorse-signer.xml.h:1 +msgid "_Sign message with key:" +msgstr "簽署信息的金鑰(_S):" + #: ../pgp/seahorse-sign.xml.h:1 -msgid "How carefully have you checked this key?" -msgstr "您要多小心地驗證本金鑰？" +msgid "Sign Key" +msgstr "簽署金鑰" #: ../pgp/seahorse-sign.xml.h:2 -msgid "How others will see this signature:" -msgstr "其他人如何看到此簽章：" - -#: ../pgp/seahorse-sign.xml.h:3 -msgid "Sign key as:" -msgstr "用作簽署的金鑰：" - -#: ../pgp/seahorse-sign.xml.h:4 -msgid "" -"Casually: means you have done a casual verification that the key is " -"owned by the person who claims to own it. For example, you could read the " -"key fingerprint to the owner over the phone. " -msgstr "" -"隨意：代表您隨意地檢驗過金鑰是由聲稱擁有它的人擁有。例如，您可以透過電" -"話要求該人讀出金鑰的數位指紋。" - -#: ../pgp/seahorse-sign.xml.h:5 -msgid "Key Name" -msgstr "金鑰名稱" - -#: ../pgp/seahorse-sign.xml.h:6 -msgid "" -"Not at all: means you believe the key is owned by the person who " -"claims to own it, but you could not or did not verify this to be a fact." -msgstr "" -"沒關係：代表您信任金鑰是由聲稱擁有它的人所擁有，但實際上您不能或是沒有" -"檢查它。" - -#: ../pgp/seahorse-sign.xml.h:7 -msgid "" -"Very Carefully: Select this only if you are absolutely sure that this " -"key is genuine." -msgstr "非常小心：只有您在完全信任此金鑰為真時才選取此項。" - -#: ../pgp/seahorse-sign.xml.h:8 -msgid "By signing you indicate your trust that this key belongs to:" -msgstr "簽署代表您信任本金鑰是屬於：" - -#: ../pgp/seahorse-sign.xml.h:9 -msgid "I can _revoke this signature at a later date." -msgstr "我可以在稍後時間撤銷此簽章(_R)" - -#: ../pgp/seahorse-sign.xml.h:10 -msgid "Sign Key" -msgstr "簽署金鑰" - -#: ../pgp/seahorse-sign.xml.h:11 -msgid "" -"You could use a hard to forge photo identification (such as a passport) to " -"personally check that the name on the key is correct. You should have also " -"used email to check that the email address belongs to the owner." -msgstr "" -"您可以使用難以偽造的相片（像護照一樣）來辨認金鑰的名稱是否正確。您同時應以電" -"郵來檢查該電郵是否屬於該人擁有。" - -#: ../pgp/seahorse-sign.xml.h:12 -msgid "_Casually" -msgstr "隨意(_C)" - -#: ../pgp/seahorse-sign.xml.h:13 -msgid "_Not at all" -msgstr "沒關係(_N)" - -#: ../pgp/seahorse-sign.xml.h:14 -msgid "_Others may not see this signature" -msgstr "其他人可能無法看到此簽章(_O)" - -#: ../pgp/seahorse-sign.xml.h:15 -msgid "_Sign" -msgstr "簽署(_S)" - -#: ../pgp/seahorse-sign.xml.h:16 -msgid "_Signer:" -msgstr "簽章者(_S)" - -#: ../pgp/seahorse-sign.xml.h:17 -msgid "_Very Carefully" -msgstr "非常小心(_V)" - -#: ../pgp/seahorse-signer.xml.h:1 -msgid "_Sign message with key:" -msgstr "簽署信息的金鑰(_S):" - -#: ../pkcs11/seahorse-pkcs11-certificate.c:106 -#: ../pkcs11/seahorse-pkcs11-certificate-props.c:66 -msgid "Certificate" -msgstr "憑證" - -#: ../pkcs11/seahorse-pkcs11-commands.c:106 -msgid "Couldn't delete" -msgstr "無法刪除" - -#: ../pkcs11/seahorse-pkcs11-commands.c:127 -#, c-format -msgid "Are you sure you want to delete the certificate '%s'?" -msgstr "確定要刪除這個憑證「%s」？" - -#: ../pkcs11/seahorse-pkcs11-commands.c:130 -#, c-format -msgid "Are you sure you want to delete %d certificate?" -msgid_plural "Are you sure you want to delete %d certificates?" -msgstr[0] "確定要刪除 %d 個憑證？" -msgstr[1] "確定要刪除 %d 個憑證？" - -#: ../pkcs11/seahorse-pkcs11-commands.c:143 -msgid "Deleting" -msgstr "刪除" - -#: ../src/seahorse-change-passphrase.xml.h:1 -msgid "Change Passphrase" -msgstr "更改密語" - -#: ../src/seahorse-change-passphrase.xml.h:2 -msgid "Con_firm Passphrase:" -msgstr "確認密語(_F):" - -#: ../src/seahorse-change-passphrase.xml.h:3 -msgid "Confirm new passphrase" -msgstr "確認新的密語" - -#: ../src/seahorse-change-passphrase.xml.h:5 -msgid "New _Passphrase:" -msgstr "新的密語(_P):" - -#: ../src/seahorse.desktop.in.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "管理密碼及金鑰" - -#: ../src/seahorse.desktop.in.in.h:2 ../src/seahorse-key-manager.c:868 -#: ../src/seahorse-main.c:76 ../src/seahorse-viewer.c:147 -msgid "Passwords and Keys" -msgstr "密碼及加密金鑰" - -#: ../src/seahorse-generate-select.xml.h:1 -msgid "_Select the type of item to create:" -msgstr "選取想要建立的項目類型(_S):" - -#: ../src/seahorse-generate-select.xml.h:2 -msgid "C_ontinue" -msgstr "繼續(_O)" - -#: ../src/seahorse-generate-select.xml.h:3 -msgid "Create New ..." -msgstr "建立新的…" - -#: ../src/seahorse-key-manager.c:251 ../src/seahorse-keyserver-results.c:116 -#, c-format -msgid "Selected %d key" -msgid_plural "Selected %d keys" -msgstr[0] "已選取 %d 個金鑰" -msgstr[1] "已選取 %d 個金鑰" - -#: ../src/seahorse-key-manager.c:431 ../src/seahorse-key-manager.c:489 -#: ../src/seahorse-key-manager.c:550 ../src/seahorse-viewer.c:453 -msgid "Couldn't import keys" -msgstr "無法匯入金鑰" - -#: ../src/seahorse-key-manager.c:433 ../src/seahorse-viewer.c:455 -msgid "Imported keys" -msgstr "匯入的金鑰" - -#: ../src/seahorse-key-manager.c:484 -msgid "Importing keys" -msgstr "正在匯入金鑰" - -#: ../src/seahorse-key-manager.c:504 ../ssh/seahorse-ssh-operation.c:891 -msgid "Import Key" -msgstr "匯入金鑰" - -#: ../src/seahorse-key-manager.c:550 -msgid "Unrecognized key type, or invalid data format" -msgstr "無法辨別的金鑰類型，或是無效的資料格式" - -#: ../src/seahorse-key-manager.c:565 -msgid "Importing Keys" -msgstr "匯入金鑰" - -#: ../src/seahorse-key-manager.c:737 ../src/seahorse-keyserver-results.c:254 -msgid "_Remote" -msgstr "遠端(_R)" - -#: ../src/seahorse-key-manager.c:739 -msgid "Close this program" -msgstr "關閉本程式" - -#: ../src/seahorse-key-manager.c:740 -msgid "_New..." -msgstr "新增(_N)…" - -#: ../src/seahorse-key-manager.c:741 -msgid "Create a new key or item" -msgstr "建立新的金鑰或項目" - -#: ../src/seahorse-key-manager.c:742 -msgid "_Import..." -msgstr "匯入(_I)…" - -#: ../src/seahorse-key-manager.c:743 -msgid "Import from a file" -msgstr "由檔案匯入" - -#: ../src/seahorse-key-manager.c:745 -msgid "Import from the clipboard" -msgstr "從剪貼簿匯入" - -#: ../src/seahorse-key-manager.c:750 ../src/seahorse-keyserver-results.c:264 -msgid "_Find Remote Keys..." -msgstr "尋找遠端金鑰(_F)…" - -#: ../src/seahorse-key-manager.c:751 ../src/seahorse-keyserver-results.c:265 -msgid "Search for keys on a key server" -msgstr "在金鑰伺服器尋找金鑰" - -#: ../src/seahorse-key-manager.c:752 -msgid "_Sync and Publish Keys..." -msgstr "同步及發行金鑰(_S)…" - -#: ../src/seahorse-key-manager.c:753 -msgid "Publish and/or synchronize your keys with those online." -msgstr "在線時發行及/或將金鑰同步" - -#: ../src/seahorse-key-manager.c:758 -msgid "T_ypes" -msgstr "類型(_Y)" - -#: ../src/seahorse-key-manager.c:758 -msgid "Show type column" -msgstr "顯示類型欄位" - -#: ../src/seahorse-key-manager.c:760 -msgid "_Expiry" -msgstr "有效日期(_E)" - -#: ../src/seahorse-key-manager.c:760 -msgid "Show expiry column" -msgstr "顯示有效日期欄位" - -#: ../src/seahorse-key-manager.c:762 -msgid "_Trust" -msgstr "信任(_T)" - -#: ../src/seahorse-key-manager.c:762 -msgid "Show owner trust column" -msgstr "顯示信任欄位" - -#: ../src/seahorse-key-manager.c:764 -msgid "_Validity" -msgstr "有效性(_V)" - -#: ../src/seahorse-key-manager.c:764 -msgid "Show validity column" -msgstr "顯示有效性欄位" - -#: ../src/seahorse-key-manager.c:941 -msgid "Filter:" -msgstr "過濾條件:" - -#: ../src/seahorse-key-manager.xml.h:1 -msgid "First time options:" -msgstr "第一次執行選項：" - -#: ../src/seahorse-key-manager.xml.h:2 -msgid "Generate a new key of your own: " -msgstr "產生您的金鑰：" - -#: ../src/seahorse-key-manager.xml.h:3 -msgid "Import existing keys from a file:" -msgstr "從檔案中匯入已存的金鑰" - -#: ../src/seahorse-key-manager.xml.h:4 -msgid "My _Personal Keys" -msgstr "我的個人金鑰(_P)" - -#: ../src/seahorse-key-manager.xml.h:5 -msgid "Other _Keys" -msgstr "其他金鑰(_K)" - -#: ../src/seahorse-key-manager.xml.h:6 -msgid "To get started with encryption you will need keys." -msgstr "開始加密前您需要擁有金鑰。" - -#: ../src/seahorse-key-manager.xml.h:7 ../src/seahorse-viewer.c:518 -msgid "_Import" -msgstr "匯入(_I)" - -#: ../src/seahorse-key-manager.xml.h:8 -msgid "_Passwords" -msgstr "密碼(_P)" - -#: ../src/seahorse-key-manager-store.c:610 ../src/seahorse-viewer.c:263 -msgid "Couldn't export keys" -msgstr "無法匯出金錀" - -#: ../src/seahorse-key-manager-store.c:820 -msgid "Validity" -msgstr "有效性" - -#. Expiry date column -#: ../src/seahorse-key-manager-store.c:839 -msgid "Expiration Date" -msgstr "有效日期" - -#: ../src/seahorse-keyserver-results.c:256 -msgid "Close this window" -msgstr "關閉本視窗" - -#: ../src/seahorse-keyserver-results.c:257 -msgid "_Expand All" -msgstr "全部展開(_E)" - -#: ../src/seahorse-keyserver-results.c:258 -msgid "Expand all listings" -msgstr "展開整個清單" - -#: ../src/seahorse-keyserver-results.c:259 -msgid "_Collapse All" -msgstr "全部收起(_C)" - -#: ../src/seahorse-keyserver-results.c:260 -msgid "Collapse all listings" -msgstr "收起整個清單" - -#: ../src/seahorse-keyserver-results.c:331 -msgid "Remote Keys" -msgstr "遠端金鑰" - -#: ../src/seahorse-keyserver-results.c:333 -#, c-format -msgid "Remote Keys Containing '%s'" -msgstr "遠端金鑰包含‘%s’" - -#: ../src/seahorse-keyserver-search.xml.h:1 -msgid "Key Servers:" -msgstr "金鑰伺服器：" - -#: ../src/seahorse-keyserver-search.xml.h:2 -msgid "Shared Keys Near Me:" -msgstr "附近的共享金鑰：" - -#: ../src/seahorse-keyserver-search.xml.h:3 -msgid "Find Remote Keys" -msgstr "尋找遠端金鑰" - -#: ../src/seahorse-keyserver-search.xml.h:4 -msgid "" -"This will find keys for others on the Internet. These keys can then be " -"imported into your local key ring." -msgstr "" -"這樣會在網際網路上尋找給別人的金鑰。然後這些金鑰能匯入到您的本地鑰匙圈中。" - -#: ../src/seahorse-keyserver-search.xml.h:5 -msgid "Where to search:" -msgstr "搜尋的地方：" - -#: ../src/seahorse-keyserver-search.xml.h:6 -msgid "_Search" -msgstr "搜尋(_S)" - -#: ../src/seahorse-keyserver-search.xml.h:7 -msgid "_Search for keys containing: " -msgstr "搜尋金鑰包含(_S):" - -#: ../src/seahorse-keyserver-sync.c:58 -msgid "Couldn't publish keys to server" -msgstr "無法發行金鑰到伺服器" - -#: ../src/seahorse-keyserver-sync.c:77 -#, c-format -msgid "Couldn't retrieve keys from server: %s" -msgstr "無法從伺服器中取得金鑰：%s" - -#: ../src/seahorse-keyserver-sync.c:161 -#, c-format -msgid "%d key is selected for synchronizing" -msgid_plural "%d keys are selected for synchronizing" -msgstr[0] "選擇了 %d 個金鑰來進行同步" -msgstr[1] "選擇了 %d 個金鑰來進行同步" - -#: ../src/seahorse-keyserver-sync.c:247 -msgid "Synchronizing keys..." -msgstr "金鑰正在同步…" - -#: ../src/seahorse-keyserver-sync.xml.h:1 -msgid "Sync Keys" -msgstr "金鑰同步" - -#: ../src/seahorse-keyserver-sync.xml.h:2 -msgid "" -"This will publish the keys in your key ring so they're available for others " -"to use. You'll also get any changes others have made since you received " -"their keys." -msgstr "" -"這會發行您的金鑰到金鑰伺服器，給其他人能使用。同樣您他們給您的金鑰若有任何改" -"變時，您也可以取得。" - -#: ../src/seahorse-keyserver-sync.xml.h:3 -msgid "" -"This will retrieve any changes others have made since you received their " -"keys. No key server has been chosen for publishing, so your keys will not be " -"made available to others." -msgstr "" -"這樣他們給您的金鑰若有任何改變時，您也可以取得。沒有選取金鑰伺服器作發行，所" -"以其它人不會有您的金鑰。" - -#: ../src/seahorse-keyserver-sync.xml.h:4 -msgid "_Key Servers" -msgstr "金鑰伺服器(_K)" - -#: ../src/seahorse-keyserver-sync.xml.h:5 -msgid "_Sync" -msgstr "同步(_S)" - -#: ../src/seahorse-main.c:60 -msgid "Version of this application" -msgstr "這個應用程式的版本" - -#: ../src/seahorse-viewer.c:123 -msgid "Contributions:" -msgstr "貢獻者:" - -#: ../src/seahorse-viewer.c:149 -msgid "translator-credits" -msgstr "" -"如對翻譯有任何意見，請送一封電子郵件給\n" -"以下地址，GNOME 翻譯團隊會盡快回覆您：\n" -"zh-l10n@lists.linux.org.tw\n" -"\n" -"Woodman Tuen , 2005-07" - -#: ../src/seahorse-viewer.c:152 -msgid "Seahorse Project Homepage" -msgstr "Seahorse 專案網頁" - -#. Top menu items -#: ../src/seahorse-viewer.c:172 -msgid "_File" -msgstr "檔案(_F)" - -#: ../src/seahorse-viewer.c:173 -msgid "_Edit" -msgstr "編輯(_E)" - -#: ../src/seahorse-viewer.c:174 -msgid "_View" -msgstr "檢視(_V)" - -#: ../src/seahorse-viewer.c:175 -msgid "_Help" -msgstr "求助(_H)" - -#: ../src/seahorse-viewer.c:177 -msgid "Prefere_nces" -msgstr "偏好設定(_N)" - -#: ../src/seahorse-viewer.c:178 -msgid "Change preferences for this program" -msgstr "更改本程式的偏好設定" - -#: ../src/seahorse-viewer.c:181 -msgid "About this program" -msgstr "關於本程式" - -#: ../src/seahorse-viewer.c:182 -msgid "_Contents" -msgstr "內容(_C)" - -#: ../src/seahorse-viewer.c:183 -msgid "Show Seahorse help" -msgstr "顯示 Seahorse 的說明文件" - -#: ../src/seahorse-viewer.c:284 -msgid "Export public key" -msgstr "匯出公鑰" - -#: ../src/seahorse-viewer.c:305 -msgid "Exporting keys" -msgstr "正在匯出金鑰" - -#: ../src/seahorse-viewer.c:334 -msgid "Couldn't retrieve data from key server" -msgstr "無法從金鑰伺服器中取得資料" - -#. Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" -#: ../src/seahorse-viewer.c:346 -msgid "Copied keys" -msgstr "複製的金鑰" - -#: ../src/seahorse-viewer.c:371 -msgid "Retrieving keys" -msgstr "正在取得金鑰" - -#: ../src/seahorse-viewer.c:426 -#, c-format -msgid "%s is a private key. Are you sure you want to proceed?" -msgstr "%s 是一個私密金鑰。您確定要繼續？" - -#: ../src/seahorse-viewer.c:480 -msgid "Importing keys from key servers" -msgstr "從金鑰伺服器匯入金鑰" - -#: ../src/seahorse-viewer.c:505 -msgid "Show properties" -msgstr "顯示屬性" - -#: ../src/seahorse-viewer.c:506 -msgctxt "This text refers to deleting an item from its type's backing store." -msgid "_Delete" -msgstr "刪除(_D)" - -#: ../src/seahorse-viewer.c:507 -msgid "Delete selected items" -msgstr "刪除選取的項目" - -#: ../src/seahorse-viewer.c:511 -msgid "E_xport..." -msgstr "匯出(_X)…" - -#: ../src/seahorse-viewer.c:512 -msgid "Export to a file" -msgstr "匯出為檔案" - -#: ../src/seahorse-viewer.c:514 -msgid "Copy to the clipboard" -msgstr "複製到剪貼簿" - -#: ../src/seahorse-viewer.c:519 -msgid "Import selected keys to local key ring" -msgstr "匯入已選的金鑰到本機鑰匙圈" - -#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 -msgid "Enter your Secure Shell passphrase:" -msgstr "輸入您的 SSH 密語:" - -#: ../ssh/seahorse-ssh-askpass.c:82 -msgid "Old Key Passphrase" -msgstr "舊金鑰密語" - -#: ../ssh/seahorse-ssh-askpass.c:83 -#, c-format -msgid "Enter the old passphrase for: %s" -msgstr "輸入 %s 的舊密語" - -#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 -msgid "New Key Passphrase" -msgstr "新的金鑰密語" - -#: ../ssh/seahorse-ssh-askpass.c:88 -#, c-format -msgid "Enter the new passphrase for: %s" -msgstr "輸入 %s 的新密語" - -#: ../ssh/seahorse-ssh-askpass.c:93 -#, c-format -msgid "Enter the new passphrase again: %s" -msgstr "請再次輸入新密語：%s" - -#: ../ssh/seahorse-ssh-commands.c:86 -msgid "Configure Key for _Secure Shell..." -msgstr "正在設定 _SSH 金鑰…" - -#: ../ssh/seahorse-ssh-commands.c:87 -msgid "" -"Send public Secure Shell key to another machine, and enable logins using " -"that key." -msgstr "將公共 SSH 金鑰傳送給其它電腦，及能使用該金鑰登入。" - -#: ../ssh/seahorse-ssh-commands.c:118 -#, c-format -msgid "Are you sure you want to delete the secure shell key '%s'?" -msgstr "確定要刪除 SSH 金錀「%s」？" - -#: ../ssh/seahorse-ssh-commands.c:121 -#, c-format -msgid "Are you sure you want to delete %d secure shell keys?" -msgstr "確定要刪除 %d 個 SSH 金鑰？" - -#: ../ssh/seahorse-ssh-commands.c:133 -msgid "Couldn't delete key" -msgstr "無法刪除金鑰" - -#: ../ssh/seahorse-ssh-generate.c:60 ../ssh/seahorse-ssh-key.c:91 -#: ../ssh/seahorse-ssh-key.c:95 ../ssh/seahorse-ssh-key-properties.xml.h:19 -msgid "Secure Shell Key" -msgstr "SSH 金鑰" - -#: ../ssh/seahorse-ssh-generate.c:61 -msgid "Used to access other computers (eg: via a terminal)" -msgstr "用作存取其它電腦（如終端機）" - -#: ../ssh/seahorse-ssh-generate.c:115 ../ssh/seahorse-ssh-generate.c:131 -msgid "Couldn't generate Secure Shell key" -msgstr "無法產生 SSH 金鑰" - -#: ../ssh/seahorse-ssh-generate.c:197 -msgid "Creating Secure Shell Key" -msgstr "正在產生 SSH 金鑰" - -#: ../ssh/seahorse-ssh-generate.xml.h:2 -msgid "" -"Use your email address, and any other reminder you need about what this " -"key is for." -msgstr "以您的電郵，及其他提示這金鑰要來作甚麼。" - -#: ../ssh/seahorse-ssh-generate.xml.h:3 -msgid "" -"A Secure Shell (SSH) key lets you connect securely to trusted computers " -"using SSH, without entering a different password for each of them." -msgstr "" -"SSH (Secure Shell) 金鑰能安全地連接使用 SSH 的電腦，而無需逐一輸入不同的密" -"碼。" - -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "" -"If there is already a computer you want to use this key with, you can set up " -"that computer to recognize your key now. " -msgstr "如果已有一臺電腦您想使用本金鑰。現在可以設定電腦認識您的金鑰。" - -#: ../ssh/seahorse-ssh-generate.xml.h:7 -msgid "New Secure Shell Key" -msgstr "新增 SSH 金鑰" - -#: ../ssh/seahorse-ssh-generate.xml.h:8 -msgid "_Create and Set Up" -msgstr "建立及設定(_C)" - -#: ../ssh/seahorse-ssh-generate.xml.h:9 -msgid "_Just Create Key" -msgstr "只是建立金鑰(_J)" - -#: ../ssh/seahorse-ssh-generate.xml.h:10 -msgid "_Key Description:" -msgstr "金鑰描述(_K):" - -#: ../ssh/seahorse-ssh-key.c:87 -msgid "(Unreadable Secure Shell Key)" -msgstr "（不能讀取的 SSH 金鑰）" - -#: ../ssh/seahorse-ssh-key-properties.c:79 -msgid "Couldn't rename key." -msgstr "金鑰無法重新命名。" - -#: ../ssh/seahorse-ssh-key-properties.c:132 -msgid "Couldn't change authorization for key." -msgstr "無法變更金鑰的認證。" - -#: ../ssh/seahorse-ssh-key-properties.c:167 -msgid "Couldn't change passphrase for key." -msgstr "無法更改金鑰的密語。" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Algorithm:" -msgstr "演算法：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:3 -msgid "Identifier:" -msgstr "識別碼：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:4 -msgid "Location:" -msgstr "位置:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:5 -msgid "Name:" -msgstr "名稱:" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:6 -msgid "Strength:" -msgstr "強度：" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:8 -msgid "Trust" -msgstr "信任" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:13 -#, no-c-format -msgid "This only applies to the '%s' account." -msgstr "只會套用在‘%s’帳戶。" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:16 -msgid "E_xport Complete Key" -msgstr "匯出整個金鑰(_X)" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:20 -msgid "The owner of this key is _authorized to connect to this computer" -msgstr "此金鑰的擁有者被授權連接本電腦(_A)" - -#: ../ssh/seahorse-ssh-key-properties.xml.h:21 -msgid "Used to connect to other computers." -msgstr "用作連接其它電腦。" - -#: ../ssh/seahorse-ssh-operation.c:198 -msgid "The SSH command was terminated unexpectedly." -msgstr "SSH 指令在無法預期下中止。" - -#: ../ssh/seahorse-ssh-operation.c:208 -msgid "The SSH command failed." -msgstr "SSH 指令失敗。" - -#: ../ssh/seahorse-ssh-operation.c:518 -msgid "Remote Host Password" -msgstr "遠端主機密碼 " - -#: ../ssh/seahorse-ssh-operation.c:634 -msgid "Enter Key Passphrase" -msgstr "輸入金鑰密語" - -#: ../ssh/seahorse-ssh-operation.c:724 -msgid "Passphrase for New Secure Shell Key" -msgstr "新的 SSH 金鑰的密語" - -#: ../ssh/seahorse-ssh-operation.c:908 -#, c-format -msgid "Importing key: %s" -msgstr "匯入金鑰：%s" - -#: ../ssh/seahorse-ssh-operation.c:910 -msgid "Importing key. Enter passphrase" -msgstr "正在匯入金鑰，請輸入密語" - -#: ../ssh/seahorse-ssh-source.c:951 -msgid "No private key file is available for this key." -msgstr "這個金鑰沒有可用的私密金鑰。" - -#: ../ssh/seahorse-ssh-upload.c:50 -msgid "Couldn't configure Secure Shell keys on remote computer." -msgstr "在遠端電腦無法設定 SSH 金鑰" - -#: ../ssh/seahorse-ssh-upload.c:133 -msgid "Configuring Secure Shell Keys..." -msgstr "正在設定 SSH 金鑰" - -#: ../ssh/seahorse-ssh-upload.xml.h:1 -msgid "eg: fileserver.example.com:port" -msgstr "例如：fileserver.example.com:port" - -#: ../ssh/seahorse-ssh-upload.xml.h:2 -msgid "Set Up Computer for SSH Connection" -msgstr "設定電腦的 SSH 連線" - -#: ../ssh/seahorse-ssh-upload.xml.h:4 -msgid "" -"To use your Secure Shell key with another computer that uses SSH, you must " -"already have a login account on that computer." -msgstr "要在其他的電腦使用您的 SSH 金鑰，您需要有該電腦的登入帳號。" - -#: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "電腦名稱(_C):" - -#: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "登入名稱(_L):" - -#: ../ssh/seahorse-ssh-upload.xml.h:7 -msgid "_Set Up" -msgstr "設定(_S)" - -#~ msgid "DSA" -#~ msgstr "DSA" - -#~ msgid "Secure Shell key" -#~ msgstr "SSH 金鑰" - -#~ msgid "Enter a passphrase for your new Secure Shell key." -#~ msgstr "輸入新的 SSH 金鑰的密語。" - -#~ msgid "Web Password" -#~ msgstr "網頁密碼" - -#~ msgid "Network Password" -#~ msgstr "網路密碼" - -#~ msgid "Deleting items" -#~ msgstr "刪除項目" - -#~ msgid "Deleting keyrings" -#~ msgstr "刪除鑰匙圈" - -#~ msgid "Symmetric Key" -#~ msgstr "對稱式金鑰" - -#~ msgid "Public Key" -#~ msgstr "公開金鑰" - -#~ msgid "Private Key" -#~ msgstr "私密金鑰" - -#~ msgid "Credentials" -#~ msgstr "憑證" - -#~ msgid "Identity" -#~ msgstr "身分" - -#~ msgid "Encryption Key Manager" -#~ msgstr "金鑰管理員" - -#~ msgid "Invalid" -#~ msgstr "無效" - -#~ msgid "Private Secure Shell Key" -#~ msgstr "私人 SSH 金鑰" - -#~ msgid "Public Secure Shell Key" -#~ msgstr "公共 SSH 金鑰" - -#~ msgid "Do not run seahorse-daemon as a daemon" -#~ msgstr "不以伺服程式形式執行 seahorse-daemon" - -#~ msgid "couldn't fork process" -#~ msgstr "無法建立子程序" - -#~ msgid "couldn't create new process group" -#~ msgstr "無法建立新的程序群組" - -#~ msgid "Encryption Daemon (Seahorse)" -#~ msgstr "加密伺服程式 (Seahorse)" - -#~ msgid "Invalid or unrecognized key type: %s" -#~ msgstr "無效或無法確認的金鑰類型：%s" - -#~ msgid "This keytype is not supported: %s" -#~ msgstr "這個金鑰類型是不支援的：%s" - -#~ msgid "Support for this feature was not enabled at build time" -#~ msgstr "編譯時沒有啟用對這個功能的支援" - -#~ msgid "Invalid or unrecognized key: %s" -#~ msgstr "無效或無法碓認的金鑰：%s" - -#~ msgid "Signed by expired on %s." -#~ msgstr "由 簽署，於 %s 過期。" - -#~ msgid "Invalid Signature" -#~ msgstr "無效的簽章" - -#~ msgid "Signed by on %s Expired." -#~ msgstr "由 於 %s 簽署，已過期。" - -#~ msgid "Expired Signature" -#~ msgstr "已過期的簽章" - -#~ msgid "Signed by Revoked on %s." -#~ msgstr "由 簽署，於 %s 撤銷。" - -#~ msgid "Revoked Signature" -#~ msgstr "簽章已撤銷" - -#~ msgid "Signed by on %s." -#~ msgstr "由 於 %s 簽署。" - -#~ msgid "Good Signature" -#~ msgstr "完好的簽章" - -#~ msgid "Signing key not in keyring." -#~ msgstr "簽署金鑰並非在鑰匙圈內。" - -#~ msgid "Unknown Signature" -#~ msgstr "不明的簽章" - -#~ msgid "Bad or forged signature. The signed data was modified." -#~ msgstr "損壞或是偽造的簽章。簽章資料已被修改。" - -#~ msgid "Bad Signature" -#~ msgstr "損壞的簽章" - -#~ msgid "Couldn't verify signature." -#~ msgstr "無法驗證簽章。" - -#~ msgid "Invalid or unrecognized signer: %s" -#~ msgstr "無效或無法辨認的簽章者：%s" - -#~ msgid "Key is not valid for signing: %s" -#~ msgstr "金鑰不能有效地作為簽署使用：%s" - -#~ msgid "Invalid or unrecognized recipient: %s" -#~ msgstr "無效或無法辨認的收件人：%s" - -#~ msgid "Key is not a valid recipient for encryption: %s" -#~ msgstr "金鑰不是一個有效的收件人作加密：%s" - -#~ msgid "No recipients specified" -#~ msgstr "沒有指定收件人" - -#~ msgid "Invalid key type for decryption: %s" -#~ msgstr "解密的金鑰類型無效：%s" - -#~ msgid "Please set clearuri" -#~ msgstr "請設定 clearui" - -#~ msgid "Please set crypturi" -#~ msgstr "請設定 cryptui" - -#~ msgid "Error opening clearuri" -#~ msgstr "開啟 clearui 時發生錯誤" - -#~ msgid "No signer specified" -#~ msgstr "沒有指定簽章者" - -#~ msgid "Invalid key type for verifying: %s" -#~ msgstr "驗證 %s 的金鑰類型無效" - -#~ msgid "Invalid key id: %s" -#~ msgstr "無效的金鑰 id：%s" - -#~ msgid "" -#~ "A list of key server URIs to search for remote PGP keys. In later " -#~ "versions a display name can be included, by appending a space and then " -#~ "the name." -#~ msgstr "" -#~ "尋找遠端 PGP 金鑰的金鑰伺服器的 URL 清單。在晚一點的版本可包括顯示名稱，以" -#~ "加入空格及名稱。" - -#~ msgid "Auto Retrieve Keys" -#~ msgstr "自動取得金鑰" - -#~ msgid "Auto Sync Keys" -#~ msgstr "金鑰自動同步" - -#~ msgid "Controls the visibility of the expires column for the key manager." -#~ msgstr "控制金鑰管理員的有效日期欄位的可示性。" - -#~ msgid "Controls the visibility of the trust column for the key manager." -#~ msgstr "控制金鑰管理員的信任欄位的可示性。" - -#~ msgid "Controls the visibility of the type column for the key manager." -#~ msgstr "控制金鑰管理員的類型欄位的可示性。" - -#~ msgid "Controls the visibility of the validity column for the key manager." -#~ msgstr "控制金鑰管理員的有效性欄位的可示性。" - -#~ msgid "Enable DNS-SD sharing" -#~ msgstr "啟用 DNS-SD 共享" - -#~ msgid "" -#~ "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " -#~ "running and must be built with HKP and DNS-SD support." -#~ msgstr "" -#~ "啟用 DNS-SD (Apple Bonjour) 金鑰共享，必須運行 seahorse-daemon 及加入 " -#~ "HKP 及 DNS-SD 支援。" - -#~ msgid "ID of the default key" -#~ msgstr "預設金鑰的 ID" - -#~ msgid "" -#~ "If set to true, then files encrypted with seahorse will be ASCII armor " -#~ "encoded." -#~ msgstr "如設定為‘true’，使用 seahorse 加密的檔案會是以 ASCII 封裝編碼。" - -#~ msgid "" -#~ "If set to true, then the default key will always be added to an " -#~ "encryption recipients list." -#~ msgstr "如設定為‘true’，預設金鑰總是會加入加密收件人清單。" - -#~ msgid "Last key server search pattern" -#~ msgstr "上次在金鑰伺服器的搜尋式樣" - -#~ msgid "Last key servers used" -#~ msgstr "上次使用的金鑰伺服器" - -#~ msgid "Last key used to sign a message." -#~ msgstr "上次用作簽署的金鑰" - -#~ msgid "PGP Key servers" -#~ msgstr "PGP 金鑰伺服器" - -#~ msgid "Publish keys to this key server." -#~ msgstr "發行金鑰到此金鑰伺服器。" - -#~ msgid "Show expires column in key manager" -#~ msgstr "在金鑰管理員中顯示有效日期的欄位" - -#~ msgid "Show trust column in key manager" -#~ msgstr "在金鑰管理員中顯示信任的欄位" - -#~ msgid "Show type column in key manager" -#~ msgstr "在金鑰管理員中顯示類型的欄位" - -#~ msgid "Show validity column in key manager" -#~ msgstr "在金鑰管理員中顯示有效性的欄位" - -#~ msgid "" -#~ "Specify the column to sort the recipients window by. Columns are: 'name' " -#~ "and 'id'. Put a '-' in front of the column name to sort in descending " -#~ "order." -#~ msgstr "" -#~ "指定收件人視窗的欄位的排序方式：‘name’及‘id’。在欄位名稱前加上‘-’以反向排" -#~ "序。" - -#~ msgid "" -#~ "Specify the column to sort the seahorse key manager main window by. " -#~ "Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. " -#~ "Put a '-' in front of the column name to sort in descending order." -#~ msgstr "" -#~ "指定 seahorse 金鑰管理程式主視窗欄位的排序方" -#~ "式：‘name’，‘id’，‘validity’，‘expires’，‘trust’及‘type’。在欄位名稱前加" -#~ "上‘-’以反向排序。" - -#~ msgid "The ID of the last secret key used to sign a message." -#~ msgstr "上次用作簽署信息的私鑰 ID。" - -#~ msgid "The column to sort the recipients by" -#~ msgstr "seahorse 收件人欄位的排序形式" - -#~ msgid "The column to sort the seahorse keys by" -#~ msgstr "seahorse 金鑰欄位的排序形式" - -#~ msgid "" -#~ "The key server to publish PGP keys to. Or empty to suppress publishing of " -#~ "PGP keys." -#~ msgstr "PGP 金鑰發行到的金鑰伺服器。或使留空白來禁止發行 PGP 金鑰" - -#~ msgid "" -#~ "The last key server a search was performed against or empty for all key " -#~ "servers." -#~ msgstr "上次搜尋的金鑰伺服器。或其留空給所有伺服器。" - -#~ msgid "The last search pattern searched for against a key server." -#~ msgstr "上次在金鑰伺服器的搜尋樣式。" - -#~ msgid "" -#~ "This specifies the default key to use for certain operations, mainly " -#~ "signing." -#~ msgstr "這指定在某些動作中使用的預設金鑰，主要為簽署時使用。" - -#~ msgid "" -#~ "Whether or not keys should be automatically retrieved from key servers." -#~ msgstr "是否自動從金鑰伺服器取得金鑰。" - -#~ msgid "" -#~ "Whether or not modified keys should be automatically synced with the " -#~ "default key server." -#~ msgstr "已修改的金鑰應否自動與預設的金鑰伺服器同步。" - -#~ msgid "Whether to always encrypt to default key" -#~ msgstr "是否總是以預設金鑰來加密" - -#~ msgid "Whether to use ASCII Armor" -#~ msgstr "是否使用 ASCII 封裝" - -#~ msgid "Couldn't set application access." -#~ msgstr "無法設定應用程式的存取。" - -#~ msgid "Path:" -#~ msgstr "路徑:" - -#~ msgid "Permissions:" -#~ msgstr "權限:" - -#~ msgid "Applications" -#~ msgstr "應用程式" - -#~ msgid "_Read" -#~ msgstr "讀取(_R)" - -#~ msgid "_Write" -#~ msgstr "寫入(_W)" - -#~ msgctxt "infinitive" -#~ msgid "_Delete" -#~ msgstr "刪除(_D)" - -#~ msgid "Saving item..." -#~ msgstr "正在儲存項目…" - -#~ msgid "Listing password keyrings" -#~ msgstr "正在列出密碼鑰匙圈 " - -#~ msgid "" -#~ "No encryption keys were found with which to perform the operation you " -#~ "requested. The program Passwords and Encryption Keys will now be " -#~ "started so that you may either create a key or import one." -#~ msgstr "" -#~ "在進行您所要求的操作時找不到加密金鑰。現在會啟動 密碼與加密金鑰 程" -#~ "式讓您建立或匯入一個金鑰。" - -#~ msgid "All Keys" -#~ msgstr "所有金鑰" - -#~ msgid "Selected Recipients" -#~ msgstr "已選取收件人" - -#~ msgid "Search Results" -#~ msgstr "搜尋結果" - -#~ msgid "Search _for:" -#~ msgstr "搜尋(_F):" - -#~ msgid "None (Don't Sign)" -#~ msgstr "沒有（不要簽署）" - -#~ msgid "Sign this message as %s" -#~ msgstr "以 %s 簽署這個郵件" - -#~ msgid "_Sign message as:" -#~ msgstr "簽署訊息的金鑰(_S):" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "檔案不是有效的 .desktop 檔案" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "無法辨識的桌面檔案版本「%s」" - -#~ msgid "Starting %s" -#~ msgstr "準備啟動 %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "應用程式不接受以命令列開啟文件" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "無法辨識的啟動選項：%d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "不能傳送文件 URI 至「Type=Link」桌面項目" - -#~ msgid "Not a launchable item" -#~ msgstr "不是可以啟動的項目" - -#~ msgid "Disable connection to session manager" -#~ msgstr "停用到作業階段管理程式的連線" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "指定含有已儲存組態的檔案" - -#~ msgid "FILE" -#~ msgstr "檔案" - -#~ msgid "Specify session management ID" -#~ msgstr "指定作業階段管理 ID" - -#~ msgid "Session management options:" -#~ msgstr "作業階段管理選項:" - -#~ msgid "Show session management options" -#~ msgstr "顯示作業階段管理選項" - -#~ msgid "Key Imported" -#~ msgid_plural "Keys Imported" -#~ msgstr[0] "金鑰已匯入" -#~ msgstr[1] "金鑰已匯入" - -#~ msgid "Imported %i key" -#~ msgid_plural "Imported %i keys" -#~ msgstr[0] "已匯入 %i 個金鑰" -#~ msgstr[1] "已匯入 %i 個金鑰" - -#~ msgid "Imported a key for" -#~ msgid_plural "Imported keys for" -#~ msgstr[0] "匯入此金鑰" -#~ msgstr[1] "匯入此金鑰" - -#~ msgid "Notification Messages" -#~ msgstr "通知訊息" - -#~ msgid "Progress Title" -#~ msgstr "進度標題" - -#~ msgid "Couldn't run file-roller" -#~ msgstr "無法執行 fille-roller" - -#~ msgid "Couldn't package files" -#~ msgstr "檔案無法封裝" - -#~ msgid "The file-roller process did not complete successfully" -#~ msgstr "file-roller 程序無法完成" - -#~ msgid "Loading Keys..." -#~ msgstr "正在載入金鑰…" - -#~ msgid "Searching for keys..." -#~ msgstr "正在搜尋金鑰…" - -#~ msgid "Uploading keys..." -#~ msgstr "正在上傳金鑰…" - -#~ msgid "Retrieving keys..." -#~ msgstr "正在取得金鑰…" - -#~ msgid "Searching for keys on: %s" -#~ msgstr "搜尋在 %s 的金鑰" - -#~ msgid "Searching for keys containing '%s'..." -#~ msgstr "正在搜尋含有‘%s’的金鑰…" - -#~ msgid "Searching for key id '%s'..." -#~ msgstr "正在搜尋 id 為‘%s’的金鑰…" - -#~ msgid "Retrieving remote keys..." -#~ msgstr "正在取得遠端金鑰…" - -#~ msgid "Sending keys to key server..." -#~ msgstr "正在傳送金鑰到金鑰伺服器" - -#~ msgid "Synchronizing keys" -#~ msgstr "金鑰正在同步…" - -#~ msgid "Passphrase:" -#~ msgstr "密語：" - -#~ msgid "Couldn't share keys" -#~ msgstr "無法共享金鑰" - -#~ msgid "Can't publish discovery information on the network." -#~ msgstr "無法在網路上發行尋找資訊。" - -#~ msgid "%s's encryption keys" -#~ msgstr "%s 的密鑰" - -#~ msgid "Key Sharing" -#~ msgstr "金鑰共享" - -#~ msgid "" -#~ "Sharing your keys allows other people on your network to use the keys " -#~ "you've collected. This means they can automatically encrypt things for " -#~ "you or those you know, without you having to send them your key.\n" -#~ "\n" -#~ "Note: Your personal keys will not be compromised." -#~ msgstr "" -#~ "共享金鑰允許其他人使用您搜集的金鑰。這代表他們加密東西給您，或是您認識的，" -#~ "而無需您的將金鑰傳給他們。\n" -#~ "\n" -#~ "注意：您的金鑰不會受損害。" - -#~ msgid "_Share my keys with others on my network" -#~ msgstr "在我的網路中共享我的金鑰(_S)" - -#~ msgid "Seahorse Daemon" -#~ msgstr "Seahorse 伺服程式" - -#~ msgid "X keys are selected for synchronizing" -#~ msgstr "選擇了 X 個金鑰來進行同步" - -#~ msgid "" -#~ "One or more of the deleted keys are private keys. Are you sure you want " -#~ "to proceed?" -#~ msgstr "一或多個刪除的金鑰為私密金鑰。您確定要繼續執行？" - -#~ msgid "/home/nate/.ssh/blah_rsa" -#~ msgstr "/home/nate/.ssh/blah_rsa" - -#~ msgid "00:00:00:00:00" -#~ msgstr "00:00:00:00:00" - -#~ msgid "Create a PGP Key" -#~ msgstr "建立 PGP 金鑰" - -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginal\n" -#~ "Full\n" -#~ "Ultimate" -#~ msgstr "" -#~ "不詳\n" -#~ "永不\n" -#~ "勉強\n" -#~ "完全\n" -#~ "徹底" - -#~ msgid "" -#~ "Unknown\n" -#~ "Never\n" -#~ "Marginally\n" -#~ "Fully\n" -#~ "Ultimately" -#~ msgstr "" -#~ "不詳\n" -#~ "永不\n" -#~ "勉強地\n" -#~ "完全地\n" -#~ "徹底地" - -#~ msgid "Other _Collected Keys" -#~ msgstr "其它搜集的金鑰" - -#~ msgid "_Trusted Keys" -#~ msgstr "信任的金鑰(_T)" - -#~ msgid "_About" -#~ msgstr "關於(_A)" - -#~ msgid "P_roperties" -#~ msgstr "屬性(_R)" - -#~ msgid "_Copy" -#~ msgstr "複製(_C)" - -#~ msgid "Removing item" -#~ msgstr "正在移除項目" - -#~ msgid "Automatically unlocked when user logs in." -#~ msgstr "當使用者登入時自動解鎖。" - -#~ msgid "Couldn't get default password keyring" -#~ msgstr "無法取得預設的密碼鑰匙圈" - -#~ msgid "Couldn't get list of password keyrings" -#~ msgstr "無法取得密碼鑰匙圈的清單" - -#~ msgid "Couldn't remove keyring" -#~ msgstr "無法移除金鑰" - -#~ msgid "Are you sure you want to permanently delete the '%s' keyring?" -#~ msgstr "確定要永久地刪除‘%s’鑰匙圈？" - -#~ msgid "Default Keyring" -#~ msgstr "預設鑰匙圈" - -#~ msgid "Password Keyrings" -#~ msgstr "密碼鑰匙圈" - -#~ msgid "Password and Encryption Settings" -#~ msgstr "密碼及加密設定值" - -#~ msgid "_Add Keyring" -#~ msgstr "加入鑰匙圈(_A)" - -#~ msgid "_Remove Keyring" -#~ msgstr "移除鑰圈(_R)" - -#~ msgid "Unknown Key: %s" -#~ msgstr "不明的金鑰：%s" - -#~ msgid "Unknown Key" -#~ msgstr "不明的金鑰" - -#~ msgid "Unavailable Key" -#~ msgstr "不存在的金鑰" - -#~ msgid "X509 Certificate" -#~ msgstr "X509 憑證" - -#~ msgid "Loading..." -#~ msgstr "載入中…" - -#~ msgid "Invalid or unrecognized object." -#~ msgstr "無效或無法碓認的物件。" - -#~ msgid "Exporting is not yet supported." -#~ msgstr "匯出功能尚未支援。" - -#~ msgid "Expiry for Subkey %d of %s" -#~ msgstr "%2$s %1$d 個子金鑰的有效日期" - -#~ msgid "_Quit" -#~ msgstr "結束(_Q)" - -#~ msgid "Create a new personal key" -#~ msgstr "建立新的個人金鑰" - -#~ msgid "Import keys into your key ring from a file" -#~ msgstr "從檔案將金鑰匯入鑰匙圈" - -#~ msgid "_Close" -#~ msgstr "關閉(_C)" - -#~ msgid "Secure Shell Passphrase" -#~ msgstr "SSH 密語" - -#~ msgid "Secure Shell Key Passphrase" -#~ msgstr "SSH 金鑰密語" - -#~ msgid "Enter the passphrase for: %s" -#~ msgstr "輸入 %s 的密語" - -#~ msgid "Save this passphrase in my keyring" -#~ msgstr "在鑰匙圈中儲存此密語" - -#~ msgid "_Key" -#~ msgstr "金鑰(_K)" - -#~ msgid "E_xport Public Key..." -#~ msgstr "匯出公鑰(_X)…" - -#~ msgid "_Copy Public Key" -#~ msgstr "複製公鑰(_C)" - -#~ msgid "Copy public part of selected keys to the clipboard" -#~ msgstr "將已選金鑰的公共部份複製到剪貼薄" - -#~ msgid "_Delete Key" -#~ msgstr "刪除金鑰(_D)" - -#~ msgid "Please enter a passphrase to use." -#~ msgstr "請輸入密語來使用。" - -#~ msgid "Unparseable Key ID" -#~ msgstr "無法分析的金鑰 ID" - -#~ msgid "Unknown/Invalid Key" -#~ msgstr "不明/無效的金鑰" - -#~ msgid "PGP Key: %s" -#~ msgstr "PGP 金鑰：%s" - -#~ msgid "" -#~ "Warning: Your system is not configured to cache passphrases in " -#~ "secure memory." -#~ msgstr "警告：您的系統沒有設定在安全的記憶體下使用密語快取。" - -#~ msgid "Cache _Preferences" -#~ msgstr "快取偏好設定(_P)" - -#~ msgid "Cached Encryption Keys" -#~ msgstr "已使用快取的加密金鑰" - -#~ msgid "Change passphrase cache settings." -#~ msgstr "更改密語快取設定。" - -#~ msgid "Clear passphrase cache" -#~ msgstr "清除密語快取" - -#~ msgid "_Clear Cache" -#~ msgstr "清除快取(_C)" - -#~ msgid "_Show Window" -#~ msgstr "顯示視窗(_S)" - -#~ msgid "Do not daemonize seahorse-agent" -#~ msgstr "不以服務程式形式執行 seahorse-agent" - -#~ msgid "Print variables in for a C type shell" -#~ msgstr "以 C shell 形式列印變數" - -#~ msgid "Display environment variables (the default)" -#~ msgstr "顯示環境變數 (預設值)" - -#~ msgid "Allow GPG agent request from any display" -#~ msgstr "允許來自任何畫面的 GPG 代理的要求" - -#~ msgid "command..." -#~ msgstr "指令…" - -#~ msgid "Encryption Key Agent (Seahorse)" -#~ msgstr "金鑰代理程式 (Seahorse)" - -#~ msgid "no command specified to execute" -#~ msgstr "沒有指定執行的指令" - -#~ msgid "Authorize Passphrase Access" -#~ msgstr "授權密語存取" - -#~ msgid "The passphrase is cached in memory." -#~ msgstr "密語在記憶體進行快取。" - -#~ msgid "Always ask me before using a cached passphrase" -#~ msgstr "在使用密語快取前先總是詢問" - -#~ msgid "_Authorize" -#~ msgstr "認證(_A)" - -#~ msgid "Key Name" -#~ msgstr "金鑰名稱" - -#~ msgid "" -#~ "After performing an decrypt or verify operation from the applet, display " -#~ "the resulting text in a window." -#~ msgstr "在面板程式進行解密或檢驗後，在視窗中顯示結果。" - -#~ msgid "" -#~ "After performing an encrypt or signing operation from the applet, display " -#~ "the resulting text in a window." -#~ msgstr "在面板程式進行加密或簽署後，在視窗中顯示結果。" - -#~ msgid "Display cache reminder in the notification area" -#~ msgstr "在面板通知區中顯示快取提示" - -#~ msgid "Display clipboard after decrypting" -#~ msgstr "解密後顯示剪貼簿" - -#~ msgid "Display clipboard after encrypting" -#~ msgstr "加密後顯示剪貼簿" - -#~ msgid "Expire passwords in the cache" -#~ msgstr "密碼在快取中過期" - -#~ msgid "" -#~ "If set to 'gnome' uses gnome-keyring to cache passwords. When set to " -#~ "'internal' uses internal cache." -#~ msgstr "" -#~ "如設定為‘gnome’，使用 gnome-keyring 進行密碼快取。設定為‘internal’，則使用" -#~ "內部快取。" - -#~ msgid "Prompt before using GPG passwords in cache" -#~ msgstr "在快取中使用 GPG 密碼前詢問" - -#~ msgid "" -#~ "Reflect the contents of the clipboard (whether encrypted, signed, etc...) " -#~ "in the panel applet icon." -#~ msgstr "在面版程式的圖示中反映剪貼簿的內容（是加密，簽署等…）" - -#~ msgid "" -#~ "Set to 'true' to enable display of the cache reminder in the notification " -#~ "area of your panel." -#~ msgstr "設定為‘true’則會在面板通知區上顯示快取提示。" - -#~ msgid "" -#~ "Set to 'true' to have seahorse-agent prompt before giving out passwords " -#~ "it has cached." -#~ msgstr "設定為‘true’時 seahorse-agent 在將密碼傳給快取前會提示。" - -#~ msgid "Show clipboard state in panel" -#~ msgstr "在面板中顯示剪貼簿狀態" - -#~ msgid "The time (in minutes) to cache GPG passwords" -#~ msgstr "快取 GPG 密碼的時間（以分鐘計算）" - -#~ msgid "" -#~ "This is the amount of time, specified in minutes, to cache GPG passwords " -#~ "in seahorse-agent." -#~ msgstr "這是時間的總數，以分鐘計算，用作在 seahorse-agent 的GPG 密碼快取。" - -#~ msgid "" -#~ "This option enables the GPG password cache in the seahorse-agent program. " -#~ "The 'use-agent' setting in gpg.conf affects this setting." -#~ msgstr "" -#~ "本選項會允許在 seahorse-agent 進行GPG 密碼快取。在 gpg-conf 中的‘use-" -#~ "agent’設定會影響本設定" - -#~ msgid "" -#~ "When set, seahorse-agent expires GPG passwords in its cache after a " -#~ "period of time." -#~ msgstr "設定後， seahorse 在快取中的 GPG 密碼會在一段間後過期。" - -#~ msgid "Whether the GPG password cache is enabled" -#~ msgstr "是否啟用 GPG 密碼快取" - -#~ msgid "None. Prompt for a key." -#~ msgstr "沒有。詢問使用那個金鑰。" - -#~ msgid "Default Key" -#~ msgstr "預設金鑰" - -#~ msgid "Remember PGP Passphrases" -#~ msgstr "記錄 PGP 密語" - -#~ msgid "A supported PGP passphrase caching agent is not running." -#~ msgstr "支援的 PGP 快取代理程式並未執行。" - -#~ msgid "This key is used to sign messages when no other key is chosen" -#~ msgstr "如沒有選取其它金鑰，則會使用此金鑰來簽署訊息" - -#~ msgid "As_k me before using a cached passphrase" -#~ msgstr "在使用密語快取前先詢問(_K)" - -#~ msgid "Encryption" -#~ msgstr "加密" - -#~ msgid "PGP Passphrases" -#~ msgstr "PGP 密語" - -#~ msgid "Show _icon in status area when passphrases are in memory" -#~ msgstr "當密語存在記憶體時於狀態區顯示圖示(_I)" - -#~ msgid "When _encrypting, always include myself as a recipient" -#~ msgstr "加密時，總是將自己加入為收件人之一(_E)" - -#~ msgid "_Always remember passphrases whenever logged in" -#~ msgstr "每次登入後總是記錄密碼(_A)" - -#~ msgid "_Default key:" -#~ msgstr "預設金鑰(_D):" - -#~ msgid "_Never remember passphrases" -#~ msgstr "永不記錄密語" - -#~ msgid "_Remember passphrases for" -#~ msgstr "密語記錄在(_R)" - -#~ msgid "Couldn't set permissions on backup file." -#~ msgstr "無法設定備份檔的權限。" - -#~ msgid "Clipboard Text Encryption" -#~ msgstr "剪貼簿文字加密" - -#~ msgid "Encrypt, decrypt or sign the clipboard (uses PGP type encryption)." -#~ msgstr "加密，解密或簽署剪貼簿（使用 PGP 形式加密）" - -#~ msgid "Seahorse Applet Factory" -#~ msgstr "Seahorse 面板程式工廠" - -#~ msgid "_Preferences" -#~ msgstr "偏好設定(_P)" - -#~ msgid "seahorse-applet" -#~ msgstr "seahorse-applet" - -#~ msgid "Use PGP/GPG to encrypt/decrypt/sign/verify/import the clipboard." -#~ msgstr "使用 PGP/GPG來加密/解密/簽署/驗證/匯入剪貼簿" - -#~ msgid "Choose Recipient Keys" -#~ msgstr "選擇收件人金鑰" - -#~ msgid "Encrypted Text" -#~ msgstr "已加密文字" - -#~ msgid "Encryption Failed" -#~ msgstr "加密失敗" - -#~ msgid "The clipboard could not be encrypted." -#~ msgstr "剪貼簿無法加密。" - -#~ msgid "Choose Key to Sign with" -#~ msgstr "選取用作簽署的金鑰" - -#~ msgid "Signed Text" -#~ msgstr "已簽署文字" - -#~ msgid "Signing Failed" -#~ msgstr "簽署失敗" - -#~ msgid "The clipboard could not be Signed." -#~ msgstr "剪貼簿無法簽署。" - -#~ msgid "Import Failed" -#~ msgstr "匯入失敗" - -#~ msgid "Keys were found but not imported." -#~ msgstr "找到金鑰但沒有匯入。" - -#~ msgid "Decrypting Failed" -#~ msgstr "解密失敗" - -#~ msgid "Text may be malformed." -#~ msgstr "文字可能已變形。" - -#~ msgid "No PGP key or message was found on clipboard" -#~ msgstr "剪貼簿中沒有 PGP 金鑰或訊息" - -#~ msgid "No PGP data found." -#~ msgstr "找不到 PGP 資料。" - -#~ msgid "Decrypted Text" -#~ msgstr "已解密文字" - -#~ msgid "Could not display the help file" -#~ msgstr "無法顯示說明文件" - -#~ msgid "_Encrypt Clipboard" -#~ msgstr "加密剪貼薄(_E)" - -#~ msgid "_Sign Clipboard" -#~ msgstr "簽署剪貼薄(_S)" - -#~ msgid "_Decrypt/Verify Clipboard" -#~ msgstr "解密/驗證剪貼薄後(_D)" - -#~ msgid "_Import Keys from Clipboard" -#~ msgstr "從剪貼薄匯入金鑰(_I)" - -#~ msgid "Encryption Applet" -#~ msgstr "加密面板程式" - -#~ msgid "Display clipboard contents after:" -#~ msgstr "顯示剪貼簿內容於：" - -#~ msgid "Clipboard Encryption Preferences" -#~ msgstr "剪貼簿加密偏好設定" - -#~ msgid "_Decrypting or verifying the clipboard" -#~ msgstr "解密或驗證剪貼簿(_D)" - -#~ msgid "_Encrypting or signing the clipboard" -#~ msgstr "加密或簽署剪貼簿後(_E)" - -#~ msgid "_Show clipboard state in panel" -#~ msgstr "在面板中顯示剪貼薄狀態(_S)" - -#~ msgid "_Encrypt" -#~ msgstr "加密(_E)" - -#~ msgid "_Decrypt/Verify" -#~ msgstr "解密/驗證(_D)" - -#~ msgid "_Import Key" -#~ msgstr "匯入金鑰(_I)" - -#~ msgid "Couldn't connect to seahorse-daemon" -#~ msgstr "無法連接 seahorse-daemon" - -#~ msgid "Encrypted text" -#~ msgstr "已加密的文字" - -#~ msgid "Couldn't encrypt text" -#~ msgstr "無法將文字加密" - -#~ msgid "Keys found but not imported" -#~ msgstr "找到金鑰但沒有匯入" - -#~ msgid "Couldn't decrypt text" -#~ msgstr "無法將文字解密" - -#~ msgid "Couldn't verify text" -#~ msgstr "無法驗證文字" - -#~ msgid "No encrypted or signed text is selected." -#~ msgstr "沒有選取任何已加密或簽署的文字。" - -#~ msgid "Decrypted text" -#~ msgstr "已解密文字" - -#~ msgid "Verified text" -#~ msgstr "已驗證文字" - -#~ msgid "Imported %d key" -#~ msgid_plural "Imported %d keys" -#~ msgstr[0] "已匯入 %d 個金鑰" -#~ msgstr[1] "已匯入 %d 個金鑰" - -#~ msgid "Signed text" -#~ msgstr "已簽署文字" - -#~ msgid "Couldn't sign text" -#~ msgstr "無法簽署文字" - -#~ msgid "_Encrypt..." -#~ msgstr "加密(_E)…" - -#~ msgid "Encrypt the selected text" -#~ msgstr "將已選的文字加密" - -#~ msgid "Decr_ypt/Verify" -#~ msgstr "解密/驗證(_Y)" - -#~ msgid "Decrypt and/or Verify text" -#~ msgstr "解密及/或驗證文字" - -#~ msgid "Sig_n..." -#~ msgstr "簽署(_N)…" - -#~ msgid "Sign the selected text" -#~ msgstr "簽署已選的文字" - -#~ msgid "Enable the seahorse encryption plugin for gedit." -#~ msgstr "啟用給 gedit 的 seahorse 加密外掛程式。" - -#~ msgid "Enable the seahorse gedit plugin" -#~ msgstr "啟用 seahorse gedit 外掛程式" - -#~ msgid "Text Encryption" -#~ msgstr "文字加密" - -#~ msgid "This plugin performs encryption operations on text." -#~ msgstr "這外掛程式進行文字的加密動作。" - -#~ msgid "Encrypt..." -#~ msgstr "加密…" - -#~ msgid "Encrypt (and optionally sign) the selected file" -#~ msgid_plural "Encrypt the selected files" -#~ msgstr[0] "將已選的檔案加密（及選擇性地簽署）" -#~ msgstr[1] "將已選的壓縮檔加密" - -#~ msgid "Sign the selected file" -#~ msgid_plural "Sign the selected files" -#~ msgstr[0] "簽署已選檔案" -#~ msgstr[1] "簽署已選檔案" - -#~ msgid "For internal use" -#~ msgstr "內部使用" - -#~ msgid "Encryption Preferences" -#~ msgstr "加密偏好設定" - -#~ msgid "Configure key servers and other encryption settings" -#~ msgstr "配置金鑰伺服器及加密設定" - -#~ msgid "Encryption and Keyrings" -#~ msgstr "加密與鑰匙圈" - -#~ msgid "Encrypt file" -#~ msgstr "加密檔案" - -#~ msgid "Sign file with default key" -#~ msgstr "以預設的金鑰簽署" - -#~ msgid "Encrypt and sign file with default key" -#~ msgstr "以預設金鑰加密及簽署檔案" - -#~ msgid "Decrypt encrypted file" -#~ msgstr "解密已加密的檔案" - -#~ msgid "Verify signature file" -#~ msgstr "驗證簽章檔" +msgid "By signing you indicate your trust that this key belongs to:" +msgstr "簽署代表您信任本金鑰是屬於：" -#~ msgid "Read list of URIs on standard in" -#~ msgstr "在標準輸入中讀取 URI 清單" +#: ../pgp/seahorse-sign.xml.h:3 +msgid "Key Name" +msgstr "金鑰名稱" -#~ msgid "file..." -#~ msgstr "檔案…" +#: ../pgp/seahorse-sign.xml.h:4 +msgid "How carefully have you checked this key?" +msgstr "您要多小心地驗證本金鑰？" -#~ msgid "Choose Recipients" -#~ msgstr "選擇收件人" +#: ../pgp/seahorse-sign.xml.h:5 +msgid "_Not at all" +msgstr "沒關係(_N)" -#~ msgid "Couldn't load keys" -#~ msgstr "無法載入金鑰" +#: ../pgp/seahorse-sign.xml.h:6 +msgid "_Casually" +msgstr "隨意(_C)" -#~ msgid "Choose Encrypted File Name for '%s'" -#~ msgstr "選取‘%s’加密後的檔案名稱" +#: ../pgp/seahorse-sign.xml.h:7 +msgid "_Very Carefully" +msgstr "非常小心(_V)" -#~ msgid "Choose Signer" -#~ msgstr "選擇簽章者" +#: ../pgp/seahorse-sign.xml.h:8 +msgid "" +"Not at all: means you believe the key is owned by the person who " +"claims to own it, but you could not or did not verify this to be a fact." +msgstr "" +"沒關係：代表您信任金鑰是由聲稱擁有它的人所擁有，但實際上您不能或是沒有" +"檢查它。" -#~ msgid "Choose Signature File Name for '%s'" -#~ msgstr "選取‘%s’的簽章檔案名稱" +#: ../pgp/seahorse-sign.xml.h:9 +msgid "" +"Casually: means you have done a casual verification that the key is " +"owned by the person who claims to own it. For example, you could read the " +"key fingerprint to the owner over the phone." +msgstr "" +"隨意：代表您隨意地檢驗過金鑰是由聲稱擁有它的人擁有。例如，您可以透過電" +"話要求該人讀出金鑰的數位指紋。" -#~ msgid "Import is complete" -#~ msgstr "匯出已完成" +#: ../pgp/seahorse-sign.xml.h:10 +msgid "" +"Very Carefully: Select this only if you are absolutely sure that this " +"key is genuine." +msgstr "非常小心：只有您在完全信任此金鑰為真時才選取此項。" -#~ msgid "Importing keys ..." -#~ msgstr "正在匯入金鑰…" +#: ../pgp/seahorse-sign.xml.h:11 +msgid "" +"You could use a hard to forge photo identification (such as a passport) to " +"personally check that the name on the key is correct. You should have also " +"used email to check that the email address belongs to the owner." +msgstr "" +"您可以使用難以偽造的相片（像護照一樣）來辨認金鑰的名稱是否正確。您同時應以電" +"郵來檢查該電郵是否屬於該人擁有。" -#~ msgid "Choose Decrypted File Name for '%s'" -#~ msgstr "選取‘%s’解密後的檔案名稱" +#: ../pgp/seahorse-sign.xml.h:12 +msgid "How others will see this signature:" +msgstr "其他人如何看到此簽章：" -#~ msgid "Choose Original File for '%s'" -#~ msgstr "選取‘%s’原始檔案名稱" +#: ../pgp/seahorse-sign.xml.h:13 +msgid "_Others may not see this signature" +msgstr "其他人可能無法看到此簽章(_O)" -#~ msgid "No valid signatures found" -#~ msgstr "找不到有效的簽章" +#: ../pgp/seahorse-sign.xml.h:14 +msgid "I can _revoke this signature at a later date." +msgstr "我可以在稍後時間撤銷此簽章(_R)" -#~ msgid "File Encryption Tool" -#~ msgstr "檔案加密工具" +#: ../pgp/seahorse-sign.xml.h:15 +msgid "Sign key as:" +msgstr "用作簽署的金鑰：" -#~ msgid "Encrypting" -#~ msgstr "加密中" +#: ../pgp/seahorse-sign.xml.h:16 +msgid "_Signer:" +msgstr "簽章者(_S)" -#~ msgid "Couldn't encrypt file: %s" -#~ msgstr "無法將檔案加密：%s" +#: ../pgp/seahorse-sign.xml.h:17 +msgid "_Sign" +msgstr "簽署(_S)" -#~ msgid "Signing" -#~ msgstr "簽署中" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Exporting data" +msgstr "匯出資料" -#~ msgid "Couldn't sign file: %s" -#~ msgstr "無法簽署檔案：%s" +#: ../pgp/seahorse-transfer.c:237 ../pgp/seahorse-transfer.c:284 +msgid "Retrieving data" +msgstr "取回資料" -#~ msgid "Couldn't import keys from file: %s" -#~ msgstr "無法從檔案匯入金鑰：%s" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Importing data" +msgstr "輸入資料" -#~ msgid "Decrypting" -#~ msgstr "解密中" +#: ../pgp/seahorse-transfer.c:240 ../pgp/seahorse-transfer.c:287 +msgid "Sending data" +msgstr "傳送資料" -#~ msgid "Couldn't decrypt file: %s" -#~ msgstr "無法將檔案解密：%s" +#: ../pgp/seahorse-unknown.c:61 +msgid "Unavailable" +msgstr "不存在" -#~ msgid "Verifying" -#~ msgstr "驗證中" +#: ../pkcs11/seahorse-certificate.c:435 +msgid "Personal certificate and key" +msgstr "個人憑證與金鑰" + +#: ../pkcs11/seahorse-certificate.c:438 +msgid "Personal certificate" +msgstr "個人憑證.." -#~ msgid "Couldn't verify file: %s" -#~ msgstr "無法驗證檔案：%s" +#: ../pkcs11/seahorse-certificate.c:440 +#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +msgid "Certificate" +msgstr "憑證" -#~ msgid "Ace (.ace)" -#~ msgstr "Ace 格式 (.ace)" +#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +msgid "Certificates (DER encoded)" +msgstr "憑證 (DER 編碼)" -#~ msgid "Ar (.ar)" -#~ msgstr "Ar 格式 (.ar)" +#: ../pkcs11/seahorse-pkcs11-backend.c:183 +msgid "Certificates" +msgstr "憑證" -#~ msgid "Arj (.arj)" -#~ msgstr "Arj 格式 (.arj)" +#: ../pkcs11/seahorse-pkcs11-backend.c:186 +msgid "X.509 certificates and related keys" +msgstr "X.509 憑證和相關金鑰" + +#: ../pkcs11/seahorse-pkcs11-deleter.c:69 +#, c-format +msgid "Are you sure you want to permanently delete %d certificate?" +msgid_plural "Are you sure you want to permanently delete %d certificates?" +msgstr[0] "您確定要永久刪除 %d 個憑證？" + +#: ../pkcs11/seahorse-pkcs11-generate.c:115 +msgid "Couldn't generate private key" +msgstr "無法產生私密金鑰" + +#: ../pkcs11/seahorse-pkcs11-generate.c:414 +#: ../pkcs11/seahorse-pkcs11-request.c:256 +msgid "Create" +msgstr "建立" + +#: ../pkcs11/seahorse-pkcs11-generate.c:507 +#: ../pkcs11/seahorse-private-key.c:179 +msgid "Private key" +msgstr "私密金鑰" + +#: ../pkcs11/seahorse-pkcs11-generate.c:508 +msgid "Used to request a certificate" +msgstr "用來申請憑證" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:1 +msgid "Create a new private key" +msgstr "建立新的私密金鑰" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:2 +msgid "Label:" +msgstr "標籤：" + +#: ../pkcs11/seahorse-pkcs11-generate.xml.h:3 +msgid "Stored at:" +msgstr "儲存在：" + +#: ../pkcs11/seahorse-pkcs11-key-deleter.c:85 +msgid "I understand that this key will be permanently deleted." +msgstr "我知道這個金鑰會被永久刪除。" + +#: ../pkcs11/seahorse-pkcs11-properties.c:147 +#: ../pkcs11/seahorse-pkcs11-properties.c:151 +msgid "Unnamed" +msgstr "未命名的" + +#: ../pkcs11/seahorse-pkcs11-properties.c:175 +msgid "Failed to export certificate" +msgstr "無法匯出憑證" -#~ msgid "Ear (.ear)" -#~ msgstr "Ear 格式 (.ear)" +#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:875 +msgid "Couldn't delete" +msgstr "無法刪除" -#~ msgid "Self-extracting zip (.exe)" -#~ msgstr "自動解壓縮 zip 檔 (.exe)" +#: ../pkcs11/seahorse-pkcs11-properties.c:231 +msgid "_Export" +msgstr "匯出(_E)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:232 +msgid "Export the certificate" +msgstr "匯出憑證" + +#: ../pkcs11/seahorse-pkcs11-properties.c:234 +msgid "Delete this certificate or key" +msgstr "刪除這個憑證或金鑰" + +#: ../pkcs11/seahorse-pkcs11-properties.c:235 +msgid "Request _Certificate" +msgstr "申請憑證(_C)" + +#: ../pkcs11/seahorse-pkcs11-properties.c:236 +msgid "Create a certificate request file for this key" +msgstr "為這個金鑰建立憑證申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:104 +msgid "Couldn't save certificate request" +msgstr "無法儲存憑證申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:127 +msgid "Save certificate request" +msgstr "儲存憑證申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:138 +msgid "Certificate request" +msgstr "憑證申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:146 +msgid "PEM encoded request" +msgstr "PEM 編碼的申請" + +#: ../pkcs11/seahorse-pkcs11-request.c:194 +msgid "Couldn't create certificate request" +msgstr "無法建立憑證申請" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:1 +msgid "Create a certificate request file." +msgstr "建立憑證申請檔案。" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:2 +msgid "The common name (CN) placed in the certificate request." +msgstr "放在憑證申請中的一般名稱 (CN)。" + +#: ../pkcs11/seahorse-pkcs11-request.xml.h:3 +msgid "Name (CN):" +msgstr "一般名稱 (CN):" + +#: ../pkcs11/seahorse-private-key.c:132 +msgid "Unnamed private key" +msgstr "未命名的私密金鑰" -#~ msgid "Jar (.jar)" -#~ msgstr "Jar 格式 (.jar)" +#: ../src/seahorse-change-passphrase.xml.h:1 +msgid "Change Passphrase" +msgstr "更改密語" -#~ msgid "Lha (.lzh)" -#~ msgstr "Lha 格式 (.lzh)" +#: ../src/seahorse-change-passphrase.xml.h:3 +msgid "New _Passphrase:" +msgstr "新的密語(_P):" -#~ msgid "Rar (.rar)" -#~ msgstr "Rar 格式 (.rar)" +#: ../src/seahorse-change-passphrase.xml.h:4 +msgid "Confirm new passphrase" +msgstr "確認新的密語" -#~ msgid "Tar uncompressed (.tar)" -#~ msgstr "未壓縮的 Tar 格式 (.tar)" +#: ../src/seahorse-change-passphrase.xml.h:5 +msgid "Con_firm Passphrase:" +msgstr "確認密語(_F):" -#~ msgid "Tar compressed with bzip (.tar.bz)" -#~ msgstr "使用 bzip 壓縮的 Tar 檔案 (.tar.bz)" +#: ../src/seahorse.desktop.in.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "管理密碼及金鑰" -#~ msgid "Tar compressed with bzip2 (.tar.bz2)" -#~ msgstr "使用 bzip2 壓縮的 Tar 檔案 (.tar.bz2)" +#: ../src/seahorse-generate-select.c:229 +msgid "Continue" +msgstr "繼續" -#~ msgid "Tar compressed with gzip (.tar.gz)" -#~ msgstr "使用 gzip 壓縮的 Tar 檔案 (.tar.gz)" +#: ../src/seahorse-generate-select.xml.h:1 +msgid "_Select the type of item to create:" +msgstr "選取想要建立的項目類型(_S):" -#~ msgid "Tar compressed with lzop (.tar.lzo)" -#~ msgstr "使用 lzop 壓縮的 Tar 檔案 (.tar.lzo)" +#: ../src/seahorse-import-dialog.c:98 +msgid "Import failed" +msgstr "匯入失敗" + +#: ../src/seahorse-import-dialog.c:116 +msgid "Import" +msgstr "匯入" + +#: ../src/seahorse-import-dialog.c:129 +msgid "Data to be imported:" +msgstr "要匯入的資料：" -#~ msgid "Tar compressed with compress (.tar.Z)" -#~ msgstr "使用 compress 壓縮的 Tar 檔案 (.tar.Z)" +#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845 +msgid "Import Key" +msgstr "匯入金鑰" -#~ msgid "War (.war)" -#~ msgstr "War 格式 (.war)" +#: ../src/seahorse-key-manager.c:274 +msgid "All key files" +msgstr "所有金鑰檔" -#~ msgid "Zip (.zip)" -#~ msgstr "Zip 格式 (.zip)" +#: ../src/seahorse-key-manager.c:375 +msgid "Dropped text" +msgstr "拖放的文字" + +#: ../src/seahorse-key-manager.c:398 +msgid "Clipboard text" +msgstr "剪貼簿文字" + +#: ../src/seahorse-key-manager.c:509 +msgid "_New" +msgstr "新增(_N)" -#~ msgid "Zoo (.zoo)" -#~ msgstr "Zoo 格式 (.zoo)" +#: ../src/seahorse-key-manager.c:511 +msgid "Close this program" +msgstr "關閉本程式" -#~ msgid "7-Zip (.7z)" -#~ msgstr "7-Zip 格式 (.7z)" +#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514 +msgid "_New..." +msgstr "新增(_N)…" -#~ msgid "You have selected %d file " -#~ msgid_plural "You have selected %d files " -#~ msgstr[0] "您選取了 %d 個檔案" -#~ msgstr[1] "您選取了 %d 個檔案" +#: ../src/seahorse-key-manager.c:513 +msgid "Create a new key or item" +msgstr "建立新的金鑰或項目" -#~ msgid "and %d folder" -#~ msgid_plural "and %d folders" -#~ msgstr[0] "及 %d 個資料夾" -#~ msgstr[1] "及 %d 個資料夾" +#: ../src/seahorse-key-manager.c:515 +msgid "Add a new key or item" +msgstr "加入新的金鑰或項目" -#~ msgid "%s%s" -#~ msgstr "%s%s" +#: ../src/seahorse-key-manager.c:516 +msgid "_Import..." +msgstr "匯入(_I)…" -#~ msgid "You have selected %d files" -#~ msgstr "您選取了 %d 個檔案" +#: ../src/seahorse-key-manager.c:517 +msgid "Import from a file" +msgstr "由檔案匯入" -#~ msgid "You have selected %d folder" -#~ msgid_plural "You have selected %d folders" -#~ msgstr[0] "您選取了 %d 個資料夾" -#~ msgstr[1] "您選取了 %d 個資料夾" +#: ../src/seahorse-key-manager.c:519 +msgid "Import from the clipboard" +msgstr "從剪貼簿匯入" -#~ msgid "Couldn't list files" -#~ msgstr "無法列出檔案" +#: ../src/seahorse-key-manager.c:523 +msgid "By _keyring" +msgstr "依鑰匙圈(_K)" + +#: ../src/seahorse-key-manager.c:524 +msgid "Show sidebar listing keyrings" +msgstr "顯示側邊欄列出鑰匙圈" + +#: ../src/seahorse-key-manager.c:528 +msgid "Show _personal" +msgstr "顯示個人(_P)" + +#: ../src/seahorse-key-manager.c:529 +msgid "Only show personal keys, certificates and passwords" +msgstr "只顯示個人金鑰、憑證和密碼" + +#: ../src/seahorse-key-manager.c:530 +msgid "Show _trusted" +msgstr "顯示信任的(_T)" + +#: ../src/seahorse-key-manager.c:531 +msgid "Only show trusted keys, certificates and passwords" +msgstr "只顯示信任的金鑰、憑證和密碼" + +#: ../src/seahorse-key-manager.c:532 +msgid "Show _any" +msgstr "顯示任何(_A)" + +#: ../src/seahorse-key-manager.c:533 +msgid "Show all keys, certificates and passwords" +msgstr "顯示所有的金鑰、憑證和密碼" + +#: ../src/seahorse-key-manager.c:737 +msgid "Filter" +msgstr "過濾條件" -#~ msgid "Couldn't read file" -#~ msgstr "無法讀取檔案" +#: ../src/seahorse-key-manager.xml.h:1 +msgid "First time options:" +msgstr "第一次執行選項：" -#~ msgid "Back up Key Rings to Archive" -#~ msgstr "將金鑰備份至壓縮檔" +#: ../src/seahorse-key-manager.xml.h:2 +msgid "Generate a new key of your own: " +msgstr "產生您的金鑰：" -#~ msgid "seahorse" -#~ msgstr "Seahorse" +#: ../src/seahorse-key-manager.xml.h:4 +msgid "Import existing keys from a file:" +msgstr "從檔案中匯入已存的金鑰" -#~ msgid "_Back up Key Rings..." -#~ msgstr "備份鑰匙圈(_B)…" +#: ../src/seahorse-key-manager.xml.h:5 +msgid "To get started with encryption you will need keys." +msgstr "開始加密前您需要擁有金鑰。" -#~ msgid "Back up all keys" -#~ msgstr "備份所有金鑰" +#: ../src/seahorse-sidebar.c:799 +msgid "Couldn't lock" +msgstr "無法鎖定" + +#: ../src/seahorse-sidebar.c:836 +msgid "Couldn't unlock" +msgstr "無法解鎖" -#~ msgid "Set Up Computer for _Secure Shell..." -#~ msgstr "設定電腦的 _SSH…" +#: ../src/seahorse-sidebar.c:944 +msgid "_Lock" +msgstr "鎖定(_L)" -#~ msgid "User ID" -#~ msgstr "使用者 ID" +#: ../src/seahorse-sidebar.c:949 +msgid "_Unlock" +msgstr "解鎖(_U)" -#~ msgid "Couldn't retrieve key data" -#~ msgstr "無法取得金鑰資料" +#: ../src/seahorse-sidebar.c:968 +msgid "_Properties" +msgstr "屬性(_P)" -#~ msgid "Couldn't write key to file" -#~ msgstr "金鑰無法儲存至檔案" +#: ../ssh/seahorse-ssh-actions.c:100 +msgid "Configure Key for _Secure Shell..." +msgstr "正在設定 _SSH 金鑰…" -#~ msgid "Couldn't import keys into key ring" -#~ msgstr "無法將金鑰匯入至鑰匙圈中" +#: ../ssh/seahorse-ssh-actions.c:101 +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." +msgstr "將公共 SSH 金鑰傳送給其它電腦，及能使用該金鑰登入。" -#~ msgid "Couldn't write keys to file: %s" -#~ msgstr "無法將金鑰寫入至檔案：%s" +#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +msgid "Enter your Secure Shell passphrase:" +msgstr "輸入您的 SSH 密語:" -#~ msgid "Save Remote Keys" -#~ msgstr "儲存遠端金鑰" +#: ../ssh/seahorse-ssh-askpass.c:82 +msgid "Old Key Passphrase" +msgstr "舊金鑰密語" -#~ msgid "No matching keys found" -#~ msgstr "找不到相符的金鑰" +#: ../ssh/seahorse-ssh-askpass.c:83 +#, c-format +msgid "Enter the old passphrase for: %s" +msgstr "輸入 %s 的舊密語" -#~ msgid "Save Key As..." -#~ msgstr "另存金鑰為…" +#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +msgid "New Key Passphrase" +msgstr "新的金鑰密語" -#~ msgid "Save selected keys as a file" -#~ msgstr "儲存金鑰為檔案" +#: ../ssh/seahorse-ssh-askpass.c:88 +#, c-format +msgid "Enter the new passphrase for: %s" +msgstr "輸入 %s 的新密語" -#~ msgid "Remote Encryption Keys" -#~ msgstr "遠端加密金鑰" +#: ../ssh/seahorse-ssh-askpass.c:93 +#, c-format +msgid "Enter the new passphrase again: %s" +msgstr "請再次輸入新密語：%s" -#~ msgid "You have selected multiple files or folders" -#~ msgstr "您選取了多個檔案或資料夾" +#: ../ssh/seahorse-ssh-backend.c:91 +msgid "Secure Shell" +msgstr "安全系統殼(Secure Shell)" + +#: ../ssh/seahorse-ssh-backend.c:94 +msgid "Keys used to connect securely to other computers" +msgstr "用來安全的連接其他電腦的金鑰" -#~ msgid "" -#~ "Because the files are located remotely, each file will be encrypted " -#~ "separately." -#~ msgstr "由於檔案位於在遠端，因此會分開每個檔案加密。" +#: ../ssh/seahorse-ssh-deleter.c:81 ../ssh/seahorse-ssh-deleter.c:86 +#, c-format +msgid "Are you sure you want to delete the secure shell key '%s'?" +msgstr "確定要刪除 SSH 金錀「%s」？" -#~ msgid "Encrypt Multiple Files" -#~ msgstr "加密多個檔案" +#: ../ssh/seahorse-ssh-deleter.c:91 +#, c-format +msgid "Are you sure you want to delete %d secure shell key?" +msgid_plural "Are you sure you want to delete %d secure shell keys?" +msgstr[0] "確定要刪除 %d 個 SSH 金鑰？" -#~ msgid "Encrypt each file separately" -#~ msgstr "每個檔案分開加密" +#: ../ssh/seahorse-ssh-exporter.c:92 +msgid "Ssh Key" +msgstr "SSH 金鑰" -#~ msgid "Encrypt packed together in a package" -#~ msgstr "加密及封裝在同一個套件中" +#: ../ssh/seahorse-ssh-exporter.c:122 +msgid "Secret SSH keys" +msgstr "秘密 SSH 金鑰" + +#: ../ssh/seahorse-ssh-exporter.c:126 +msgid "Public SSH keys" +msgstr "公開 SSH 金鑰" + +#: ../ssh/seahorse-ssh-exporter.c:290 +msgid "No public key file is available for this key." +msgstr "這個金鑰沒有可用的公開金鑰。" -#~ msgid "Package Name:" -#~ msgstr "套件名稱：" +#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 +#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +msgid "Secure Shell Key" +msgstr "SSH 金鑰" -#~ msgid "Packaging:" -#~ msgstr "封裝形式：" +#: ../ssh/seahorse-ssh-generate.c:56 +msgid "Used to access other computers (eg: via a terminal)" +msgstr "用作存取其它電腦（如終端機）" -#~ msgid "encrypted-package" -#~ msgstr "encrypted-package" +#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +msgid "Couldn't generate Secure Shell key" +msgstr "無法產生 SSH 金鑰" -#~ msgid "Decrypt File" -#~ msgstr "解密檔案" +#: ../ssh/seahorse-ssh-generate.c:192 +msgid "Creating Secure Shell Key" +msgstr "正在產生 SSH 金鑰" -#~ msgid "I have checked that this key belongs to '%s'" -#~ msgstr "已檢查該金鑰屬於‘%s’" +#: ../ssh/seahorse-ssh-generate.xml.h:1 +msgid "New Secure Shell Key" +msgstr "新增 SSH 金鑰" -#~ msgid "Verify Signature" -#~ msgstr "驗證簽章" +#: ../ssh/seahorse-ssh-generate.xml.h:2 +msgid "_Just Create Key" +msgstr "只是建立金鑰(_J)" -#~ msgid "couldn't read gpg configuration, will try to create" -#~ msgstr "無法讀取 gpg 設定，會嘗設建立" +#: ../ssh/seahorse-ssh-generate.xml.h:3 +msgid "_Create and Set Up" +msgstr "建立及設定(_C)" -#~ msgid "couldn't modify gpg configuration: %s" -#~ msgstr "無法修改 gpg 設定：%s" +#: ../ssh/seahorse-ssh-generate.xml.h:4 +msgid "A Secure Shell (SSH) key lets you connect securely to other computers." +msgstr "SSH (Secure Shell) 金鑰能讓您安全的連接其他的電腦。" + +#: ../ssh/seahorse-ssh-generate.xml.h:6 +msgid "Your email address, or a reminder of what this key is for." +msgstr "您的電子郵件位址，及其他提示這金鑰要來作甚麼。" -#~ msgid "" -#~ "Display variables instead of editing conf files (gpg.conf, SSH agent " -#~ "socket)" -#~ msgstr "以顯示變數取代編輯 conf 檔案 (gpg.conf, SSH agent socket)" +#: ../ssh/seahorse-ssh-generate.xml.h:10 +msgid "DSA" +msgstr "DSA" -#~ msgid "couldn't drop privileges properly" -#~ msgstr "無法正確地消除權限" +#: ../ssh/seahorse-ssh-generate.xml.h:12 +msgid "" +"If there is a computer you want to use this key with, you can set up that " +"computer to recognize your new key." +msgstr "如果有您想使用本金鑰的電腦，現在可以設定電腦認識您的金鑰。" -#~ msgid "" -#~ "When set seahorse-agent will try to automatically load the users SSH keys " -#~ "when needed. This is equivalent to using the ssh-add utility." -#~ msgstr "" -#~ "設定後 seahorse-agent 在需要時會嘗試自動載入使用者的 SSH 金鑰。這跟使用" -#~ "ssh-add 工具的效果一樣。" +#: ../ssh/seahorse-ssh-key.c:110 +msgid "(Unreadable Secure Shell Key)" +msgstr "（不能讀取的 SSH 金鑰）" -#~ msgid "Whether to automatically load SSH keys on demand." -#~ msgstr "需要時是否自動載入 SSH 金鑰。" +#: ../ssh/seahorse-ssh-key.c:218 +msgid "Personal SSH key" +msgstr "個人的 SSH 金鑰" -#~ msgid "Couldn't open the Session Properties" -#~ msgstr "無法開啟階段屬性" +#: ../ssh/seahorse-ssh-key.c:220 +msgid "SSH key" +msgstr "SSH 金鑰" -#~ msgid "Couldn't start the 'seahorse-agent' program" -#~ msgstr "無法執行‘seahorse-agent’程式" +#: ../ssh/seahorse-ssh-key-properties.c:82 +msgid "Couldn't rename key." +msgstr "金鑰無法重新命名。" -#~ msgid "The 'seahorse-agent' program exited unsuccessfully." -#~ msgstr "‘seahorse-agent’程式未能成功離開。" +#: ../ssh/seahorse-ssh-key-properties.c:135 +msgid "Couldn't change authorization for key." +msgstr "無法變更金鑰的認證。" -#~ msgid "" -#~ "Note: The 'seahorse-agent' program has been started. This program " -#~ "is necessary in order to cache passphrases. " -#~ msgstr "" -#~ "注意：‘seahorse-agent’程式已經執行。使用密語快取時需要這程式。" +#: ../ssh/seahorse-ssh-key-properties.c:170 +msgid "Couldn't change passphrase for key." +msgstr "無法更改金鑰的密語。" -#~ msgid "Secure Shell Keys" -#~ msgstr "SSH 金鑰" +#: ../ssh/seahorse-ssh-key-properties.xml.h:2 +msgid "Identifier:" +msgstr "識別碼：" -#~ msgid "" -#~ "Warning: The 'seahorse-agent' program is not running. This program " -#~ "is necessary in order to cache passphrases. " -#~ msgstr "" -#~ "警告：‘seahorse-agent’程式並沒有執行。使用密語快取時所需要這程式。" +#. Name of key, often a persons name +#: ../ssh/seahorse-ssh-key-properties.xml.h:6 +msgctxt "name-of-ssh-key" +msgid "Name:" +msgstr "名稱：" -#~ msgid "" -#~ "No SSH caching agent is running. Cannot load Secure Shell keys." -#~ msgstr "沒有 SSH 代理程式正在運行，無法載入 SSH 金鑰。" +#: ../ssh/seahorse-ssh-key-properties.xml.h:7 +msgid "Used to connect to other computers." +msgstr "用作連接其它電腦。" -#~ msgid "Automatically load _Secure Shell keys" -#~ msgstr "自動載入 _SSH 金鑰" +#: ../ssh/seahorse-ssh-key-properties.xml.h:11 +msgid "Trust" +msgstr "信任" -#~ msgid "Passphrase Cache" -#~ msgstr "密語快取" +#: ../ssh/seahorse-ssh-key-properties.xml.h:12 +msgid "The owner of this key is _authorized to connect to this computer" +msgstr "此金鑰的擁有者被授權連接本電腦(_A)" -#~ msgid "Session Properties" -#~ msgstr "階段屬性" +#: ../ssh/seahorse-ssh-key-properties.xml.h:14 +#, no-c-format +msgid "This only applies to the %s account." +msgstr "只會套用在 %s帳號。" -#~ msgid "" -#~ "To avoid manually starting the 'seahorse-agent' in the future\n" -#~ "add it to the Session Manager. " -#~ msgstr "" -#~ "為了以後無需每次都要自行執行‘seahorse-agent’，\n" -#~ "將其加入到作業階段管理員。" +#: ../ssh/seahorse-ssh-key-properties.xml.h:16 +msgid "Algorithm:" +msgstr "演算法：" -#~ msgid "Progress Message" -#~ msgstr "進度信息" +#: ../ssh/seahorse-ssh-key-properties.xml.h:17 +msgid "Strength:" +msgstr "強度：" -#~ msgid "Progress Status" -#~ msgstr "進度狀態" +#: ../ssh/seahorse-ssh-key-properties.xml.h:18 +msgid "Location:" +msgstr "位置:" -#~ msgid "Cursor Position" -#~ msgstr "游標位置" +#: ../ssh/seahorse-ssh-key-properties.xml.h:21 +msgid "E_xport Complete Key" +msgstr "匯出整個金鑰(_X)" -#~ msgid "The current position of the insertion cursor in chars" -#~ msgstr "游標目前的位置，以字元計。" +#: ../ssh/seahorse-ssh-operation.c:199 +msgid "The SSH command was terminated unexpectedly." +msgstr "SSH 指令在無法預期下中止。" -#~ msgid "Selection Bound" -#~ msgstr "選取邊界" +#: ../ssh/seahorse-ssh-operation.c:209 +msgid "The SSH command failed." +msgstr "SSH 指令失敗。" -#~ msgid "" -#~ "The position of the opposite end of the selection from the cursor in chars" -#~ msgstr "所選取的部份中，游標到另一端位置的距離（字元為單位）" +#: ../ssh/seahorse-ssh-operation.c:502 +msgid "Remote Host Password" +msgstr "遠端主機密碼 " -#~ msgid "Maximum length" -#~ msgstr "最大長度" +#: ../ssh/seahorse-ssh-operation.c:588 +msgid "Enter Key Passphrase" +msgstr "輸入金鑰密語" -#~ msgid "Maximum number of characters for this entry. Zero if no maximum" -#~ msgstr "輸入欄中字元數目的上限。0 為沒有上限" +#: ../ssh/seahorse-ssh-operation.c:678 +msgid "Passphrase for New Secure Shell Key" +msgstr "新的 SSH 金鑰的密語" -#~ msgid "Has Frame" -#~ msgstr "有框架" +#: ../ssh/seahorse-ssh-operation.c:862 +#, c-format +msgid "Importing key: %s" +msgstr "匯入金鑰：%s" -#~ msgid "FALSE removes outside bevel from entry" -#~ msgstr "FALSE 可將外部裝飾" +#: ../ssh/seahorse-ssh-operation.c:864 +msgid "Importing key. Enter passphrase" +msgstr "正在匯入金鑰，請輸入密語" -#~ msgid "Invisible character" -#~ msgstr "隱形字元" +#: ../ssh/seahorse-ssh-source.c:232 +msgid "OpenSSH keys" +msgstr "OpenSSH 金鑰" -#~ msgid "" -#~ "The character to use when masking entry contents (in \"password mode\")" -#~ msgstr "用來遮蓋輸入內容的字元（在「密碼模式」裡）" +#: ../ssh/seahorse-ssh-source.c:235 +#, c-format +msgid "OpenSSH: %s" +msgstr "OpenSSH：%s" -#~ msgid "" -#~ "Whether to activate the default widget (such as the default button in a " -#~ "dialog) when Enter is pressed" -#~ msgstr "當按下 Enter 鍵時，是否啟動預設視窗元件（例如對話盒的按鈕）" +#: ../ssh/seahorse-ssh-source.c:940 +msgid "No private key file is available for this key." +msgstr "這個金鑰沒有可用的私密金鑰。" -#~ msgid "Width in chars" -#~ msgstr "寬度（以字元計算）" +#: ../ssh/seahorse-ssh-upload.c:50 +msgid "Couldn't configure Secure Shell keys on remote computer." +msgstr "在遠端電腦無法設定 SSH 金鑰" -#~ msgid "Number of characters to leave space for in the entry" -#~ msgstr "輸入元件中預留的空白長度（單位為字元）" +#: ../ssh/seahorse-ssh-upload.c:133 +msgid "Configuring Secure Shell Keys..." +msgstr "正在設定 SSH 金鑰" -#~ msgid "Scroll offset" -#~ msgstr "捲動偏移" +#: ../ssh/seahorse-ssh-upload.xml.h:1 +msgid "Set Up Computer for SSH Connection" +msgstr "設定電腦的 SSH 連線" -#~ msgid "Number of pixels of the entry scrolled off the screen to the left" -#~ msgstr "輸入元件相對於螢幕向左捲動偏移的程度（單位為像素）" +#: ../ssh/seahorse-ssh-upload.xml.h:2 +msgid "" +"To use your Secure Shell key with another computer that uses SSH, you must " +"already have a login account on that computer." +msgstr "要在其他的電腦使用您的 SSH 金鑰，您需要有該電腦的登入帳號。" -#~ msgid "Text" -#~ msgstr "文字" +#: ../ssh/seahorse-ssh-upload.xml.h:4 +msgid "eg: fileserver.example.com:port" +msgstr "例如：fileserver.example.com:port" -#~ msgid "The contents of the entry" -#~ msgstr "輸入的內容" +#: ../ssh/seahorse-ssh-upload.xml.h:5 +msgid "_Computer Name:" +msgstr "電腦名稱(_C):" -#~ msgid "Visibility" -#~ msgstr "可見狀態" +#: ../ssh/seahorse-ssh-upload.xml.h:6 +msgid "_Login Name:" +msgstr "登入名稱(_L):" -#~ msgid "Whether contents are drawn using invisible character" -#~ msgstr "內容是否以透明的字元顯示" +#: ../ssh/seahorse-ssh-upload.xml.h:7 +msgid "_Set Up" +msgstr "設定(_S)" -#~ msgid "Key type / algorithm" -#~ msgstr "金鑰類型 / 演算法" +#~ msgid "Login keyring" +#~ msgstr "登入鑰匙圈" -#~ msgid "Login:" -#~ msgstr "登入：" +#~ msgid "Access to the key ring was denied" +#~ msgstr "存取鑰匙圈被禁止" -#~ msgid "Server:" -#~ msgstr "伺服器：" +#~ msgid "The gnome-keyring daemon is not running" +#~ msgstr "gnome-keyring 服務程式沒有執行" -#~ msgid "[Type here]" -#~ msgstr "[在這裡輸入]" +#~ msgid "The key ring has already been unlocked" +#~ msgstr "鑰匙圈已經解鎖" -#~ msgid "[Use here]" -#~ msgstr "[使用這裡]" +#~ msgid "No such key ring exists" +#~ msgstr "沒有該鑰匙圈存在" -#~ msgid "[details]\n" -#~ msgstr "[詳細資料]\n" +#~ msgid "Couldn't communicate with key ring daemon" +#~ msgstr "無法與鑰匙圈服務程式聯絡" -#~ msgid "[login]" -#~ msgstr "[登入]" +#~ msgid "The item already exists" +#~ msgstr "項目已經存在" -#~ msgid "[server]" -#~ msgstr "[伺服器]" +#~ msgid "Internal error accessing gnome-keyring" +#~ msgstr "存取 gnome-keyring 發生內部錯誤" -#~ msgid "This key expired on: (placeholder)" -#~ msgstr "此金鑰過期於：(placeholder)" +#~ msgid "Algorithms here" +#~ msgstr "演算法這裡" diff -Nru seahorse-3.2.2/src/Makefile.am seahorse-3.6.3/src/Makefile.am --- seahorse-3.2.2/src/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/Makefile.am 2012-11-09 11:08:13.000000000 +0100 @@ -1,26 +1,16 @@ +include $(top_srcdir)/Makefile.decl uidir = $(datadir)/seahorse/ui/ localedir = $(datadir)/locale -pixmapsdir = $(datadir)/pixmaps/ INCLUDES = -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libegg \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DPIXMAPSDIR=\""$(pixmapsdir)"\" \ -DGETTEXT_PACKAGE=\""seahorse\"" -if WITH_KEYSERVER -KEYSERVER_SRCS = seahorse-keyserver-search.c seahorse-keyserver-sync.c seahorse-keyserver-sync.h -KEYSERVER_SRCS += seahorse-keyserver-results.c seahorse-keyserver-results.h -else -KEYSERVER_SRCS = -endif - if WITH_PGP PGP_LDADD = $(top_builddir)/pgp/libseahorse-pgp.la else @@ -42,13 +32,11 @@ bin_PROGRAMS = seahorse seahorse_SOURCES = \ - seahorse-preferences.c seahorse-preferences.h \ seahorse-generate-select.c seahorse-generate-select.h \ + seahorse-import-dialog.c seahorse-import-dialog.h \ seahorse-key-manager.c seahorse-key-manager.h \ - seahorse-key-manager-store.c seahorse-key-manager-store.h \ seahorse-main.c \ - seahorse-viewer.c seahorse-viewer.h \ - seahorse-windows.h \ + seahorse-sidebar.c seahorse-sidebar.h \ $(KEYSERVER_SRCS) seahorse_LDADD = \ @@ -65,11 +53,7 @@ seahorse-key-manager.ui \ seahorse-key-manager.xml \ seahorse-change-passphrase.xml \ - seahorse-generate-select.xml \ - seahorse-keyserver-search.xml \ - seahorse-keyserver-results.ui \ - seahorse-keyserver-results.xml \ - seahorse-keyserver-sync.xml + seahorse-generate-select.xml desktopdir = $(datadir)/applications desktop_in_files = seahorse.desktop.in @@ -84,5 +68,5 @@ seahorse.desktop.in.in CLEANFILES = *.xmlp* *.bak \ - $(desktop_DATA) \ - seahorse.desktop.in + $(desktop_DATA) \ + $(desktop_in_files) diff -Nru seahorse-3.2.2/src/Makefile.in seahorse-3.6.3/src/Makefile.in --- seahorse-3.2.2/src/Makefile.in 2011-11-14 11:51:43.000000000 +0100 +++ seahorse-3.6.3/src/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,43 +51,30 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.decl $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs bin_PROGRAMS = seahorse$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/seahorse.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(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 = seahorse.desktop.in +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(uidir)" PROGRAMS = $(bin_PROGRAMS) -am__seahorse_SOURCES_DIST = seahorse-preferences.c \ - seahorse-preferences.h seahorse-generate-select.c \ - seahorse-generate-select.h seahorse-key-manager.c \ - seahorse-key-manager.h seahorse-key-manager-store.c \ - seahorse-key-manager-store.h seahorse-main.c seahorse-viewer.c \ - seahorse-viewer.h seahorse-windows.h \ - seahorse-keyserver-search.c seahorse-keyserver-sync.c \ - seahorse-keyserver-sync.h seahorse-keyserver-results.c \ - seahorse-keyserver-results.h -@WITH_KEYSERVER_TRUE@am__objects_1 = \ -@WITH_KEYSERVER_TRUE@ seahorse-keyserver-search.$(OBJEXT) \ -@WITH_KEYSERVER_TRUE@ seahorse-keyserver-sync.$(OBJEXT) \ -@WITH_KEYSERVER_TRUE@ seahorse-keyserver-results.$(OBJEXT) -am_seahorse_OBJECTS = seahorse-preferences.$(OBJEXT) \ - seahorse-generate-select.$(OBJEXT) \ - seahorse-key-manager.$(OBJEXT) \ - seahorse-key-manager-store.$(OBJEXT) seahorse-main.$(OBJEXT) \ - seahorse-viewer.$(OBJEXT) $(am__objects_1) +am_seahorse_OBJECTS = seahorse-generate-select.$(OBJEXT) \ + seahorse-import-dialog.$(OBJEXT) \ + seahorse-key-manager.$(OBJEXT) seahorse-main.$(OBJEXT) \ + seahorse-sidebar.$(OBJEXT) seahorse_OBJECTS = $(am_seahorse_OBJECTS) @WITH_PGP_TRUE@am__DEPENDENCIES_1 = \ @WITH_PGP_TRUE@ $(top_builddir)/pgp/libseahorse-pgp.la @@ -85,9 +88,22 @@ $(top_builddir)/libegg/libeggdatetime.la \ $(top_builddir)/libegg/libeggtreemultidnd.la \ $(am__DEPENDENCIES_4) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -98,24 +114,25 @@ $(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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(seahorse_SOURCES) -DIST_SOURCES = $(am__seahorse_SOURCES_DIST) +DIST_SOURCES = $(seahorse_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -137,6 +154,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -168,9 +191,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -185,15 +206,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -212,10 +229,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -233,7 +257,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -268,6 +291,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -303,6 +327,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale @@ -322,25 +348,38 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +NULL = +V_ASN1 = $(V_ASN1_$(V)) +V_ASN1_ = $(V_ASN1_$(AM_DEFAULT_VERBOSITY)) +V_ASN1_0 = @echo " ASN1 " $@; +V_SED = $(V_SED_$(V)) +V_SED_ = $(V_SED_$(AM_DEFAULT_VERBOSITY)) +V_SED_0 = @echo " SED " $@; +SED_SUBST = sed \ + -e 's,[@]datadir[@],$(datadir),g' \ + -e 's,[@]libexecdir[@],$(libexecdir),g' \ + -e 's,[@]libdir[@],$(libdir),g' \ + -e 's,[@]includedir[@],$(includedir),g' \ + -e 's,[@]datarootdir[@],$(datarootdir),g' \ + -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ + -e 's,[@]bindir[@],$(bindir),g' \ + -e 's,[@]exec_prefix[@],$(exec_prefix),g' \ + -e 's,[@]prefix[@],$(prefix),g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]VALGRIND_RUN[@],$(VALGRIND_RUN),g' \ + $(NULL) + +SUFFIXES = .asn .asn.h .desktop.in .desktop.in.in .service .service.in uidir = $(datadir)/seahorse/ui/ -pixmapsdir = $(datadir)/pixmaps/ INCLUDES = -I$(top_builddir) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libegg \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DPIXMAPSDIR=\""$(pixmapsdir)"\" \ -DGETTEXT_PACKAGE=\""seahorse\"" -@WITH_KEYSERVER_FALSE@KEYSERVER_SRCS = -@WITH_KEYSERVER_TRUE@KEYSERVER_SRCS = seahorse-keyserver-search.c \ -@WITH_KEYSERVER_TRUE@ seahorse-keyserver-sync.c \ -@WITH_KEYSERVER_TRUE@ seahorse-keyserver-sync.h \ -@WITH_KEYSERVER_TRUE@ seahorse-keyserver-results.c \ -@WITH_KEYSERVER_TRUE@ seahorse-keyserver-results.h @WITH_PGP_FALSE@PGP_LDADD = @WITH_PGP_TRUE@PGP_LDADD = $(top_builddir)/pgp/libseahorse-pgp.la @WITH_SSH_FALSE@SSH_LDADD = @@ -348,13 +387,11 @@ @WITH_PKCS11_FALSE@PKCS11_LDADD = @WITH_PKCS11_TRUE@PKCS11_LDADD = $(top_builddir)/pkcs11/libseahorse-pkcs11.la seahorse_SOURCES = \ - seahorse-preferences.c seahorse-preferences.h \ seahorse-generate-select.c seahorse-generate-select.h \ + seahorse-import-dialog.c seahorse-import-dialog.h \ seahorse-key-manager.c seahorse-key-manager.h \ - seahorse-key-manager-store.c seahorse-key-manager-store.h \ seahorse-main.c \ - seahorse-viewer.c seahorse-viewer.h \ - seahorse-windows.h \ + seahorse-sidebar.c seahorse-sidebar.h \ $(KEYSERVER_SRCS) seahorse_LDADD = \ @@ -371,11 +408,7 @@ seahorse-key-manager.ui \ seahorse-key-manager.xml \ seahorse-change-passphrase.xml \ - seahorse-generate-select.xml \ - seahorse-keyserver-search.xml \ - seahorse-keyserver-results.ui \ - seahorse-keyserver-results.xml \ - seahorse-keyserver-sync.xml + seahorse-generate-select.xml desktopdir = $(datadir)/applications desktop_in_files = seahorse.desktop.in @@ -387,14 +420,14 @@ seahorse.desktop.in.in CLEANFILES = *.xmlp* *.bak \ - $(desktop_DATA) \ - seahorse.desktop.in + $(desktop_DATA) \ + $(desktop_in_files) all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +.SUFFIXES: .asn .asn.h .desktop.in .desktop.in.in .service .service.in .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -403,9 +436,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -415,6 +448,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/Makefile.decl: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -424,12 +458,13 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -seahorse.desktop.in: $(top_builddir)/config.status $(srcdir)/seahorse.desktop.in.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -469,7 +504,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -seahorse$(EXEEXT): $(seahorse_OBJECTS) $(seahorse_DEPENDENCIES) +seahorse$(EXEEXT): $(seahorse_OBJECTS) $(seahorse_DEPENDENCIES) $(EXTRA_seahorse_DEPENDENCIES) @rm -f seahorse$(EXEEXT) $(AM_V_CCLD)$(LINK) $(seahorse_OBJECTS) $(seahorse_LDADD) $(LIBS) @@ -480,38 +515,31 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-generate-select.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-key-manager-store.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-import-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-key-manager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-keyserver-results.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-keyserver-search.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-keyserver-sync.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-preferences.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-viewer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-sidebar.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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -520,11 +548,18 @@ -rm -rf .libs _libs install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @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'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -553,13 +588,14 @@ 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; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -573,13 +609,14 @@ @$(NORMAL_UNINSTALL) @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 + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -593,9 +630,7 @@ @$(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 + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -646,6 +681,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -656,10 +705,10 @@ 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; \ + 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; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -709,10 +758,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -801,21 +855,32 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags 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-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am 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-binPROGRAMS uninstall-desktopDATA uninstall-man \ - uninstall-man1 uninstall-uiDATA + clean-generic clean-libtool cscopelist ctags 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-desktopDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am 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-binPROGRAMS uninstall-desktopDATA \ + uninstall-man uninstall-man1 uninstall-uiDATA + + +.asn.asn.h: + $(V_ASN1) $(ASN1PARSER) -o $@ $< && sed -i 's|#include.*|/* \0 */|' $@ + +.desktop.in.in.desktop.in: + $(V_SED) $(SED_SUBST) $< > $@ + +@INTLTOOL_DESKTOP_RULE@ +.service.in.service: + $(V_SED) $(SED_SUBST) $< > $@ @INTLTOOL_DESKTOP_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru seahorse-3.2.2/src/seahorse.desktop.in.in seahorse-3.6.3/src/seahorse.desktop.in.in --- seahorse-3.2.2/src/seahorse.desktop.in.in 2011-09-14 17:14:58.000000000 +0200 +++ seahorse-3.6.3/src/seahorse.desktop.in.in 2012-08-21 12:23:19.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] _Name=Passwords and Keys _Comment=Manage your passwords and encryption keys -Exec=seahorse +Exec=@bindir@/seahorse Terminal=false Type=Application Icon=seahorse diff -Nru seahorse-3.2.2/src/seahorse-generate-select.c seahorse-3.6.3/src/seahorse-generate-select.c --- seahorse-3.2.2/src/seahorse-generate-select.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-generate-select.c 2012-10-18 21:08:43.000000000 +0200 @@ -23,9 +23,34 @@ #include "seahorse-generate-select.h" -#include "seahorse-object-list.h" +#include "seahorse-action.h" #include "seahorse-registry.h" +#include + +#define SEAHORSE_TYPE_GENERATE_SELECT (seahorse_generate_select_get_type ()) +#define SEAHORSE_GENERATE_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GENERATE_SELECT, SeahorseGenerateSelect)) +#define SEAHORSE_GENERATE_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GENERATE_SELECT, SeahorseGenerateSelectClass)) +#define SEAHORSE_IS_GENERATE_SELECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GENERATE_SELECT)) +#define SEAHORSE_IS_GENERATE_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GENERATE_SELECT)) +#define SEAHORSE_GENERATE_SELECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GENERATE_SELECT, SeahorseGenerateSelectClass)) + +GType seahorse_generate_select_get_type (void); + +typedef struct _SeahorseGenerateSelect SeahorseGenerateSelect; +typedef struct _SeahorseGenerateSelectClass SeahorseGenerateSelectClass; + +struct _SeahorseGenerateSelect { + GtkDialog parent_instance; + GtkListStore* store; + GtkTreeView* view; + GList *action_groups; +}; + +struct _SeahorseGenerateSelectClass { + GtkDialogClass dialog_class; +}; + typedef enum { COLUMN_ICON, COLUMN_TEXT, @@ -33,139 +58,205 @@ COLUMN_N_COLUMNS } Column; -struct _SeahorseGenerateSelectPrivate { - GtkListStore* store; - GtkTreeView* view; - GtkDialog* dialog; - GList *action_groups; -}; - -G_DEFINE_TYPE (SeahorseGenerateSelect, seahorse_generate_select, SEAHORSE_TYPE_WIDGET); +G_DEFINE_TYPE (SeahorseGenerateSelect, seahorse_generate_select, GTK_TYPE_DIALOG); static const char* TEMPLATE = "%s\n%s"; -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static gboolean -fire_selected_action (SeahorseGenerateSelect* self) +static GtkAction * +get_selected_action (SeahorseGenerateSelect *self) { GtkTreeSelection *selection; GtkTreeIter iter; GtkTreeModel *model; GtkAction *action; - - selection = gtk_tree_view_get_selection (self->pv->view); + + selection = gtk_tree_view_get_selection (self->view); if (!gtk_tree_selection_get_selected (selection, &model, &iter)) - return FALSE; + return NULL; - gtk_tree_model_get (GTK_TREE_MODEL (self->pv->store), &iter, + gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter, COLUMN_ACTION, &action, -1); g_assert (action != NULL); - gtk_action_activate (action); - return TRUE; + return action; } static void -on_row_activated (GtkTreeView* view, GtkTreePath* path, GtkTreeViewColumn* col, SeahorseGenerateSelect* self) +on_row_activated (GtkTreeView *view, + GtkTreePath *path, + GtkTreeViewColumn *col, + gpointer user_data) { - g_return_if_fail (SEAHORSE_IS_GENERATE_SELECT (self)); - g_return_if_fail (GTK_IS_TREE_VIEW (view)); - g_return_if_fail (path != NULL); - g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (col)); - - if (fire_selected_action (self)) - seahorse_widget_destroy (SEAHORSE_WIDGET (self)); + SeahorseGenerateSelect *self = SEAHORSE_GENERATE_SELECT (user_data); + GtkAction *action; + GtkWindow *parent; + + action = get_selected_action (self); + if (action != NULL) { + parent = gtk_window_get_transient_for (GTK_WINDOW (self)); + if (parent != NULL) + g_object_ref (parent); + + g_object_ref (action); + gtk_widget_destroy (GTK_WIDGET (self)); + + seahorse_action_activate_with_window (action, NULL, parent); + + g_clear_object (&parent); + g_object_unref (action); + } } static void -on_response (GtkDialog* dialog, gint response, SeahorseGenerateSelect* self) +on_response (GtkDialog *dialog, + gint response, + gpointer user_data) { - g_return_if_fail (SEAHORSE_IS_GENERATE_SELECT (self)); - g_return_if_fail (GTK_IS_DIALOG (dialog)); - + SeahorseGenerateSelect *self = SEAHORSE_GENERATE_SELECT (user_data); + GtkAction *action = NULL; + GtkWindow *parent = NULL; + if (response == GTK_RESPONSE_OK) - fire_selected_action (self); + action = get_selected_action (self); + if (action != NULL) { + g_object_ref (action); + parent = gtk_window_get_transient_for (GTK_WINDOW (self)); + if (parent != NULL) + g_object_ref (parent); + } - seahorse_widget_destroy (SEAHORSE_WIDGET (self)); + gtk_widget_destroy (GTK_WIDGET (self)); + + if (action != NULL) { + seahorse_action_activate_with_window (action, NULL, parent); + g_object_unref (action); + g_clear_object (&parent); + } } -/* ----------------------------------------------------------------------------- - * OBJECT - */ +static gint +on_list_sort (GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + gpointer user_data) +{ + gchar *text_a; + gchar *text_b; + gint ret; + + gtk_tree_model_get (model, a, COLUMN_TEXT, &text_a, -1); + gtk_tree_model_get (model, b, COLUMN_TEXT, &text_b, -1); + + ret = g_utf8_collate (text_a, text_b); + g_free (text_a); + g_free (text_b); -static GObject* -seahorse_generate_select_constructor (GType type, guint n_props, GObjectConstructParam *props) + return ret; +} + +static void +seahorse_generate_select_constructed (GObject *obj) { - SeahorseGenerateSelect *self = SEAHORSE_GENERATE_SELECT (G_OBJECT_CLASS (seahorse_generate_select_parent_class)->constructor(type, n_props, props)); - gchar *text, *icon; - gchar *label, *tooltip; + SeahorseGenerateSelect *self = SEAHORSE_GENERATE_SELECT (obj); + gchar *text; GtkCellRenderer *pixcell; GtkTreeSelection *selection; GtkTreeIter iter; - GList *l; - - g_return_val_if_fail (self, NULL); - - self->pv->store = gtk_list_store_new (COLUMN_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, GTK_TYPE_ACTION); - - self->pv->action_groups = seahorse_registry_object_instances (NULL, "generator", NULL); - for (l = self->pv->action_groups; l; l = g_list_next (l)) { - GList *k, *actions = gtk_action_group_list_actions (l->data); - for (k = actions; k; k = g_list_next (k)) { - - g_object_get (k->data, "label", &label, "tooltip", &tooltip, "stock-id", &icon, NULL); - text = g_strdup_printf (TEMPLATE, label, tooltip); + GList *actions; + GList *l, *k; + GIcon *icon; + GtkBuilder *builder; + const gchar *path; + GError *error = NULL; + const gchar *icon_name; + GtkAction *action; + + G_OBJECT_CLASS (seahorse_generate_select_parent_class)->constructed (obj); + + self->store = gtk_list_store_new (COLUMN_N_COLUMNS, G_TYPE_ICON, G_TYPE_STRING, GTK_TYPE_ACTION); + gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (self->store), on_list_sort, NULL, NULL); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->store), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); + + self->action_groups = seahorse_registry_object_instances (NULL, "generator", NULL); + for (l = self->action_groups; l != NULL; l = g_list_next (l)) { + actions = gtk_action_group_list_actions (l->data); + for (k = actions; k != NULL; k = g_list_next (k)) { + action = k->data; + + text = g_strdup_printf (TEMPLATE, gtk_action_get_label (action), + gtk_action_get_tooltip (action)); + + icon = gtk_action_get_gicon (action); + if (icon == NULL) { + icon_name = gtk_action_get_icon_name (action); + if (icon_name) + icon = g_themed_icon_new (icon_name); + gtk_action_get_stock_id (action); + } else { + g_object_ref (icon); + } - gtk_list_store_append (self->pv->store, &iter); - gtk_list_store_set (self->pv->store, &iter, + gtk_list_store_append (self->store, &iter); + gtk_list_store_set (self->store, &iter, COLUMN_TEXT, text, COLUMN_ICON, icon, - COLUMN_ACTION, k->data, - -1); - - g_free (text); - g_free (label); - g_free (icon); - g_free (tooltip); + COLUMN_ACTION, k->data, + -1); + g_clear_object (&icon); } - + g_list_free (actions); } - + + builder = gtk_builder_new (); + path = SEAHORSE_UIDIR "/seahorse-generate-select.xml"; + gtk_builder_add_from_file (builder, path, &error); + if (error != NULL) { + g_warning ("couldn't load ui file: %s", path); + g_clear_error (&error); + g_object_unref (builder); + return; + } + + /* Setup the dialog */ + gtk_window_set_modal (GTK_WINDOW (self), TRUE); + gtk_window_set_default_size (GTK_WINDOW (self), -1, 410); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))), + GTK_WIDGET (gtk_builder_get_object (builder, "generate-select"))); + gtk_dialog_add_buttons (GTK_DIALOG (self), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Continue"), GTK_RESPONSE_OK, + NULL); + /* Hook it into the view */ - self->pv->view = GTK_TREE_VIEW (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "keytype-tree")); - g_return_val_if_fail (self->pv->view, NULL); - + self->view = GTK_TREE_VIEW (gtk_builder_get_object (builder, "keytype-tree")); + + g_object_unref (builder); + pixcell = gtk_cell_renderer_pixbuf_new (); g_object_set (pixcell, "stock-size", GTK_ICON_SIZE_DND, NULL); - gtk_tree_view_insert_column_with_attributes (self->pv->view, -1, "", pixcell, "stock-id", COLUMN_ICON, NULL); - gtk_tree_view_insert_column_with_attributes (self->pv->view, -1, "", gtk_cell_renderer_text_new (), "markup", COLUMN_TEXT, NULL); - gtk_tree_view_set_model (self->pv->view, GTK_TREE_MODEL (self->pv->store)); + gtk_tree_view_insert_column_with_attributes (self->view, -1, "", pixcell, "gicon", COLUMN_ICON, NULL); + gtk_tree_view_insert_column_with_attributes (self->view, -1, "", gtk_cell_renderer_text_new (), "markup", COLUMN_TEXT, NULL); + gtk_tree_view_set_model (self->view, GTK_TREE_MODEL (self->store)); /* Setup selection, select first item */ - selection = gtk_tree_view_get_selection (self->pv->view); + selection = gtk_tree_view_get_selection (self->view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); - - gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->pv->store), &iter); + + gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter); gtk_tree_selection_select_iter (selection, &iter); - g_signal_connect (self->pv->view, "row-activated", G_CALLBACK (on_row_activated), self); - g_object_set (self->pv->view, "height-request", 410, NULL); + g_signal_connect (self->view, "row-activated", G_CALLBACK (on_row_activated), self); + g_object_set (self->view, "height-request", 410, NULL); - self->pv->dialog = GTK_DIALOG (seahorse_widget_get_toplevel (SEAHORSE_WIDGET (self))); - g_signal_connect (self->pv->dialog, "response", G_CALLBACK (on_response), self); - - return G_OBJECT (self); + g_signal_connect (self, "response", G_CALLBACK (on_response), self); } static void seahorse_generate_select_init (SeahorseGenerateSelect *self) { - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_GENERATE_SELECT, SeahorseGenerateSelectPrivate); + } static void @@ -173,12 +264,8 @@ { SeahorseGenerateSelect *self = SEAHORSE_GENERATE_SELECT (obj); - if (self->pv->store != NULL) - g_object_unref (self->pv->store); - self->pv->store = NULL; - - seahorse_object_list_free (self->pv->action_groups); - self->pv->action_groups = NULL; + g_clear_object (&self->store); + g_list_free_full (self->action_groups, g_object_unref); G_OBJECT_CLASS (seahorse_generate_select_parent_class)->finalize (obj); } @@ -187,11 +274,8 @@ seahorse_generate_select_class_init (SeahorseGenerateSelectClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_generate_select_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorseGenerateSelectPrivate)); - gobject_class->constructor = seahorse_generate_select_constructor; + gobject_class->constructed = seahorse_generate_select_constructed; gobject_class->finalize = seahorse_generate_select_finalize; } @@ -203,11 +287,13 @@ void seahorse_generate_select_show (GtkWindow* parent) { - SeahorseGenerateSelect* sel; - + GtkWidget *dialog; + g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent)); - - sel = g_object_ref_sink (g_object_new (SEAHORSE_TYPE_GENERATE_SELECT, "name", "generate-select", NULL)); - if (parent != NULL) - gtk_window_set_transient_for (GTK_WINDOW (sel->pv->dialog), parent); + + dialog = g_object_new (SEAHORSE_TYPE_GENERATE_SELECT, + "transient-for", parent, + NULL); + + gtk_widget_show (dialog); } diff -Nru seahorse-3.2.2/src/seahorse-generate-select.h seahorse-3.6.3/src/seahorse-generate-select.h --- seahorse-3.2.2/src/seahorse-generate-select.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-generate-select.h 2012-08-21 12:23:19.000000000 +0200 @@ -27,29 +27,7 @@ #include "seahorse-widget.h" -#define SEAHORSE_TYPE_GENERATE_SELECT (seahorse_generate_select_get_type ()) -#define SEAHORSE_GENERATE_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_GENERATE_SELECT, SeahorseGenerateSelect)) -#define SEAHORSE_GENERATE_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_GENERATE_SELECT, SeahorseGenerateSelectClass)) -#define SEAHORSE_IS_GENERATE_SELECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_GENERATE_SELECT)) -#define SEAHORSE_IS_GENERATE_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_GENERATE_SELECT)) -#define SEAHORSE_GENERATE_SELECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_GENERATE_SELECT, SeahorseGenerateSelectClass)) - -typedef struct _SeahorseGenerateSelect SeahorseGenerateSelect; -typedef struct _SeahorseGenerateSelectClass SeahorseGenerateSelectClass; -typedef struct _SeahorseGenerateSelectPrivate SeahorseGenerateSelectPrivate; - -struct _SeahorseGenerateSelect { - SeahorseWidget parent_instance; - SeahorseGenerateSelectPrivate *pv; -}; - -struct _SeahorseGenerateSelectClass { - SeahorseWidgetClass parent_class; -}; - -void seahorse_generate_select_show (GtkWindow* parent); -GType seahorse_generate_select_get_type (void); - +void seahorse_generate_select_show (GtkWindow *parent); G_END_DECLS diff -Nru seahorse-3.2.2/src/seahorse-generate-select.xml seahorse-3.6.3/src/seahorse-generate-select.xml --- seahorse-3.2.2/src/seahorse-generate-select.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-generate-select.xml 2012-11-12 08:32:13.000000000 +0100 @@ -1,74 +1,7 @@ - - False - gtk-go-forward - - - True - False - 6 - Create New ... - center - 410 - dialog - - - - True - False - vertical - 2 - - - True - False - end - - - gtk-cancel - True - True - True - False - False - True - - - False - False - 0 - - - - - C_ontinue - True - True - True - True - False - False - continue-image - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - + True False 5 @@ -123,17 +56,4 @@ - - True - True - 1 - - - - - - button1 - button2 - - diff -Nru seahorse-3.2.2/src/seahorse-import-dialog.c seahorse-3.6.3/src/seahorse-import-dialog.c --- seahorse-3.2.2/src/seahorse-import-dialog.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-import-dialog.c 2012-08-21 12:23:19.000000000 +0200 @@ -0,0 +1,191 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-backend.h" +#include "seahorse-place.h" + +#include "seahorse-import-dialog.h" + +#include + +#include + +struct _SeahorseImportDialog { + GtkDialog parent; + GcrViewerWidget *viewer; + GcrImportButton *import; +}; + +struct _SeahorseImportDialogClass { + GtkDialogClass parent_class; +}; + +G_DEFINE_TYPE (SeahorseImportDialog, seahorse_import_dialog, GTK_TYPE_DIALOG); + +static void +on_viewer_renderer_added (GcrViewerWidget *viewer, + GcrRenderer *renderer, + GcrParsed *parsed, + gpointer user_data) +{ + SeahorseImportDialog *self = SEAHORSE_IMPORT_DIALOG (user_data); + gcr_import_button_add_parsed (self->import, parsed); +} + +static void +seahorse_import_dialog_init (SeahorseImportDialog *self) +{ + +} + +static void +on_import_button_importing (GcrImportButton *button, + GcrImporter *importer, + gpointer user_data) +{ + SeahorseImportDialog *self = SEAHORSE_IMPORT_DIALOG (user_data); + gcr_viewer_widget_clear_error (self->viewer); +} + +static void +on_import_button_imported (GcrImportButton *button, + GcrImporter *importer, + GError *error, + gpointer user_data) +{ + SeahorseImportDialog *self = SEAHORSE_IMPORT_DIALOG (user_data); + SeahorsePlace *place; + GList *backends, *l; + gchar *uri; + + if (error == NULL) { + gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK); + g_object_get (importer, "uri", &uri, NULL); + + backends = seahorse_backend_get_registered (); + for (l = backends; l != NULL; l = g_list_next (l)) { + place = seahorse_backend_lookup_place (l->data, uri); + if (place != NULL) + seahorse_place_load_async (place, NULL, NULL, NULL); + } + g_list_free (backends); + g_free (uri); + + } else { + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + gcr_viewer_widget_show_error (self->viewer, _("Import failed"), error); + } +} + +static void +seahorse_import_dialog_constructed (GObject *obj) +{ + SeahorseImportDialog *self = SEAHORSE_IMPORT_DIALOG (obj); + GtkWidget *button; + GtkBox *content; + GtkWidget *frame; + + G_OBJECT_CLASS (seahorse_import_dialog_parent_class)->constructed (obj); + + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + gtk_widget_show (button); + gtk_dialog_add_action_widget (GTK_DIALOG (self), GTK_WIDGET (button), GTK_RESPONSE_CANCEL); + + self->import = gcr_import_button_new (_("Import")); + g_signal_connect_object (self->import, "importing", + G_CALLBACK (on_import_button_importing), + self, 0); + g_signal_connect_object (self->import, "imported", + G_CALLBACK (on_import_button_imported), + self, 0); + gtk_widget_show (GTK_WIDGET (self->import)); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (self))), + GTK_WIDGET (self->import), FALSE, TRUE, 0); + + content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))); + + frame = gtk_frame_new (_("Data to be imported:")); + gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), TRUE); + gtk_box_pack_start (content, frame, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (frame), 6); + gtk_widget_show (frame); + + self->viewer = gcr_viewer_widget_new (); + g_signal_connect_object (self->viewer, "added", + G_CALLBACK (on_viewer_renderer_added), + self, 0); + gtk_widget_show (GTK_WIDGET (self->viewer)); + + gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (self->viewer)); +} + +static void +seahorse_import_dialog_class_init (SeahorseImportDialogClass *klass) +{ + GObjectClass *gobject_class= G_OBJECT_CLASS (klass); + + gobject_class->constructed = seahorse_import_dialog_constructed; + + g_type_class_add_private (klass, sizeof (SeahorseImportDialog)); +} + +GtkDialog * +seahorse_import_dialog_new (GtkWindow *parent) +{ + g_return_val_if_fail (GTK_WINDOW (parent), NULL); + + return g_object_new (SEAHORSE_TYPE_IMPORT_DIALOG, + "transient-for", parent, + NULL); +} + +void +seahorse_import_dialog_add_uris (SeahorseImportDialog *self, + const gchar **uris) +{ + GFile *file; + guint i; + + g_return_if_fail (SEAHORSE_IS_IMPORT_DIALOG (self)); + g_return_if_fail (uris != NULL); + + for (i = 0; uris[i] != NULL; i++) { + file = g_file_new_for_uri (uris[i]); + gcr_viewer_widget_load_file (self->viewer, file); + g_object_unref (file); + } +} + +void +seahorse_import_dialog_add_text (SeahorseImportDialog *self, + const gchar *display_name, + const gchar *text) +{ + g_return_if_fail (SEAHORSE_IS_IMPORT_DIALOG (self)); + g_return_if_fail (text != NULL); + gcr_viewer_widget_load_data (self->viewer, display_name, + (const guchar *)text, + strlen (text)); +} diff -Nru seahorse-3.2.2/src/seahorse-import-dialog.h seahorse-3.6.3/src/seahorse-import-dialog.h --- seahorse-3.2.2/src/seahorse-import-dialog.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-import-dialog.h 2012-08-21 12:23:19.000000000 +0200 @@ -0,0 +1,52 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_IMPORT_DIALOG_H__ +#define __SEAHORSE_IMPORT_DIALOG_H__ + +#include + +#include + +#define SEAHORSE_TYPE_IMPORT_DIALOG (seahorse_import_dialog_get_type ()) +#define SEAHORSE_IMPORT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_IMPORT_DIALOG, SeahorseImportDialog)) +#define SEAHORSE_IMPORT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_IMPORT_DIALOG, SeahorseImportDialogClass)) +#define SEAHORSE_IS_IMPORT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_IMPORT_DIALOG)) +#define SEAHORSE_IS_IMPORT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_IMPORT_DIALOG)) +#define SEAHORSE_IMPORT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_IMPORT_DIALOG_KEY, SeahorseImportDialogClass)) + +typedef struct _SeahorseImportDialog SeahorseImportDialog; +typedef struct _SeahorseImportDialogClass SeahorseImportDialogClass; + +GType seahorse_import_dialog_get_type (void); + +GtkDialog * seahorse_import_dialog_new (GtkWindow *parent); + +void seahorse_import_dialog_add_uris (SeahorseImportDialog *self, + const gchar **uris); + +void seahorse_import_dialog_add_text (SeahorseImportDialog *self, + const gchar *display_name, + const gchar *text); + +#endif /* __SEAHORSE_IMPORT_DIALOG_H__ */ diff -Nru seahorse-3.2.2/src/seahorse-key-manager.c seahorse-3.6.3/src/seahorse-key-manager.c --- seahorse-3.2.2/src/seahorse-key-manager.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-key-manager.c 2012-08-21 12:23:19.000000000 +0200 @@ -23,19 +23,25 @@ #include "config.h" #include "seahorse-generate-select.h" +#include "seahorse-import-dialog.h" #include "seahorse-key-manager.h" #include "seahorse-key-manager-store.h" #include "seahorse-preferences.h" -#include "seahorse-windows.h" -#include "seahorse-keyserver-results.h" +#include "seahorse-sidebar.h" +#include "seahorse-collection.h" +#include "seahorse-registry.h" #include "seahorse-progress.h" #include "seahorse-util.h" -#include "gkr/seahorse-gkr.h" - #include +enum { + SHOW_ANY, + SHOW_PERSONAL, + SHOW_TRUSTED, +}; + void on_keymanager_row_activated (GtkTreeView* view, GtkTreePath* path, GtkTreeViewColumn* column, @@ -54,27 +60,20 @@ void on_keymanager_import_button (GtkButton* button, SeahorseKeyManager* self); -enum { - PROP_0, - PROP_SELECTED -}; -typedef struct _TabInfo { - guint id; - gint page; - GtkTreeView* view; - SeahorseSet* objects; - GtkWidget* widget; - SeahorseKeyManagerStore* store; -} TabInfo; - struct _SeahorseKeyManagerPrivate { - GtkNotebook* notebook; GtkActionGroup* view_actions; + GtkRadioAction *show_action; GtkEntry* filter_entry; - GQuark track_selected_id; - guint track_selected_tab; - TabInfo* tabs; + SeahorsePredicate pred; + SeahorseSidebar *sidebar; + + GtkTreeView* view; + GcrCollection *collection; /* owned by the sidebar */ + SeahorseKeyManagerStore* store; + GSettings *settings; + gint sidebar_width; + guint sidebar_width_sig; }; enum { @@ -82,181 +81,16 @@ TARGETS_URIS }; -enum { - TAB_PUBLIC = 0, - TAB_PRIVATE, - TAB_PASSWORD, - TAB_NUM_TABS -} SeahorseKeyManagerTabs; - -static SeahorseObjectPredicate pred_public = { - 0, - 0, - 0, - SEAHORSE_LOCATION_LOCAL, - SEAHORSE_USAGE_PUBLIC_KEY, - 0, - 0, - NULL -}; - -static SeahorseObjectPredicate pred_private = { - 0, - 0, - 0, - SEAHORSE_LOCATION_LOCAL, - SEAHORSE_USAGE_PRIVATE_KEY, - 0, - 0, - NULL -}; - -static SeahorseObjectPredicate pred_password = { - 0, - 0, /* Tag filled in later */ - 0, - SEAHORSE_LOCATION_LOCAL, - 0, - 0, - 0, - NULL -}; - -G_DEFINE_TYPE (SeahorseKeyManager, seahorse_key_manager, SEAHORSE_TYPE_VIEWER); +G_DEFINE_TYPE (SeahorseKeyManager, seahorse_key_manager, SEAHORSE_TYPE_CATALOG); /* ----------------------------------------------------------------------------- * INTERNAL */ -static TabInfo* -get_tab_for_object (SeahorseKeyManager* self, SeahorseObject* obj) -{ - gint i; - - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), NULL); - g_return_val_if_fail (SEAHORSE_IS_OBJECT (obj), NULL); - - for (i = 0; i < TAB_NUM_TABS; ++i) { - TabInfo* tab = &self->pv->tabs[i]; - if (seahorse_set_has_object (tab->objects, obj)) - return tab; - } - - return NULL; -} - -static TabInfo* -get_tab_info (SeahorseKeyManager* self, gint page) -{ - gint i; - - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), NULL); - - if (page < 0) - page = gtk_notebook_get_current_page (self->pv->notebook); - if (page < 0) - return NULL; - - for (i = 0; i < TAB_NUM_TABS; ++i) - { - TabInfo* tab = &self->pv->tabs[i]; - if (tab->page == page) - return tab; - } - - return NULL; -} - -static GtkTreeView* -get_current_view (SeahorseKeyManager* self) -{ - TabInfo* tab; - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), NULL); - tab = get_tab_info (self, -1); - if (tab == NULL) - return NULL; - return tab->view; -} - -static guint -get_tab_id (SeahorseKeyManager* self, TabInfo* tab) -{ - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), 0U); - if (tab == NULL) - return 0; - return tab->id; -} - -static void -set_tab_current (SeahorseKeyManager* self, TabInfo* tab) -{ - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - gtk_notebook_set_current_page (self->pv->notebook, tab->page); - g_signal_emit_by_name (G_OBJECT (SEAHORSE_VIEW (self)), "selection-changed"); -} - static gboolean -fire_selection_changed (SeahorseKeyManager* self) +fire_selection_changed (gpointer user_data) { - gboolean selected; - gint rows; - GtkTreeView* view; - gboolean dotracking; - guint tabid; - GQuark keyid; - GList* objects; - - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), FALSE); - - selected = FALSE; - rows = 0; - - view = get_current_view (self); - - if (view != NULL) { - GtkTreeSelection* selection = gtk_tree_view_get_selection (view); - rows = gtk_tree_selection_count_selected_rows (selection); - selected = rows > 0; - } - - dotracking = TRUE; - - /* See which tab we're on, if different from previous, no tracking */ - tabid = get_tab_id (self, get_tab_info (self, -1)); - if (tabid != self->pv->track_selected_tab) { - dotracking = FALSE; - self->pv->track_selected_tab = tabid; - } - - /* Retrieve currently tracked, and reset tracking */ - keyid = self->pv->track_selected_id; - self->pv->track_selected_id = 0; - - /* no selection, see if selected key moved to another tab */ - if (dotracking && rows == 0 && keyid != 0) { - /* Find it */ - SeahorseObject* obj = seahorse_context_find_object (NULL, keyid, SEAHORSE_LOCATION_LOCAL); - if (obj != NULL) { - /* If it's still around, then select it */ - TabInfo* tab = get_tab_for_object (self, obj); - if (tab != NULL && tab != get_tab_info (self, -1)) { - /* Make sure we don't end up in a loop */ - g_assert (self->pv->track_selected_id == 0); - seahorse_viewer_set_selected (SEAHORSE_VIEWER (self), obj); - } - } - } - - if (selected) { - seahorse_viewer_set_numbered_status (SEAHORSE_VIEWER (self), ngettext ("Selected %d key", "Selected %d keys", rows), rows); - objects = seahorse_viewer_get_selected_objects (SEAHORSE_VIEWER (self)); - - /* If one key is selected then mark it down for following across tabs */ - if (objects->data) - self->pv->track_selected_id = seahorse_object_get_id (objects->data); - - g_list_free (objects); - } + SeahorseKeyManager* self = SEAHORSE_KEY_MANAGER (user_data); /* Fire the signal */ g_signal_emit_by_name (self, "selection-changed"); @@ -266,19 +100,6 @@ } static void -on_tab_changed (GtkNotebook* notebook, void* unused, guint page_num, SeahorseKeyManager* self) -{ - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (GTK_IS_NOTEBOOK (notebook)); - gtk_entry_set_text (self->pv->filter_entry, ""); - - /* Don't track the selected key when tab is changed on purpose */ - self->pv->track_selected_id = 0; - - fire_selection_changed (self); -} - -static void on_view_selection_changed (GtkTreeSelection* selection, SeahorseKeyManager* self) { g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); @@ -290,7 +111,7 @@ on_keymanager_row_activated (GtkTreeView* view, GtkTreePath* path, GtkTreeViewColumn* column, SeahorseKeyManager* self) { - SeahorseObject* obj; + GObject* obj; g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); g_return_if_fail (GTK_IS_TREE_VIEW (view)); @@ -299,7 +120,7 @@ obj = seahorse_key_manager_store_get_object_from_path (view, path); if (obj != NULL) - seahorse_viewer_show_properties (SEAHORSE_VIEWER (self), obj); + seahorse_catalog_show_properties (SEAHORSE_CATALOG (self), obj); } G_MODULE_EXPORT gboolean @@ -309,7 +130,9 @@ g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE); if (event->button == 3) - seahorse_viewer_show_context_menu (SEAHORSE_VIEWER (self), event->button, event->time); + seahorse_catalog_show_context_menu (SEAHORSE_CATALOG (self), + SEAHORSE_CATALOG_MENU_OBJECT, + event->button, event->time); return FALSE; } @@ -317,14 +140,14 @@ G_MODULE_EXPORT gboolean on_keymanager_key_list_popup_menu (GtkTreeView* view, SeahorseKeyManager* self) { - SeahorseObject* obj; + GList *objects; - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), FALSE); - g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE); - - obj = seahorse_viewer_get_selected (SEAHORSE_VIEWER (self)); - if (obj != NULL) - seahorse_viewer_show_context_menu (SEAHORSE_VIEWER (self), 0, gtk_get_current_event_time ()); + objects = seahorse_catalog_get_selected_objects (SEAHORSE_CATALOG (self)); + if (objects != NULL) + seahorse_catalog_show_context_menu (SEAHORSE_CATALOG (self), + SEAHORSE_CATALOG_MENU_OBJECT, + 0, gtk_get_current_event_time ()); + g_list_free (objects); return FALSE; } @@ -333,7 +156,7 @@ { g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); g_return_if_fail (GTK_IS_ACTION (action)); - seahorse_generate_select_show (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))); + seahorse_generate_select_show (seahorse_catalog_get_window (SEAHORSE_CATALOG (self))); } G_MODULE_EXPORT void @@ -341,43 +164,10 @@ { g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); g_return_if_fail (GTK_IS_BUTTON (button)); - seahorse_generate_select_show (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))); -} - -static void -initialize_tab (SeahorseKeyManager* self, const char* tabwidget, guint tabid, const char* viewwidget, - const SeahorseObjectPredicate* pred) -{ - SeahorseSet *objects; - GtkTreeSelection *selection; - GtkTreeView *view; - - g_assert (tabid < (int)TAB_NUM_TABS); - - self->pv->tabs[tabid].id = tabid; - self->pv->tabs[tabid].widget = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), tabwidget); - g_return_if_fail (self->pv->tabs[tabid].widget != NULL); - - self->pv->tabs[tabid].page = gtk_notebook_page_num (self->pv->notebook, self->pv->tabs[tabid].widget); - g_return_if_fail (self->pv->tabs[tabid].page >= 0); - - objects = seahorse_set_new_full ((SeahorseObjectPredicate*)pred); - self->pv->tabs[tabid].objects = objects; - - /* Init key list & selection settings */ - view = GTK_TREE_VIEW (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), viewwidget)); - self->pv->tabs[tabid].view = view; - g_return_if_fail (view != NULL); - - selection = gtk_tree_view_get_selection (view); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); - g_signal_connect (selection, "changed", G_CALLBACK (on_view_selection_changed), self); - gtk_widget_realize (GTK_WIDGET (view)); - - /* Add new key store and associate it */ - self->pv->tabs[tabid].store = seahorse_key_manager_store_new (objects, view, self->pv->settings); + seahorse_generate_select_show (seahorse_catalog_get_window (SEAHORSE_CATALOG (self))); } +#if REFACTOR_FIRST static gboolean on_first_timer (SeahorseKeyManager* self) { @@ -389,129 +179,147 @@ * Although not all the keys have completed we'll know whether we have * any or not at this point */ - - if (seahorse_context_get_count (NULL) == 0) { + + if (gcr_collection_get_length (GCR_COLLECTION (self->pv->collection)) == 0) { widget = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "first-time-box"); gtk_widget_show (widget); } return FALSE; } +#endif static void -on_clear_clicked (GtkEntry* entry, GtkEntryIconPosition icon_pos, GdkEvent* event, gpointer user_data) +on_clear_clicked (GtkEntry* entry, + GtkEntryIconPosition icon_pos, + GdkEvent* event, + gpointer user_data) { gtk_entry_set_text (entry, ""); } static void -on_filter_changed (GtkEntry* entry, SeahorseKeyManager* self) +on_filter_changed (GtkEntry* entry, + SeahorseKeyManager* self) { const gchar *text; - gint i; g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); g_return_if_fail (GTK_IS_ENTRY (entry)); text = gtk_entry_get_text (entry); - for (i = 0; i < TAB_NUM_TABS; ++i) - g_object_set (self->pv->tabs[i].store, "filter", text, NULL); -} + g_object_set (self->pv->store, "filter", text, NULL); -static void -on_import_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseKeyManager* self = SEAHORSE_KEY_MANAGER (user_data); - GError *error = NULL; - - if (!seahorse_source_import_finish (SEAHORSE_SOURCE (source), result, &error)) { - seahorse_util_handle_error (&error, seahorse_viewer_get_window (SEAHORSE_VIEWER (self)), - "%s", _("Couldn't import keys")); + if (text == NULL || g_str_equal (text, "")) { + g_object_set (G_OBJECT (entry), + "secondary-icon-name", "edit-find-symbolic", + "secondary-icon-activatable", FALSE, + "secondary-icon-sensitive", FALSE, + NULL); } else { - seahorse_viewer_set_status (SEAHORSE_VIEWER (self), _("Imported keys")); + g_object_set (G_OBJECT (entry), + "secondary-icon-name", "edit-clear-symbolic", + "secondary-icon-activatable", TRUE, + "secondary-icon-sensitive", TRUE, + NULL); } +} - g_object_unref (self); +static gboolean +on_start_interactive_search (GtkTreeView *treeview, + gpointer user_data) +{ + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (user_data); + gtk_widget_grab_focus (GTK_WIDGET (self->pv->filter_entry)); + return FALSE; } static void -import_files (SeahorseKeyManager* self, const gchar** uris) +import_files (SeahorseKeyManager* self, + const gchar** uris) { - GError *error = NULL; - GFileInputStream* input; - GCancellable *cancellable; - const gchar *uri; - GString *errmsg; - GFile* file; - - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - errmsg = g_string_new (""); - cancellable = g_cancellable_new (); + GtkDialog *dialog; + GtkWindow *parent; - for (uri = *uris; uri; uris++, uri = *uris) { - GQuark ktype; - SeahorseSource* sksrc; - - if(!uri[0]) - continue; - - /* Figure out where to import to */ - ktype = seahorse_util_detect_file_type (uri); - if (ktype == 0) { - g_string_append_printf (errmsg, "%s: Invalid file format\n", uri); - continue; - } - - /* All our supported key types have a local source */ - sksrc = seahorse_context_find_source (NULL, ktype, SEAHORSE_LOCATION_LOCAL); - g_return_if_fail (sksrc != NULL); - - file = g_file_new_for_uri (uri); - input = g_file_read (file, NULL, &error); - if (error) { - g_string_append_printf (errmsg, "%s: %s\n", uri, error->message); - g_clear_error (&error); - continue; - } - - seahorse_source_import_async (sksrc, G_INPUT_STREAM (input), - cancellable, on_import_complete, - g_object_ref (self)); - } - - seahorse_progress_show (cancellable, _("Importing keys"), TRUE); - g_object_unref (cancellable); + parent = seahorse_catalog_get_window (SEAHORSE_CATALOG (self)); + dialog = seahorse_import_dialog_new (parent); + seahorse_import_dialog_add_uris (SEAHORSE_IMPORT_DIALOG (dialog), uris); - if (errmsg->len > 0) - seahorse_util_show_error (GTK_WIDGET (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))), - _("Couldn't import keys"), errmsg->str); - - g_string_free (errmsg, TRUE); + gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); } - static void import_prompt (SeahorseKeyManager* self) { - GtkDialog* dialog; + GtkFileFilter *filter; + GtkWidget *dialog; gchar *uris[2]; - gchar* uri; + gchar *uri = NULL; g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - dialog = seahorse_util_chooser_open_new (_("Import Key"), - seahorse_viewer_get_window (SEAHORSE_VIEWER (self))); - seahorse_util_chooser_show_key_files (dialog); - - uri = seahorse_util_chooser_open_prompt (dialog); + dialog = gtk_file_chooser_dialog_new (_("Import Key"), + seahorse_catalog_get_window (SEAHORSE_CATALOG (self)), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); + + /* TODO: This should come from libgcr somehow */ + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("All key files")); + gtk_file_filter_add_mime_type (filter, "application/pgp-keys"); + gtk_file_filter_add_mime_type (filter, "application/x-ssh-key"); + gtk_file_filter_add_mime_type (filter, "application/pkcs12"); + gtk_file_filter_add_mime_type (filter, "application/pkcs12+pem"); + gtk_file_filter_add_mime_type (filter, "application/pkcs7-mime"); + gtk_file_filter_add_mime_type (filter, "application/pkcs7-mime+pem"); + gtk_file_filter_add_mime_type (filter, "application/pkcs8"); + gtk_file_filter_add_mime_type (filter, "application/pkcs8+pem"); + gtk_file_filter_add_mime_type (filter, "application/pkix-cert"); + gtk_file_filter_add_mime_type (filter, "application/pkix-cert+pem"); + gtk_file_filter_add_mime_type (filter, "application/pkix-crl"); + gtk_file_filter_add_mime_type (filter, "application/pkix-crl+pem"); + gtk_file_filter_add_mime_type (filter, "application/x-pem-file"); + gtk_file_filter_add_mime_type (filter, "application/x-pem-key"); + gtk_file_filter_add_mime_type (filter, "application/x-pkcs12"); + gtk_file_filter_add_mime_type (filter, "application/x-pkcs7-certificates"); + gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert"); + gtk_file_filter_add_mime_type (filter, "application/x-x509-user-cert"); + gtk_file_filter_add_mime_type (filter, "application/pkcs10"); + gtk_file_filter_add_mime_type (filter, "application/pkcs10+pem"); + gtk_file_filter_add_mime_type (filter, "application/x-spkac"); + gtk_file_filter_add_mime_type (filter, "application/x-spkac+base64"); + gtk_file_filter_add_pattern (filter, "*.asc"); + gtk_file_filter_add_pattern (filter, "*.gpg"); + gtk_file_filter_add_pattern (filter, "*.pub"); + gtk_file_filter_add_pattern (filter, "*.pfx"); + gtk_file_filter_add_pattern (filter, "*.cer"); + gtk_file_filter_add_pattern (filter, "*.crt"); + gtk_file_filter_add_pattern (filter, "*.pem"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter); + + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("All files")); + gtk_file_filter_add_pattern (filter, "*"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + + gtk_widget_destroy (dialog); + if (uri != NULL) { uris[0] = uri; uris[1] = NULL; import_files (self, (const gchar**)uris); } - + g_free (uri); } @@ -532,40 +340,20 @@ } static void -import_text (SeahorseKeyManager* self, const char* text) -{ - glong len; - GQuark ktype; - SeahorseSource* sksrc; - GMemoryInputStream* input; - GCancellable *cancellable; +import_text (SeahorseKeyManager* self, + const gchar *display_name, + const char* text) +{ + GtkDialog *dialog; + GtkWindow *parent; + + parent = seahorse_catalog_get_window (SEAHORSE_CATALOG (self)); + dialog = seahorse_import_dialog_new (parent); + seahorse_import_dialog_add_text (SEAHORSE_IMPORT_DIALOG (dialog), + display_name, text); - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (text != NULL); - - len = g_utf8_strlen (text, -1); - ktype = seahorse_util_detect_data_type (text, len); - if (ktype == 0) { - seahorse_util_show_error (GTK_WIDGET (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))), - _("Couldn't import keys"), _("Unrecognized key type, or invalid data format")); - return; - } - - /* All our supported key types have a local key source */ - sksrc = seahorse_context_find_source (seahorse_context_instance (), ktype, SEAHORSE_LOCATION_LOCAL); - g_return_if_fail (sksrc != NULL); - - input = G_MEMORY_INPUT_STREAM (g_memory_input_stream_new_from_data (g_strndup (text, len), - len, g_free)); - - cancellable = g_cancellable_new (); - seahorse_source_import_async (sksrc, G_INPUT_STREAM (input), cancellable, - on_import_complete, g_object_ref (self)); - - seahorse_progress_show (cancellable, _("Importing Keys"), TRUE); - g_object_unref (cancellable); - - g_object_unref (input); + gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void @@ -584,7 +372,7 @@ if (info == TARGETS_PLAIN) { text = gtk_selection_data_get_text (selection_data); - import_text (self, (gchar*)text); + import_text (self, _("Dropped text"), (gchar*)text); g_free (text); } else if (info == TARGETS_URIS) { uris = gtk_selection_data_get_uris (selection_data); @@ -602,12 +390,12 @@ g_return_if_fail (GTK_IS_CLIPBOARD (board)); g_return_if_fail (text != NULL); - g_assert(self->pv->filter_entry); - if (gtk_widget_is_focus (GTK_WIDGET (self->pv->filter_entry)) == TRUE) - gtk_editable_paste_clipboard (GTK_EDITABLE (self->pv->filter_entry)); - else - if (text != NULL && g_utf8_strlen (text, -1) > 0) - import_text (self, text); + g_assert(self->pv->filter_entry); + if (gtk_widget_is_focus (GTK_WIDGET (self->pv->filter_entry)) == TRUE) + gtk_editable_paste_clipboard (GTK_EDITABLE (self->pv->filter_entry)); + else + if (text != NULL && g_utf8_strlen (text, -1) > 0) + import_text (self, _("Clipboard text"), text); } static void @@ -615,240 +403,245 @@ { GdkAtom atom; GtkClipboard* board; - + g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); g_return_if_fail (GTK_IS_ACTION (action)); - + atom = gdk_atom_intern ("CLIPBOARD", FALSE); board = gtk_clipboard_get (atom); gtk_clipboard_request_text (board, (GtkClipboardTextReceivedFunc)on_clipboard_received, self); } -#ifdef WITH_KEYSERVER static void -on_remote_find (GtkAction* action, SeahorseKeyManager* self) +on_app_quit (GtkAction* action, + SeahorseKeyManager* self) { g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); g_return_if_fail (GTK_IS_ACTION (action)); - seahorse_keyserver_search_show (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))); + g_application_quit (G_APPLICATION (seahorse_application_get ())); } -static void -on_remote_sync (GtkAction* action, SeahorseKeyManager* self) +static const gchar * +update_view_filter (SeahorseKeyManager *self) { - GList* objects; + const gchar *value = ""; + gint radio; - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - objects = seahorse_viewer_get_selected_objects (SEAHORSE_VIEWER (self)); - if (objects == NULL) - objects = seahorse_context_find_objects (NULL, 0, 0, SEAHORSE_LOCATION_LOCAL); - seahorse_keyserver_sync_show (objects, seahorse_viewer_get_window (SEAHORSE_VIEWER (self))); - g_list_free (objects); -} -#endif + radio = gtk_radio_action_get_current_value (self->pv->show_action); + switch (radio) { + case SHOW_PERSONAL: + self->pv->pred.flags = SEAHORSE_FLAG_PERSONAL; + value = "personal"; + break; + case SHOW_TRUSTED: + self->pv->pred.flags = SEAHORSE_FLAG_TRUSTED; + value = "trusted"; + break; + case SHOW_ANY: + self->pv->pred.flags = 0; + value = ""; + break; + } -static gboolean -quit_app_later (gpointer unused) -{ - seahorse_context_destroy (seahorse_context_instance ()); - return FALSE; + seahorse_key_manager_store_refilter (self->pv->store); + return value; } -static void -on_app_quit (GtkAction* action, SeahorseKeyManager* self) +static void +on_view_show_changed (GtkRadioAction *action, + GtkRadioAction *current, + gpointer user_data) { - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - g_idle_add (quit_app_later, NULL); + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (user_data); + const gchar *value = update_view_filter (self); + g_settings_set_string (self->pv->settings, "item-filter", value); } -/* When this window closes we quit seahorse */ -static gboolean -on_delete_event (GtkWidget* widget, GdkEvent* event, SeahorseKeyManager* self) +static void +on_item_filter_changed (GSettings *settings, + const gchar *key, + gpointer user_data) { - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), FALSE); - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - g_idle_add (quit_app_later, NULL); - return TRUE; -} + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (user_data); + gchar *value; + gint radio; -static void -on_view_type_activate (GtkToggleAction* action, SeahorseKeyManager* self) -{ - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (GTK_IS_TOGGLE_ACTION (action)); - g_settings_set_boolean (self->pv->settings, "show-type", gtk_toggle_action_get_active (action)); + value = g_settings_get_string (settings, key); + if (value == NULL || g_str_equal (value, "")) + radio = SHOW_ANY; + else if (g_str_equal (value, "personal")) + radio = SHOW_PERSONAL; + else if (g_str_equal (value, "trusted")) + radio = SHOW_TRUSTED; + else + radio = -1; + gtk_radio_action_set_current_value (self->pv->show_action, radio); + update_view_filter (self); + g_free (value); } +#define SEAHORSE_TYPE_MENU_ACTION (seahorse_menu_action_get_type ()) -static void -on_view_expires_activate (GtkToggleAction* action, SeahorseKeyManager* self) -{ - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (GTK_IS_TOGGLE_ACTION (action)); - g_settings_set_boolean (self->pv->settings, "show-expiry", gtk_toggle_action_get_active (action)); -} +GType seahorse_menu_action_get_type (void) G_GNUC_CONST; +typedef GtkAction SeahorseMenuAction; -static void -on_view_validity_activate (GtkToggleAction* action, SeahorseKeyManager* self) -{ - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (GTK_IS_TOGGLE_ACTION (action)); - g_settings_set_boolean (self->pv->settings, "show-validity", gtk_toggle_action_get_active (action)); -} +typedef GtkActionClass SeahorseMenuActionClass; -static void -on_view_trust_activate (GtkToggleAction* action, SeahorseKeyManager* self) -{ - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self)); - g_return_if_fail (GTK_IS_TOGGLE_ACTION (action)); - g_settings_set_boolean (self->pv->settings, "show-trust", gtk_toggle_action_get_active (action)); -} +G_DEFINE_TYPE (SeahorseMenuAction, seahorse_menu_action, GTK_TYPE_ACTION); static void -on_manager_settings_changed (GSettings *settings, const gchar *key, gpointer user_data) +seahorse_menu_action_init (SeahorseMenuAction *self) { - SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (user_data); - GtkToggleAction* action; - const gchar* name; - - if (g_str_equal (key, "show-trust")) - name = "view-trust"; - else if (g_str_equal (key, "show-type")) - name = "view-type"; - else if (g_str_equal (key, "show-expiry")) - name = "view-expires"; - else if (g_str_equal (key, "show-validity")) - name = "view-validity"; - else - return; - action = GTK_TOGGLE_ACTION (gtk_action_group_get_action (self->pv->view_actions, name)); - g_return_if_fail (action != NULL); +} - gtk_toggle_action_set_active (action, g_settings_get_boolean (settings, key)); +static void +seahorse_menu_action_class_init (SeahorseMenuActionClass *klass) +{ + GTK_ACTION_CLASS (klass)->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON; } -static const GtkActionEntry GENERAL_ENTRIES[] = { +static const GtkActionEntry GENERAL_ACTIONS[] = { + /* TRANSLATORS: The "Remote" menu contains key operations on remote systems. */ { "remote-menu", NULL, N_("_Remote") }, + { "new-menu", NULL, N_("_New") }, { "app-quit", GTK_STOCK_QUIT, NULL, "Q", N_("Close this program"), G_CALLBACK (on_app_quit) }, { "file-new", GTK_STOCK_NEW, N_("_New..."), "N", - N_("Create a new key or item"), G_CALLBACK (on_file_new) }, + N_("Create a new key or item"), G_CALLBACK (on_file_new) }, + { "new-object", GTK_STOCK_ADD, N_("_New..."), NULL, + N_("Add a new key or item"), G_CALLBACK (on_file_new) }, { "file-import", GTK_STOCK_OPEN, N_("_Import..."), "I", N_("Import from a file"), G_CALLBACK (on_key_import_file) }, { "edit-import-clipboard", GTK_STOCK_PASTE, NULL, "V", N_("Import from the clipboard"), G_CALLBACK (on_key_import_clipboard) } }; -#ifdef WITH_KEYSERVER -static const GtkActionEntry SERVER_ENTRIES[] = { - { "remote-find", GTK_STOCK_FIND, N_("_Find Remote Keys..."), "", - N_("Search for keys on a key server"), G_CALLBACK (on_remote_find) }, - { "remote-sync", GTK_STOCK_REFRESH, N_("_Sync and Publish Keys..."), "", - N_("Publish and/or synchronize your keys with those online."), G_CALLBACK (on_remote_sync) } +static const GtkToggleActionEntry SIDEBAR_ACTIONS[] = { + { "view-sidebar", NULL, N_("By _keyring"), NULL, + N_("Show sidebar listing keyrings"), NULL, FALSE }, }; -#endif -static const GtkToggleActionEntry VIEW_ENTRIES[] = { - { "view-type", NULL, N_("T_ypes"), NULL, N_("Show type column"), - G_CALLBACK (on_view_type_activate), FALSE }, - { "view-expires", NULL, N_("_Expiry"), NULL, N_("Show expiry column"), - G_CALLBACK (on_view_expires_activate), FALSE }, - { "view-trust", NULL, N_("_Trust"), NULL, N_("Show owner trust column"), - G_CALLBACK (on_view_trust_activate), FALSE}, - { "view-validity", NULL, N_("_Validity"), NULL, N_("Show validity column"), - G_CALLBACK (on_view_validity_activate), FALSE } +static const GtkRadioActionEntry VIEW_RADIO_ACTIONS[] = { + { "view-personal", NULL, N_("Show _personal"), NULL, + N_("Only show personal keys, certificates and passwords"), SHOW_PERSONAL }, + { "view-trusted", NULL, N_("Show _trusted"), NULL, + N_("Only show trusted keys, certificates and passwords"), SHOW_TRUSTED }, + { "view-any", NULL, N_("Show _any"), NULL, + N_("Show all keys, certificates and passwords"), SHOW_ANY }, }; -/* ----------------------------------------------------------------------------- - * OBJECT - */ +static GList * +seahorse_key_manager_get_selected_objects (SeahorseCatalog *catalog) +{ + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (catalog); + return seahorse_key_manager_store_get_selected_objects (self->pv->view); +} -static GList* -seahorse_key_manager_get_selected_objects (SeahorseViewer* base) +static SeahorsePlace * +seahorse_key_manager_get_focused_place (SeahorseCatalog *catalog) { - SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (base); - TabInfo* tab = get_tab_info (self, -1); - if (tab == NULL) - return NULL; - return seahorse_key_manager_store_get_selected_objects (tab->view); + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (catalog); + return seahorse_sidebar_get_focused_place (self->pv->sidebar); } -static void -seahorse_key_manager_set_selected_objects (SeahorseViewer* base, GList* objects) +static gboolean +on_panes_realize (GtkWidget *widget, + gpointer user_data) { - SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (base); - GList** tab_lists; - GList *l; - gint i; - guint highest_matched; - TabInfo* highest_tab; + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (user_data); + gint width; - tab_lists = g_new0 (GList*, TAB_NUM_TABS + 1); - - /* Break objects into what's on each tab */ - for (l = objects; l; l = g_list_next (l)) { - SeahorseObject* obj = SEAHORSE_OBJECT (l->data); - TabInfo* tab = get_tab_for_object (self, obj); - if (tab == NULL) - continue; + width = g_settings_get_int (self->pv->settings, "sidebar-width"); + gtk_paned_set_position (GTK_PANED (widget), width); - g_assert (tab->id < TAB_NUM_TABS); - tab_lists[tab->id] = g_list_prepend (tab_lists[tab->id], obj); - } - - highest_matched = 0; - highest_tab = NULL; - - for (i = 0; i < TAB_NUM_TABS; ++i) { - GList* list = tab_lists[i]; - TabInfo* tab = &self->pv->tabs[i]; - - /* Save away the tab that had the most objects */ - guint num = g_list_length (list); - if (num > highest_matched) { - highest_matched = num; - highest_tab = tab; - } - - /* Select the objects on that tab */ - seahorse_key_manager_store_set_selected_objects (tab->view, list); - - /* Free the broken down list */ - g_list_free (list); - } - - g_free (tab_lists); - - /* Change to the tab with the most objects */ - if (highest_tab != NULL) - set_tab_current (self, highest_tab); + return FALSE; } -static SeahorseObject* -seahorse_key_manager_get_selected (SeahorseViewer* base) -{ - SeahorseKeyManager* self = SEAHORSE_KEY_MANAGER (base); - TabInfo* tab = get_tab_info (self, -1); - if (tab == NULL) - return NULL; - return seahorse_key_manager_store_get_selected_object (tab->view); +static gboolean +on_panes_unrealize (GtkWidget *widget, + gpointer user_data) +{ + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (user_data); + gint width; + + width = gtk_paned_get_position (GTK_PANED (widget)); + g_settings_set_int (self->pv->settings, "sidebar-width", width); + + return FALSE; } -static void -seahorse_key_manager_set_selected (SeahorseViewer* base, SeahorseObject* value) +static void +on_sidebar_popup_menu (SeahorseSidebar *sidebar, + GcrCollection *collection, + gpointer user_data) { - SeahorseKeyManager* self = SEAHORSE_KEY_MANAGER (base); - GList* objects = NULL; - objects = g_list_prepend (objects, value); - seahorse_viewer_set_selected_objects (SEAHORSE_VIEWER (self), objects); - g_list_free (objects); - g_object_notify (G_OBJECT (self), "selected"); + SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (user_data); + const gchar *name; + + name = G_OBJECT_TYPE_NAME (collection); + seahorse_catalog_show_context_menu (SEAHORSE_CATALOG (self), name, + 0, gtk_get_current_event_time ()); +} + +static GcrCollection * +setup_sidebar (SeahorseKeyManager *self) +{ + GtkWidget *area, *panes; + GtkActionGroup *actions; + GtkAction *action; + GList *backends, *l; + + self->pv->sidebar = seahorse_sidebar_new (); + + self->pv->sidebar_width = g_settings_get_int (self->pv->settings, "sidebar-width"); + panes = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "sidebar-panes"); + gtk_paned_set_position (GTK_PANED (panes), self->pv->sidebar_width); + g_signal_connect (panes, "realize", G_CALLBACK (on_panes_realize), self); + g_signal_connect (panes, "unrealize", G_CALLBACK (on_panes_unrealize), self); + g_signal_connect (self->pv->sidebar, "context-menu", G_CALLBACK (on_sidebar_popup_menu), self); + + gtk_widget_set_size_request (gtk_paned_get_child1 (GTK_PANED (panes)), 50, -1); + gtk_widget_set_size_request (gtk_paned_get_child2 (GTK_PANED (panes)), 150, -1); + + backends = seahorse_sidebar_get_backends (self->pv->sidebar); + for (l = backends; l != NULL; l = g_list_next (l)) { + actions = NULL; + g_object_get (l->data, "actions", &actions, NULL); + if (actions != NULL) { + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions); + g_object_unref (actions); + } + } + + area = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "sidebar-area"); + gtk_container_add (GTK_CONTAINER (area), GTK_WIDGET (self->pv->sidebar)); + gtk_widget_show (GTK_WIDGET (self->pv->sidebar)); + + actions = gtk_action_group_new ("sidebar"); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_toggle_actions (actions, SIDEBAR_ACTIONS, + G_N_ELEMENTS (SIDEBAR_ACTIONS), self); + action = gtk_action_group_get_action (actions, "view-sidebar"); + g_settings_bind (self->pv->settings, "sidebar-visible", + action, "active", + G_SETTINGS_BIND_DEFAULT); + g_object_bind_property (action, "active", + area, "visible", + G_BINDING_SYNC_CREATE); + g_object_bind_property (action, "active", + self->pv->sidebar, "combined", + G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE); + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions); + g_object_unref (actions); + + g_settings_bind (self->pv->settings, "keyrings-selected", + self->pv->sidebar, "selected-uris", + G_SETTINGS_BIND_DEFAULT); + + return seahorse_sidebar_get_collection (self->pv->sidebar); } static void @@ -856,60 +649,61 @@ { SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (object); GtkActionGroup* actions; - GtkToggleAction* action; GtkTargetList* targets; + GtkTreeSelection *selection; GtkWidget* widget; + GtkAction *action; G_OBJECT_CLASS (seahorse_key_manager_parent_class)->constructed (object); - self->pv->tabs = g_new0 (TabInfo, TAB_NUM_TABS); + gtk_window_set_title (seahorse_catalog_get_window (SEAHORSE_CATALOG (self)), _("Passwords and Keys")); + + self->pv->collection = setup_sidebar (self); + + /* Init key list & selection settings */ + self->pv->view = GTK_TREE_VIEW (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "key-list")); + g_return_if_fail (self->pv->view != NULL); + + selection = gtk_tree_view_get_selection (self->pv->view); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); + g_signal_connect (selection, "changed", G_CALLBACK (on_view_selection_changed), self); + gtk_widget_realize (GTK_WIDGET (self->pv->view)); + + /* Add new key store and associate it */ + self->pv->store = seahorse_key_manager_store_new (self->pv->collection, + self->pv->view, + &self->pv->pred, + self->pv->settings); + - self->pv->notebook = GTK_NOTEBOOK (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "notebook")); - gtk_window_set_title (seahorse_viewer_get_window (SEAHORSE_VIEWER (self)), _("Passwords and Keys")); - actions = gtk_action_group_new ("general"); gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (actions, GENERAL_ENTRIES, G_N_ELEMENTS (GENERAL_ENTRIES), self); - seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), actions); + gtk_action_group_add_actions (actions, GENERAL_ACTIONS, G_N_ELEMENTS (GENERAL_ACTIONS), self); + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions); -#ifdef WITH_KEYSERVER - actions = gtk_action_group_new ("keyserver"); - gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (actions, SERVER_ENTRIES, G_N_ELEMENTS (SERVER_ENTRIES), self); - seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), actions); -#endif /* WITH_KEYSERVER */ - self->pv->view_actions = gtk_action_group_new ("view"); gtk_action_group_set_translation_domain (self->pv->view_actions, GETTEXT_PACKAGE); - gtk_action_group_add_toggle_actions (self->pv->view_actions, VIEW_ENTRIES, G_N_ELEMENTS (VIEW_ENTRIES), self); - action = GTK_TOGGLE_ACTION (gtk_action_group_get_action (self->pv->view_actions, "view-type")); - gtk_toggle_action_set_active (action, g_settings_get_boolean (self->pv->settings, "show-type")); - action = GTK_TOGGLE_ACTION (gtk_action_group_get_action (self->pv->view_actions, "view-expires")); - gtk_toggle_action_set_active (action, g_settings_get_boolean (self->pv->settings, "show-expiry")); - action = GTK_TOGGLE_ACTION (gtk_action_group_get_action (self->pv->view_actions, "view-trust")); - gtk_toggle_action_set_active (action, g_settings_get_boolean (self->pv->settings, "show-trust")); - action = GTK_TOGGLE_ACTION (gtk_action_group_get_action (self->pv->view_actions, "view-validity")); - gtk_toggle_action_set_active (action, g_settings_get_boolean (self->pv->settings, "show-validity")); - seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), self->pv->view_actions); - + gtk_action_group_add_radio_actions (self->pv->view_actions, VIEW_RADIO_ACTIONS, + G_N_ELEMENTS (VIEW_RADIO_ACTIONS), -1, + G_CALLBACK (on_view_show_changed), self); + action = gtk_action_group_get_action (self->pv->view_actions, "view-personal"); + seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), self->pv->view_actions); + self->pv->show_action = GTK_RADIO_ACTION (action); + /* Notify us when settings change */ - g_signal_connect_object (self->pv->settings, "changed", G_CALLBACK (on_manager_settings_changed), self, 0); + g_signal_connect_object (self->pv->settings, "changed::item-filter", + G_CALLBACK (on_item_filter_changed), self, 0); + on_item_filter_changed (self->pv->settings, "item-filter", self); - /* close event */ - g_signal_connect_object (seahorse_widget_get_toplevel (SEAHORSE_WIDGET (self)), - "delete-event", G_CALLBACK (on_delete_event), self, 0); - /* first time signals */ g_signal_connect_object (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "import-button"), "clicked", G_CALLBACK (on_keymanager_import_button), self, 0); + g_signal_connect_object (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "new-button"), "clicked", G_CALLBACK (on_keymanager_new_button), self, 0); - - /* The notebook */ - g_signal_connect_object (self->pv->notebook, "switch-page", G_CALLBACK (on_tab_changed), self, G_CONNECT_AFTER); - + /* Flush all updates */ - seahorse_viewer_ensure_updated (SEAHORSE_VIEWER (self)); + seahorse_catalog_ensure_updated (SEAHORSE_CATALOG (self)); /* Find the toolbar */ widget = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "toolbar-placeholder"); @@ -938,9 +732,9 @@ /* Insert a filter bar */ box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); - gtk_box_pack_start (box, GTK_WIDGET (gtk_label_new (_("Filter:"))), FALSE, TRUE, 3); - + self->pv->filter_entry = GTK_ENTRY (gtk_entry_new ()); + gtk_entry_set_placeholder_text (self->pv->filter_entry, _("Filter")); gtk_box_pack_start (box, GTK_WIDGET (self->pv->filter_entry), FALSE, TRUE, 0); gtk_box_pack_start (box, gtk_label_new (NULL), FALSE, FALSE, 0); @@ -954,55 +748,39 @@ } } - gtk_entry_set_icon_from_icon_name (self->pv->filter_entry, - GTK_ENTRY_ICON_PRIMARY, - GTK_STOCK_FIND); - gtk_entry_set_icon_from_icon_name (self->pv->filter_entry, - GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_CLEAR); - - gtk_entry_set_icon_activatable (self->pv->filter_entry, - GTK_ENTRY_ICON_PRIMARY, FALSE); - gtk_entry_set_icon_activatable (self->pv->filter_entry, - GTK_ENTRY_ICON_SECONDARY, TRUE); - + on_filter_changed (self->pv->filter_entry, self); gtk_entry_set_width_chars (self->pv->filter_entry, 30); - g_signal_connect (self->pv->filter_entry, "icon-release", - G_CALLBACK (on_clear_clicked), NULL); - + G_CALLBACK (on_clear_clicked), NULL); + /* For the filtering */ g_signal_connect_object (GTK_EDITABLE (self->pv->filter_entry), "changed", G_CALLBACK (on_filter_changed), self, 0); - - /* Initialize the tabs, and associate them up */ - initialize_tab (self, "pub-key-tab", TAB_PUBLIC, "pub-key-list", &pred_public); - initialize_tab (self, "sec-key-tab", TAB_PRIVATE, "sec-key-list", &pred_private); - pred_password.tag = SEAHORSE_GKR_TYPE; - initialize_tab (self, "password-tab", TAB_PASSWORD, "password-list", &pred_password); - - /* Set focus to the current key list */ - widget = GTK_WIDGET (get_current_view (self)); - gtk_widget_grab_focus (widget); + g_signal_connect (self->pv->view, "start-interactive-search", + G_CALLBACK (on_start_interactive_search), self); + /* Set focus to the current key list */ + gtk_widget_grab_focus (GTK_WIDGET (self->pv->view)); g_signal_emit_by_name (self, "selection-changed"); /* To avoid flicker */ - seahorse_widget_show (SEAHORSE_WIDGET (SEAHORSE_VIEWER (self))); + seahorse_widget_show (SEAHORSE_WIDGET (SEAHORSE_CATALOG (self))); /* Setup drops */ - gtk_drag_dest_set (GTK_WIDGET (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))), + gtk_drag_dest_set (GTK_WIDGET (seahorse_catalog_get_window (SEAHORSE_CATALOG (self))), GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY); targets = gtk_target_list_new (NULL, 0); gtk_target_list_add_uri_targets (targets, TARGETS_URIS); gtk_target_list_add_text_targets (targets, TARGETS_PLAIN); - gtk_drag_dest_set_target_list (GTK_WIDGET (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))), targets); - - g_signal_connect_object (seahorse_viewer_get_window (SEAHORSE_VIEWER (self)), "drag-data-received", + gtk_drag_dest_set_target_list (GTK_WIDGET (seahorse_catalog_get_window (SEAHORSE_CATALOG (self))), targets); + + g_signal_connect_object (seahorse_catalog_get_window (SEAHORSE_CATALOG (self)), "drag-data-received", G_CALLBACK (on_target_drag_data_received), self, 0); - + +#ifdef REFACTOR_FIRST /* To show first time dialog */ g_timeout_add_seconds (1, (GSourceFunc)on_first_timer, self); +#endif } static void @@ -1016,24 +794,17 @@ seahorse_key_manager_finalize (GObject *obj) { SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (obj); - gint i; - + + if (self->pv->sidebar_width_sig != 0) { + g_source_remove (self->pv->sidebar_width_sig); + self->pv->sidebar_width_sig = 0; + } + if (self->pv->view_actions) g_object_unref (self->pv->view_actions); self->pv->view_actions = NULL; self->pv->filter_entry = NULL; - - if (self->pv->tabs) { - for (i = 0; i < TAB_NUM_TABS; ++i) { - if (self->pv->tabs[i].store) - g_object_unref (self->pv->tabs[i].store); - if (self->pv->tabs[i].objects) - g_object_unref (self->pv->tabs[i].objects); - } - g_free (self->pv->tabs); - self->pv->tabs = NULL; - } g_clear_object (&self->pv->settings); @@ -1041,67 +812,28 @@ } static void -seahorse_key_manager_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (obj); - - switch (prop_id) { - case PROP_SELECTED: - seahorse_viewer_set_selected (SEAHORSE_VIEWER (self), g_value_get_object (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_key_manager_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorseKeyManager *self = SEAHORSE_KEY_MANAGER (obj); - - switch (prop_id) { - case PROP_SELECTED: - g_value_set_object (value, seahorse_viewer_get_selected (SEAHORSE_VIEWER (self))); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void seahorse_key_manager_class_init (SeahorseKeyManagerClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_key_manager_parent_class = g_type_class_peek_parent (klass); + SeahorseCatalogClass *catalog_class = SEAHORSE_CATALOG_CLASS (klass); + g_type_class_add_private (klass, sizeof (SeahorseKeyManagerPrivate)); gobject_class->constructed = seahorse_key_manager_constructed; gobject_class->finalize = seahorse_key_manager_finalize; - gobject_class->set_property = seahorse_key_manager_set_property; - gobject_class->get_property = seahorse_key_manager_get_property; - - SEAHORSE_VIEWER_CLASS (klass)->get_selected_objects = seahorse_key_manager_get_selected_objects; - SEAHORSE_VIEWER_CLASS (klass)->set_selected_objects = seahorse_key_manager_set_selected_objects; - SEAHORSE_VIEWER_CLASS (klass)->get_selected = seahorse_key_manager_get_selected; - SEAHORSE_VIEWER_CLASS (klass)->set_selected = seahorse_key_manager_set_selected; - g_object_class_override_property (G_OBJECT_CLASS (klass), PROP_SELECTED, "selected"); + catalog_class->get_selected_objects = seahorse_key_manager_get_selected_objects; + catalog_class->get_focused_place = seahorse_key_manager_get_focused_place; } -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - - -GtkWindow* -seahorse_key_manager_show (void) +void +seahorse_key_manager_show (void) { - SeahorseKeyManager *man = g_object_new (SEAHORSE_TYPE_KEY_MANAGER, "name", "key-manager", NULL); - g_object_ref_sink (man); - return GTK_WINDOW (seahorse_widget_get_toplevel (SEAHORSE_WIDGET (man))); + SeahorseWidget *self; + + self = seahorse_widget_find ("key-manager"); + if (self != NULL) + gtk_window_present (GTK_WINDOW (seahorse_widget_get_widget (self, self->name))); + else + g_object_new (SEAHORSE_TYPE_KEY_MANAGER, "name", "key-manager", NULL); } diff -Nru seahorse-3.2.2/src/seahorse-key-manager.h seahorse-3.6.3/src/seahorse-key-manager.h --- seahorse-3.2.2/src/seahorse-key-manager.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-key-manager.h 2012-08-21 12:23:19.000000000 +0200 @@ -26,10 +26,11 @@ #include #include -#include "seahorse-viewer.h" +#include -G_BEGIN_DECLS +#include "seahorse-catalog.h" +G_BEGIN_DECLS #define SEAHORSE_TYPE_KEY_MANAGER (seahorse_key_manager_get_type ()) #define SEAHORSE_KEY_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEY_MANAGER, SeahorseKeyManager)) @@ -43,21 +44,17 @@ typedef struct _SeahorseKeyManagerPrivate SeahorseKeyManagerPrivate; struct _SeahorseKeyManager { - SeahorseViewer parent_instance; + SeahorseCatalog parent_instance; SeahorseKeyManagerPrivate *pv; }; struct _SeahorseKeyManagerClass { - SeahorseViewerClass parent_class; + SeahorseCatalogClass parent_class; }; -/* - * The various tabs. If adding a tab be sure to fix - * logic throughout this file. - */ +GType seahorse_key_manager_get_type (void) G_GNUC_CONST; -GtkWindow* seahorse_key_manager_show (void); -GType seahorse_key_manager_get_type (void); +void seahorse_key_manager_show (void); G_END_DECLS diff -Nru seahorse-3.2.2/src/seahorse-key-manager-store.c seahorse-3.6.3/src/seahorse-key-manager-store.c --- seahorse-3.2.2/src/seahorse-key-manager-store.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-key-manager-store.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1000 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2003 Jacob Perkins - * Copyright (C) 2004, 2005, 2006 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include - -#include -#include - -#include "seahorse-key-manager-store.h" -#include "seahorse-preferences.h" -#include "seahorse-util.h" -#include "seahorse-validity.h" - -#define DEBUG_FLAG SEAHORSE_DEBUG_DRAG -#include "seahorse-debug.h" - -#include "eggtreemultidnd.h" - -#define KEY_MANAGER_SORT_KEY "/apps/seahorse/listing/sort_by" - -enum { - PROP_0, - PROP_MODE, - PROP_FILTER, - PROP_SETTINGS -}; - -enum { - COL_USAGE, - COL_STOCK_ID, - COL_NAME, - COL_KEYID, - COL_VALIDITY_STR, - COL_TRUST_STR, - COL_TYPE, - COL_EXPIRES_STR, - COL_VALIDITY, - COL_EXPIRES, - COL_TRUST, - N_COLS -}; - -static SeahorseSetModelColumn column_info[] = { - { "usage", G_TYPE_UINT, "usage" }, - { "icon", G_TYPE_STRING, NULL }, - { "markup", G_TYPE_STRING, "label" }, - { "identifier", G_TYPE_STRING, "id" }, - { "validity-str", G_TYPE_STRING, "validity" }, - { "trust-str", G_TYPE_STRING, "trust" }, - { "type", G_TYPE_STRING, "type" }, - { "expires-str", G_TYPE_STRING, "expires" }, - { "validity", G_TYPE_UINT, "validity" }, - { "expires", G_TYPE_ULONG, "expires" }, - { "trust", G_TYPE_UINT, "trust" } -}; - -enum { - DRAG_INFO_TEXT, - DRAG_INFO_XDS, -}; - -#define XDS_FILENAME "xds.txt" -#define MAX_XDS_ATOM_VAL_LEN 4096 -#define XDS_ATOM gdk_atom_intern ("XdndDirectSave0", FALSE) -#define TEXT_ATOM gdk_atom_intern ("text/plain", FALSE) - -static GtkTargetEntry store_targets[] = { - { "text/plain", 0, DRAG_INFO_TEXT }, - { "XdndDirectSave0", 0, DRAG_INFO_XDS } -}; - -struct _SeahorseKeyManagerStorePriv { - GtkTreeModelFilter *filter; - GtkTreeModelSort *sort; - GSettings *settings; - - SeahorseKeyManagerStoreMode filter_mode; - gchar* filter_text; - guint filter_stag; - - gchar *drag_destination; - GError *drag_error; - GList *drag_objects; -}; - -G_DEFINE_TYPE (SeahorseKeyManagerStore, seahorse_key_manager_store, SEAHORSE_TYPE_SET_MODEL); - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -/* Given a treeview iter, get the base store iterator */ -static void -get_base_iter (SeahorseKeyManagerStore *skstore, GtkTreeIter *base_iter, - const GtkTreeIter *iter) -{ - GtkTreeIter i; - g_return_if_fail (skstore->priv->sort && skstore->priv->filter); - gtk_tree_model_sort_convert_iter_to_child_iter (skstore->priv->sort, &i, (GtkTreeIter*)iter); - gtk_tree_model_filter_convert_iter_to_child_iter (skstore->priv->filter, base_iter, &i); -} - -/* Given a base store iter, get the treeview iter */ -static gboolean -get_upper_iter (SeahorseKeyManagerStore *skstore, GtkTreeIter *upper_iter, - const GtkTreeIter *iter) -{ - GtkTreeIter i; - GtkTreePath *child_path, *path; - gboolean ret; - - g_return_val_if_fail (skstore->priv->filter, FALSE); - child_path = gtk_tree_model_get_path (gtk_tree_model_filter_get_model (skstore->priv->filter), - (GtkTreeIter*)iter); - g_return_val_if_fail (child_path != NULL, FALSE); - path = gtk_tree_model_filter_convert_child_path_to_path (skstore->priv->filter, child_path); - gtk_tree_path_free (child_path); - - if (!path) - return FALSE; - - ret = gtk_tree_model_get_iter (GTK_TREE_MODEL (skstore->priv->filter), &i, path); - gtk_tree_path_free (path); - - if (!ret) - return FALSE; - - g_return_val_if_fail (skstore->priv->sort, FALSE); - gtk_tree_model_sort_convert_child_iter_to_iter (skstore->priv->sort, upper_iter, &i); - return TRUE; -} - -/* Try to find our key store given a tree model */ -static SeahorseKeyManagerStore* -key_store_from_model (GtkTreeModel *model) -{ - /* Sort models are what's set on the tree */ - if (GTK_IS_TREE_MODEL_SORT (model)) - model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model)); - if (GTK_IS_TREE_MODEL_FILTER (model)) - model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)); - if (SEAHORSE_IS_KEY_MANAGER_STORE (model)) - return SEAHORSE_KEY_MANAGER_STORE (model); - - g_return_val_if_reached (NULL); -} - -/* Given an iterator find the associated object */ -static SeahorseObject* -object_from_iterator (GtkTreeModel* model, GtkTreeIter* iter) -{ - GtkTreeIter i; - - /* Convert to base iter if necessary */ - if (!SEAHORSE_IS_KEY_MANAGER_STORE (model)) { - SeahorseKeyManagerStore* skstore = key_store_from_model (model); - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore), NULL); - get_base_iter (skstore, &i, iter); - - iter = &i; - model = GTK_TREE_MODEL (skstore); - } - - return seahorse_set_model_object_for_iter (SEAHORSE_SET_MODEL (model), iter); -} - -/* Search through row for text */ -static gboolean -row_contains_filtered_text (GtkTreeModel* model, GtkTreeIter* iter, const gchar* text) -{ - gchar* name = NULL; - gchar* id = NULL; - gchar* t; - gboolean ret = FALSE; - - /* Empty search text results in a match */ - if (!text || !text[0]) - return TRUE; - - /* Note that we only search the name and id */ - gtk_tree_model_get (model, iter, COL_NAME, &name, COL_KEYID, &id, -1); - - if(name) { - t = g_utf8_strdown (name, -1); - if (strstr (t, text)) - ret = TRUE; - g_free (t); - } - - if (!ret && id) { - t = g_utf8_strdown (id, -1); - if (strstr (t, text)) - ret = TRUE; - g_free (t); - } - - g_free (name); - g_free (id); - return ret; -} - -/* Called to filter each row */ -static gboolean -filter_callback (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) -{ - SeahorseKeyManagerStore* skstore = SEAHORSE_KEY_MANAGER_STORE(data); - GtkTreeIter child; - gboolean ret = FALSE; - - /* Check the row requested */ - switch (skstore->priv->filter_mode) - { - case KEY_STORE_MODE_FILTERED: - ret = row_contains_filtered_text (model, iter, skstore->priv->filter_text); - break; - - case KEY_STORE_MODE_ALL: - ret = TRUE; - break; - - default: - g_assert_not_reached (); - break; - }; - - /* If current is not being shown, double check with children */ - if (!ret && gtk_tree_model_iter_children (model, &child, iter)) { - do { - ret = filter_callback (model, &child, data); - } while (!ret && gtk_tree_model_iter_next (model, &child)); - } - - return ret; -} - -/* Refilter the tree */ -static gboolean -refilter_now (SeahorseKeyManagerStore* skstore) -{ - g_return_val_if_fail (skstore->priv->filter, FALSE); - seahorse_set_refresh (SEAHORSE_SET_MODEL (skstore)->set); - gtk_tree_model_filter_refilter (skstore->priv->filter); - skstore->priv->filter_stag = 0; - return FALSE; -} - -/* Refilter the tree after a timeout has passed */ -static void -refilter_later (SeahorseKeyManagerStore* skstore) -{ - if (skstore->priv->filter_stag != 0) - g_source_remove (skstore->priv->filter_stag); - skstore->priv->filter_stag = g_timeout_add (200, (GSourceFunc)refilter_now, skstore); -} - -/* Update the sort order for a column */ -static void -set_sort_to (SeahorseKeyManagerStore *skstore, const gchar *name) -{ - GtkTreeSortable* sort; - gint i, id = -1; - GtkSortType ord = GTK_SORT_ASCENDING; - const gchar* n; - - g_return_if_fail (name != NULL); - - /* Prefix with a minus means descending */ - if (name[0] == '-') { - ord = GTK_SORT_DESCENDING; - name++; - } - - /* Prefix with a plus means ascending */ - else if (name[0] == '+') { - ord = GTK_SORT_ASCENDING; - name++; - } - - /* Find the column sort id */ - for (i = N_COLS - 1; i >= 0 ; i--) { - n = column_info[i].data; - if (n && g_ascii_strcasecmp (name, n) == 0) { - id = i; - break; - } - } - - if (id != -1) { - g_return_if_fail (skstore->priv->sort); - sort = GTK_TREE_SORTABLE (skstore->priv->sort); - gtk_tree_sortable_set_sort_column_id (sort, id, ord); - } -} - -/* Called when the column sort is changed */ -static void -sort_changed (GtkTreeSortable *sort, gpointer user_data) -{ - SeahorseKeyManagerStore *self = SEAHORSE_KEY_MANAGER_STORE (user_data); - GtkSortType ord; - gchar* value; - gint column_id; - - g_return_if_fail (self->priv->sort); - if (!self->priv->settings) - return; - - /* We have a sort so save it */ - if (gtk_tree_sortable_get_sort_column_id (sort, &column_id, &ord)) { - if (column_id >= 0 && column_id < N_COLS) { - if (column_info[column_id].data != NULL) { - value = g_strconcat (ord == GTK_SORT_DESCENDING ? "-" : "", - column_info[column_id].data, NULL); - g_settings_set_string (self->priv->settings, "sort-by", value); - g_free (value); - } - } - - /* No sort so save blank */ - } else if (self->priv->settings) { - g_settings_set_string (self->priv->settings, "sort-by", ""); - } -} - -static void -on_manager_settings_changed (GSettings *settings, const gchar *key, gpointer user_data) -{ - SeahorseKeyManagerStore *self; - GtkTreeViewColumn *col = NULL; - GtkTreeView *view = GTK_TREE_VIEW (user_data); - const gchar *col_key = NULL; - GList *columns, *l; - gchar *sort_by; - - if (g_str_equal (key, "sort-by")) { - self = key_store_from_model (gtk_tree_view_get_model (view)); - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (self)); - sort_by = g_settings_get_string (settings, key); - set_sort_to (self, sort_by); - g_free (sort_by); - return; - } - - columns = gtk_tree_view_get_columns (view); - for (l = columns; l; l = g_list_next (l)) { - col_key = g_object_get_data (G_OBJECT (l->data), "settings-key"); - if (col_key && g_str_equal (col_key, key)) { - col = GTK_TREE_VIEW_COLUMN (l->data); - break; - } - } - - if (col != NULL) - gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, key)); - - g_list_free (columns); -} - -static GtkTreeViewColumn* -append_text_column (SeahorseKeyManagerStore *skstore, GtkTreeView *view, - const gchar *label, const gint index) -{ - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - - renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "xpad", 3, NULL); - column = gtk_tree_view_column_new_with_attributes (label, renderer, "text", index, NULL); - gtk_tree_view_column_set_resizable (column, TRUE); - gtk_tree_view_append_column (view, column); - - return column; -} - -/* The following three functions taken from bugzilla - * (http://bugzilla.gnome.org/attachment.cgi?id=49362&action=view) - * Author: Christian Neumair - * Copyright: 2005 Free Software Foundation, Inc - * License: GPL */ -static char * -xds_get_atom_value (GdkDragContext *context) -{ - GdkWindow *source_window; - char *ret; - - g_return_val_if_fail (context != NULL, NULL); - - source_window = gdk_drag_context_get_source_window (context); - g_return_val_if_fail (source_window != NULL, NULL); - - if (gdk_property_get (source_window, - XDS_ATOM, TEXT_ATOM, - 0, MAX_XDS_ATOM_VAL_LEN, - FALSE, NULL, NULL, NULL, - (unsigned char **) &ret)) - return ret; - - return NULL; -} - -static gboolean -xds_context_offers_target (GdkDragContext *context, GdkAtom target) -{ - GList *targets = gdk_drag_context_list_targets (context); - return (g_list_find (targets, target) != NULL); -} - -static gboolean -xds_is_dnd_valid_context (GdkDragContext *context) -{ - char *tmp; - gboolean ret; - - g_return_val_if_fail (context != NULL, FALSE); - - tmp = NULL; - if (xds_context_offers_target (context, XDS_ATOM)) { - tmp = xds_get_atom_value (context); - } - - ret = (tmp != NULL); - g_free (tmp); - - return ret; -} - -static gboolean -drag_begin (GtkWidget *widget, GdkDragContext *context, SeahorseKeyManagerStore *skstore) -{ - GtkTreeView *view = GTK_TREE_VIEW (widget); - GdkWindow *source_window; - - seahorse_debug ("drag_begin -->"); - - g_free (skstore->priv->drag_destination); - skstore->priv->drag_destination = NULL; - - g_clear_error (&skstore->priv->drag_error); - - g_list_free (skstore->priv->drag_objects); - skstore->priv->drag_objects = seahorse_key_manager_store_get_selected_objects (view); - - if (skstore->priv->drag_objects) { - source_window = gdk_drag_context_get_source_window (context); - gdk_property_change (source_window, XDS_ATOM, TEXT_ATOM, - 8, GDK_PROP_MODE_REPLACE, (guchar*)XDS_FILENAME, - strlen (XDS_FILENAME)); - } - - seahorse_debug ("drag_begin <--"); - return skstore->priv->drag_objects ? TRUE : FALSE; -} - -typedef struct { - SeahorseKeyManagerStore *skstore; - - gint exports; - gboolean failures; -} export_keys_to_output_closure; - -static gboolean -export_to_text (SeahorseKeyManagerStore *skstore, - GtkSelectionData *selection_data) -{ - GOutputStream *output; - gboolean ret = FALSE; - - g_return_val_if_fail (skstore->priv->drag_objects, FALSE); - seahorse_debug ("exporting to text"); - - output = g_memory_output_stream_new (NULL, 0, g_realloc, g_free); - g_return_val_if_fail (output, FALSE); - - ret = seahorse_source_export_auto_wait (skstore->priv->drag_objects, output, - &skstore->priv->drag_error) && - g_output_stream_close (output, NULL, &skstore->priv->drag_error); - - if (ret) { - seahorse_debug ("setting selection text"); - gtk_selection_data_set_text (selection_data, - g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (output)), - g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (output))); - } else { - g_message ("error occurred on export: %s", - skstore->priv->drag_error && skstore->priv->drag_error->message ? - skstore->priv->drag_error->message : ""); - } - - g_object_unref (output); - return ret; -} - -static gboolean -export_to_filename (SeahorseKeyManagerStore *skstore, const gchar *filename) -{ - GOutputStream *output; - gboolean ret; - gchar *uri; - GFile *file; - GList *keys; - - seahorse_debug ("exporting to %s", filename); - - ret = FALSE; - g_return_val_if_fail (skstore->priv->drag_objects, FALSE); - keys = g_list_copy (skstore->priv->drag_objects); - - uri = seahorse_util_uri_unique (filename); - - /* Create output file */ - file = g_file_new_for_uri (uri); - g_free (uri); - output = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, - NULL, &skstore->priv->drag_error)); - g_object_unref (file); - - if (output) { - /* This modifies and frees keys */ - ret = seahorse_source_export_auto_wait (keys, output, &skstore->priv->drag_error) && - g_output_stream_close (output, NULL, &skstore->priv->drag_error); - - g_object_unref (output); - } - - return ret; -} - -static gboolean -drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, - guint info, guint time, SeahorseKeyManagerStore *skstore) -{ - gchar *destination; - gboolean ret; - - seahorse_debug ("drag_data_get %d -->", info); - - g_return_val_if_fail (skstore->priv->drag_objects, FALSE); - - /* The caller wants plain text */ - if (info == DRAG_INFO_TEXT) { - seahorse_debug ("returning object text"); - export_to_text (skstore, selection_data); - - /* The caller wants XDS */ - } else if (info == DRAG_INFO_XDS) { - - if (xds_is_dnd_valid_context (context)) { - destination = xds_get_atom_value (context); - g_return_val_if_fail (destination, FALSE); - skstore->priv->drag_destination = g_path_get_dirname (destination); - g_free (destination); - - gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data), 8, (guchar*)"S", 1); - ret = TRUE; - } - - /* Unrecognized format */ - } else { - seahorse_debug ("Unrecognized format: %d", info); - } - - seahorse_debug ("drag_data_get <--"); - return ret; -} - -static void -drag_end (GtkWidget *widget, GdkDragContext *context, SeahorseKeyManagerStore *skstore) -{ - gchar *filename, *name; - - seahorse_debug ("drag_end -->"); - - if (skstore->priv->drag_destination && !skstore->priv->drag_error) { - g_return_if_fail (skstore->priv->drag_objects); - - name = seahorse_util_filename_for_objects (skstore->priv->drag_objects); - g_return_if_fail (name); - - filename = g_build_filename (skstore->priv->drag_destination, name, NULL); - g_free (name); - - export_to_filename (skstore, filename); - g_free (filename); - } - - if (skstore->priv->drag_error) { - seahorse_util_show_error (widget, _("Couldn't export keys"), - skstore->priv->drag_error->message); - } - - g_clear_error (&skstore->priv->drag_error); - g_list_free (skstore->priv->drag_objects); - skstore->priv->drag_objects = NULL; - g_free (skstore->priv->drag_destination); - skstore->priv->drag_destination = NULL; - - seahorse_debug ("drag_end <--"); -} - -static gint -compare_pointers (gconstpointer a, gconstpointer b) -{ - if (a == b) - return 0; - return a > b ? 1 : -1; -} - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_key_manager_store_init (SeahorseKeyManagerStore *skstore) -{ - /* init private vars */ - skstore->priv = g_new0 (SeahorseKeyManagerStorePriv, 1); -} - -static void -seahorse_key_manager_store_get_property (GObject *gobject, guint prop_id, - GValue *value, GParamSpec *pspec) -{ - SeahorseKeyManagerStore *skstore = SEAHORSE_KEY_MANAGER_STORE (gobject); - - switch (prop_id) { - - /* The filtering mode */ - case PROP_MODE: - g_value_set_uint (value, skstore->priv->filter_mode); - break; - - case PROP_SETTINGS: - g_value_set_object (value, skstore->priv->settings); - break; - - /* The filter text. Note that we act as if we don't have any - * filter text when not in filtering mode */ - case PROP_FILTER: - g_value_set_string (value, - skstore->priv->filter_mode == KEY_STORE_MODE_FILTERED ? skstore->priv->filter_text : ""); - break; - - default: - break; - } -} - -static void -seahorse_key_manager_store_set_property (GObject *gobject, guint prop_id, - const GValue *value, GParamSpec *pspec) -{ - SeahorseKeyManagerStore *skstore = SEAHORSE_KEY_MANAGER_STORE (gobject); - const gchar* t; - - switch (prop_id) { - - /* The filtering mode */ - case PROP_MODE: - if (skstore->priv->filter_mode != g_value_get_uint (value)) { - skstore->priv->filter_mode = g_value_get_uint (value); - refilter_later (skstore); - } - break; - - case PROP_SETTINGS: - skstore->priv->settings = g_value_dup_object (value); - break; - - /* The filter text */ - case PROP_FILTER: - t = g_value_get_string (value); - - /* - * If we're not in filtered mode and there is text OR - * we're in filtered mode (regardless of text or not) - * then update the filter - */ - if ((skstore->priv->filter_mode != KEY_STORE_MODE_FILTERED && t && t[0]) || - (skstore->priv->filter_mode == KEY_STORE_MODE_FILTERED)) { - skstore->priv->filter_mode = KEY_STORE_MODE_FILTERED; - g_free (skstore->priv->filter_text); - - /* We always use lower case text (see filter_callback) */ - skstore->priv->filter_text = g_utf8_strdown (t, -1); - refilter_later (skstore); - } - break; - - default: - break; - } -} - -static void -seahorse_key_manager_store_finalize (GObject *gobject) -{ - SeahorseKeyManagerStore *skstore = SEAHORSE_KEY_MANAGER_STORE (gobject); - - if (skstore->priv->sort) { - g_signal_handlers_disconnect_by_func (skstore->priv->sort, sort_changed, skstore); - g_object_remove_weak_pointer (G_OBJECT (skstore->priv->sort), (gpointer*)&skstore->priv->sort); - skstore->priv->sort = NULL; - } - - if (skstore->priv->filter) { - g_object_remove_weak_pointer (G_OBJECT (skstore->priv->filter), (gpointer*)&skstore->priv->filter); - skstore->priv->filter = NULL; - } - - /* Allocated in property setter */ - g_free (skstore->priv->filter_text); - - G_OBJECT_CLASS (seahorse_key_manager_store_parent_class)->finalize (gobject); -} - -static void -seahorse_key_manager_store_class_init (SeahorseKeyManagerStoreClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - seahorse_key_manager_store_parent_class = g_type_class_peek_parent (klass); - - /* Some simple checks to make sure all column info is on the same page */ - g_assert (N_COLS == G_N_ELEMENTS (column_info)); - - gobject_class->finalize = seahorse_key_manager_store_finalize; - gobject_class->set_property = seahorse_key_manager_store_set_property; - gobject_class->get_property = seahorse_key_manager_store_get_property; - - g_object_class_install_property (gobject_class, PROP_MODE, - g_param_spec_uint ("mode", "Key Store Mode", "Key store mode controls which keys to display", - 0, KEY_STORE_MODE_FILTERED, KEY_STORE_MODE_ALL, G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_FILTER, - g_param_spec_string ("filter", "Key Store Filter", "Key store filter for when in filtered mode", - "", G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_SETTINGS, - g_param_spec_object ("settings", "Settings", "Manager Settings", - G_TYPE_SETTINGS, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorseKeyManagerStore* -seahorse_key_manager_store_new (SeahorseSet *skset, GtkTreeView *view, GSettings *settings) -{ - SeahorseKeyManagerStore *skstore; - GtkTreeViewColumn *col; - SeahorseObjectPredicate *pred; - GtkCellRenderer *renderer; - gchar *sort_by; - gint last; - - skstore = g_object_new (SEAHORSE_TYPE_KEY_MANAGER_STORE, "set", skset, "settings", settings, NULL); - last = seahorse_set_model_set_columns (SEAHORSE_SET_MODEL (skstore), column_info, N_COLS); - g_return_val_if_fail (last == N_COLS - 1, NULL); - - /* Setup the sort and filter */ - skstore->priv->filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (GTK_TREE_MODEL (skstore), NULL)); - gtk_tree_model_filter_set_visible_func (skstore->priv->filter, filter_callback, skstore, NULL); - skstore->priv->sort = GTK_TREE_MODEL_SORT (gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (skstore->priv->filter))); - - /* The sorted model is the top level model */ - gtk_tree_view_set_model (view, GTK_TREE_MODEL (skstore->priv->sort)); - - /* add the icon column */ - renderer = gtk_cell_renderer_pixbuf_new (); - g_object_set (renderer, "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL); - g_object_set (renderer, "xpad", 6, NULL); - col = gtk_tree_view_column_new_with_attributes ("", renderer, "stock-id", COL_STOCK_ID, NULL); - gtk_tree_view_column_set_resizable (col, FALSE); - gtk_tree_view_append_column (view, col); - gtk_tree_view_column_set_sort_column_id (col, COL_USAGE); - - /* Name column */ - renderer = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (_("Name"), renderer, "markup", COL_NAME, NULL); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_expand (col, TRUE); - gtk_tree_view_append_column (view, col); - gtk_tree_view_set_expander_column (view, col); - gtk_tree_view_column_set_sort_column_id (col, COL_NAME); - - /* Use predicate to figure out which columns to add */ - g_object_get (skset, "predicate", &pred, NULL); - - /* Key ID column, don't show for passwords */ - if (pred->usage != SEAHORSE_USAGE_CREDENTIALS) { - col = append_text_column (skstore, view, _("Key ID"), COL_KEYID); - gtk_tree_view_column_set_sort_column_id (col, COL_KEYID); - } - - /* Public keys show validity */ - if (pred->usage == SEAHORSE_USAGE_PUBLIC_KEY) { - col = append_text_column (skstore, view, _("Validity"), COL_VALIDITY_STR); - g_object_set_data (G_OBJECT (col), "settings-key", "show-validity"); - gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-validity")); - gtk_tree_view_column_set_sort_column_id (col, COL_VALIDITY); - } - - /* Trust column */ - col = append_text_column (skstore, view, _("Trust"), COL_TRUST_STR); - g_object_set_data (G_OBJECT (col), "settings-key", "show-trust"); - gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-trust")); - gtk_tree_view_column_set_sort_column_id (col, COL_TRUST); - - /* The key type column */ - col = append_text_column (skstore, view, _("Type"), COL_TYPE); - g_object_set_data (G_OBJECT (col), "settings-key", "show-type"); - gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-type")); - gtk_tree_view_column_set_sort_column_id (col, COL_TYPE); - - /* Expiry date column */ - col = append_text_column (skstore, view, _("Expiration Date"), COL_EXPIRES_STR); - g_object_set_data (G_OBJECT (col), "settings-key", "show-expiry"); - gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-expiry")); - gtk_tree_view_column_set_sort_column_id (col, COL_EXPIRES); - - /* Also watch for sort-changed on the store */ - g_signal_connect (skstore->priv->sort, "sort-column-changed", G_CALLBACK (sort_changed), skstore); - - /* Update sort order in case the sorted column was added */ - if ((sort_by = g_settings_get_string (settings, "sort-by")) != NULL) { - set_sort_to (skstore, sort_by); - g_free (sort_by); - } - - gtk_tree_view_set_enable_search (view, FALSE); - - g_signal_connect_object (settings, "changed", G_CALLBACK (on_manager_settings_changed), view, 0); - - /* Tree drag */ - egg_tree_multi_drag_add_drag_support (view); - - g_signal_connect (G_OBJECT (view), "drag_data_get", G_CALLBACK (drag_data_get), skstore); - g_signal_connect (G_OBJECT (view), "drag_begin", G_CALLBACK (drag_begin), skstore); - g_signal_connect (G_OBJECT (view), "drag_end", G_CALLBACK (drag_end), skstore); - - gtk_drag_source_set (GTK_WIDGET (view), GDK_BUTTON1_MASK, - store_targets, G_N_ELEMENTS (store_targets), GDK_ACTION_COPY); - - /* We keep track of these but not as a strong reference */ - g_object_add_weak_pointer (G_OBJECT (skstore->priv->filter), (gpointer*)&skstore->priv->filter); - g_object_unref (skstore->priv->filter); - g_object_add_weak_pointer (G_OBJECT (skstore->priv->sort), (gpointer*)&skstore->priv->sort); - g_object_unref (skstore->priv->sort); - - return skstore; -} - -SeahorseObject* -seahorse_key_manager_store_get_object_from_path (GtkTreeView *view, GtkTreePath *path) -{ - GtkTreeModel *model; - GtkTreeIter iter; - - g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); - g_return_val_if_fail (path != NULL, NULL); - - model = gtk_tree_view_get_model (view); - g_return_val_if_fail (gtk_tree_model_get_iter (model, &iter, path), NULL); - return object_from_iterator (model, &iter); -} - -GList* -seahorse_key_manager_store_get_all_objects (GtkTreeView *view) -{ - SeahorseKeyManagerStore* skstore; - - g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); - skstore = key_store_from_model (gtk_tree_view_get_model (view)); - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore), NULL); - return seahorse_set_get_objects (SEAHORSE_SET_MODEL (skstore)->set); -} - -GList* -seahorse_key_manager_store_get_selected_objects (GtkTreeView *view) -{ - SeahorseObject *sobj; - GList *l, *objects = NULL; - SeahorseKeyManagerStore* skstore; - GList *list, *paths = NULL; - GtkTreeSelection *selection; - - g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); - skstore = key_store_from_model (gtk_tree_view_get_model (view)); - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore), NULL); - - selection = gtk_tree_view_get_selection (view); - paths = gtk_tree_selection_get_selected_rows (selection, NULL); - - /* make object list */ - for (list = paths; list != NULL; list = g_list_next (list)) { - sobj = seahorse_key_manager_store_get_object_from_path (view, list->data); - if (sobj != NULL) - objects = g_list_append (objects, sobj); - } - - /* free selected paths */ - g_list_foreach (paths, (GFunc)gtk_tree_path_free, NULL); - g_list_free (paths); - - /* Remove duplicates */ - objects = g_list_sort (objects, compare_pointers); - for (l = objects; l; l = g_list_next (l)) { - while (l->next && l->data == l->next->data) - objects = g_list_delete_link (objects, l->next); - } - - return objects; -} - -void -seahorse_key_manager_store_set_selected_objects (GtkTreeView *view, GList* objects) -{ - SeahorseKeyManagerStore* skstore; - GtkTreeSelection* selection; - gboolean first = TRUE; - GtkTreePath *path; - GList *l; - GtkTreeIter iter, upper; - - g_return_if_fail (GTK_IS_TREE_VIEW (view)); - selection = gtk_tree_view_get_selection (view); - gtk_tree_selection_unselect_all (selection); - - skstore = key_store_from_model (gtk_tree_view_get_model (view)); - g_return_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore)); - - for (l = objects; l; l = g_list_next (l)) { - if (seahorse_set_model_iter_for_object (SEAHORSE_SET_MODEL (skstore), - SEAHORSE_OBJECT (l->data), &iter)) { - /* And select them ... */ - if (get_upper_iter (skstore, &upper, &iter)) { - - gtk_tree_selection_select_iter (selection, &upper); - - /* Scroll the first row selected into view */ - if (first) { - path = gtk_tree_model_get_path (gtk_tree_view_get_model (view), &upper); - gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0.0, 0.0); - gtk_tree_path_free (path); - first = FALSE; - } - } - } - } -} - -SeahorseObject* -seahorse_key_manager_store_get_selected_object (GtkTreeView *view) -{ - SeahorseKeyManagerStore* skstore; - SeahorseObject *sobj = NULL; - GList *paths = NULL; - GtkTreeSelection *selection; - - g_return_val_if_fail (GTK_IS_TREE_VIEW (view), NULL); - skstore = key_store_from_model (gtk_tree_view_get_model (view)); - g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (skstore), NULL); - - selection = gtk_tree_view_get_selection (view); - paths = gtk_tree_selection_get_selected_rows (selection, NULL); - - /* choose first object */ - if (paths != NULL) { - sobj = seahorse_key_manager_store_get_object_from_path (view, paths->data); - - /* free selected paths */ - g_list_foreach (paths, (GFunc)gtk_tree_path_free, NULL); - g_list_free (paths); - } - - return sobj; -} diff -Nru seahorse-3.2.2/src/seahorse-key-manager-store.h seahorse-3.6.3/src/seahorse-key-manager-store.h --- seahorse-3.2.2/src/seahorse-key-manager-store.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-key-manager-store.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2003 Jacob Perkins - * Copyright (C) 2006 Stefan Walter - * - * 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 __SEAHORSE_KEY_MANAGER_STORE_H__ -#define __SEAHORSE_KEY_MANAGER_STORE_H__ - -#include - -#include "seahorse-context.h" -#include "seahorse-set.h" -#include "seahorse-set-model.h" - -#define SEAHORSE_TYPE_KEY_MANAGER_STORE (seahorse_key_manager_store_get_type ()) -#define SEAHORSE_KEY_MANAGER_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStore)) -#define SEAHORSE_KEY_MANAGER_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass)) -#define SEAHORSE_IS_KEY_MANAGER_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE)) -#define SEAHORSE_IS_KEY_MANAGER_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE)) -#define SEAHORSE_KEY_MANAGER_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass)) - -typedef struct _SeahorseKeyManagerStore SeahorseKeyManagerStore; -typedef struct _SeahorseKeyManagerStorePriv SeahorseKeyManagerStorePriv; -typedef struct _SeahorseKeyManagerStoreClass SeahorseKeyManagerStoreClass; - -typedef enum _SeahorseKeyManagerStoreMode { - KEY_STORE_MODE_ALL, - KEY_STORE_MODE_FILTERED -} SeahorseKeyManagerStoreMode; - -struct _SeahorseKeyManagerStore { - SeahorseSetModel parent; - - /*< private >*/ - SeahorseKeyManagerStorePriv *priv; -}; - -struct _SeahorseKeyManagerStoreClass { - SeahorseSetModelClass parent_class; -}; - -GType seahorse_key_manager_store_get_type (void) G_GNUC_CONST; - -SeahorseKeyManagerStore* seahorse_key_manager_store_new (SeahorseSet *skset, - GtkTreeView *view, - GSettings *settings); - -SeahorseObject* seahorse_key_manager_store_get_object_from_path (GtkTreeView *view, - GtkTreePath *path); - -GList* seahorse_key_manager_store_get_all_objects (GtkTreeView *view); - -void seahorse_key_manager_store_set_selected_objects (GtkTreeView *view, - GList* objects); - -GList* seahorse_key_manager_store_get_selected_objects (GtkTreeView *view); - -SeahorseObject* seahorse_key_manager_store_get_selected_object (GtkTreeView *view); - -#endif /* __SEAHORSE_KEY_MANAGER_STORE_H__ */ diff -Nru seahorse-3.2.2/src/seahorse-key-manager.ui seahorse-3.6.3/src/seahorse-key-manager.ui --- seahorse-3.2.2/src/seahorse-key-manager.ui 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-key-manager.ui 2012-08-21 12:23:19.000000000 +0200 @@ -17,39 +17,29 @@ - - - - + + - - - - + + + + + - + - + - - - - - - + - - - - - - + + + - diff -Nru seahorse-3.2.2/src/seahorse-key-manager.xml seahorse-3.6.3/src/seahorse-key-manager.xml --- seahorse-3.2.2/src/seahorse-key-manager.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-key-manager.xml 2012-11-12 08:32:13.000000000 +0100 @@ -1,356 +1,302 @@ - + - + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 640 476 True + False True + False False + True 0 - - True - - - - - - False - 1 - - - - + True True - 3 - - - True - True - 3 - automatic - - - True - True - 12 - True - - - - - - - - - - True - 3 - _Passwords - True - - - False - - - + True - True - 3 - automatic + False - - True - True - 12 - True - - - - + - 1 - - - - - True - 3 - My _Personal Keys - True - - - 1 - False + False + False - - True - True - 3 - automatic - - - True - True - 12 - True - - - - - - - - 2 - - - - + True - 3 - Other _Keys - True - - - 2 - False - - - - - 2 - - - - - True - 0 - 0 - - - 12 - 6 + False + vertical - + True - 0 - 6 - <big><b>First time options:</b></big> - True + False + + + False - False + True 0 - + True + True + + + True + True + 12 + 12 + True + + + + + + + + - False + True + True 1 - + True - 6 - 3 - 2 - 12 - 6 - - - gtk-new - True - True - False - True - - - - 1 - 2 - 2 - 3 - - - - - - - True - 0 - Generate a new key of your own: - - - 2 - 3 - - - - + False + 0 + 0 - - True - True - True - True - True - False - + + False + 12 + 6 + + + True + False + 0 + 6 + <big><b>First time options:</b></big> + True + + + False + False + 0 + + + + + True + False + + + False + True + 1 + + - + True - 0 - 0 + False + 6 + 3 + 2 + 12 + 6 - + + gtk-new True - 2 - - - True - gtk-open - - - False - False - 0 - - + True + True + False + True + + + + 1 + 2 + 2 + 3 + + + + + + + True + False + 0 + Generate a new key of your own: + + + 2 + 3 + + + + + + + True + True + True + True + True + False + - + True - _Import - True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-open + + + False + False + 0 + + + + + True + False + _Import + True + + + False + False + 1 + + + + - - False - False - 1 - + + 1 + 2 + 1 + 2 + + + + + + + True + False + 0 + Import existing keys from a file: + + + 1 + 2 + + + + + + + gtk-help + True + True + True + True + True + False + True + + + + 1 + 2 + + + + + + + True + False + 0 + To get started with encryption you will need keys. + True + + + + + + + True + True + 2 + - - 1 - 2 - 1 - 2 - - - - - - - True - 0 - Import existing keys from a file: - - - 1 - 2 - - - - - - - gtk-help - True - True - True - True - True - False - True - - - - 1 - 2 - - - - - - - True - 0 - To get started with encryption you will need keys. - True - - - - - + False + False 2 - - - - False - False - 3 - - - - - True - - - True - 0.10000000149 - - False - False - 0 - - - - - True - - - 1 + True + False - False - 4 + True + True + 1 diff -Nru seahorse-3.2.2/src/seahorse-keyserver-results.c seahorse-3.6.3/src/seahorse-keyserver-results.c --- seahorse-3.2.2/src/seahorse-keyserver-results.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-results.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,591 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-keyserver-results.h" -#include "seahorse-key-manager-store.h" -#include "seahorse-windows.h" - -#include "seahorse-progress.h" - -#include - -#include - -gboolean on_key_list_button_pressed (GtkTreeView* view, - GdkEventButton* event, - SeahorseKeyserverResults* self); - -gboolean on_key_list_popup_menu (GtkTreeView* view, - SeahorseKeyserverResults* self); - -enum { - PROP_0, - PROP_SEARCH, - PROP_SELECTED -}; - -struct _SeahorseKeyserverResultsPrivate { - char *search_string; - GtkTreeView *view; - GtkActionGroup *object_actions; - SeahorseKeyManagerStore *store; - SeahorseSet *objects; - SeahorseObjectPredicate pred; - GSettings *settings; -}; - -G_DEFINE_TYPE (SeahorseKeyserverResults, seahorse_keyserver_results, SEAHORSE_TYPE_VIEWER); - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - - -static gboolean -on_filter_objects (SeahorseObject *obj, SeahorseKeyserverResults *self) -{ - const gchar *match; - gboolean ret = FALSE; - gchar* value; - gsize n_value, n_match; - - g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); - g_return_val_if_fail (SEAHORSE_IS_OBJECT (obj), FALSE); - - match = self->pv->search_string; - if (g_utf8_strlen (match, -1) == 0) - ret = TRUE; - - /* Match against the label */ - if (ret != TRUE) { - value = g_utf8_casefold (seahorse_object_get_label (obj), -1); - ret = strstr (value, match) != NULL; - g_free (value); - } - - /* Match against the key identifier */ - if (ret != TRUE) { - if (strncmp (match, "0x", 2) == 0) - match += 2; - value = g_utf8_casefold (seahorse_object_get_identifier (obj), -1); - - /* Only compare as many bytes as exist in the key id */ - n_value = strlen (value); - n_match = strlen (match); - if (n_value > n_match) - match += (n_value - n_match); - ret = strstr (value, match) != NULL; - - g_free (value); - } - - return ret; -} - - -static gboolean -fire_selection_changed (SeahorseKeyserverResults* self) -{ - gint rows; - GtkTreeSelection* selection; - g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); - - selection = gtk_tree_view_get_selection (self->pv->view); - rows = gtk_tree_selection_count_selected_rows (selection); - seahorse_viewer_set_numbered_status (SEAHORSE_VIEWER (self), ngettext ("Selected %d key", "Selected %d keys", rows), rows); - if (self->pv->object_actions) - gtk_action_group_set_sensitive (self->pv->object_actions, rows > 0); - g_signal_emit_by_name (G_OBJECT (SEAHORSE_VIEW (self)), "selection-changed"); - return FALSE; -} - -/** -* selection: -* self: the results object -* -* Adds fire_selection_changed as idle function -* -**/ -static void -on_view_selection_changed (GtkTreeSelection *selection, SeahorseKeyserverResults *self) -{ - g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); - g_return_if_fail (GTK_IS_TREE_SELECTION (selection)); - g_idle_add ((GSourceFunc)fire_selection_changed, self); -} - -static void -on_row_activated (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *column, SeahorseKeyserverResults *self) -{ - SeahorseObject *obj; - - g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); - g_return_if_fail (GTK_IS_TREE_VIEW (view)); - g_return_if_fail (path != NULL); - g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column)); - - obj = seahorse_key_manager_store_get_object_from_path (view, path); - if (obj != NULL) - seahorse_viewer_show_properties (SEAHORSE_VIEWER (self), obj); -} - -G_MODULE_EXPORT gboolean -on_key_list_button_pressed (GtkTreeView* view, GdkEventButton* event, SeahorseKeyserverResults* self) -{ - g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); - g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE); - if (event->button == 3) - seahorse_viewer_show_context_menu (SEAHORSE_VIEWER (self), event->button, event->time); - return FALSE; -} - -G_MODULE_EXPORT gboolean -on_key_list_popup_menu (GtkTreeView* view, SeahorseKeyserverResults* self) -{ - SeahorseObject* key; - - g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); - g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE); - - key = seahorse_viewer_get_selected (SEAHORSE_VIEWER (self)); - if (key == NULL) - return FALSE; - seahorse_viewer_show_context_menu (SEAHORSE_VIEWER (self), 0, gtk_get_current_event_time ()); - return TRUE; -} - -/** -* action: -* self: The result object to expand the nodes in -* -* Expands all the nodes in the view of the object -* -**/ -static void -on_view_expand_all (GtkAction* action, SeahorseKeyserverResults* self) -{ - g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - gtk_tree_view_expand_all (self->pv->view); -} - - -/** -* action: -* self: The result object to collapse the nodes in -* -* Collapses all the nodes in the view of the object -* -**/ -static void -on_view_collapse_all (GtkAction* action, SeahorseKeyserverResults* self) - -{ - g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - gtk_tree_view_collapse_all (self->pv->view); -} - -/** -* action: the closing action or NULL -* self: The SeahorseKeyServerResults widget to destroy -* -* destroys the widget -* -**/ -static void -on_app_close (GtkAction* action, SeahorseKeyserverResults* self) -{ - g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); - g_return_if_fail (action == NULL || GTK_IS_ACTION (action)); - seahorse_widget_destroy (SEAHORSE_WIDGET (self)); -} - -static void -on_remote_find (GtkAction* action, SeahorseKeyserverResults* self) -{ - g_return_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - seahorse_keyserver_search_show (seahorse_viewer_get_window (SEAHORSE_VIEWER (self))); -} - - - -/** -* widget: sending widget -* event: ignored -* self: The SeahorseKeyserverResults widget to destroy -* -* When this window closes we quit seahorse -* -* Returns TRUE on success -**/ -static gboolean -on_delete_event (GtkWidget* widget, GdkEvent* event, SeahorseKeyserverResults* self) -{ - g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE); - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - on_app_close (NULL, self); - return TRUE; -} - -static const GtkActionEntry GENERAL_ENTRIES[] = { - { "remote-menu", NULL, N_("_Remote") }, - { "app-close", GTK_STOCK_CLOSE, NULL, "W", - N_("Close this window"), G_CALLBACK (on_app_close) }, - { "view-expand-all", GTK_STOCK_ADD, N_("_Expand All"), NULL, - N_("Expand all listings"), G_CALLBACK (on_view_expand_all) }, - { "view-collapse-all", GTK_STOCK_REMOVE, N_("_Collapse All"), NULL, - N_("Collapse all listings"), G_CALLBACK (on_view_collapse_all) } -}; - -static const GtkActionEntry SERVER_ENTRIES[] = { - { "remote-find", GTK_STOCK_FIND, N_("_Find Remote Keys..."), "", - N_("Search for keys on a key server"), G_CALLBACK (on_remote_find) } -}; - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static GList* -seahorse_keyserver_results_get_selected_objects (SeahorseViewer* base) -{ - SeahorseKeyserverResults * self = SEAHORSE_KEYSERVER_RESULTS (base); - return seahorse_key_manager_store_get_selected_objects (self->pv->view); -} - -static void -seahorse_keyserver_results_set_selected_objects (SeahorseViewer* base, GList* keys) -{ - SeahorseKeyserverResults * self = SEAHORSE_KEYSERVER_RESULTS (base); - seahorse_key_manager_store_set_selected_objects (self->pv->view, keys); -} - -static SeahorseObject* -seahorse_keyserver_results_get_selected (SeahorseViewer* base) -{ - SeahorseKeyserverResults* self; - self = SEAHORSE_KEYSERVER_RESULTS (base); - return seahorse_key_manager_store_get_selected_object (self->pv->view); -} - -static void -seahorse_keyserver_results_set_selected (SeahorseViewer* base, SeahorseObject* value) -{ - SeahorseKeyserverResults* self = SEAHORSE_KEYSERVER_RESULTS (base); - GList* keys = NULL; - - if (value != NULL) - keys = g_list_prepend (keys, value); - - seahorse_viewer_set_selected_objects (SEAHORSE_VIEWER (self), keys); - g_list_free (keys);; - g_object_notify (G_OBJECT (self), "selected"); -} - - -/** -* type: The type identifying this object -* n_props: Number of properties -* props: Properties -* -* Creates a new SeahorseKeyserverResults object, shows the resulting window -* -* Returns The SeahorseKeyserverResults object as GObject -**/ -static GObject* -seahorse_keyserver_results_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (G_OBJECT_CLASS (seahorse_keyserver_results_parent_class)->constructor(type, n_props, props)); - GtkActionGroup* actions; - GtkTreeSelection *selection; - GtkWindow *window; - char* title; - - g_return_val_if_fail (self, NULL); - - - if (g_utf8_strlen (self->pv->search_string, -1) == 0) { - title = g_strdup (_("Remote Keys")); - } else { - title = g_strdup_printf (_ ("Remote Keys Containing '%s'"), self->pv->search_string); - } - - window = seahorse_viewer_get_window (SEAHORSE_VIEWER (self)); - gtk_window_set_title (window, title); - g_free (title); - - g_signal_connect (window, "delete-event", G_CALLBACK (on_delete_event), self); - - actions = gtk_action_group_new ("general"); - gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (actions, GENERAL_ENTRIES, G_N_ELEMENTS (GENERAL_ENTRIES), self); - seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), actions); - - actions = gtk_action_group_new ("keyserver"); - gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (actions, SERVER_ENTRIES, G_N_ELEMENTS (SERVER_ENTRIES), self); - seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), actions); - - /* init key list & selection settings */ - self->pv->view = GTK_TREE_VIEW (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "key_list")); - selection = gtk_tree_view_get_selection (self->pv->view); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); - g_signal_connect_object (selection, "changed", G_CALLBACK (on_view_selection_changed), self, 0); - g_signal_connect_object (self->pv->view, "row-activated", G_CALLBACK (on_row_activated), self, 0); - g_signal_connect_object (self->pv->view, "button-press-event", G_CALLBACK (on_key_list_button_pressed), self, 0); - g_signal_connect_object (self->pv->view, "popup-menu", G_CALLBACK (on_key_list_popup_menu), self, 0); - gtk_widget_realize (GTK_WIDGET (self->pv->view)); - - /* Set focus to the current key list */ - gtk_widget_grab_focus (GTK_WIDGET (self->pv->view)); - - /* To avoid flicker */ - seahorse_viewer_ensure_updated (SEAHORSE_VIEWER (self)); - seahorse_widget_show (SEAHORSE_WIDGET (SEAHORSE_VIEWER (self))); - - /* Our predicate for filtering keys */ - self->pv->pred.tag = g_quark_from_string ("openpgp"); - self->pv->pred.location = SEAHORSE_LOCATION_REMOTE; - self->pv->pred.custom = (SeahorseObjectPredicateFunc)on_filter_objects; - self->pv->pred.custom_target = self; - - /* Our set all nicely filtered */ - self->pv->objects = seahorse_set_new_full (&self->pv->pred); - self->pv->store = seahorse_key_manager_store_new (self->pv->objects, self->pv->view, - self->pv->settings); - on_view_selection_changed (selection, self); - - return G_OBJECT (self); -} - -/** -* self: The SeahorseKeyserverResults object to init -* -* Inits the results object -* -**/ -static void -seahorse_keyserver_results_init (SeahorseKeyserverResults *self) -{ - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResultsPrivate); - self->pv->settings = g_settings_new ("org.gnome.seahorse.manager"); -} - -/** -* obj: SeahorseKeyserverResults object -* -* Finalize the results object -* -**/ -static void -seahorse_keyserver_results_finalize (GObject *obj) -{ - SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (obj); - - g_free (self->pv->search_string); - self->pv->search_string = NULL; - - if (self->pv->object_actions) - g_object_unref (self->pv->object_actions); - self->pv->object_actions = NULL; - - if (self->pv->objects) - g_object_unref (self->pv->objects); - self->pv->objects = NULL; - - if (self->pv->store) - g_object_unref (self->pv->store); - self->pv->store = NULL; - - if (self->pv->view) - gtk_tree_view_set_model (self->pv->view, NULL); - self->pv->view = NULL; - - g_clear_object (&self->pv->settings); - - G_OBJECT_CLASS (seahorse_keyserver_results_parent_class)->finalize (obj); -} - -/** -* obj: The SeahorseKeyserverResults object to set -* prop_id: Property to set -* value: Value of this property -* pspec: GParamSpec for the warning -* -* Supported properties are PROP_SEARCH and PROP_SELECTED -* -**/ -static void -seahorse_keyserver_results_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (obj); - const gchar* str; - - switch (prop_id) { - case PROP_SEARCH: - /* Many key servers ignore spaces at the beginning and end, so we do too */ - str = g_value_get_string (value); - if (!str) - str = ""; - self->pv->search_string = g_strstrip (g_utf8_casefold (str, -1)); - break; - - case PROP_SELECTED: - seahorse_viewer_set_selected (SEAHORSE_VIEWER (self), g_value_get_object (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -/** -* obj: The SeahorseKeyserverResults object to get properties from -* prop_id: the ide of the property to get -* value: Value returned -* pspec: GParamSpec for the warning -* -* Supported properties: PROP_SEARCH and PROP_SELECTED -* -**/ -static void -seahorse_keyserver_results_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (obj); - - switch (prop_id) { - case PROP_SEARCH: - g_value_set_string (value, seahorse_keyserver_results_get_search (self)); - break; - case PROP_SELECTED: - g_value_set_object (value, seahorse_viewer_get_selected (SEAHORSE_VIEWER (self))); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -/** -* klass: The SeahorseKeyserverResultsClass -* -* Inits the class -* -**/ -static void -seahorse_keyserver_results_class_init (SeahorseKeyserverResultsClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_keyserver_results_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorseKeyserverResultsPrivate)); - - gobject_class->constructor = seahorse_keyserver_results_constructor; - gobject_class->finalize = seahorse_keyserver_results_finalize; - gobject_class->set_property = seahorse_keyserver_results_set_property; - gobject_class->get_property = seahorse_keyserver_results_get_property; - - SEAHORSE_VIEWER_CLASS (klass)->get_selected_objects = seahorse_keyserver_results_get_selected_objects; - SEAHORSE_VIEWER_CLASS (klass)->set_selected_objects = seahorse_keyserver_results_set_selected_objects; - SEAHORSE_VIEWER_CLASS (klass)->get_selected = seahorse_keyserver_results_get_selected; - SEAHORSE_VIEWER_CLASS (klass)->set_selected = seahorse_keyserver_results_set_selected; - - g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SEARCH, - g_param_spec_string ("search", "search", "search", NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_override_property (G_OBJECT_CLASS (klass), PROP_SELECTED, "selected"); -} - -static void -on_search_completed (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseKeyserverResults *self = SEAHORSE_KEYSERVER_RESULTS (user_data); - GError *error = NULL; - - seahorse_context_search_remote_finish (seahorse_context_instance (), - result, &error); - if (error != NULL) { - seahorse_viewer_set_status (SEAHORSE_VIEWER (self), error->message); - g_error_free (error); - } - - g_object_unref (self); -} -/** - * seahorse_keyserver_results_show: - * @parent: A GTK window as parent (or NULL) - * @search_text: The test to search for - * - * Creates a search results window and adds the operation to it's progress status. - * - */ -void -seahorse_keyserver_results_show (const char* search_text) -{ - SeahorseKeyserverResults* self; - GCancellable *cancellable; - - g_return_if_fail (search_text != NULL); - - self = g_object_new (SEAHORSE_TYPE_KEYSERVER_RESULTS, - "name", "keyserver-results", - "search", search_text, - NULL); - - /* Destorys itself with destroy */ - g_object_ref_sink (self); - - cancellable = g_cancellable_new (); - seahorse_context_search_remote_async (seahorse_context_instance (), - search_text, cancellable, - on_search_completed, - g_object_ref (self)); - - seahorse_progress_attach (cancellable, SEAHORSE_WIDGET (self)); - - g_object_unref (cancellable); -} - -/** - * seahorse_keyserver_results_get_search: - * @self: SeahorseKeyserverResults object to get the search string from - * - * - * - * Returns: The search string in from the results - */ -const gchar* -seahorse_keyserver_results_get_search (SeahorseKeyserverResults* self) -{ - g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), NULL); - return self->pv->search_string; -} diff -Nru seahorse-3.2.2/src/seahorse-keyserver-results.h seahorse-3.6.3/src/seahorse-keyserver-results.h --- seahorse-3.2.2/src/seahorse-keyserver-results.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-results.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_KEYSERVER_RESULTS_H__ -#define __SEAHORSE_KEYSERVER_RESULTS_H__ - -#include -#include -#include - -#include "seahorse-viewer.h" -#include "seahorse-object.h" - -G_BEGIN_DECLS - - -#define SEAHORSE_TYPE_KEYSERVER_RESULTS (seahorse_keyserver_results_get_type ()) -#define SEAHORSE_KEYSERVER_RESULTS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResults)) -#define SEAHORSE_KEYSERVER_RESULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResultsClass)) -#define SEAHORSE_IS_KEYSERVER_RESULTS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEYSERVER_RESULTS)) -#define SEAHORSE_IS_KEYSERVER_RESULTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEYSERVER_RESULTS)) -#define SEAHORSE_KEYSERVER_RESULTS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEYSERVER_RESULTS, SeahorseKeyserverResultsClass)) - -typedef struct _SeahorseKeyserverResults SeahorseKeyserverResults; -typedef struct _SeahorseKeyserverResultsClass SeahorseKeyserverResultsClass; -typedef struct _SeahorseKeyserverResultsPrivate SeahorseKeyserverResultsPrivate; - -struct _SeahorseKeyserverResults { - SeahorseViewer parent_instance; - SeahorseKeyserverResultsPrivate *pv; -}; - -struct _SeahorseKeyserverResultsClass { - SeahorseViewerClass parent_class; -}; - -GType seahorse_keyserver_results_get_type (void); - -void seahorse_keyserver_results_show (const gchar *search_text); - -const gchar* seahorse_keyserver_results_get_search (SeahorseKeyserverResults* self); - - -G_END_DECLS - -#endif diff -Nru seahorse-3.2.2/src/seahorse-keyserver-results.ui seahorse-3.6.3/src/seahorse-keyserver-results.ui --- seahorse-3.2.2/src/seahorse-keyserver-results.ui 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-results.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru seahorse-3.2.2/src/seahorse-keyserver-results.xml seahorse-3.6.3/src/seahorse-keyserver-results.xml --- seahorse-3.2.2/src/seahorse-keyserver-results.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-results.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ - - - - - - True - window1 - 640 - 476 - - - True - - - True - - - - - - False - 0 - - - - - True - - - - - - False - 1 - - - - - True - 1 - - - True - True - automatic - - - True - True - 12 - True - - - - - - - 0 - - - - - True - - - True - 0.10000000149 - - - False - False - 0 - - - - - True - - - 1 - - - - - False - 1 - - - - - 2 - - - - - - diff -Nru seahorse-3.2.2/src/seahorse-keyserver-search.c seahorse-3.6.3/src/seahorse-keyserver-search.c --- seahorse-3.2.2/src/seahorse-keyserver-search.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-search.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,498 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2004-2005 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -#include "seahorse-context.h" -#include "seahorse-dns-sd.h" -#include "seahorse-preferences.h" -#include "seahorse-servers.h" -#include "seahorse-util.h" -#include "seahorse-widget.h" - -#include "seahorse-keyserver-results.h" -#include "seahorse-windows.h" - -/** - * SECTION:seahorse-keyserver-search - * @short_description: Contains the functions to start a search for keys on a - * keyserver. - **/ - -void on_keyserver_search_control_changed (GtkWidget *widget, - SeahorseWidget *swidget); - -void on_keyserver_search_ok_clicked (GtkButton *button, - SeahorseWidget *swidget); - -/** - * KeyserverSelection: - * @names: A list of keyserver names - * @uris: A list of keyserver URIs - * @all: TRUE if all keyservers are selected - **/ -typedef struct _KeyserverSelection { - GPtrArray *names; - GPtrArray *uris; - gboolean all; -} KeyserverSelection; - - -/* Selection Retrieval ------------------------------------------------------ */ - -/** - * widget: CHECK_BUTTON widget to read - * selection: will be updated depending on the state of the widget - * - * Adds the name/uri of the checked widget to the selection - * - **/ -static void -get_checks (GtkWidget *widget, KeyserverSelection *selection) -{ - const gchar *value; - - if (!GTK_IS_CHECK_BUTTON (widget)) - return; - - /* Pull in the selected name and uri */ - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - value = gtk_button_get_label (GTK_BUTTON (widget)); - g_ptr_array_add (selection->names, g_strdup (value)); - value = g_object_get_data (G_OBJECT (widget), "keyserver-uri"); - g_ptr_array_add (selection->uris, g_strdup (value)); - - /* Note that not all checks are selected */ - } else { - selection->all = FALSE; - } -} - -/** - * swidget: the window/main widget - * - * extracts all keyservers in the sub-widgets "key-server-list" and - * "shared-keys-list" and fills a KeyserverSelection structure. - * - * returns the selection - **/ -static KeyserverSelection* -get_keyserver_selection (SeahorseWidget *swidget) -{ - KeyserverSelection *selection; - GtkWidget *widget; - - selection = g_new0 (KeyserverSelection, 1); - selection->all = TRUE; - selection->uris = g_ptr_array_new_with_free_func (g_free); - selection->names = g_ptr_array_new_with_free_func (g_free); - - /* Key servers */ - widget = seahorse_widget_get_widget (swidget, "key-server-list"); - g_return_val_if_fail (widget != NULL, selection); - gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback)get_checks, selection); - - /* Shared Key */ - widget = seahorse_widget_get_widget (swidget, "shared-keys-list"); - g_return_val_if_fail (widget != NULL, selection); - gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback)get_checks, selection); - - g_ptr_array_add (selection->uris, NULL); - g_ptr_array_add (selection->names, NULL); - - return selection; -} - -/** - * selection: The selection to free - * - * All data (string lists, structures) are freed - * - **/ -static void -free_keyserver_selection (KeyserverSelection *selection) -{ - if (selection) { - g_ptr_array_free (selection->uris, TRUE); - g_ptr_array_free (selection->names, TRUE); - g_free (selection); - } -} - -/** - * widget: a CHECK_BUTTON - * checked: out- TRUE if the button is active, stays the same else. - * - **/ -static void -have_checks (GtkWidget *widget, gboolean *checked) -{ - if (GTK_IS_CHECK_BUTTON (widget)) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - *checked = TRUE; - } -} - -/** - * swidget: sub widgets in here will be checked - * - * returns TRUE if at least one of the CHECK_BUTTONS in "key-server-list" or - * "shared-keys-list" is TRUE - **/ -static gboolean -have_keyserver_selection (SeahorseWidget *swidget) -{ - GtkWidget *w; - gboolean checked = FALSE; - - /* Key servers */ - w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "key-server-list")); - g_return_val_if_fail (w != NULL, FALSE); - gtk_container_foreach (GTK_CONTAINER (w), (GtkCallback)have_checks, &checked); - - /* Shared keys */ - w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "shared-keys-list")); - g_return_val_if_fail (w != NULL, FALSE); - gtk_container_foreach (GTK_CONTAINER (w), (GtkCallback)have_checks, &checked); - - return checked; -} - -/** - * on_keyserver_search_control_changed: - * @widget: ignored - * @swidget: main widget - * - * - * Enables the "search" button if the edit-field contains text and at least a - * server is selected - */ -G_MODULE_EXPORT void -on_keyserver_search_control_changed (GtkWidget *widget, SeahorseWidget *swidget) -{ - gboolean enabled = TRUE; - GtkWidget *w; - gchar *text; - - /* Need to have at least one key server selected ... */ - if (!have_keyserver_selection (swidget)) - enabled = FALSE; - - /* ... and some search text */ - else { - w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "search-text")); - text = gtk_editable_get_chars (GTK_EDITABLE (w), 0, -1); - if (!text || !text[0]) - enabled = FALSE; - g_free (text); - } - - w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "search")); - gtk_widget_set_sensitive (w, enabled); -} - -/* Initial Selection -------------------------------------------------------- */ - -static void -foreach_child_select_checks (GtkWidget *widget, gpointer user_data) -{ - gchar **names = user_data; - gboolean checked; - gchar *name; - guint i; - - if (GTK_IS_CHECK_BUTTON (widget)) { - name = g_utf8_casefold (gtk_button_get_label (GTK_BUTTON (widget)), -1); - checked = names != NULL && names[0] != NULL ? FALSE : TRUE; - for (i = 0; names && names[i] != NULL; i++) { - if (g_utf8_collate (names[i], name) == 0) { - checked = TRUE; - break; - } - } - g_free (name); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), checked); - } -} - -/** - * swidget: the main widget - * - * Reads key servers from settings and updates the UI content. - * - **/ -static void -select_inital_keyservers (SeahorseWidget *swidget) -{ - gchar **names; - GtkWidget *widget; - gchar *name; - guint i; - - names = g_settings_get_strv (seahorse_context_settings (NULL), "last-search-servers"); - - /* Close the expander if all servers are selected */ - widget = seahorse_widget_get_widget (swidget, "search-where"); - g_return_if_fail (widget != NULL); - gtk_expander_set_expanded (GTK_EXPANDER (widget), names != NULL && names[0] != NULL); - - /* We do case insensitive matches */ - for (i = 0; names[i] != NULL; i++) { - name = g_utf8_casefold (names[i], -1); - g_free (names[i]); - names[i] = name; - } - - widget = seahorse_widget_get_widget (swidget, "key-server-list"); - g_return_if_fail (widget != NULL); - gtk_container_foreach (GTK_CONTAINER (widget), foreach_child_select_checks, names); - - widget = seahorse_widget_get_widget (swidget, "shared-keys-list"); - g_return_if_fail (widget != NULL); - gtk_container_foreach (GTK_CONTAINER (widget), foreach_child_select_checks, names); -} - -/* Populating Lists --------------------------------------------------------- */ - -/** - * widget: a check button - * unchecked: a hash table containing the state of the servers - * - * If the button is not checked, the hash table entry associate with it will be - * replaced with "" - * - **/ -static void -remove_checks (GtkWidget *widget, GHashTable *unchecked) -{ - if (GTK_IS_CHECK_BUTTON (widget)) { - - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) - g_hash_table_replace (unchecked, - g_strdup (gtk_button_get_label (GTK_BUTTON (widget))), ""); - - gtk_widget_destroy (widget); - } -} - -/** -* swidget: the main widget -* box: the GTK_CONTAINER with the checkboxes -* uris: the uri list of the keyservers -* names: the keyserver names -* -* Updates the box and adds checkboxes containing names/uris. The check-status -* of already existing check boxes is not changed. -**/ -static void -populate_keyserver_list (SeahorseWidget *swidget, GtkWidget *box, gchar **uris, - gchar **names) -{ - GtkContainer *cont = GTK_CONTAINER (box); - GHashTable *unchecked; - gboolean any = FALSE; - GtkWidget *check; - guint i; - - /* Remove all checks, and note which ones were unchecked */ - unchecked = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - gtk_container_foreach (cont, (GtkCallback)remove_checks, unchecked); - - /* Now add the new ones back */ - for (i = 0; uris && uris[i] && names && names[i]; i++) { - any = TRUE; - - /* A new checkbox with this the name as the label */ - check = gtk_check_button_new_with_label (names[i]); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), - g_hash_table_lookup (unchecked, names[i]) == NULL); - g_signal_connect (check, "toggled", G_CALLBACK (on_keyserver_search_control_changed), swidget); - gtk_widget_show (check); - - /* Save URI and set it as the tooltip */ - g_object_set_data_full (G_OBJECT (check), "keyserver-uri", g_strdup (uris[i]), g_free); - gtk_widget_set_tooltip_text (check, uris[i]); - - gtk_container_add (cont, check); - } - - g_hash_table_destroy (unchecked); - - /* Only display the container if we had some checks */ - if (any) - gtk_widget_show (box); - else - gtk_widget_hide (box); -} - -static void -on_settings_keyservers_changed (GSettings *settings, const gchar *key, gpointer user_data) -{ - SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - GtkWidget *widget; - gchar **keyservers; - gchar **names; - - widget = seahorse_widget_get_widget (swidget, "key-server-list"); - g_return_if_fail (widget != NULL); - - keyservers = seahorse_servers_get_uris (); - names = seahorse_servers_get_names (); - populate_keyserver_list (swidget, widget, keyservers, names); - - g_strfreev (keyservers); - g_strfreev (names); -} - -/** -* ssd: the SeahorseServiceDiscovery. List-data is read from there -* name: ignored -* swidget: The SeahorseWidget -* -* refreshes the "shared-keys-list" -* -**/ -static void -refresh_shared_keys (SeahorseServiceDiscovery *ssd, const gchar *name, SeahorseWidget *swidget) -{ - gchar **keyservers; - gchar **names; - GtkWidget *widget; - - widget = seahorse_widget_get_widget (swidget, "shared-keys-list"); - g_return_if_fail (widget != NULL); - - names = seahorse_service_discovery_list (ssd); - keyservers = seahorse_service_discovery_get_uris (ssd, (const gchar **)names); - populate_keyserver_list (swidget, widget, keyservers, names); - - g_strfreev (keyservers); - g_strfreev (names); -} - -/* -------------------------------------------------------------------------- */ - -/** - * on_keyserver_search_ok_clicked: - * @button: ignored - * @swidget: The SeahorseWidget to work with - * - * Extracts data, stores it in settings and starts a search using the entered - * search data. - * - * This function gets the things done - */ -G_MODULE_EXPORT void -on_keyserver_search_ok_clicked (GtkButton *button, SeahorseWidget *swidget) -{ - KeyserverSelection *selection; - const gchar *search; - GtkWidget *widget; - - widget = seahorse_widget_get_widget (swidget, "search-text"); - g_return_if_fail (widget != NULL); - - /* Get search text and save it for next time */ - search = gtk_entry_get_text (GTK_ENTRY (widget)); - g_return_if_fail (search != NULL && search[0] != 0); - g_settings_set_string (seahorse_context_settings (NULL), "last-search-text", search); - - /* The keyservers to search, and save for next time */ - selection = get_keyserver_selection (swidget); - g_return_if_fail (selection->uris != NULL); - g_settings_set_strv (seahorse_context_settings (NULL), "last-search-servers", - selection->all ? NULL : (const gchar * const*)selection->uris->pdata); - - /* Open the new result window */ - seahorse_keyserver_results_show (search); - - free_keyserver_selection (selection); - seahorse_widget_destroy (swidget); -} - -/** -* widget: ignored -* swidget: the SeahorseWidget to remove the signals from -* -* Disconnects the added/removed signals -* -**/ -static void -cleanup_signals (GtkWidget *widget, SeahorseWidget *swidget) -{ - SeahorseServiceDiscovery *ssd = seahorse_context_get_discovery (SCTX_APP()); - g_signal_handlers_disconnect_by_func (ssd, refresh_shared_keys, swidget); -} - - -/** - * seahorse_keyserver_search_show: - * @parent: the parent window to connect this window to - * - * Shows a remote search window. - * - * Returns: the new window. - */ -GtkWindow* -seahorse_keyserver_search_show (GtkWindow *parent) -{ - SeahorseServiceDiscovery *ssd; - SeahorseWidget *swidget; - GtkWindow *window; - GtkWidget *widget; - GSettings *settings; - gchar *search; - - swidget = seahorse_widget_new ("keyserver-search", parent); - g_return_val_if_fail (swidget != NULL, NULL); - - window = GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)); - - widget = seahorse_widget_get_widget (swidget, "search-text"); - g_return_val_if_fail (widget != NULL, window); - - search = g_settings_get_string (seahorse_context_settings (NULL), - "last-search-text"); - if (search != NULL) { - gtk_entry_set_text (GTK_ENTRY (widget), search); - gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); - g_free (search); - } - - /* The key servers to list */ - settings = seahorse_context_pgp_settings (NULL); - on_settings_keyservers_changed (settings, "keyservers", swidget); - g_signal_connect_object (settings, "changed::keyservers", - G_CALLBACK (on_settings_keyservers_changed), swidget, 0); - - /* Any shared keys to list */ - ssd = seahorse_context_get_discovery (NULL); - refresh_shared_keys (ssd, NULL, swidget); - g_signal_connect (ssd, "added", G_CALLBACK (refresh_shared_keys), swidget); - g_signal_connect (ssd, "removed", G_CALLBACK (refresh_shared_keys), swidget); - g_signal_connect (window, "destroy", G_CALLBACK (cleanup_signals), swidget); - - select_inital_keyservers (swidget); - on_keyserver_search_control_changed (NULL, swidget); - - return window; -} diff -Nru seahorse-3.2.2/src/seahorse-keyserver-search.xml seahorse-3.6.3/src/seahorse-keyserver-search.xml --- seahorse-3.2.2/src/seahorse-keyserver-search.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-search.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,243 +0,0 @@ - - - - - - gtk-find - 4 - - - True - 5 - Find Remote Keys - False - center-on-parent - dialog - True - center - - - - True - 2 - - - True - 5 - 12 - - - True - 12 - - - True - gtk-find - 5 - - - False - 0 - - - - - True - 0 - 0 - This will find keys for others on the Internet. These keys can then be imported into your local key ring. - True - - - False - False - 1 - - - - - False - False - 0 - - - - - True - 12 - - - True - 4 - _Search for keys containing: - True - search-text - - - False - False - 0 - - - - - True - True - True - - - - - - 1 - - - - - False - 1 - - - - - True - True - - - 135 - True - True - never - automatic - etched-out - - - True - - - True - - - True - 6 - - - True - 0 - <b>Key Servers:</b> - True - - - False - False - 0 - - - - - False - False - 0 - - - - - True - 6 - - - True - 0 - <b>Shared Keys Near Me:</b> - True - - - False - False - 0 - - - - - False - False - 1 - - - - - - - - - - - True - Where to search: - True - True - - - - - 2 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - - False - False - 0 - - - - - True - True - True - True - False - search-image - _Search - True - - - - False - False - 1 - - - - - False - end - 0 - - - - - - button3 - search - - - diff -Nru seahorse-3.2.2/src/seahorse-keyserver-sync.c seahorse-3.6.3/src/seahorse-keyserver-sync.c --- seahorse-3.2.2/src/seahorse-keyserver-sync.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-sync.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,249 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2005 Stefan Walter - * Copyright (C) 2011 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, write to the - * Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -#include - -#include "seahorse-context.h" -#include "seahorse-keyserver-sync.h" -#include "seahorse-object.h" -#include "seahorse-progress.h" -#include "seahorse-preferences.h" -#include "seahorse-servers.h" -#include "seahorse-transfer.h" -#include "seahorse-util.h" -#include "seahorse-widget.h" -#include "seahorse-windows.h" - -void on_sync_ok_clicked (GtkButton *button, - SeahorseWidget *swidget); - -void on_sync_configure_clicked (GtkButton *button, - SeahorseWidget *swidget); - -static void -on_transfer_upload_complete (GObject *object, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseSource *source = SEAHORSE_SOURCE (user_data); - GError *error = NULL; - gchar *publish_to; - - if (!seahorse_context_transfer_objects_finish (SEAHORSE_CONTEXT (object), - result, &error)) { - publish_to = g_settings_get_string (seahorse_context_settings (NULL), - "server-publish-to"); - seahorse_util_handle_error (&error, NULL, - _("Couldn't publish keys to server"), publish_to); - g_free (publish_to); - } - - g_object_unref (source); -} - -static void -on_transfer_download_complete (GObject *object, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseSource *source = SEAHORSE_SOURCE (user_data); - GError *error = NULL; - gchar *keyserver; - - if (!seahorse_transfer_finish (result, &error)) { - g_object_get (source, "key-server", &keyserver, NULL); - seahorse_util_handle_error (&error, NULL, - _("Couldn't retrieve keys from server: %s"), keyserver); - g_free (keyserver); - } - - g_object_unref (source); -} - -G_MODULE_EXPORT void -on_sync_ok_clicked (GtkButton *button, SeahorseWidget *swidget) -{ - GList *keys; - - keys = (GList*)g_object_get_data (G_OBJECT (swidget), "publish-keys"); - keys = g_list_copy (keys); - - seahorse_widget_destroy (swidget); - - seahorse_keyserver_sync (keys); - g_list_free (keys); -} - -G_MODULE_EXPORT void -on_sync_configure_clicked (GtkButton *button, SeahorseWidget *swidget) -{ - seahorse_preferences_show (GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)), "keyserver-tab"); -} - -static void -update_message (SeahorseWidget *swidget) -{ - GtkWidget *widget; - GtkWidget *widget2; - GtkWidget *sync_button; - gchar *text; - - widget = seahorse_widget_get_widget (swidget, "publish-message"); - widget2 = seahorse_widget_get_widget (swidget, "sync-message"); - sync_button = seahorse_widget_get_widget (swidget, "sync-button"); - - text = g_settings_get_string (seahorse_context_settings (NULL), - "server-publish-to"); - if (text && text[0]) { - gtk_widget_show (widget); - gtk_widget_hide (widget2); - gtk_widget_set_sensitive (sync_button, TRUE); - } else { - gtk_widget_hide (widget); - gtk_widget_show (widget2); - gtk_widget_set_sensitive (sync_button, FALSE); - } - g_free (text); -} - -static void -on_settings_publish_to_changed (GSettings *settings, const gchar *key, gpointer user_data) -{ - SeahorseWidget *swidget = SEAHORSE_WIDGET (user_data); - update_message (swidget); -} - -/** - * seahorse_keyserver_sync_show - * @keys: The keys to synchronize - * - * Shows a synchronize window. - * - * Returns the new window. - **/ -GtkWindow* -seahorse_keyserver_sync_show (GList *keys, GtkWindow *parent) -{ - SeahorseWidget *swidget; - GtkWindow *win; - GtkWidget *w; - guint n; - gchar *t; - - swidget = seahorse_widget_new_allow_multiple ("keyserver-sync", parent); - g_return_val_if_fail (swidget != NULL, NULL); - - win = GTK_WINDOW (seahorse_widget_get_widget (swidget, swidget->name)); - - /* The details message */ - n = g_list_length (keys); - t = g_strdup_printf (ngettext ("%d key is selected for synchronizing", - "%d keys are selected for synchronizing", n), n); - - w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "detail-message")); - g_return_val_if_fail (swidget != NULL, win); - gtk_label_set_markup (GTK_LABEL (w), t); - g_free (t); - - /* The right help message */ - update_message (swidget); - g_signal_connect_object (seahorse_context_settings (NULL), "changed::server-publish-to", - G_CALLBACK (on_settings_publish_to_changed), swidget, 0); - - keys = g_list_copy (keys); - g_return_val_if_fail (!keys || SEAHORSE_IS_OBJECT (keys->data), win); - g_object_set_data_full (G_OBJECT (swidget), "publish-keys", keys, - (GDestroyNotify)g_list_free); - - return win; -} - -void -seahorse_keyserver_sync (GList *keys) -{ - SeahorseSource *source; - SeahorseSource *local_source; - gchar *keyserver; - GList *k, *keyids = NULL; - GCancellable *cancellable; - gchar **keyservers; - guint i; - - if (!keys) - return; - - /* Build a keyid list */ - for (k = keys; k != NULL; k = g_list_next (k)) - keyids = g_list_prepend (keyids, - GUINT_TO_POINTER (seahorse_object_get_id (k->data))); - - cancellable = g_cancellable_new (); - - /* And now synchronizing keys from the servers */ - keyservers = seahorse_servers_get_uris (); - for (i = 0; keyservers[i] != NULL; i++) { - source = seahorse_context_remote_source (seahorse_context_instance (), - keyservers[i]); - - /* This can happen if the URI scheme is not supported */ - if (source == NULL) - continue; - - local_source = seahorse_context_find_source (seahorse_context_instance (), - seahorse_source_get_tag (source), - SEAHORSE_LOCATION_LOCAL); - - if (local_source) { - seahorse_transfer_async (source, local_source, keyids, - cancellable, on_transfer_download_complete, - g_object_ref (source)); - } - } - - g_strfreev (keyservers); - - /* Publishing keys online */ - keyserver = g_settings_get_string (seahorse_context_settings (NULL), - "server-publish-to"); - if (keyserver && keyserver[0]) { - source = seahorse_context_remote_source (seahorse_context_instance (), - keyserver); - - /* This can happen if the URI scheme is not supported */ - if (source != NULL) { - - seahorse_context_transfer_objects_async (seahorse_context_instance (), - keys, source, cancellable, - on_transfer_upload_complete, - g_object_ref (source)); - } - } - - g_free (keyserver); - - g_list_free (keyids); - - seahorse_progress_show (cancellable, _("Synchronizing keys..."), FALSE); - g_object_unref (cancellable); -} diff -Nru seahorse-3.2.2/src/seahorse-keyserver-sync.h seahorse-3.6.3/src/seahorse-keyserver-sync.h --- seahorse-3.2.2/src/seahorse-keyserver-sync.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-sync.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2006 Adam Schreiber - * - * 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 __SEAHORSE_KEYSERVER_SYNC_H__ -#define __SEAHORSE_KEYSERVER_SYNC_H__ - -void seahorse_keyserver_sync (GList *keys); - -#endif diff -Nru seahorse-3.2.2/src/seahorse-keyserver-sync.xml seahorse-3.6.3/src/seahorse-keyserver-sync.xml --- seahorse-3.2.2/src/seahorse-keyserver-sync.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-keyserver-sync.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,180 +0,0 @@ - - - - - - gtk-properties - - - gtk-refresh - - - True - 5 - Sync Keys - center - dialog - - - True - 2 - - - True - 5 - 12 - - - True - 12 - - - True - 0 - 0 - gtk-network - 5 - - - False - 0 - - - - - True - 12 - - - True - 0 - 0 - This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys. - True - - - False - False - 0 - - - - - 0 - 0 - This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others. - True - - - False - False - 1 - - - - - True - 0 - 0 - - True - True - - - False - False - 2 - - - - - False - False - 1 - - - - - False - False - 0 - - - - - False - 1 - - - - - True - end - - - _Key Servers - True - True - True - False - configure-image - True - - - - False - False - 0 - - - - - gtk-cancel - True - True - True - False - True - - - - False - False - 1 - - - - - _Sync - True - True - True - True - True - False - sync-image - True - - - - False - False - 2 - - - - - False - end - 0 - - - - - - configure - button3 - sync-button - - - diff -Nru seahorse-3.2.2/src/seahorse-main.c seahorse-3.6.3/src/seahorse-main.c --- seahorse-3.2.2/src/seahorse-main.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-main.c 2012-11-12 08:32:13.000000000 +0100 @@ -22,97 +22,46 @@ #include "config.h" +#include "seahorse-application.h" #include "seahorse-cleanup.h" -#include "seahorse-context.h" -#include "seahorse-gtkstock.h" #include "seahorse-registry.h" -#include "seahorse-secure-memory.h" #include "seahorse-util.h" #include "seahorse-key-manager.h" -#ifdef WITH_PGP -#include "pgp/seahorse-pgp-module.h" -#endif - -#ifdef WITH_SSH -#include "ssh/seahorse-ssh-module.h" -#endif - -#ifdef WITH_PKCS11 -#include "pkcs11/seahorse-pkcs11-module.h" -#endif - -#include "gkr/seahorse-gkr-module.h" +#include #include #include - -#include -static gboolean show_version = FALSE; +static void +on_application_activate (GApplication *application, + gpointer user_data) +{ + seahorse_key_manager_show (); +} /* Initializes context and preferences, then loads key manager */ int main (int argc, char **argv) { - static GOptionEntry options[] = { - { "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL }, - { NULL, 0, 0, 0, NULL, NULL, NULL } - }; - GError *error = NULL; - int ret = 0; + GtkApplication *application; + int status; - g_thread_init (NULL); - - seahorse_secure_memory_init (); - #ifdef ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); -#endif - - if (!gtk_init_with_args (&argc, &argv, _("Passwords and Keys"), options, GETTEXT_PACKAGE, &error)) { - g_printerr ("seahorse: %s\n", error->message); - g_error_free (error); - exit (1); - } - - if (show_version) { - g_print ("%s\n", PACKAGE_STRING); - g_print ("GNUPG: %s (%d.%d.%d)\n", GNUPG, GPG_MAJOR, GPG_MINOR, GPG_MICRO); - exit (1); - } - - /* Insert Icons into Stock */ - seahorse_gtkstock_init (); - - /* Make the default SeahorseContext */ - seahorse_context_create (); - - /* Initialize the various components */ -#ifdef WITH_PGP - seahorse_pgp_module_init (); -#endif -#ifdef WITH_SSH - seahorse_ssh_module_init (); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); #endif -#ifdef WITH_PKCS11 - seahorse_pkcs11_module_init (); -#endif - seahorse_gkr_module_init (); - - seahorse_key_manager_show (); - /* Start the refreshing of the keys */ - seahorse_context_refresh_auto (NULL); + g_type_init (); - g_signal_connect_after (SCTX_APP (), "destroy", gtk_main_quit, NULL); - - gtk_main (); + application = seahorse_application_new (); + g_signal_connect (application, "activate", G_CALLBACK (on_application_activate), NULL); + status = g_application_run (G_APPLICATION (application), argc, argv); + seahorse_cleanup_perform (); + g_object_unref (application); - seahorse_cleanup_perform (); - return ret; + return status; } diff -Nru seahorse-3.2.2/src/seahorse-preferences.c seahorse-3.6.3/src/seahorse-preferences.c --- seahorse-3.2.2/src/seahorse-preferences.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-preferences.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2003 Jacob Perkins - * Copyright (C) 2005 Jacob Perkins - * - * 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 "seahorse-prefs.h" -#include "seahorse-preferences.h" -#include "seahorse-widget.h" - -/** - * seahorse_preferences_show: - * @tabid: The id of the tab to show - * - * Creates a new or shows the current preferences dialog. - **/ -void -seahorse_preferences_show (GtkWindow *parent, const gchar *tabid) -{ - SeahorseWidget *swidget = seahorse_prefs_new (parent); - GtkWidget *tab; - - if (tabid) { - tab = seahorse_widget_get_widget (swidget, tabid); - g_return_if_fail (tab); - seahorse_prefs_select_tab (swidget, tab); - } -} diff -Nru seahorse-3.2.2/src/seahorse-preferences.h seahorse-3.6.3/src/seahorse-preferences.h --- seahorse-3.2.2/src/seahorse-preferences.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-preferences.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2003 Jacob Perkins - * - * 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 __SEAHORSE_PREFERENCES_H__ -#define __SEAHORSE_PREFERENCES_H__ - -#include - -#define LISTING_SCHEMAS SEAHORSE_SCHEMAS "/listing" -#define SHOW_VALIDITY_KEY LISTING_SCHEMAS "/show_validity" -#define SHOW_EXPIRES_KEY LISTING_SCHEMAS "/show_expires" -#define SHOW_TRUST_KEY LISTING_SCHEMAS "/show_trust" -#define SHOW_LENGTH_KEY LISTING_SCHEMAS "/show_length" -#define SHOW_TYPE_KEY LISTING_SCHEMAS "/show_type" - -void seahorse_preferences_show (GtkWindow *parent, const gchar *tabid); - -#endif /* __SEAHORSE_PREFERENCES_H__ */ diff -Nru seahorse-3.2.2/src/seahorse-sidebar.c seahorse-3.6.3/src/seahorse-sidebar.c --- seahorse-3.2.2/src/seahorse-sidebar.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-sidebar.c 2012-11-09 17:31:45.000000000 +0100 @@ -0,0 +1,1603 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "seahorse-sidebar.h" + +#include "seahorse-action.h" +#include "seahorse-actions.h" +#include "seahorse-backend.h" +#include "seahorse-deletable.h" +#include "seahorse-interaction.h" +#include "seahorse-lockable.h" +#include "seahorse-place.h" +#include "seahorse-util.h" +#include "seahorse-viewable.h" + +#include "gkr/seahorse-gkr.h" +#include "pgp/seahorse-pgp.h" +#include "pkcs11/seahorse-pkcs11.h" +#include "ssh/seahorse-ssh.h" + +#include + +struct _SeahorseSidebar { + GtkScrolledWindow parent; + + GtkTreeView *tree_view; + + GtkListStore *store; + GPtrArray *backends; + GcrUnionCollection *objects; + + /* The selection */ + GHashTable *selection; + gboolean combined; + gboolean updating; + + /* A set of chosen uris, used with settings */ + GHashTable *chosen; + + /* Action icons */ + GdkPixbuf *pixbuf_lock; + GdkPixbuf *pixbuf_unlock; + GdkPixbuf *pixbuf_lock_l; + GdkPixbuf *pixbuf_unlock_l; + GtkTreePath *action_highlight_path; + GtkCellRenderer *action_cell_renderer; + gint action_button_size; + GtkAccelGroup *accel_group; + + guint update_places_sig; +}; + +struct _SeahorseSidebarClass { + GtkScrolledWindowClass parent_class; +}; + +#define ACTION_BUTTON_XPAD 6 + +enum { + PROP_0, + PROP_COLLECTION, + PROP_COMBINED, + PROP_SELECTED_URIS +}; + +typedef enum { + TYPE_BACKEND, + TYPE_PLACE, +} RowType; + +enum { + SIDEBAR_ROW_TYPE, + SIDEBAR_ICON, + SIDEBAR_LABEL, + SIDEBAR_TOOLTIP, + SIDEBAR_EDITABLE, + SIDEBAR_CATEGORY, + SIDEBAR_COLLECTION, + SIDEBAR_URI, + SIDEBAR_N_COLUMNS +}; + +static GType column_types[] = { + G_TYPE_UINT, + 0 /* later */, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_BOOLEAN, + G_TYPE_STRING, + 0 /* later */, + G_TYPE_STRING +}; + +enum { + CONTEXT_MENU, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0, }; + +G_DEFINE_TYPE (SeahorseSidebar, seahorse_sidebar, GTK_TYPE_SCROLLED_WINDOW); + +static void +seahorse_sidebar_init (SeahorseSidebar *self) +{ + g_assert (SIDEBAR_N_COLUMNS == G_N_ELEMENTS (column_types)); + column_types[SIDEBAR_ICON] = G_TYPE_ICON; + column_types[SIDEBAR_COLLECTION] = GCR_TYPE_COLLECTION; + self->store = gtk_list_store_newv (SIDEBAR_N_COLUMNS, column_types); + + self->backends = g_ptr_array_new_with_free_func (g_object_unref); + self->selection = g_hash_table_new (g_direct_hash, g_direct_equal); + self->objects = GCR_UNION_COLLECTION (gcr_union_collection_new ()); + self->chosen = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + self->accel_group = gtk_accel_group_new (); +} + +static guchar +lighten_component (guchar cur_value) +{ + int new_value = cur_value + 24 + (cur_value >> 3); + return (new_value > 255) ? (guchar)255 : (guchar)new_value; +} + +static GdkPixbuf * +create_spotlight_pixbuf (GdkPixbuf* src) +{ + GdkPixbuf *dest; + int i, j; + int width, height, has_alpha, src_row_stride, dst_row_stride; + guchar *target_pixels, *original_pixels; + guchar *pixsrc, *pixdest; + + dest = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src), + gdk_pixbuf_get_has_alpha (src), + gdk_pixbuf_get_bits_per_sample (src), + gdk_pixbuf_get_width (src), + gdk_pixbuf_get_height (src)); + + has_alpha = gdk_pixbuf_get_has_alpha (src); + width = gdk_pixbuf_get_width (src); + height = gdk_pixbuf_get_height (src); + dst_row_stride = gdk_pixbuf_get_rowstride (dest); + src_row_stride = gdk_pixbuf_get_rowstride (src); + target_pixels = gdk_pixbuf_get_pixels (dest); + original_pixels = gdk_pixbuf_get_pixels (src); + + for (i = 0; i < height; i++) { + pixdest = target_pixels + i * dst_row_stride; + pixsrc = original_pixels + i * src_row_stride; + for (j = 0; j < width; j++) { + *pixdest++ = lighten_component (*pixsrc++); + *pixdest++ = lighten_component (*pixsrc++); + *pixdest++ = lighten_component (*pixsrc++); + if (has_alpha) { + *pixdest++ = *pixsrc++; + } + } + } + return dest; +} + +static void +ensure_sidebar_pixbufs (SeahorseSidebar *self) +{ + GtkIconInfo *icon_info; + GIcon *icon; + GtkIconTheme *icon_theme; + GtkStyleContext *style; + gint height; + + if (self->pixbuf_lock && + self->pixbuf_lock_l && + self->pixbuf_unlock_l && + self->pixbuf_unlock) + return; + + icon_theme = gtk_icon_theme_get_default (); + style = gtk_widget_get_style_context (GTK_WIDGET (self)); + if (!gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &self->action_button_size, &height)) + self->action_button_size = 16; + + /* Lock icon */ + icon = g_themed_icon_new_with_default_fallbacks ("changes-prevent-symbolic"); + icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, self->action_button_size, GTK_ICON_LOOKUP_GENERIC_FALLBACK); + g_return_if_fail (icon_info != NULL); + if (!self->pixbuf_lock) + self->pixbuf_lock = gtk_icon_info_load_symbolic_for_context (icon_info, style, NULL, NULL); + if (!self->pixbuf_lock_l) + self->pixbuf_lock_l = create_spotlight_pixbuf (self->pixbuf_lock); + gtk_icon_info_free (icon_info); + g_object_unref (icon); + + /* Unlock icon */ + icon = g_themed_icon_new_with_default_fallbacks ("changes-allow-symbolic"); + icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, self->action_button_size, GTK_ICON_LOOKUP_GENERIC_FALLBACK); + g_return_if_fail (icon_info != NULL); + if (!self->pixbuf_unlock) + self->pixbuf_unlock = gtk_icon_info_load_symbolic_for_context (icon_info, style, NULL, NULL); + if (!self->pixbuf_unlock_l) + self->pixbuf_unlock_l = create_spotlight_pixbuf (self->pixbuf_unlock); + gtk_icon_info_free (icon_info); + g_object_unref (icon); +} + +static void +invalidate_sidebar_pixbufs (SeahorseSidebar *self) +{ + g_clear_object (&self->pixbuf_lock); + g_clear_object (&self->pixbuf_unlock); + g_clear_object (&self->pixbuf_lock_l); + g_clear_object (&self->pixbuf_unlock_l); +} + +static void +next_or_append_row (GtkListStore *store, + GtkTreeIter *iter, + const gchar *category, + GcrCollection *collection) +{ + GcrCollection *row_collection; + gchar *row_category; + gboolean found; + + /* + * We try to keep the same row in order to preserve checked state + * and selections. So if the next row matches the values we want to + * set on it, then just keep that row. + * + * This is complicated by the fact that the first row being inserted + * doesn't have a valid iter, and we don't have a standard way to + * detect that an iter isn't valid. + */ + + /* A marker that tells us the iter is not yet valid */ + if (iter->stamp == GPOINTER_TO_INT (iter) && iter->user_data3 == iter && + iter->user_data2 == iter && iter->user_data == iter) { + if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), iter)) + gtk_list_store_append (store, iter); + return; + } + + if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), iter)) { + gtk_list_store_append (store, iter); + return; + } + + for (;;) { + gtk_tree_model_get (GTK_TREE_MODEL (store), iter, + SIDEBAR_CATEGORY, &row_category, + SIDEBAR_COLLECTION, &row_collection, + -1); + + found = (g_strcmp0 (row_category, category) == 0 && row_collection == collection); + + g_free (row_category); + g_clear_object (&row_collection); + + if (found) + return; + + if (!gtk_list_store_remove (store, iter)) { + gtk_list_store_append (store, iter); + return; + } + } +} + +static void +update_backend (SeahorseSidebar *self, + GcrCollection *backend, + GtkTreeIter *iter) +{ + GList *collections, *l; + GtkActionGroup *actions; + GParamSpec *spec; + gchar *category; + gchar *tooltip; + gchar *label; + GIcon *icon = NULL; + gchar *uri; + + collections = gcr_collection_get_objects (backend); + + /* Ignore categories that have nothing */ + if (collections == NULL) + return; + + g_object_get (backend, + "name", &category, + "label", &label, + "description", &tooltip, + NULL); + + next_or_append_row (self->store, iter, category, GCR_COLLECTION (backend)); + gtk_list_store_set (self->store, iter, + SIDEBAR_ROW_TYPE, TYPE_BACKEND, + SIDEBAR_CATEGORY, category, + SIDEBAR_LABEL, label, + SIDEBAR_TOOLTIP, tooltip, + SIDEBAR_EDITABLE, FALSE, + SIDEBAR_COLLECTION, backend, + -1); + + g_free (label); + g_free (tooltip); + + for (l = collections; l != NULL; l = g_list_next (l)) { + label = tooltip = NULL; + g_object_get (l->data, + "label", &label, + "description", &tooltip, + "icon", &icon, + "uri", &uri, + "actions", &actions, + NULL); + + spec = g_object_class_find_property (G_OBJECT_GET_CLASS (l->data), "label"); + g_return_if_fail (spec != NULL); + + next_or_append_row (self->store, iter, category, l->data); + gtk_list_store_set (self->store, iter, + SIDEBAR_ROW_TYPE, TYPE_PLACE, + SIDEBAR_CATEGORY, category, + SIDEBAR_LABEL, label, + SIDEBAR_TOOLTIP, tooltip, + SIDEBAR_ICON, icon, + SIDEBAR_EDITABLE, (spec->flags & G_PARAM_WRITABLE) ? TRUE : FALSE, + SIDEBAR_COLLECTION, l->data, + SIDEBAR_URI, uri, + -1); + g_clear_object (&icon); + g_free (label); + g_free (tooltip); + g_free (uri); + } + + g_free (category); + g_list_free (collections); +} + +static void +update_objects_in_collection (SeahorseSidebar *self, + gboolean update_chosen) +{ + GList *collections; + gboolean include; + gboolean have; + gboolean changed = FALSE; + gchar *uri; + GList *l; + guint i; + + /* Updating collection is blocked */ + if (self->updating) + return; + + for (i = 0; i < self->backends->len; i++) { + collections = gcr_collection_get_objects (self->backends->pdata[i]); + for (l = collections; l != NULL; l = g_list_next (l)) { + + include = g_hash_table_lookup (self->selection, l->data) != NULL; + + if (update_chosen) { + g_object_get (l->data, "uri", &uri, NULL); + have = g_hash_table_lookup (self->chosen, uri) != NULL; + if (include && !have) { + g_hash_table_insert (self->chosen, g_strdup (uri), ""); + changed = TRUE; + } else if (!include && have) { + g_hash_table_remove (self->chosen, uri); + changed = TRUE; + } + g_free (uri); + } + + /* Combined overrides and shows all objects */ + if (self->combined) + include = TRUE; + + have = gcr_union_collection_have (self->objects, l->data); + if (include && !have) + gcr_union_collection_add (self->objects, l->data); + else if (!include && have) + gcr_union_collection_remove (self->objects, l->data); + } + g_list_free (collections); + } + + if (update_chosen && changed) + g_object_notify (G_OBJECT (self), "selected-uris"); +} + +static void +for_each_selected_place_row (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + GcrCollection *collection; + GHashTable *selected = user_data; + + gtk_tree_model_get (model, iter, SIDEBAR_COLLECTION, &collection, -1); + if (collection != NULL) { + g_hash_table_insert (selected, collection, collection); + g_object_unref (collection); + } +} + +static void +update_objects_for_selection (SeahorseSidebar *self, + GtkTreeSelection *selection) +{ + GHashTable *selected; + + if (self->updating) + return; + + selected = g_hash_table_new (g_direct_hash, g_direct_equal); + gtk_tree_selection_selected_foreach (selection, for_each_selected_place_row, selected); + + g_hash_table_destroy (self->selection); + self->selection = selected; + + if (!self->combined) + update_objects_in_collection (self, TRUE); +} + +static void +update_objects_for_combine (SeahorseSidebar *self, + gboolean combine) +{ + if (self->combined != combine) { + self->combined = combine; + update_objects_in_collection (self, FALSE); + } +} + +static void +update_objects_for_chosen (SeahorseSidebar *self, + GHashTable *chosen) +{ + GtkTreeIter iter; + GtkTreeModel *model; + GcrCollection *collection; + gchar *uri; + GtkTreeSelection *selection; + + self->updating = TRUE; + + model = GTK_TREE_MODEL (self->store); + selection = gtk_tree_view_get_selection (self->tree_view); + + /* Update the display */ + if (gtk_tree_model_get_iter_first (model, &iter)) { + do { + gtk_tree_model_get (model, &iter, + SIDEBAR_COLLECTION, &collection, + SIDEBAR_URI, &uri, + -1); + + if (collection && uri) { + if (g_hash_table_lookup (chosen, uri)) + gtk_tree_selection_select_iter (selection, &iter); + else + gtk_tree_selection_unselect_iter (selection, &iter); + } + + g_clear_object (&collection); + g_free (uri); + } while (gtk_tree_model_iter_next (model, &iter)); + } + + self->updating = FALSE; + update_objects_for_selection (self, selection); +} + +static void +update_places (SeahorseSidebar *self) +{ + GtkTreeIter iter; + guint i; + + /* A marker that tells us the iter is not yet valid */ + iter.stamp = GPOINTER_TO_INT (&iter); + iter.user_data3 = iter.user_data2 = iter.user_data = &iter; + + for (i = 0; i < self->backends->len; i++) + update_backend (self, GCR_COLLECTION (self->backends->pdata[i]), &iter); + + /* Update selection */ + update_objects_for_chosen (self, self->chosen); + + if (self->combined) + update_objects_in_collection (self, FALSE); +} + +static gboolean +on_idle_update_places (gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + + self->update_places_sig = 0; + update_places (self); + + return FALSE; /* don't call again */ +} + +static void +update_places_later (SeahorseSidebar *self) +{ + if (!self->update_places_sig) + self->update_places_sig = g_idle_add (on_idle_update_places, self); +} + +static SeahorseLockable * +lookup_lockable_for_iter (GtkTreeModel *model, + GtkTreeIter *iter) +{ + GcrCollection *collection; + + gtk_tree_model_get (model, iter, + SIDEBAR_COLLECTION, &collection, + -1); + + if (collection == NULL) + return NULL; + + if (!SEAHORSE_IS_LOCKABLE (collection)) { + g_object_unref (collection); + return NULL; + } + + return SEAHORSE_LOCKABLE (collection); +} + +static void +on_cell_renderer_action_icon (GtkTreeViewColumn *column, + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + gboolean highlight = FALSE; + GtkTreePath *path; + GdkPixbuf *pixbuf = NULL; + SeahorseLockable *lockable; + gboolean can_lock = FALSE; + gboolean can_unlock = FALSE; + + lockable = lookup_lockable_for_iter (model, iter); + + if (lockable) { + can_lock = seahorse_lockable_can_lock (lockable); + can_unlock = seahorse_lockable_can_unlock (lockable); + } + + if (can_lock || can_unlock) { + ensure_sidebar_pixbufs (self); + + pixbuf = NULL; + highlight = FALSE; + + if (self->action_highlight_path) { + path = gtk_tree_model_get_path (model, iter); + highlight = gtk_tree_path_compare (path, self->action_highlight_path) == 0; + gtk_tree_path_free (path); + } + + if (can_lock) + pixbuf = highlight ? self->pixbuf_unlock : self->pixbuf_unlock_l; + else + pixbuf = highlight ? self->pixbuf_lock : self->pixbuf_lock_l; + + g_object_set (cell, + "visible", TRUE, + "pixbuf", pixbuf, + NULL); + } else { + g_object_set (cell, + "visible", FALSE, + "pixbuf", NULL, + NULL); + } + + g_clear_object (&lockable); +} + +static void +on_cell_renderer_heading_visible (GtkTreeViewColumn *column, + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ + RowType type; + gtk_tree_model_get (model, iter, + SIDEBAR_ROW_TYPE, &type, + -1); + g_object_set (cell, + "visible", (type == TYPE_BACKEND), + NULL); +} + +static void +on_padding_cell_renderer (GtkTreeViewColumn *column, + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ + RowType type; + gtk_tree_model_get (model, iter, + SIDEBAR_ROW_TYPE, &type, + -1); + + if (type == TYPE_BACKEND) { + g_object_set (cell, + "visible", FALSE, + "xpad", 0, + "ypad", 0, + NULL); + } else { + g_object_set (cell, + "visible", TRUE, + "xpad", 3, + "ypad", 3, + NULL); + } +} + +static void +on_cell_renderer_heading_not_visible (GtkTreeViewColumn *column, + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ + RowType type; + gtk_tree_model_get (model, iter, + SIDEBAR_ROW_TYPE, &type, + -1); + g_object_set (cell, + "visible", (type != TYPE_BACKEND), + NULL); +} + +static gboolean +on_tree_selection_validate (GtkTreeSelection *selection, + GtkTreeModel *model, + GtkTreePath *path, + gboolean path_currently_selected, + gpointer user_data) +{ + GtkTreeIter iter; + RowType row_type; + + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, + SIDEBAR_ROW_TYPE, &row_type, + -1); + if (row_type == TYPE_BACKEND) + return FALSE; + + return TRUE; +} + +static void +on_tree_selection_changed (GtkTreeSelection *selection, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + update_objects_for_selection (self, selection); +} + +static void +on_place_changed (GObject *obj, + GParamSpec *spec, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + update_places_later (self); +} + +static void +on_backend_changed (GObject *obj, + GParamSpec *spec, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + update_places_later (self); +} + +static void +on_place_added (GcrCollection *places, + GObject *place, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + g_signal_connect (place, "notify", G_CALLBACK (on_place_changed), self); + update_places_later (self); +} + +static void +on_place_removed (GcrCollection *places, + GObject *object, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + g_signal_handlers_disconnect_by_func (object, on_place_changed, self); + update_places_later (self); +} + +static gint +order_from_backend (GObject *backend) +{ + gchar *name; + gint order; + + g_object_get (backend, "name", &name, NULL); + + if (name == NULL) + order = 10; + else if (g_str_equal (name, SEAHORSE_GKR_NAME)) + order = 0; + else if (g_str_equal (name, SEAHORSE_PGP_NAME)) + order = 1; + else if (g_str_equal (name, SEAHORSE_PKCS11_NAME)) + order = 2; + else if (g_str_equal (name, SEAHORSE_SSH_NAME)) + order = 3; + else + order = 10; + + g_free (name); + return order; +} + +static gint +on_sort_backends (gconstpointer a, + gconstpointer b) +{ + gint ordera = order_from_backend (G_OBJECT (*((gpointer *)a))); + gint orderb = order_from_backend (G_OBJECT (*((gpointer *)b))); + return ordera - orderb; +} + +static void +load_backends (SeahorseSidebar *self) +{ + GList *backends, *l; + GList *places, *p; + + backends = seahorse_backend_get_registered (); + for (l = backends; l != NULL; l = g_list_next (l)) { + g_ptr_array_add (self->backends, l->data); + g_signal_connect (l->data, "added", G_CALLBACK (on_place_added), self); + g_signal_connect (l->data, "removed", G_CALLBACK (on_place_removed), self); + g_signal_connect (l->data, "notify", G_CALLBACK (on_backend_changed), self); + + places = gcr_collection_get_objects (l->data); + for (p = places; p != NULL; p = g_list_next (p)) + on_place_added (l->data, p->data, self); + g_list_free (places); + } + g_ptr_array_sort (self->backends, on_sort_backends); + g_list_free (backends); +} + +static void +on_place_locked (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GtkWindow *parent = GTK_WINDOW (user_data); + GError *error = NULL; + + if (!seahorse_lockable_lock_finish (SEAHORSE_LOCKABLE (source), result, &error)) + seahorse_util_handle_error (&error, parent, _("Couldn't lock")); + + g_object_unref (parent); +} + +static void +place_lock (SeahorseLockable *lockable, + GtkWindow *window) +{ + GCancellable *cancellable = g_cancellable_new (); + GTlsInteraction *interaction = seahorse_interaction_new (window); + + seahorse_lockable_lock_async (lockable, interaction, cancellable, + on_place_locked, g_object_ref (window)); + + g_object_unref (cancellable); + g_object_unref (interaction); +} + +static void +on_place_lock (GtkMenuItem *item, + gpointer user_data) +{ + SeahorseLockable *lockable = SEAHORSE_LOCKABLE (user_data); + GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (item)); + place_lock (lockable, GTK_WINDOW (window)); +} + +static void +on_place_unlocked (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GtkWindow *parent = GTK_WINDOW (user_data); + GError *error = NULL; + + if (!seahorse_lockable_unlock_finish (SEAHORSE_LOCKABLE (source), result, &error)) + seahorse_util_handle_error (&error, parent, _("Couldn't unlock")); + + g_object_unref (parent); +} + + + +static void +place_unlock (SeahorseLockable *lockable, + GtkWindow *window) +{ + GCancellable *cancellable = g_cancellable_new (); + GTlsInteraction *interaction = seahorse_interaction_new (window); + + seahorse_lockable_unlock_async (lockable, interaction, cancellable, + on_place_unlocked, g_object_ref (window)); + + g_object_unref (cancellable); + g_object_unref (interaction); +} + +static void +on_place_unlock (GtkMenuItem *item, + gpointer user_data) +{ + SeahorseLockable *lockable = SEAHORSE_LOCKABLE (user_data); + GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (item)); + place_unlock (lockable, GTK_WINDOW (window)); +} + +static void +on_place_deleted (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GtkWindow *parent = GTK_WINDOW (user_data); + GError *error = NULL; + + if (!seahorse_deleter_delete_finish (SEAHORSE_DELETER (source), result, &error)) + seahorse_util_handle_error (&error, parent, _("Couldn't delete")); + + g_object_unref (parent); +} + +static void +on_place_delete (GtkMenuItem *item, + gpointer user_data) +{ + SeahorseDeletable *deletable = SEAHORSE_DELETABLE (user_data); + GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (item)); + SeahorseDeleter *deleter; + + deleter = seahorse_deletable_create_deleter (deletable); + + if (seahorse_deleter_prompt (deleter, GTK_WINDOW (window))) + seahorse_deleter_delete_async (deleter, NULL, on_place_deleted, + g_object_ref (window)); + + g_object_unref (deleter); +} + +static void +on_place_properties (GtkMenuItem *item, + gpointer user_data) +{ + SeahorseViewable *viewable = SEAHORSE_VIEWABLE (user_data); + GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (item)); + seahorse_viewable_show_viewer (viewable, GTK_WINDOW (window)); +} + +static void +check_widget_visible (GtkWidget *widget, + gpointer data) +{ + gboolean *visible = data; + if (gtk_widget_get_visible (widget)) + *visible = TRUE; +} + +static void +popup_menu_for_place (SeahorseSidebar *self, + SeahorsePlace *place, + guint button, + guint32 activate_time) +{ + GtkActionGroup *actions = NULL; + GtkMenu *menu; + GList *list, *l; + GtkWidget *item; + gboolean visible; + + menu = GTK_MENU (gtk_menu_new ()); + + /* First add all the actions from the collection */ + g_object_get (place, "actions", &actions, NULL); + list = actions ? gtk_action_group_list_actions (actions) : NULL; + if (list) { + for (l = list; l != NULL; l = g_list_next (l)) { + gtk_action_set_accel_group (l->data, self->accel_group); + item = gtk_action_create_menu_item (l->data); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + g_list_free (list); + } + g_clear_object (&actions); + + /* Lock and unlock items */ + if (SEAHORSE_IS_LOCKABLE (place)) { + item = gtk_menu_item_new_with_mnemonic (_("_Lock")); + g_signal_connect (item, "activate", G_CALLBACK (on_place_lock), place); + g_object_bind_property (place, "lockable", item, "visible", G_BINDING_SYNC_CREATE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + item = gtk_menu_item_new_with_mnemonic (_("_Unlock")); + g_signal_connect (item, "activate", G_CALLBACK (on_place_unlock), place); + g_object_bind_property (place, "unlockable", item, "visible", G_BINDING_SYNC_CREATE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + + /* Delete item */ + if (SEAHORSE_IS_DELETABLE (place)) { + item = gtk_image_menu_item_new_with_mnemonic (_("_Delete")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), + gtk_image_new_from_stock (GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU)); + g_signal_connect (item, "activate", G_CALLBACK (on_place_delete), place); + g_object_bind_property (place, "deletable", item, "sensitive", G_BINDING_SYNC_CREATE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); + } + + /* Properties item */ + if (SEAHORSE_IS_VIEWABLE (place)) { + item = gtk_image_menu_item_new_with_mnemonic (_("_Properties")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), + gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU)); + g_signal_connect (item, "activate", G_CALLBACK (on_place_properties), place); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); + } + + visible = FALSE; + gtk_container_foreach (GTK_CONTAINER (menu), check_widget_visible, &visible); + + if (visible) { + gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, activate_time); + gtk_menu_attach_to_widget (menu, GTK_WIDGET (self), NULL); + gtk_widget_show (GTK_WIDGET (menu)); + } else { + gtk_widget_destroy (GTK_WIDGET (menu)); + } +} + +static void +on_tree_view_popup_menu (GtkWidget *widget, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + GtkTreeModel *model = GTK_TREE_MODEL (self->store); + GcrCollection *collection; + GtkTreePath *path; + GtkTreeIter iter; + + gtk_tree_view_get_cursor (self->tree_view, &path, NULL); + if (path == NULL) + return; + + if (!gtk_tree_model_get_iter (model, &iter, path)) + g_return_if_reached (); + gtk_tree_path_free (path); + + gtk_tree_model_get (model, &iter, + SIDEBAR_COLLECTION, &collection, + -1); + + if (SEAHORSE_IS_PLACE (collection)) + popup_menu_for_place (self, SEAHORSE_PLACE (collection), 0, gtk_get_current_event_time ()); + + g_clear_object (&collection); +} + +static void +update_action_buttons_take_path (SeahorseSidebar *self, + GtkTreePath *path) +{ + GtkTreeIter iter; + GtkTreePath *old_path; + GtkTreeModel *model; + + if (path == self->action_highlight_path) { + gtk_tree_path_free (path); + return; + } + + if (path && self->action_highlight_path && + gtk_tree_path_compare (self->action_highlight_path, path) == 0) { + gtk_tree_path_free (path); + return; + } + + old_path = self->action_highlight_path; + self->action_highlight_path = path; + + model = GTK_TREE_MODEL (self->store); + if (self->action_highlight_path) { + if (gtk_tree_model_get_iter (model, &iter, self->action_highlight_path)) + gtk_tree_model_row_changed (model, self->action_highlight_path, &iter); + } + + if (old_path) { + if (gtk_tree_model_get_iter (model, &iter, old_path)) + gtk_tree_model_row_changed (model, old_path, &iter); + gtk_tree_path_free (old_path); + } +} + +static gboolean +over_action_button (SeahorseSidebar *self, + gint x, + gint y, + GtkTreePath **path) +{ + GtkTreeViewColumn *column; + gint width, x_offset, hseparator; + GtkTreeIter iter; + GtkTreeModel *model; + + *path = NULL; + + if (gtk_tree_view_get_path_at_pos (self->tree_view, x, y, path, + &column, NULL, NULL)) { + + model = GTK_TREE_MODEL (self->store); + gtk_tree_model_get_iter (model, &iter, *path); + + gtk_widget_style_get (GTK_WIDGET (self->tree_view), + "horizontal-separator", &hseparator, + NULL); + + /* Reload cell attributes for this particular row */ + gtk_tree_view_column_cell_set_cell_data (column, + model, &iter, FALSE, FALSE); + + gtk_tree_view_column_cell_get_position (column, + self->action_cell_renderer, + &x_offset, &width); + + /* This is kinda weird, but we have to do it to workaround gtk+ expanding + * the eject cell renderer (even thought we told it not to) and we then + * had to set it right-aligned */ + x_offset += width - hseparator - ACTION_BUTTON_XPAD - self->action_button_size; + + if (x - x_offset >= 0 && x - x_offset <= self->action_button_size) + return TRUE; + } + + if (*path != NULL) { + gtk_tree_path_free (*path); + *path = NULL; + } + + return FALSE; +} + +static gboolean +on_tree_view_motion_notify_event (GtkWidget *widget, + GdkEventMotion *event, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + GtkTreePath *path = NULL; + + if (over_action_button (self, event->x, event->y, &path)) { + update_action_buttons_take_path (self, path); + return TRUE; + } + + update_action_buttons_take_path (self, NULL); + return FALSE; +} + +static gboolean +on_tree_view_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + GtkTreeModel *model = GTK_TREE_MODEL (self->store); + GcrCollection *collection; + GtkTreePath *path; + GtkTreeIter iter; + + if (event->button != 3 || event->type != GDK_BUTTON_PRESS) + return FALSE; + + if (!gtk_tree_view_get_path_at_pos (self->tree_view, event->x, event->y, + &path, NULL, NULL, NULL)) + return FALSE; + + gtk_tree_view_set_cursor (self->tree_view, path, NULL, FALSE); + if (!gtk_tree_model_get_iter (model, &iter, path)) + g_return_val_if_reached (FALSE); + gtk_tree_path_free (path); + + gtk_tree_model_get (model, &iter, + SIDEBAR_COLLECTION, &collection, + -1); + + if (SEAHORSE_IS_PLACE (collection)) + popup_menu_for_place (self, SEAHORSE_PLACE (collection), event->button, event->time); + + g_clear_object (&collection); + return TRUE; +} + +static gboolean +on_tree_view_button_release_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (user_data); + SeahorseLockable *lockable; + GtkTreePath *path; + GtkTreeModel *model; + GtkWidget *window; + GtkTreeIter iter; + gboolean ret; + + if (event->type != GDK_BUTTON_RELEASE) + return TRUE; + + if (!over_action_button (self, event->x, event->y, &path)) + return FALSE; + + model = GTK_TREE_MODEL (self->store); + + ret = gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_path_free (path); + + if (!ret) + return FALSE; + + window = gtk_widget_get_toplevel (widget); + ret = FALSE; + + lockable = lookup_lockable_for_iter (model, &iter); + if (lockable) { + if (seahorse_lockable_can_lock (lockable)) + place_lock (lockable, GTK_WINDOW (window)); + else if (seahorse_lockable_can_unlock (lockable)) + place_unlock (lockable, GTK_WINDOW (window)); + } + + return TRUE; +} + +static void +seahorse_sidebar_constructed (GObject *obj) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (obj); + GtkTreeSelection *selection; + GtkTreeViewColumn *col; + GtkTreeView *tree_view; + GtkCellRenderer *cell; + + G_OBJECT_CLASS (seahorse_sidebar_parent_class)->constructed (obj); + + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self)), + GTK_STYLE_CLASS_SIDEBAR); + + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (self), NULL); + gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (self), NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (self), GTK_SHADOW_OUT); + gtk_style_context_set_junction_sides (gtk_widget_get_style_context (GTK_WIDGET (self)), + GTK_JUNCTION_RIGHT | GTK_JUNCTION_LEFT); + + /* tree view */ + tree_view = GTK_TREE_VIEW (gtk_tree_view_new ()); + col = gtk_tree_view_column_new (); + + /* initial padding */ + cell = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, cell, FALSE); + g_object_set (cell, + "xpad", 6, + NULL); + + /* headings */ + cell = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, cell, FALSE); + gtk_tree_view_column_set_attributes (col, cell, + "text", SIDEBAR_LABEL, + NULL); + g_object_set (cell, + "weight", PANGO_WEIGHT_BOLD, + "weight-set", TRUE, + "ypad", 6, + "xpad", 0, + NULL); + gtk_tree_view_column_set_cell_data_func (col, cell, + on_cell_renderer_heading_visible, + self, NULL); + + /* icon padding */ + cell = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, cell, FALSE); + gtk_tree_view_column_set_cell_data_func (col, cell, + on_padding_cell_renderer, + self, NULL); + + /* icon renderer */ + cell = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (col, cell, FALSE); + gtk_tree_view_column_set_attributes (col, cell, + "gicon", SIDEBAR_ICON, + NULL); + gtk_tree_view_column_set_cell_data_func (col, cell, + on_cell_renderer_heading_not_visible, + self, NULL); + + /* normal text renderer */ + cell = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (col, cell, TRUE); + g_object_set (G_OBJECT (cell), "editable", FALSE, NULL); + gtk_tree_view_column_set_attributes (col, cell, + "text", SIDEBAR_LABEL, + NULL); + gtk_tree_view_column_set_cell_data_func (col, cell, + on_cell_renderer_heading_not_visible, + self, NULL); + g_object_set (cell, + "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, + NULL); + + /* lock/unlock icon renderer */ + cell = gtk_cell_renderer_pixbuf_new (); + self->action_cell_renderer = cell; + g_object_set (cell, + "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, + "stock-size", GTK_ICON_SIZE_MENU, + "xpad", ACTION_BUTTON_XPAD, + "xalign", 1.0, + NULL); + gtk_tree_view_column_pack_start (col, cell, FALSE); + gtk_tree_view_column_set_cell_data_func (col, cell, + on_cell_renderer_action_icon, + self, NULL); + + gtk_tree_view_column_set_max_width (GTK_TREE_VIEW_COLUMN (col), 24); + gtk_tree_view_append_column (tree_view, col); + + gtk_tree_view_set_headers_visible (tree_view, FALSE); + gtk_tree_view_set_tooltip_column (tree_view, SIDEBAR_TOOLTIP); + gtk_tree_view_set_search_column (tree_view, SIDEBAR_LABEL); + gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (self->store)); + g_signal_connect (tree_view, "popup-menu", G_CALLBACK (on_tree_view_popup_menu), self); + g_signal_connect (tree_view, "button-press-event", G_CALLBACK (on_tree_view_button_press_event), self); + g_signal_connect (tree_view, "motion-notify-event", G_CALLBACK (on_tree_view_motion_notify_event), self); + g_signal_connect (tree_view, "button-release-event", G_CALLBACK (on_tree_view_button_release_event), self); + gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (tree_view)); + gtk_widget_show (GTK_WIDGET (tree_view)); + self->tree_view = tree_view; + + selection = gtk_tree_view_get_selection (tree_view); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); + gtk_tree_selection_set_select_function (selection, on_tree_selection_validate, self, NULL); + g_signal_connect (selection, "changed", G_CALLBACK (on_tree_selection_changed), self); + + + load_backends (self); +} + +static void +seahorse_sidebar_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (obj); + + switch (prop_id) { + case PROP_COLLECTION: + g_value_set_object (value, seahorse_sidebar_get_collection (self)); + break; + case PROP_COMBINED: + g_value_set_boolean (value, seahorse_sidebar_get_combined (self)); + break; + case PROP_SELECTED_URIS: + g_value_take_boxed (value, seahorse_sidebar_get_selected_uris (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_sidebar_set_property (GObject *obj, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (obj); + + switch (prop_id) { + case PROP_COMBINED: + seahorse_sidebar_set_combined (self, g_value_get_boolean (value)); + break; + case PROP_SELECTED_URIS: + seahorse_sidebar_set_selected_uris (self, g_value_get_boxed (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_sidebar_dispose (GObject *obj) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (obj); + GList *places, *l; + gint i; + + for (i = 0; i < self->backends->len; i++) { + g_signal_handlers_disconnect_by_func (self->backends->pdata[i], on_place_added, self); + g_signal_handlers_disconnect_by_func (self->backends->pdata[i], on_place_removed, self); + g_signal_handlers_disconnect_by_func (self->backends->pdata[i], on_backend_changed, self); + + places = gcr_collection_get_objects (self->backends->pdata[i]); + for (l = places; l != NULL; l = g_list_next (l)) + on_place_removed (self->backends->pdata[i], l->data, self); + g_list_free (places); + } + + invalidate_sidebar_pixbufs (self); + + G_OBJECT_CLASS (seahorse_sidebar_parent_class)->dispose (obj); +} + +static void +seahorse_sidebar_finalize (GObject *obj) +{ + SeahorseSidebar *self = SEAHORSE_SIDEBAR (obj); + + g_hash_table_destroy (self->selection); + g_hash_table_destroy (self->chosen); + g_object_unref (self->objects); + + if (self->update_places_sig) + g_source_remove (self->update_places_sig); + + g_ptr_array_unref (self->backends); + g_object_unref (self->store); + + if (self->action_highlight_path) + gtk_tree_path_free (self->action_highlight_path); + + g_object_unref (self->accel_group); + + G_OBJECT_CLASS (seahorse_sidebar_parent_class)->finalize (obj); +} + +static void +seahorse_sidebar_class_init (SeahorseSidebarClass *klass) +{ + GObjectClass *gobject_class= G_OBJECT_CLASS (klass); + + gobject_class->constructed = seahorse_sidebar_constructed; + gobject_class->dispose = seahorse_sidebar_dispose; + gobject_class->finalize = seahorse_sidebar_finalize; + gobject_class->get_property = seahorse_sidebar_get_property; + gobject_class->set_property = seahorse_sidebar_set_property; + + g_object_class_install_property (gobject_class, PROP_COLLECTION, + g_param_spec_object ("collection", "Collection", "Collection of objects sidebar represents", + GCR_TYPE_COLLECTION, G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, PROP_COMBINED, + g_param_spec_boolean ("combined", "Combined", "Collection shows all objects combined", + FALSE, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_SELECTED_URIS, + g_param_spec_boxed ("selected-uris", "Selected URIs", "URIs selected by the user", + G_TYPE_STRV, G_PARAM_READWRITE)); + + signals[CONTEXT_MENU] = g_signal_new ("context-menu", SEAHORSE_TYPE_SIDEBAR, + G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, + G_TYPE_NONE, 1, GCR_TYPE_COLLECTION); +} + +SeahorseSidebar * +seahorse_sidebar_new (void) +{ + return g_object_new (SEAHORSE_TYPE_SIDEBAR, + NULL); +} + +GcrCollection * +seahorse_sidebar_get_collection (SeahorseSidebar *self) +{ + g_return_val_if_fail (SEAHORSE_IS_SIDEBAR (self), NULL); + return GCR_COLLECTION (self->objects); +} + +gboolean +seahorse_sidebar_get_combined (SeahorseSidebar *self) +{ + g_return_val_if_fail (SEAHORSE_IS_SIDEBAR (self), FALSE); + return self->combined; +} + +void +seahorse_sidebar_set_combined (SeahorseSidebar *self, + gboolean combined) +{ + g_return_if_fail (SEAHORSE_IS_SIDEBAR (self)); + update_objects_for_combine (self, combined); + g_object_notify (G_OBJECT (self), "combined"); +} + +gchar ** +seahorse_sidebar_get_selected_uris (SeahorseSidebar *self) +{ + GHashTableIter iter; + GPtrArray *results; + gchar *uri; + + g_return_val_if_fail (SEAHORSE_IS_SIDEBAR (self), NULL); + + results = g_ptr_array_new (); + g_hash_table_iter_init (&iter, self->chosen); + while (g_hash_table_iter_next (&iter, (gpointer *)&uri, NULL)) + g_ptr_array_add (results, g_strdup (uri)); + g_ptr_array_add (results, NULL); + + return (gchar **)g_ptr_array_free (results, FALSE); +} + +void +seahorse_sidebar_set_selected_uris (SeahorseSidebar *self, + const gchar **value) +{ + GHashTable *chosen; + gint i; + + g_return_if_fail (SEAHORSE_IS_SIDEBAR (self)); + + /* For quick lookups */ + chosen = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + for (i = 0; value != NULL && value[i] != NULL; i++) + g_hash_table_insert (chosen, g_strdup (value[i]), ""); + + update_objects_for_chosen (self, chosen); + g_hash_table_destroy (self->chosen); + self->chosen = chosen; + + g_object_notify (G_OBJECT (self), "selected-uris"); +} + +GList * +seahorse_sidebar_get_selected_places (SeahorseSidebar *self) +{ + GcrCollection *collection; + GtkTreePath *path; + RowType row_type; + GtkTreeIter iter; + GList *places; + + g_return_val_if_fail (SEAHORSE_IS_SIDEBAR (self), NULL); + + places = gcr_union_collection_elements (self->objects); + + gtk_tree_view_get_cursor (self->tree_view, &path, NULL); + if (path != NULL) { + if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (self->store), &iter, path)) + g_return_val_if_reached (NULL); + gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter, + SIDEBAR_ROW_TYPE, &row_type, + SIDEBAR_COLLECTION, &collection, + -1); + + if (collection != NULL) { + if (row_type == TYPE_PLACE) { + places = g_list_remove (places, collection); + places = g_list_prepend (places, collection); + } + g_object_unref (collection); + } + + gtk_tree_path_free (path); + } + + return places; +} + +SeahorsePlace * +seahorse_sidebar_get_focused_place (SeahorseSidebar *self) +{ + GcrCollection *collection; + GtkTreePath *path; + GtkTreeIter iter; + RowType row_type; + + g_return_val_if_fail (SEAHORSE_IS_SIDEBAR (self), NULL); + + gtk_tree_view_get_cursor (self->tree_view, &path, NULL); + if (path != NULL) { + if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (self->store), &iter, path)) + g_return_val_if_reached (NULL); + gtk_tree_path_free (path); + + gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter, + SIDEBAR_ROW_TYPE, &row_type, + SIDEBAR_COLLECTION, &collection, + -1); + + if (row_type == TYPE_PLACE) + return SEAHORSE_PLACE (collection); + } + + return NULL; +} + +GList * +seahorse_sidebar_get_backends (SeahorseSidebar *self) +{ + GList *backends = NULL; + GcrCollection *collection; + GtkTreePath *path; + RowType row_type; + GtkTreeIter iter; + guint i; + + g_return_val_if_fail (SEAHORSE_IS_SIDEBAR (self), NULL); + + for (i = 0; i < self->backends->len; i++) + backends = g_list_prepend (backends, self->backends->pdata[i]); + + backends = g_list_reverse (backends); + + gtk_tree_view_get_cursor (self->tree_view, &path, NULL); + if (path != NULL) { + if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (self->store), &iter, path)) + g_return_val_if_reached (NULL); + gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter, + SIDEBAR_ROW_TYPE, &row_type, + SIDEBAR_COLLECTION, &collection, + -1); + + if (collection != NULL) { + if (row_type == TYPE_BACKEND) { + backends = g_list_remove (backends, collection); + backends = g_list_prepend (backends, collection); + } + g_object_unref (collection); + } + + gtk_tree_path_free (path); + } + + return backends; +} diff -Nru seahorse-3.2.2/src/seahorse-sidebar.h seahorse-3.6.3/src/seahorse-sidebar.h --- seahorse-3.2.2/src/seahorse-sidebar.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-sidebar.h 2012-08-21 12:23:19.000000000 +0200 @@ -0,0 +1,63 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __SEAHORSE_SIDEBAR_H__ +#define __SEAHORSE_SIDEBAR_H__ + +#include "seahorse-place.h" + +#include + +#include + +#define SEAHORSE_TYPE_SIDEBAR (seahorse_sidebar_get_type ()) +#define SEAHORSE_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SIDEBAR, SeahorseSidebar)) +#define SEAHORSE_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SIDEBAR, SeahorseSidebarClass)) +#define SEAHORSE_IS_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SIDEBAR)) +#define SEAHORSE_IS_SIDEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SIDEBAR)) +#define SEAHORSE_SIDEBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SIDEBAR_KEY, SeahorseSidebarClass)) + +typedef struct _SeahorseSidebar SeahorseSidebar; +typedef struct _SeahorseSidebarClass SeahorseSidebarClass; + +GType seahorse_sidebar_get_type (void); + +SeahorseSidebar * seahorse_sidebar_new (void); + +gboolean seahorse_sidebar_get_combined (SeahorseSidebar *self); + +void seahorse_sidebar_set_combined (SeahorseSidebar *self, + gboolean combined); + +GcrCollection * seahorse_sidebar_get_collection (SeahorseSidebar *self); + +gchar ** seahorse_sidebar_get_selected_uris (SeahorseSidebar *self); + +void seahorse_sidebar_set_selected_uris (SeahorseSidebar *self, + const gchar **value); + +GList * seahorse_sidebar_get_selected_places (SeahorseSidebar *self); + +SeahorsePlace * seahorse_sidebar_get_focused_place (SeahorseSidebar *self); + +GList * seahorse_sidebar_get_backends (SeahorseSidebar *self); + +#endif /* __SEAHORSE_SIDEBAR_H__ */ diff -Nru seahorse-3.2.2/src/seahorse-viewer.c seahorse-3.6.3/src/seahorse-viewer.c --- seahorse-3.2.2/src/seahorse-viewer.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-viewer.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1011 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-commands.h" -#include "seahorse-object.h" -#include "seahorse-object-list.h" -#include "seahorse-preferences.h" -#include "seahorse-progress.h" -#include "seahorse-registry.h" -#include "seahorse-util.h" -#include "seahorse-view.h" -#include "seahorse-viewer.h" - - -#include -#include - -void on_app_preferences (GtkAction* action, - SeahorseViewer* self); - -enum { - PROP_0, - PROP_SELECTED, - PROP_WINDOW -}; - -typedef struct _ViewerPredicate { - SeahorseObjectPredicate pred; - gboolean is_commands; - GObject *commands_or_actions; -} ViewerPredicate; - -struct _SeahorseViewerPrivate { - GtkUIManager *ui_manager; - GtkActionGroup *object_actions; - GtkActionGroup *export_actions; - GtkActionGroup *import_actions; - GtkAction *delete_action; - GArray *predicates; - GList *all_commands; -}; - -static void seahorse_viewer_implement_view (SeahorseViewIface *iface); -G_DEFINE_TYPE_EXTENDED (SeahorseViewer, seahorse_viewer, SEAHORSE_TYPE_WIDGET, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEW, seahorse_viewer_implement_view)); - -#define SEAHORSE_VIEWER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEAHORSE_TYPE_VIEWER, SeahorseViewerPrivate)) - -/* Predicates which control export and delete commands, inited in class_init */ -static SeahorseObjectPredicate exportable_predicate = { 0, }; -static SeahorseObjectPredicate deletable_predicate = { 0, }; -static SeahorseObjectPredicate importable_predicate = { 0, }; -static SeahorseObjectPredicate remote_predicate = { 0, }; - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -typedef gboolean (*ForEachCommandsFunc) (SeahorseViewer *self, SeahorseCommands *commands, - SeahorseObjectPredicate *predicate, gpointer user_data); - -static void -for_each_commands (SeahorseViewer *self, ForEachCommandsFunc func, gpointer user_data) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - ViewerPredicate *predicate; - guint i; - - for (i = 0; i < pv->predicates->len; ++i) - { - predicate = &g_array_index (pv->predicates, ViewerPredicate, i); - if (predicate->is_commands) { - if (!(func) (self, SEAHORSE_COMMANDS (predicate->commands_or_actions), - &predicate->pred, user_data)) - return; - } - } -} - -G_MODULE_EXPORT void -on_app_preferences (GtkAction* action, SeahorseViewer* self) -{ - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - seahorse_preferences_show (seahorse_viewer_get_window (self), NULL); -} - -static void -on_app_about (GtkAction* action, SeahorseViewer* self) -{ - GtkAboutDialog *about; - - const gchar *authors[] = { - "Jacob Perkins ", - "Jose Carlos Garcia Sogo ", - "Jean Schurger ", - "Stef Walter ", - "Adam Schreiber ", - "", - N_("Contributions:"), - "Albrecht Dreß ", - "Jim Pharis ", - NULL - }; - - const gchar *documenters[] = { - "Jacob Perkins ", - "Adam Schreiber ", - "Milo Casagrande ", - NULL - }; - - const gchar *artists[] = { - "Jacob Perkins ", - "Stef Walter ", - NULL - }; - - about = GTK_ABOUT_DIALOG (gtk_about_dialog_new ()); - gtk_about_dialog_set_artists (about, artists); - gtk_about_dialog_set_authors (about, authors); - gtk_about_dialog_set_documenters (about, documenters); - gtk_about_dialog_set_version (about, VERSION); - gtk_about_dialog_set_comments (about, _("Passwords and Keys")); - gtk_about_dialog_set_copyright (about, "Copyright \xc2\xa9 2002 - 2010 Seahorse Project"); - gtk_about_dialog_set_translator_credits (about, _("translator-credits")); - gtk_about_dialog_set_logo_icon_name (about, "seahorse"); - gtk_about_dialog_set_website (about, "http://www.gnome.org/projects/seahorse"); - gtk_about_dialog_set_website_label (about, _("Seahorse Project Homepage")); - - g_signal_connect (about, "response", G_CALLBACK (gtk_widget_hide), NULL); - gtk_window_set_transient_for (GTK_WINDOW (about), seahorse_viewer_get_window (self)); - - gtk_dialog_run (GTK_DIALOG (about)); - gtk_widget_destroy (GTK_WIDGET (about)); -} - -static void -on_help_show (GtkAction* action, SeahorseViewer* self) -{ - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - seahorse_widget_show_help (SEAHORSE_WIDGET (self)); -} - -static const GtkActionEntry UI_ENTRIES[] = { - - /* Top menu items */ - { "file-menu", NULL, N_("_File") }, - { "edit-menu", NULL, N_("_Edit") }, - { "view-menu", NULL, N_("_View") }, - { "help-menu", NULL, N_("_Help") }, -#if defined (WITH_KEYSERVER) || defined (WITH_SHARING) - { "app-preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL, - N_("Change preferences for this program"), G_CALLBACK (on_app_preferences) }, -#endif - { "app-about", GTK_STOCK_ABOUT, NULL, NULL, - N_("About this program"), G_CALLBACK (on_app_about) }, - { "help-show", GTK_STOCK_HELP, N_("_Contents"), "F1", - N_("Show Seahorse help"), G_CALLBACK (on_help_show) } -}; - -static void -on_key_properties (GtkAction* action, SeahorseViewer* self) -{ - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - if (seahorse_viewer_get_selected (self) != NULL) - seahorse_viewer_show_properties (self, seahorse_viewer_get_selected (self)); -} - -static GList* -objects_prune_non_exportable (GList *objects) -{ - GList *exportable = NULL; - GList *l; - - for (l = objects; l; l = g_list_next (l)) { - if (seahorse_object_get_flags (l->data) & SEAHORSE_FLAG_EXPORTABLE) - exportable = g_list_append (exportable, l->data); - } - - g_list_free (objects); - return exportable; -} - -static GList* -filter_matching_objects (SeahorseObjectPredicate *pred, GList** all_objects) -{ - GList *results, *next, *here; - SeahorseObject *object; - - results = NULL; - - next = *all_objects; - while ((here = next) != NULL) { - g_return_val_if_fail (SEAHORSE_IS_OBJECT (here->data), NULL); - object = SEAHORSE_OBJECT (here->data); - next = g_list_next (here); - - /* If it matches then separate it */ - if (seahorse_object_predicate_match (pred, object)) { - results = g_list_append (results, object); - *all_objects = g_list_delete_link (*all_objects, here); - } - } - - return results; -} - -static gboolean -has_matching_objects (SeahorseObjectPredicate *pred, GList *objects) -{ - SeahorseObject *object; - GList *l; - - for (l = objects; l; l = g_list_next (l)) { - g_return_val_if_fail (SEAHORSE_IS_OBJECT (l->data), FALSE); - object = SEAHORSE_OBJECT (l->data); - - /* If it matches then separate it */ - if (seahorse_object_predicate_match (pred, object)) - return TRUE; - } - - return FALSE; -} - -static void -on_file_export_completed (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseViewer* self = SEAHORSE_VIEWER (user_data); - GError *error = NULL; - - if (!seahorse_source_export_auto_finish (result, &error)) - seahorse_util_handle_error (&error, seahorse_viewer_get_window (self), - _("Couldn't export keys")); - - g_object_unref (self); -} - -static void -on_key_export_file (GtkAction* action, SeahorseViewer* self) -{ - GError *error = NULL; - GList *objects; - GtkDialog *dialog; - gchar *uri, *unesc_uri; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - objects = seahorse_viewer_get_selected_objects (self); - objects = objects_prune_non_exportable (objects); - if (objects == NULL) - return; - - dialog = seahorse_util_chooser_save_new (_("Export public key"), - seahorse_viewer_get_window (self)); - seahorse_util_chooser_show_key_files (dialog); - seahorse_util_chooser_set_filename_full (dialog, objects); - uri = seahorse_util_chooser_save_prompt (dialog); - if (uri != NULL) { - GFile* file; - GOutputStream* output; - GCancellable *cancellable; - - file = g_file_new_for_uri (uri); - output = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE, 0, NULL, &error)); - if (output == NULL) { - unesc_uri = g_uri_unescape_string (seahorse_util_uri_get_last (uri), NULL); - seahorse_util_handle_error (&error, NULL, _ ("Couldn't export key to \"%s\""), - unesc_uri, NULL); - g_free (unesc_uri); - } else { - cancellable = g_cancellable_new (); - seahorse_source_export_auto_async (objects, output, cancellable, - on_file_export_completed, g_object_ref (self)); - seahorse_progress_show (cancellable, _("Exporting keys"), TRUE); - g_object_unref (cancellable); - } - - - g_object_unref (file); - g_object_unref (output); - g_free (uri); - } - - g_list_free (objects); -} - -static void -on_copy_export_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseViewer *self = SEAHORSE_VIEWER (user_data); - GOutputStream* output; - GError *error = NULL; - const gchar* text; - guint size; - GdkAtom atom; - GtkClipboard* board; - - output = seahorse_source_export_auto_finish (result, &error); - if (error != NULL) { - seahorse_util_handle_error (&error, seahorse_viewer_get_window (self), - _("Couldn't retrieve data from key server")); - return; - } - - text = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (output)); - size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (output)); - - atom = gdk_atom_intern ("CLIPBOARD", FALSE); - board = gtk_clipboard_get (atom); - gtk_clipboard_set_text (board, text, (gint)size); - - /* Translators: "Copied" is a verb (used as a status indicator), not an adjective for the word "keys" */ - seahorse_viewer_set_status (self, _ ("Copied keys")); - - g_object_unref (self); -} - -static void -on_key_export_clipboard (GtkAction* action, SeahorseViewer* self) -{ - GList* objects; - GOutputStream* output; - GCancellable *cancellable; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - objects = seahorse_viewer_get_selected_objects (self); - objects = objects_prune_non_exportable (objects); - if (objects == NULL) - return; - - output = G_OUTPUT_STREAM (g_memory_output_stream_new (NULL, 0, g_realloc, g_free)); - - cancellable = g_cancellable_new (); - seahorse_source_export_auto_async (objects, output, cancellable, - on_copy_export_complete, g_object_ref (self)); - seahorse_progress_show (cancellable, _ ("Retrieving keys"), TRUE); - g_object_unref (cancellable); - - g_list_free (objects); - g_object_unref (output); -} - -static gboolean -delete_objects_for_selected (SeahorseViewer *self, SeahorseCommands *commands, - SeahorseObjectPredicate *pred, gpointer user_data) -{ - GList **all_objects; - GList *objects; - gboolean ret; - - all_objects = (GList**)user_data; - - /* Stop the enumeration if nothing still selected */ - if (!*all_objects) - return FALSE; - - objects = filter_matching_objects (pred, all_objects); - - /* No objects matched this predicate? */ - if (!objects) - return TRUE; - - /* Indicate to our users what is being operated on */ - seahorse_viewer_set_selected_objects (self, objects); - - ret = seahorse_commands_delete_objects (commands, objects); - g_list_free (objects); - - return ret; -} - -static void -on_key_delete (GtkAction* action, SeahorseViewer* self) -{ - GList *objects = NULL; - GList *all_objects = NULL; - GList *l; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - all_objects = seahorse_viewer_get_selected_objects (self); - objects = filter_matching_objects (&deletable_predicate, &all_objects); - g_list_free (all_objects); - - /* Check for private objects */ - for (l = objects; l; l = g_list_next (l)) { - SeahorseObject* object = l->data; - - if (seahorse_object_get_usage (object) == SEAHORSE_USAGE_PRIVATE_KEY) { - gchar* prompt = g_strdup_printf (_("%s is a private key. Are you sure you want to proceed?"), - seahorse_object_get_label (object)); - if (!seahorse_util_prompt_delete (prompt, GTK_WIDGET (seahorse_viewer_get_window (self)))) { - g_free (prompt); - g_list_free (objects); - return; - } - } - } - - /* Go through the list of predicates, and call each one */ - for_each_commands (self, delete_objects_for_selected, &objects); - - g_list_free (objects); -} - -static void -on_import_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - SeahorseViewer *self = SEAHORSE_VIEWER (user_data); - GError *error = NULL; - - if (!seahorse_context_transfer_objects_finish (SEAHORSE_CONTEXT (source), - result, &error)) - seahorse_util_handle_error (&error, seahorse_viewer_get_window (self), - _("Couldn't import keys")); - else - seahorse_viewer_set_status (self, _ ("Imported keys")); - - g_object_unref (self); -} - -static void -on_key_import_keyring (GtkAction* action, SeahorseViewer* self) -{ - GCancellable *cancellable; - GList* objects; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - objects = seahorse_viewer_get_selected_objects (self); - objects = objects_prune_non_exportable (objects); - - /* No objects, nothing to do */ - if (objects == NULL) - return; - - cancellable = g_cancellable_new (); - seahorse_context_transfer_objects_async (seahorse_context_instance (), - objects, NULL, cancellable, - on_import_complete, g_object_ref (self)); - seahorse_progress_show (cancellable, _ ("Importing keys from key servers"), TRUE); - g_object_unref (cancellable); - - g_list_free (objects); -} - - -static gboolean -show_properties_for_selected (SeahorseViewer *self, SeahorseCommands *commands, - SeahorseObjectPredicate *pred, gpointer user_data) -{ - g_return_val_if_fail (SEAHORSE_IS_OBJECT (user_data), FALSE); - - /* If not mactched, then continue enumeration */ - if (!seahorse_object_predicate_match (pred, user_data)) - return TRUE; - - seahorse_commands_show_properties (commands, user_data); - - /* Stop enumeration */ - return FALSE; -} - -static const GtkActionEntry KEY_ENTRIES[] = { - { "show-properties", GTK_STOCK_PROPERTIES, NULL, NULL, - N_("Show properties"), G_CALLBACK (on_key_properties) }, - { "edit-delete", GTK_STOCK_DELETE, NC_("This text refers to deleting an item from its type's backing store.", "_Delete"), NULL, - N_("Delete selected items"), G_CALLBACK (on_key_delete) } -}; - -static const GtkActionEntry EXPORT_ENTRIES[] = { - { "file-export", GTK_STOCK_SAVE_AS, N_("E_xport..."), NULL, - N_("Export to a file"), G_CALLBACK (on_key_export_file) }, - { "edit-export-clipboard", GTK_STOCK_COPY, NULL, "C", - N_("Copy to the clipboard"), G_CALLBACK (on_key_export_clipboard) } -}; - -static const GtkActionEntry IMPORT_ENTRIES[] = { - { "key-import-keyring", GTK_STOCK_ADD, N_("_Import"), "", - N_("Import selected keys to local key ring"), G_CALLBACK (on_key_import_keyring) } -}; - -static void -include_basic_actions (SeahorseViewer* self) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - GtkActionGroup* actions; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - - actions = gtk_action_group_new ("main"); - gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (actions, UI_ENTRIES, G_N_ELEMENTS (UI_ENTRIES), self); - seahorse_viewer_include_actions (self, actions); - g_object_unref (actions); - - pv->object_actions = gtk_action_group_new ("key"); - gtk_action_group_set_translation_domain (pv->object_actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (pv->object_actions, KEY_ENTRIES, G_N_ELEMENTS (KEY_ENTRIES), self); - /* Mark the properties toolbar button as important */ - g_object_set (gtk_action_group_get_action (pv->object_actions, "show-properties"), "is-important", TRUE, NULL); - seahorse_viewer_include_actions (self, pv->object_actions); - pv->delete_action = gtk_action_group_get_action (pv->object_actions, "edit-delete"); - g_return_if_fail (pv->delete_action); - g_object_ref (pv->delete_action); - - pv->export_actions = gtk_action_group_new ("export"); - gtk_action_group_set_translation_domain (pv->export_actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (pv->export_actions, EXPORT_ENTRIES, G_N_ELEMENTS (EXPORT_ENTRIES), self); - seahorse_viewer_include_actions (self, pv->export_actions); - - pv->import_actions = gtk_action_group_new ("import"); - gtk_action_group_set_translation_domain (pv->import_actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (pv->import_actions, IMPORT_ENTRIES, G_N_ELEMENTS (IMPORT_ENTRIES), self); - g_object_set (gtk_action_group_get_action (pv->import_actions, "key-import-keyring"), "is-important", TRUE, NULL); - seahorse_viewer_include_actions (self, pv->import_actions); -} - -static void -on_selection_changed (SeahorseView* view, SeahorseViewer* self) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - ViewerPredicate *predicate; - GList *objects; - guint i; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (SEAHORSE_IS_VIEW (view)); - - /* Enable if anything is selected */ - gtk_action_group_set_sensitive (pv->object_actions, seahorse_view_get_selected (view) != NULL); - - objects = seahorse_viewer_get_selected_objects (self); - - /* Enable if any exportable objects are selected */ - gtk_action_group_set_sensitive (pv->export_actions, - has_matching_objects (&exportable_predicate, objects)); - - /* Enable if any importable objects are selected */ - gtk_action_group_set_sensitive (pv->import_actions, - has_matching_objects (&importable_predicate, objects)); - - /* Enable if any deletable objects are selected */ - gtk_action_set_sensitive (pv->delete_action, - has_matching_objects (&deletable_predicate, objects)); - - /* Go through the list of actions and disable all those which have no matches */ - for (i = 0; i < pv->predicates->len; ++i) { - predicate = &g_array_index (pv->predicates, ViewerPredicate, i); - if (predicate->is_commands) - continue; - gtk_action_group_set_visible (GTK_ACTION_GROUP (predicate->commands_or_actions), - has_matching_objects (&predicate->pred, objects)); - } - - g_list_free (objects); -} - -static void -on_add_widget (GtkUIManager* ui, GtkWidget* widget, SeahorseViewer* self) -{ - const char* name = NULL; - GtkWidget* holder; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (GTK_IS_UI_MANAGER (ui)); - g_return_if_fail (GTK_IS_WIDGET (widget)); - - if (GTK_IS_MENU_BAR (widget)) - name = "menu-placeholder"; - else if (GTK_IS_TOOLBAR (widget)) - name = "toolbar-placeholder"; - else - name = NULL; - - holder = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), name); - if (holder != NULL) - gtk_container_add ((GTK_CONTAINER (holder)), widget); - else - g_warning ("no place holder found for: %s", name); -} - - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static GList* -seahorse_viewer_get_selected_matching (SeahorseView *base, SeahorseObjectPredicate *pred) -{ - GList *all_objects; - GList *objects; - - g_return_val_if_fail (SEAHORSE_IS_VIEW (base), NULL); - g_return_val_if_fail (pred, NULL); - - all_objects = seahorse_view_get_selected_objects (base); - objects = filter_matching_objects (pred, &all_objects); - g_list_free (all_objects); - - return objects; -} - -static GObject* -seahorse_viewer_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - GObject *obj = G_OBJECT_CLASS (seahorse_viewer_parent_class)->constructor (type, n_props, props); - SeahorseViewer *self = NULL; - SeahorseViewerPrivate *pv; - GError *error = NULL; - GtkWidget *win; - const gchar *name; - gchar *path; - GList *types, *l; - - if (obj) { - pv = SEAHORSE_VIEWER_GET_PRIVATE (obj); - self = SEAHORSE_VIEWER (obj); - - /* The widgts get added in an idle loop later */ - name = seahorse_widget_get_name (SEAHORSE_WIDGET (self)); - path = g_strdup_printf ("%sseahorse-%s.ui", SEAHORSE_UIDIR, name); - if (!gtk_ui_manager_add_ui_from_file (pv->ui_manager, path, &error)) { - g_warning ("couldn't load ui description for '%s': %s", name, error->message); - g_clear_error (&error); - } - - g_free (path); - - win = seahorse_widget_get_toplevel (SEAHORSE_WIDGET (self)); - if (G_TYPE_FROM_INSTANCE (G_OBJECT (win)) == GTK_TYPE_WINDOW) - gtk_window_add_accel_group (GTK_WINDOW (win), - gtk_ui_manager_get_accel_group (pv->ui_manager)); - - include_basic_actions (self); - - g_signal_connect (SEAHORSE_VIEW (self), "selection-changed", - G_CALLBACK (on_selection_changed), self); - - /* Setup the commands */ - types = seahorse_registry_object_types (seahorse_registry_get (), "commands", NULL, NULL); - for (l = types; l; l = g_list_next (l)) { - GType typ = GPOINTER_TO_SIZE (l->data); - SeahorseCommands *commands; - - commands = g_object_new (typ, "view", self, NULL); - pv->all_commands = seahorse_object_list_prepend (pv->all_commands, commands); - g_object_unref (commands); - } - } - - return obj; -} - - -static void -seahorse_viewer_init (SeahorseViewer *self) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - - pv->ui_manager = gtk_ui_manager_new (); - g_signal_connect (pv->ui_manager, "add-widget", G_CALLBACK (on_add_widget), self); - - pv->predicates = g_array_new (FALSE, TRUE, sizeof (ViewerPredicate)); -} - -static void -seahorse_viewer_dispose (GObject *obj) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (obj); - ViewerPredicate *predicate; - guint i; - - if (pv->ui_manager) - g_object_unref (pv->ui_manager); - pv->ui_manager = NULL; - - if (pv->object_actions) - g_object_unref (pv->object_actions); - pv->object_actions = NULL; - - if (pv->export_actions) - g_object_unref (pv->export_actions); - pv->export_actions = NULL; - - if (pv->delete_action) - g_object_unref (pv->delete_action); - pv->delete_action = NULL; - - for (i = 0; i < pv->predicates->len; ++i) { - predicate = &g_array_index (pv->predicates, ViewerPredicate, i); - g_object_unref (predicate->commands_or_actions); - } - g_array_set_size (pv->predicates, 0); - - seahorse_object_list_free (pv->all_commands); - pv->all_commands = NULL; - - G_OBJECT_CLASS (seahorse_viewer_parent_class)->dispose (obj); -} - -static void -seahorse_viewer_finalize (GObject *obj) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE(obj); - - g_assert (pv->object_actions == NULL); - g_assert (pv->export_actions == NULL); - g_assert (pv->delete_action == NULL); - g_assert (pv->all_commands == NULL); - g_assert (pv->ui_manager == NULL); - g_array_free (pv->predicates, TRUE); - - G_OBJECT_CLASS (seahorse_viewer_parent_class)->finalize (obj); -} - -static void -seahorse_viewer_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - SeahorseViewer *self = SEAHORSE_VIEWER (obj); - - switch (prop_id) { - case PROP_SELECTED: - g_value_set_object (value, seahorse_viewer_get_selected (self)); - break; - case PROP_WINDOW: - g_value_set_object (value, seahorse_view_get_window (SEAHORSE_VIEW (self))); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_viewer_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - SeahorseViewer *self = SEAHORSE_VIEWER (obj); - - switch (prop_id) { - case PROP_SELECTED: - seahorse_viewer_set_selected (self, g_value_get_object (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_viewer_class_init (SeahorseViewerClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_viewer_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorseViewerPrivate)); - - gobject_class->constructor = seahorse_viewer_constructor; - gobject_class->dispose = seahorse_viewer_dispose; - gobject_class->finalize = seahorse_viewer_finalize; - gobject_class->set_property = seahorse_viewer_set_property; - gobject_class->get_property = seahorse_viewer_get_property; - - g_object_class_install_property (gobject_class, PROP_SELECTED, - g_param_spec_object ("selected", "Selected", "Selected Object", - SEAHORSE_TYPE_OBJECT, G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_WINDOW, - g_param_spec_object ("window", "Window", "Window of View", - GTK_TYPE_WIDGET, G_PARAM_READABLE)); - - exportable_predicate.flags = SEAHORSE_FLAG_EXPORTABLE; - deletable_predicate.flags = SEAHORSE_FLAG_DELETABLE; - importable_predicate.flags = SEAHORSE_FLAG_EXPORTABLE; - importable_predicate.location = SEAHORSE_LOCATION_REMOTE; - remote_predicate.location = SEAHORSE_LOCATION_REMOTE; -} - -static void -seahorse_viewer_implement_view (SeahorseViewIface *iface) -{ - iface->get_selected_objects = (gpointer)seahorse_viewer_get_selected_objects; - iface->set_selected_objects = (gpointer)seahorse_viewer_set_selected_objects; - iface->get_selected = (gpointer)seahorse_viewer_get_selected; - iface->set_selected = (gpointer)seahorse_viewer_set_selected; - iface->get_selected_matching = (gpointer)seahorse_viewer_get_selected_matching; - iface->get_window = (gpointer)seahorse_viewer_get_window; - iface->register_ui = (gpointer)seahorse_viewer_register_ui; - iface->register_commands = (gpointer)seahorse_viewer_register_commands; -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -void -seahorse_viewer_ensure_updated (SeahorseViewer* self) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - - gtk_ui_manager_ensure_update (pv->ui_manager); - -} - -void -seahorse_viewer_include_actions (SeahorseViewer* self, GtkActionGroup* actions) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - - gtk_ui_manager_insert_action_group (pv->ui_manager, actions, -1); -} - -GList* -seahorse_viewer_get_selected_objects (SeahorseViewer* self) -{ - g_return_val_if_fail (SEAHORSE_IS_VIEWER (self), NULL); - g_return_val_if_fail (SEAHORSE_VIEWER_GET_CLASS (self)->get_selected_objects, NULL); - - return SEAHORSE_VIEWER_GET_CLASS (self)->get_selected_objects (self); -} - -void -seahorse_viewer_set_selected_objects (SeahorseViewer* self, GList* objects) -{ - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (SEAHORSE_VIEWER_GET_CLASS (self)->set_selected_objects); - - SEAHORSE_VIEWER_GET_CLASS (self)->set_selected_objects (self, objects); -} - -SeahorseObject* -seahorse_viewer_get_selected_object_and_uid (SeahorseViewer* self, guint* uid) -{ - g_return_val_if_fail (SEAHORSE_IS_VIEWER (self), NULL); - g_return_val_if_fail (SEAHORSE_VIEWER_GET_CLASS (self)->get_selected_object_and_uid, NULL); - - return SEAHORSE_VIEWER_GET_CLASS (self)->get_selected_object_and_uid (self, uid); -} - -void -seahorse_viewer_show_context_menu (SeahorseViewer* self, guint button, guint time) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - GtkMenu* menu; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - - menu = GTK_MENU (gtk_ui_manager_get_widget (pv->ui_manager, "/KeyPopup")); - g_return_if_fail (GTK_IS_MENU (menu)); - - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, time); - gtk_widget_show (GTK_WIDGET (menu)); -} - -void -seahorse_viewer_show_properties (SeahorseViewer* self, SeahorseObject* obj) -{ - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (SEAHORSE_IS_OBJECT (obj)); - - for_each_commands (self, show_properties_for_selected, obj); -} - -void -seahorse_viewer_set_status (SeahorseViewer* self, const char* text) -{ - GtkStatusbar* status; - guint id; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (text != NULL); - - status = GTK_STATUSBAR (seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "status")); - g_return_if_fail (GTK_IS_STATUSBAR (status)); - - id = gtk_statusbar_get_context_id (status, "key-manager"); - gtk_statusbar_pop (status, id); - gtk_statusbar_push (status, id, text); -} - -void -seahorse_viewer_set_numbered_status (SeahorseViewer* self, const char* text, gint num) -{ - gchar* message; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (text != NULL); - - message = g_strdup_printf (text, num); - seahorse_viewer_set_status (self, message); - g_free (message); -} - -SeahorseObject* -seahorse_viewer_get_selected (SeahorseViewer* self) -{ - g_return_val_if_fail (SEAHORSE_IS_VIEWER (self), NULL); - g_return_val_if_fail (SEAHORSE_VIEWER_GET_CLASS (self)->get_selected, NULL); - - return SEAHORSE_VIEWER_GET_CLASS (self)->get_selected (self); -} - -void -seahorse_viewer_set_selected (SeahorseViewer* self, SeahorseObject* value) -{ - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (SEAHORSE_VIEWER_GET_CLASS (self)->set_selected); - - SEAHORSE_VIEWER_GET_CLASS (self)->set_selected (self, value); -} - -GtkWindow* -seahorse_viewer_get_window (SeahorseViewer* self) -{ - g_return_val_if_fail (SEAHORSE_IS_VIEWER (self), NULL); - return GTK_WINDOW (seahorse_widget_get_toplevel (SEAHORSE_WIDGET (self))); -} - -void -seahorse_viewer_register_ui (SeahorseViewer *self, SeahorseObjectPredicate *pred, - const gchar *uidef, GtkActionGroup *actions) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - GError *error = NULL; - ViewerPredicate predicate; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - - if (actions != NULL) { - seahorse_viewer_include_actions (self, actions); - - /* Add this to the list */ - memset (&predicate, 0, sizeof (predicate)); - if (pred) - predicate.pred = *pred; - predicate.is_commands = FALSE; - predicate.commands_or_actions = G_OBJECT (actions); - g_object_ref (actions); - g_array_append_val (pv->predicates, predicate); - } - - if (uidef && uidef[0]) { - if (!gtk_ui_manager_add_ui_from_string (pv->ui_manager, uidef, -1, &error)) { - g_warning ("couldn't load UI description: %s", error->message); - g_clear_error (&error); - } - } -} - -void -seahorse_viewer_register_commands (SeahorseViewer *self, SeahorseObjectPredicate *pred, - SeahorseCommands *commands) -{ - SeahorseViewerPrivate *pv = SEAHORSE_VIEWER_GET_PRIVATE (self); - ViewerPredicate predicate; - - g_return_if_fail (SEAHORSE_IS_VIEWER (self)); - g_return_if_fail (SEAHORSE_IS_COMMANDS (commands)); - - /* Add this to the list of commands */ - memset (&predicate, 0, sizeof (predicate)); - if (pred) - predicate.pred = *pred; - predicate.is_commands = TRUE; - predicate.commands_or_actions = G_OBJECT (commands); - g_object_ref (commands); - g_array_append_val (pv->predicates, predicate); -} diff -Nru seahorse-3.2.2/src/seahorse-viewer.h seahorse-3.6.3/src/seahorse-viewer.h --- seahorse-3.2.2/src/seahorse-viewer.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-viewer.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,112 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_VIEWER_H__ -#define __SEAHORSE_VIEWER_H__ - -#include - -#include "seahorse-object.h" -#include "seahorse-set.h" -#include "seahorse-view.h" -#include "seahorse-widget.h" - -#define SEAHORSE_TYPE_VIEWER (seahorse_viewer_get_type ()) -#define SEAHORSE_VIEWER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_VIEWER, SeahorseViewer)) -#define SEAHORSE_VIEWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_VIEWER, SeahorseViewerClass)) -#define SEAHORSE_IS_VIEWER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_VIEWER)) -#define SEAHORSE_IS_VIEWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_VIEWER)) -#define SEAHORSE_VIEWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_VIEWER, SeahorseViewerClass)) - -typedef struct _SeahorseViewer SeahorseViewer; -typedef struct _SeahorseViewerClass SeahorseViewerClass; -typedef struct _SeahorseViewerPrivate SeahorseViewerPrivate; - -struct _SeahorseViewer { - SeahorseWidget parent; -}; - -struct _SeahorseViewerClass { - SeahorseWidgetClass parent; - - /* virtual -------------------------------------------------------- */ - - GList* (*get_selected_objects) (SeahorseViewer* self); - - void (*set_selected_objects) (SeahorseViewer* self, GList* objects); - - SeahorseObject* (*get_selected_object_and_uid) (SeahorseViewer* self, guint* uid); - - SeahorseObject* (*get_selected) (SeahorseViewer* self); - - void (*set_selected) (SeahorseViewer* self, SeahorseObject* value); - - /* signals --------------------------------------------------------- */ - - void (*signal) (SeahorseViewer *viewer); -}; - -GType seahorse_viewer_get_type (void); - -void seahorse_viewer_ensure_updated (SeahorseViewer* self); - -void seahorse_viewer_include_actions (SeahorseViewer* self, - GtkActionGroup* actions); - -GList* seahorse_viewer_get_selected_objects (SeahorseViewer* self); - -void seahorse_viewer_set_selected_objects (SeahorseViewer* self, - GList* objects); - -SeahorseObject* seahorse_viewer_get_selected_object_and_uid (SeahorseViewer* self, - guint* uid); - -void seahorse_viewer_show_context_menu (SeahorseViewer* self, - guint button, - guint time); - -void seahorse_viewer_show_properties (SeahorseViewer* self, - SeahorseObject* obj); - -void seahorse_viewer_set_status (SeahorseViewer* self, - const char* text); - -void seahorse_viewer_set_numbered_status (SeahorseViewer* self, - const char* text, - gint num); - -SeahorseObject* seahorse_viewer_get_selected (SeahorseViewer* self); - -void seahorse_viewer_set_selected (SeahorseViewer* self, - SeahorseObject* value); - -GtkWindow* seahorse_viewer_get_window (SeahorseViewer* self); - -void seahorse_viewer_register_ui (SeahorseViewer *self, - SeahorseObjectPredicate *pred, - const gchar *uidef, - GtkActionGroup *actions); - -void seahorse_viewer_register_commands (SeahorseViewer *self, - SeahorseObjectPredicate *pred, - SeahorseCommands *commands); - -#endif /* __SEAHORSE_VIEWER_H__ */ diff -Nru seahorse-3.2.2/src/seahorse-windows.h seahorse-3.6.3/src/seahorse-windows.h --- seahorse-3.2.2/src/seahorse-windows.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/src/seahorse-windows.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2003 Jacob Perkins - * Copyright (C) 2005 Stefan Walter - * - * 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 __SEAHORSE_WINDOWS_H__ -#define __SEAHORSE_WINDOWS_H__ - -#include "seahorse-context.h" - -GtkWindow* seahorse_keyserver_search_show (GtkWindow *parent); - -GtkWindow* seahorse_keyserver_sync_show (GList *keys, - GtkWindow *parent); - -void seahorse_generate_select_show (GtkWindow *parent); - -void seahorse_delete_show (GList *keys); - -#endif /* __SEAHORSE_WINDOWS_H__ */ diff -Nru seahorse-3.2.2/ssh/Makefile.am seahorse-3.6.3/ssh/Makefile.am --- seahorse-3.2.2/ssh/Makefile.am 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/Makefile.am 2012-11-09 11:08:13.000000000 +0100 @@ -7,7 +7,6 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ @@ -19,10 +18,11 @@ libseahorse_ssh_la_SOURCES = \ seahorse-ssh.h seahorse-ssh.c \ - seahorse-ssh-module.c seahorse-ssh-module.h \ - seahorse-algo.c seahorse-algo.h \ - seahorse-ssh-commands.c seahorse-ssh-commands.h \ + seahorse-ssh-actions.c seahorse-ssh-actions.h \ + seahorse-ssh-backend.c seahorse-ssh-backend.h \ + seahorse-ssh-deleter.c seahorse-ssh-deleter.h \ seahorse-ssh-dialogs.h \ + seahorse-ssh-exporter.c seahorse-ssh-exporter.h \ seahorse-ssh-generate.c \ seahorse-ssh-key-data.c seahorse-ssh-key-data.h \ seahorse-ssh-key.c seahorse-ssh-key.h \ diff -Nru seahorse-3.2.2/ssh/Makefile.in seahorse-3.6.3/ssh/Makefile.in --- seahorse-3.2.2/ssh/Makefile.in 2011-11-14 11:51:43.000000000 +0100 +++ seahorse-3.6.3/ssh/Makefile.in 2012-11-12 08:49:47.000000000 +0100 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 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. +# Copyright (C) 1994-2012 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. @@ -18,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,13 +54,14 @@ host_triplet = @host@ seahorselibexecbin_PROGRAMS = seahorse-ssh-askpass$(EXEEXT) subdir = ssh -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -54,16 +71,18 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libseahorse_ssh_la_DEPENDENCIES = \ $(top_builddir)/libseahorse/libseahorse.la -am_libseahorse_ssh_la_OBJECTS = seahorse-ssh.lo seahorse-ssh-module.lo \ - seahorse-algo.lo seahorse-ssh-commands.lo \ +am_libseahorse_ssh_la_OBJECTS = seahorse-ssh.lo \ + seahorse-ssh-actions.lo seahorse-ssh-backend.lo \ + seahorse-ssh-deleter.lo seahorse-ssh-exporter.lo \ seahorse-ssh-generate.lo seahorse-ssh-key-data.lo \ seahorse-ssh-key.lo seahorse-ssh-key-properties.lo \ seahorse-ssh-source.lo seahorse-ssh-operation.lo \ seahorse-ssh-upload.lo libseahorse_ssh_la_OBJECTS = $(am_libseahorse_ssh_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am__installdirs = "$(DESTDIR)$(seahorselibexecbindir)" \ "$(DESTDIR)$(uidir)" PROGRAMS = $(seahorselibexecbin_PROGRAMS) @@ -73,6 +92,18 @@ seahorse_ssh_askpass_DEPENDENCIES = \ $(top_builddir)/libseahorse/libseahorse.la \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -83,26 +114,27 @@ $(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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = 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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libseahorse_ssh_la_SOURCES) \ $(seahorse_ssh_askpass_SOURCES) DIST_SOURCES = $(libseahorse_ssh_la_SOURCES) \ $(seahorse_ssh_askpass_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -124,6 +156,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(ui_DATA) ETAGS = etags CTAGS = ctags @@ -152,9 +190,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,15 +205,11 @@ FGREP = @FGREP@ GCK_CFLAGS = @GCK_CFLAGS@ GCK_LIBS = @GCK_LIBS@ -GCR_CFLAGS = @GCR_CFLAGS@ -GCR_LIBS = @GCR_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GNUPG = @GNUPG@ GPGME_CONFIG = @GPGME_CONFIG@ GREP = @GREP@ @@ -196,10 +228,17 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -217,7 +256,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -252,6 +290,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -287,6 +326,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale @@ -312,7 +353,6 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ - -DDATA_DIR=\""$(datadir)"\" \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ -DLOCALEDIR=\"$(localedir)\" \ -DEXECDIR=\""$(seahorselibexecbindir)"\" \ @@ -322,10 +362,11 @@ noinst_LTLIBRARIES = libseahorse-ssh.la libseahorse_ssh_la_SOURCES = \ seahorse-ssh.h seahorse-ssh.c \ - seahorse-ssh-module.c seahorse-ssh-module.h \ - seahorse-algo.c seahorse-algo.h \ - seahorse-ssh-commands.c seahorse-ssh-commands.h \ + seahorse-ssh-actions.c seahorse-ssh-actions.h \ + seahorse-ssh-backend.c seahorse-ssh-backend.h \ + seahorse-ssh-deleter.c seahorse-ssh-deleter.h \ seahorse-ssh-dialogs.h \ + seahorse-ssh-exporter.c seahorse-ssh-exporter.h \ seahorse-ssh-generate.c \ seahorse-ssh-key-data.c seahorse-ssh-key-data.h \ seahorse-ssh-key.c seahorse-ssh-key.h \ @@ -363,9 +404,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ssh/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ssh/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu ssh/Makefile + $(AUTOMAKE) --foreign ssh/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -387,18 +428,23 @@ 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 -libseahorse-ssh.la: $(libseahorse_ssh_la_OBJECTS) $(libseahorse_ssh_la_DEPENDENCIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +libseahorse-ssh.la: $(libseahorse_ssh_la_OBJECTS) $(libseahorse_ssh_la_DEPENDENCIES) $(EXTRA_libseahorse_ssh_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libseahorse_ssh_la_OBJECTS) $(libseahorse_ssh_la_LIBADD) $(LIBS) install-seahorselibexecbinPROGRAMS: $(seahorselibexecbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(seahorselibexecbindir)" || $(MKDIR_P) "$(DESTDIR)$(seahorselibexecbindir)" @list='$(seahorselibexecbin_PROGRAMS)'; test -n "$(seahorselibexecbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(seahorselibexecbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(seahorselibexecbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -438,7 +484,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -seahorse-ssh-askpass$(EXEEXT): $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_DEPENDENCIES) +seahorse-ssh-askpass$(EXEEXT): $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_DEPENDENCIES) $(EXTRA_seahorse_ssh_askpass_DEPENDENCIES) @rm -f seahorse-ssh-askpass$(EXEEXT) $(AM_V_CCLD)$(LINK) $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_LDADD) $(LIBS) @@ -448,14 +494,15 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-algo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-actions.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-askpass.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-commands.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-backend.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-deleter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-exporter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-generate.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-key-data.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-key-properties.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-key.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-module.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-operation.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-source.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seahorse-ssh-upload.Plo@am__quote@ @@ -464,26 +511,23 @@ .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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -492,8 +536,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -507,9 +554,7 @@ @$(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 + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -560,6 +605,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -610,10 +669,15 @@ 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 + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -700,7 +764,7 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES \ - clean-seahorselibexecbinPROGRAMS ctags distclean \ + clean-seahorselibexecbinPROGRAMS cscopelist 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 \ diff -Nru seahorse-3.2.2/ssh/seahorse-algo.c seahorse-3.6.3/ssh/seahorse-algo.c --- seahorse-3.2.2/ssh/seahorse-algo.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-algo.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,243 +0,0 @@ -/* - * A bunch of necessary algorithms that should (or will be) in Glib. - * We keep them here (with function names prefixed) until such a - * time as we can depend on them either in GTK or OS - */ - -#include - -#include "seahorse-algo.h" - -/* - * This code implements the MD5 message-digest algorithm. - * The algorithm is due to Ron Rivest. This code was - * written by Colin Plumb in 1993, no copyright is claimed. - * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * MD5Context structure, pass it to MD5Init, call MD5Update as - * needed on buffers full of bytes, and then call MD5Final, which - * will fill a supplied 16-byte array with the digest. - * - * Minor modifications by Stef Walter - */ - -#include - -void seahorse_md5_transform(unsigned int buf[4], unsigned int const in[16]); - -#ifdef BIG_ENDIAN -void -byteSwap(unsigned int *buf, unsigned words) -{ - unsigned char *p = (unsigned char *)buf; - - do { - *buf++ = (unsigned int)((unsigned)p[3] << 8 | p[2]) << 16 | - ((unsigned)p[1] << 8 | p[0]); - p += 4; - } while (--words); -} -#else -#define byteSwap(buf,words) -#endif - -/* - * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious - * initialization constants. - */ -void -seahorse_md5_init(md5_ctx_t* ctx) -{ - ctx->buf[0] = 0x67452301; - ctx->buf[1] = 0xefcdab89; - ctx->buf[2] = 0x98badcfe; - ctx->buf[3] = 0x10325476; - - ctx->bytes[0] = 0; - ctx->bytes[1] = 0; -} - -/* - * Update context to reflect the concatenation of another buffer full - * of bytes. - */ -void -seahorse_md5_update(md5_ctx_t* ctx, const void* b, unsigned len) -{ - unsigned int t; - const unsigned char* buf = (const unsigned char*)b; - - /* Update byte count */ - - t = ctx->bytes[0]; - if ((ctx->bytes[0] = t + len) < t) - ctx->bytes[1]++; /* Carry from low to high */ - - t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */ - if (t > len) { - memcpy((unsigned char *)ctx->in + 64 - t, buf, len); - return; - } - /* First chunk is an odd size */ - memcpy((unsigned char *)ctx->in + 64 - t, buf, t); - byteSwap(ctx->in, 16); - seahorse_md5_transform(ctx->buf, ctx->in); - buf += t; - len -= t; - - /* Process data in 64-byte chunks */ - while (len >= 64) { - memcpy(ctx->in, buf, 64); - byteSwap(ctx->in, 16); - seahorse_md5_transform(ctx->buf, ctx->in); - buf += 64; - len -= 64; - } - - /* Handle any remaining bytes of data. */ - memcpy(ctx->in, buf, len); -} - -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -void -seahorse_md5_final(unsigned char digest[16], md5_ctx_t* ctx) -{ - int count = ctx->bytes[0] & 0x3f; /* Number of bytes in ctx->in */ - unsigned char *p = (unsigned char *)ctx->in + count; - - /* Set the first char of padding to 0x80. There is always room. */ - *p++ = 0x80; - - /* Bytes of padding needed to make 56 bytes (-8..55) */ - count = 56 - 1 - count; - - if (count < 0) { /* Padding forces an extra block */ - memset(p, 0, (unsigned int)count + 8); - byteSwap(ctx->in, 16); - seahorse_md5_transform(ctx->buf, ctx->in); - p = (unsigned char *)ctx->in; - count = 56; - } - memset(p, 0, (unsigned int)count); - byteSwap(ctx->in, 14); - - /* Append length in bits and transform */ - ctx->in[14] = ctx->bytes[0] << 3; - ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29; - seahorse_md5_transform(ctx->buf, ctx->in); - - byteSwap(ctx->buf, 4); - memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ -} - -/* The four core functions - F1 is optimized somewhat */ - -/* #define F1(x, y, z) (x & y | ~x & z) */ -#define F1(x, y, z) (z ^ (x & (y ^ z))) -#define F2(x, y, z) F1(z, x, y) -#define F3(x, y, z) (x ^ y ^ z) -#define F4(x, y, z) (y ^ (x | ~z)) - -/* This is the central step in the MD5 algorithm. */ -#define MD5STEP(f,w,x,y,z,in,s) \ - (w += f(x,y,z) + in, w = (w<>(32-s)) + x) - -/* - * The core of the MD5 algorithm, this alters an existing MD5 hash to - * reflect the addition of 16 longwords of new data. MD5Update blocks - * the data and converts bytes into longwords for this routine. - */ -void -seahorse_md5_transform(unsigned int buf[4], unsigned int const in[16]) -{ - register unsigned int a, b, c, d; - - a = buf[0]; - b = buf[1]; - c = buf[2]; - d = buf[3]; - - MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); - MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); - MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); - MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); - MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); - MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); - MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); - MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); - MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); - MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); - MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); - MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); - MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); - MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); - MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); - MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); - - MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); - MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); - MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); - MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); - MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); - MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); - MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); - MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); - MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); - MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); - MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); - MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); - MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); - MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); - MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); - MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); - - MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); - MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); - MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); - MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); - MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); - MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); - MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); - MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); - MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); - MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); - MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); - MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); - MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); - MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); - MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); - MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); - - MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); - MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); - MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); - MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); - MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); - MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); - MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); - MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); - MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); - MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); - MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); - MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); - MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); - MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); - MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); - MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; -} - diff -Nru seahorse-3.2.2/ssh/seahorse-algo.h seahorse-3.6.3/ssh/seahorse-algo.h --- seahorse-3.2.2/ssh/seahorse-algo.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-algo.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -/* - * A bunch of necessary algorithms that should (or will be) in Glib. - * We keep them here (with function names prefixed) until such a - * time as we can depend on them either in GTK or OS - */ - -/* - * This is the header file for the MD5 message-digest algorithm. - * The algorithm is due to Ron Rivest. This code was - * written by Colin Plumb in 1993, no copyright is claimed. - * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * MD5Context structure, pass it to MD5Init, call MD5Update as - * needed on buffers full of bytes, and then call MD5Final, which - * will fill a supplied 16-byte array with the digest. - * - * Changed so as no longer to depend on Colin Plumb's `usual.h' - * header definitions - * - Ian Jackson . - * Still in the public domain. - * - * Some minor additions by Stef Walter - */ - -#ifndef __SEAHORSE_ALGO_H__ -#define __SEAHORSE_ALGO_H__ - -#define MD5_LEN 16 -#define md5byte unsigned char - -typedef struct md5_ctx { - unsigned int buf[4]; - unsigned int bytes[2]; - unsigned int in[16]; -} md5_ctx_t; - -void seahorse_md5_init(md5_ctx_t* context); -void seahorse_md5_update(md5_ctx_t* context, const void* buf, unsigned len); -void seahorse_md5_final(unsigned char digest[MD5_LEN], md5_ctx_t* context); - -#endif /* __SEAHORSE_ALGO_H__ */ - - diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-actions.c seahorse-3.6.3/ssh/seahorse-ssh-actions.c --- seahorse-3.2.2/ssh/seahorse-ssh-actions.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-actions.c 2012-08-21 12:23:19.000000000 +0200 @@ -0,0 +1,136 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-ssh.h" +#include "seahorse-ssh-actions.h" +#include "seahorse-ssh-dialogs.h" +#include "seahorse-ssh-operation.h" + +#include "seahorse-action.h" +#include "seahorse-actions.h" +#include "seahorse-delete-dialog.h" +#include "seahorse-object.h" +#include "seahorse-object-list.h" +#include "seahorse-registry.h" +#include "seahorse-util.h" + +#include + +#include +#include + +GType seahorse_ssh_actions_get_type (void); +#define SEAHORSE_TYPE_SSH_ACTIONS (seahorse_ssh_actions_get_type ()) +#define SEAHORSE_SSH_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SSH_ACTIONS, SeahorseSshActions)) +#define SEAHORSE_SSH_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SSH_ACTIONS, SeahorseSshActionsClass)) +#define SEAHORSE_IS_SSH_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SSH_ACTIONS)) +#define SEAHORSE_IS_SSH_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SSH_ACTIONS)) +#define SEAHORSE_SSH_ACTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SSH_ACTIONS, SeahorseSshActionsClass)) + +typedef struct { + SeahorseActions parent_instance; +} SeahorseSshActions; + +typedef struct { + SeahorseActionsClass parent_class; +} SeahorseSshActionsClass; + +G_DEFINE_TYPE (SeahorseSshActions, seahorse_ssh_actions, SEAHORSE_TYPE_ACTIONS); + +static const char* UI_DEFINITION = ""\ +""\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +" "\ +""; + +static void +on_ssh_upload (GtkAction* action, + gpointer user_data) +{ + SeahorseActions *actions = SEAHORSE_ACTIONS (user_data); + SeahorseCatalog *catalog; + GList *keys, *objects, *l; + + keys = NULL; + catalog = seahorse_actions_get_catalog (actions); + + if (catalog != NULL) { + objects = seahorse_catalog_get_selected_objects (catalog); + for (l = objects; l != NULL; l = g_list_next (l)) { + if (SEAHORSE_IS_SSH_KEY (l->data)) + keys = g_list_prepend (keys, l->data); + } + g_list_free (objects); + } + + seahorse_ssh_upload_prompt (keys, seahorse_action_get_window (action)); + g_list_free (keys); +} + +static const GtkActionEntry KEYS_ACTIONS[] = { + { "remote-ssh-upload", NULL, N_ ("Configure Key for _Secure Shell..."), "", + N_ ("Send public Secure Shell key to another machine, and enable logins using that key."), + G_CALLBACK (on_ssh_upload) }, +}; + +static void +seahorse_ssh_actions_init (SeahorseSshActions *self) +{ + GtkActionGroup *actions = GTK_ACTION_GROUP (self); + gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (actions, KEYS_ACTIONS, G_N_ELEMENTS (KEYS_ACTIONS), self); + seahorse_actions_register_definition (SEAHORSE_ACTIONS (self), UI_DEFINITION); +} + +static void +seahorse_ssh_actions_class_init (SeahorseSshActionsClass *klass) +{ + +} + +GtkActionGroup * +seahorse_ssh_actions_instance (void) +{ + static GtkActionGroup *actions = NULL; + + if (actions == NULL) { + actions = g_object_new (SEAHORSE_TYPE_SSH_ACTIONS, + "name", "SshKey", + NULL); + g_object_add_weak_pointer (G_OBJECT (actions), + (gpointer *)&actions); + } else { + g_object_ref (actions); + } + + return actions; +} diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-actions.h seahorse-3.6.3/ssh/seahorse-ssh-actions.h --- seahorse-3.2.2/ssh/seahorse-ssh-actions.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-actions.h 2012-08-21 12:23:19.000000000 +0200 @@ -0,0 +1,30 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 __SEAHORSE_SSH_ACTIONS_H__ +#define __SEAHORSE_SSH_ACTIONS_H__ + +#include + +GtkActionGroup * seahorse_ssh_actions_instance (void); + +#endif diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-backend.c seahorse-3.6.3/ssh/seahorse-ssh-backend.c --- seahorse-3.2.2/ssh/seahorse-ssh-backend.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-backend.c 2012-08-21 12:23:19.000000000 +0200 @@ -0,0 +1,213 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 "config.h" + +#include "seahorse-ssh-backend.h" +#include "seahorse-ssh-dialogs.h" +#include "seahorse-ssh-source.h" + +#include "seahorse-backend.h" + +#include + +enum { + PROP_0, + PROP_NAME, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ACTIONS +}; + +static SeahorseSshBackend *ssh_backend = NULL; + +struct _SeahorseSshBackend { + GObject parent; + SeahorseSSHSource *dot_ssh; +}; + +struct _SeahorseSshBackendClass { + GObjectClass parent_class; +}; + +static void seahorse_ssh_backend_iface (SeahorseBackendIface *iface); + +static void seahorse_ssh_backend_collection_init (GcrCollectionIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseSshBackend, seahorse_ssh_backend, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_ssh_backend_collection_init); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_BACKEND, seahorse_ssh_backend_iface); +); + +static void +seahorse_ssh_backend_init (SeahorseSshBackend *self) +{ + g_return_if_fail (ssh_backend == NULL); + ssh_backend = self; + + seahorse_ssh_generate_register (); +} + +static void +seahorse_ssh_backend_constructed (GObject *obj) +{ + SeahorseSshBackend *self = SEAHORSE_SSH_BACKEND (obj); + + G_OBJECT_CLASS (seahorse_ssh_backend_parent_class)->constructed (obj); + + self->dot_ssh = seahorse_ssh_source_new (); + seahorse_place_load_async (SEAHORSE_PLACE (self->dot_ssh), NULL, NULL, NULL); +} + +static void +seahorse_ssh_backend_get_property (GObject *obj, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + switch (prop_id) { + case PROP_NAME: + g_value_set_string (value, SEAHORSE_SSH_NAME); + break; + case PROP_LABEL: + g_value_set_string (value, _("Secure Shell")); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, _("Keys used to connect securely to other computers")); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } +} + +static void +seahorse_ssh_backend_finalize (GObject *obj) +{ + SeahorseSshBackend *self = SEAHORSE_SSH_BACKEND (obj); + + g_clear_object (&self->dot_ssh); + g_return_if_fail (ssh_backend == self); + ssh_backend = NULL; + + G_OBJECT_CLASS (seahorse_ssh_backend_parent_class)->finalize (obj); +} + +static void +seahorse_ssh_backend_class_init (SeahorseSshBackendClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + gobject_class->constructed = seahorse_ssh_backend_constructed; + gobject_class->finalize = seahorse_ssh_backend_finalize; + gobject_class->get_property = seahorse_ssh_backend_get_property; + + g_object_class_override_property (gobject_class, PROP_NAME, "name"); + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); +} + +static guint +seahorse_ssh_backend_get_length (GcrCollection *collection) +{ + return 1; +} + +static GList * +seahorse_ssh_backend_get_objects (GcrCollection *collection) +{ + SeahorseSshBackend *self = SEAHORSE_SSH_BACKEND (collection); + return g_list_append (NULL, self->dot_ssh); +} + +static gboolean +seahorse_ssh_backend_contains (GcrCollection *collection, + GObject *object) +{ + SeahorseSshBackend *self = SEAHORSE_SSH_BACKEND (collection); + return G_OBJECT (self->dot_ssh) == object; +} + +static void +seahorse_ssh_backend_collection_init (GcrCollectionIface *iface) +{ + iface->contains = seahorse_ssh_backend_contains; + iface->get_length = seahorse_ssh_backend_get_length; + iface->get_objects = seahorse_ssh_backend_get_objects; +} + +static SeahorsePlace * +seahorse_ssh_backend_lookup_place (SeahorseBackend *backend, + const gchar *uri) +{ + SeahorseSshBackend *self = SEAHORSE_SSH_BACKEND (backend); + gchar *our_uri = NULL; + gboolean match; + + if (self->dot_ssh) { + g_object_get (self->dot_ssh, "uri", &our_uri, NULL); + match = (our_uri && g_str_equal (our_uri, uri)); + g_free (our_uri); + if (match) + return SEAHORSE_PLACE (self->dot_ssh); + } + + return NULL; +} + +static void +seahorse_ssh_backend_iface (SeahorseBackendIface *iface) +{ + iface->lookup_place = seahorse_ssh_backend_lookup_place; +} + +void +seahorse_ssh_backend_initialize (void) +{ + SeahorseSshBackend *self; + + g_return_if_fail (ssh_backend == NULL); + self = g_object_new (SEAHORSE_TYPE_SSH_BACKEND, NULL); + + seahorse_backend_register (SEAHORSE_BACKEND (self)); + g_object_unref (self); + + g_return_if_fail (ssh_backend != NULL); +} + +SeahorseSshBackend * +seahorse_ssh_backend_get (void) +{ + g_return_val_if_fail (ssh_backend, NULL); + return ssh_backend; +} + +SeahorseSSHSource * +seahorse_ssh_backend_get_dot_ssh (SeahorseSshBackend *self) +{ + self = self ? self : seahorse_ssh_backend_get (); + g_return_val_if_fail (SEAHORSE_IS_SSH_BACKEND (self), NULL); + g_return_val_if_fail (self->dot_ssh, NULL); + return self->dot_ssh; +} diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-backend.h seahorse-3.6.3/ssh/seahorse-ssh-backend.h --- seahorse-3.2.2/ssh/seahorse-ssh-backend.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-backend.h 2012-08-21 12:23:19.000000000 +0200 @@ -0,0 +1,48 @@ +/* + * Seahorse + * + * Copyright (C) 2008 Stefan Walter + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 SEAHORSE_SSH_BACKEND_H_ +#define SEAHORSE_SSH_BACKEND_H_ + +#include "seahorse-ssh.h" +#include "seahorse-ssh-source.h" + +G_BEGIN_DECLS + +#define SEAHORSE_SSH_STR "openssh" + +#define SEAHORSE_TYPE_SSH_BACKEND (seahorse_ssh_backend_get_type ()) +#define SEAHORSE_SSH_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SSH_BACKEND, SeahorseSshBackend)) +#define SEAHORSE_SSH_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SSH_BACKEND, SeahorseSshBackendClass)) +#define SEAHORSE_IS_SSH_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SSH_BACKEND)) +#define SEAHORSE_IS_SSH_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SSH_BACKEND)) +#define SEAHORSE_SSH_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SSH_BACKEND, SeahorseSshBackendClass)) + +typedef struct _SeahorseSshBackend SeahorseSshBackend; +typedef struct _SeahorseSshBackendClass SeahorseSshBackendClass; + +GType seahorse_ssh_backend_get_type (void) G_GNUC_CONST; + +SeahorseSshBackend * seahorse_ssh_backend_get (void); + +SeahorseSSHSource * seahorse_ssh_backend_get_dot_ssh (SeahorseSshBackend *self); + +#endif /*SEAHORSE_SSH_BACKEND_H_*/ diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-commands.c seahorse-3.6.3/ssh/seahorse-ssh-commands.c --- seahorse-3.2.2/ssh/seahorse-ssh-commands.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-commands.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,252 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include - -#include "seahorse-ssh.h" -#include "seahorse-ssh-commands.h" -#include "seahorse-ssh-dialogs.h" -#include "seahorse-ssh-operation.h" - -#include "seahorse-object.h" -#include "seahorse-registry.h" -#include "seahorse-util.h" - -enum { - PROP_0 -}; - -struct _SeahorseSshCommandsPrivate { - GtkActionGroup* command_actions; -}; - -G_DEFINE_TYPE (SeahorseSshCommands, seahorse_ssh_commands, SEAHORSE_TYPE_COMMANDS); - -static const char* UI_DEFINITION = ""\ -""\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -" "\ -""; - -static SeahorseObjectPredicate commands_predicate = { 0, }; - -/* ----------------------------------------------------------------------------- - * INTERNAL - */ - -static void -on_ssh_upload (GtkAction* action, SeahorseSshCommands* self) -{ - SeahorseView *view; - GList* ssh_keys; - - g_return_if_fail (SEAHORSE_IS_SSH_COMMANDS (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - ssh_keys = seahorse_view_get_selected_matching (view, &commands_predicate); - if (ssh_keys == NULL) - return; - - /* Indicate what we're actually going to operate on */ - seahorse_view_set_selected_objects (view, ssh_keys); - - seahorse_ssh_upload_prompt (ssh_keys, seahorse_commands_get_window (SEAHORSE_COMMANDS (self))); - g_list_free (ssh_keys); -} - -static const GtkActionEntry COMMAND_ENTRIES[] = { - { "remote-ssh-upload", NULL, N_ ("Configure Key for _Secure Shell..."), "", - N_ ("Send public Secure Shell key to another machine, and enable logins using that key."), - G_CALLBACK (on_ssh_upload) } -}; - -/* ----------------------------------------------------------------------------- - * OBJECT - */ - -static void -seahorse_ssh_commands_show_properties (SeahorseCommands* base, SeahorseObject* obj) -{ - g_return_if_fail (SEAHORSE_IS_OBJECT (obj)); - g_return_if_fail (seahorse_object_get_tag (obj) == SEAHORSE_SSH_TYPE); - g_return_if_fail (G_TYPE_FROM_INSTANCE (G_OBJECT (obj)) == SEAHORSE_SSH_TYPE_KEY); - - seahorse_ssh_key_properties_show (SEAHORSE_SSH_KEY (obj), seahorse_commands_get_window (base)); -} - -static gboolean -seahorse_ssh_commands_delete_objects (SeahorseCommands* base, GList* objects) -{ - guint num; - gchar* prompt; - GList *l; - GtkWidget *parent; - GError *error = NULL; - - num = g_list_length (objects); - if (num == 0) { - return TRUE; - } else if (num == 1) { - prompt = g_strdup_printf (_("Are you sure you want to delete the secure shell key '%s'?"), - seahorse_object_get_label (objects->data)); - } else { - prompt = g_strdup_printf (_("Are you sure you want to delete %d secure shell keys?"), num); - } - - parent = GTK_WIDGET (seahorse_commands_get_window (base)); - if (!seahorse_util_prompt_delete (prompt, NULL)) { - g_free (prompt); - return FALSE; - } - - g_free (prompt); - for (l = objects; l != NULL; l = g_list_next (l)) { - if (!seahorse_ssh_op_delete_sync (l->data, &error)) { - seahorse_util_handle_error (&error, parent, _("Couldn't delete key")); - return FALSE; - } - } - - return TRUE; -} - -static GObject* -seahorse_ssh_commands_constructor (GType type, guint n_props, GObjectConstructParam *props) -{ - GObject *obj = G_OBJECT_CLASS (seahorse_ssh_commands_parent_class)->constructor (type, n_props, props); - SeahorseSshCommands *self = NULL; - SeahorseCommands *base; - SeahorseView *view; - - if (obj) { - self = SEAHORSE_SSH_COMMANDS (obj); - base = SEAHORSE_COMMANDS (obj); - - view = seahorse_commands_get_view (SEAHORSE_COMMANDS (self)); - g_return_val_if_fail (view, NULL); - - self->pv->command_actions = gtk_action_group_new ("ssh"); - gtk_action_group_set_translation_domain (self->pv->command_actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (self->pv->command_actions, COMMAND_ENTRIES, - G_N_ELEMENTS (COMMAND_ENTRIES), self); - - seahorse_view_register_commands (view, &commands_predicate, base); - seahorse_view_register_ui (view, &commands_predicate, UI_DEFINITION, self->pv->command_actions); - } - - return obj; -} - -static void -seahorse_ssh_commands_init (SeahorseSshCommands *self) -{ - self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_SSH_COMMANDS, SeahorseSshCommandsPrivate); - -} - -static void -seahorse_ssh_commands_dispose (GObject *obj) -{ - SeahorseSshCommands *self = SEAHORSE_SSH_COMMANDS (obj); - - if (self->pv->command_actions) - g_object_unref (self->pv->command_actions); - self->pv->command_actions = NULL; - - G_OBJECT_CLASS (seahorse_ssh_commands_parent_class)->dispose (obj); -} - -static void -seahorse_ssh_commands_finalize (GObject *obj) -{ - SeahorseSshCommands *self = SEAHORSE_SSH_COMMANDS (obj); - - g_assert (!self->pv->command_actions); - - G_OBJECT_CLASS (seahorse_ssh_commands_parent_class)->finalize (obj); -} - -static void -seahorse_ssh_commands_set_property (GObject *obj, guint prop_id, const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_ssh_commands_get_property (GObject *obj, guint prop_id, GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); - break; - } -} - -static void -seahorse_ssh_commands_class_init (SeahorseSshCommandsClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - seahorse_ssh_commands_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (SeahorseSshCommandsPrivate)); - - gobject_class->constructor = seahorse_ssh_commands_constructor; - gobject_class->dispose = seahorse_ssh_commands_dispose; - gobject_class->finalize = seahorse_ssh_commands_finalize; - gobject_class->set_property = seahorse_ssh_commands_set_property; - gobject_class->get_property = seahorse_ssh_commands_get_property; - - SEAHORSE_COMMANDS_CLASS (klass)->show_properties = seahorse_ssh_commands_show_properties; - SEAHORSE_COMMANDS_CLASS (klass)->delete_objects = seahorse_ssh_commands_delete_objects; - - commands_predicate.type = SEAHORSE_TYPE_SSH_KEY; - commands_predicate.usage = SEAHORSE_USAGE_PRIVATE_KEY; - - /* Register this class as a commands */ - seahorse_registry_register_type (seahorse_registry_get (), SEAHORSE_TYPE_SSH_COMMANDS, - SEAHORSE_SSH_TYPE_STR, "commands", NULL, NULL); -} - -/* ----------------------------------------------------------------------------- - * PUBLIC - */ - -SeahorseSshCommands* -seahorse_ssh_commands_new (void) -{ - return g_object_new (SEAHORSE_TYPE_SSH_COMMANDS, NULL); -} diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-commands.h seahorse-3.6.3/ssh/seahorse-ssh-commands.h --- seahorse-3.2.2/ssh/seahorse-ssh-commands.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-commands.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * Copyright (C) 2011 Collabora Ltd. - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 __SEAHORSE_SSH_COMMANDS_H__ -#define __SEAHORSE_SSH_COMMANDS_H__ - -#include -#include - -#include "seahorse-commands.h" -#include "seahorse-object.h" - -#define SEAHORSE_TYPE_SSH_COMMANDS (seahorse_ssh_commands_get_type ()) -#define SEAHORSE_SSH_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SSH_COMMANDS, SeahorseSshCommands)) -#define SEAHORSE_SSH_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SSH_COMMANDS, SeahorseSshCommandsClass)) -#define SEAHORSE_IS_SSH_COMMANDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SSH_COMMANDS)) -#define SEAHORSE_IS_SSH_COMMANDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SSH_COMMANDS)) -#define SEAHORSE_SSH_COMMANDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SSH_COMMANDS, SeahorseSshCommandsClass)) - -typedef struct _SeahorseSshCommands SeahorseSshCommands; -typedef struct _SeahorseSshCommandsClass SeahorseSshCommandsClass; -typedef struct _SeahorseSshCommandsPrivate SeahorseSshCommandsPrivate; - -struct _SeahorseSshCommands { - SeahorseCommands parent_instance; - SeahorseSshCommandsPrivate *pv; -}; - -struct _SeahorseSshCommandsClass { - SeahorseCommandsClass parent_class; -}; - -GType seahorse_ssh_commands_get_type (void); - -SeahorseSshCommands* seahorse_ssh_commands_new (void); - - -#endif diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-deleter.c seahorse-3.6.3/ssh/seahorse-ssh-deleter.c --- seahorse-3.2.2/ssh/seahorse-ssh-deleter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-deleter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,205 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-ssh-key.h" +#include "seahorse-ssh-deleter.h" +#include "seahorse-ssh-operation.h" + +#include "seahorse-delete-dialog.h" + +#include + +#define SEAHORSE_SSH_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SSH_DELETER, SeahorseSshDeleterClass)) +#define SEAHORSE_IS_SSH_DELETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SSH_DELETER)) +#define SEAHORSE_SSH_DELETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SSH_DELETER, SeahorseSshDeleterClass)) + +typedef struct _SeahorseSshDeleterClass SeahorseSshDeleterClass; + +struct _SeahorseSshDeleter { + SeahorseDeleter parent; + gboolean have_private; + GList *keys; +}; + +struct _SeahorseSshDeleterClass { + SeahorseDeleterClass parent_class; +}; + +G_DEFINE_TYPE (SeahorseSshDeleter, seahorse_ssh_deleter, SEAHORSE_TYPE_DELETER); + +static void +seahorse_ssh_deleter_init (SeahorseSshDeleter *self) +{ + +} + +static void +seahorse_ssh_deleter_finalize (GObject *obj) +{ + SeahorseSshDeleter *self = SEAHORSE_SSH_DELETER (obj); + + g_list_free_full (self->keys, g_object_unref); + + G_OBJECT_CLASS (seahorse_ssh_deleter_parent_class)->finalize (obj); +} + +static GtkDialog * +seahorse_ssh_deleter_create_confirm (SeahorseDeleter *deleter, + GtkWindow *parent) +{ + SeahorseSshDeleter *self = SEAHORSE_SSH_DELETER (deleter); + const gchar *confirm; + GtkDialog *dialog; + gchar *prompt; + guint num; + + num = g_list_length (self->keys); + if (self->have_private) { + g_return_val_if_fail (num == 1, NULL); + prompt = g_strdup_printf (_("Are you sure you want to delete the secure shell key '%s'?"), + seahorse_object_get_label (SEAHORSE_OBJECT (self->keys->data))); + confirm = _("I understand that this secret key will be permanently deleted."); + + } else if (num == 1) { + prompt = g_strdup_printf (_("Are you sure you want to delete the secure shell key '%s'?"), + seahorse_object_get_label (SEAHORSE_OBJECT (self->keys->data))); + confirm = NULL; + + } else { + prompt = g_strdup_printf (ngettext ("Are you sure you want to delete %d secure shell key?", + "Are you sure you want to delete %d secure shell keys?", + num), + num); + confirm = NULL; + } + + dialog = seahorse_delete_dialog_new (parent, "%s", prompt); + g_free (prompt); + + if (confirm) { + seahorse_delete_dialog_set_check_label (SEAHORSE_DELETE_DIALOG (dialog), confirm); + seahorse_delete_dialog_set_check_require (SEAHORSE_DELETE_DIALOG (dialog), TRUE); + } + + return dialog; +} + +static GList * +seahorse_ssh_deleter_get_objects (SeahorseDeleter *deleter) +{ + SeahorseSshDeleter *self = SEAHORSE_SSH_DELETER (deleter); + return self->keys; +} + +static gboolean +seahorse_ssh_deleter_add_object (SeahorseDeleter *deleter, + GObject *object) +{ + SeahorseSshDeleter *self = SEAHORSE_SSH_DELETER (deleter); + SeahorseUsage usage; + + if (!SEAHORSE_IS_SSH_KEY (object)) + return FALSE; + if (self->have_private) + return FALSE; + usage = seahorse_object_get_usage (SEAHORSE_OBJECT (object)); + if (usage == SEAHORSE_USAGE_PRIVATE_KEY) { + if (self->keys != NULL) + return FALSE; + self->have_private = TRUE; + } + + self->keys = g_list_append (self->keys, g_object_ref (object)); + return TRUE; +} + +static void +seahorse_ssh_deleter_delete_async (SeahorseDeleter *deleter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseSshDeleter *self = SEAHORSE_SSH_DELETER (deleter); + GSimpleAsyncResult *res; + GError *error = NULL; + GList *l; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_ssh_deleter_delete_async); + + for (l = self->keys; l != NULL && !g_cancellable_is_cancelled (cancellable); + l = g_list_next (l)) { + if (!seahorse_ssh_op_delete_sync (l->data, &error)) { + g_simple_async_result_take_error (res, error); + break; + } + } + + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); +} + +static gboolean +seahorse_ssh_deleter_delete_finish (SeahorseDeleter *deleter, + GAsyncResult *result, + GError **error) +{ + SeahorseSshDeleter *self = SEAHORSE_SSH_DELETER (deleter); + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), + seahorse_ssh_deleter_delete_async), FALSE); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + + return TRUE; +} + +static void +seahorse_ssh_deleter_class_init (SeahorseSshDeleterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + SeahorseDeleterClass *deleter_class = SEAHORSE_DELETER_CLASS (klass); + + gobject_class->finalize = seahorse_ssh_deleter_finalize; + + deleter_class->add_object = seahorse_ssh_deleter_add_object; + deleter_class->create_confirm = seahorse_ssh_deleter_create_confirm; + deleter_class->delete_async = seahorse_ssh_deleter_delete_async; + deleter_class->delete_finish = seahorse_ssh_deleter_delete_finish; + deleter_class->get_objects = seahorse_ssh_deleter_get_objects; +} + +SeahorseDeleter * +seahorse_ssh_deleter_new (SeahorseSSHKey *item) +{ + SeahorseDeleter *deleter; + + deleter = g_object_new (SEAHORSE_TYPE_SSH_DELETER, NULL); + if (!seahorse_deleter_add_object (deleter, G_OBJECT (item))) + g_assert_not_reached (); + + return deleter; +} diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-deleter.h seahorse-3.6.3/ssh/seahorse-ssh-deleter.h --- seahorse-3.2.2/ssh/seahorse-ssh-deleter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-deleter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * Seahorse + * + * Copyright (C) 2011 Collabora Ltd. + * + * This program 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 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_SSH_DELETER_H__ +#define __SEAHORSE_SSH_DELETER_H__ + +#include + +#include "seahorse-deleter.h" +#include "seahorse-ssh-key.h" + +#define SEAHORSE_TYPE_SSH_DELETER (seahorse_ssh_deleter_get_type ()) +#define SEAHORSE_SSH_DELETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SSH_DELETER, SeahorseSshDeleter)) +#define SEAHORSE_IS_SSH_DELETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SSH_DELETER)) + +typedef struct _SeahorseSshDeleter SeahorseSshDeleter; + +GType seahorse_ssh_deleter_get_type (void) G_GNUC_CONST; + +SeahorseDeleter * seahorse_ssh_deleter_new (SeahorseSSHKey *key); + +#endif /* __SEAHORSE_SSH_DELETER_H__ */ diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-exporter.c seahorse-3.6.3/ssh/seahorse-ssh-exporter.c --- seahorse-3.2.2/ssh/seahorse-ssh-exporter.c 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-exporter.c 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,321 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#include "config.h" + +#include "seahorse-ssh.h" +#include "seahorse-ssh-key.h" +#include "seahorse-ssh-exporter.h" +#include "seahorse-ssh-source.h" + +#include "seahorse-exporter.h" +#include "seahorse-object.h" +#include "seahorse-util.h" + +#include + +#include + +#define SEAHORSE_SSH_EXPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SSH_EXPORTER, SeahorseSshExporterClass)) +#define SEAHORSE_IS_SSH_EXPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SSH_EXPORTER)) +#define SEAHORSE_SSH_EXPORTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SSH_EXPORTER, SeahorseSshExporterClass)) + +typedef struct _SeahorseSshExporterClass SeahorseSshExporterClass; + +struct _SeahorseSshExporter { + GObject parent; + SeahorseSSHKey *key; + GList *objects; + gboolean secret; +}; + +struct _SeahorseSshExporterClass { + GObjectClass parent_class; +}; + +enum { + PROP_0, + PROP_FILENAME, + PROP_CONTENT_TYPE, + PROP_FILE_FILTER, + PROP_SECRET +}; + +static void seahorse_ssh_exporter_iface_init (SeahorseExporterIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseSshExporter, seahorse_ssh_exporter, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTER, seahorse_ssh_exporter_iface_init); +); + +static gchar * +calc_filename (SeahorseSshExporter *self) +{ + SeahorseSSHKeyData *data; + const gchar *location = NULL; + const gchar *basename = NULL; + gchar *filename; + + g_return_val_if_fail (self->key, NULL); + + data = seahorse_ssh_key_get_data (self->key); + if (data && !data->partial) { + if (self->secret && data->privfile) + location = data->privfile; + else if (!self->secret && data->pubfile) + location = data->pubfile; + if (location != NULL) + return g_path_get_basename (location); + } + + basename = seahorse_object_get_nickname (SEAHORSE_OBJECT (self->key)); + if (basename == NULL) + basename = _("Ssh Key"); + + if (self->secret) { + filename = g_strdup_printf ("id_%s", basename); + g_strstrip (filename); + g_strdelimit (filename, SEAHORSE_BAD_FILENAME_CHARS " ", '_'); + return filename; + } else { + filename = g_strdup_printf ("%s.pub", basename); + g_strstrip (filename); + g_strdelimit (filename, SEAHORSE_BAD_FILENAME_CHARS, '_'); + return filename; + } +} + +static const gchar * +calc_content_type (SeahorseSshExporter *self) +{ + if (self->secret) + return "application/x-pem-key"; + else + return "application/x-ssh-key"; +} + +static GtkFileFilter * +calc_file_filter (SeahorseSshExporter *self) +{ + GtkFileFilter *filter = gtk_file_filter_new (); + + if (self->secret) { + gtk_file_filter_set_name (filter, _("Secret SSH keys")); + gtk_file_filter_add_mime_type (filter, "application/x-pem-key"); + gtk_file_filter_add_pattern (filter, "id_*"); + } else { + gtk_file_filter_set_name (filter, _("Public SSH keys")); + gtk_file_filter_add_mime_type (filter, "application/x-ssh-key"); + gtk_file_filter_add_pattern (filter, "*.pub"); + } + + return filter; +} + +static void +seahorse_ssh_exporter_init (SeahorseSshExporter *self) +{ + +} + +static void +seahorse_ssh_exporter_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + SeahorseSshExporter *self = SEAHORSE_SSH_EXPORTER (object); + + switch (prop_id) { + case PROP_FILENAME: + g_value_take_string (value, calc_filename (self)); + break; + case PROP_CONTENT_TYPE: + g_value_set_string (value, calc_content_type (self)); + break; + case PROP_FILE_FILTER: + g_value_take_object (value, calc_file_filter (self)); + break; + case PROP_SECRET: + g_value_set_boolean (value, self->secret); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +seahorse_ssh_exporter_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + SeahorseSshExporter *self = SEAHORSE_SSH_EXPORTER (object); + + switch (prop_id) { + case PROP_SECRET: + self->secret = g_value_get_boolean (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +seahorse_ssh_exporter_finalize (GObject *obj) +{ + SeahorseSshExporter *self = SEAHORSE_SSH_EXPORTER (obj); + + g_clear_object (&self->key); + + G_OBJECT_CLASS (seahorse_ssh_exporter_parent_class)->finalize (obj); +} + +static void +seahorse_ssh_exporter_class_init (SeahorseSshExporterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->finalize = seahorse_ssh_exporter_finalize; + gobject_class->set_property = seahorse_ssh_exporter_set_property; + gobject_class->get_property = seahorse_ssh_exporter_get_property; + + g_object_class_override_property (gobject_class, PROP_FILENAME, "filename"); + g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type"); + g_object_class_override_property (gobject_class, PROP_FILE_FILTER, "file-filter"); + + g_object_class_install_property (gobject_class, PROP_SECRET, + g_param_spec_boolean ("secret", "Secret", "Secret key export", + FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); +} + +static GList * +seahorse_ssh_exporter_get_objects (SeahorseExporter *exporter) +{ + SeahorseSshExporter *self = SEAHORSE_SSH_EXPORTER (exporter); + return self->objects; +} + +static gboolean +seahorse_ssh_exporter_add_object (SeahorseExporter *exporter, + GObject *object) +{ + SeahorseSshExporter *self = SEAHORSE_SSH_EXPORTER (exporter); + SeahorseSSHKey *key; + SeahorseUsage usage; + + if (SEAHORSE_IS_SSH_KEY (object) && !self->key) { + key = SEAHORSE_SSH_KEY (object); + if (self->secret) { + usage = seahorse_object_get_usage (SEAHORSE_OBJECT (object)); + if (usage != SEAHORSE_USAGE_PRIVATE_KEY) + return FALSE; + } + self->key = g_object_ref (key); + self->objects = g_list_append (self->objects, self->key); + return TRUE; + } + + return FALSE; +} + +static void +seahorse_ssh_exporter_export_async (SeahorseExporter *exporter, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SeahorseSshExporter *self = SEAHORSE_SSH_EXPORTER (exporter); + GSimpleAsyncResult *res; + + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + seahorse_ssh_exporter_export_async); + + g_simple_async_result_complete_in_idle (res); + g_object_unref (res); + } + +static gpointer +seahorse_ssh_exporter_export_finish (SeahorseExporter *exporter, + GAsyncResult *result, + gsize *size, + GError **error) +{ + SeahorseSshExporter *self = SEAHORSE_SSH_EXPORTER (exporter); + SeahorseSSHKeyData *keydata; + gpointer results = NULL; + SeahorsePlace *place; + gsize n_results; + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (exporter), + seahorse_ssh_exporter_export_async), NULL); + + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return NULL; + + keydata = seahorse_ssh_key_get_data (self->key); + + if (self->secret) { + place = seahorse_object_get_place (SEAHORSE_OBJECT (self->key)); + results = seahorse_ssh_source_export_private (SEAHORSE_SSH_SOURCE (place), + self->key, &n_results, error); + } else { + if (keydata->pubfile) { + g_assert (keydata->rawdata); + results = g_strdup_printf ("%s\n", keydata->rawdata); + n_results = strlen (results); + } else { + g_set_error (error, SEAHORSE_ERROR, 0, "%s", + _("No public key file is available for this key.")); + } + } + + *size = n_results; + return results; +} + +static void +seahorse_ssh_exporter_iface_init (SeahorseExporterIface *iface) +{ + iface->add_object = seahorse_ssh_exporter_add_object; + iface->export_async = seahorse_ssh_exporter_export_async; + iface->export_finish = seahorse_ssh_exporter_export_finish; + iface->get_objects = seahorse_ssh_exporter_get_objects; +} + +SeahorseExporter * +seahorse_ssh_exporter_new (GObject *object, + gboolean secret) +{ + SeahorseExporter *exporter; + + exporter = g_object_new (SEAHORSE_TYPE_SSH_EXPORTER, + "secret", secret, + NULL); + + if (!seahorse_exporter_add_object (exporter, object)) + g_assert_not_reached (); + + return exporter; +} diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-exporter.h seahorse-3.6.3/ssh/seahorse-ssh-exporter.h --- seahorse-3.2.2/ssh/seahorse-ssh-exporter.h 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-exporter.h 2012-11-09 11:08:13.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * Seahorse + * + * Copyright (C) 2011 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, write to the + * Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Stef Walter + */ + +#ifndef __SEAHORSE_SSH_EXPORTER_H__ +#define __SEAHORSE_SSH_EXPORTER_H__ + +#include + +#include "seahorse-exporter.h" + +#define SEAHORSE_TYPE_SSH_EXPORTER (seahorse_ssh_exporter_get_type ()) +#define SEAHORSE_SSH_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SSH_EXPORTER, SeahorseSshExporter)) +#define SEAHORSE_IS_SSH_EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SSH_EXPORTER)) + +typedef struct _SeahorseSshExporter SeahorseSshExporter; + +GType seahorse_ssh_exporter_get_type (void) G_GNUC_CONST; + +SeahorseExporter * seahorse_ssh_exporter_new (GObject *object, + gboolean secret); + +#endif /* __SEAHORSE_SSH_EXPORTER_H__ */ diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-generate.c seahorse-3.6.3/ssh/seahorse-ssh-generate.c --- seahorse-3.2.2/ssh/seahorse-ssh-generate.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-generate.c 2012-08-21 12:23:19.000000000 +0200 @@ -26,13 +26,14 @@ #include +#include "seahorse-ssh-backend.h" #include "seahorse-ssh-dialogs.h" #include "seahorse-ssh-source.h" #include "seahorse-ssh-key.h" -#include "seahorse-ssh.h" #include "seahorse-ssh-operation.h" -#include "seahorse-gtkstock.h" +#include "seahorse-action.h" +#include "seahorse-icons.h" #include "seahorse-progress.h" #include "seahorse-registry.h" #include "seahorse-util.h" @@ -46,18 +47,12 @@ static void on_ssh_generate_key (GtkAction *action, gpointer unused) { - SeahorseSource* sksrc; - - g_return_if_fail (GTK_IS_ACTION (action)); - - sksrc = seahorse_context_find_source (seahorse_context_instance (), SEAHORSE_SSH_TYPE, SEAHORSE_LOCATION_LOCAL); - g_return_if_fail (sksrc != NULL); - - seahorse_ssh_generate_show (SEAHORSE_SSH_SOURCE (sksrc), NULL); + seahorse_ssh_generate_show (seahorse_ssh_backend_get_dot_ssh (NULL), + seahorse_action_get_window (action)); } static const GtkActionEntry ACTION_ENTRIES[] = { - { "ssh-generate-key", SEAHORSE_SSH_STOCK_ICON, N_ ("Secure Shell Key"), "", + { "ssh-generate-key", GCR_ICON_KEY_PAIR, N_ ("Secure Shell Key"), "", N_("Used to access other computers (eg: via a terminal)"), G_CALLBACK (on_ssh_generate_key) } }; @@ -221,10 +216,6 @@ g_signal_connect (seahorse_widget_get_toplevel (swidget), "response", G_CALLBACK (on_response), swidget); - widget = seahorse_widget_get_widget (swidget, "ssh-image"); - g_return_if_fail (widget != NULL); - gtk_image_set_from_stock (GTK_IMAGE (widget), SEAHORSE_STOCK_KEY_SSH, GTK_ICON_SIZE_DIALOG); - /* on_change() gets called, bits entry is setup */ widget = seahorse_widget_get_widget (swidget, "algorithm-choice"); g_return_if_fail (widget != NULL); diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-generate.xml seahorse-3.6.3/ssh/seahorse-ssh-generate.xml --- seahorse-3.2.2/ssh/seahorse-ssh-generate.xml 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-generate.xml 2012-11-12 08:32:13.000000000 +0100 @@ -106,6 +106,8 @@ True False 0 + 48 + gcr-key-pair @@ -136,7 +138,7 @@ False 0 0 - A Secure Shell (SSH) key lets you connect securely to trusted computers using SSH, without entering a different password for each of them. + A Secure Shell (SSH) key lets you connect securely to other computers. True @@ -189,27 +191,29 @@ True False - + True False + 6 + 12 2 2 - 12 - 3 True False 1 0 - _Key Description: + _Description: True True email-entry - GTK_FILL - + 0 + 0 + 1 + 1 @@ -217,14 +221,15 @@ 180 True True - True ● True + True 1 - 2 - + 0 + 1 + 1 @@ -233,31 +238,19 @@ False 0 3 - <i>Use your email address, and any other reminder you need about what this key is for.</i> + <i>Your email address, or a reminder of what this key is for.</i> True True 1 - 2 1 - 2 - GTK_FILL - + 1 + 1 - - True - False - 0 - - - 1 - 2 - GTK_FILL - - + @@ -280,105 +273,99 @@ True True - + True False - 0 - 0 - 0 - 0 - 12 + 20 + 6 + 12 + 2 + 2 - + True False - 2 - 2 - 12 - 6 - - - True - False - 0 - Encryption _Type: - True - algorithm-choice - - - GTK_FILL - - - - - - True - False - 0 - Key _Strength (bits): - True - bits-entry - - - 1 - 2 - GTK_FILL - - - + 0 + Encryption _Type: + True + algorithm-choice + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Key _Strength (bits): + True + bits-entry + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + 0 + 0 - + True False - 0 - 0 - 0 - - - True - False - 1 - 0 - - RSA - DSA - - - + 0 + 1 + + RSA + DSA + - - 1 - 2 - - + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + 0 + 0 + 0 - + True - False - 0 - 0 - 0 - 0 - - - True - True - adjustment1 - 1 - True - - + True + ● + True + adjustment1 + 1 + True - - 1 - 2 - 1 - 2 - GTK_FILL - + + 1 + 1 + 1 + 1 + @@ -403,7 +390,7 @@ True False 0 - If there is already a computer you want to use this key with, you can set up that computer to recognize your key now. + If there is a computer you want to use this key with, you can set up that computer to recognize your new key. True diff -Nru seahorse-3.2.2/ssh/seahorse-ssh.h seahorse-3.6.3/ssh/seahorse-ssh.h --- seahorse-3.2.2/ssh/seahorse-ssh.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh.h 2012-08-21 12:23:19.000000000 +0200 @@ -25,10 +25,16 @@ #include #include +#include -#define SEAHORSE_SSH_TYPE_STR "openssh" -#define SEAHORSE_SSH_TYPE g_quark_from_string ("openssh") -#define SEAHORSE_SSH_STOCK_ICON "seahorse-key-ssh" +#define SEAHORSE_SSH_NAME "openssh" +#define SEAHORSE_SSH_TYPE_STR SEAHORSE_SSH_NAME +#define SEAHORSE_SSH (g_quark_from_static_string (SEAHORSE_SSH_NAME)) +#ifdef WITH_SSH + +void seahorse_ssh_backend_initialize (void); + +#endif /* WITH_SSH */ #endif diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-key.c seahorse-3.6.3/ssh/seahorse-ssh-key.c --- seahorse-3.2.2/ssh/seahorse-ssh-key.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-key.c 2012-11-09 11:08:13.000000000 +0100 @@ -22,34 +22,52 @@ #include "config.h" -#include +#include "seahorse-ssh-actions.h" +#include "seahorse-ssh-deleter.h" +#include "seahorse-ssh-dialogs.h" +#include "seahorse-ssh-exporter.h" +#include "seahorse-ssh-key.h" +#include "seahorse-ssh-operation.h" +#include "seahorse-ssh-source.h" -#include +#include "seahorse-deletable.h" +#include "seahorse-exportable.h" +#include "seahorse-icons.h" +#include "seahorse-place.h" +#include "seahorse-validity.h" +#include "seahorse-viewable.h" + +#include +#include #include #include #include - -#include "seahorse-context.h" -#include "seahorse-source.h" -#include "seahorse-ssh-source.h" -#include "seahorse-ssh-key.h" -#include "seahorse-ssh-operation.h" -#include "seahorse-gtkstock.h" -#include "seahorse-validity.h" +#include enum { PROP_0, PROP_KEY_DATA, PROP_FINGERPRINT, + PROP_DESCRIPTION, PROP_VALIDITY, PROP_TRUST, PROP_EXPIRES, PROP_LENGTH }; -G_DEFINE_TYPE (SeahorseSSHKey, seahorse_ssh_key, SEAHORSE_TYPE_OBJECT); +static void seahorse_ssh_key_deletable_iface (SeahorseDeletableIface *iface); + +static void seahorse_ssh_key_exportable_iface (SeahorseExportableIface *iface); + +static void seahorse_ssh_key_viewable_iface (SeahorseViewableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (SeahorseSSHKey, seahorse_ssh_key, SEAHORSE_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_EXPORTABLE, seahorse_ssh_key_exportable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_DELETABLE, seahorse_ssh_key_deletable_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_VIEWABLE, seahorse_ssh_key_viewable_iface); +); /* ----------------------------------------------------------------------------- * INTERNAL @@ -71,10 +89,15 @@ { SeahorseObject *obj = SEAHORSE_OBJECT (self); SeahorseUsage usage; + SeahorseFlags flags; const gchar *display = NULL; gchar *identifier; gchar *simple = NULL; - + GtkActionGroup *actions; + GIcon *icon; + gchar *filename; + gchar *markup; + if (self->keydata) { /* Try to make display and simple names */ @@ -96,39 +119,57 @@ } if (!self->keydata || !self->keydata->fingerprint) { - g_object_set (self, - "id", 0, "label", "", "icon", NULL, "usage", SEAHORSE_USAGE_NONE, "nickname", "", - "location", SEAHORSE_LOCATION_INVALID, - "flags", SEAHORSE_FLAG_DISABLED, + "object-flags", SEAHORSE_FLAG_DISABLED, NULL); return; - } - if (self->keydata->privfile) + flags = SEAHORSE_FLAG_EXPORTABLE | SEAHORSE_FLAG_DELETABLE; + + if (self->keydata->privfile) { usage = SEAHORSE_USAGE_PRIVATE_KEY; - else + flags |= SEAHORSE_FLAG_PERSONAL | SEAHORSE_FLAG_TRUSTED; + icon = g_themed_icon_new (GCR_ICON_KEY_PAIR); + } else { + flags = 0; usage = SEAHORSE_USAGE_PUBLIC_KEY; + icon = g_themed_icon_new (GCR_ICON_KEY); + } + + if (self->keydata->privfile) + filename = g_path_get_basename (self->keydata->privfile); + else + filename = g_path_get_basename (self->keydata->pubfile); + + markup = g_markup_printf_escaped ("%s\n%s", + display, filename); identifier = seahorse_ssh_key_calc_identifier (self->keydata->fingerprint); + actions = seahorse_ssh_actions_instance (); + + if (self->keydata->authorized) + flags |= SEAHORSE_FLAG_TRUSTED; g_object_set (obj, - "id", seahorse_ssh_key_calc_cannonical_id (self->keydata->fingerprint), + "actions", actions, + "markup", markup, "label", display, - "icon", SEAHORSE_STOCK_KEY_SSH, + "icon", icon, "usage", usage, "nickname", simple, - "location", SEAHORSE_LOCATION_LOCAL, "identifier", identifier, - "flags", (self->keydata->authorized ? SEAHORSE_FLAG_TRUSTED : 0) | SEAHORSE_FLAG_EXPORTABLE | SEAHORSE_FLAG_DELETABLE, + "object-flags", flags, NULL); - + + g_object_unref (actions); + g_object_unref (icon); g_free (identifier); + g_free (markup); } static guint @@ -162,7 +203,8 @@ GValue *value, GParamSpec *pspec) { SeahorseSSHKey *skey = SEAHORSE_SSH_KEY (object); - + SeahorseUsage usage; + switch (prop_id) { case PROP_KEY_DATA: g_value_set_pointer (value, skey->keydata); @@ -170,6 +212,13 @@ case PROP_FINGERPRINT: g_value_set_string (value, skey->keydata ? skey->keydata->fingerprint : NULL); break; + case PROP_DESCRIPTION: + g_object_get (skey, "usage", &usage, NULL); + if (usage == SEAHORSE_USAGE_PRIVATE_KEY) + g_value_set_string (value, _("Personal SSH key")); + else + g_value_set_string (value, _("SSH key")); + break; case PROP_VALIDITY: g_value_set_uint (value, calc_validity (skey)); break; @@ -240,6 +289,10 @@ g_param_spec_string ("fingerprint", "Fingerprint", "Unique fingerprint for this key", "", G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_DESCRIPTION, + g_param_spec_string ("description", "Description", "Description", + "", G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_VALIDITY, g_param_spec_uint ("validity", "Validity", "Validity of this key", 0, G_MAXUINT, 0, G_PARAM_READABLE)); @@ -257,19 +310,64 @@ 0, G_MAXUINT, 0, G_PARAM_READABLE)); } -/* ----------------------------------------------------------------------------- - * PUBLIC METHODS - */ +static GList * +seahorse_ssh_key_create_exporters (SeahorseExportable *exportable, + SeahorseExporterType type) +{ + return g_list_append (NULL, seahorse_ssh_exporter_new (G_OBJECT (exportable), FALSE)); +} + +static void +seahorse_ssh_key_exportable_iface (SeahorseExportableIface *iface) +{ + iface->create_exporters = seahorse_ssh_key_create_exporters; +} + +static SeahorseDeleter * +seahorse_ssh_key_create_deleter (SeahorseDeletable *deletable) +{ + SeahorseSSHKey *self = SEAHORSE_SSH_KEY (deletable); + return seahorse_ssh_deleter_new (self); +} + +static void +seahorse_ssh_key_deletable_iface (SeahorseDeletableIface *iface) +{ + iface->create_deleter = seahorse_ssh_key_create_deleter; +} + +static void +seahorse_ssh_key_show_viewer (SeahorseViewable *viewable, + GtkWindow *parent) +{ + seahorse_ssh_key_properties_show (SEAHORSE_SSH_KEY (viewable), parent); +} + +static void +seahorse_ssh_key_viewable_iface (SeahorseViewableIface *iface) +{ + iface->show_viewer = seahorse_ssh_key_show_viewer; +} SeahorseSSHKey* -seahorse_ssh_key_new (SeahorseSource *sksrc, SeahorseSSHKeyData *data) +seahorse_ssh_key_new (SeahorsePlace *place, + SeahorseSSHKeyData *data) { SeahorseSSHKey *skey; - skey = g_object_new (SEAHORSE_TYPE_SSH_KEY, "source", sksrc, - "key-data", data, NULL); + skey = g_object_new (SEAHORSE_TYPE_SSH_KEY, + "place", place, + "key-data", data, + NULL); return skey; } +SeahorseSSHKeyData * +seahorse_ssh_key_get_data (SeahorseSSHKey *self) +{ + g_return_val_if_fail (SEAHORSE_IS_SSH_KEY (self), NULL); + return self->keydata; +} + guint seahorse_ssh_key_get_algo (SeahorseSSHKey *skey) { @@ -312,33 +410,6 @@ skey->keydata->privfile : skey->keydata->pubfile; } -GQuark -seahorse_ssh_key_calc_cannonical_id (const gchar *id) -{ - #define SSH_ID_SIZE 16 - gchar *hex, *canonical_id = g_malloc0 (SSH_ID_SIZE + 1); - gint i, off, len = strlen (id); - GQuark ret; - - /* Strip out all non alpha numeric chars and limit length to SSH_ID_SIZE */ - for (i = len, off = SSH_ID_SIZE; i >= 0 && off > 0; --i) { - if (g_ascii_isalnum (id[i])) - canonical_id[--off] = g_ascii_toupper (id[i]); - } - - /* Not enough characters */ - g_return_val_if_fail (off == 0, 0); - - hex = g_strdup_printf ("%s:%s", SEAHORSE_SSH_STR, canonical_id); - ret = g_quark_from_string (hex); - - g_free (canonical_id); - g_free (hex); - - return ret; -} - - gchar* seahorse_ssh_key_calc_identifier (const gchar *id) { diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-key-data.c seahorse-3.6.3/ssh/seahorse-ssh-key-data.c --- seahorse-3.2.2/ssh/seahorse-ssh-key-data.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-key-data.c 2012-08-21 12:23:19.000000000 +0200 @@ -24,7 +24,6 @@ #include "seahorse-ssh-key-data.h" #include "seahorse-ssh-source.h" -#include "seahorse-algo.h" #include "seahorse-util.h" #define SSH_PRIVATE_BEGIN "-----BEGIN " @@ -77,27 +76,27 @@ static gboolean parse_key_blob (guchar *bytes, gsize len, SeahorseSSHKeyData *data) { - md5_ctx_t ctx; - guchar digest[MD5_LEN]; - gchar *fingerprint; - guint i; - - seahorse_md5_init (&ctx); - seahorse_md5_update (&ctx, bytes, len); - seahorse_md5_final (digest, &ctx); - - fingerprint = g_new0 (gchar, MD5_LEN * 3 + 1); - for (i = 0; i < MD5_LEN; i++) { - char hex[4]; - snprintf (hex, sizeof (hex), "%02x:", (int)(digest[i])); - strncat (fingerprint, hex, MD5_LEN * 3 - strlen (fingerprint)); - } + GString *fingerprint; + gchar *digest; + gsize n_digest; + gsize i; + + digest = g_compute_checksum_for_data (G_CHECKSUM_MD5, bytes, len); + if (!digest) + return FALSE; + + n_digest = strlen (digest); + fingerprint = g_string_sized_new ((n_digest * 3) / 2); + for (i = 0; i < n_digest; i += 2) { + if (i > 0) + g_string_append_c (fingerprint, ':'); + g_string_append_len (fingerprint, digest + i, 2); + } - /* Remove the trailing ':' character */ - fingerprint[(MD5_LEN * 3) - 1] = '\0'; - data->fingerprint = fingerprint; - - return TRUE; + g_free (digest); + data->fingerprint = g_string_free (fingerprint, FALSE); + + return TRUE; } static gboolean diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-key.h seahorse-3.6.3/ssh/seahorse-ssh-key.h --- seahorse-3.2.2/ssh/seahorse-ssh-key.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-key.h 2012-08-21 12:23:19.000000000 +0200 @@ -26,10 +26,9 @@ #include #include "seahorse-object.h" -#include "seahorse-source.h" +#include "seahorse-place.h" #include "seahorse-validity.h" -#include "seahorse-ssh-module.h" #include "seahorse-ssh-key-data.h" /* For vala's sake */ @@ -61,9 +60,11 @@ SeahorseObjectClass parent_class; }; -SeahorseSSHKey* seahorse_ssh_key_new (SeahorseSource *sksrc, +SeahorseSSHKey* seahorse_ssh_key_new (SeahorsePlace *sksrc, SeahorseSSHKeyData *data); +SeahorseSSHKeyData * seahorse_ssh_key_get_data (SeahorseSSHKey *self); + void seahorse_ssh_key_refresh (SeahorseSSHKey *self); GType seahorse_ssh_key_get_type (void); @@ -89,8 +90,6 @@ gchar* seahorse_ssh_key_get_fingerprint (SeahorseSSHKey *self); -GQuark seahorse_ssh_key_calc_cannonical_id (const gchar *id); - gchar* seahorse_ssh_key_calc_identifier (const gchar *id); -#endif /* __SEAHORSE_KEY_H__ */ +#endif /* __SEAHORSE_SSH_KEY_H__ */ diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-key-properties.c seahorse-3.6.3/ssh/seahorse-ssh-key-properties.c --- seahorse-3.2.2/ssh/seahorse-ssh-key-properties.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-key-properties.c 2012-11-09 11:08:13.000000000 +0100 @@ -21,17 +21,20 @@ */ #include "config.h" +#include "seahorse-ssh-dialogs.h" +#include "seahorse-ssh-exporter.h" +#include "seahorse-ssh-key.h" +#include "seahorse-ssh-operation.h" + #include "seahorse-bind.h" -#include "seahorse-gtkstock.h" +#include "seahorse-exporter.h" +#include "seahorse-exportable.h" +#include "seahorse-icons.h" #include "seahorse-object.h" #include "seahorse-object-widget.h" #include "seahorse-util.h" #include "seahorse-validity.h" -#include "ssh/seahorse-ssh-dialogs.h" -#include "ssh/seahorse-ssh-key.h" -#include "ssh/seahorse-ssh-operation.h" - #include #define NOTEBOOK "notebook" @@ -94,7 +97,7 @@ ssh_rename_closure *closure; skey = SEAHORSE_SSH_KEY (SEAHORSE_OBJECT_WIDGET (swidget)->object); - source = SEAHORSE_SSH_SOURCE (seahorse_object_get_source (SEAHORSE_OBJECT (skey))); + source = SEAHORSE_SSH_SOURCE (seahorse_object_get_place (SEAHORSE_OBJECT (skey))); text = gtk_entry_get_text (GTK_ENTRY (entry)); @@ -145,7 +148,7 @@ gboolean authorize; skey = SEAHORSE_SSH_KEY (SEAHORSE_OBJECT_WIDGET (swidget)->object); - source = SEAHORSE_SSH_SOURCE (seahorse_object_get_source (SEAHORSE_OBJECT (skey))); + source = SEAHORSE_SSH_SOURCE (seahorse_object_get_place (SEAHORSE_OBJECT (skey))); authorize = gtk_toggle_button_get_active (button); gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE); @@ -175,7 +178,7 @@ on_ssh_passphrase_button_clicked (GtkWidget *widget, SeahorseWidget *swidget) { - SeahorseObject *object; + GObject *object; GtkWidget *button; object = SEAHORSE_OBJECT_WIDGET (swidget)->object; @@ -188,65 +191,41 @@ } static void -export_complete (GFile *file, GAsyncResult *result, guchar *contents) +on_export_complete (GObject *source, + GAsyncResult *result, + gpointer user_data) { - GError *err = NULL; - gchar *uri, *unesc_uri; - - g_free (contents); - - if (!g_file_replace_contents_finish (file, result, NULL, &err)) { - uri = g_file_get_uri (file); - unesc_uri = g_uri_unescape_string (seahorse_util_uri_get_last (uri), NULL); - seahorse_util_handle_error (&err, NULL, _("Couldn't export key to \"%s\""), - unesc_uri); - g_free (uri); - g_free (unesc_uri); - } + GtkWindow *parent = GTK_WINDOW (user_data); + GError *error = NULL; + + if (!seahorse_exporter_export_to_file_finish (SEAHORSE_EXPORTER (source), result, &error)) + seahorse_util_handle_error (&error, parent, _("Couldn't export key")); + + g_object_unref (parent); } G_MODULE_EXPORT void on_ssh_export_button_clicked (GtkWidget *widget, SeahorseWidget *swidget) { - SeahorseSource *sksrc; - SeahorseObject *object; + SeahorseExporter *exporter; + GList *exporters = NULL; + GObject *object; + GtkWindow *window; GFile *file; - GtkDialog *dialog; - guchar *results; - gsize n_results; - gchar* uri = NULL; - GError *err = NULL; object = SEAHORSE_OBJECT_WIDGET (swidget)->object; - g_return_if_fail (SEAHORSE_IS_SSH_KEY (object)); - sksrc = seahorse_object_get_source (object); - g_return_if_fail (SEAHORSE_IS_SSH_SOURCE (sksrc)); - - dialog = seahorse_util_chooser_save_new (_("Export Complete Key"), - GTK_WINDOW (seahorse_widget_get_toplevel (swidget))); - seahorse_util_chooser_show_key_files (dialog); - seahorse_util_chooser_set_filename (dialog, object); - uri = seahorse_util_chooser_save_prompt (dialog); - if (!uri) - return; - - results = seahorse_ssh_source_export_private (SEAHORSE_SSH_SOURCE (sksrc), - SEAHORSE_SSH_KEY (object), - &n_results, &err); - - if (results) { - g_return_if_fail (err == NULL); - file = g_file_new_for_uri (uri); - g_file_replace_contents_async (file, (gchar*)results, n_results, NULL, FALSE, - G_FILE_CREATE_PRIVATE, NULL, - (GAsyncReadyCallback)export_complete, results); + exporters = g_list_append (exporters, seahorse_ssh_exporter_new (object, TRUE)); + + window = GTK_WINDOW (seahorse_widget_get_toplevel (swidget)); + if (seahorse_exportable_prompt (exporters, window, NULL, &file, &exporter)) { + seahorse_exporter_export_to_file_async (exporter, file, TRUE, NULL, + on_export_complete, g_object_ref (window)); + g_object_unref (file); + g_object_unref (exporter); } - - if (err) - seahorse_util_handle_error (&err, swidget, _("Couldn't export key.")); - g_free (uri); + g_list_free_full (exporters, g_object_unref); } static void @@ -259,13 +238,13 @@ const gchar *label; const gchar *template; - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); skey = SEAHORSE_SSH_KEY (object); /* Image */ widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "key-image")); if (widget) - gtk_image_set_from_stock (GTK_IMAGE (widget), SEAHORSE_STOCK_KEY_SSH, GTK_ICON_SIZE_DIALOG); + gtk_image_set_from_icon_name (GTK_IMAGE (widget), SEAHORSE_ICON_KEY_SSH, GTK_ICON_SIZE_DIALOG); /* Name and title */ label = seahorse_object_get_label (object); @@ -309,7 +288,7 @@ const gchar *label; gchar *text; - object = SEAHORSE_OBJECT_WIDGET (swidget)->object; + object = SEAHORSE_OBJECT (SEAHORSE_OBJECT_WIDGET (swidget)->object); skey = SEAHORSE_SSH_KEY (object); widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "fingerprint-label")); @@ -358,9 +337,10 @@ } void -seahorse_ssh_key_properties_show (SeahorseSSHKey *skey, GtkWindow *parent) +seahorse_ssh_key_properties_show (SeahorseSSHKey *skey, + GtkWindow *parent) { - SeahorseObject *object = SEAHORSE_OBJECT (skey); + GObject *object = G_OBJECT (skey); SeahorseWidget *swidget = NULL; GtkWidget *widget; @@ -383,7 +363,7 @@ g_return_if_fail (widget != NULL); /* A public key only */ - if (seahorse_object_get_usage (object) != SEAHORSE_USAGE_PRIVATE_KEY) { + if (seahorse_object_get_usage (SEAHORSE_OBJECT (skey)) != SEAHORSE_USAGE_PRIVATE_KEY) { seahorse_widget_set_visible (swidget, "passphrase-button", FALSE); seahorse_widget_set_visible (swidget, "export-button", FALSE); } diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-key-properties.xml seahorse-3.6.3/ssh/seahorse-ssh-key-properties.xml --- seahorse-3.2.2/ssh/seahorse-ssh-key-properties.xml 2011-09-14 17:14:58.000000000 +0200 +++ seahorse-3.6.3/ssh/seahorse-ssh-key-properties.xml 2012-11-12 08:32:13.000000000 +0100 @@ -121,7 +121,7 @@ True 1 0 - <b>Name:</b> + <b>Name:</b> True @@ -257,7 +257,7 @@ True 0 - <i>This only applies to the '%s'</i> account. + This only applies to the <i>%s</i> account. True diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-module.c seahorse-3.6.3/ssh/seahorse-ssh-module.c --- seahorse-3.2.2/ssh/seahorse-ssh-module.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-module.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 "config.h" - -#include "seahorse-ssh-module.h" - -#include "seahorse-ssh-commands.h" -#include "seahorse-ssh-dialogs.h" -#include "seahorse-ssh-source.h" - -#include "seahorse-context.h" - -void -seahorse_ssh_module_init (void) -{ - SeahorseSource *source; - - /* Always have a default pgp source added */ - source = g_object_new (SEAHORSE_TYPE_SSH_SOURCE, NULL); - seahorse_context_take_source (NULL, source); - - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_SSH_SOURCE)); - g_type_class_unref (g_type_class_ref (SEAHORSE_TYPE_SSH_COMMANDS)); - - seahorse_ssh_generate_register (); -} diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-module.h seahorse-3.6.3/ssh/seahorse-ssh-module.h --- seahorse-3.2.2/ssh/seahorse-ssh-module.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-module.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* - * Seahorse - * - * Copyright (C) 2008 Stefan Walter - * - * This program 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 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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 SEASSH_H_ -#define SEASSH_H_ - -#define SEAHORSE_SSH_STR "openssh" -#define SEAHORSE_SSH (g_quark_from_static_string (SEAHORSE_SSH_STR)) - -void seahorse_ssh_module_init (void); - -#endif /*SEASSH_H_*/ diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-operation.c seahorse-3.6.3/ssh/seahorse-ssh-operation.c --- seahorse-3.2.2/ssh/seahorse-ssh-operation.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-operation.c 2012-11-09 11:08:13.000000000 +0100 @@ -22,6 +22,13 @@ #include "config.h" +#include "seahorse-ssh-operation.h" + +#define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION +#include "seahorse-debug.h" +#include "seahorse-exporter.h" +#include "seahorse-util.h" + #include #include #include @@ -33,12 +40,6 @@ #include #include -#include "seahorse-ssh-operation.h" -#include "seahorse-util.h" - -#define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION -#include "seahorse-debug.h" - #define COMMAND_PASSWORD "PASSWORD " #define COMMAND_PASSWORD_LEN 9 @@ -240,7 +241,7 @@ gchar buf[128]; GIOStatus status; gsize read = 0; - GString *str; + GString *str = NULL; gboolean ret = TRUE; /* Figure out which buffer we're writing into */ @@ -473,26 +474,6 @@ * UPLOAD KEY */ -typedef struct { - GMemoryOutputStream *output; - GCancellable *cancellable; - gchar *username; - gchar *hostname; - gchar *port; -} ssh_upload_closure; - -static void -ssh_upload_free (gpointer data) -{ - ssh_upload_closure *closure = data; - g_object_unref (closure->output); - g_clear_object (&closure->cancellable); - g_free (closure->username); - g_free (closure->hostname); - g_free (closure->port); - g_free (closure); -} - static void on_upload_send_complete (GObject *source, GAsyncResult *result, @@ -508,49 +489,6 @@ g_object_unref (res); } -static void -on_upload_export_complete (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (user_data); - ssh_upload_closure *closure = g_simple_async_result_get_op_res_gpointer (res); - SeahorseSshPromptInfo prompt = { _("Remote Host Password"), NULL, NULL, NULL }; - GError *error = NULL; - gchar *data; - size_t length; - gchar *cmd; - - if (!seahorse_source_export_finish (SEAHORSE_SOURCE (source), result, &error)) { - g_simple_async_result_take_error (res, error); - g_simple_async_result_complete (res); - g_object_unref (res); - return; - } - - /* - * This command creates the .ssh directory if necessary (with appropriate permissions) - * and then appends all input data onto the end of .ssh/authorized_keys - */ - /* TODO: Important, we should handle the host checking properly */ - cmd = g_strdup_printf (SSH_PATH " '%s@%s' %s %s -o StrictHostKeyChecking=no " - "\"umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys\"", - closure->username, closure->hostname, - closure->port ? "-p" : "", closure->port ? closure->port : ""); - - if (g_output_stream_write_all (G_OUTPUT_STREAM (closure->output), "\n", 1, NULL, NULL, NULL) != 1) - g_return_if_reached (); - data = g_memory_output_stream_get_data (closure->output); - length = g_memory_output_stream_get_data_size (closure->output); - - seahorse_ssh_operation_async (SEAHORSE_SSH_SOURCE (source), cmd, data, length, - closure->cancellable, on_upload_send_complete, - &prompt, g_object_ref (res)); - - g_free (cmd); - g_object_unref (res); -} - void seahorse_ssh_op_upload_async (SeahorseSSHSource *source, GList *keys, @@ -561,8 +499,12 @@ GAsyncReadyCallback callback, gpointer user_data) { + SeahorseSshPromptInfo prompt = { _("Remote Host Password"), NULL, NULL, NULL }; + SeahorseSSHKeyData *keydata; GSimpleAsyncResult *res; - ssh_upload_closure *closure; + GString *data; + GList *l; + gchar *cmd; g_return_if_fail (keys != NULL); g_return_if_fail (username && username[0]); @@ -573,18 +515,30 @@ res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, seahorse_ssh_op_upload_async); - closure = g_new0 (ssh_upload_closure, 1); - closure->output = G_MEMORY_OUTPUT_STREAM (g_memory_output_stream_new (NULL, 0, g_realloc, NULL)); - closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - closure->username = g_strdup (username); - closure->hostname = g_strdup (hostname); - closure->port = g_strdup (port); - g_simple_async_result_set_op_res_gpointer (res, closure, ssh_upload_free); - - /* Buffer for what we send to the server */ - seahorse_source_export_async (SEAHORSE_SOURCE (source), keys, G_OUTPUT_STREAM (closure->output), - cancellable, on_upload_export_complete, g_object_ref (res)); + data = g_string_sized_new (1024); + for (l = keys; l != NULL; l = g_list_next (l)) { + keydata = seahorse_ssh_key_get_data (l->data); + if (keydata && keydata->pubfile) { + g_string_append (data, keydata->rawdata); + g_string_append_c (data, '\n'); + } + } + + /* + * This command creates the .ssh directory if necessary (with appropriate permissions) + * and then appends all input data onto the end of .ssh/authorized_keys + */ + /* TODO: Important, we should handle the host checking properly */ + cmd = g_strdup_printf (SSH_PATH " '%s@%s' %s %s -o StrictHostKeyChecking=no " + "\"umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys\"", + username, hostname, port ? "-p" : "", port ? port : ""); + + seahorse_ssh_operation_async (SEAHORSE_SSH_SOURCE (source), cmd, data->str, data->len, + cancellable, on_upload_send_complete, + &prompt, g_object_ref (res)); + + g_string_free (data, TRUE); g_object_unref (res); } @@ -633,14 +587,14 @@ { SeahorseSshPromptInfo prompt = { _("Enter Key Passphrase"), NULL, NULL, NULL }; GSimpleAsyncResult *res; - SeahorseSource *source; + SeahorsePlace *place; gchar *cmd; g_return_if_fail (SEAHORSE_IS_SSH_KEY (key)); g_return_if_fail (key->keydata && key->keydata->privfile); - source = seahorse_object_get_source (SEAHORSE_OBJECT (key)); - g_return_if_fail (SEAHORSE_IS_SSH_SOURCE (source)); + place = seahorse_object_get_place (SEAHORSE_OBJECT (key)); + g_return_if_fail (SEAHORSE_IS_SSH_SOURCE (place)); prompt.argument = seahorse_object_get_label (SEAHORSE_OBJECT (key)); @@ -649,7 +603,7 @@ g_simple_async_result_set_op_res_gpointer (res, g_object_ref (key), g_object_unref); cmd = g_strdup_printf (SSH_KEYGEN_PATH " -p -f '%s'", key->keydata->privfile); - seahorse_ssh_operation_async (SEAHORSE_SSH_SOURCE (source), cmd, NULL, 0, cancellable, + seahorse_ssh_operation_async (SEAHORSE_SSH_SOURCE (place), cmd, NULL, 0, cancellable, on_change_passphrase_complete, &prompt, g_object_ref (res)); g_free (cmd); @@ -1117,6 +1071,7 @@ GError **error) { SeahorseSSHKeyData *keydata = NULL; + SeahorseSSHSource *source; gboolean ret = TRUE; g_return_val_if_fail (SEAHORSE_IS_SSH_KEY (key), FALSE); @@ -1149,10 +1104,10 @@ } } - if (ret) - seahorse_context_remove_object (seahorse_context_instance (), - SEAHORSE_OBJECT (key)); + if (ret) { + source = SEAHORSE_SSH_SOURCE (seahorse_object_get_place (SEAHORSE_OBJECT (key))); + seahorse_ssh_source_remove_object (source, key); + } return ret; } - diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-source.c seahorse-3.6.3/ssh/seahorse-ssh-source.c --- seahorse-3.2.2/ssh/seahorse-ssh-source.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-source.c 2012-08-21 12:23:19.000000000 +0200 @@ -23,14 +23,17 @@ #include "config.h" -#include "seahorse-ssh-source.h" - #include "seahorse-ssh-key.h" #include "seahorse-ssh-operation.h" +#include "seahorse-ssh-source.h" +#include "seahorse-place.h" #include "seahorse-registry.h" #include "seahorse-util.h" +#include + +#include #include #include @@ -38,28 +41,34 @@ #include #include -#include - #define DEBUG_FLAG SEAHORSE_DEBUG_LOAD #include "seahorse-debug.h" enum { - PROP_0, - PROP_SOURCE_TAG, - PROP_SOURCE_LOCATION, - PROP_BASE_DIRECTORY + PROP_0, + PROP_LABEL, + PROP_DESCRIPTION, + PROP_ICON, + PROP_BASE_DIRECTORY, + PROP_URI, + PROP_ACTIONS }; struct _SeahorseSSHSourcePrivate { gchar *ssh_homedir; /* Home directory for SSH keys */ guint scheduled_refresh; /* Source for refresh timeout */ GFileMonitor *monitor_handle; /* For monitoring the .ssh directory */ + GHashTable *keys; }; -static void seahorse_source_iface (SeahorseSourceIface *iface); +static void seahorse_ssh_source_place_iface (SeahorsePlaceIface *iface); + +static void seahorse_ssh_source_collection_iface (GcrCollectionIface *iface); G_DEFINE_TYPE_EXTENDED (SeahorseSSHSource, seahorse_ssh_source, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SOURCE, seahorse_source_iface)); + G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_ssh_source_collection_iface); + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_PLACE, seahorse_ssh_source_place_iface) +); #define AUTHORIZED_KEYS_FILE "authorized_keys" #define OTHER_KEYS_FILE "other_keys.seahorse" @@ -123,23 +132,24 @@ } static void -remove_key_from_context (gpointer hkey, SeahorseObject *dummy, SeahorseSSHSource *ssrc) +remove_key_from_context (gpointer key, + SeahorseObject *dummy, + SeahorseSSHSource *self) { - GQuark keyid = GPOINTER_TO_UINT (hkey); - SeahorseObject *sobj; - - sobj = seahorse_context_get_object (SCTX_APP (), SEAHORSE_SOURCE (ssrc), keyid); - if (sobj != NULL) - seahorse_context_remove_object (SCTX_APP (), sobj); -} + const gchar *filename = key; + SeahorseSSHKey *skey; + skey = g_hash_table_lookup (self->priv->keys, filename); + if (skey != NULL) + seahorse_ssh_source_remove_object (self, skey); +} static gboolean scheduled_refresh (SeahorseSSHSource *ssrc) { seahorse_debug ("scheduled refresh event ocurring now"); cancel_scheduled_refresh (ssrc); - seahorse_source_load_async (SEAHORSE_SOURCE (ssrc), NULL, NULL, NULL); + seahorse_place_load_async (SEAHORSE_PLACE (ssrc), NULL, NULL, NULL); return FALSE; /* don't run again */ } @@ -209,22 +219,39 @@ } static void -seahorse_ssh_source_get_property (GObject *object, guint prop_id, GValue *value, +seahorse_ssh_source_get_property (GObject *obj, + guint prop_id, + GValue *value, GParamSpec *pspec) { - SeahorseSSHSource *ssrc = SEAHORSE_SSH_SOURCE (object); - - switch (prop_id) { - case PROP_SOURCE_TAG: - g_value_set_uint (value, SEAHORSE_SSH); - break; - case PROP_SOURCE_LOCATION: - g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL); - break; - case PROP_BASE_DIRECTORY: - g_value_set_string (value, ssrc->priv->ssh_homedir); - break; - } + SeahorseSSHSource *self = SEAHORSE_SSH_SOURCE (obj); + gchar *text; + + switch (prop_id) { + case PROP_LABEL: + g_value_set_string (value, _("OpenSSH keys")); + break; + case PROP_DESCRIPTION: + text = g_strdup_printf (_("OpenSSH: %s"), self->priv->ssh_homedir); + g_value_take_string (value, text); + break; + case PROP_ICON: + g_value_take_object (value, g_themed_icon_new (GCR_ICON_HOME_DIRECTORY)); + break; + case PROP_BASE_DIRECTORY: + g_value_set_string (value, self->priv->ssh_homedir); + break; + case PROP_URI: + g_value_take_string (value, g_strdup_printf ("openssh://%s", + self->priv->ssh_homedir)); + break; + case PROP_ACTIONS: + g_value_set_object (value, NULL); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); + break; + } } static void @@ -234,6 +261,7 @@ g_assert (ssrc->priv); + g_hash_table_remove_all (ssrc->priv->keys); cancel_scheduled_refresh (ssrc); if (ssrc->priv->monitor_handle) { @@ -249,7 +277,9 @@ { SeahorseSSHSource *ssrc = SEAHORSE_SSH_SOURCE (gobject); g_assert (ssrc->priv); - + + g_hash_table_destroy (ssrc->priv->keys); + /* All monitoring and scheduling should be done */ g_assert (ssrc->priv->scheduled_refresh == 0); g_assert (ssrc->priv->monitor_handle == 0); @@ -267,12 +297,15 @@ /* init private vars */ ssrc->priv = g_new0 (SeahorseSSHSourcePrivate, 1); - + + ssrc->priv->keys = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_object_unref); + ssrc->priv->scheduled_refresh = 0; ssrc->priv->monitor_handle = NULL; - ssrc->priv->ssh_homedir = g_strdup_printf ("%s/.ssh/", g_get_home_dir ()); - + ssrc->priv->ssh_homedir = g_strdup_printf ("%s/.ssh", g_get_home_dir ()); + /* Make the .ssh directory if it doesn't exist */ if (!g_file_test (ssrc->priv->ssh_homedir, G_FILE_TEST_EXISTS)) { if (g_mkdir (ssrc->priv->ssh_homedir, 0700) == -1) @@ -302,19 +335,52 @@ gobject_class->dispose = seahorse_ssh_source_dispose; gobject_class->finalize = seahorse_ssh_source_finalize; gobject_class->get_property = seahorse_ssh_source_get_property; - - g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag"); - g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location"); + + g_object_class_override_property (gobject_class, PROP_LABEL, "label"); + g_object_class_override_property (gobject_class, PROP_DESCRIPTION, "description"); + g_object_class_override_property (gobject_class, PROP_URI, "uri"); + g_object_class_override_property (gobject_class, PROP_ICON, "icon"); + g_object_class_override_property (gobject_class, PROP_ACTIONS, "actions"); g_object_class_install_property (gobject_class, PROP_BASE_DIRECTORY, g_param_spec_string ("base-directory", "Key directory", "Directory where the keys are stored", NULL, G_PARAM_READABLE)); - - seahorse_registry_register_type (NULL, SEAHORSE_TYPE_SSH_SOURCE, "source", "local", SEAHORSE_SSH_STR, NULL); - - seahorse_registry_register_function (NULL, seahorse_ssh_key_calc_cannonical_id, "canonize", SEAHORSE_SSH_STR, NULL); } +static guint +seahorse_ssh_source_get_length (GcrCollection *collection) +{ + SeahorseSSHSource *self = SEAHORSE_SSH_SOURCE (collection); + return g_hash_table_size (self->priv->keys); +} + +static GList * +seahorse_ssh_source_get_objects (GcrCollection *collection) +{ + SeahorseSSHSource *self = SEAHORSE_SSH_SOURCE (collection); + return g_hash_table_get_values (self->priv->keys); +} + +static gboolean +seahorse_ssh_source_contains (GcrCollection *collection, + GObject *object) +{ + SeahorseSSHSource *self = SEAHORSE_SSH_SOURCE (collection); + const gchar *filename; + + if (!SEAHORSE_IS_SSH_KEY (object)) + return FALSE; + filename = seahorse_ssh_key_get_location (SEAHORSE_SSH_KEY (object)); + return g_hash_table_lookup (self->priv->keys, filename) == object; +} + +static void +seahorse_ssh_source_collection_iface (GcrCollectionIface *iface) +{ + iface->get_length = seahorse_ssh_source_get_length; + iface->get_objects = seahorse_ssh_source_get_objects; + iface->contains = seahorse_ssh_source_contains; +} typedef struct { SeahorseSSHSource *source; @@ -344,31 +410,30 @@ source_load_closure *closure, SeahorseSSHKeyData *keydata) { - SeahorseSource *source = SEAHORSE_SOURCE (self); + SeahorsePlace *place = SEAHORSE_PLACE (self); SeahorseSSHKey *skey; SeahorseObject *prev; - GQuark keyid; + const gchar *location; if (!seahorse_ssh_key_data_is_valid (keydata)) { seahorse_ssh_key_data_free (keydata); return NULL; } - /* Make sure it's valid */ - keyid = seahorse_ssh_key_calc_cannonical_id (keydata->fingerprint); - g_return_val_if_fail (keyid, NULL); + location = keydata->privfile ? keydata->privfile : keydata->pubfile; + g_return_val_if_fail (location, NULL); /* Does this key exist in the context? */ - prev = seahorse_context_get_object (SCTX_APP (), source, keyid); + prev = g_hash_table_lookup (self->priv->keys, location); /* Mark this key as seen */ if (closure->checks) - g_hash_table_remove (closure->checks, GUINT_TO_POINTER (keyid)); + g_hash_table_remove (closure->checks, location); if (closure->loaded) { /* See if we've already gotten a key like this in this load batch */ - if (g_hash_table_lookup (closure->loaded, GUINT_TO_POINTER (keyid))) { + if (g_hash_table_lookup (closure->loaded, location)) { /* * Sometimes later keys loaded have more information (for @@ -381,7 +446,7 @@ } /* Mark this key as loaded */ - g_hash_table_insert (closure->loaded, GUINT_TO_POINTER (keyid), + g_hash_table_insert (closure->loaded, g_strdup (location), GUINT_TO_POINTER (TRUE)); } @@ -393,27 +458,27 @@ /* Create a new key */ g_assert (keydata); - skey = seahorse_ssh_key_new (source, keydata); + skey = seahorse_ssh_key_new (place, keydata); + g_assert (g_strcmp0 (seahorse_ssh_key_get_location (skey), location) == 0); + + g_hash_table_insert (self->priv->keys, g_strdup (location), skey); + gcr_collection_emit_added (GCR_COLLECTION (self), G_OBJECT (skey)); - seahorse_context_take_object (seahorse_context_instance (), - SEAHORSE_OBJECT (skey)); return skey; } static GHashTable* load_present_keys (SeahorseSSHSource *self) { - GList *keys, *l; + const gchar *filename; GHashTable *checks; + GHashTableIter iter; + + checks = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + g_hash_table_iter_init (&iter, self->priv->keys); + while (g_hash_table_iter_next (&iter, (gpointer*)&filename, NULL)) + g_hash_table_insert (checks, g_strdup (filename), "PRESENT"); - checks = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL); - keys = seahorse_context_get_objects (seahorse_context_instance (), - SEAHORSE_SOURCE (self)); - for (l = keys; l != NULL; l = g_list_next (l)) - g_hash_table_insert (checks, - GUINT_TO_POINTER (seahorse_object_get_id (l->data)), - GUINT_TO_POINTER (TRUE)); - g_list_free (keys); return checks; } @@ -509,12 +574,12 @@ } static void -seahorse_ssh_source_load_async (SeahorseSource *source, +seahorse_ssh_source_load_async (SeahorsePlace *place, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { - SeahorseSSHSource *self = SEAHORSE_SSH_SOURCE (source); + SeahorseSSHSource *self = SEAHORSE_SSH_SOURCE (place); GSimpleAsyncResult *res; source_load_closure *closure; GError *error = NULL; @@ -522,13 +587,14 @@ gchar *privfile; GDir *dir; - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, seahorse_ssh_source_load_async); closure = g_new0 (source_load_closure, 1); closure->source = g_object_ref (self); /* Since we can find duplicate keys, limit them with this hash */ - closure->loaded = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL); + closure->loaded = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, NULL); /* Keys that currently exist, so we can remove any that disappeared */ closure->checks = load_present_keys (self); @@ -603,11 +669,11 @@ } static gboolean -seahorse_ssh_source_load_finish (SeahorseSource *source, +seahorse_ssh_source_load_finish (SeahorsePlace *place, GAsyncResult *result, GError **error) { - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (place), seahorse_ssh_source_load_async), FALSE); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) @@ -713,20 +779,19 @@ return TRUE; } -static void -seahorse_ssh_source_import_async (SeahorseSource *source, +void +seahorse_ssh_source_import_async (SeahorseSSHSource *self, GInputStream *input, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { - SeahorseSSHSource *self = SEAHORSE_SSH_SOURCE (source); source_import_closure *closure; gchar *contents; GSimpleAsyncResult *res; guint count; - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, + res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, seahorse_ssh_source_import_async); closure = g_new0 (source_import_closure, 1); closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; @@ -744,12 +809,12 @@ g_object_unref (res); } -static GList * -seahorse_ssh_source_import_finish (SeahorseSource *source, +GList * +seahorse_ssh_source_import_finish (SeahorseSSHSource *self, GAsyncResult *result, GError **error) { - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (self), seahorse_ssh_source_import_async), NULL); if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) @@ -759,95 +824,11 @@ return NULL; } -static void -seahorse_ssh_source_export_async (SeahorseSource *source, - GList *keys, - GOutputStream *output, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *res; - SeahorseSSHKeyData *keydata; - gchar *results = NULL; - gchar *raw = NULL; - GError *error = NULL; - SeahorseObject *object; - GList *l; - gsize written; - - res = g_simple_async_result_new (G_OBJECT (source), callback, user_data, - seahorse_ssh_source_export_async); - - for (l = keys; l; l = g_list_next (l)) { - object = SEAHORSE_OBJECT (l->data); - g_assert (SEAHORSE_IS_SSH_KEY (object)); - - results = NULL; - raw = NULL; - - keydata = NULL; - g_object_get (object, "key-data", &keydata, NULL); - g_assert (keydata); - - /* We should already have the data loaded */ - if (keydata->pubfile) { - g_assert (keydata->rawdata); - results = g_strdup_printf ("%s", keydata->rawdata); - - } else if (!keydata->pubfile) { - - /* - * TODO: We should be able to get at this data by using ssh-keygen - * to make a public key from the private - */ - g_warning ("private key without public, not exporting: %s", keydata->privfile); - } - - /* Write the data out */ - if (results) { - if (g_output_stream_write_all (output, results, strlen (results), - &written, NULL, &error)) - g_output_stream_flush (output, NULL, &error); - g_free (results); - } - - g_free (raw); - - if (error != NULL) { - g_simple_async_result_take_error (res, error); - break; - } - } - - g_simple_async_result_set_op_res_gpointer (res, g_object_ref (output), g_object_unref); - g_simple_async_result_complete_in_idle (res); - g_object_unref (res); -} - -static GOutputStream * -seahorse_ssh_source_export_finish (SeahorseSource *source, - GAsyncResult *result, - GError **error) -{ - g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (source), - seahorse_ssh_source_export_async), NULL); - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; - - return g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); -} - static void -seahorse_source_iface (SeahorseSourceIface *iface) +seahorse_ssh_source_place_iface (SeahorsePlaceIface *iface) { iface->load_async = seahorse_ssh_source_load_async; iface->load_finish = seahorse_ssh_source_load_finish; - iface->import_async = seahorse_ssh_source_import_async; - iface->import_finish = seahorse_ssh_source_import_finish; - iface->export_async = seahorse_ssh_source_export_async; - iface->export_finish = seahorse_ssh_source_export_finish; } /* ----------------------------------------------------------------------------- @@ -861,31 +842,19 @@ } SeahorseSSHKey* -seahorse_ssh_source_key_for_filename (SeahorseSSHSource *ssrc, +seahorse_ssh_source_key_for_filename (SeahorseSSHSource *self, const gchar *privfile) { - SeahorseSSHKeyData *data; - GList *keys, *l; + SeahorseSSHKey *key; + g_return_val_if_fail (SEAHORSE_IS_SSH_SOURCE (self), NULL); g_return_val_if_fail (privfile, NULL); - g_return_val_if_fail (SEAHORSE_IS_SSH_SOURCE (ssrc), NULL); - /* Try to find it first */ - keys = seahorse_context_get_objects (SCTX_APP (), SEAHORSE_SOURCE (ssrc)); - for (l = keys; l; l = g_list_next (l)) { - - g_object_get (l->data, "key-data", &data, NULL); - g_return_val_if_fail (data, NULL); - - /* If it's already loaded then just leave it at that */ - if (data->privfile && strcmp (privfile, data->privfile) == 0) { - g_list_free (keys); - return SEAHORSE_SSH_KEY (l->data); - } - } - g_list_free (keys); + key = g_hash_table_lookup (self->priv->keys, privfile); + if (key == NULL) + key = seahorse_ssh_source_load_one_sync (self, privfile); - return seahorse_ssh_source_load_one_sync (ssrc, privfile); + return key; } gchar* @@ -932,6 +901,26 @@ authorized ? AUTHORIZED_KEYS_FILE : OTHER_KEYS_FILE, NULL); } +void +seahorse_ssh_source_remove_object (SeahorseSSHSource *self, + SeahorseSSHKey *skey) +{ + const gchar *filename; + + g_return_if_fail (SEAHORSE_SSH_SOURCE (self)); + g_return_if_fail (SEAHORSE_SSH_KEY (skey)); + + filename = seahorse_ssh_key_get_location (skey); + g_return_if_fail (filename != NULL); + g_return_if_fail (g_hash_table_lookup (self->priv->keys, filename) == skey); + + g_object_ref (skey); + g_hash_table_remove (self->priv->keys, filename); + gcr_collection_emit_removed (GCR_COLLECTION (self), G_OBJECT (skey)); + g_object_unref (skey); +} + + guchar* seahorse_ssh_source_export_private (SeahorseSSHSource *ssrc, SeahorseSSHKey *skey, gsize *n_results, GError **err) diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-source.h seahorse-3.6.3/ssh/seahorse-ssh-source.h --- seahorse-3.2.2/ssh/seahorse-ssh-source.h 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-source.h 2012-08-21 12:23:19.000000000 +0200 @@ -40,7 +40,6 @@ #define __SEAHORSE_SSH_SOURCE_H__ #include "seahorse-ssh-key.h" -#include "seahorse-source.h" #define SEAHORSE_TYPE_SSH_SOURCE (seahorse_ssh_source_get_type ()) #define SEAHORSE_SSH_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SSH_SOURCE, SeahorseSSHSource)) @@ -77,10 +76,22 @@ gchar* seahorse_ssh_source_file_for_algorithm (SeahorseSSHSource *ssrc, guint algo); +void seahorse_ssh_source_remove_object (SeahorseSSHSource *self, + SeahorseSSHKey *skey); + guchar* seahorse_ssh_source_export_private (SeahorseSSHSource *ssrc, SeahorseSSHKey *skey, gsize *n_results, GError **err); +void seahorse_ssh_source_import_async (SeahorseSSHSource *self, + GInputStream *input, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +GList * seahorse_ssh_source_import_finish (SeahorseSSHSource *self, + GAsyncResult *result, + GError **error); #endif /* __SEAHORSE_SSH_SOURCE_H__ */ diff -Nru seahorse-3.2.2/ssh/seahorse-ssh-upload.c seahorse-3.6.3/ssh/seahorse-ssh-upload.c --- seahorse-3.2.2/ssh/seahorse-ssh-upload.c 2011-11-14 11:45:20.000000000 +0100 +++ seahorse-3.6.3/ssh/seahorse-ssh-upload.c 2012-08-21 12:23:19.000000000 +0200 @@ -26,10 +26,10 @@ #include +#include "seahorse-icons.h" #include "seahorse-widget.h" #include "seahorse-util.h" #include "seahorse-progress.h" -#include "seahorse-gtkstock.h" #include "ssh/seahorse-ssh-dialogs.h" #include "ssh/seahorse-ssh-source.h" @@ -124,7 +124,7 @@ cancellable = g_cancellable_new (); /* Start an upload process */ - seahorse_ssh_op_upload_async (SEAHORSE_SSH_SOURCE (seahorse_object_get_source (keys->data)), + seahorse_ssh_op_upload_async (SEAHORSE_SSH_SOURCE (seahorse_object_get_place (keys->data)), keys, user, host, port, cancellable, on_upload_complete, NULL); g_free (host);